diff options
| author | Richard Henderson <rth@redhat.com> | 2002-04-01 17:44:51 -0800 |
|---|---|---|
| committer | Richard Henderson <rth@gcc.gnu.org> | 2002-04-01 17:44:51 -0800 |
| commit | b88a94c6034309e1ac64fc4c71db44f5dc474b18 (patch) | |
| tree | e638724db8708acd22c6361987c03e27e062ed66 /gcc/fixinc | |
| parent | 9b14a23707c6df419d96a696c572a343c0431b19 (diff) | |
| download | gcc-b88a94c6034309e1ac64fc4c71db44f5dc474b18.zip gcc-b88a94c6034309e1ac64fc4c71db44f5dc474b18.tar.gz gcc-b88a94c6034309e1ac64fc4c71db44f5dc474b18.tar.bz2 | |
inclhack.def (solaris_sys_varargs_h): New.
* fixinc/inclhack.def (solaris_sys_varargs_h): New.
* fixinc/fixincl.x: Rebuild.
From-SVN: r51729
Diffstat (limited to 'gcc/fixinc')
| -rw-r--r-- | gcc/fixinc/fixincl.x | 42 | ||||
| -rw-r--r-- | gcc/fixinc/inclhack.def | 16 |
2 files changed, 56 insertions, 2 deletions
diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index a128a39..18e5d6b 100644 --- a/gcc/fixinc/fixincl.x +++ b/gcc/fixinc/fixincl.x @@ -5,7 +5,7 @@ * files which are fixed to work correctly with ANSI C and placed in a * directory that GNU C will search. * - * This file contains 140 fixup descriptions. + * This file contains 141 fixup descriptions. * * See README for more information. * @@ -3696,6 +3696,38 @@ static const char* apzSolaris_Stdio_TagPatch[] = { "sed", /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Solaris_Sys_Varargs_H fix + */ +tSCC zSolaris_Sys_Varargs_HName[] = + "solaris_sys_varargs_h"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Sys_Varargs_HList[] = + "|sys/varargs.h|"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzSolaris_Sys_Varargs_HMachs[] = { + "*-*-solaris*", + (const char*)NULL }; +#define SOLARIS_SYS_VARARGS_H_TEST_CT 0 +#define aSolaris_Sys_Varargs_HTests (tTestDesc*)NULL + +/* + * Fix Command Arguments for Solaris_Sys_Varargs_H + */ +static const char* apzSolaris_Sys_Varargs_HPatch[] = { +"#ifdef __STDC__\n\ +#include <stdarg.h>\n\ +#else\n\ +#include <varargs.h>\n\ +#endif\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Statsswtch fix */ tSCC zStatsswtchName[] = @@ -5506,7 +5538,7 @@ static const char* apzX11_SprintfPatch[] = { */ #define REGEX_COUNT 149 #define MACH_LIST_SIZE_LIMIT 279 -#define FIX_COUNT 140 +#define FIX_COUNT 141 /* * Enumerate the fixes @@ -5605,6 +5637,7 @@ typedef enum { SCO_UTIME_FIXIDX, SOLARIS_MUTEX_INIT_FIXIDX, SOLARIS_STDIO_TAG_FIXIDX, + SOLARIS_SYS_VARARGS_H_FIXIDX, STATSSWTCH_FIXIDX, STDIO_STDARG_H_FIXIDX, STDIO_VA_LIST_FIXIDX, @@ -6120,6 +6153,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { SOLARIS_STDIO_TAG_TEST_CT, FD_MACH_ONLY, aSolaris_Stdio_TagTests, apzSolaris_Stdio_TagPatch, 0 }, + { zSolaris_Sys_Varargs_HName, zSolaris_Sys_Varargs_HList, + apzSolaris_Sys_Varargs_HMachs, + SOLARIS_SYS_VARARGS_H_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, + aSolaris_Sys_Varargs_HTests, apzSolaris_Sys_Varargs_HPatch, 0 }, + { zStatsswtchName, zStatsswtchList, apzStatsswtchMachs, STATSSWTCH_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index 6faca9a..011929c 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -2077,6 +2077,22 @@ fix = { /* + * Solaris <sys/varargs.h> is a DDK (aka kernel-land) header providing + * the same interface as <stdarg.h>. No idea why they couldn't have just + * used the standard header. + */ +fix = { + hackname = solaris_sys_varargs_h; + files = "sys/varargs.h"; + mach = '*-*-solaris*'; + replace = "#ifdef __STDC__\n" + "#include <stdarg.h>\n" + "#else\n" + "#include <varargs.h>\n" + "#endif\n"; +}; + +/* * Sony NEWSOS 5.0 does not support the complete ANSI C standard. */ #ifdef SONY |