*
* DO NOT EDIT THIS FILE (fixincl.x)
*
- * It has been AutoGen-ed Sunday October 14, 2007 at 06:17:05 PM EDT
+ * It has been AutoGen-ed Tuesday December 18, 2007 at 03:28:19 AM CET
* From the definitions inclhack.def
* and the template file fixincl
*/
-/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Oct 14 18:17:05 EDT 2007
+/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Dec 18 03:28:19 CET 2007
*
* You must regenerate it. Use the ./genfixes script.
*
* certain ANSI-incompatible system header files which are fixed to work
* correctly with ANSI C and placed in a directory that GNU C will search.
*
- * This file contains 210 fixup descriptions.
+ * This file contains 212 fixup descriptions.
*
* See README for more information.
*
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Glibc_C99_Inline_1a fix
+ */
+tSCC zGlibc_C99_Inline_1aName[] =
+ "glibc_c99_inline_1a";
+
+/*
+ * File name selection pattern
+ */
+tSCC zGlibc_C99_Inline_1aList[] =
+ "features.h\0*/features.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzGlibc_C99_Inline_1aMachs (const char**)NULL
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zGlibc_C99_Inline_1aSelect0[] =
+ "(\\) && defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__)\n\
+(#[ \t]*define[ \t]*__USE_EXTERN_INLINES[ \t]*1)";
+
+#define GLIBC_C99_INLINE_1A_TEST_CT 1
+static tTestDesc aGlibc_C99_Inline_1aTests[] = {
+ { TT_EGREP, zGlibc_C99_Inline_1aSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Glibc_C99_Inline_1a
+ */
+static const char* apzGlibc_C99_Inline_1aPatch[] = {
+ "format",
+ "%1 && (defined __extern_inline || defined __GNUC_GNU_INLINE__)\n\
+%2",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Glibc_C99_Inline_2 fix
*/
tSCC zGlibc_C99_Inline_2Name[] =
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Glibc_C99_Inline_5 fix
+ */
+tSCC zGlibc_C99_Inline_5Name[] =
+ "glibc_c99_inline_5";
+
+/*
+ * File name selection pattern
+ */
+tSCC zGlibc_C99_Inline_5List[] =
+ "wchar.h\0*/wchar.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzGlibc_C99_Inline_5Machs (const char**)NULL
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zGlibc_C99_Inline_5Select0[] =
+ "(^| )extern __inline";
+
+/*
+ * content bypass pattern - skip fix if pattern found
+ */
+tSCC zGlibc_C99_Inline_5Bypass0[] =
+ "__STDC_VERSION__";
+
+#define GLIBC_C99_INLINE_5_TEST_CT 2
+static tTestDesc aGlibc_C99_Inline_5Tests[] = {
+ { TT_NEGREP, zGlibc_C99_Inline_5Bypass0, (regex_t*)NULL },
+ { TT_EGREP, zGlibc_C99_Inline_5Select0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Glibc_C99_Inline_5
+ */
+static const char* apzGlibc_C99_Inline_5Patch[] = {
+ "format",
+ "\n\
+#ifdef __GNUC_GNU_INLINE__\n\
+extern\n\
+#endif\n\
+__inline",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Glibc_Mutex_Init fix
*/
tSCC zGlibc_Mutex_InitName[] =
*
* List of all fixes
*/
-#define REGEX_COUNT 253
+#define REGEX_COUNT 256
#define MACH_LIST_SIZE_LIMIT 261
-#define FIX_COUNT 210
+#define FIX_COUNT 212
/*
* Enumerate the fixes
FREEBSD_GCC3_BREAKAGE_FIXIDX,
FREEBSD_GCC4_BREAKAGE_FIXIDX,
GLIBC_C99_INLINE_1_FIXIDX,
+ GLIBC_C99_INLINE_1A_FIXIDX,
GLIBC_C99_INLINE_2_FIXIDX,
GLIBC_C99_INLINE_3_FIXIDX,
GLIBC_C99_INLINE_4_FIXIDX,
+ GLIBC_C99_INLINE_5_FIXIDX,
GLIBC_MUTEX_INIT_FIXIDX,
GNU_TYPES_FIXIDX,
HP_INLINE_FIXIDX,
GLIBC_C99_INLINE_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aGlibc_C99_Inline_1Tests, apzGlibc_C99_Inline_1Patch, 0 },
+ { zGlibc_C99_Inline_1aName, zGlibc_C99_Inline_1aList,
+ apzGlibc_C99_Inline_1aMachs,
+ GLIBC_C99_INLINE_1A_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aGlibc_C99_Inline_1aTests, apzGlibc_C99_Inline_1aPatch, 0 },
+
{ zGlibc_C99_Inline_2Name, zGlibc_C99_Inline_2List,
apzGlibc_C99_Inline_2Machs,
GLIBC_C99_INLINE_2_TEST_CT, FD_MACH_ONLY,
GLIBC_C99_INLINE_4_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aGlibc_C99_Inline_4Tests, apzGlibc_C99_Inline_4Patch, 0 },
+ { zGlibc_C99_Inline_5Name, zGlibc_C99_Inline_5List,
+ apzGlibc_C99_Inline_5Machs,
+ GLIBC_C99_INLINE_5_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aGlibc_C99_Inline_5Tests, apzGlibc_C99_Inline_5Patch, 0 },
+
{ zGlibc_Mutex_InitName, zGlibc_Mutex_InitList,
apzGlibc_Mutex_InitMachs,
GLIBC_MUTEX_INIT_TEST_CT, FD_MACH_ONLY,
/*
+ * Similar, but a version that didn't have __NO_INLINE__
+ */
+fix = {
+ hackname = glibc_c99_inline_1a;
+ files = features.h, '*/features.h';
+ select = "(\\) && defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__)\n"
+ "(#[ \t]*define[ \t]*__USE_EXTERN_INLINES[ \t]*1)";
+ c_fix = format;
+ c_fix_arg = "%1 && (defined __extern_inline || defined __GNUC_GNU_INLINE__)\n%2";
+ test_text = <<-EOT
+#if __GNUC_PREREQ (2, 7) && defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__
+# define __USE_EXTERN_INLINES 1
+#endif
+EOT;
+};
+
+
+/*
* The glibc_c99_inline_1 fix should have fixed everything. Unfortunately
* there are many glibc headers which do not respect __USE_EXTERN_INLINES.
* The remaining glibc_c99_inline_* fixes deal with some of those headers.
};
+fix = {
+ hackname = glibc_c99_inline_5;
+ files = wchar.h, '*/wchar.h';
+ bypass = "__STDC_VERSION__";
+ select = "(^| )extern __inline";
+ c_fix = format;
+ c_fix_arg = "\n#ifdef __GNUC_GNU_INLINE__\nextern\n#endif\n__inline";
+ test_text = <<-EOT
+ __extension__ extern __inline double
+ __extension__ __extern_inline long
+ extern __inline unsigned int
+ EOT;
+};
+
+
/* glibc-2.3.5 defines pthread mutex initializers incorrectly,
* so we replace them with versions that correspond to the
* definition.