diff options
Diffstat (limited to 'gcc/fixinc/fixincl.x')
| -rw-r--r-- | gcc/fixinc/fixincl.x | 1063 |
1 files changed, 962 insertions, 101 deletions
diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index 09fad0267a6..c9cbf3acbda 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 148 fixup descriptions. + * This file contains 166 fixup descriptions. * * See README for more information. * @@ -345,10 +345,12 @@ tSCC zAab_Svr4_Replace_ByteorderList[] = tSCC* apzAab_Svr4_Replace_ByteorderMachs[] = { "*-*-sysv4*", "i[34567]86-*-sysv5*", + "i[34567]86-*-sco3.2v5*", "i[34567]86-*-udk*", "i[34567]86-*-solaris2.[0-4]", "powerpcle-*-solaris2.[0-4]", "sparc-*-solaris2.[0-4]", + "i[34567]86-sequent-ptx*", (const char*)NULL }; #define AAB_SVR4_REPLACE_BYTEORDER_TEST_CT 0 #define aAab_Svr4_Replace_ByteorderTests (tTestDesc*)NULL @@ -393,9 +395,7 @@ static __inline__ unsigned long\n\ htonl (unsigned long __arg)\n\ {\n\ register unsigned long __result;\n\n\ - __asm__ (\"xchg%B0 %b0,%h0\n\ -\tror%L0 $16,%0\n\ -\txchg%B0 %b0,%h0\" : \"=q\" (__result) : \"0\" (__arg));\n\ + __asm__ (\"xchg%B0 %b0,%h0 ; ror%L0 $16,%0 ; xchg%B0 %b0,%h0\" : \"=q\" (__result) : \"0\" (__arg));\n\ return __result;\n\ }\n\n\ /* Convert a host short to a network short. */\n\n\ @@ -776,6 +776,43 @@ static const char* apzAlpha___AssertPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Alpha___Extern_Prefix fix + */ +tSCC zAlpha___Extern_PrefixName[] = + "alpha___extern_prefix"; + +/* + * File name selection pattern + */ +tSCC zAlpha___Extern_PrefixList[] = + "|sys/stat.h|"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAlpha___Extern_PrefixMachs[] = { + "alpha*-dec-osf5*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAlpha___Extern_PrefixSelect0[] = + "#[ \t]*if[ \t]*defined\\(__DECC\\)"; + +#define ALPHA___EXTERN_PREFIX_TEST_CT 1 +static tTestDesc aAlpha___Extern_PrefixTests[] = { + { TT_EGREP, zAlpha___Extern_PrefixSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Alpha___Extern_Prefix + */ +static const char* apzAlpha___Extern_PrefixPatch[] = { + "format", + "%0 || defined(__PRAGMA_EXTERN_PREFIX)", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Alpha_Assert fix */ tSCC zAlpha_AssertName[] = @@ -881,6 +918,46 @@ static const char* apzAlpha_ParensPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Alpha_Pthread_Gcc fix + */ +tSCC zAlpha_Pthread_GccName[] = + "alpha_pthread_gcc"; + +/* + * File name selection pattern + */ +tSCC zAlpha_Pthread_GccList[] = + "|pthread.h|"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAlpha_Pthread_GccMachs[] = { + "alpha*-dec-osf*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAlpha_Pthread_GccSelect0[] = + "#else\n\ +# error <pthread.h>: unrecognized compiler."; + +#define ALPHA_PTHREAD_GCC_TEST_CT 1 +static tTestDesc aAlpha_Pthread_GccTests[] = { + { TT_EGREP, zAlpha_Pthread_GccSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Alpha_Pthread_Gcc + */ +static const char* apzAlpha_Pthread_GccPatch[] = { + "format", + "#elif defined (__GNUC__)\n\ +# define _PTHREAD_ENV_GCC\n\ +%0", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Alpha_Sbrk fix */ tSCC zAlpha_SbrkName[] = @@ -1131,8 +1208,21 @@ tSCC zAvoid_Wchar_T_TypeName[] = tSCC zAvoid_Wchar_T_TypeSelect0[] = "^[ \t]*typedef[ \t].*[ \t]wchar_t[ \t]*;"; -#define AVOID_WCHAR_T_TYPE_TEST_CT 1 +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zAvoid_Wchar_T_TypeBypass0[] = + "we must use the C\\+\\+ compiler's type"; +tSCC zAvoid_Wchar_T_TypeBypass1[] = + "_LINUX_NLS_H"; +tSCC zAvoid_Wchar_T_TypeBypass2[] = + "XFree86: xc/lib/X11/Xlib\\.h"; + +#define AVOID_WCHAR_T_TYPE_TEST_CT 4 static tTestDesc aAvoid_Wchar_T_TypeTests[] = { + { TT_NEGREP, zAvoid_Wchar_T_TypeBypass0, (regex_t*)NULL }, + { TT_NEGREP, zAvoid_Wchar_T_TypeBypass1, (regex_t*)NULL }, + { TT_NEGREP, zAvoid_Wchar_T_TypeBypass2, (regex_t*)NULL }, { TT_EGREP, zAvoid_Wchar_T_TypeSelect0, (regex_t*)NULL }, }; /* @@ -1868,46 +1958,118 @@ static const char* apzHpux11_Cpp_Pow_InlinePatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux11_Fabsf fix + * Description of Hpux10_Ctype_Declarations1 fix */ -tSCC zHpux11_FabsfName[] = - "hpux11_fabsf"; +tSCC zHpux10_Ctype_Declarations1Name[] = + "hpux10_ctype_declarations1"; /* * File name selection pattern */ -tSCC zHpux11_FabsfList[] = - "|math.h|"; +tSCC zHpux10_Ctype_Declarations1List[] = + "|ctype.h|"; /* * Machine/OS name selection pattern */ -#define apzHpux11_FabsfMachs (const char**)NULL +#define apzHpux10_Ctype_Declarations1Machs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zHpux11_FabsfSelect0[] = - "^[ \t]*#[ \t]*define[ \t]+fabsf\\(.*"; +tSCC zHpux10_Ctype_Declarations1Select0[] = + "^#[ \t]*define _toupper\\(__c\\)[ \t]*__toupper\\(__c\\)"; /* * content bypass pattern - skip fix if pattern found */ -tSCC zHpux11_FabsfBypass0[] = - "__cplusplus"; +tSCC zHpux10_Ctype_Declarations1Bypass0[] = + "^[ \t]*extern[ \t]*int[ \t]*__tolower[ \t]*\\("; -#define HPUX11_FABSF_TEST_CT 2 -static tTestDesc aHpux11_FabsfTests[] = { - { TT_NEGREP, zHpux11_FabsfBypass0, (regex_t*)NULL }, - { TT_EGREP, zHpux11_FabsfSelect0, (regex_t*)NULL }, }; +#define HPUX10_CTYPE_DECLARATIONS1_TEST_CT 2 +static tTestDesc aHpux10_Ctype_Declarations1Tests[] = { + { TT_NEGREP, zHpux10_Ctype_Declarations1Bypass0, (regex_t*)NULL }, + { TT_EGREP, zHpux10_Ctype_Declarations1Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Hpux11_Fabsf + * Fix Command Arguments for Hpux10_Ctype_Declarations1 */ -static const char* apzHpux11_FabsfPatch[] = { +static const char* apzHpux10_Ctype_Declarations1Patch[] = { "format", - "#ifndef __cplusplus\n\ -%0\n\ -#endif", + "#ifdef _PROTOTYPES\n\ +extern int __tolower(int);\n\ +extern int __toupper(int);\n\ +#else /* NOT _PROTOTYPES */\n\ +extern int __tolower();\n\ +extern int __toupper();\n\ +#endif /* _PROTOTYPES */\n\n\ +%0\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Hpux10_Ctype_Declarations2 fix + */ +tSCC zHpux10_Ctype_Declarations2Name[] = + "hpux10_ctype_declarations2"; + +/* + * File name selection pattern + */ +tSCC zHpux10_Ctype_Declarations2List[] = + "|ctype.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzHpux10_Ctype_Declarations2Machs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux10_Ctype_Declarations2Select0[] = + "^# if defined\\(_SB_CTYPE_MACROS\\) && \\!defined\\(__lint\\)"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zHpux10_Ctype_Declarations2Bypass0[] = + "^[ \t]*extern[ \t]*int[ \t]*_isalnum[ \t]*\\("; + +#define HPUX10_CTYPE_DECLARATIONS2_TEST_CT 2 +static tTestDesc aHpux10_Ctype_Declarations2Tests[] = { + { TT_NEGREP, zHpux10_Ctype_Declarations2Bypass0, (regex_t*)NULL }, + { TT_EGREP, zHpux10_Ctype_Declarations2Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux10_Ctype_Declarations2 + */ +static const char* apzHpux10_Ctype_Declarations2Patch[] = { + "format", + "%0\n\n\ +#ifdef _PROTOTYPES\n\ + extern int _isalnum(int);\n\ + extern int _isalpha(int);\n\ + extern int _iscntrl(int);\n\ + extern int _isdigit(int);\n\ + extern int _isgraph(int);\n\ + extern int _islower(int);\n\ + extern int _isprint(int);\n\ + extern int _ispunct(int);\n\ + extern int _isspace(int);\n\ + extern int _isupper(int);\n\ + extern int _isxdigit(int);\n\ +# else /* not _PROTOTYPES */\n\ + extern int _isalnum();\n\ + extern int _isalpha();\n\ + extern int _iscntrl();\n\ + extern int _isdigit();\n\ + extern int _isgraph();\n\ + extern int _islower();\n\ + extern int _isprint();\n\ + extern int _ispunct();\n\ + extern int _isspace();\n\ + extern int _isupper();\n\ + extern int _isxdigit();\n\ +#endif /* _PROTOTYPES */\n", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -1949,6 +2111,50 @@ static const char* apzHpux11_AbsPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Hpux11_Fabsf fix + */ +tSCC zHpux11_FabsfName[] = + "hpux11_fabsf"; + +/* + * File name selection pattern + */ +tSCC zHpux11_FabsfList[] = + "|math.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzHpux11_FabsfMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux11_FabsfSelect0[] = + "^[ \t]*#[ \t]*define[ \t]+fabsf\\(.*"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zHpux11_FabsfBypass0[] = + "__cplusplus"; + +#define HPUX11_FABSF_TEST_CT 2 +static tTestDesc aHpux11_FabsfTests[] = { + { TT_NEGREP, zHpux11_FabsfBypass0, (regex_t*)NULL }, + { TT_EGREP, zHpux11_FabsfSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux11_Fabsf + */ +static const char* apzHpux11_FabsfPatch[] = { + "format", + "#ifndef __cplusplus\n\ +%0\n\ +#endif", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Hpux11_Size_T fix */ tSCC zHpux11_Size_TName[] = @@ -2055,6 +2261,41 @@ static const char* apzHpux11_VsnprintfPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Hpux11_Snprintf fix + */ +tSCC zHpux11_SnprintfName[] = + "hpux11_snprintf"; + +/* + * File name selection pattern + */ +tSCC zHpux11_SnprintfList[] = + "|stdio.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzHpux11_SnprintfMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux11_SnprintfSelect0[] = + "(extern int snprintf *\\(char *\\*, *(|__|_hpux_)size_t,) *(char *\\*, *\\.\\.\\.\\);)"; + +#define HPUX11_SNPRINTF_TEST_CT 1 +static tTestDesc aHpux11_SnprintfTests[] = { + { TT_EGREP, zHpux11_SnprintfSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux11_Snprintf + */ +static const char* apzHpux11_SnprintfPatch[] = { + "format", + "%1 const %3", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Hpux8_Bogus_Inlines fix */ tSCC zHpux8_Bogus_InlinesName[] = @@ -2092,6 +2333,83 @@ static const char* apzHpux8_Bogus_InlinesPatch[] = { "sed", /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Hpux_Ctype_Macros fix + */ +tSCC zHpux_Ctype_MacrosName[] = + "hpux_ctype_macros"; + +/* + * File name selection pattern + */ +tSCC zHpux_Ctype_MacrosList[] = + "|ctype.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzHpux_Ctype_MacrosMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux_Ctype_MacrosSelect0[] = + "((: |\\()__SB_masks \\? )(__SB_masks\\[__(alnum|c)\\] & _IS)"; + +#define HPUX_CTYPE_MACROS_TEST_CT 1 +static tTestDesc aHpux_Ctype_MacrosTests[] = { + { TT_EGREP, zHpux_Ctype_MacrosSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux_Ctype_Macros + */ +static const char* apzHpux_Ctype_MacrosPatch[] = { + "format", + "%1(int)%3", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Hpux_Long_Double fix + */ +tSCC zHpux_Long_DoubleName[] = + "hpux_long_double"; + +/* + * File name selection pattern + */ +tSCC zHpux_Long_DoubleList[] = + "|stdlib.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzHpux_Long_DoubleMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux_Long_DoubleSelect0[] = + "extern[ \t]long_double[ \t]strtold"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zHpux_Long_DoubleBypass0[] = + "long_double_t"; + +#define HPUX_LONG_DOUBLE_TEST_CT 2 +static tTestDesc aHpux_Long_DoubleTests[] = { + { TT_NEGREP, zHpux_Long_DoubleBypass0, (regex_t*)NULL }, + { TT_EGREP, zHpux_Long_DoubleSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux_Long_Double + */ +static const char* apzHpux_Long_DoublePatch[] = { "sed", + "-e", "/^#[ \t]*ifndef _LONG_DOUBLE/,/\\/\\* _LONG_DOUBLE \\*\\//D", + "-e", "s/long_double/long double/g", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Hpux_Maxint fix */ tSCC zHpux_MaxintName[] = @@ -2316,6 +2634,128 @@ static const char* apzIp_Missing_SemiPatch[] = { "sed", /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Irix___Restrict fix + */ +tSCC zIrix___RestrictName[] = + "irix___restrict"; + +/* + * File name selection pattern + */ +tSCC zIrix___RestrictList[] = + "|internal/sgimacros.h|"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzIrix___RestrictMachs[] = { + "mips-sgi-irix6.5", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zIrix___RestrictSelect0[] = + "(#ifdef __c99\n\ +)(#[ \t]*define __restrict restrict)"; + +#define IRIX___RESTRICT_TEST_CT 1 +static tTestDesc aIrix___RestrictTests[] = { + { TT_EGREP, zIrix___RestrictSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Irix___Restrict + */ +static const char* apzIrix___RestrictPatch[] = { + "format", + "%1# ifndef __cplusplus\n\ +%2\n\ +# endif", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Irix___Generic1 fix + */ +tSCC zIrix___Generic1Name[] = + "irix___generic1"; + +/* + * File name selection pattern + */ +tSCC zIrix___Generic1List[] = + "|internal/math_core.h|"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzIrix___Generic1Machs[] = { + "mips-sgi-irix6.5", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zIrix___Generic1Select0[] = + "#define ([a-z]+)\\(x\\) *__generic.*"; + +#define IRIX___GENERIC1_TEST_CT 1 +static tTestDesc aIrix___Generic1Tests[] = { + { TT_EGREP, zIrix___Generic1Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Irix___Generic1 + */ +static const char* apzIrix___Generic1Patch[] = { + "format", + "extern int %1(double);\n\ +extern int %1f(float);\n\ +extern int %1l(long double);\n\ +#define %1(x) (sizeof(x) == sizeof(double) ? _%1(x) \\\n\ + : sizeof(x) == sizeof(float) ? _%1f(x) \\\n\ + : _%1l(x))\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Irix___Generic2 fix + */ +tSCC zIrix___Generic2Name[] = + "irix___generic2"; + +/* + * File name selection pattern + */ +tSCC zIrix___Generic2List[] = + "|internal/math_core.h|"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzIrix___Generic2Machs[] = { + "mips-sgi-irix6.5", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zIrix___Generic2Select0[] = + "#define ([a-z]+)\\(x,y\\) *__generic.*"; + +#define IRIX___GENERIC2_TEST_CT 1 +static tTestDesc aIrix___Generic2Tests[] = { + { TT_EGREP, zIrix___Generic2Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Irix___Generic2 + */ +static const char* apzIrix___Generic2Patch[] = { + "format", + "#define %1(x,y) \\\n\ + ((sizeof(x)<=4 && sizeof(y)<=4) ? _%1f(x,y) \\\n\ + : (sizeof(x)<=8 && sizeof(y)<=8) ? _%1(x,y) \\\n\ + : _%1l(x,y))\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Irix_Asm_Apostrophe fix */ tSCC zIrix_Asm_ApostropheName[] = @@ -2387,6 +2827,48 @@ static const char* apzIrix_Limits_ConstPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Irix_Socklen_T fix + */ +tSCC zIrix_Socklen_TName[] = + "irix_socklen_t"; + +/* + * File name selection pattern + */ +tSCC zIrix_Socklen_TList[] = + "|sys/socket.h|"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzIrix_Socklen_TMachs[] = { + "mips-sgi-irix6.5", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zIrix_Socklen_TSelect0[] = + "(#define _SOCKLEN_T\n\ +)(typedef u_int32_t socklen_t;)"; + +#define IRIX_SOCKLEN_T_TEST_CT 1 +static tTestDesc aIrix_Socklen_TTests[] = { + { TT_EGREP, zIrix_Socklen_TSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Irix_Socklen_T + */ +static const char* apzIrix_Socklen_TPatch[] = { + "format", + "%1#if _NO_XOPEN4 && _NO_XOPEN5\n\ +typedef int socklen_t;\n\ +#else\n\ +%2\n\ +#endif /* _NO_XOPEN4 && _NO_XOPEN5 */", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Irix_Stdio_Va_List fix */ tSCC zIrix_Stdio_Va_ListName[] = @@ -2396,7 +2878,7 @@ tSCC zIrix_Stdio_Va_ListName[] = * File name selection pattern */ tSCC zIrix_Stdio_Va_ListList[] = - "|stdio.h|"; + "|stdio.h|internal/stdio_core.h|"; /* * Machine/OS name selection pattern */ @@ -2406,7 +2888,7 @@ tSCC zIrix_Stdio_Va_ListList[] = * content selection pattern - do fix if pattern found */ tSCC zIrix_Stdio_Va_ListSelect0[] = - "(printf\\(.*), /\\* va_list \\*/ char \\*"; + "/\\* va_list \\*/ char \\*"; #define IRIX_STDIO_VA_LIST_TEST_CT 1 static tTestDesc aIrix_Stdio_Va_ListTests[] = { @@ -2417,7 +2899,46 @@ static tTestDesc aIrix_Stdio_Va_ListTests[] = { */ static const char* apzIrix_Stdio_Va_ListPatch[] = { "format", - "%1, __gnuc_va_list", + "__gnuc_va_list", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Irix_Wcsftime fix + */ +tSCC zIrix_WcsftimeName[] = + "irix_wcsftime"; + +/* + * File name selection pattern + */ +tSCC zIrix_WcsftimeList[] = + "|internal/wchar_core.h|"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzIrix_WcsftimeMachs[] = { + "mips-sgi-irix6.5", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zIrix_WcsftimeSelect0[] = + "#if _NO_XOPEN5\n\ +(extern size_t[ \t]+wcsftime.*const char *.*)"; + +#define IRIX_WCSFTIME_TEST_CT 1 +static tTestDesc aIrix_WcsftimeTests[] = { + { TT_EGREP, zIrix_WcsftimeSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Irix_Wcsftime + */ +static const char* apzIrix_WcsftimePatch[] = { + "format", + "#if _NO_XOPEN5 && !defined(__c99)\n\ +%1", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -2527,6 +3048,43 @@ static const char* apzKandr_ConcatPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Libc1_G_Va_List fix + */ +tSCC zLibc1_G_Va_ListName[] = + "libc1_G_va_list"; + +/* + * File name selection pattern + */ +tSCC zLibc1_G_Va_ListList[] = + "|_G_config.h|"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzLibc1_G_Va_ListMachs[] = { + "*-*-linux*libc1", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zLibc1_G_Va_ListSelect0[] = + "typedef void \\* _G_va_list;"; + +#define LIBC1_G_VA_LIST_TEST_CT 1 +static tTestDesc aLibc1_G_Va_ListTests[] = { + { TT_EGREP, zLibc1_G_Va_ListSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Libc1_G_Va_List + */ +static const char* apzLibc1_G_Va_ListPatch[] = { + "format", + "typedef __builtin_va_list _G_va_list;", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Libc1_Ifdefd_Memx fix */ tSCC zLibc1_Ifdefd_MemxName[] = @@ -2575,43 +3133,6 @@ extern [a-z_]+ mem.*(\n\ /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Libc1_G_Va_List fix - */ -tSCC zLibc1_G_Va_ListName[] = - "libc1_G_va_list"; - -/* - * File name selection pattern - */ -tSCC zLibc1_G_Va_ListList[] = - "|_G_config.h|"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzLibc1_G_Va_ListMachs[] = { - "*-*-linux*libc1", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zLibc1_G_Va_ListSelect0[] = - "typedef void \\* _G_va_list;"; - -#define LIBC1_G_VA_LIST_TEST_CT 1 -static tTestDesc aLibc1_G_Va_ListTests[] = { - { TT_EGREP, zLibc1_G_Va_ListSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Libc1_G_Va_List - */ -static const char* apzLibc1_G_Va_ListPatch[] = { - "format", - "typedef __builtin_va_list _G_va_list;", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * * Description of Limits_Ifndefs fix */ tSCC zLimits_IfndefsName[] = @@ -2631,7 +3152,7 @@ tSCC zLimits_IfndefsList[] = * content bypass pattern - skip fix if pattern found */ tSCC zLimits_IfndefsBypass0[] = - "ifndef[ \t]+FLT_MIN"; + "ifndef[ \t]+FLT_(MIN|MAX)"; #define LIMITS_IFNDEFS_TEST_CT 1 static tTestDesc aLimits_IfndefsTests[] = { @@ -3369,6 +3890,41 @@ static const char* apzNodeent_SyntaxPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Obstack_Lvalue_Cast fix + */ +tSCC zObstack_Lvalue_CastName[] = + "obstack_lvalue_cast"; + +/* + * File name selection pattern + */ +tSCC zObstack_Lvalue_CastList[] = + "|obstack.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzObstack_Lvalue_CastMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zObstack_Lvalue_CastSelect0[] = + "\\*\\(\\(([^()]*)\\*\\)(.*)\\)\\+\\+ = \\(([^()]*)\\)"; + +#define OBSTACK_LVALUE_CAST_TEST_CT 1 +static tTestDesc aObstack_Lvalue_CastTests[] = { + { TT_EGREP, zObstack_Lvalue_CastSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Obstack_Lvalue_Cast + */ +static const char* apzObstack_Lvalue_CastPatch[] = { + "format", + "((*((%1*)%2) = (%3)), (%2 += sizeof (%1)))", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Osf_Namespace_A fix */ tSCC zOsf_Namespace_AName[] = @@ -3648,6 +4204,129 @@ static const char* apzRs6000_ParamPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Sco_Math fix + */ +tSCC zSco_MathName[] = + "sco_math"; + +/* + * File name selection pattern + */ +tSCC zSco_MathList[] = + "|math.h|posix/math.h|ansi/math.h|xpg4/math.h|xpg4v2/math.h|xpg4plus/math.h|ods_30_compat/math.h|oldstyle/math.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzSco_MathMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSco_MathSelect0[] = + "__builtin_generic"; + +#define SCO_MATH_TEST_CT 1 +static tTestDesc aSco_MathTests[] = { + { TT_EGREP, zSco_MathSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Sco_Math + */ +static const char* apzSco_MathPatch[] = { "sed", + "-e", "/#define.*__fp_class(a) \\\\/i\\\n\ +#ifndef __GNUC__\n", + "-e", "/.*__builtin_generic/a\\\n\ +#else\\\n\ +#define __fp_class(a) \\\\\\\n\ + __builtin_choose_expr(__builtin_types_compatible_p(typeof(a),long double),\\\\\\\n\ + __fpclassifyl(a), \\\\\\\n\ + __builtin_choose_expr(__builtin_types_compatible_p(typeof(a), float), \\\\\\\n\ + __fpclassifyf(a),__fpclassify(a)))\\\n\ +#endif", + "-e", "/extern \"C\\+\\+\"/N;/inline double abs/i\\\n\ +#ifndef __GNUC__\n", + "-e", "/inline long double trunc/N;/inline long double trunc.*}.*extern \"C\\+\\+\"/a\\\n\ +#endif /* ! __GNUC__ */", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Sco_Regset fix + */ +tSCC zSco_RegsetName[] = + "sco_regset"; + +/* + * File name selection pattern + */ +tSCC zSco_RegsetList[] = + "|sys/regset.h|"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzSco_RegsetMachs[] = { + "*-*-sco3.2v5*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSco_RegsetSelect0[] = + "(struct[ \t]+_*)fpstate"; + +#define SCO_REGSET_TEST_CT 1 +static tTestDesc aSco_RegsetTests[] = { + { TT_EGREP, zSco_RegsetSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Sco_Regset + */ +static const char* apzSco_RegsetPatch[] = { + "format", + "%1rsfpstate", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Sco_String fix + */ +tSCC zSco_StringName[] = + "sco_string"; + +/* + * File name selection pattern + */ +tSCC zSco_StringList[] = + "|ansi/string.h|posix/string.h|xpg4/string.h|xpg4v2/string.h|xpg4plus/string.h|ods_30_compat/string.h|oldstyle/string.h|string.h|"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzSco_StringMachs[] = { + "*-*-sco3.2v5*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSco_StringSelect0[] = + "inline char"; + +#define SCO_STRING_TEST_CT 1 +static tTestDesc aSco_StringTests[] = { + { TT_EGREP, zSco_StringSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Sco_String + */ +static const char* apzSco_StringPatch[] = { "sed", + "-e", "/extern \"C\\+\\+\"/N;/inline void.*memchr/i\\\n\ +#ifndef __GNUC__\n", + "-e", "/return.*strstr/N;/return.*strstr.*}/a\\\n\ +#endif /* ! __GNUC__ */", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Sco_Static_Func fix */ tSCC zSco_Static_FuncName[] = @@ -3728,35 +4407,70 @@ static const char* apzSco_UtimePatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Solaris_Mutex_Init fix + * Description of Solaris_Mutex_Init_1 fix + */ +tSCC zSolaris_Mutex_Init_1Name[] = + "solaris_mutex_init_1"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Mutex_Init_1List[] = + "|pthread.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzSolaris_Mutex_Init_1Machs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Mutex_Init_1Select0[] = + "@\\(#\\)pthread.h[ \t]+1.1[0-9][ \t]+9[567]/[0-9/]+ SMI"; + +#define SOLARIS_MUTEX_INIT_1_TEST_CT 1 +static tTestDesc aSolaris_Mutex_Init_1Tests[] = { + { TT_EGREP, zSolaris_Mutex_Init_1Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Solaris_Mutex_Init_1 + */ +static const char* apzSolaris_Mutex_Init_1Patch[] = { "sed", + "-e", "/define[ \t]*PTHREAD_MUTEX_INI/s/{0, 0,/{{{0}, 0}, {{{0}}},/\n\ +/define[ \t]*PTHREAD_COND_INI/s/{0,/{{{0},0},/", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Solaris_Mutex_Init_2 fix */ -tSCC zSolaris_Mutex_InitName[] = - "solaris_mutex_init"; +tSCC zSolaris_Mutex_Init_2Name[] = + "solaris_mutex_init_2"; /* * File name selection pattern */ -tSCC zSolaris_Mutex_InitList[] = +tSCC zSolaris_Mutex_Init_2List[] = "|pthread.h|"; /* * Machine/OS name selection pattern */ -#define apzSolaris_Mutex_InitMachs (const char**)NULL +#define apzSolaris_Mutex_Init_2Machs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zSolaris_Mutex_InitSelect0[] = +tSCC zSolaris_Mutex_Init_2Select0[] = "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; -#define SOLARIS_MUTEX_INIT_TEST_CT 1 -static tTestDesc aSolaris_Mutex_InitTests[] = { - { TT_EGREP, zSolaris_Mutex_InitSelect0, (regex_t*)NULL }, }; +#define SOLARIS_MUTEX_INIT_2_TEST_CT 1 +static tTestDesc aSolaris_Mutex_Init_2Tests[] = { + { TT_EGREP, zSolaris_Mutex_Init_2Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Solaris_Mutex_Init + * Fix Command Arguments for Solaris_Mutex_Init_2 */ -static const char* apzSolaris_Mutex_InitPatch[] = { +static const char* apzSolaris_Mutex_Init_2Patch[] = { "format", "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n\ %0\n\ @@ -3816,7 +4530,8 @@ tSCC zSolaris_WidecList[] = * Machine/OS name selection pattern */ tSCC* apzSolaris_WidecMachs[] = { - "*-*-solaris2.[0-5]*", + "*-*-solaris2.[0-5]", + "*-*-solaris2.[0-5].*", (const char*)NULL }; /* @@ -3927,7 +4642,7 @@ tSCC zStdio_Va_ListName[] = * File name selection pattern */ tSCC zStdio_Va_ListList[] = - "|stdio.h|"; + "|stdio.h|internal/stdio_core.h|internal/wchar_core.h|"; /* * Machine/OS name selection pattern */ @@ -3937,7 +4652,7 @@ tSCC zStdio_Va_ListList[] = * content bypass pattern - skip fix if pattern found */ tSCC zStdio_Va_ListBypass0[] = - "__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list"; + "__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list"; #define STDIO_VA_LIST_TEST_CT 1 static tTestDesc aStdio_Va_ListTests[] = { @@ -3947,8 +4662,9 @@ static tTestDesc aStdio_Va_ListTests[] = { * Fix Command Arguments for Stdio_Va_List */ static const char* apzStdio_Va_ListPatch[] = { "sed", - "-e", "s@ va_list @ __gnuc_va_list @\n\ -s@ va_list)@ __gnuc_va_list)@\n\ + "-e", "s@[ \t]va_list @ __gnuc_va_list @\n\ +s@[ \t]va_list)@ __gnuc_va_list)@\n\ +s@(va_list)&@(__gnuc_va_list)\\&@\n\ s@ _VA_LIST_));@ __gnuc_va_list));@\n\ s@ __VA_LIST__));@ __gnuc_va_list));@\n\ s@ va_list@ __not_va_list__@\n\ @@ -3989,16 +4705,19 @@ tSCC zStrict_Ansi_NotSelect0[] = */ tSCC zStrict_Ansi_NotBypass0[] = "GNU and MIPS C compilers define __STDC__ differently"; +tSCC zStrict_Ansi_NotBypass1[] = + "__SCO_VERSION__.*__STDC__ != 1"; /* * perform the C function call test */ tSCC zStrict_Ansi_NotFTst0[] = "stdc_0_in_system_headers"; -#define STRICT_ANSI_NOT_TEST_CT 3 +#define STRICT_ANSI_NOT_TEST_CT 4 static tTestDesc aStrict_Ansi_NotTests[] = { { TT_FUNCTION, zStrict_Ansi_NotFTst0, 0 /* unused */ }, { TT_NEGREP, zStrict_Ansi_NotBypass0, (regex_t*)NULL }, + { TT_NEGREP, zStrict_Ansi_NotBypass1, (regex_t*)NULL }, { TT_EGREP, zStrict_Ansi_NotSelect0, (regex_t*)NULL }, }; /* @@ -4502,6 +5221,40 @@ static const char* apzSvr4__PPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Svr4_Disable_Opt fix + */ +tSCC zSvr4_Disable_OptName[] = + "svr4_disable_opt"; + +/* + * File name selection pattern + */ +tSCC zSvr4_Disable_OptList[] = + "|string.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzSvr4_Disable_OptMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSvr4_Disable_OptSelect0[] = + "#define.*__std_hdr_"; + +#define SVR4_DISABLE_OPT_TEST_CT 1 +static tTestDesc aSvr4_Disable_OptTests[] = { + { TT_EGREP, zSvr4_Disable_OptSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Svr4_Disable_Opt + */ +static const char* apzSvr4_Disable_OptPatch[] = { "sed", + "-e", "/#define.*__std_hdr_/d", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Svr4_Getcwd fix */ tSCC zSvr4_GetcwdName[] = @@ -5782,9 +6535,9 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 155 -#define MACH_LIST_SIZE_LIMIT 279 -#define FIX_COUNT 148 +#define REGEX_COUNT 180 +#define MACH_LIST_SIZE_LIMIT 334 +#define FIX_COUNT 166 /* * Enumerate the fixes @@ -5806,9 +6559,11 @@ typedef enum { AIX_SYSWAIT_FIXIDX, AIX_VOLATILE_FIXIDX, ALPHA___ASSERT_FIXIDX, + ALPHA___EXTERN_PREFIX_FIXIDX, ALPHA_ASSERT_FIXIDX, ALPHA_GETOPT_FIXIDX, ALPHA_PARENS_FIXIDX, + ALPHA_PTHREAD_GCC_FIXIDX, ALPHA_SBRK_FIXIDX, ARM_NORCROFT_HINT_FIXIDX, ARM_WCHAR_FIXIDX, @@ -5835,26 +6590,36 @@ typedef enum { HP_SYSFILE_FIXIDX, HPUX10_CPP_POW_INLINE_FIXIDX, HPUX11_CPP_POW_INLINE_FIXIDX, - HPUX11_FABSF_FIXIDX, + HPUX10_CTYPE_DECLARATIONS1_FIXIDX, + HPUX10_CTYPE_DECLARATIONS2_FIXIDX, HPUX11_ABS_FIXIDX, + HPUX11_FABSF_FIXIDX, HPUX11_SIZE_T_FIXIDX, HPUX11_UINT32_C_FIXIDX, HPUX11_VSNPRINTF_FIXIDX, + HPUX11_SNPRINTF_FIXIDX, HPUX8_BOGUS_INLINES_FIXIDX, + HPUX_CTYPE_MACROS_FIXIDX, + HPUX_LONG_DOUBLE_FIXIDX, HPUX_MAXINT_FIXIDX, HPUX_SYSTIME_FIXIDX, INT_ABORT_FREE_AND_EXIT_FIXIDX, IO_QUOTES_DEF_FIXIDX, IO_QUOTES_USE_FIXIDX, IP_MISSING_SEMI_FIXIDX, + IRIX___RESTRICT_FIXIDX, + IRIX___GENERIC1_FIXIDX, + IRIX___GENERIC2_FIXIDX, IRIX_ASM_APOSTROPHE_FIXIDX, IRIX_LIMITS_CONST_FIXIDX, + IRIX_SOCKLEN_T_FIXIDX, IRIX_STDIO_VA_LIST_FIXIDX, + IRIX_WCSFTIME_FIXIDX, ISC_FMOD_FIXIDX, ISC_OMITS_WITH_STDC_FIXIDX, KANDR_CONCAT_FIXIDX, - LIBC1_IFDEFD_MEMX_FIXIDX, LIBC1_G_VA_LIST_FIXIDX, + LIBC1_IFDEFD_MEMX_FIXIDX, LIMITS_IFNDEFS_FIXIDX, LYNX_VOID_INT_FIXIDX, LYNXOS_FCNTL_PROTO_FIXIDX, @@ -5875,6 +6640,7 @@ typedef enum { NEXT_VOLITILE_FIXIDX, NEXT_WAIT_UNION_FIXIDX, NODEENT_SYNTAX_FIXIDX, + OBSTACK_LVALUE_CAST_FIXIDX, OSF_NAMESPACE_A_FIXIDX, OSF_NAMESPACE_C_FIXIDX, PTHREAD_PAGE_SIZE_FIXIDX, @@ -5882,9 +6648,13 @@ typedef enum { RS6000_DOUBLE_FIXIDX, RS6000_FCHMOD_FIXIDX, RS6000_PARAM_FIXIDX, + SCO_MATH_FIXIDX, + SCO_REGSET_FIXIDX, + SCO_STRING_FIXIDX, SCO_STATIC_FUNC_FIXIDX, SCO_UTIME_FIXIDX, - SOLARIS_MUTEX_INIT_FIXIDX, + SOLARIS_MUTEX_INIT_1_FIXIDX, + SOLARIS_MUTEX_INIT_2_FIXIDX, SOLARIS_STDIO_TAG_FIXIDX, SOLARIS_WIDEC_FIXIDX, STATSSWTCH_FIXIDX, @@ -5904,6 +6674,7 @@ typedef enum { SUNOS_MATHERR_DECL_FIXIDX, SUNOS_STRLEN_FIXIDX, SVR4__P_FIXIDX, + SVR4_DISABLE_OPT_FIXIDX, SVR4_GETCWD_FIXIDX, SVR4_PROFIL_FIXIDX, SYSV68_STRING_FIXIDX, @@ -6021,6 +6792,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { ALPHA___ASSERT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aAlpha___AssertTests, apzAlpha___AssertPatch, 0 }, + { zAlpha___Extern_PrefixName, zAlpha___Extern_PrefixList, + apzAlpha___Extern_PrefixMachs, + ALPHA___EXTERN_PREFIX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAlpha___Extern_PrefixTests, apzAlpha___Extern_PrefixPatch, 0 }, + { zAlpha_AssertName, zAlpha_AssertList, apzAlpha_AssertMachs, ALPHA_ASSERT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -6036,6 +6812,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { ALPHA_PARENS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aAlpha_ParensTests, apzAlpha_ParensPatch, 0 }, + { zAlpha_Pthread_GccName, zAlpha_Pthread_GccList, + apzAlpha_Pthread_GccMachs, + ALPHA_PTHREAD_GCC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAlpha_Pthread_GccTests, apzAlpha_Pthread_GccPatch, 0 }, + { zAlpha_SbrkName, zAlpha_SbrkList, apzAlpha_SbrkMachs, ALPHA_SBRK_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -6166,16 +6947,26 @@ tFixDesc fixDescList[ FIX_COUNT ] = { HPUX11_CPP_POW_INLINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aHpux11_Cpp_Pow_InlineTests, apzHpux11_Cpp_Pow_InlinePatch, 0 }, - { zHpux11_FabsfName, zHpux11_FabsfList, - apzHpux11_FabsfMachs, - HPUX11_FABSF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aHpux11_FabsfTests, apzHpux11_FabsfPatch, 0 }, + { zHpux10_Ctype_Declarations1Name, zHpux10_Ctype_Declarations1List, + apzHpux10_Ctype_Declarations1Machs, + HPUX10_CTYPE_DECLARATIONS1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux10_Ctype_Declarations1Tests, apzHpux10_Ctype_Declarations1Patch, 0 }, + + { zHpux10_Ctype_Declarations2Name, zHpux10_Ctype_Declarations2List, + apzHpux10_Ctype_Declarations2Machs, + HPUX10_CTYPE_DECLARATIONS2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux10_Ctype_Declarations2Tests, apzHpux10_Ctype_Declarations2Patch, 0 }, { zHpux11_AbsName, zHpux11_AbsList, apzHpux11_AbsMachs, HPUX11_ABS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aHpux11_AbsTests, apzHpux11_AbsPatch, 0 }, + { zHpux11_FabsfName, zHpux11_FabsfList, + apzHpux11_FabsfMachs, + HPUX11_FABSF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux11_FabsfTests, apzHpux11_FabsfPatch, 0 }, + { zHpux11_Size_TName, zHpux11_Size_TList, apzHpux11_Size_TMachs, HPUX11_SIZE_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -6191,11 +6982,26 @@ tFixDesc fixDescList[ FIX_COUNT ] = { HPUX11_VSNPRINTF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aHpux11_VsnprintfTests, apzHpux11_VsnprintfPatch, 0 }, + { zHpux11_SnprintfName, zHpux11_SnprintfList, + apzHpux11_SnprintfMachs, + HPUX11_SNPRINTF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux11_SnprintfTests, apzHpux11_SnprintfPatch, 0 }, + { zHpux8_Bogus_InlinesName, zHpux8_Bogus_InlinesList, apzHpux8_Bogus_InlinesMachs, HPUX8_BOGUS_INLINES_TEST_CT, FD_MACH_ONLY, aHpux8_Bogus_InlinesTests, apzHpux8_Bogus_InlinesPatch, 0 }, + { zHpux_Ctype_MacrosName, zHpux_Ctype_MacrosList, + apzHpux_Ctype_MacrosMachs, + HPUX_CTYPE_MACROS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux_Ctype_MacrosTests, apzHpux_Ctype_MacrosPatch, 0 }, + + { zHpux_Long_DoubleName, zHpux_Long_DoubleList, + apzHpux_Long_DoubleMachs, + HPUX_LONG_DOUBLE_TEST_CT, FD_MACH_ONLY, + aHpux_Long_DoubleTests, apzHpux_Long_DoublePatch, 0 }, + { zHpux_MaxintName, zHpux_MaxintList, apzHpux_MaxintMachs, HPUX_MAXINT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -6226,6 +7032,21 @@ tFixDesc fixDescList[ FIX_COUNT ] = { IP_MISSING_SEMI_TEST_CT, FD_MACH_ONLY, aIp_Missing_SemiTests, apzIp_Missing_SemiPatch, 0 }, + { zIrix___RestrictName, zIrix___RestrictList, + apzIrix___RestrictMachs, + IRIX___RESTRICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aIrix___RestrictTests, apzIrix___RestrictPatch, 0 }, + + { zIrix___Generic1Name, zIrix___Generic1List, + apzIrix___Generic1Machs, + IRIX___GENERIC1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aIrix___Generic1Tests, apzIrix___Generic1Patch, 0 }, + + { zIrix___Generic2Name, zIrix___Generic2List, + apzIrix___Generic2Machs, + IRIX___GENERIC2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aIrix___Generic2Tests, apzIrix___Generic2Patch, 0 }, + { zIrix_Asm_ApostropheName, zIrix_Asm_ApostropheList, apzIrix_Asm_ApostropheMachs, IRIX_ASM_APOSTROPHE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -6236,11 +7057,21 @@ tFixDesc fixDescList[ FIX_COUNT ] = { IRIX_LIMITS_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aIrix_Limits_ConstTests, apzIrix_Limits_ConstPatch, 0 }, + { zIrix_Socklen_TName, zIrix_Socklen_TList, + apzIrix_Socklen_TMachs, + IRIX_SOCKLEN_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aIrix_Socklen_TTests, apzIrix_Socklen_TPatch, 0 }, + { zIrix_Stdio_Va_ListName, zIrix_Stdio_Va_ListList, apzIrix_Stdio_Va_ListMachs, IRIX_STDIO_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aIrix_Stdio_Va_ListTests, apzIrix_Stdio_Va_ListPatch, 0 }, + { zIrix_WcsftimeName, zIrix_WcsftimeList, + apzIrix_WcsftimeMachs, + IRIX_WCSFTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aIrix_WcsftimeTests, apzIrix_WcsftimePatch, 0 }, + { zIsc_FmodName, zIsc_FmodList, apzIsc_FmodMachs, ISC_FMOD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -6256,16 +7087,16 @@ tFixDesc fixDescList[ FIX_COUNT ] = { KANDR_CONCAT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aKandr_ConcatTests, apzKandr_ConcatPatch, 0 }, - { zLibc1_Ifdefd_MemxName, zLibc1_Ifdefd_MemxList, - apzLibc1_Ifdefd_MemxMachs, - LIBC1_IFDEFD_MEMX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aLibc1_Ifdefd_MemxTests, apzLibc1_Ifdefd_MemxPatch, 0 }, - { zLibc1_G_Va_ListName, zLibc1_G_Va_ListList, apzLibc1_G_Va_ListMachs, LIBC1_G_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aLibc1_G_Va_ListTests, apzLibc1_G_Va_ListPatch, 0 }, + { zLibc1_Ifdefd_MemxName, zLibc1_Ifdefd_MemxList, + apzLibc1_Ifdefd_MemxMachs, + LIBC1_IFDEFD_MEMX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aLibc1_Ifdefd_MemxTests, apzLibc1_Ifdefd_MemxPatch, 0 }, + { zLimits_IfndefsName, zLimits_IfndefsList, apzLimits_IfndefsMachs, LIMITS_IFNDEFS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -6366,6 +7197,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { NODEENT_SYNTAX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aNodeent_SyntaxTests, apzNodeent_SyntaxPatch, 0 }, + { zObstack_Lvalue_CastName, zObstack_Lvalue_CastList, + apzObstack_Lvalue_CastMachs, + OBSTACK_LVALUE_CAST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aObstack_Lvalue_CastTests, apzObstack_Lvalue_CastPatch, 0 }, + { zOsf_Namespace_AName, zOsf_Namespace_AList, apzOsf_Namespace_AMachs, OSF_NAMESPACE_A_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -6401,6 +7237,21 @@ tFixDesc fixDescList[ FIX_COUNT ] = { RS6000_PARAM_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aRs6000_ParamTests, apzRs6000_ParamPatch, 0 }, + { zSco_MathName, zSco_MathList, + apzSco_MathMachs, + SCO_MATH_TEST_CT, FD_MACH_ONLY, + aSco_MathTests, apzSco_MathPatch, 0 }, + + { zSco_RegsetName, zSco_RegsetList, + apzSco_RegsetMachs, + SCO_REGSET_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSco_RegsetTests, apzSco_RegsetPatch, 0 }, + + { zSco_StringName, zSco_StringList, + apzSco_StringMachs, + SCO_STRING_TEST_CT, FD_MACH_ONLY, + aSco_StringTests, apzSco_StringPatch, 0 }, + { zSco_Static_FuncName, zSco_Static_FuncList, apzSco_Static_FuncMachs, SCO_STATIC_FUNC_TEST_CT, FD_MACH_ONLY, @@ -6411,10 +7262,15 @@ tFixDesc fixDescList[ FIX_COUNT ] = { SCO_UTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aSco_UtimeTests, apzSco_UtimePatch, 0 }, - { zSolaris_Mutex_InitName, zSolaris_Mutex_InitList, - apzSolaris_Mutex_InitMachs, - SOLARIS_MUTEX_INIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aSolaris_Mutex_InitTests, apzSolaris_Mutex_InitPatch, 0 }, + { zSolaris_Mutex_Init_1Name, zSolaris_Mutex_Init_1List, + apzSolaris_Mutex_Init_1Machs, + SOLARIS_MUTEX_INIT_1_TEST_CT, FD_MACH_ONLY, + aSolaris_Mutex_Init_1Tests, apzSolaris_Mutex_Init_1Patch, 0 }, + + { zSolaris_Mutex_Init_2Name, zSolaris_Mutex_Init_2List, + apzSolaris_Mutex_Init_2Machs, + SOLARIS_MUTEX_INIT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Mutex_Init_2Tests, apzSolaris_Mutex_Init_2Patch, 0 }, { zSolaris_Stdio_TagName, zSolaris_Stdio_TagList, apzSolaris_Stdio_TagMachs, @@ -6511,6 +7367,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { SVR4__P_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aSvr4__PTests, apzSvr4__PPatch, 0 }, + { zSvr4_Disable_OptName, zSvr4_Disable_OptList, + apzSvr4_Disable_OptMachs, + SVR4_DISABLE_OPT_TEST_CT, FD_MACH_ONLY, + aSvr4_Disable_OptTests, apzSvr4_Disable_OptPatch, 0 }, + { zSvr4_GetcwdName, zSvr4_GetcwdList, apzSvr4_GetcwdMachs, SVR4_GETCWD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, |