From eadc0202ff6468fb6927a160f7537503bfa73854 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Tue, 2 Apr 2002 10:32:10 -0800 Subject: [PATCH] inclhack.def (AAB_solaris_sys_varargs_h): Move and rename solaris_sys_varargs_h. * fixinc/inclhack.def (AAB_solaris_sys_varargs_h): Move and rename solaris_sys_varargs_h. From-SVN: r51759 --- gcc/ChangeLog | 5 +++ gcc/fixinc/fixincl.x | 76 ++++++++++++++++++++--------------------- gcc/fixinc/inclhack.def | 34 +++++++++--------- 3 files changed, 60 insertions(+), 55 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3cb11a0e535..b40448e0345 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2002-04-02 Richard Henderson + + * fixinc/inclhack.def (AAB_solaris_sys_varargs_h): Move and + rename solaris_sys_varargs_h. + Tue Apr 2 06:47:40 2002 Richard Kenner * stor-layout.c (layout_type, case ARRAY_TYPE): Give one-element array diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index 18e5d6b564c..8dd8629ef39 100644 --- a/gcc/fixinc/fixincl.x +++ b/gcc/fixinc/fixincl.x @@ -295,6 +295,38 @@ extern int memcmp();\n\n\ #endif /* __memory_h__ */\n", (char*)NULL }; +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aab_Solaris_Sys_Varargs_H fix + */ +tSCC zAab_Solaris_Sys_Varargs_HName[] = + "AAB_solaris_sys_varargs_h"; + +/* + * File name selection pattern + */ +tSCC zAab_Solaris_Sys_Varargs_HList[] = + "|sys/varargs.h|"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAab_Solaris_Sys_Varargs_HMachs[] = { + "*-*-solaris*", + (const char*)NULL }; +#define AAB_SOLARIS_SYS_VARARGS_H_TEST_CT 0 +#define aAab_Solaris_Sys_Varargs_HTests (tTestDesc*)NULL + +/* + * Fix Command Arguments for Aab_Solaris_Sys_Varargs_H + */ +static const char* apzAab_Solaris_Sys_Varargs_HPatch[] = { +"#ifdef __STDC__\n\ +#include \n\ +#else\n\ +#include \n\ +#endif\n", + (char*)NULL }; + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * Description of Aab_Svr4_Replace_Byteorder fix @@ -3694,38 +3726,6 @@ static const char* apzSolaris_Stdio_TagPatch[] = { "sed", "-e", "s/defined(__cplusplus) && (__cplusplus < 54321L)/0/", (char*)NULL }; -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * 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 \n\ -#else\n\ -#include \n\ -#endif\n", - (char*)NULL }; - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * Description of Statsswtch fix @@ -5549,6 +5549,7 @@ typedef enum { AAB_FD_ZERO_GNU_TYPES_H_FIXIDX, AAB_FD_ZERO_SELECTBITS_H_FIXIDX, AAB_SUN_MEMCPY_FIXIDX, + AAB_SOLARIS_SYS_VARARGS_H_FIXIDX, AAB_SVR4_REPLACE_BYTEORDER_FIXIDX, AAB_ULTRIX_ANSI_COMPAT_FIXIDX, AAB_ULTRIX_LIMITS_FIXIDX, @@ -5637,7 +5638,6 @@ 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, @@ -5713,6 +5713,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { AAB_SUN_MEMCPY_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, aAab_Sun_MemcpyTests, apzAab_Sun_MemcpyPatch, 0 }, + { zAab_Solaris_Sys_Varargs_HName, zAab_Solaris_Sys_Varargs_HList, + apzAab_Solaris_Sys_Varargs_HMachs, + AAB_SOLARIS_SYS_VARARGS_H_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, + aAab_Solaris_Sys_Varargs_HTests, apzAab_Solaris_Sys_Varargs_HPatch, 0 }, + { zAab_Svr4_Replace_ByteorderName, zAab_Svr4_Replace_ByteorderList, apzAab_Svr4_Replace_ByteorderMachs, AAB_SVR4_REPLACE_BYTEORDER_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, @@ -6153,11 +6158,6 @@ 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 011929cb391..1e82ee8e229 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -259,6 +259,23 @@ extern int memcmp(); }; +/* + * Solaris is a DDK (aka kernel-land) header providing + * the same interface as . No idea why they couldn't have just + * used the standard header. + */ +fix = { + hackname = AAB_solaris_sys_varargs_h; + files = "sys/varargs.h"; + mach = '*-*-solaris*'; + replace = "#ifdef __STDC__\n" + "#include \n" + "#else\n" + "#include \n" + "#endif\n"; +}; + + /* * Completely replace with a file that includes gcc's * stdarg.h or varargs.h files as appropriate. @@ -2075,23 +2092,6 @@ fix = { test_text = '#if\tdefined(__cplusplus) && (__cplusplus < 54321L)'; }; - -/* - * Solaris is a DDK (aka kernel-land) header providing - * the same interface as . 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 \n" - "#else\n" - "#include \n" - "#endif\n"; -}; - /* * Sony NEWSOS 5.0 does not support the complete ANSI C standard. */