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

Duncan Sands baldrick at free.fr
Fri Jul 17 04:21:20 PDT 2009 

Author: baldrick
Date: Fri Jul 17 06:21:18 2009
New Revision: 76171

URL: http://llvm.org/viewvc/llvm-project?rev=76171&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=76171&r1=76170&r2=76171&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/fixincludes/fixincl.x (original)
+++ llvm-gcc-4.2/trunk/fixincludes/fixincl.x Fri Jul 17 06:21:18 2009
@@ -2,11 +2,11 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been AutoGen-ed  Monday July 13, 2009 at 11:39:18 PM MSD
+ * It has been AutoGen-ed  Friday July 17, 2009 at 11:13:21 AM CEST
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Пнд Июл 13 23:39:18 MSD 2009
+/* DO NOT SVN-MERGE THIS FILE, EITHER Fri Jul 17 11:13:21 CEST 2009
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -15,29 +15,25 @@
  * 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 217 fixup descriptions.
  *
  * See README for more information.
  *
  *  inclhack copyright (c) 1998, 1999, 2000, 2001
  *  The Free Software Foundation, Inc.
  *
-  *  inclhack is free software.
+  *  inclhack is free software: you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the
+ *  Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
  *  
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *  
- *  inclhack is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  inclhack is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *  See the GNU General Public License for more details.
  *  
- *  You should have received a copy of the GNU General Public License
- *  along with inclhack.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             59 Temple Place - Suite 330,
- *             Boston,  MA  02111-1307, USA.
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -260,10 +256,13 @@
  */
 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  1
+#define    AAB_FD_ZERO_ASM_POSIX_TYPES_H_TEST_CT  2
 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_HBypass0, (regex_t*)NULL },
+  { TT_NEGREP,   zAab_Fd_Zero_Asm_Posix_Types_HBypass1, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Aab_Fd_Zero_Asm_Posix_Types_H
@@ -1697,7 +1696,7 @@
  *  File name selection pattern
  */
 tSCC zBroken_CabsList[] =
-  "math.h\0architecture/ppc/math.h\0architecture/i386/math.h\0";
+  "math.h\0architecture/*/math.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1732,7 +1731,7 @@
  *  File name selection pattern
  */
 tSCC zBroken_NanList[] =
-  "architecture/ppc/math.h\0architecture/i386/math.h\0";
+  "architecture/ppc/math.h\0architecture/*/math.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2393,6 +2392,175 @@
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  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[] =
@@ -2626,6 +2794,50 @@
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  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[] =
@@ -4107,7 +4319,7 @@
  *  File name selection pattern
  */
 tSCC zKandr_ConcatList[] =
-  "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";
+  "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";
 /*
  *  Machine/OS name selection pattern
  */
@@ -4646,6 +4858,47 @@
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  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[] =
@@ -5292,7 +5545,7 @@
  *  File name selection pattern
  */
 tSCC zSco_MathList[] =
-  "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";
+  "math.h\0*/math.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -8582,9 +8835,9 @@
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          253
+#define REGEX_COUNT          262
 #define MACH_LIST_SIZE_LIMIT 261
-#define FIX_COUNT            211
+#define FIX_COUNT            217
 
 /*
  *  Enumerate the fixes
@@ -8645,12 +8898,17 @@
     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,
@@ -8702,6 +8960,7 @@
     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,
@@ -9079,6 +9338,26 @@
      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,
@@ -9109,6 +9388,11 @@
      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,
@@ -9364,6 +9648,11 @@
      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,

More information about the llvm-commits mailing list