[llvm-commits] [llvm-gcc-4.2] r61519 - in /llvm-gcc-4.2/trunk/fixincludes: ChangeLog Makefile.in README fixincl.c fixincl.tpl fixincl.x inclhack.def mkfixinc.sh mkheaders.in tests/base/bits/string2.h tests/base/mach-o/swap.h tests/base/math.h tests/base/signal.h tests/base/sys/stat.h tests/base/sys/sysmacros.h
Duncan Sands
baldrick at free.fr
Wed Dec 31 02:07:21 PST 2008
Author: baldrick
Date: Wed Dec 31 04:07:04 2008
New Revision: 61519
URL: http://llvm.org/viewvc/llvm-project?rev=61519&view=rev
Log:
Backport from mainline: update to revision 126377.
This is the last change before gcc moved over to
GPLv3, and (just!) includes a bunch of fixes for
C99 extern inline. These C99 fixes are need to
get the x86-32 fortran front-end building on
ubuntu 5.10, which happens to be what my 32 bit
cfarm test machine runs. I updated everything
rather than porting a minimal set of fixes because
the current fixincludes seems to be broken: you
can't generate fixincl.x using genfixes because
of errors in inclhack.def...
Added:
llvm-gcc-4.2/trunk/fixincludes/tests/base/bits/string2.h
llvm-gcc-4.2/trunk/fixincludes/tests/base/signal.h
llvm-gcc-4.2/trunk/fixincludes/tests/base/sys/sysmacros.h
Removed:
llvm-gcc-4.2/trunk/fixincludes/tests/base/mach-o/swap.h
Modified:
llvm-gcc-4.2/trunk/fixincludes/ChangeLog
llvm-gcc-4.2/trunk/fixincludes/Makefile.in
llvm-gcc-4.2/trunk/fixincludes/README
llvm-gcc-4.2/trunk/fixincludes/fixincl.c
llvm-gcc-4.2/trunk/fixincludes/fixincl.tpl
llvm-gcc-4.2/trunk/fixincludes/fixincl.x
llvm-gcc-4.2/trunk/fixincludes/inclhack.def
llvm-gcc-4.2/trunk/fixincludes/mkfixinc.sh
llvm-gcc-4.2/trunk/fixincludes/mkheaders.in
llvm-gcc-4.2/trunk/fixincludes/tests/base/math.h
llvm-gcc-4.2/trunk/fixincludes/tests/base/sys/stat.h
Modified: llvm-gcc-4.2/trunk/fixincludes/ChangeLog
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/fixincludes/ChangeLog?rev=61519&r1=61518&r2=61519&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/fixincludes/ChangeLog (original)
+++ llvm-gcc-4.2/trunk/fixincludes/ChangeLog Wed Dec 31 04:07:04 2008
@@ -1,36 +1,132 @@
-2007-07-19 Geoffrey Keating <geoffk at apple.com>
+2007-07-05 Rainer Orth <ro at TechFak.Uni-Bielefeld.DE>
- * inclhack.def (darwin_macho_swaph_externc): New fix.
+ PR libgcj/28190
+ * inclhack.def (irix_stdint_c99): New fix.
* fixincl.x: Regenerate.
- * tests/base/mach-o/swap.h: New.
+ * tests/base/stdint.h: New test.
-/* APPLE LOCAL merge marger */
-/* Stuff above is only in mainline, not the 4.2 branch */
-2007-07-19 Release Manager
+2007-06-06 Steve Ellcey <sje at cup.hp.com>
- * GCC 4.2.1 released.
+ PR testsuite/31828
+ * inclhack.def (hppa_hpux_fp_macros): New.
+ * fixincl.x: Regenerate.
+ * tests/base/math.h: Update.
-2007-07-10 Rainer Orth <ro at TechFak.Uni-Bielefeld.DE>
+2007-03-26 Jakub Jelinek <jakub at redhat.com>
- PR libgcj/28190
- * inclhack.def (irix_stdint_c99): New fix.
+ * inclhack.def (glibc_c99_inline_1): Define __USE_EXTERN_INLINES
+ if __extern_inline or __GNUC_GNU_INLINE__ is defined rather than
+ __STDC_VERSION__ < 199901L.
+ (glibc_c99_inline_2): Replace #if __STDC_VERSION__ < 199901L
+ with #ifdef __GNUC_GNU_INLINE__.
+ (glibc_c99_inline_3): Add select. Replace __STDC_VERSION__ >= 199901L
+ with defined(__GNUC_STDC_INLINE__).
+ (glibc_c99_inline_4): Change select, add second c_fix_arg.
+ Replace #if __STDC_VERSION__ < 199901L with
+ #ifdef __GNUC_GNU_INLINE__.
+ * fixincl.x: Regenerated.
+ * tests/base/bits/string2.h: Update.
+ * tests/base/sys/sysmacros.h: Update.
+ * tests/base/sys/stat.h: Update.
+
+2007-03-18 Krister Walfridsson <cato at df.lth.se>
+
+ PR target/30058
+ * inclhack.def (netbsd_c99_inline_1): New.
* fixincl.x: Regenerate.
- * tests/base/stdint.h: New test.
+ * tests/base/signal.h: New.
+
+2007-03-12 Brooks Moses <brooks.moses at codesourcery.com>
-2007-05-13 Release Manager
+ * Makefile.in: Add dummy "install-info" target.
- * GCC 4.2.0 released.
+2007-03-06 Joseph Myers <joseph at codesourcery.com>
+
+ * mkheaders.in: Fix headers for each multilib required.
+
+2007-03-01 Brooks Moses <brooks.moses at codesourcery.com>
+
+ * Makefile.in: Add dummy install-pdf target.
+
+2007-02-27 Joseph Myers <joseph at codesourcery.com>
+
+ * mkheaders.in (incdir): Use include-fixed not include.
+
+2007-02-15 Brooks Moses <brooks.moses at codesourcery.com>
+
+ * Makefile.in: Added "pdf" target to .PHONY.
+
+2007-02-05 Richard Guenther <rguenther at suse.de>
+
+ * inclhack.def (glibc_c99_inline_4): Adjust selector to cope
+ with older glibc. Adjust version number for C99.
+ * fixincl.x: Regenerated.
2007-02-04 Mike Stump <mrs at apple.com>
* mkheaders.in: Allow optional isysroot parameter.
-2006-11-02 Steve Ellcey <sje at cup.hp.com>
+2007-02-03 Bruce Korb <bkorb at gnu.org>
+
+ * inclhack.def (glibc_c99_inline_4): replace "extern" only if
+ surrounded by space characters.
+
+2007-01-25 Daniel Franke <franke.daniel at gmail.com>
+
+ PR target/30272
+ * inclhack.def(broken_cabs): Also remove definition of cabsl.
+ * fixincl.x: Regenerate.
+ * tests/base/math.h: Update.
+
+2007-01-05 Bruce Korb <bkorb at gnu.org>,
+ Daniel Franke <franke.daniel at gmail.com>
+
+ PR target/30008
+ * fixincl.tpl (List): separate file name patterns with a NUL byte instead
+ of a vertical bar ("|").
+ * fixincl.c (fix_applies, machine_matches): Use fnmatch for name
+ matching. Set SKIP_TEST flag if we are not to run a test.
+ * fixincl.x: Regenerate.
+ * inclhack.def (glibc_c99_inline_[1234], broken_cabs, broken_nan,
+ kandr_concat, sco_math): Replace lists of specfic file names by search
+ patterns.
+
+2006-12-12 Olivier Hainque <hainque at adacore.com>
+
+ * fixincludes/mkfixinc.sh: Add "*-*-vxworks*" to the list of
+ targets for which a no-op fixer is appropriate.
+
+2006-11-07 Richard Guenther <rguenther at suse.de>
+
+ * inclhack.def (glibc_c99_inline_2): Adjust for glibc 2.3
+ systems.
+ * fixincl.x: Regenerate.
+
+2006-11-02 Geoffrey Keating <geoffk at apple.com>
+
+ * inclhack.def (glibc_c99_inline_1): New.
+ * inclhack.def (glibc_c99_inline_2): New.
+ * inclhack.def (glibc_c99_inline_3): New.
+ * inclhack.def (glibc_c99_inline_4): New.
+ * fixincl.x: Regenerate.
+ * tests/base/bits/string2.h: New.
+ * tests/base/sys/sysmacros.h: New.
+ * tests/base/sys/stat.h: Update.
+
+2006-11-01 Steve Ellcey <sje at cup.hp.com>
+
+ * tests/base/sys/socket.h: Update.
+
+2006-10-31 Steve Ellcey <sje at cup.hp.com>
* inclhack.def (hpux11_extern_sendfile): New.
(hpux11_extern_sendpath): New.
* fixincl.x: Regenerate.
- * tests/base/sys/socket.h: Update.
+
+2006-10-29 Joseph Myers <joseph at codesourcery.com>
+
+ * inclhack.def (AAB_fd_zero_asm_posix_types_h): Bypass on x86_64.
+ * fixincl.x: Regenerate.
2006-10-10 Brooks Moses <bmoses at stanford.edu>
Modified: llvm-gcc-4.2/trunk/fixincludes/Makefile.in
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/fixincludes/Makefile.in?rev=61519&r1=61518&r2=61519&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/fixincludes/Makefile.in (original)
+++ llvm-gcc-4.2/trunk/fixincludes/Makefile.in Wed Dec 31 04:07:04 2008
@@ -184,11 +184,13 @@
$(DESTDIR)$(itoolsdir)/fixincl at EXEEXT@
$(INSTALL_SCRIPT) mkheaders $(DESTDIR)$(itoolsdir)/mkheaders
-.PHONY: dvi info html install-html
+.PHONY: dvi pdf info html install-pdf install-info install-html
dvi :
pdf :
info :
html :
+install-pdf :
+install-info :
install-html :
installcheck :
Modified: llvm-gcc-4.2/trunk/fixincludes/README
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/fixincludes/README?rev=61519&r1=61518&r2=61519&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/fixincludes/README (original)
+++ llvm-gcc-4.2/trunk/fixincludes/README Wed Dec 31 04:07:04 2008
@@ -69,14 +69,17 @@
for variable names and is unique without regard to alphabetic case.
Please keep them alphabetical by this name. :-)
-2. If the problem is known to exist only in certain files,
- then name each such file with a "files = " entry.
+2. If the problem is known to exist only in certain files, then
+ identify the files with "files = " entries. If you use fnmatch(3C)
+ wild card characters in a "files" entry, be certain that the first
+ "files" entry has no such character. Otherwise, the "make check"
+ machinery will attempt to create files with those characters in the
+ name. That is inconvenient.
3. It is relatively expensive to fire off a process to fix a source
file, therefore write apply tests to avoid unnecessary fix
- processes. The preferred apply tests are "select", "bypass" and
- "c_test" because they are performed internally. The available
- tests are:
+ processes. The preferred apply tests are "select", "bypass", "mach"
+ and "c-test" because they are performed internally:
* select - Run a regex on the contents of the file being considered.
All such regex-es must match.
@@ -84,17 +87,16 @@
* bypass - Run a regex on the contents of the file being considered.
No such regex may match.
- * c_test - call a function in fixtests.c. See that file.
+ * c-test - call a function in fixtests.c. See that file.
- The next two tests are relatively slow because they must be handled
- in a separate shell process. Some platforms do not support server
- shells, so the whole process is even slower and more cumbersome there.
-
- * mach - Match the output of config.conf against a series of globbing
+ * mach - Match the output of config.conf against a series of fnmatch
patterns. It must match at least one of the patterns, unless
- "not-machine" has also been specified. If that has been
- specified, then the config.conf output may not match any of
- the patterns.
+ "not-machine" has also been specified. In that case, the
+ config.conf output must not match any of the patterns.
+
+ The next test is relatively slow because it must be handled in a
+ separate shell process. Some platforms do not support server shells,
+ so the whole process is even slower and more cumbersome there.
* test - These should be arguments to the program, "/bin/test".
You may perform multiple commands, if you enclose them
Modified: llvm-gcc-4.2/trunk/fixincludes/fixincl.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/fixincludes/fixincl.c?rev=61519&r1=61518&r2=61519&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/fixincludes/fixincl.c (original)
+++ llvm-gcc-4.2/trunk/fixincludes/fixincl.c Wed Dec 31 04:07:04 2008
@@ -14,7 +14,7 @@
GCC 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.
+GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING. If not, write to
@@ -23,6 +23,7 @@
#include "fixlib.h"
+#include <fnmatch.h>
#include <sys/stat.h>
#ifndef SEPARATE_FIX_PROC
#include <sys/wait.h>
@@ -359,96 +360,36 @@
static int
machine_matches( tFixDesc* p_fixd )
- {
-# ifndef SEPARATE_FIX_PROC
- tSCC case_fmt[] = "case %s in\n"; /* 9 bytes, plus string */
- tSCC esac_fmt[] =
- " )\n echo %s ;;\n* ) echo %s ;;\nesac";/* 4 bytes */
- tSCC skip[] = "skip"; /* 4 bytes */
- tSCC run[] = "run"; /* 3 bytes */
- /* total bytes to add to machine sum: 49 - see fixincl.tpl */
-
- const char **papz_machs = p_fixd->papz_machs;
- char *pz;
- const char *pz_sep = "";
- tCC *pz_if_true;
- tCC *pz_if_false;
- char cmd_buf[ MACH_LIST_SIZE_LIMIT ]; /* size lim from fixincl.tpl */
-
- /* Start the case statement */
-
- sprintf (cmd_buf, case_fmt, pz_machine);
- pz = cmd_buf + strlen (cmd_buf);
-
- /* Determine if a match means to apply the fix or not apply it */
-
- if (p_fixd->fd_flags & FD_MACH_IFNOT)
- {
- pz_if_true = skip;
- pz_if_false = run;
- }
- else
- {
- pz_if_true = run;
- pz_if_false = skip;
- }
-
- /* Emit all the machine names. If there are more than one,
- then we will insert " | \\\n" between the names */
-
- for (;;)
- {
- const char* pz_mach = *(papz_machs++);
-
- if (pz_mach == (const char*) NULL)
- break;
- sprintf (pz, "%s%s", pz_sep, pz_mach);
- pz += strlen (pz);
- pz_sep = " | \\\n";
- }
-
- /* Now emit the match and not-match actions and the esac */
-
- sprintf (pz, esac_fmt, pz_if_true, pz_if_false);
-
- /* Run the script.
- The result will start either with 's' or 'r'. */
-
- {
- int skip;
- pz = run_shell (cmd_buf);
- skip = (*pz == 's');
- free ( (void*)pz );
- if (skip)
- {
- p_fixd->fd_flags |= FD_SKIP_TEST;
- return BOOL_FALSE;
- }
- }
+{
+ char const ** papz_machs = p_fixd->papz_machs;
+ int have_match = BOOL_FALSE;
- return BOOL_TRUE;
-# else /* is SEPARATE_FIX_PROC */
- const char **papz_machs = p_fixd->papz_machs;
- int invert = (p_fixd->fd_flags & FD_MACH_IFNOT) != 0;
for (;;)
{
- const char* pz_mach = *(papz_machs++);
-
- if (pz_mach == (const char*) NULL)
+ char const * pz_mpat = *(papz_machs++);
+ if (pz_mpat == NULL)
break;
- if (strstr (pz_mach, "dos") != NULL && !invert)
- return BOOL_TRUE;
+ if (fnmatch(pz_mpat, pz_machine, 0) == 0)
+ {
+ have_match = BOOL_TRUE;
+ break;
+ }
}
- p_fixd->fd_flags |= FD_SKIP_TEST;
- return BOOL_FALSE;
-# endif
+ /* Check for sense inversion then set the "skip test" flag, if needed */
+ if (p_fixd->fd_flags & FD_MACH_IFNOT)
+ have_match = ! have_match;
+
+ if (! have_match)
+ p_fixd->fd_flags |= FD_SKIP_TEST;
+
+ return have_match;
}
/* * * * * * * * * * * * *
-
- run_compiles run all the regexp compiles for all the fixes once.
- */
+ *
+ * run_compiles run all the regexp compiles for all the fixes once.
+ */
void
run_compiles (void)
{
@@ -1074,11 +1015,11 @@
/* * * * * * * * * * * * *
-
- Process the potential fixes for a particular include file.
- Input: the original text of the file and the file's name
- Result: none. A new file may or may not be created. */
-
+ *
+ * Process the potential fixes for a particular include file.
+ * Input: the original text of the file and the file's name
+ * Result: none. A new file may or may not be created.
+ */
static t_bool
fix_applies (tFixDesc* p_fixd)
{
@@ -1087,7 +1028,7 @@
int test_ct;
tTestDesc *p_test;
-# ifdef SEPARATE_FIX_PROC
+#ifdef SEPARATE_FIX_PROC
/*
* There is only one fix that uses a shell script as of this writing.
* I hope to nuke it anyway, it does not apply to DOS and it would
@@ -1095,10 +1036,10 @@
*/
if (p_fixd->fd_flags & (FD_SHELL_SCRIPT | FD_SKIP_TEST))
return BOOL_FALSE;
-# else
+#else
if (p_fixd->fd_flags & FD_SKIP_TEST)
return BOOL_FALSE;
-# endif
+#endif
/* IF there is a file name restriction,
THEN ensure the current file name matches one in the pattern */
@@ -1113,17 +1054,11 @@
for (;;)
{
- pz_scan = strstr (pz_scan + 1, pz_fname);
- /* IF we can't match the string at all,
- THEN bail */
- if (pz_scan == (char *) NULL)
- return BOOL_FALSE;
-
- /* IF the match is surrounded by the '|' markers,
- THEN we found a full match -- time to run the tests */
-
- if ((pz_scan[-1] == '|') && (pz_scan[name_len] == '|'))
+ if (fnmatch (pz_scan, pz_fname, 0) == 0)
break;
+ pz_scan += strlen (pz_scan) + 1;
+ if (*pz_scan == NUL)
+ return BOOL_FALSE;
}
}
Modified: llvm-gcc-4.2/trunk/fixincludes/fixincl.tpl
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/fixincludes/fixincl.tpl?rev=61519&r1=61518&r2=61519&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/fixincludes/fixincl.tpl (original)
+++ llvm-gcc-4.2/trunk/fixincludes/fixincl.tpl Wed Dec 31 04:07:04 2008
@@ -2,7 +2,7 @@
x=fixincl.x =]
[= (dne " * " "/* ")=]
*/
-/* DO NOT CVS-MERGE THIS FILE, EITHER [=`date`=]
+/* DO NOT SVN-MERGE THIS FILE, EITHER [=`date`=]
*
* You must regenerate it. Use the ./genfixes script.
*
@@ -48,7 +48,7 @@
IF (exist? "files")=]
tSCC z[=(. Hack)=]List[] =
- "[=FOR files =]|[=files=][=ENDFOR=]|";[=
+ "[= (join "\\0" (stack "files")) =]\0";[=
ELSE =]
#define z[=(. Hack)=]List (char*)NULL[=
@@ -73,7 +73,7 @@
ELSE =]
#define apz[=(. Hack)=]Machs (const char**)NULL[=
- ENDIF (exist? "files") =][=
+ ENDIF (exist? "mach") =][=
IF (exist? "select")=]
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=61519&r1=61518&r2=61519&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/fixincludes/fixincl.x (original)
+++ llvm-gcc-4.2/trunk/fixincludes/fixincl.x Wed Dec 31 04:07:04 2008
@@ -2,11 +2,11 @@
*
* DO NOT EDIT THIS FILE (fixincl.x)
*
- * It has been AutoGen-ed Thursday August 2, 2007 at 04:56:07 PM PDT
+ * It has been AutoGen-ed Friday June 29, 2007 at 06:59:26 PM MEST
* From the definitions inclhack.def
* and the template file fixincl
*/
-/* DO NOT CVS-MERGE THIS FILE, EITHER Thu Aug 2 16:56:07 PDT 2007
+/* DO NOT SVN-MERGE THIS FILE, EITHER Fri Jun 29 18:59:26 MEST 2007
*
* You must regenerate it. Use the ./genfixes script.
*
@@ -51,7 +51,7 @@
* File name selection pattern
*/
tSCC zAab_Darwin7_9_Long_Double_FuncsList[] =
- "|architecture/ppc/math.h|";
+ "architecture/ppc/math.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -165,7 +165,7 @@
* File name selection pattern
*/
tSCC zAab_Darwin7_9_Long_Double_Funcs_2List[] =
- "|math.h|";
+ "math.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -194,50 +194,6 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * 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|";
-/*
- * 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[] =
@@ -247,7 +203,7 @@
* File name selection pattern
*/
tSCC zAab_Fd_Zero_Asm_Posix_Types_HList[] =
- "|asm/posix_types.h|";
+ "asm/posix_types.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -260,10 +216,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
@@ -300,7 +259,7 @@
* File name selection pattern
*/
tSCC zAab_Fd_Zero_Gnu_Types_HList[] =
- "|gnu/types.h|";
+ "gnu/types.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -344,7 +303,7 @@
* File name selection pattern
*/
tSCC zAab_Fd_Zero_Selectbits_HList[] =
- "|selectbits.h|";
+ "selectbits.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -392,7 +351,7 @@
* File name selection pattern
*/
tSCC zAab_Solaris_Sys_Varargs_HList[] =
- "|sys/varargs.h|";
+ "sys/varargs.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -424,7 +383,7 @@
* File name selection pattern
*/
tSCC zAab_Sun_MemcpyList[] =
- "|memory.h|";
+ "memory.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -616,7 +575,7 @@
* File name selection pattern
*/
tSCC zAab_Ultrix_Ansi_CompatList[] =
- "|ansi_compat.h|";
+ "ansi_compat.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -650,7 +609,7 @@
* File name selection pattern
*/
tSCC zAab_Ultrix_LimitsList[] =
- "|limits.h|";
+ "limits.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -681,7 +640,7 @@
* File name selection pattern
*/
tSCC zAab_Ultrix_MemoryList[] =
- "|memory.h|";
+ "memory.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -712,7 +671,7 @@
* File name selection pattern
*/
tSCC zAab_Ultrix_StringList[] =
- "|string.h|";
+ "string.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -743,7 +702,7 @@
* File name selection pattern
*/
tSCC zAix_PthreadList[] =
- "|pthread.h|";
+ "pthread.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -780,7 +739,7 @@
* File name selection pattern
*/
tSCC zAix_SysmachineList[] =
- "|sys/machine.h|";
+ "sys/machine.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -815,7 +774,7 @@
* File name selection pattern
*/
tSCC zAix_SyswaitList[] =
- "|sys/wait.h|";
+ "sys/wait.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -854,7 +813,7 @@
* File name selection pattern
*/
tSCC zAix_Syswait_2List[] =
- "|sys/wait.h|";
+ "sys/wait.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -889,7 +848,7 @@
* File name selection pattern
*/
tSCC zAix_VolatileList[] =
- "|sys/signal.h|";
+ "sys/signal.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -924,7 +883,7 @@
* File name selection pattern
*/
tSCC zAlpha___AssertList[] =
- "|assert.h|";
+ "assert.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -997,7 +956,7 @@
* File name selection pattern
*/
tSCC zAlpha___Extern_Prefix_StandardsList[] =
- "|standards.h|";
+ "standards.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -1034,7 +993,7 @@
* File name selection pattern
*/
tSCC zAlpha___Extern_Prefix_Sys_StatList[] =
- "|sys/stat.h|sys/mount.h|";
+ "sys/stat.h\0sys/mount.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -1071,7 +1030,7 @@
* File name selection pattern
*/
tSCC zAlpha_AssertList[] =
- "|assert.h|";
+ "assert.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -1141,7 +1100,7 @@
* File name selection pattern
*/
tSCC zAlpha_GetoptList[] =
- "|stdio.h|stdlib.h|";
+ "stdio.h\0stdlib.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -1176,7 +1135,7 @@
* File name selection pattern
*/
tSCC zAlpha_ParensList[] =
- "|sym.h|";
+ "sym.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -1211,7 +1170,7 @@
* File name selection pattern
*/
tSCC zAlpha_PthreadList[] =
- "|pthread.h|";
+ "pthread.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -1250,7 +1209,7 @@
* File name selection pattern
*/
tSCC zAlpha_Pthread_GccList[] =
- "|pthread.h|";
+ "pthread.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -1290,7 +1249,7 @@
* File name selection pattern
*/
tSCC zAlpha_Pthread_InitList[] =
- "|pthread.h|";
+ "pthread.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -1331,7 +1290,7 @@
* File name selection pattern
*/
tSCC zAlpha_SbrkList[] =
- "|unistd.h|";
+ "unistd.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -1366,7 +1325,7 @@
* File name selection pattern
*/
tSCC zAlpha_WcharList[] =
- "|wchar.h|";
+ "wchar.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -1403,7 +1362,7 @@
* File name selection pattern
*/
tSCC zAvoid_Bool_DefineList[] =
- "|curses.h|curses_colr/curses.h|term.h|tinfo.h|";
+ "curses.h\0curses_colr/curses.h\0term.h\0tinfo.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -1448,7 +1407,7 @@
* File name selection pattern
*/
tSCC zAvoid_Bool_TypeList[] =
- "|curses.h|curses_colr/curses.h|term.h|tinfo.h|";
+ "curses.h\0curses_colr/curses.h\0term.h\0tinfo.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -1541,7 +1500,7 @@
* File name selection pattern
*/
tSCC zBad_Struct_TermList[] =
- "|curses.h|";
+ "curses.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -1576,7 +1535,7 @@
* File name selection pattern
*/
tSCC zBadquoteList[] =
- "|sundev/vuid_event.h|";
+ "sundev/vuid_event.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -1611,7 +1570,7 @@
* File name selection pattern
*/
tSCC zBroken_Assert_StdioList[] =
- "|assert.h|";
+ "assert.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -1653,7 +1612,7 @@
* File name selection pattern
*/
tSCC zBroken_Assert_StdlibList[] =
- "|assert.h|";
+ "assert.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -1697,7 +1656,7 @@
* File name selection pattern
*/
tSCC zBroken_CabsList[] =
- "|math.h|architecture/ppc/math.h|architecture/i386/math.h|";
+ "math.h\0architecture/*/math.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -1732,7 +1691,7 @@
* File name selection pattern
*/
tSCC zBroken_NanList[] =
- "|architecture/ppc/math.h|architecture/i386/math.h|";
+ "architecture/ppc/math.h\0architecture/*/math.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -1774,7 +1733,7 @@
* File name selection pattern
*/
tSCC zBsd_Stdio_Attrs_ConflictList[] =
- "|stdio.h|";
+ "stdio.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -1882,7 +1841,7 @@
* File name selection pattern
*/
tSCC zCxx_UnreadyList[] =
- "|sys/mman.h|rpc/types.h|";
+ "sys/mman.h\0rpc/types.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -1929,7 +1888,7 @@
* File name selection pattern
*/
tSCC zDarwin_Gcc4_BreakageList[] =
- "|AvailabilityMacros.h|";
+ "AvailabilityMacros.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -1957,48 +1916,6 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * 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|";
-/*
- * 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[] =
@@ -2008,7 +1925,7 @@
* File name selection pattern
*/
tSCC zDarwin_Private_ExternList[] =
- "|mach-o/dyld.h|";
+ "mach-o/dyld.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -2037,132 +1954,6 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * 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|i386/types.h|";
-/*
- * 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|i386/types.h|";
-/*
- * 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|i386/types.h|";
-/*
- * 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[] =
@@ -2172,7 +1963,7 @@
* File name selection pattern
*/
tSCC zDec_Intern_AsmList[] =
- "|c_asm.h|";
+ "c_asm.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -2244,7 +2035,7 @@
* File name selection pattern
*/
tSCC zEcd_CursorList[] =
- "|sunwindow/win_lock.h|sunwindow/win_cursor.h|";
+ "sunwindow/win_lock.h\0sunwindow/win_cursor.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -2279,7 +2070,7 @@
* File name selection pattern
*/
tSCC zException_StructureList[] =
- "|math.h|";
+ "math.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -2321,7 +2112,7 @@
* File name selection pattern
*/
tSCC zFreebsd_Gcc3_BreakageList[] =
- "|sys/cdefs.h|";
+ "sys/cdefs.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -2365,7 +2156,7 @@
* File name selection pattern
*/
tSCC zFreebsd_Gcc4_BreakageList[] =
- "|sys/cdefs.h|";
+ "sys/cdefs.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -2393,6 +2184,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[] =
@@ -2402,7 +2362,7 @@
* File name selection pattern
*/
tSCC zGlibc_Mutex_InitList[] =
- "|pthread.h|";
+ "pthread.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -2441,7 +2401,7 @@
* File name selection pattern
*/
tSCC zGnu_TypesList[] =
- "|sys/types.h|stdlib.h|sys/stdtypes.h|stddef.h|memory.h|unistd.h|";
+ "sys/types.h\0stdlib.h\0sys/stdtypes.h\0stddef.h\0memory.h\0unistd.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -2484,7 +2444,7 @@
* File name selection pattern
*/
tSCC zHp_InlineList[] =
- "|sys/spinlock.h|machine/machparam.h|";
+ "sys/spinlock.h\0machine/machparam.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -2520,7 +2480,7 @@
* File name selection pattern
*/
tSCC zHp_SysfileList[] =
- "|sys/file.h|";
+ "sys/file.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -2556,7 +2516,7 @@
* File name selection pattern
*/
tSCC zHpux10_Cpp_Pow_InlineList[] =
- "|fixinc-test-limits.h|math.h|";
+ "fixinc-test-limits.h\0math.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -2598,7 +2558,7 @@
* File name selection pattern
*/
tSCC zHpux11_Cpp_Pow_InlineList[] =
- "|math.h|";
+ "math.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -2626,6 +2586,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[] =
@@ -2635,7 +2639,7 @@
* File name selection pattern
*/
tSCC zHpux10_Ctype_Declarations1List[] =
- "|ctype.h|";
+ "ctype.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -2684,7 +2688,7 @@
* File name selection pattern
*/
tSCC zHpux10_Ctype_Declarations2List[] =
- "|ctype.h|";
+ "ctype.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -2751,7 +2755,7 @@
* File name selection pattern
*/
tSCC zHpux10_Stdio_DeclarationsList[] =
- "|stdio.h|";
+ "stdio.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -2800,7 +2804,7 @@
* File name selection pattern
*/
tSCC zHpux11_AbsList[] =
- "|stdlib.h|";
+ "stdlib.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -2837,7 +2841,7 @@
* File name selection pattern
*/
tSCC zHpux11_FabsfList[] =
- "|math.h|";
+ "math.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -2917,7 +2921,7 @@
* File name selection pattern
*/
tSCC zHpux11_SnprintfList[] =
- "|stdio.h|";
+ "stdio.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -2952,7 +2956,7 @@
* File name selection pattern
*/
tSCC zHpux11_Uint32_CList[] =
- "|inttypes.h|";
+ "inttypes.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -2987,7 +2991,7 @@
* File name selection pattern
*/
tSCC zHpux11_VsnprintfList[] =
- "|stdio.h|";
+ "stdio.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -3022,7 +3026,7 @@
* File name selection pattern
*/
tSCC zHpux8_Bogus_InlinesList[] =
- "|math.h|";
+ "math.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -3066,7 +3070,7 @@
* File name selection pattern
*/
tSCC zHpux_Ctype_MacrosList[] =
- "|ctype.h|";
+ "ctype.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -3101,7 +3105,7 @@
* File name selection pattern
*/
tSCC zHpux_HtonlList[] =
- "|netinet/in.h|";
+ "netinet/in.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -3141,7 +3145,7 @@
* File name selection pattern
*/
tSCC zHpux_Long_DoubleList[] =
- "|stdlib.h|";
+ "stdlib.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -3183,7 +3187,7 @@
* File name selection pattern
*/
tSCC zHpux_SystimeList[] =
- "|sys/time.h|";
+ "sys/time.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -3218,7 +3222,7 @@
* File name selection pattern
*/
tSCC zHpux_Spu_InfoList[] =
- "|ia64/sys/getppdp.h|";
+ "ia64/sys/getppdp.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -3257,7 +3261,7 @@
* File name selection pattern
*/
tSCC zHpux11_Extern_SendfileList[] =
- "|sys/socket.h|";
+ "sys/socket.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -3296,7 +3300,7 @@
* File name selection pattern
*/
tSCC zHpux11_Extern_SendpathList[] =
- "|sys/socket.h|";
+ "sys/socket.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -3335,7 +3339,7 @@
* File name selection pattern
*/
tSCC zHpux_Extern_ErrnoList[] =
- "|errno.h|";
+ "errno.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -3379,7 +3383,7 @@
* File name selection pattern
*/
tSCC zHpux_Pthread_InitializersList[] =
- "|sys/pthread.h|";
+ "sys/pthread.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -3419,7 +3423,7 @@
* File name selection pattern
*/
tSCC zHuge_Val_HexList[] =
- "|bits/huge_val.h|";
+ "bits/huge_val.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -3461,7 +3465,7 @@
* File name selection pattern
*/
tSCC zHuge_Valf_HexList[] =
- "|bits/huge_val.h|";
+ "bits/huge_val.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -3503,7 +3507,7 @@
* File name selection pattern
*/
tSCC zHuge_Vall_HexList[] =
- "|bits/huge_val.h|";
+ "bits/huge_val.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -3545,7 +3549,7 @@
* File name selection pattern
*/
tSCC zInt_Abort_Free_And_ExitList[] =
- "|stdlib.h|";
+ "stdlib.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -3655,7 +3659,7 @@
* File name selection pattern
*/
tSCC zIp_Missing_SemiList[] =
- "|netinet/ip.h|";
+ "netinet/ip.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -3689,7 +3693,7 @@
* File name selection pattern
*/
tSCC zIrix___RestrictList[] =
- "|internal/sgimacros.h|";
+ "internal/sgimacros.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -3729,7 +3733,7 @@
* File name selection pattern
*/
tSCC zIrix___Generic1List[] =
- "|internal/math_core.h|";
+ "internal/math_core.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -3771,7 +3775,7 @@
* File name selection pattern
*/
tSCC zIrix___Generic2List[] =
- "|internal/math_core.h|";
+ "internal/math_core.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -3811,7 +3815,7 @@
* File name selection pattern
*/
tSCC zIrix_Asm_ApostropheList[] =
- "|sys/asm.h|";
+ "sys/asm.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -3847,7 +3851,7 @@
* File name selection pattern
*/
tSCC zIrix_Limits_ConstList[] =
- "|fixinc-test-limits.h|limits.h|";
+ "fixinc-test-limits.h\0limits.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -3882,7 +3886,7 @@
* File name selection pattern
*/
tSCC zIrix_Socklen_TList[] =
- "|sys/socket.h|";
+ "sys/socket.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -3924,7 +3928,7 @@
* File name selection pattern
*/
tSCC zIrix_Stdint_C99List[] =
- "|stdint.h|";
+ "stdint.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -3963,7 +3967,7 @@
* File name selection pattern
*/
tSCC zIrix_Stdio_Va_ListList[] =
- "|stdio.h|internal/stdio_core.h|";
+ "stdio.h\0internal/stdio_core.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -3998,7 +4002,7 @@
* File name selection pattern
*/
tSCC zIrix_WcsftimeList[] =
- "|internal/wchar_core.h|";
+ "internal/wchar_core.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -4037,7 +4041,7 @@
* File name selection pattern
*/
tSCC zIsc_FmodList[] =
- "|math.h|";
+ "math.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -4072,7 +4076,7 @@
* File name selection pattern
*/
tSCC zIsc_Omits_With_StdcList[] =
- "|stdio.h|math.h|ctype.h|sys/limits.h|sys/fcntl.h|sys/dirent.h|";
+ "stdio.h\0math.h\0ctype.h\0sys/limits.h\0sys/fcntl.h\0sys/dirent.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -4107,7 +4111,7 @@
* File name selection pattern
*/
tSCC zKandr_ConcatList[] =
- "|sparc/asm_linkage.h|sun3/asm_linkage.h|sun3x/asm_linkage.h|sun4/asm_linkage.h|sun4c/asm_linkage.h|sun4m/asm_linkage.h|sun4c/debug/asm_linkage.h|sun4m/debug/asm_linkage.h|arm/as_support.h|arm/mc_type.h|arm/xcb.h|dev/chardefmac.h|dev/ps_irq.h|dev/screen.h|dev/scsi.h|sys/tty.h|Xm.acorn/XmP.h|bsd43/bsd43_.h|";
+ "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
*/
@@ -4142,7 +4146,7 @@
* File name selection pattern
*/
tSCC zLibc1_G_Va_ListList[] =
- "|_G_config.h|";
+ "_G_config.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -4179,7 +4183,7 @@
* File name selection pattern
*/
tSCC zLibc1_Ifdefd_MemxList[] =
- "|testing.h|string.h|";
+ "testing.h\0string.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -4227,7 +4231,7 @@
* File name selection pattern
*/
tSCC zLinux_Ia64_UcontextList[] =
- "|sys/ucontext.h|";
+ "sys/ucontext.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -4264,7 +4268,7 @@
* File name selection pattern
*/
tSCC zLynxos_No_Warning_In_Sys_Time_HList[] =
- "|sys/time.h|";
+ "sys/time.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -4299,7 +4303,7 @@
* File name selection pattern
*/
tSCC zLynxos_Missing_PutenvList[] =
- "|stdlib.h|";
+ "stdlib.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -4419,7 +4423,7 @@
* File name selection pattern
*/
tSCC zMath_ExceptionList[] =
- "|math.h|";
+ "math.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -4466,7 +4470,7 @@
* File name selection pattern
*/
tSCC zMath_Huge_Val_From_Dbl_MaxList[] =
- "|math.h|";
+ "math.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -4502,43 +4506,6 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * 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|";
-/*
- * 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[] =
@@ -4548,7 +4515,7 @@
* File name selection pattern
*/
tSCC zNested_Auth_DesList[] =
- "|rpc/rpc.h|";
+ "rpc/rpc.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -4583,7 +4550,7 @@
* File name selection pattern
*/
tSCC zNested_MotorolaList[] =
- "|sys/limits.h|limits.h|";
+ "sys/limits.h\0limits.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -4620,7 +4587,7 @@
* File name selection pattern
*/
tSCC zNested_Sys_LimitsList[] =
- "|sys/limits.h|";
+ "sys/limits.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -4646,6 +4613,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[] =
@@ -4655,7 +4663,7 @@
* File name selection pattern
*/
tSCC zNetbsd_Extra_SemicolonList[] =
- "|sys/cdefs.h|";
+ "sys/cdefs.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -4692,7 +4700,7 @@
* File name selection pattern
*/
tSCC zNext_Math_PrefixList[] =
- "|ansi/math.h|";
+ "ansi/math.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -4728,7 +4736,7 @@
* File name selection pattern
*/
tSCC zNext_TemplateList[] =
- "|bsd/libc.h|";
+ "bsd/libc.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -4764,7 +4772,7 @@
* File name selection pattern
*/
tSCC zNext_VolitileList[] =
- "|ansi/stdlib.h|";
+ "ansi/stdlib.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -4800,7 +4808,7 @@
* File name selection pattern
*/
tSCC zNext_Wait_UnionList[] =
- "|sys/wait.h|";
+ "sys/wait.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -4835,7 +4843,7 @@
* File name selection pattern
*/
tSCC zNodeent_SyntaxList[] =
- "|netdnet/dnetdb.h|";
+ "netdnet/dnetdb.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -4870,7 +4878,7 @@
* File name selection pattern
*/
tSCC zObstack_Lvalue_CastList[] =
- "|obstack.h|";
+ "obstack.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -4905,7 +4913,7 @@
* File name selection pattern
*/
tSCC zOsf_Namespace_AList[] =
- "|reg_types.h|sys/lc_core.h|";
+ "reg_types.h\0sys/lc_core.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -4950,7 +4958,7 @@
* File name selection pattern
*/
tSCC zOsf_Namespace_CList[] =
- "|regex.h|";
+ "regex.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -5004,7 +5012,7 @@
* File name selection pattern
*/
tSCC zPthread_Page_SizeList[] =
- "|pthread.h|";
+ "pthread.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -5039,7 +5047,7 @@
* File name selection pattern
*/
tSCC zPthread_Incomplete_Struct_ArgumentList[] =
- "|pthread.h|";
+ "pthread.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -5075,7 +5083,7 @@
* File name selection pattern
*/
tSCC zRead_Ret_TypeList[] =
- "|stdio.h|";
+ "stdio.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -5112,7 +5120,7 @@
* File name selection pattern
*/
tSCC zRpc_Xdr_Lvalue_Cast_AList[] =
- "|rpc/xdr.h|";
+ "rpc/xdr.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -5148,7 +5156,7 @@
* File name selection pattern
*/
tSCC zRpc_Xdr_Lvalue_Cast_BList[] =
- "|rpc/xdr.h|";
+ "rpc/xdr.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -5184,7 +5192,7 @@
* File name selection pattern
*/
tSCC zRs6000_DoubleList[] =
- "|math.h|";
+ "math.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -5222,7 +5230,7 @@
* File name selection pattern
*/
tSCC zRs6000_FchmodList[] =
- "|sys/stat.h|";
+ "sys/stat.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -5257,7 +5265,7 @@
* File name selection pattern
*/
tSCC zRs6000_ParamList[] =
- "|stdio.h|unistd.h|";
+ "stdio.h\0unistd.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -5292,7 +5300,7 @@
* File name selection pattern
*/
tSCC zSco_MathList[] =
- "|math.h|ansi/math.h|posix/math.h|xpg4/math.h|xpg4v2/math.h|xpg4plus/math.h|ods_30_compat/math.h|oldstyle/math.h|";
+ "math.h\0*/math.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -5346,7 +5354,7 @@
* File name selection pattern
*/
tSCC zSco_RegsetList[] =
- "|sys/regset.h|";
+ "sys/regset.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -5383,7 +5391,7 @@
* File name selection pattern
*/
tSCC zSco_Static_FuncList[] =
- "|sys/stat.h|";
+ "sys/stat.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -5426,7 +5434,7 @@
* File name selection pattern
*/
tSCC zSco_UtimeList[] =
- "|sys/times.h|";
+ "sys/times.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -5463,7 +5471,7 @@
* File name selection pattern
*/
tSCC zSolaris_Math_1List[] =
- "|iso/math_c99.h|";
+ "iso/math_c99.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -5506,7 +5514,7 @@
* File name selection pattern
*/
tSCC zSolaris_Math_2List[] =
- "|iso/math_c99.h|";
+ "iso/math_c99.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -5549,7 +5557,7 @@
* File name selection pattern
*/
tSCC zSolaris_Math_3List[] =
- "|iso/math_c99.h|";
+ "iso/math_c99.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -5592,7 +5600,7 @@
* File name selection pattern
*/
tSCC zSolaris_Math_4List[] =
- "|iso/math_c99.h|";
+ "iso/math_c99.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -5645,7 +5653,7 @@
* File name selection pattern
*/
tSCC zSolaris_Math_5List[] =
- "|iso/math_c99.h|";
+ "iso/math_c99.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -5690,7 +5698,7 @@
* File name selection pattern
*/
tSCC zSolaris_Math_6List[] =
- "|iso/math_c99.h|";
+ "iso/math_c99.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -5735,7 +5743,7 @@
* File name selection pattern
*/
tSCC zSolaris_Math_7List[] =
- "|iso/math_c99.h|";
+ "iso/math_c99.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -5786,7 +5794,7 @@
* File name selection pattern
*/
tSCC zSolaris_Math_8List[] =
- "|iso/math_c99.h|";
+ "iso/math_c99.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -5833,7 +5841,7 @@
* File name selection pattern
*/
tSCC zSolaris_Math_9List[] =
- "|iso/math_c99.h|";
+ "iso/math_c99.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -5876,7 +5884,7 @@
* File name selection pattern
*/
tSCC zSolaris_Mutex_Init_1List[] =
- "|pthread.h|";
+ "pthread.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -5911,7 +5919,7 @@
* File name selection pattern
*/
tSCC zSolaris_Mutex_Init_2List[] =
- "|pthread.h|";
+ "pthread.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -5955,7 +5963,7 @@
* File name selection pattern
*/
tSCC zSolaris_Rwlock_Init_1List[] =
- "|pthread.h|";
+ "pthread.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -5997,7 +6005,7 @@
* File name selection pattern
*/
tSCC zSolaris_Once_Init_1List[] =
- "|pthread.h|";
+ "pthread.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -6035,7 +6043,7 @@
* File name selection pattern
*/
tSCC zSolaris_Once_Init_2List[] =
- "|pthread.h|";
+ "pthread.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -6078,7 +6086,7 @@
* File name selection pattern
*/
tSCC zSolaris_SocketList[] =
- "|sys/socket.h|";
+ "sys/socket.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -6114,7 +6122,7 @@
* File name selection pattern
*/
tSCC zSolaris_Stdio_TagList[] =
- "|stdio_tag.h|";
+ "stdio_tag.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -6155,7 +6163,7 @@
* File name selection pattern
*/
tSCC zSolaris_UnistdList[] =
- "|unistd.h|";
+ "unistd.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -6199,7 +6207,7 @@
* File name selection pattern
*/
tSCC zSolaris_WidecList[] =
- "|widec.h|";
+ "widec.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -6245,7 +6253,7 @@
* File name selection pattern
*/
tSCC zStatsswtchList[] =
- "|rpcsvc/rstat.h|";
+ "rpcsvc/rstat.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -6280,7 +6288,7 @@
* File name selection pattern
*/
tSCC zStdio_Stdarg_HList[] =
- "|stdio.h|";
+ "stdio.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -6318,7 +6326,7 @@
* File name selection pattern
*/
tSCC zStdio_Va_ListList[] =
- "|stdio.h|internal/stdio_core.h|internal/wchar_core.h|";
+ "stdio.h\0internal/stdio_core.h\0internal/wchar_core.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -6367,7 +6375,7 @@
* File name selection pattern
*/
tSCC zStdio_Va_List_ClientsList[] =
- "|com_err.h|cps.h|curses.h|krb5.h|lc_core.h|pfmt.h|wchar.h|curses_colr/curses.h|";
+ "com_err.h\0cps.h\0curses.h\0krb5.h\0lc_core.h\0pfmt.h\0wchar.h\0curses_colr/curses.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -6467,7 +6475,7 @@
* File name selection pattern
*/
tSCC zStrict_Ansi_Not_CtdList[] =
- "|math.h|limits.h|stdio.h|signal.h|stdlib.h|sys/signal.h|time.h|";
+ "math.h\0limits.h\0stdio.h\0signal.h\0stdlib.h\0sys/signal.h\0time.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -6548,7 +6556,7 @@
* File name selection pattern
*/
tSCC zStruct_FileList[] =
- "|rpc/xdr.h|";
+ "rpc/xdr.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -6584,7 +6592,7 @@
* File name selection pattern
*/
tSCC zStruct_SockaddrList[] =
- "|rpc/auth.h|";
+ "rpc/auth.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -6630,7 +6638,7 @@
* File name selection pattern
*/
tSCC zSun_Auth_ProtoList[] =
- "|rpc/auth.h|rpc/clnt.h|rpc/svc.h|rpc/xdr.h|";
+ "rpc/auth.h\0rpc/clnt.h\0rpc/svc.h\0rpc/xdr.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -6677,7 +6685,7 @@
* File name selection pattern
*/
tSCC zSun_Bogus_IfdefList[] =
- "|hsfs/hsfs_spec.h|hsfs/iso_spec.h|";
+ "hsfs/hsfs_spec.h\0hsfs/iso_spec.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -6712,7 +6720,7 @@
* File name selection pattern
*/
tSCC zSun_CatmacroList[] =
- "|pixrect/memvar.h|";
+ "pixrect/memvar.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -6751,7 +6759,7 @@
* File name selection pattern
*/
tSCC zSun_MallocList[] =
- "|malloc.h|";
+ "malloc.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -6789,7 +6797,7 @@
* File name selection pattern
*/
tSCC zSun_Rusers_SemiList[] =
- "|rpcsvc/rusers.h|";
+ "rpcsvc/rusers.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -6823,7 +6831,7 @@
* File name selection pattern
*/
tSCC zSun_SignalList[] =
- "|sys/signal.h|signal.h|";
+ "sys/signal.h\0signal.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -6862,7 +6870,7 @@
* File name selection pattern
*/
tSCC zSunos_StrlenList[] =
- "|strings.h|";
+ "strings.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -6897,7 +6905,7 @@
* File name selection pattern
*/
tSCC zSvr4_Disable_OptList[] =
- "|string.h|";
+ "string.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -6931,7 +6939,7 @@
* File name selection pattern
*/
tSCC zSvr4_GetcwdList[] =
- "|stdlib.h|unistd.h|prototypes.h|";
+ "stdlib.h\0unistd.h\0prototypes.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -6966,7 +6974,7 @@
* File name selection pattern
*/
tSCC zSvr4_KrnlList[] =
- "|fs/rfs/rf_cache.h|sys/erec.h|sys/err.h|sys/char.h|sys/getpages.h|sys/map.h|sys/cmn_err.h|sys/kdebugger.h|";
+ "fs/rfs/rf_cache.h\0sys/erec.h\0sys/err.h\0sys/char.h\0sys/getpages.h\0sys/map.h\0sys/cmn_err.h\0sys/kdebugger.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -7005,7 +7013,7 @@
* File name selection pattern
*/
tSCC zSvr4_ProfilList[] =
- "|stdlib.h|unistd.h|";
+ "stdlib.h\0unistd.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -7047,7 +7055,7 @@
* File name selection pattern
*/
tSCC zSvr4_Sighandler_TypeList[] =
- "|sys/signal.h|";
+ "sys/signal.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -7082,7 +7090,7 @@
* File name selection pattern
*/
tSCC zSvr4_Undeclared_GetrngeList[] =
- "|regexp.h|";
+ "regexp.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -7126,7 +7134,7 @@
* File name selection pattern
*/
tSCC zSysv68_StringList[] =
- "|testing.h|string.h|";
+ "testing.h\0string.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -7170,7 +7178,7 @@
* File name selection pattern
*/
tSCC zSysz_Stdlib_For_SunList[] =
- "|stdlib.h|";
+ "stdlib.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -7212,7 +7220,7 @@
* File name selection pattern
*/
tSCC zThread_KeywordList[] =
- "|pthread.h|bits/sigthread.h|";
+ "pthread.h\0bits/sigthread.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -7247,7 +7255,7 @@
* File name selection pattern
*/
tSCC zTinfo_CplusplusList[] =
- "|tinfo.h|";
+ "tinfo.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -7282,7 +7290,7 @@
* File name selection pattern
*/
tSCC zUltrix_Atexit_ParamList[] =
- "|stdlib.h|";
+ "stdlib.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -7317,7 +7325,7 @@
* File name selection pattern
*/
tSCC zUltrix_Atof_ParamList[] =
- "|math.h|";
+ "math.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -7352,7 +7360,7 @@
* File name selection pattern
*/
tSCC zUltrix_ConstList[] =
- "|stdio.h|";
+ "stdio.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -7388,7 +7396,7 @@
* File name selection pattern
*/
tSCC zUltrix_Const2List[] =
- "|stdio.h|";
+ "stdio.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -7424,7 +7432,7 @@
* File name selection pattern
*/
tSCC zUltrix_Const3List[] =
- "|stdio.h|";
+ "stdio.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -7460,7 +7468,7 @@
* File name selection pattern
*/
tSCC zUltrix_Fix_FixprotoList[] =
- "|sys/utsname.h|";
+ "sys/utsname.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -7497,7 +7505,7 @@
* File name selection pattern
*/
tSCC zUltrix_IfdefList[] =
- "|sys/file.h|";
+ "sys/file.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -7532,7 +7540,7 @@
* File name selection pattern
*/
tSCC zUltrix_LocaleList[] =
- "|locale.h|";
+ "locale.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -7566,7 +7574,7 @@
* File name selection pattern
*/
tSCC zUltrix_Math_IfdefList[] =
- "|sys/limits.h|float.h|math.h|";
+ "sys/limits.h\0float.h\0math.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -7601,7 +7609,7 @@
* File name selection pattern
*/
tSCC zUltrix_Nested_IoctlList[] =
- "|sys/ioctl.h|";
+ "sys/ioctl.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -7635,7 +7643,7 @@
* File name selection pattern
*/
tSCC zUltrix_Nested_SvcList[] =
- "|rpc/svc.h|";
+ "rpc/svc.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -7669,7 +7677,7 @@
* File name selection pattern
*/
tSCC zUltrix_StatList[] =
- "|sys/stat.h|";
+ "sys/stat.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -7708,7 +7716,7 @@
* File name selection pattern
*/
tSCC zUltrix_StaticList[] =
- "|machine/cpu.h|";
+ "machine/cpu.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -7744,7 +7752,7 @@
* File name selection pattern
*/
tSCC zUltrix_StdlibList[] =
- "|stdlib.h|";
+ "stdlib.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -7785,7 +7793,7 @@
* File name selection pattern
*/
tSCC zUltrix_StringsList[] =
- "|strings.h|";
+ "strings.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -7819,7 +7827,7 @@
* File name selection pattern
*/
tSCC zUltrix_Strings2List[] =
- "|strings.h|";
+ "strings.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -7861,7 +7869,7 @@
* File name selection pattern
*/
tSCC zUltrix_Sys_TimeList[] =
- "|sys/time.h|";
+ "sys/time.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -7915,7 +7923,7 @@
* File name selection pattern
*/
tSCC zUltrix_UnistdList[] =
- "|unistd.h|";
+ "unistd.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -7952,7 +7960,7 @@
* File name selection pattern
*/
tSCC zUnicosmk_RestrictList[] =
- "|stdio.h|stdlib.h|wchar.h|";
+ "stdio.h\0stdlib.h\0wchar.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -7989,7 +7997,7 @@
* File name selection pattern
*/
tSCC zUw7_Byteorder_FixList[] =
- "|arpa/inet.h|";
+ "arpa/inet.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -8039,7 +8047,7 @@
* File name selection pattern
*/
tSCC zVa_I960_MacroList[] =
- "|arch/i960/archI960.h|";
+ "arch/i960/archI960.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -8074,7 +8082,7 @@
* File name selection pattern
*/
tSCC zVoid_NullList[] =
- "|curses.h|dbm.h|locale.h|stdio.h|stdlib.h|string.h|time.h|unistd.h|sys/dir.h|sys/param.h|sys/types.h|";
+ "curses.h\0dbm.h\0locale.h\0stdio.h\0stdlib.h\0string.h\0time.h\0unistd.h\0sys/dir.h\0sys/param.h\0sys/types.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -8116,7 +8124,7 @@
* File name selection pattern
*/
tSCC zVxworks_Gcc_ProblemList[] =
- "|types/vxTypesBase.h|";
+ "types/vxTypesBase.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -8165,7 +8173,7 @@
* File name selection pattern
*/
tSCC zVxworks_Needs_VxtypesList[] =
- "|time.h|";
+ "time.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -8200,7 +8208,7 @@
* File name selection pattern
*/
tSCC zVxworks_Needs_VxworksList[] =
- "|sys/stat.h|";
+ "sys/stat.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -8248,7 +8256,7 @@
* File name selection pattern
*/
tSCC zVxworks_TimeList[] =
- "|time.h|";
+ "time.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -8298,7 +8306,7 @@
* File name selection pattern
*/
tSCC zWindiss_Math1List[] =
- "|math.h|";
+ "math.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -8326,7 +8334,7 @@
* File name selection pattern
*/
tSCC zWindiss_Math2List[] =
- "|math.h|";
+ "math.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -8389,7 +8397,7 @@
* File name selection pattern
*/
tSCC zX11_ClassList[] =
- "|X11/ShellP.h|";
+ "X11/ShellP.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -8435,7 +8443,7 @@
* File name selection pattern
*/
tSCC zX11_Class_UsageList[] =
- "|Xm/BaseClassI.h|";
+ "Xm/BaseClassI.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -8477,7 +8485,7 @@
* File name selection pattern
*/
tSCC zX11_NewList[] =
- "|Xm/Traversal.h|";
+ "Xm/Traversal.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -8517,7 +8525,7 @@
* File name selection pattern
*/
tSCC zX11_SprintfList[] =
- "|X11/Xmu.h|X11/Xmu/Xmu.h|";
+ "X11/Xmu.h\0X11/Xmu/Xmu.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -8548,7 +8556,7 @@
*
* List of all fixes
*/
-#define REGEX_COUNT 252
+#define REGEX_COUNT 255
#define MACH_LIST_SIZE_LIMIT 261
#define FIX_COUNT 210
@@ -8558,7 +8566,6 @@
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,
@@ -8600,23 +8607,24 @@
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,
@@ -8664,10 +8672,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,
@@ -8779,11 +8787,6 @@
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,
@@ -8989,31 +8992,11 @@
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,
@@ -9044,6 +9027,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,
@@ -9074,6 +9077,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,
@@ -9309,11 +9317,6 @@
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,
@@ -9329,6 +9332,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,
Modified: llvm-gcc-4.2/trunk/fixincludes/inclhack.def
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/fixincludes/inclhack.def?rev=61519&r1=61518&r2=61519&view=diff
==============================================================================
(empty)
Modified: llvm-gcc-4.2/trunk/fixincludes/mkfixinc.sh
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/fixincludes/mkfixinc.sh?rev=61519&r1=61518&r2=61519&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/fixincludes/mkfixinc.sh (original)
+++ llvm-gcc-4.2/trunk/fixincludes/mkfixinc.sh Wed Dec 31 04:07:04 2008
@@ -23,6 +23,7 @@
i?86-*-mingw32* | \
i?86-*-uwin* | \
i?86-*-interix* | \
+ *-*-vxworks* | \
powerpc-*-eabiaix* | \
powerpc-*-eabisim* | \
powerpc-*-eabi* | \
Modified: llvm-gcc-4.2/trunk/fixincludes/mkheaders.in
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/fixincludes/mkheaders.in?rev=61519&r1=61518&r2=61519&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/fixincludes/mkheaders.in (original)
+++ llvm-gcc-4.2/trunk/fixincludes/mkheaders.in Wed Dec 31 04:07:04 2008
@@ -77,30 +77,34 @@
itoolsdir=${libexecsubdir}/install-tools
itoolsdatadir=${libsubdir}/install-tools
-incdir=${libsubdir}/include
-
-. ${itoolsdatadir}/mkheaders.conf
+incdir=${libsubdir}/include-fixed
+mkinstalldirs="@SHELL@ ${itoolsdir}/mkinstalldirs"
cd ${itoolsdir}
rm -rf ${incdir}/*
-if [ x${STMP_FIXINC} != x ] ; then
+for ml in `cat ${itoolsdatadir}/fixinc_list`; do
+ sysroot_headers_suffix=`echo ${ml} | sed -e 's/;.*$//'`
+ multi_dir=`echo ${ml} | sed -e 's/^[^;]*;//'`
+ subincdir=${incdir}${multi_dir}
+ . ${itoolsdatadir}/mkheaders.conf
+ if [ x${STMP_FIXINC} != x ] ; then
TARGET_MACHINE="${target}" target_canonical="${target}" \
MACRO_LIST="${itoolsdatadir}/macro_list" \
- @SHELL@ ./fixinc.sh ${incdir} \
+ @SHELL@ ./fixinc.sh ${subincdir} \
${isysroot}${SYSTEM_HEADER_DIR} ${OTHER_FIXINCLUDES_DIRS}
- rm -f ${incdir}/syslimits.h
- if [ -f ${incdir}/limits.h ]; then
- mv ${incdir}/limits.h ${incdir}/syslimits.h
+ rm -f ${subincdir}/syslimits.h
+ if [ -f ${subincdir}/limits.h ]; then
+ mv ${subincdir}/limits.h ${subincdir}/syslimits.h
else
- cp ${itoolsdatadir}/gsyslimits.h ${incdir}/syslimits.h
+ cp ${itoolsdatadir}/gsyslimits.h ${subincdir}/syslimits.h
fi
-fi
+ fi
-cp ${itoolsdatadir}/include/* ${incdir}
+ cp ${itoolsdatadir}/include${multi_dir}/limits.h ${subincdir}
-if [ x${STMP_FIXPROTO} != x ] ; then
- mkinstalldirs="@SHELL@ ${itoolsdir}/mkinstalldirs"
- export FIXPROTO_DEFINES mkinstalldirs
- @SHELL@ fixproto ${incdir} ${incdir} ${isysroot}${SYSTEM_HEADER_DIR} || exit 1
-fi
+ if [ x${STMP_FIXPROTO} != x ] ; then
+ export FIXPROTO_DEFINES mkinstalldirs
+ @SHELL@ fixproto ${subincdir} ${subincdir} ${isysroot}${SYSTEM_HEADER_DIR} || exit 1
+ fi
+done
Added: llvm-gcc-4.2/trunk/fixincludes/tests/base/bits/string2.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/fixincludes/tests/base/bits/string2.h?rev=61519&view=auto
==============================================================================
--- llvm-gcc-4.2/trunk/fixincludes/tests/base/bits/string2.h (added)
+++ llvm-gcc-4.2/trunk/fixincludes/tests/base/bits/string2.h Wed Dec 31 04:07:04 2008
@@ -0,0 +1,18 @@
+/* DO NOT EDIT THIS FILE.
+
+ It has been auto-edited by fixincludes from:
+
+ "fixinc/tests/inc/bits/string2.h"
+
+ This had to be done to correct non-standard usages in the
+ original, manufacturer supplied header file. */
+
+
+
+#if defined( GLIBC_C99_INLINE_3_CHECK )
+# if defined(__cplusplus) || defined(__GNUC_STDC_INLINE__)
+# define __STRING_INLINE inline
+# else
+# define __STRING_INLINE extern __inline
+# endif
+#endif /* GLIBC_C99_INLINE_3_CHECK */
Removed: llvm-gcc-4.2/trunk/fixincludes/tests/base/mach-o/swap.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/fixincludes/tests/base/mach-o/swap.h?rev=61518&view=auto
==============================================================================
--- llvm-gcc-4.2/trunk/fixincludes/tests/base/mach-o/swap.h (original)
+++ llvm-gcc-4.2/trunk/fixincludes/tests/base/mach-o/swap.h (removed)
@@ -1,26 +0,0 @@
-/* DO NOT EDIT THIS FILE. APPLE LOCAL file
-
- It has been auto-edited by fixincludes from:
-
- "fixinc/tests/inc/mach-o/swap.h"
-
- This had to be done to correct non-standard usages in the
- original, manufacturer supplied header file. */
-
-#ifndef FIXINC_WRAP_MACH_O_SWAP_H_DARWIN_MACHO_SWAPH_EXTERNC
-#define FIXINC_WRAP_MACH_O_SWAP_H_DARWIN_MACHO_SWAPH_EXTERNC 1
-
-#if __cplusplus
-extern "C" {
-#endif
-
-
-#if defined( DARWIN_MACHO_SWAPH_EXTERNC_CHECK )
-extern void swap_fat_header();
-
-#endif /* DARWIN_MACHO_SWAPH_EXTERNC_CHECK */
-#if __cplusplus
-}
-#endif
-
-#endif /* FIXINC_WRAP_MACH_O_SWAP_H_DARWIN_MACHO_SWAPH_EXTERNC */
Modified: llvm-gcc-4.2/trunk/fixincludes/tests/base/math.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/fixincludes/tests/base/math.h?rev=61519&r1=61518&r2=61519&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/fixincludes/tests/base/math.h (original)
+++ llvm-gcc-4.2/trunk/fixincludes/tests/base/math.h Wed Dec 31 04:07:04 2008
@@ -48,6 +48,22 @@
#endif /* HPUX11_CPP_POW_INLINE_CHECK */
+#if defined( HPPA_HPUX_FP_MACROS_CHECK )
+#endif /* _INCLUDE_HPUX_SOURCE */
+
+#if defined(_INCLUDE_HPUX_SOURCE) || (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L))
+# define FP_NORMAL 0
+# define FP_ZERO 1
+# define FP_INFINITE 2
+# define FP_SUBNORMAL 3
+# define FP_NAN 4
+#endif
+
+#ifdef _INCLUDE_HPUX_SOURCE
+
+#endif /* HPPA_HPUX_FP_MACROS_CHECK */
+
+
#if defined( HPUX11_FABSF_CHECK )
#ifdef _PA_RISC
#ifndef __cplusplus
Added: llvm-gcc-4.2/trunk/fixincludes/tests/base/signal.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/fixincludes/tests/base/signal.h?rev=61519&view=auto
==============================================================================
--- llvm-gcc-4.2/trunk/fixincludes/tests/base/signal.h (added)
+++ llvm-gcc-4.2/trunk/fixincludes/tests/base/signal.h Wed Dec 31 04:07:04 2008
@@ -0,0 +1,20 @@
+/* DO NOT EDIT THIS FILE.
+
+ It has been auto-edited by fixincludes from:
+
+ "fixinc/tests/inc/signal.h"
+
+ This had to be done to correct non-standard usages in the
+ original, manufacturer supplied header file. */
+
+
+
+#if defined( NETBSD_C99_INLINE_1_CHECK )
+extern
+#ifdef __GNUC_STDC_INLINE__
+__attribute__((__gnu_inline__))
+#endif
+__inline int
+sigaddset(sigset_t *set, int signo)
+{}
+#endif /* NETBSD_C99_INLINE_1_CHECK */
Modified: llvm-gcc-4.2/trunk/fixincludes/tests/base/sys/stat.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/fixincludes/tests/base/sys/stat.h?rev=61519&r1=61518&r2=61519&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/fixincludes/tests/base/sys/stat.h (original)
+++ llvm-gcc-4.2/trunk/fixincludes/tests/base/sys/stat.h Wed Dec 31 04:07:04 2008
@@ -14,6 +14,20 @@
#endif /* ALPHA___EXTERN_PREFIX_SYS_STAT_CHECK */
+#if defined( GLIBC_C99_INLINE_2_CHECK )
+#ifdef __GNUC_GNU_INLINE__
+extern
+#endif
+__inline__ int fstat64 (int __fd, struct stat64 *__buf) __THROW __nonnull ((2));
+#ifdef __GNUC_GNU_INLINE__
+extern
+#endif
+__inline__ int
+__NTH (fstat64 (int __fd, struct stat64 *__statbuf))
+{}
+#endif /* GLIBC_C99_INLINE_2_CHECK */
+
+
#if defined( RS6000_FCHMOD_CHECK )
extern int fchmod(int, mode_t);
#endif /* RS6000_FCHMOD_CHECK */
Added: llvm-gcc-4.2/trunk/fixincludes/tests/base/sys/sysmacros.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/fixincludes/tests/base/sys/sysmacros.h?rev=61519&view=auto
==============================================================================
--- llvm-gcc-4.2/trunk/fixincludes/tests/base/sys/sysmacros.h (added)
+++ llvm-gcc-4.2/trunk/fixincludes/tests/base/sys/sysmacros.h Wed Dec 31 04:07:04 2008
@@ -0,0 +1,24 @@
+/* DO NOT EDIT THIS FILE.
+
+ It has been auto-edited by fixincludes from:
+
+ "fixinc/tests/inc/sys/sysmacros.h"
+
+ This had to be done to correct non-standard usages in the
+ original, manufacturer supplied header file. */
+
+
+
+#if defined( GLIBC_C99_INLINE_4_CHECK )
+__extension__
+#ifdef __GNUC_GNU_INLINE__
+extern
+#endif
+__inline unsigned int
+__extension__ __extern_inline unsigned int
+
+#ifdef __GNUC_GNU_INLINE__
+extern
+#endif
+__inline unsigned int
+#endif /* GLIBC_C99_INLINE_4_CHECK */
More information about the llvm-commits
mailing list