[llvm-commits] [llvm-gcc-4.2] r75552 - /llvm-gcc-4.2/trunk/fixincludes/fixincl.x

Anton Korobeynikov asl at math.spbu.ru
Mon Jul 13 16:41:39 PDT 2009


Author: asl
Date: Mon Jul 13 18:41:37 2009
New Revision: 75552

URL: http://llvm.org/viewvc/llvm-project?rev=75552&view=rev
Log:
Regenerate

Modified:
    llvm-gcc-4.2/trunk/fixincludes/fixincl.x

Modified: llvm-gcc-4.2/trunk/fixincludes/fixincl.x
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/fixincludes/fixincl.x?rev=75552&r1=75551&r2=75552&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/fixincludes/fixincl.x (original)
+++ llvm-gcc-4.2/trunk/fixincludes/fixincl.x Mon Jul 13 18:41:37 2009
@@ -2,11 +2,11 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been AutoGen-ed  Friday June 29, 2007 at 06:59:26 PM MEST
+ * It has been AutoGen-ed  Monday July 13, 2009 at 11:39:18 PM MSD
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Fri Jun 29 18:59:26 MEST 2007
+/* DO NOT SVN-MERGE THIS FILE, EITHER Пнд Июл 13 23:39:18 MSD 2009
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -194,6 +194,50 @@
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Aab_Darwin_Fenv_H fix
+ */
+tSCC zAab_Darwin_Fenv_HName[] =
+     "AAB_darwin_fenv_h";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAab_Darwin_Fenv_HList[] =
+  "fenv.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAab_Darwin_Fenv_HMachs[] = {
+        "*-*-darwin*",
+        (const char*)NULL };
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zAab_Darwin_Fenv_HBypass0[] =
+       "#pragma GCC fenv";
+
+#define    AAB_DARWIN_FENV_H_TEST_CT  1
+static tTestDesc aAab_Darwin_Fenv_HTests[] = {
+  { TT_NEGREP,   zAab_Darwin_Fenv_HBypass0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aab_Darwin_Fenv_H
+ */
+static const char* apzAab_Darwin_Fenv_HPatch[] = {
+"/* This file is a backwards compability hack to allow \n\
+   no-trapping-math to be the default.  */\n\
+#ifndef _DARWIN_FENV_H_WRAPPER\n\
+#if defined(__GNUC__) && __GNUC__ >= 4\n\
+#pragma GCC fenv\n\
+#endif\n\
+#include_next <fenv.h>\n\
+#define _DARWIN_FENV_H_WRAPPER\n\
+#endif /* _DARWIN_FENV_H_WRAPPER */",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Aab_Fd_Zero_Asm_Posix_Types_H fix
  */
 tSCC zAab_Fd_Zero_Asm_Posix_Types_HName[] =
@@ -216,13 +260,10 @@
  */
 tSCC zAab_Fd_Zero_Asm_Posix_Types_HBypass0[] =
        "} while";
-tSCC zAab_Fd_Zero_Asm_Posix_Types_HBypass1[] =
-       "x86_64";
 
-#define    AAB_FD_ZERO_ASM_POSIX_TYPES_H_TEST_CT  2
+#define    AAB_FD_ZERO_ASM_POSIX_TYPES_H_TEST_CT  1
 static tTestDesc aAab_Fd_Zero_Asm_Posix_Types_HTests[] = {
-  { TT_NEGREP,   zAab_Fd_Zero_Asm_Posix_Types_HBypass0, (regex_t*)NULL },
-  { TT_NEGREP,   zAab_Fd_Zero_Asm_Posix_Types_HBypass1, (regex_t*)NULL }, };
+  { TT_NEGREP,   zAab_Fd_Zero_Asm_Posix_Types_HBypass0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Aab_Fd_Zero_Asm_Posix_Types_H
@@ -1656,7 +1697,7 @@
  *  File name selection pattern
  */
 tSCC zBroken_CabsList[] =
-  "math.h\0architecture/*/math.h\0";
+  "math.h\0architecture/ppc/math.h\0architecture/i386/math.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1691,7 +1732,7 @@
  *  File name selection pattern
  */
 tSCC zBroken_NanList[] =
-  "architecture/ppc/math.h\0architecture/*/math.h\0";
+  "architecture/ppc/math.h\0architecture/i386/math.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1916,6 +1957,48 @@
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Darwin_Macho_Swaph_Externc fix
+ */
+tSCC zDarwin_Macho_Swaph_ExterncName[] =
+     "darwin_macho_swaph_externc";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zDarwin_Macho_Swaph_ExterncList[] =
+  "mach-o/swap.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Macho_Swaph_ExterncMachs[] = {
+        "*-*-darwin*",
+        (const char*)NULL };
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zDarwin_Macho_Swaph_ExterncBypass0[] =
+       "extern \"C\"";
+
+#define    DARWIN_MACHO_SWAPH_EXTERNC_TEST_CT  1
+static tTestDesc aDarwin_Macho_Swaph_ExterncTests[] = {
+  { TT_NEGREP,   zDarwin_Macho_Swaph_ExterncBypass0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Darwin_Macho_Swaph_Externc
+ */
+static const char* apzDarwin_Macho_Swaph_ExterncPatch[] = {
+    "wrap",
+    "#if __cplusplus\n\
+extern \"C\" {\n\
+#endif\n",
+    "#if __cplusplus\n\
+}\n\
+#endif\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Darwin_Private_Extern fix
  */
 tSCC zDarwin_Private_ExternName[] =
@@ -1954,6 +2037,132 @@
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Darwin_Stdint_Guards_Intn fix
+ */
+tSCC zDarwin_Stdint_Guards_IntnName[] =
+     "darwin_stdint_guards_intn";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zDarwin_Stdint_Guards_IntnList[] =
+  "ppc/types.h\0i386/types.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Stdint_Guards_IntnMachs[] = {
+        "*-*-darwin*",
+        (const char*)NULL };
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zDarwin_Stdint_Guards_IntnBypass0[] =
+       "_INT32_T[ \n\
+]";
+
+#define    DARWIN_STDINT_GUARDS_INTN_TEST_CT  1
+static tTestDesc aDarwin_Stdint_Guards_IntnTests[] = {
+  { TT_NEGREP,   zDarwin_Stdint_Guards_IntnBypass0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Darwin_Stdint_Guards_Intn
+ */
+static const char* apzDarwin_Stdint_Guards_IntnPatch[] = {
+    "format",
+    "#ifndef _INT%2_T\n\
+#define _INT%2_T\n\
+%0\n\
+#endif",
+    "typedef[ \t]([_a-z ]*\t+)int([0-9]+)_t;",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Darwin_Stdint_Guards_Intptr fix
+ */
+tSCC zDarwin_Stdint_Guards_IntptrName[] =
+     "darwin_stdint_guards_intptr";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zDarwin_Stdint_Guards_IntptrList[] =
+  "ppc/types.h\0i386/types.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Stdint_Guards_IntptrMachs[] = {
+        "*-*-darwin*",
+        (const char*)NULL };
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zDarwin_Stdint_Guards_IntptrBypass0[] =
+       "_INTPTR_T[ \n\
+]";
+
+#define    DARWIN_STDINT_GUARDS_INTPTR_TEST_CT  1
+static tTestDesc aDarwin_Stdint_Guards_IntptrTests[] = {
+  { TT_NEGREP,   zDarwin_Stdint_Guards_IntptrBypass0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Darwin_Stdint_Guards_Intptr
+ */
+static const char* apzDarwin_Stdint_Guards_IntptrPatch[] = {
+    "format",
+    "#ifndef _INTPTR_T\n\
+#define _INTPTR_T\n\
+%0\n\
+#endif",
+    "typedef[ \t]([_a-z \t]+)[ \t]+intptr_t;",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Darwin_Stdint_Guards_Uintptr fix
+ */
+tSCC zDarwin_Stdint_Guards_UintptrName[] =
+     "darwin_stdint_guards_uintptr";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zDarwin_Stdint_Guards_UintptrList[] =
+  "ppc/types.h\0i386/types.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Stdint_Guards_UintptrMachs[] = {
+        "*-*-darwin*",
+        (const char*)NULL };
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zDarwin_Stdint_Guards_UintptrBypass0[] =
+       "_UINTPTR_T[ \n\
+]";
+
+#define    DARWIN_STDINT_GUARDS_UINTPTR_TEST_CT  1
+static tTestDesc aDarwin_Stdint_Guards_UintptrTests[] = {
+  { TT_NEGREP,   zDarwin_Stdint_Guards_UintptrBypass0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Darwin_Stdint_Guards_Uintptr
+ */
+static const char* apzDarwin_Stdint_Guards_UintptrPatch[] = {
+    "format",
+    "#ifndef _UINTPTR_T\n\
+#define _UINTPTR_T\n\
+%0\n\
+#endif",
+    "typedef[ \t]([_a-z \t]+)[ \t]+uintptr_t;",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Dec_Intern_Asm fix
  */
 tSCC zDec_Intern_AsmName[] =
@@ -2184,175 +2393,6 @@
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Glibc_C99_Inline_1 fix
- */
-tSCC zGlibc_C99_Inline_1Name[] =
-     "glibc_c99_inline_1";
-
-/*
- *  File name selection pattern
- */
-tSCC zGlibc_C99_Inline_1List[] =
-  "features.h\0*/features.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzGlibc_C99_Inline_1Machs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zGlibc_C99_Inline_1Select0[] =
-       "^ *&& !defined __OPTIMIZE_SIZE__ && !defined __NO_INLINE__$";
-
-#define    GLIBC_C99_INLINE_1_TEST_CT  1
-static tTestDesc aGlibc_C99_Inline_1Tests[] = {
-  { TT_EGREP,    zGlibc_C99_Inline_1Select0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Glibc_C99_Inline_1
- */
-static const char* apzGlibc_C99_Inline_1Patch[] = {
-    "format",
-    "%0 && (defined __extern_inline || defined __GNUC_GNU_INLINE__)",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Glibc_C99_Inline_2 fix
- */
-tSCC zGlibc_C99_Inline_2Name[] =
-     "glibc_c99_inline_2";
-
-/*
- *  File name selection pattern
- */
-tSCC zGlibc_C99_Inline_2List[] =
-  "sys/stat.h\0*/sys/stat.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzGlibc_C99_Inline_2Machs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zGlibc_C99_Inline_2Select0[] =
-       "extern __inline__ int";
-
-#define    GLIBC_C99_INLINE_2_TEST_CT  1
-static tTestDesc aGlibc_C99_Inline_2Tests[] = {
-  { TT_EGREP,    zGlibc_C99_Inline_2Select0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Glibc_C99_Inline_2
- */
-static const char* apzGlibc_C99_Inline_2Patch[] = { "sed",
-    "-e", "s/extern int \\(stat\\|lstat\\|fstat\\|mknod\\)/#ifdef __GNUC_GNU_INLINE__\\\n\
-extern\\\n\
-#endif\\\n\
-__inline__ int \\1/",
-    "-e", "s/extern int __REDIRECT\\(_NTH\\|\\) (\\(stat\\|lstat\\|fstat\\)/#ifdef __GNUC_GNU_INLINE__\\\n\
-extern\\\n\
-#endif\\\n\
-__inline__ int __REDIRECT\\1 (\\2/",
-    "-e", "s/^extern __inline__ int/#ifdef __GNUC_GNU_INLINE__\\\n\
-extern\\\n\
-#endif\\\n\
-__inline__ int/",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Glibc_C99_Inline_3 fix
- */
-tSCC zGlibc_C99_Inline_3Name[] =
-     "glibc_c99_inline_3";
-
-/*
- *  File name selection pattern
- */
-tSCC zGlibc_C99_Inline_3List[] =
-  "bits/string2.h\0*/bits/string2.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzGlibc_C99_Inline_3Machs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zGlibc_C99_Inline_3Select0[] =
-       "extern __inline";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zGlibc_C99_Inline_3Bypass0[] =
-       "__STDC_VERSION__";
-
-#define    GLIBC_C99_INLINE_3_TEST_CT  2
-static tTestDesc aGlibc_C99_Inline_3Tests[] = {
-  { TT_NEGREP,   zGlibc_C99_Inline_3Bypass0, (regex_t*)NULL },
-  { TT_EGREP,    zGlibc_C99_Inline_3Select0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Glibc_C99_Inline_3
- */
-static const char* apzGlibc_C99_Inline_3Patch[] = {
-    "format",
-    "# if defined(__cplusplus) || defined(__GNUC_STDC_INLINE__)",
-    "^# ifdef __cplusplus$",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Glibc_C99_Inline_4 fix
- */
-tSCC zGlibc_C99_Inline_4Name[] =
-     "glibc_c99_inline_4";
-
-/*
- *  File name selection pattern
- */
-tSCC zGlibc_C99_Inline_4List[] =
-  "sys/sysmacros.h\0*/sys/sysmacros.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzGlibc_C99_Inline_4Machs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zGlibc_C99_Inline_4Select0[] =
-       "extern __inline";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zGlibc_C99_Inline_4Bypass0[] =
-       "__STDC_VERSION__";
-
-#define    GLIBC_C99_INLINE_4_TEST_CT  2
-static tTestDesc aGlibc_C99_Inline_4Tests[] = {
-  { TT_NEGREP,   zGlibc_C99_Inline_4Bypass0, (regex_t*)NULL },
-  { TT_EGREP,    zGlibc_C99_Inline_4Select0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Glibc_C99_Inline_4
- */
-static const char* apzGlibc_C99_Inline_4Patch[] = {
-    "format",
-    "\n\
-#ifdef __GNUC_GNU_INLINE__\n\
-extern\n\
-#endif\n",
-    "(^| )extern ",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Glibc_Mutex_Init fix
  */
 tSCC zGlibc_Mutex_InitName[] =
@@ -2586,50 +2626,6 @@
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hppa_Hpux_Fp_Macros fix
- */
-tSCC zHppa_Hpux_Fp_MacrosName[] =
-     "hppa_hpux_fp_macros";
-
-/*
- *  File name selection pattern
- */
-tSCC zHppa_Hpux_Fp_MacrosList[] =
-  "math.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzHppa_Hpux_Fp_MacrosMachs[] = {
-        "hppa*-hp-hpux11*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHppa_Hpux_Fp_MacrosSelect0[] =
-       "#[ \t]*define[ \t]*FP_NORMAL.*\n\
-#[ \t]*define[ \t]*FP_ZERO.*\n\
-#[ \t]*define[ \t]*FP_INFINITE.*\n\
-#[ \t]*define[ \t]*FP_SUBNORMAL.*\n\
-#[ \t]*define[ \t]*FP_NAN.*\n";
-
-#define    HPPA_HPUX_FP_MACROS_TEST_CT  1
-static tTestDesc aHppa_Hpux_Fp_MacrosTests[] = {
-  { TT_EGREP,    zHppa_Hpux_Fp_MacrosSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Hppa_Hpux_Fp_Macros
- */
-static const char* apzHppa_Hpux_Fp_MacrosPatch[] = {
-    "format",
-    "#endif /* _INCLUDE_HPUX_SOURCE */\n\n\
-#if defined(_INCLUDE_HPUX_SOURCE) || (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L))\n\
-%0#endif\n\n\
-#ifdef _INCLUDE_HPUX_SOURCE\n",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Hpux10_Ctype_Declarations1 fix
  */
 tSCC zHpux10_Ctype_Declarations1Name[] =
@@ -4111,7 +4107,7 @@
  *  File name selection pattern
  */
 tSCC zKandr_ConcatList[] =
-  "sparc/asm_linkage.h\0sun*/asm_linkage.h\0arm/as_support.h\0arm/mc_type.h\0arm/xcb.h\0dev/chardefmac.h\0dev/ps_irq.h\0dev/screen.h\0dev/scsi.h\0sys/tty.h\0Xm.acorn/XmP.h\0bsd43/bsd43_.h\0";
+  "sparc/asm_linkage.h\0sun3/asm_linkage.h\0sun3x/asm_linkage.h\0sun4/asm_linkage.h\0sun4c/asm_linkage.h\0sun4m/asm_linkage.h\0sun4c/debug/asm_linkage.h\0sun4m/debug/asm_linkage.h\0arm/as_support.h\0arm/mc_type.h\0arm/xcb.h\0dev/chardefmac.h\0dev/ps_irq.h\0dev/screen.h\0dev/scsi.h\0sys/tty.h\0Xm.acorn/XmP.h\0bsd43/bsd43_.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -4506,6 +4502,43 @@
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Mingw_Inline_Fp_Math fix
+ */
+tSCC zMingw_Inline_Fp_MathName[] =
+     "mingw_inline_fp_math";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zMingw_Inline_Fp_MathList[] =
+  "complex.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzMingw_Inline_Fp_MathMachs[] = {
+        "i[34567]86-*-mingw*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zMingw_Inline_Fp_MathSelect0[] =
+       "[ \\t]*__asm__[ \\t]*\\(\\\"fpatan";
+
+#define    MINGW_INLINE_FP_MATH_TEST_CT  1
+static tTestDesc aMingw_Inline_Fp_MathTests[] = {
+  { TT_EGREP,    zMingw_Inline_Fp_MathSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Mingw_Inline_Fp_Math
+ */
+static const char* apzMingw_Inline_Fp_MathPatch[] = { "sed",
+    "-e", "/^\\#ifdef[ \\t]*__GNUC__$/,/^\\#endif[ \\t]*\\/*[ \\t]*__GNUC__[ \\t]*$/ { :ack N; /\\n[ \\t]*:/! b ack; s/\\(\\n[ \\t]*double[ \\t]*res;\\)\\n/\\1\\n#ifdef __NO_MATH_INLINES\\n    res = atan((__imag__ _Z) \\/ (__real__ _Z));\\n#else\\n/; s/\\(\\n[ \\t]*float[ \\t]*res;\\)\\n/\\1\\n#ifdef __NO_MATH_INLINES\\n    res = atanf((__imag__ _Z) \\/ (__real__ _Z));\\n#else\\n/; s/\\(\\n[ \\t]*long[ \\t]*double[ \\t]*res;\\)\\n/\\1\\n#ifdef __NO_MATH_INLINES\\n    res = atanl((__imag__ _Z) \\/ (__real__ _Z));\\n#else\\n/; s/\\(\\\"st[(]1[)]\\\"[)];[ \\t]*\\)$/\\1\\n#endif/g }",
+    "-e", "s/\\(\\#include[ \\t]*<_mingw.h>\\)/\\1\\n\\#include <math.h>/",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Nested_Auth_Des fix
  */
 tSCC zNested_Auth_DesName[] =
@@ -4613,47 +4646,6 @@
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Netbsd_C99_Inline_1 fix
- */
-tSCC zNetbsd_C99_Inline_1Name[] =
-     "netbsd_c99_inline_1";
-
-/*
- *  File name selection pattern
- */
-tSCC zNetbsd_C99_Inline_1List[] =
-  "signal.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzNetbsd_C99_Inline_1Machs[] = {
-        "*-*-netbsd*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zNetbsd_C99_Inline_1Select0[] =
-       "extern __inline int";
-
-#define    NETBSD_C99_INLINE_1_TEST_CT  1
-static tTestDesc aNetbsd_C99_Inline_1Tests[] = {
-  { TT_EGREP,    zNetbsd_C99_Inline_1Select0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Netbsd_C99_Inline_1
- */
-static const char* apzNetbsd_C99_Inline_1Patch[] = {
-    "format",
-    "extern\n\
-#ifdef __GNUC_STDC_INLINE__\n\
-__attribute__((__gnu_inline__))\n\
-#endif\n\
-__inline int",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Netbsd_Extra_Semicolon fix
  */
 tSCC zNetbsd_Extra_SemicolonName[] =
@@ -5300,7 +5292,7 @@
  *  File name selection pattern
  */
 tSCC zSco_MathList[] =
-  "math.h\0*/math.h\0";
+  "math.h\0ansi/math.h\0posix/math.h\0xpg4/math.h\0xpg4v2/math.h\0xpg4plus/math.h\0ods_30_compat/math.h\0oldstyle/math.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -8551,14 +8543,48 @@
 #endif /* !defined __STDC__ */",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Glibc_Fdzero_Inline_Asm fix
+ */
+tSCC zGlibc_Fdzero_Inline_AsmName[] =
+     "glibc_fdzero_inline_asm";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zGlibc_Fdzero_Inline_AsmList[] =
+  "bits/select.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzGlibc_Fdzero_Inline_AsmMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zGlibc_Fdzero_Inline_AsmSelect0[] =
+       "^[ \\t]*int __d0, __d1*";
+
+#define    GLIBC_FDZERO_INLINE_ASM_TEST_CT  1
+static tTestDesc aGlibc_Fdzero_Inline_AsmTests[] = {
+  { TT_EGREP,    zGlibc_Fdzero_Inline_AsmSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Glibc_Fdzero_Inline_Asm
+ */
+static const char* apzGlibc_Fdzero_Inline_AsmPatch[] = { "sed",
+    "-e", "s/int __d0, __d1;/__intptr_t __d0, __d1;/g",
+    (char*)NULL };
+
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          255
+#define REGEX_COUNT          253
 #define MACH_LIST_SIZE_LIMIT 261
-#define FIX_COUNT            210
+#define FIX_COUNT            211
 
 /*
  *  Enumerate the fixes
@@ -8566,6 +8592,7 @@
 typedef enum {
     AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_FIXIDX,
     AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_2_FIXIDX,
+    AAB_DARWIN_FENV_H_FIXIDX,
     AAB_FD_ZERO_ASM_POSIX_TYPES_H_FIXIDX,
     AAB_FD_ZERO_GNU_TYPES_H_FIXIDX,
     AAB_FD_ZERO_SELECTBITS_H_FIXIDX,
@@ -8607,24 +8634,23 @@
     CTRL_QUOTES_USE_FIXIDX,
     CXX_UNREADY_FIXIDX,
     DARWIN_GCC4_BREAKAGE_FIXIDX,
+    DARWIN_MACHO_SWAPH_EXTERNC_FIXIDX,
     DARWIN_PRIVATE_EXTERN_FIXIDX,
+    DARWIN_STDINT_GUARDS_INTN_FIXIDX,
+    DARWIN_STDINT_GUARDS_INTPTR_FIXIDX,
+    DARWIN_STDINT_GUARDS_UINTPTR_FIXIDX,
     DEC_INTERN_ASM_FIXIDX,
     DJGPP_WCHAR_H_FIXIDX,
     ECD_CURSOR_FIXIDX,
     EXCEPTION_STRUCTURE_FIXIDX,
     FREEBSD_GCC3_BREAKAGE_FIXIDX,
     FREEBSD_GCC4_BREAKAGE_FIXIDX,
-    GLIBC_C99_INLINE_1_FIXIDX,
-    GLIBC_C99_INLINE_2_FIXIDX,
-    GLIBC_C99_INLINE_3_FIXIDX,
-    GLIBC_C99_INLINE_4_FIXIDX,
     GLIBC_MUTEX_INIT_FIXIDX,
     GNU_TYPES_FIXIDX,
     HP_INLINE_FIXIDX,
     HP_SYSFILE_FIXIDX,
     HPUX10_CPP_POW_INLINE_FIXIDX,
     HPUX11_CPP_POW_INLINE_FIXIDX,
-    HPPA_HPUX_FP_MACROS_FIXIDX,
     HPUX10_CTYPE_DECLARATIONS1_FIXIDX,
     HPUX10_CTYPE_DECLARATIONS2_FIXIDX,
     HPUX10_STDIO_DECLARATIONS_FIXIDX,
@@ -8672,10 +8698,10 @@
     MACHINE_NAME_FIXIDX,
     MATH_EXCEPTION_FIXIDX,
     MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX,
+    MINGW_INLINE_FP_MATH_FIXIDX,
     NESTED_AUTH_DES_FIXIDX,
     NESTED_MOTOROLA_FIXIDX,
     NESTED_SYS_LIMITS_FIXIDX,
-    NETBSD_C99_INLINE_1_FIXIDX,
     NETBSD_EXTRA_SEMICOLON_FIXIDX,
     NEXT_MATH_PREFIX_FIXIDX,
     NEXT_TEMPLATE_FIXIDX,
@@ -8773,7 +8799,8 @@
     X11_CLASS_FIXIDX,
     X11_CLASS_USAGE_FIXIDX,
     X11_NEW_FIXIDX,
-    X11_SPRINTF_FIXIDX
+    X11_SPRINTF_FIXIDX,
+    GLIBC_FDZERO_INLINE_ASM_FIXIDX
 } t_fixinc_idx;
 
 tFixDesc fixDescList[ FIX_COUNT ] = {
@@ -8787,6 +8814,11 @@
      AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAab_Darwin7_9_Long_Double_Funcs_2Tests,   apzAab_Darwin7_9_Long_Double_Funcs_2Patch, 0 },
 
+  {  zAab_Darwin_Fenv_HName,    zAab_Darwin_Fenv_HList,
+     apzAab_Darwin_Fenv_HMachs,
+     AAB_DARWIN_FENV_H_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
+     aAab_Darwin_Fenv_HTests,   apzAab_Darwin_Fenv_HPatch, 0 },
+
   {  zAab_Fd_Zero_Asm_Posix_Types_HName,    zAab_Fd_Zero_Asm_Posix_Types_HList,
      apzAab_Fd_Zero_Asm_Posix_Types_HMachs,
      AAB_FD_ZERO_ASM_POSIX_TYPES_H_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
@@ -8992,11 +9024,31 @@
      DARWIN_GCC4_BREAKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aDarwin_Gcc4_BreakageTests,   apzDarwin_Gcc4_BreakagePatch, 0 },
 
+  {  zDarwin_Macho_Swaph_ExterncName,    zDarwin_Macho_Swaph_ExterncList,
+     apzDarwin_Macho_Swaph_ExterncMachs,
+     DARWIN_MACHO_SWAPH_EXTERNC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aDarwin_Macho_Swaph_ExterncTests,   apzDarwin_Macho_Swaph_ExterncPatch, 0 },
+
   {  zDarwin_Private_ExternName,    zDarwin_Private_ExternList,
      apzDarwin_Private_ExternMachs,
      DARWIN_PRIVATE_EXTERN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aDarwin_Private_ExternTests,   apzDarwin_Private_ExternPatch, 0 },
 
+  {  zDarwin_Stdint_Guards_IntnName,    zDarwin_Stdint_Guards_IntnList,
+     apzDarwin_Stdint_Guards_IntnMachs,
+     DARWIN_STDINT_GUARDS_INTN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aDarwin_Stdint_Guards_IntnTests,   apzDarwin_Stdint_Guards_IntnPatch, 0 },
+
+  {  zDarwin_Stdint_Guards_IntptrName,    zDarwin_Stdint_Guards_IntptrList,
+     apzDarwin_Stdint_Guards_IntptrMachs,
+     DARWIN_STDINT_GUARDS_INTPTR_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aDarwin_Stdint_Guards_IntptrTests,   apzDarwin_Stdint_Guards_IntptrPatch, 0 },
+
+  {  zDarwin_Stdint_Guards_UintptrName,    zDarwin_Stdint_Guards_UintptrList,
+     apzDarwin_Stdint_Guards_UintptrMachs,
+     DARWIN_STDINT_GUARDS_UINTPTR_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aDarwin_Stdint_Guards_UintptrTests,   apzDarwin_Stdint_Guards_UintptrPatch, 0 },
+
   {  zDec_Intern_AsmName,    zDec_Intern_AsmList,
      apzDec_Intern_AsmMachs,
      DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY,
@@ -9027,26 +9079,6 @@
      FREEBSD_GCC4_BREAKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aFreebsd_Gcc4_BreakageTests,   apzFreebsd_Gcc4_BreakagePatch, 0 },
 
-  {  zGlibc_C99_Inline_1Name,    zGlibc_C99_Inline_1List,
-     apzGlibc_C99_Inline_1Machs,
-     GLIBC_C99_INLINE_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aGlibc_C99_Inline_1Tests,   apzGlibc_C99_Inline_1Patch, 0 },
-
-  {  zGlibc_C99_Inline_2Name,    zGlibc_C99_Inline_2List,
-     apzGlibc_C99_Inline_2Machs,
-     GLIBC_C99_INLINE_2_TEST_CT, FD_MACH_ONLY,
-     aGlibc_C99_Inline_2Tests,   apzGlibc_C99_Inline_2Patch, 0 },
-
-  {  zGlibc_C99_Inline_3Name,    zGlibc_C99_Inline_3List,
-     apzGlibc_C99_Inline_3Machs,
-     GLIBC_C99_INLINE_3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aGlibc_C99_Inline_3Tests,   apzGlibc_C99_Inline_3Patch, 0 },
-
-  {  zGlibc_C99_Inline_4Name,    zGlibc_C99_Inline_4List,
-     apzGlibc_C99_Inline_4Machs,
-     GLIBC_C99_INLINE_4_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aGlibc_C99_Inline_4Tests,   apzGlibc_C99_Inline_4Patch, 0 },
-
   {  zGlibc_Mutex_InitName,    zGlibc_Mutex_InitList,
      apzGlibc_Mutex_InitMachs,
      GLIBC_MUTEX_INIT_TEST_CT, FD_MACH_ONLY,
@@ -9077,11 +9109,6 @@
      HPUX11_CPP_POW_INLINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHpux11_Cpp_Pow_InlineTests,   apzHpux11_Cpp_Pow_InlinePatch, 0 },
 
-  {  zHppa_Hpux_Fp_MacrosName,    zHppa_Hpux_Fp_MacrosList,
-     apzHppa_Hpux_Fp_MacrosMachs,
-     HPPA_HPUX_FP_MACROS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHppa_Hpux_Fp_MacrosTests,   apzHppa_Hpux_Fp_MacrosPatch, 0 },
-
   {  zHpux10_Ctype_Declarations1Name,    zHpux10_Ctype_Declarations1List,
      apzHpux10_Ctype_Declarations1Machs,
      HPUX10_CTYPE_DECLARATIONS1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9317,6 +9344,11 @@
      MATH_HUGE_VAL_FROM_DBL_MAX_TEST_CT, FD_MACH_ONLY | FD_SHELL_SCRIPT,
      aMath_Huge_Val_From_Dbl_MaxTests,   apzMath_Huge_Val_From_Dbl_MaxPatch, 0 },
 
+  {  zMingw_Inline_Fp_MathName,    zMingw_Inline_Fp_MathList,
+     apzMingw_Inline_Fp_MathMachs,
+     MINGW_INLINE_FP_MATH_TEST_CT, FD_MACH_ONLY,
+     aMingw_Inline_Fp_MathTests,   apzMingw_Inline_Fp_MathPatch, 0 },
+
   {  zNested_Auth_DesName,    zNested_Auth_DesList,
      apzNested_Auth_DesMachs,
      NESTED_AUTH_DES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9332,11 +9364,6 @@
      NESTED_SYS_LIMITS_TEST_CT, FD_MACH_ONLY,
      aNested_Sys_LimitsTests,   apzNested_Sys_LimitsPatch, 0 },
 
-  {  zNetbsd_C99_Inline_1Name,    zNetbsd_C99_Inline_1List,
-     apzNetbsd_C99_Inline_1Machs,
-     NETBSD_C99_INLINE_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aNetbsd_C99_Inline_1Tests,   apzNetbsd_C99_Inline_1Patch, 0 },
-
   {  zNetbsd_Extra_SemicolonName,    zNetbsd_Extra_SemicolonList,
      apzNetbsd_Extra_SemicolonMachs,
      NETBSD_EXTRA_SEMICOLON_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9825,5 +9852,10 @@
   {  zX11_SprintfName,    zX11_SprintfList,
      apzX11_SprintfMachs,
      X11_SPRINTF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aX11_SprintfTests,   apzX11_SprintfPatch, 0 }
+     aX11_SprintfTests,   apzX11_SprintfPatch, 0 },
+
+  {  zGlibc_Fdzero_Inline_AsmName,    zGlibc_Fdzero_Inline_AsmList,
+     apzGlibc_Fdzero_Inline_AsmMachs,
+     GLIBC_FDZERO_INLINE_ASM_TEST_CT, FD_MACH_ONLY,
+     aGlibc_Fdzero_Inline_AsmTests,   apzGlibc_Fdzero_Inline_AsmPatch, 0 }
 };





More information about the llvm-commits mailing list