X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=fixincludes%2Ffixincl.x;h=0f5e5fcae8eb49eab78ff749289130c1b58cefce;hb=305117d0a80b313e9ba4994177c85e91f0abb764;hp=cbf6d07aa1b7d208b45d715c1ae124df997d5912;hpb=6af9f7ea1f2b5cc8e19fc1f8d2d78f3a5dc02b6a;p=pf3gnuchains%2Fgcc-fork.git
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index cbf6d07aa1b..0f5e5fcae8e 100644
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -2,11 +2,11 @@
*
* DO NOT EDIT THIS FILE (fixincl.x)
*
- * It has been AutoGen-ed Thursday May 29, 2008 at 11:31:36 PM UTC
+ * It has been AutoGen-ed Sunday October 23, 2011 at 12:18:29 PM EST
* From the definitions inclhack.def
* and the template file fixincl
*/
-/* DO NOT SVN-MERGE THIS FILE, EITHER Thu May 29 23:31:36 UTC 2008
+/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Oct 23 12:18:29 EST 2011
*
* You must regenerate it. Use the ./genfixes script.
*
@@ -15,14 +15,15 @@
* certain ANSI-incompatible system header files which are fixed to work
* correctly with ANSI C and placed in a directory that GNU C will search.
*
- * This file contains 177 fixup descriptions.
+ * This file contains 220 fixup descriptions.
*
* See README for more information.
*
- * inclhack copyright (c) 1998, 1999, 2000, 2001
+ * inclhack copyright (c) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+ * 2006, 2007, 2008
* The Free Software Foundation, Inc.
*
- * inclhack is free software: you can redistribute it and/or modify it
+ * inclhack is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
@@ -35,6 +36,10 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see .
*/
+#ifndef SED_PROGRAM
+#define SED_PROGRAM "/usr/bin/sed"
+#endif
+static char const sed_cmd_z[] = SED_PROGRAM;
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
@@ -475,42 +480,81 @@ static const char* apzAab_Sun_MemcpyPatch[] = {
extern char *memset();\n\
#endif /* __STDC__ */\n\n\
extern int memcmp();\n\n\
-#endif /* __memory_h__ */\n\
-_EndOfHeader;\n\
-};\n\n\n\
-/*\n\
- * Completely replace with a file that includes gcc's\n\
- * stdarg.h or varargs.h files as appropriate.\n\
- */\n\
-#ifdef SVR4\n\
-fix = {\n\
- hackname = AAB_svr4_no_varargs;\n\
- files = sys/varargs.h;\n\
- replace = \"/* This file was generated by fixincludes. */\\n\"\n\
- \"#ifndef _SYS_VARARGS_H\\n\"\n\
- \"#define _SYS_VARARGS_H\\n\\n\"\n\n\
- \"#ifdef __STDC__\\n\"\n\
- \"#include \\n\"\n\
- \"#else\\n\"\n\
- \"#include \\n\"\n\
- \"#endif\\n\\n\"\n\n\
- \"#endif /* _SYS_VARARGS_H */\\n\";\n\
-};\n\
-#endif\n\n\n\
-/*\n\
- * The Ultrix 4.3 file string.h is a symbolic link to strings.h.\n\
- * Replace string.h link with a file that includes strings.h to prevent\n\
- * problems from multiple inclusion.\n\
- */\n\
-fix = {\n\
- hackname = AAB_ultrix_string;\n\
- files = string.h;\n\
- mach = \"*-*-ultrix4.3\";\n\
- replace = <<- _EndOfHeader_\n\
-#ifndef _STRING_INCLUDED\n\
- #define _STRING_INCLUDED\n\
- #include \n\
-#endif /* _STRING_INCLUDED */",
+#endif /* __memory_h__ */",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Aix_Complex fix
+ */
+tSCC zAix_ComplexName[] =
+ "aix_complex";
+
+/*
+ * File name selection pattern
+ */
+tSCC zAix_ComplexList[] =
+ "complex.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzAix_ComplexMachs[] = {
+ "*-*-aix*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zAix_ComplexSelect0[] =
+ "#define[ \t]_Complex_I[ \t]__I";
+
+#define AIX_COMPLEX_TEST_CT 1
+static tTestDesc aAix_ComplexTests[] = {
+ { TT_EGREP, zAix_ComplexSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Aix_Complex
+ */
+static const char* apzAix_ComplexPatch[] = {
+ "format",
+ "#define _Complex_I (__extension__ 1.0iF)",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Aix_Net_If_Arp fix
+ */
+tSCC zAix_Net_If_ArpName[] =
+ "aix_net_if_arp";
+
+/*
+ * File name selection pattern
+ */
+tSCC zAix_Net_If_ArpList[] =
+ "net/if_arp.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzAix_Net_If_ArpMachs[] = {
+ "*-*-aix*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zAix_Net_If_ArpSelect0[] =
+ "^struct fc_softc \\{";
+
+#define AIX_NET_IF_ARP_TEST_CT 1
+static tTestDesc aAix_Net_If_ArpTests[] = {
+ { TT_EGREP, zAix_Net_If_ArpSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Aix_Net_If_Arp
+ */
+static const char* apzAix_Net_If_ArpPatch[] = {
+ "format",
+ "typedef struct _fc_softc {",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -552,76 +596,250 @@ static const char* apzAix_PthreadPatch[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Aix_Sysmachine fix
+ * Description of Aix_Stdint_1 fix
*/
-tSCC zAix_SysmachineName[] =
- "aix_sysmachine";
+tSCC zAix_Stdint_1Name[] =
+ "aix_stdint_1";
/*
* File name selection pattern
*/
-tSCC zAix_SysmachineList[] =
- "sys/machine.h\0";
+tSCC zAix_Stdint_1List[] =
+ "stdint-aix.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
-#define apzAix_SysmachineMachs (const char**)NULL
+tSCC* apzAix_Stdint_1Machs[] = {
+ "*-*-aix*",
+ (const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
-tSCC zAix_SysmachineSelect0[] =
- "\\\\ +\n";
+tSCC zAix_Stdint_1Select0[] =
+ "#define[ \t]UINT8_MAX[ \t]\\(255U\\)\n\
+#define[ \t]UINT16_MAX[ \t]\\(65535U\\)";
-#define AIX_SYSMACHINE_TEST_CT 1
-static tTestDesc aAix_SysmachineTests[] = {
- { TT_EGREP, zAix_SysmachineSelect0, (regex_t*)NULL }, };
+#define AIX_STDINT_1_TEST_CT 1
+static tTestDesc aAix_Stdint_1Tests[] = {
+ { TT_EGREP, zAix_Stdint_1Select0, (regex_t*)NULL }, };
/*
- * Fix Command Arguments for Aix_Sysmachine
+ * Fix Command Arguments for Aix_Stdint_1
*/
-static const char* apzAix_SysmachinePatch[] = {
+static const char* apzAix_Stdint_1Patch[] = {
"format",
- "\\\n",
+ "#define UINT8_MAX\t(255)\n\
+#define UINT16_MAX\t(65535)",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Aix_Syswait fix
+ * Description of Aix_Stdint_2 fix
*/
-tSCC zAix_SyswaitName[] =
- "aix_syswait";
+tSCC zAix_Stdint_2Name[] =
+ "aix_stdint_2";
/*
* File name selection pattern
*/
-tSCC zAix_SyswaitList[] =
- "sys/wait.h\0";
+tSCC zAix_Stdint_2List[] =
+ "stdint-aix.h\0stdint.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzAix_Stdint_2Machs[] = {
+ "*-*-aix*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zAix_Stdint_2Select0[] =
+ "#define[ \t]INTPTR_MIN[ \t]INT64_MIN\n\
+#define[ \t]INTPTR_MAX[ \t]INT64_MAX\n\
+#define[ \t]UINTPTR_MAX[ \t]UINT64_MAX\n\
+#else\n\
+#define[ \t]INTPTR_MIN[ \t]INT32_MIN\n\
+#define[ \t]INTPTR_MAX[ \t]INT32_MAX\n\
+#define[ \t]UINTPTR_MAX[ \t]UINT32_MAX";
+
+#define AIX_STDINT_2_TEST_CT 1
+static tTestDesc aAix_Stdint_2Tests[] = {
+ { TT_EGREP, zAix_Stdint_2Select0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Aix_Stdint_2
+ */
+static const char* apzAix_Stdint_2Patch[] = {
+ "format",
+ "#define INTPTR_MIN\t(-INTPTR_MAX-1)\n\
+#define INTPTR_MAX\t9223372036854775807L\n\
+#define UINTPTR_MAX\t18446744073709551615UL\n\
+#else\n\
+#define INTPTR_MIN\t(-INTPTR_MAX-1)\n\
+#define INTPTR_MAX\t2147483647L\n\
+#define UINTPTR_MAX\t4294967295UL",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Aix_Stdint_3 fix
+ */
+tSCC zAix_Stdint_3Name[] =
+ "aix_stdint_3";
+
+/*
+ * File name selection pattern
+ */
+tSCC zAix_Stdint_3List[] =
+ "stdint-aix.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
-#define apzAix_SyswaitMachs (const char**)NULL
+tSCC* apzAix_Stdint_3Machs[] = {
+ "*-*-aix*",
+ (const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
-tSCC zAix_SyswaitSelect0[] =
- "^extern pid_t wait3\\(\\);\n";
-tSCC zAix_SyswaitSelect1[] =
- "bos325,";
+tSCC zAix_Stdint_3Select0[] =
+ "#define[ \t]PTRDIFF_MIN[ \t]INT64_MIN\n\
+#define[ \t]PTRDIFF_MAX[ \t]INT64_MAX\n\
+#else\n\
+#define[ \t]PTRDIFF_MIN[ \t]*INT32_MIN\n\
+#define[ \t]PTRDIFF_MAX[ \t]*INT32_MAX";
-#define AIX_SYSWAIT_TEST_CT 2
-static tTestDesc aAix_SyswaitTests[] = {
- { TT_EGREP, zAix_SyswaitSelect0, (regex_t*)NULL },
- { TT_EGREP, zAix_SyswaitSelect1, (regex_t*)NULL }, };
+#define AIX_STDINT_3_TEST_CT 1
+static tTestDesc aAix_Stdint_3Tests[] = {
+ { TT_EGREP, zAix_Stdint_3Select0, (regex_t*)NULL }, };
/*
- * Fix Command Arguments for Aix_Syswait
+ * Fix Command Arguments for Aix_Stdint_3
*/
-static const char* apzAix_SyswaitPatch[] = {
+static const char* apzAix_Stdint_3Patch[] = {
"format",
- "struct rusage;\n\
-%0",
+ "#define PTRDIFF_MIN\t(-9223372036854775807L - 1)\n\
+#define PTRDIFF_MAX\t9223372036854775807L\n\
+#else\n\
+#define PTRDIFF_MIN\t(-2147483647L - 1)\n\
+#define PTRDIFF_MAX\t2147483647L",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Aix_Stdint_4 fix
+ */
+tSCC zAix_Stdint_4Name[] =
+ "aix_stdint_4";
+
+/*
+ * File name selection pattern
+ */
+tSCC zAix_Stdint_4List[] =
+ "stdint-aix.h\0stdint.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzAix_Stdint_4Machs[] = {
+ "*-*-aix*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zAix_Stdint_4Select0[] =
+ "#define[ \t]SIZE_MAX[ \t]UINT64_MAX\n\
+#else\n\
+#define[ \t]SIZE_MAX[ \t]*UINT32_MAX";
+
+#define AIX_STDINT_4_TEST_CT 1
+static tTestDesc aAix_Stdint_4Tests[] = {
+ { TT_EGREP, zAix_Stdint_4Select0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Aix_Stdint_4
+ */
+static const char* apzAix_Stdint_4Patch[] = {
+ "format",
+ "#define SIZE_MAX\t18446744073709551615UL\n\
+#else\n\
+#define SIZE_MAX\t4294967295UL",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Aix_Stdint_5 fix
+ */
+tSCC zAix_Stdint_5Name[] =
+ "aix_stdint_5";
+
+/*
+ * File name selection pattern
+ */
+tSCC zAix_Stdint_5List[] =
+ "stdint-aix.h\0stdint.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzAix_Stdint_5Machs[] = {
+ "*-*-aix*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zAix_Stdint_5Select0[] =
+ "#define[ \t]UINT8_C\\(c\\)[ \t]__CONCAT__\\(c,U\\)\n\
+#define[ \t]UINT16_C\\(c\\)[ \t]__CONCAT__\\(c,U\\)";
+
+#define AIX_STDINT_5_TEST_CT 1
+static tTestDesc aAix_Stdint_5Tests[] = {
+ { TT_EGREP, zAix_Stdint_5Select0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Aix_Stdint_5
+ */
+static const char* apzAix_Stdint_5Patch[] = {
+ "format",
+ "#define UINT8_C(c)\tc\n\
+#define UINT16_C(c)\tc",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Aix_Sysmachine fix
+ */
+tSCC zAix_SysmachineName[] =
+ "aix_sysmachine";
+
+/*
+ * File name selection pattern
+ */
+tSCC zAix_SysmachineList[] =
+ "sys/machine.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzAix_SysmachineMachs (const char**)NULL
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zAix_SysmachineSelect0[] =
+ "\\\\ +\n";
+
+#define AIX_SYSMACHINE_TEST_CT 1
+static tTestDesc aAix_SysmachineTests[] = {
+ { TT_EGREP, zAix_SysmachineSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Aix_Sysmachine
+ */
+static const char* apzAix_SysmachinePatch[] = {
+ "format",
+ "\\\n",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -862,7 +1080,7 @@ tSCC zAlpha_AssertList[] =
* content selection pattern - do fix if pattern found
*/
tSCC zAlpha_AssertSelect0[] =
- "(#define assert\\(EX\\).*)\\(\\(int\\) \\(EX\\)\\)";
+ "(#[ \t]*define assert\\(EX\\).*)\\(\\(int\\) \\(EX\\)\\)";
#define ALPHA_ASSERT_TEST_CT 1
static tTestDesc aAlpha_AssertTests[] = {
@@ -907,7 +1125,7 @@ static tTestDesc aAlpha_Bad_LvalTests[] = {
/*
* Fix Command Arguments for Alpha_Bad_Lval
*/
-static const char* apzAlpha_Bad_LvalPatch[] = { "sed",
+static const char* apzAlpha_Bad_LvalPatch[] = { sed_cmd_z,
"-e", "s/^[ \t]*#[ \t]*define[ \t][ \t]*\\([^(]*\\)\\(([^)]*)\\)[ \t]*\\(_.*\\)\\1\\2[ \t]*$/#define \\1 \\3\\1/",
(char*)NULL };
@@ -948,6 +1166,41 @@ static const char* apzAlpha_GetoptPatch[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Alpha_If_Semicolon fix
+ */
+tSCC zAlpha_If_SemicolonName[] =
+ "alpha_if_semicolon";
+
+/*
+ * File name selection pattern
+ */
+tSCC zAlpha_If_SemicolonList[] =
+ "net/if.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzAlpha_If_SemicolonMachs (const char**)NULL
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zAlpha_If_SemicolonSelect0[] =
+ "struct[ \t]+sockaddr[ \t]+vmif_paddr[ \t]+/\\*";
+
+#define ALPHA_IF_SEMICOLON_TEST_CT 1
+static tTestDesc aAlpha_If_SemicolonTests[] = {
+ { TT_EGREP, zAlpha_If_SemicolonSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Alpha_If_Semicolon
+ */
+static const char* apzAlpha_If_SemicolonPatch[] = {
+ "format",
+ "struct sockaddr vmif_paddr;\t/*",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Alpha_Parens fix
*/
tSCC zAlpha_ParensName[] =
@@ -1092,7 +1345,7 @@ static tTestDesc aAlpha_Pthread_InitTests[] = {
/*
* Fix Command Arguments for Alpha_Pthread_Init
*/
-static const char* apzAlpha_Pthread_InitPatch[] = { "sed",
+static const char* apzAlpha_Pthread_InitPatch[] = { sed_cmd_z,
"-e", "s@MVALID\\(.*\\)A}@MVALID\\1A, 0, 0, 0, 0, 0, 0 }@\n\
s@MVALID\\(.*\\)_}@MVALID\\1_, 0, 0, 0, 0 }@\n\
s@CVALID\\(.*\\)A}@CVALID\\1A, 0, 0, 0, 0 }@\n\
@@ -1138,43 +1391,6 @@ static const char* apzAlpha_SbrkPatch[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Alpha_Wchar fix
- */
-tSCC zAlpha_WcharName[] =
- "alpha_wchar";
-
-/*
- * File name selection pattern
- */
-tSCC zAlpha_WcharList[] =
- "wchar.h\0";
-/*
- * Machine/OS name selection pattern
- */
-tSCC* apzAlpha_WcharMachs[] = {
- "alpha*-dec-osf4*",
- (const char*)NULL };
-
-/*
- * content selection pattern - do fix if pattern found
- */
-tSCC zAlpha_WcharSelect0[] =
- "#define wcstok wcstok_r";
-
-#define ALPHA_WCHAR_TEST_CT 1
-static tTestDesc aAlpha_WcharTests[] = {
- { TT_EGREP, zAlpha_WcharSelect0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for Alpha_Wchar
- */
-static const char* apzAlpha_WcharPatch[] = { "sed",
- "-e", "s@#define wcstok wcstok_r@extern wchar_t *wcstok __((wchar_t *, const wchar_t *, wchar_t **)) __asm__(\"wcstok_r\");@",
- "-e", "s@#define wcsftime __wcsftime_isoc@extern size_t wcsftime __((wchar_t *, size_t, const wchar_t *, const struct tm *)) __asm__(\"__wcsftime_isoc\");@",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
* Description of Avoid_Bool_Define fix
*/
tSCC zAvoid_Bool_DefineName[] =
@@ -1497,7 +1713,7 @@ static tTestDesc aBroken_CabsTests[] = {
/*
* Fix Command Arguments for Broken_Cabs
*/
-static const char* apzBroken_CabsPatch[] = { "sed",
+static const char* apzBroken_CabsPatch[] = { sed_cmd_z,
"-e", "s/^extern[ \t]*double[ \t]*cabs[ \t]*([^\\)]*);//",
"-e", "s/^extern[ \t]*long[ \t]*double[ \t]*cabsl[ \t]*([^\\)]*);//",
(char*)NULL };
@@ -1821,151 +2037,427 @@ static const char* apzDarwin_Private_ExternPatch[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Dec_Intern_Asm fix
+ * Description of Darwin_Stdint_1 fix
*/
-tSCC zDec_Intern_AsmName[] =
- "dec_intern_asm";
+tSCC zDarwin_Stdint_1Name[] =
+ "darwin_stdint_1";
/*
* File name selection pattern
*/
-tSCC zDec_Intern_AsmList[] =
- "c_asm.h\0";
+tSCC zDarwin_Stdint_1List[] =
+ "stdint-darwin.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
-#define apzDec_Intern_AsmMachs (const char**)NULL
-#define DEC_INTERN_ASM_TEST_CT 0
-#define aDec_Intern_AsmTests (tTestDesc*)NULL
+tSCC* apzDarwin_Stdint_1Machs[] = {
+ "*-*-darwin*",
+ (const char*)NULL };
/*
- * Fix Command Arguments for Dec_Intern_Asm
+ * content selection pattern - do fix if pattern found
*/
-static const char* apzDec_Intern_AsmPatch[] = { "sed",
- "-e", "/^[ \t]*float[ \t]*fasm/i\\\n\
-#ifdef __DECC\n",
- "-e", "/^[ \t]*#[ \t]*pragma[ \t]*intrinsic([ \t]*dasm/a\\\n\
-#endif\n",
+tSCC zDarwin_Stdint_1Select0[] =
+ "#define UINT8_C\\(v\\)[ \t]+\\(v ## U\\)\n\
+#define UINT16_C\\(v\\)[ \t]+\\(v ## U\\)";
+
+#define DARWIN_STDINT_1_TEST_CT 1
+static tTestDesc aDarwin_Stdint_1Tests[] = {
+ { TT_EGREP, zDarwin_Stdint_1Select0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Darwin_Stdint_1
+ */
+static const char* apzDarwin_Stdint_1Patch[] = {
+ "format",
+ "#define UINT8_C(v)\tv\n\
+#define UINT16_C(v)\tv",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Djgpp_Wchar_H fix
+ * Description of Darwin_Stdint_2 fix
*/
-tSCC zDjgpp_Wchar_HName[] =
- "djgpp_wchar_h";
+tSCC zDarwin_Stdint_2Name[] =
+ "darwin_stdint_2";
/*
* File name selection pattern
*/
-#define zDjgpp_Wchar_HList (char*)NULL
+tSCC zDarwin_Stdint_2List[] =
+ "stdint-darwin.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
-#define apzDjgpp_Wchar_HMachs (const char**)NULL
+tSCC* apzDarwin_Stdint_2Machs[] = {
+ "*-*-darwin*",
+ (const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
-tSCC zDjgpp_Wchar_HSelect0[] =
- "__DJ_wint_t";
+tSCC zDarwin_Stdint_2Select0[] =
+ "#if __WORDSIZE == 64\n\
+#define INTPTR_MIN[ \t]+INT64_MIN\n\
+#define INTPTR_MAX[ \t]+INT64_MAX\n\
+#else\n\
+#define INTPTR_MIN[ \t]+INT32_MIN\n\
+#define INTPTR_MAX[ \t]+INT32_MAX\n\
+#endif";
+
+#define DARWIN_STDINT_2_TEST_CT 1
+static tTestDesc aDarwin_Stdint_2Tests[] = {
+ { TT_EGREP, zDarwin_Stdint_2Select0, (regex_t*)NULL }, };
/*
- * content bypass pattern - skip fix if pattern found
+ * Fix Command Arguments for Darwin_Stdint_2
*/
-tSCC zDjgpp_Wchar_HBypass0[] =
- "sys/djtypes.h";
-
-#define DJGPP_WCHAR_H_TEST_CT 2
-static tTestDesc aDjgpp_Wchar_HTests[] = {
- { TT_NEGREP, zDjgpp_Wchar_HBypass0, (regex_t*)NULL },
- { TT_EGREP, zDjgpp_Wchar_HSelect0, (regex_t*)NULL }, };
+static const char* apzDarwin_Stdint_2Patch[] = {
+ "format",
+ "#if __WORDSIZE == 64\n\
+#define INTPTR_MAX 9223372036854775807L\n\
+#define INTPTR_MIN (-INTPTR_MAX-1)\n\
+#else\n\
+#define INTPTR_MAX 2147483647L\n\
+#define INTPTR_MIN (-INTPTR_MAX-1)\n\
+#endif",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Darwin_Stdint_3 fix
+ */
+tSCC zDarwin_Stdint_3Name[] =
+ "darwin_stdint_3";
/*
- * Fix Command Arguments for Djgpp_Wchar_H
+ * File name selection pattern
*/
-static const char* apzDjgpp_Wchar_HPatch[] = {
+tSCC zDarwin_Stdint_3List[] =
+ "stdint-darwin.h\0stdint.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Stdint_3Machs[] = {
+ "*-*-darwin*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zDarwin_Stdint_3Select0[] =
+ "#if __WORDSIZE == 64\n\
+#define UINTPTR_MAX[ \t]+UINT64_MAX\n\
+#else\n\
+#define UINTPTR_MAX[ \t]+UINT32_MAX\n\
+#endif";
+
+#define DARWIN_STDINT_3_TEST_CT 1
+static tTestDesc aDarwin_Stdint_3Tests[] = {
+ { TT_EGREP, zDarwin_Stdint_3Select0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Darwin_Stdint_3
+ */
+static const char* apzDarwin_Stdint_3Patch[] = {
"format",
- "%0\n\
-#include ",
- "#include ",
+ "#if __WORDSIZE == 64\n\
+#define UINTPTR_MAX 18446744073709551615UL\n\
+#else\n\
+#define UINTPTR_MAX 4294967295UL\n\
+#endif",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Ecd_Cursor fix
+ * Description of Darwin_Stdint_4 fix
*/
-tSCC zEcd_CursorName[] =
- "ecd_cursor";
+tSCC zDarwin_Stdint_4Name[] =
+ "darwin_stdint_4";
/*
* File name selection pattern
*/
-tSCC zEcd_CursorList[] =
- "sunwindow/win_lock.h\0sunwindow/win_cursor.h\0";
+tSCC zDarwin_Stdint_4List[] =
+ "stdint-darwin.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
-#define apzEcd_CursorMachs (const char**)NULL
+tSCC* apzDarwin_Stdint_4Machs[] = {
+ "*-*-darwin*",
+ (const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
-tSCC zEcd_CursorSelect0[] =
- "ecd\\.cursor";
+tSCC zDarwin_Stdint_4Select0[] =
+ "#if __WORDSIZE == 64\n\
+#define SIZE_MAX[ \t]+UINT64_MAX\n\
+#else\n\
+#define SIZE_MAX[ \t]+UINT32_MAX\n\
+#endif";
-#define ECD_CURSOR_TEST_CT 1
-static tTestDesc aEcd_CursorTests[] = {
- { TT_EGREP, zEcd_CursorSelect0, (regex_t*)NULL }, };
+#define DARWIN_STDINT_4_TEST_CT 1
+static tTestDesc aDarwin_Stdint_4Tests[] = {
+ { TT_EGREP, zDarwin_Stdint_4Select0, (regex_t*)NULL }, };
/*
- * Fix Command Arguments for Ecd_Cursor
+ * Fix Command Arguments for Darwin_Stdint_4
*/
-static const char* apzEcd_CursorPatch[] = {
+static const char* apzDarwin_Stdint_4Patch[] = {
"format",
- "ecd_cursor",
+ "#if __WORDSIZE == 64\n\
+#define SIZE_MAX 18446744073709551615UL\n\
+#else\n\
+#define SIZE_MAX 4294967295UL\n\
+#endif",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Exception_Structure fix
+ * Description of Darwin_Stdint_5 fix
*/
-tSCC zException_StructureName[] =
- "exception_structure";
+tSCC zDarwin_Stdint_5Name[] =
+ "darwin_stdint_5";
/*
* File name selection pattern
*/
-tSCC zException_StructureList[] =
- "math.h\0";
+tSCC zDarwin_Stdint_5List[] =
+ "stdint-darwin.h\0stdint.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Stdint_5Machs[] = {
+ "*-*-darwin*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zDarwin_Stdint_5Select0[] =
+ "#define INTMAX_MIN[ \t]+INT64_MIN\n\
+#define INTMAX_MAX[ \t]+INT64_MAX\n\n\
+#define UINTMAX_MAX[ \t]+UINT64_MAX";
+
+#define DARWIN_STDINT_5_TEST_CT 1
+static tTestDesc aDarwin_Stdint_5Tests[] = {
+ { TT_EGREP, zDarwin_Stdint_5Select0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Darwin_Stdint_5
+ */
+static const char* apzDarwin_Stdint_5Patch[] = {
+ "format",
+ "#if __WORDSIZE == 64\n\
+#define INTMAX_MIN (-9223372036854775807L - 1)\n\
+#define INTMAX_MAX 9223372036854775807L\n\
+#define UINTMAX_MAX 18446744073709551615UL\n\
+#else\n\
+#define INTMAX_MIN (-9223372036854775807LL - 1)\n\
+#define INTMAX_MAX 9223372036854775807LL\n\
+#define UINTMAX_MAX 18446744073709551615ULL\n\
+#endif",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Darwin_Stdint_6 fix
+ */
+tSCC zDarwin_Stdint_6Name[] =
+ "darwin_stdint_6";
+
+/*
+ * File name selection pattern
+ */
+tSCC zDarwin_Stdint_6List[] =
+ "stdint-darwin.h\0stdint.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Stdint_6Machs[] = {
+ "*-*-darwin*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zDarwin_Stdint_6Select0[] =
+ "#if __WORDSIZE == 64\n\
+#define PTRDIFF_MIN[ \t]+INT64_MIN\n\
+#define PTRDIFF_MAX[ \t]+INT64_MAX\n\
+#else\n\
+#define PTRDIFF_MIN[ \t]+INT32_MIN\n\
+#define PTRDIFF_MAX[ \t]+INT32_MAX\n\
+#endif";
+
+#define DARWIN_STDINT_6_TEST_CT 1
+static tTestDesc aDarwin_Stdint_6Tests[] = {
+ { TT_EGREP, zDarwin_Stdint_6Select0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Darwin_Stdint_6
+ */
+static const char* apzDarwin_Stdint_6Patch[] = {
+ "format",
+ "#if __WORDSIZE == 64\n\
+#define PTRDIFF_MIN (-9223372036854775807L - 1)\n\
+#define PTRDIFF_MAX 9223372036854775807L\n\
+#else\n\
+#define PTRDIFF_MIN (-2147483647 - 1)\n\
+#define PTRDIFF_MAX 2147483647\n\
+#endif",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Darwin_Stdint_7 fix
+ */
+tSCC zDarwin_Stdint_7Name[] =
+ "darwin_stdint_7";
+
+/*
+ * File name selection pattern
+ */
+tSCC zDarwin_Stdint_7List[] =
+ "stdint-darwin.h\0stdint.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Stdint_7Machs[] = {
+ "*-*-darwin*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zDarwin_Stdint_7Select0[] =
+ "#define INTMAX_C\\(v\\)[ \t]+\\(v ## LL\\)\n\
+#define UINTMAX_C\\(v\\)[ \t]+\\(v ## ULL\\)";
+
+#define DARWIN_STDINT_7_TEST_CT 1
+static tTestDesc aDarwin_Stdint_7Tests[] = {
+ { TT_EGREP, zDarwin_Stdint_7Select0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Darwin_Stdint_7
+ */
+static const char* apzDarwin_Stdint_7Patch[] = {
+ "format",
+ "#if __WORDSIZE == 64\n\
+#define INTMAX_C(v) (v ## L)\n\
+#define UINTMAX_C(v) (v ## UL)\n\
+#else\n\
+#define INTMAX_C(v) (v ## LL)\n\
+#define UINTMAX_C(v) (v ## ULL)\n\
+#endif",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Dec_Intern_Asm fix
+ */
+tSCC zDec_Intern_AsmName[] =
+ "dec_intern_asm";
+
+/*
+ * File name selection pattern
+ */
+tSCC zDec_Intern_AsmList[] =
+ "c_asm.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzDec_Intern_AsmMachs (const char**)NULL
+#define DEC_INTERN_ASM_TEST_CT 0
+#define aDec_Intern_AsmTests (tTestDesc*)NULL
+
+/*
+ * Fix Command Arguments for Dec_Intern_Asm
+ */
+static const char* apzDec_Intern_AsmPatch[] = { sed_cmd_z,
+ "-e", "/^[ \t]*float[ \t]*fasm/i\\\n\
+#ifdef __DECC\n",
+ "-e", "/^[ \t]*#[ \t]*pragma[ \t]*intrinsic([ \t]*dasm/a\\\n\
+#endif\n",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Djgpp_Wchar_H fix
+ */
+tSCC zDjgpp_Wchar_HName[] =
+ "djgpp_wchar_h";
+
+/*
+ * File name selection pattern
+ */
+#define zDjgpp_Wchar_HList (char*)NULL
/*
* Machine/OS name selection pattern
*/
-#define apzException_StructureMachs (const char**)NULL
+#define apzDjgpp_Wchar_HMachs (const char**)NULL
/*
* content selection pattern - do fix if pattern found
*/
-tSCC zException_StructureSelect0[] =
- "matherr";
+tSCC zDjgpp_Wchar_HSelect0[] =
+ "__DJ_wint_t";
/*
* content bypass pattern - skip fix if pattern found
*/
-tSCC zException_StructureBypass0[] =
- "matherr.*(struct exception|__MATH_EXCEPTION|[ \\t]*__FP_EXCEPTION[ \\t]*\\*[ \\t]*)";
+tSCC zDjgpp_Wchar_HBypass0[] =
+ "sys/djtypes.h";
-#define EXCEPTION_STRUCTURE_TEST_CT 2
-static tTestDesc aException_StructureTests[] = {
- { TT_NEGREP, zException_StructureBypass0, (regex_t*)NULL },
- { TT_EGREP, zException_StructureSelect0, (regex_t*)NULL }, };
+#define DJGPP_WCHAR_H_TEST_CT 2
+static tTestDesc aDjgpp_Wchar_HTests[] = {
+ { TT_NEGREP, zDjgpp_Wchar_HBypass0, (regex_t*)NULL },
+ { TT_EGREP, zDjgpp_Wchar_HSelect0, (regex_t*)NULL }, };
/*
- * Fix Command Arguments for Exception_Structure
+ * Fix Command Arguments for Djgpp_Wchar_H
*/
-static const char* apzException_StructurePatch[] = {
- "wrap",
- "struct exception;\n",
+static const char* apzDjgpp_Wchar_HPatch[] = {
+ "format",
+ "%0\n\
+#include ",
+ "#include ",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Ecd_Cursor fix
+ */
+tSCC zEcd_CursorName[] =
+ "ecd_cursor";
+
+/*
+ * File name selection pattern
+ */
+tSCC zEcd_CursorList[] =
+ "sunwindow/win_lock.h\0sunwindow/win_cursor.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzEcd_CursorMachs (const char**)NULL
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zEcd_CursorSelect0[] =
+ "ecd\\.cursor";
+
+#define ECD_CURSOR_TEST_CT 1
+static tTestDesc aEcd_CursorTests[] = {
+ { TT_EGREP, zEcd_CursorSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Ecd_Cursor
+ */
+static const char* apzEcd_CursorPatch[] = {
+ "format",
+ "ecd_cursor",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -2151,12 +2643,24 @@ static tTestDesc aGlibc_C99_Inline_2Tests[] = {
/*
* 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\
+static const char* apzGlibc_C99_Inline_2Patch[] = { sed_cmd_z,
+ "-e", "s/extern int \\(stat\\)/#ifdef __GNUC_GNU_INLINE__\\\n\
+extern\\\n\
+#endif\\\n\
+__inline__ int \\1/",
+ "-e", "s/extern int \\([lf]stat\\)/#ifdef __GNUC_GNU_INLINE__\\\n\
+extern\\\n\
+#endif\\\n\
+__inline__ int \\1/",
+ "-e", "s/extern int \\(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\
+ "-e", "s/extern int __REDIRECT\\(_NTH\\)\\{0,1\\} (\\(stat\\)/#ifdef __GNUC_GNU_INLINE__\\\n\
+extern\\\n\
+#endif\\\n\
+__inline__ int __REDIRECT\\1 (\\2/",
+ "-e", "s/extern int __REDIRECT\\(_NTH\\)\\{0,1\\} (\\([lf]stat\\)/#ifdef __GNUC_GNU_INLINE__\\\n\
extern\\\n\
#endif\\\n\
__inline__ int __REDIRECT\\1 (\\2/",
@@ -2281,82 +2785,215 @@ static tTestDesc aGlibc_Mutex_InitTests[] = {
/*
* Fix Command Arguments for Glibc_Mutex_Init
*/
-static const char* apzGlibc_Mutex_InitPatch[] = { "sed",
- "-e", "/define[ \t]\\+PTHREAD_MUTEX_INITIALIZER[ \t]*\\\\/,+1s/{ { 0, } }/{ { 0, 0, 0, 0, 0, 0 } }/",
- "-e", "s/{ \\(0, 0, 0, 0, PTHREAD_MUTEX_\\(RECURSIVE\\|ERRORCHECK\\|ADAPTIVE\\)_NP\\) }/{ \\1, 0 }/",
- "-e", "s/{ \\(0, 0, 0, PTHREAD_MUTEX_\\(RECURSIVE\\|ERRORCHECK\\|ADAPTIVE\\)_NP\\) }/{ \\1, 0, 0 }/",
- "-e", "/define[ \t]\\+PTHREAD_RWLOCK_INITIALIZER[ \t]*\\\\/N;s/^[ \t]*#[ \t]*\\(define[ \t]\\+PTHREAD_RWLOCK_INITIALIZER[ \t]*\\\\\\)\\n[ \t]*{ { 0, } }/# if __WORDSIZE == 64\\n# \\1\\n { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }\\n# else\\n# \\1\\n { { 0, 0, 0, 0, 0, 0, 0, 0 } }\\n# endif/",
+static const char* apzGlibc_Mutex_InitPatch[] = { sed_cmd_z,
+ "-e", "/define[ \t]\\{1,\\}PTHREAD_MUTEX_INITIALIZER[ \t]*\\\\/{\n\
+N\n\
+s/{ { 0, } }/{ { 0, 0, 0, 0, 0, 0 } }/\n\
+}",
+ "-e", "s/{ \\(0, 0, 0, 0, PTHREAD_MUTEX_\\(RECURSIVE\\)_NP\\) }/{ \\1, 0 }/",
+ "-e", "s/{ \\(0, 0, 0, 0, PTHREAD_MUTEX_\\(ERRORCHECK\\)_NP\\) }/{ \\1, 0 }/",
+ "-e", "s/{ \\(0, 0, 0, 0, PTHREAD_MUTEX_\\(ADAPTIVE\\)_NP\\) }/{ \\1, 0 }/",
+ "-e", "s/{ \\(0, 0, 0, PTHREAD_MUTEX_\\(RECURSIVE\\)_NP\\) }/{ \\1, 0, 0 }/",
+ "-e", "s/{ \\(0, 0, 0, PTHREAD_MUTEX_\\(ERRORCHECK\\)_NP\\) }/{ \\1, 0, 0 }/",
+ "-e", "s/{ \\(0, 0, 0, PTHREAD_MUTEX_\\(ADAPTIVE\\)_NP\\) }/{ \\1, 0, 0 }/",
+ "-e", "/define[ \t]\\{1,\\}PTHREAD_RWLOCK_INITIALIZER[ \t]*\\\\/N;s/^[ \t]*#[ \t]*\\(define[ \t]\\{1,\\}PTHREAD_RWLOCK_INITIALIZER[ \t]*\\\\\\)\\n[ \t]*{ { 0, } }/# if __WORDSIZE == 64\\\n\
+# \\1\\\n\
+ { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }\\\n\
+# else\\\n\
+# \\1\\\n\
+ { { 0, 0, 0, 0, 0, 0, 0, 0 } }\\\n\
+# endif/",
"-e", "s/{ \\(0, 0, 0, 0, 0, 0, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP\\) }/{ \\1, 0 }/",
- "-e", "/define[ \t]\\+PTHREAD_COND_INITIALIZER/s/{ { 0, } }/{ { 0, 0, 0, 0, 0, (void *) 0, 0, 0 } }/",
+ "-e", "/define[ \t]\\{1,\\}PTHREAD_COND_INITIALIZER/s/{ { 0, } }/{ { 0, 0, 0, 0, 0, (void *) 0, 0, 0 } }/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Gnu_Types fix
+ * Description of Glibc_Stdint fix
*/
-tSCC zGnu_TypesName[] =
- "gnu_types";
+tSCC zGlibc_StdintName[] =
+ "glibc_stdint";
/*
* File name selection pattern
*/
-tSCC zGnu_TypesList[] =
- "sys/types.h\0stdlib.h\0sys/stdtypes.h\0stddef.h\0memory.h\0unistd.h\0";
+tSCC zGlibc_StdintList[] =
+ "stdint.h\0";
/*
* Machine/OS name selection pattern
*/
-tSCC* apzGnu_TypesMachs[] = {
- "*-*-solaris2.1[0-9]*",
- (const char*)NULL };
+#define apzGlibc_StdintMachs (const char**)NULL
/*
* content selection pattern - do fix if pattern found
*/
-tSCC zGnu_TypesSelect0[] =
- "^[ \t]*typedef[ \t]+.*[ \t](ptrdiff|size|wchar)_t;";
-
-/*
- * content bypass pattern - skip fix if pattern found
- */
-tSCC zGnu_TypesBypass0[] =
- "_GCC_(PTRDIFF|SIZE|WCHAR)_T";
+tSCC zGlibc_StdintSelect0[] =
+ "GNU C Library";
-#define GNU_TYPES_TEST_CT 2
-static tTestDesc aGnu_TypesTests[] = {
- { TT_NEGREP, zGnu_TypesBypass0, (regex_t*)NULL },
- { TT_EGREP, zGnu_TypesSelect0, (regex_t*)NULL }, };
+#define GLIBC_STDINT_TEST_CT 1
+static tTestDesc aGlibc_StdintTests[] = {
+ { TT_EGREP, zGlibc_StdintSelect0, (regex_t*)NULL }, };
/*
- * Fix Command Arguments for Gnu_Types
+ * Fix Command Arguments for Glibc_Stdint
*/
-static const char* apzGnu_TypesPatch[] = {
- "gnu_type",
+static const char* apzGlibc_StdintPatch[] = {
+ "format",
+ "# define UINT8_C(c)\tc\n\
+# define UINT16_C(c)\tc",
+ "# define UINT8_C\\(c\\)\tc ## U\n\
+# define UINT16_C\\(c\\)\tc ## U",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Hp_Inline fix
+ * Description of Glibc_Strncpy fix
*/
-tSCC zHp_InlineName[] =
- "hp_inline";
+tSCC zGlibc_StrncpyName[] =
+ "glibc_strncpy";
/*
* File name selection pattern
*/
-tSCC zHp_InlineList[] =
- "sys/spinlock.h\0machine/machparam.h\0";
+tSCC zGlibc_StrncpyList[] =
+ "bits/string2.h\0";
/*
* Machine/OS name selection pattern
*/
-#define apzHp_InlineMachs (const char**)NULL
+#define apzGlibc_StrncpyMachs (const char**)NULL
/*
- * content selection pattern - do fix if pattern found
+ * content bypass pattern - skip fix if pattern found
*/
-tSCC zHp_InlineSelect0[] =
- "[ \t]*#[ \t]*include[ \t]+\"\\.\\./machine/";
+tSCC zGlibc_StrncpyBypass0[] =
+ "__builtin_strncpy";
-#define HP_INLINE_TEST_CT 1
+#define GLIBC_STRNCPY_TEST_CT 1
+static tTestDesc aGlibc_StrncpyTests[] = {
+ { TT_NEGREP, zGlibc_StrncpyBypass0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Glibc_Strncpy
+ */
+static const char* apzGlibc_StrncpyPatch[] = {
+ "format",
+ "# define strncpy(dest, src, n) __builtin_strncpy (dest, src, n)",
+ "# define strncpy([^\n\
+]*\\\\\n\
+)*[^\n\
+]*",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Glibc_Tgmath fix
+ */
+tSCC zGlibc_TgmathName[] =
+ "glibc_tgmath";
+
+/*
+ * File name selection pattern
+ */
+tSCC zGlibc_TgmathList[] =
+ "tgmath.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzGlibc_TgmathMachs (const char**)NULL
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zGlibc_TgmathSelect0[] =
+ "\\(\\(\\(type\\) 0.25\\) && \\(\\(type\\) 0.25 - 1\\)\\)";
+
+/*
+ * content bypass pattern - skip fix if pattern found
+ */
+tSCC zGlibc_TgmathBypass0[] =
+ "__floating_type\\(type\\) \\\\\n\
+.*__builtin_classify_type";
+
+#define GLIBC_TGMATH_TEST_CT 2
+static tTestDesc aGlibc_TgmathTests[] = {
+ { TT_NEGREP, zGlibc_TgmathBypass0, (regex_t*)NULL },
+ { TT_EGREP, zGlibc_TgmathSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Glibc_Tgmath
+ */
+static const char* apzGlibc_TgmathPatch[] = {
+ "format",
+ "(__builtin_classify_type ((type) 0) == 8 || (__builtin_classify_type ((type) 0) == 9 && __builtin_classify_type (__real__ ((type) 0)) == 8))",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Gnu_Types fix
+ */
+tSCC zGnu_TypesName[] =
+ "gnu_types";
+
+/*
+ * File name selection pattern
+ */
+tSCC zGnu_TypesList[] =
+ "sys/types.h\0stdlib.h\0sys/stdtypes.h\0stddef.h\0memory.h\0unistd.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzGnu_TypesMachs[] = {
+ "*-*-solaris2.1[0-9]*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zGnu_TypesSelect0[] =
+ "^[ \t]*typedef[ \t]+.*[ \t](ptrdiff|size|wchar)_t;";
+
+/*
+ * content bypass pattern - skip fix if pattern found
+ */
+tSCC zGnu_TypesBypass0[] =
+ "_GCC_(PTRDIFF|SIZE|WCHAR)_T";
+
+#define GNU_TYPES_TEST_CT 2
+static tTestDesc aGnu_TypesTests[] = {
+ { TT_NEGREP, zGnu_TypesBypass0, (regex_t*)NULL },
+ { TT_EGREP, zGnu_TypesSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Gnu_Types
+ */
+static const char* apzGnu_TypesPatch[] = {
+ "gnu_type",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Hp_Inline fix
+ */
+tSCC zHp_InlineName[] =
+ "hp_inline";
+
+/*
+ * File name selection pattern
+ */
+tSCC zHp_InlineList[] =
+ "sys/spinlock.h\0machine/machparam.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzHp_InlineMachs (const char**)NULL
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zHp_InlineSelect0[] =
+ "[ \t]*#[ \t]*include[ \t]+\"\\.\\./machine/";
+
+#define HP_INLINE_TEST_CT 1
static tTestDesc aHp_InlineTests[] = {
{ TT_EGREP, zHp_InlineSelect0, (regex_t*)NULL }, };
@@ -2407,6 +3044,51 @@ static const char* apzHp_SysfilePatch[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * 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) || \\\n\
+ (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L))\n\
+%0#endif\n\n\
+#ifdef _INCLUDE_HPUX_SOURCE\n",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Hpux10_Cpp_Pow_Inline fix
*/
tSCC zHpux10_Cpp_Pow_InlineName[] =
@@ -2486,50 +3168,6 @@ static const char* apzHpux11_Cpp_Pow_InlinePatch[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * 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[] =
@@ -2709,7 +3347,7 @@ tSCC zHpux11_AbsList[] =
* Machine/OS name selection pattern
*/
tSCC* apzHpux11_AbsMachs[] = {
- "ia64-hp-hpux11*",
+ "*-hp-hpux11*",
(const char*)NULL };
/*
@@ -2776,6 +3414,43 @@ static const char* apzHpux11_FabsfPatch[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Hpux11_Pthread_Const fix
+ */
+tSCC zHpux11_Pthread_ConstName[] =
+ "hpux11_pthread_const";
+
+/*
+ * File name selection pattern
+ */
+tSCC zHpux11_Pthread_ConstList[] =
+ "sys/pthread.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzHpux11_Pthread_ConstMachs[] = {
+ "*-hp-hpux11.[0-3]*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zHpux11_Pthread_ConstSelect0[] =
+ "^#define[ \t]*__POINTER_SET[ \t]*\\(\\(void \\*\\) 1LL\\)";
+
+#define HPUX11_PTHREAD_CONST_TEST_CT 1
+static tTestDesc aHpux11_Pthread_ConstTests[] = {
+ { TT_EGREP, zHpux11_Pthread_ConstSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Hpux11_Pthread_Const
+ */
+static const char* apzHpux11_Pthread_ConstPatch[] = {
+ "format",
+ "#define __POINTER_SET\t\t((void *) 1L)",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Hpux11_Size_T fix
*/
tSCC zHpux11_Size_TName[] =
@@ -2847,41 +3522,6 @@ static const char* apzHpux11_SnprintfPatch[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Hpux11_Uint32_C fix
- */
-tSCC zHpux11_Uint32_CName[] =
- "hpux11_uint32_c";
-
-/*
- * File name selection pattern
- */
-tSCC zHpux11_Uint32_CList[] =
- "inttypes.h\0";
-/*
- * Machine/OS name selection pattern
- */
-#define apzHpux11_Uint32_CMachs (const char**)NULL
-
-/*
- * content selection pattern - do fix if pattern found
- */
-tSCC zHpux11_Uint32_CSelect0[] =
- "^#define UINT32_C\\(__c\\)[ \t]*__CONCAT__\\(__CONCAT_U__\\(__c\\),l\\)";
-
-#define HPUX11_UINT32_C_TEST_CT 1
-static tTestDesc aHpux11_Uint32_CTests[] = {
- { TT_EGREP, zHpux11_Uint32_CSelect0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for Hpux11_Uint32_C
- */
-static const char* apzHpux11_Uint32_CPatch[] = {
- "format",
- "#define UINT32_C(__c) __CONCAT__(__c,ul)",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
* Description of Hpux11_Vsnprintf fix
*/
tSCC zHpux11_VsnprintfName[] =
@@ -2952,7 +3592,7 @@ static tTestDesc aHpux8_Bogus_InlinesTests[] = {
/*
* Fix Command Arguments for Hpux8_Bogus_Inlines
*/
-static const char* apzHpux8_Bogus_InlinesPatch[] = { "sed",
+static const char* apzHpux8_Bogus_InlinesPatch[] = { sed_cmd_z,
"-e", "s@inline int abs(int [a-z][a-z]*) {.*}@extern \"C\" int abs(int);@",
"-e", "s@inline double abs(double [a-z][a-z]*) {.*}@@",
"-e", "s@inline int sqr(int [a-z][a-z]*) {.*}@@",
@@ -3015,7 +3655,7 @@ tSCC zHpux_HtonlList[] =
* content selection pattern - do fix if pattern found
*/
tSCC zHpux_HtonlSelect0[] =
- "#ifndef _XOPEN_SOURCE_EXTENDED\n\
+ "#ifndef _XOPEN_SOURCE_EXTENDED[ \t]*\n\
(/\\*\n\
\\* Macros for number representation conversion\\.\n\
\\*/\n\
@@ -3049,7 +3689,10 @@ tSCC zHpux_Long_DoubleList[] =
/*
* Machine/OS name selection pattern
*/
-#define apzHpux_Long_DoubleMachs (const char**)NULL
+tSCC* apzHpux_Long_DoubleMachs[] = {
+ "*-*-hpux10*",
+ "*-*-hpux11.[012]*",
+ (const char*)NULL };
/*
* content selection pattern - do fix if pattern found
@@ -3071,36 +3714,73 @@ static tTestDesc aHpux_Long_DoubleTests[] = {
/*
* Fix Command Arguments for Hpux_Long_Double
*/
-static const char* apzHpux_Long_DoublePatch[] = { "sed",
+static const char* apzHpux_Long_DoublePatch[] = { sed_cmd_z,
"-e", "/^#[ \t]*ifndef _LONG_DOUBLE/,/\\/\\* _LONG_DOUBLE \\*\\//D",
"-e", "s/long_double/long double/g",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Hpux_Systime fix
+ * Description of Hpux_Long_Double_2 fix
*/
-tSCC zHpux_SystimeName[] =
- "hpux_systime";
+tSCC zHpux_Long_Double_2Name[] =
+ "hpux_long_double_2";
/*
* File name selection pattern
*/
-tSCC zHpux_SystimeList[] =
- "sys/time.h\0";
+tSCC zHpux_Long_Double_2List[] =
+ "stdlib.h\0";
/*
* Machine/OS name selection pattern
*/
-#define apzHpux_SystimeMachs (const char**)NULL
+tSCC* apzHpux_Long_Double_2Machs[] = {
+ "hppa*-*-hpux11.3*",
+ (const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
-tSCC zHpux_SystimeSelect0[] =
- "^extern struct sigevent;";
+tSCC zHpux_Long_Double_2Select0[] =
+ "#[ \t]*if[ \t]*!defined\\(__ia64\\) \\|\\| defined\\(_PROTOTYPES\\) \\|\\| defined\\(_LONG_DOUBLE_STRUCT\\)";
-#define HPUX_SYSTIME_TEST_CT 1
-static tTestDesc aHpux_SystimeTests[] = {
+#define HPUX_LONG_DOUBLE_2_TEST_CT 1
+static tTestDesc aHpux_Long_Double_2Tests[] = {
+ { TT_EGREP, zHpux_Long_Double_2Select0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Hpux_Long_Double_2
+ */
+static const char* apzHpux_Long_Double_2Patch[] = {
+ "format",
+ "# if !defined(_PROTOTYPES) || defined(_LONG_DOUBLE_STRUCT)",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Hpux_Systime fix
+ */
+tSCC zHpux_SystimeName[] =
+ "hpux_systime";
+
+/*
+ * File name selection pattern
+ */
+tSCC zHpux_SystimeList[] =
+ "sys/time.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzHpux_SystimeMachs (const char**)NULL
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zHpux_SystimeSelect0[] =
+ "^extern struct sigevent;";
+
+#define HPUX_SYSTIME_TEST_CT 1
+static tTestDesc aHpux_SystimeTests[] = {
{ TT_EGREP, zHpux_SystimeSelect0, (regex_t*)NULL }, };
/*
@@ -3122,7 +3802,7 @@ tSCC zHpux_Spu_InfoName[] =
* File name selection pattern
*/
tSCC zHpux_Spu_InfoList[] =
- "ia64/sys/getppdp.h\0";
+ "ia64/sys/getppdp.h\0*/sys/getppdp.h\0";
/*
* Machine/OS name selection pattern
*/
@@ -3274,79 +3954,248 @@ extern \"C\" {\n\
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Hpux11_Pthread_Const fix
+ * Description of Hpux_Pthread_Initializers fix
*/
-tSCC zHpux11_Pthread_ConstName[] =
- "hpux11_pthread_const";
+tSCC zHpux_Pthread_InitializersName[] =
+ "hpux_pthread_initializers";
/*
* File name selection pattern
*/
-tSCC zHpux11_Pthread_ConstList[] =
+tSCC zHpux_Pthread_InitializersList[] =
"sys/pthread.h\0";
/*
* Machine/OS name selection pattern
*/
-tSCC* apzHpux11_Pthread_ConstMachs[] = {
+tSCC* apzHpux_Pthread_InitializersMachs[] = {
"*-hp-hpux11.[0-3]*",
(const char*)NULL };
+#define HPUX_PTHREAD_INITIALIZERS_TEST_CT 0
+#define aHpux_Pthread_InitializersTests (tTestDesc*)NULL
+
+/*
+ * Fix Command Arguments for Hpux_Pthread_Initializers
+ */
+static const char* apzHpux_Pthread_InitializersPatch[] = { sed_cmd_z,
+ "-e", "s@^[ \t]*1, 1, 1, 1,[ \t]*\\\\@\t{ 1, 1, 1, 1 },\t\t\t\t\t\t\t\\\\@",
+ "-e", "s@^[ \t]*1,[ \t]*\\\\@\t{ 1, 0 }@",
+ "-e", "/^[ \t]*0$/d",
+ "-e", "s@__PTHREAD_MUTEX_VALID, 0@{ __PTHREAD_MUTEX_VALID, 0 }@",
+ "-e", "s@^[ \t]*0, 0, -1, 0,[ \t]*\\\\@\t{ 0, 0, -1, 0 },\t\t\t\t\t\t\\\\@",
+ "-e", "s@0, __LWP_MTX_VALID, 0, 1, 1, 1, 1,[ \t]*\\\\@{ 0, __LWP_MTX_VALID }, { 0, 1, 1, 1, 1 },\t\t\t\\\\@",
+ "-e", "s@^[ \t]*__LWP_MTX_VALID, 0, 1, 1, 1, 1,[ \t]*\\\\@\t{ 0, __LWP_MTX_VALID }, { 0, 1, 1, 1, 1 },\t\t\t\\\\@",
+ "-e", "s@^[ \t]*0, 0[ \t]*\\\\@\t{ 0, 0 }\t\t\t\t\t\t\t\\\\@",
+ "-e", "s@__PTHREAD_COND_VALID, 0@{ __PTHREAD_COND_VALID, 0 }@",
+ "-e", "s@__LWP_COND_VALID, 0,[ \t]*\\\\@{ __LWP_COND_VALID, 0 },\t\t\t\t\t\\\\@",
+ "-e", "s@__PTHREAD_RWLOCK_VALID, 0@{ __PTHREAD_RWLOCK_VALID, 0 }@",
+ "-e", "s@__LWP_RWLOCK_VALID, 0,[ \t]*\\\\@{ __LWP_RWLOCK_VALID, 0 },\t\t\t\t\t\\\\@",
+ "-e", "s@^[ \t]*0, 0, 0, 0, 0, 0, 0[ \t]*\\\\@\t{ 0, 0, 0, 0, 0 }, { 0, 0}\t\t\t\t\t\\\\@",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Hpux_C99_Intptr fix
+ */
+tSCC zHpux_C99_IntptrName[] =
+ "hpux_c99_intptr";
+
+/*
+ * File name selection pattern
+ */
+tSCC zHpux_C99_IntptrList[] =
+ "stdint-hpux11.h\0stdint.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzHpux_C99_IntptrMachs[] = {
+ "*-hp-hpux11.3*",
+ (const char*)NULL };
+#define HPUX_C99_INTPTR_TEST_CT 0
+#define aHpux_C99_IntptrTests (tTestDesc*)NULL
+
+/*
+ * Fix Command Arguments for Hpux_C99_Intptr
+ */
+static const char* apzHpux_C99_IntptrPatch[] = { sed_cmd_z,
+ "-e", "s@^[ \t]*#[ \t]*define[ \t]*PTRDIFF_MAX[ \t]*INT32_MAX[ \t]*$@#define PTRDIFF_MAX (2147483647l)@",
+ "-e", "s@^[ \t]*#[ \t]*define[ \t]*PTRDIFF_MIN[ \t]*INT32_MIN[ \t]*$@#define PTRDIFF_MIN (-PTRDIFF_MAX - 1)@",
+ "-e", "s@^[ \t]*#[ \t]*define[ \t]*INTPTR_MAX[ \t]*INT32_MAX[ \t]*$@#define INTPTR_MAX (2147483647l)@",
+ "-e", "s@^[ \t]*#[ \t]*define[ \t]*INTPTR_MIN[ \t]*INT32_MIN[ \t]*$@#define INTPTR_MIN (-INTPTR_MAX - 1)@",
+ "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINTPTR_MAX[ \t]*UINT32_MAX[ \t]*$@#define UINTPTR_MAX (4294967295ul)@",
+ "-e", "s@^[ \t]*#[ \t]*define[ \t]*SIZE_MAX[ \t]*UINT32_MAX[ \t]*$@#define SIZE_MAX (4294967295ul)@",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Hpux_C99_Inttypes fix
+ */
+tSCC zHpux_C99_InttypesName[] =
+ "hpux_c99_inttypes";
+
+/*
+ * File name selection pattern
+ */
+tSCC zHpux_C99_InttypesList[] =
+ "inttypes.h\0stdint-hpux11.h\0stdint.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzHpux_C99_InttypesMachs[] = {
+ "*-hp-hpux11.[23]*",
+ (const char*)NULL };
+#define HPUX_C99_INTTYPES_TEST_CT 0
+#define aHpux_C99_InttypesTests (tTestDesc*)NULL
+
+/*
+ * Fix Command Arguments for Hpux_C99_Inttypes
+ */
+static const char* apzHpux_C99_InttypesPatch[] = { sed_cmd_z,
+ "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT8_C(__c)[ \t]*__CONCAT_U__(__c)[ \t]*$@#define UINT8_C(__c) (__c)@",
+ "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT16_C(__c)[ \t]*__CONCAT_U__(__c)[ \t]*$@#define UINT16_C(__c) (__c)@",
+ "-e", "s@^[ \t]*#[ \t]*define[ \t]*INT32_C(__c)[ \t]*__CONCAT__(__c,l)[ \t]*$@#define INT32_C(__c) (__c)@",
+ "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT32_C(__c)[ \t].*$@#define UINT32_C(__c) __CONCAT__(__c,u)@",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Hpux_C99_Inttypes2 fix
+ */
+tSCC zHpux_C99_Inttypes2Name[] =
+ "hpux_c99_inttypes2";
+
+/*
+ * File name selection pattern
+ */
+tSCC zHpux_C99_Inttypes2List[] =
+ "stdint-hpux11.h\0stdint.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzHpux_C99_Inttypes2Machs[] = {
+ "*-hp-hpux11.2*",
+ (const char*)NULL };
+#define HPUX_C99_INTTYPES2_TEST_CT 0
+#define aHpux_C99_Inttypes2Tests (tTestDesc*)NULL
+
+/*
+ * Fix Command Arguments for Hpux_C99_Inttypes2
+ */
+static const char* apzHpux_C99_Inttypes2Patch[] = { sed_cmd_z,
+ "-e", "s@^[ \t]*#[ \t]*define[ \t]*INT8_C(__c)[ \t]*((signed char)(__c))[ \t]*$@#define INT8_C(__c) (__c)@",
+ "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT8_C(__c)[ \t]*((unsigned char)(__c))[ \t]*$@#define UINT8_C(__c) (__c)@",
+ "-e", "s@^[ \t]*#[ \t]*define[ \t]*INT16_C(__c)[ \t]*((short)(__c))[ \t]*$@#define INT16_C(__c) (__c)@",
+ "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT16_C(__c)[ \t]*((unsigned short)(__c))[ \t]*$@#define UINT16_C(__c) (__c)@",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Hpux_Stdint_Least_Fast fix
+ */
+tSCC zHpux_Stdint_Least_FastName[] =
+ "hpux_stdint_least_fast";
+
+/*
+ * File name selection pattern
+ */
+tSCC zHpux_Stdint_Least_FastList[] =
+ "stdint-hpux11.h\0stdint.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzHpux_Stdint_Least_FastMachs[] = {
+ "*-hp-hpux11.2*",
+ (const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
-tSCC zHpux11_Pthread_ConstSelect0[] =
- "^#define[ \t]*__POINTER_SET[ \t]*\\(\\(void \\*\\) 1LL\\)";
+tSCC zHpux_Stdint_Least_FastSelect0[] =
+ "^[ \t]*#[ \t]*define[ \t]+UINT_(LEAST|FAST)64_MAX[ \t]+ULLONG_MAX";
-#define HPUX11_PTHREAD_CONST_TEST_CT 1
-static tTestDesc aHpux11_Pthread_ConstTests[] = {
- { TT_EGREP, zHpux11_Pthread_ConstSelect0, (regex_t*)NULL }, };
+#define HPUX_STDINT_LEAST_FAST_TEST_CT 1
+static tTestDesc aHpux_Stdint_Least_FastTests[] = {
+ { TT_EGREP, zHpux_Stdint_Least_FastSelect0, (regex_t*)NULL }, };
/*
- * Fix Command Arguments for Hpux11_Pthread_Const
+ * Fix Command Arguments for Hpux_Stdint_Least_Fast
*/
-static const char* apzHpux11_Pthread_ConstPatch[] = {
+static const char* apzHpux_Stdint_Least_FastPatch[] = {
"format",
- "#define __POINTER_SET\t\t((void *) 1L)",
+ "# define\tUINT_%164_MAX\t__UINT64_MAX__",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Hpux_Pthread_Initializers fix
+ * Description of Hpux_Inttype_Int8_T fix
*/
-tSCC zHpux_Pthread_InitializersName[] =
- "hpux_pthread_initializers";
+tSCC zHpux_Inttype_Int8_TName[] =
+ "hpux_inttype_int8_t";
/*
* File name selection pattern
*/
-tSCC zHpux_Pthread_InitializersList[] =
- "sys/pthread.h\0";
+tSCC zHpux_Inttype_Int8_TList[] =
+ "sys/_inttypes.h\0";
/*
* Machine/OS name selection pattern
*/
-tSCC* apzHpux_Pthread_InitializersMachs[] = {
- "*-hp-hpux11.[0-3]*",
+tSCC* apzHpux_Inttype_Int8_TMachs[] = {
+ "*-hp-hpux1[01].*",
(const char*)NULL };
-#define HPUX_PTHREAD_INITIALIZERS_TEST_CT 0
-#define aHpux_Pthread_InitializersTests (tTestDesc*)NULL
/*
- * Fix Command Arguments for Hpux_Pthread_Initializers
+ * content selection pattern - do fix if pattern found
*/
-static const char* apzHpux_Pthread_InitializersPatch[] = { "sed",
- "-e", "s@^[ \t]*1, 1, 1, 1,[ \t]*\\\\@\t{ 1, 1, 1, 1 },\t\t\t\t\t\t\t\\\\@",
- "-e", "s@^[ \t]*1,[ \t]*\\\\@\t{ 1, 0 }@",
- "-e", "/^[ \t]*0$/d",
- "-e", "s@__PTHREAD_MUTEX_VALID, 0@{ __PTHREAD_MUTEX_VALID, 0 }@",
- "-e", "s@^[ \t]*0, 0, -1, 0,[ \t]*\\\\@\t{ 0, 0, -1, 0 },\t\t\t\t\t\t\\\\@",
- "-e", "s@0, __LWP_MTX_VALID, 0, 1, 1, 1, 1,[ \t]*\\\\@{ 0, __LWP_MTX_VALID }, { 0, 1, 1, 1, 1 },\t\t\t\\\\@",
- "-e", "s@^[ \t]*__LWP_MTX_VALID, 0, 1, 1, 1, 1,[ \t]*\\\\@\t{ 0, __LWP_MTX_VALID }, { 0, 1, 1, 1, 1 },\t\t\t\\\\@",
- "-e", "s@^[ \t]*0, 0[ \t]*\\\\@\t{ 0, 0 }\t\t\t\t\t\t\t\\\\@",
- "-e", "s@__PTHREAD_COND_VALID, 0@{ __PTHREAD_COND_VALID, 0 }@",
- "-e", "s@__LWP_COND_VALID, 0,[ \t]*\\\\@{ __LWP_COND_VALID, 0 },\t\t\t\t\t\\\\@",
- "-e", "s@__PTHREAD_RWLOCK_VALID, 0@{ __PTHREAD_RWLOCK_VALID, 0 }@",
- "-e", "s@__LWP_RWLOCK_VALID, 0,[ \t]*\\\\@{ __LWP_RWLOCK_VALID, 0 },\t\t\t\t\t\\\\@",
- "-e", "s@^[ \t]*0, 0, 0, 0, 0, 0, 0[ \t]*\\\\@\t{ 0, 0, 0, 0, 0 }, { 0, 0}\t\t\t\t\t\\\\@",
+tSCC zHpux_Inttype_Int8_TSelect0[] =
+ "^[ \t]*typedef[ \t]*char[ \t]*int(_least){0,1}8_t.*";
+
+#define HPUX_INTTYPE_INT8_T_TEST_CT 1
+static tTestDesc aHpux_Inttype_Int8_TTests[] = {
+ { TT_EGREP, zHpux_Inttype_Int8_TSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Hpux_Inttype_Int8_T
+ */
+static const char* apzHpux_Inttype_Int8_TPatch[] = {
+ "format",
+ "typedef signed char int%18_t;",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Hpux_Imaginary_I fix
+ */
+tSCC zHpux_Imaginary_IName[] =
+ "hpux_imaginary_i";
+
+/*
+ * File name selection pattern
+ */
+tSCC zHpux_Imaginary_IList[] =
+ "complex.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzHpux_Imaginary_IMachs[] = {
+ "ia64-hp-hpux11.*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zHpux_Imaginary_ISelect0[] =
+ "^[ \t]*#[ \t]*define[ \t]*_Complex_I.*";
+
+#define HPUX_IMAGINARY_I_TEST_CT 1
+static tTestDesc aHpux_Imaginary_ITests[] = {
+ { TT_EGREP, zHpux_Imaginary_ISelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Hpux_Imaginary_I
+ */
+static const char* apzHpux_Imaginary_IPatch[] = {
+ "format",
+ "#define _Complex_I (__extension__ 1.0iF)",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -3615,7 +4464,7 @@ static tTestDesc aIp_Missing_SemiTests[] = {
/*
* Fix Command Arguments for Ip_Missing_Semi
*/
-static const char* apzIp_Missing_SemiPatch[] = { "sed",
+static const char* apzIp_Missing_SemiPatch[] = { sed_cmd_z,
"-e", "/^struct/,/^};/s/}$/};/",
(char*)NULL };
@@ -3779,6 +4628,45 @@ static const char* apzIrix_Asm_ApostrophePatch[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Irix_Complex fix
+ */
+tSCC zIrix_ComplexName[] =
+ "irix_complex";
+
+/*
+ * File name selection pattern
+ */
+tSCC zIrix_ComplexList[] =
+ "complex.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzIrix_ComplexMachs[] = {
+ "mips-sgi-irix6.5",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zIrix_ComplexSelect0[] =
+ "#define[ \t]_Complex_I[ \t]\\(\\(float[ \t]_Complex\\)[ \t]\\(__I__\\)\\)";
+
+#define IRIX_COMPLEX_TEST_CT 1
+static tTestDesc aIrix_ComplexTests[] = {
+ { TT_EGREP, zIrix_ComplexSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Irix_Complex
+ */
+static const char* apzIrix_ComplexPatch[] = { sed_cmd_z,
+ "-e", "s/#define[ \t]_Complex_I[ \t]((float[ \t]_Complex)[ \t](__I__))/#define _Complex_I (__extension__ 1.0iF)/",
+ "-e", "/#define[ \t]imaginary[ \t]_Imaginary/d",
+ "-e", "/#define[ \t]_Imaginary_I/d",
+ "-e", "s/#define[ \t]I[ \t]_Imaginary_I/#define I _Complex_I/",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Irix_Limits_Const fix
*/
tSCC zIrix_Limits_ConstName[] =
@@ -3814,6 +4702,43 @@ static const char* apzIrix_Limits_ConstPatch[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Irix_Pthread_Init fix
+ */
+tSCC zIrix_Pthread_InitName[] =
+ "irix_pthread_init";
+
+/*
+ * File name selection pattern
+ */
+tSCC zIrix_Pthread_InitList[] =
+ "pthread.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzIrix_Pthread_InitMachs[] = {
+ "mips-sgi-irix6.5",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zIrix_Pthread_InitSelect0[] =
+ "^(#define[ \t]+PTHREAD_.*_INITIALIZER[ \t]+)(\\{ 0 \\})";
+
+#define IRIX_PTHREAD_INIT_TEST_CT 1
+static tTestDesc aIrix_Pthread_InitTests[] = {
+ { TT_EGREP, zIrix_Pthread_InitSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Irix_Pthread_Init
+ */
+static const char* apzIrix_Pthread_InitPatch[] = {
+ "format",
+ "%1{ %2 }",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Irix_Socklen_T fix
*/
tSCC zIrix_Socklen_TName[] =
@@ -3856,38 +4781,38 @@ typedef int socklen_t;\n\
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Irix_Stdint_C99 fix
+ * Description of Irix_Stdint_C99_Mode fix
*/
-tSCC zIrix_Stdint_C99Name[] =
- "irix_stdint_c99";
+tSCC zIrix_Stdint_C99_ModeName[] =
+ "irix_stdint_c99_mode";
/*
* File name selection pattern
*/
-tSCC zIrix_Stdint_C99List[] =
+tSCC zIrix_Stdint_C99_ModeList[] =
"stdint.h\0";
/*
* Machine/OS name selection pattern
*/
-tSCC* apzIrix_Stdint_C99Machs[] = {
+tSCC* apzIrix_Stdint_C99_ModeMachs[] = {
"mips-sgi-irix6.5",
(const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
-tSCC zIrix_Stdint_C99Select0[] =
+tSCC zIrix_Stdint_C99_ModeSelect0[] =
"(#ifndef __c99\n\
)(#error This header file is to be used only for c99 mode compilations)";
-#define IRIX_STDINT_C99_TEST_CT 1
-static tTestDesc aIrix_Stdint_C99Tests[] = {
- { TT_EGREP, zIrix_Stdint_C99Select0, (regex_t*)NULL }, };
+#define IRIX_STDINT_C99_MODE_TEST_CT 1
+static tTestDesc aIrix_Stdint_C99_ModeTests[] = {
+ { TT_EGREP, zIrix_Stdint_C99_ModeSelect0, (regex_t*)NULL }, };
/*
- * Fix Command Arguments for Irix_Stdint_C99
+ * Fix Command Arguments for Irix_Stdint_C99_Mode
*/
-static const char* apzIrix_Stdint_C99Patch[] = {
+static const char* apzIrix_Stdint_C99_ModePatch[] = {
"format",
"#if 0\n\
%2",
@@ -3895,146 +4820,153 @@ static const char* apzIrix_Stdint_C99Patch[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Irix_Stdio_Va_List fix
+ * Description of Irix_Stdint_C99_Types fix
*/
-tSCC zIrix_Stdio_Va_ListName[] =
- "irix_stdio_va_list";
+tSCC zIrix_Stdint_C99_TypesName[] =
+ "irix_stdint_c99_types";
/*
* File name selection pattern
*/
-tSCC zIrix_Stdio_Va_ListList[] =
- "stdio.h\0internal/stdio_core.h\0";
+tSCC zIrix_Stdint_C99_TypesList[] =
+ "stdint-irix65.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
-#define apzIrix_Stdio_Va_ListMachs (const char**)NULL
-
-/*
- * content selection pattern - do fix if pattern found
- */
-tSCC zIrix_Stdio_Va_ListSelect0[] =
- "/\\* va_list \\*/ char \\*";
-
-#define IRIX_STDIO_VA_LIST_TEST_CT 1
-static tTestDesc aIrix_Stdio_Va_ListTests[] = {
- { TT_EGREP, zIrix_Stdio_Va_ListSelect0, (regex_t*)NULL }, };
+tSCC* apzIrix_Stdint_C99_TypesMachs[] = {
+ "mips-sgi-irix6.5",
+ (const char*)NULL };
+#define IRIX_STDINT_C99_TYPES_TEST_CT 0
+#define aIrix_Stdint_C99_TypesTests (tTestDesc*)NULL
/*
- * Fix Command Arguments for Irix_Stdio_Va_List
+ * Fix Command Arguments for Irix_Stdint_C99_Types
*/
-static const char* apzIrix_Stdio_Va_ListPatch[] = {
- "format",
- "__gnuc_va_list",
+static const char* apzIrix_Stdint_C99_TypesPatch[] = { sed_cmd_z,
+ "-e", "s@^#define INT64_MIN.*(-0x7fffffffffffffff - 1)$@#define INT64_MIN (-0x7fffffffffffffffLL - 1)@",
+ "-e", "s@^#define INT64_MAX.*0x7fffffffffffffff$@#define INT64_MAX 0x7fffffffffffffffLL@",
+ "-e", "s@^#define UINT32_MAX.*0xffffffff$@#define UINT32_MAX 0xffffffffU@",
+ "-e", "s@^#define UINT64_MAX.*0xffffffffffffffff$@#define UINT64_MAX 0xffffffffffffffffULL@",
+ "-e", "s@^#define INTPTR_MIN.*INT32_MIN$@#define INTPTR_MIN (-0x7fffffffL - 1)@",
+ "-e", "s@^#define INTPTR_MAX.*INT32_MAX$@#define INTPTR_MAX 0x7fffffffL@",
+ "-e", "s@^#define UINTPTR_MAX.*UINT32_MAX$@#define UINTPTR_MAX 0xffffffffUL@",
+ "-e", "s@^#define INTPTR_MIN.*INT64_MIN@#define INTPTR_MIN (-0x7fffffffffffffffL - 1)@",
+ "-e", "s@^#define INTPTR_MAX.*INT64_MAX$@#define INTPTR_MAX 0x7fffffffffffffffL@",
+ "-e", "s@^#define UINTPTR_MAX.*UINT64_MAX$@#define UINTPTR_MAX 0xffffffffffffffffUL@",
+ "-e", "s@^#define PTRDIFF_MIN.*INT64_MIN$@#define PTRDIFF_MIN (-0x7fffffffffffffffL - 1)@",
+ "-e", "s@^#define PTRDIFF_MAX.*INT64_MAX$@#define PTRDIFF_MAX 0x7fffffffffffffffL@",
+ "-e", "s@^#define SIZE_MAX.*UINT64_MAX$@#define SIZE_MAX 0xffffffffffffffffUL@",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Irix_Wcsftime fix
+ * Description of Irix_Stdint_C99_Macros fix
*/
-tSCC zIrix_WcsftimeName[] =
- "irix_wcsftime";
+tSCC zIrix_Stdint_C99_MacrosName[] =
+ "irix_stdint_c99_macros";
/*
* File name selection pattern
*/
-tSCC zIrix_WcsftimeList[] =
- "internal/wchar_core.h\0";
+tSCC zIrix_Stdint_C99_MacrosList[] =
+ "stdint-irix65.h\0stdint.h\0";
/*
* Machine/OS name selection pattern
*/
-tSCC* apzIrix_WcsftimeMachs[] = {
+tSCC* apzIrix_Stdint_C99_MacrosMachs[] = {
"mips-sgi-irix6.5",
(const char*)NULL };
+#define IRIX_STDINT_C99_MACROS_TEST_CT 0
+#define aIrix_Stdint_C99_MacrosTests (tTestDesc*)NULL
/*
- * content selection pattern - do fix if pattern found
+ * Fix Command Arguments for Irix_Stdint_C99_Macros
*/
-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",
+static const char* apzIrix_Stdint_C99_MacrosPatch[] = { sed_cmd_z,
+ "-e", "s@^#define INT8_C(x).*int.*_t.*$@#define INT8_C(x) (x)@",
+ "-e", "s@^#define INT16_C(x).*int.*_t.*$@#define INT16_C(x) (x)@",
+ "-e", "s@^#define INT32_C(x).*int.*_t.*$@#define INT32_C(x) (x)@",
+ "-e", "s@^#define INT64_C(x).*int.*_t.*$@#define INT64_C(x) (x ## LL)@",
+ "-e", "s@^#define UINT8_C(x).*int.*_t.*$@#define UINT8_C(x) (x)@",
+ "-e", "s@^#define UINT16_C(x).*int.*_t.*$@#define UINT16_C(x) (x)@",
+ "-e", "s@^#define UINT32_C(x).*int.*_t.*$@#define UINT32_C(x) (x ## U)@",
+ "-e", "s@^#define UINT64_C(x).*int.*_t.*$@#define UINT64_C(x) (x ## ULL)@",
+ "-e", "s@^#define INTMAX_C(x).*int.*_t.*$@#define INTMAX_C(x) (x ## LL)@",
+ "-e", "s@^#define UINTMAX_C(x).*int.*_t.*$@#define UINTMAX_C(x) (x ## ULL)@",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Isc_Fmod fix
+ * Description of Irix_Stdio_Va_List fix
*/
-tSCC zIsc_FmodName[] =
- "isc_fmod";
+tSCC zIrix_Stdio_Va_ListName[] =
+ "irix_stdio_va_list";
/*
* File name selection pattern
*/
-tSCC zIsc_FmodList[] =
- "math.h\0";
+tSCC zIrix_Stdio_Va_ListList[] =
+ "stdio.h\0internal/stdio_core.h\0";
/*
* Machine/OS name selection pattern
*/
-#define apzIsc_FmodMachs (const char**)NULL
+#define apzIrix_Stdio_Va_ListMachs (const char**)NULL
/*
* content selection pattern - do fix if pattern found
*/
-tSCC zIsc_FmodSelect0[] =
- "fmod\\(double\\)";
+tSCC zIrix_Stdio_Va_ListSelect0[] =
+ "/\\* va_list \\*/ char \\*";
-#define ISC_FMOD_TEST_CT 1
-static tTestDesc aIsc_FmodTests[] = {
- { TT_EGREP, zIsc_FmodSelect0, (regex_t*)NULL }, };
+#define IRIX_STDIO_VA_LIST_TEST_CT 1
+static tTestDesc aIrix_Stdio_Va_ListTests[] = {
+ { TT_EGREP, zIrix_Stdio_Va_ListSelect0, (regex_t*)NULL }, };
/*
- * Fix Command Arguments for Isc_Fmod
+ * Fix Command Arguments for Irix_Stdio_Va_List
*/
-static const char* apzIsc_FmodPatch[] = {
+static const char* apzIrix_Stdio_Va_ListPatch[] = {
"format",
- "fmod(double, double)",
+ "__gnuc_va_list",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Isc_Omits_With_Stdc fix
+ * Description of Irix_Wcsftime fix
*/
-tSCC zIsc_Omits_With_StdcName[] =
- "isc_omits_with_stdc";
+tSCC zIrix_WcsftimeName[] =
+ "irix_wcsftime";
/*
* File name selection pattern
*/
-tSCC zIsc_Omits_With_StdcList[] =
- "stdio.h\0math.h\0ctype.h\0sys/limits.h\0sys/fcntl.h\0sys/dirent.h\0";
+tSCC zIrix_WcsftimeList[] =
+ "internal/wchar_core.h\0";
/*
* Machine/OS name selection pattern
*/
-#define apzIsc_Omits_With_StdcMachs (const char**)NULL
+tSCC* apzIrix_WcsftimeMachs[] = {
+ "mips-sgi-irix6.5",
+ (const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
-tSCC zIsc_Omits_With_StdcSelect0[] =
- "!defined\\(__STDC__\\) && !defined\\(_POSIX_SOURCE\\)";
+tSCC zIrix_WcsftimeSelect0[] =
+ "#if _NO_XOPEN5\n\
+(extern size_t[ \t]+wcsftime.*const char *.*)";
-#define ISC_OMITS_WITH_STDC_TEST_CT 1
-static tTestDesc aIsc_Omits_With_StdcTests[] = {
- { TT_EGREP, zIsc_Omits_With_StdcSelect0, (regex_t*)NULL }, };
+#define IRIX_WCSFTIME_TEST_CT 1
+static tTestDesc aIrix_WcsftimeTests[] = {
+ { TT_EGREP, zIrix_WcsftimeSelect0, (regex_t*)NULL }, };
/*
- * Fix Command Arguments for Isc_Omits_With_Stdc
+ * Fix Command Arguments for Irix_Wcsftime
*/
-static const char* apzIsc_Omits_With_StdcPatch[] = {
+static const char* apzIrix_WcsftimePatch[] = {
"format",
- "!defined(_POSIX_SOURCE)",
+ "#if _NO_XOPEN5 && !defined(__c99)\n\
+%1",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -4393,41 +5325,6 @@ static const char* apzNested_Auth_DesPatch[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Nested_Sys_Limits fix
- */
-tSCC zNested_Sys_LimitsName[] =
- "nested_sys_limits";
-
-/*
- * File name selection pattern
- */
-tSCC zNested_Sys_LimitsList[] =
- "sys/limits.h\0";
-/*
- * Machine/OS name selection pattern
- */
-#define apzNested_Sys_LimitsMachs (const char**)NULL
-
-/*
- * content selection pattern - do fix if pattern found
- */
-tSCC zNested_Sys_LimitsSelect0[] =
- "CHILD_MAX";
-
-#define NESTED_SYS_LIMITS_TEST_CT 1
-static tTestDesc aNested_Sys_LimitsTests[] = {
- { TT_EGREP, zNested_Sys_LimitsSelect0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for Nested_Sys_Limits
- */
-static const char* apzNested_Sys_LimitsPatch[] = { "sed",
- "-e", "/CHILD_MAX/s,/\\* Max, Max,",
- "-e", "/OPEN_MAX/s,/\\* Max, Max,",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
* Description of Netbsd_C99_Inline_1 fix
*/
tSCC zNetbsd_C99_Inline_1Name[] =
@@ -4547,6 +5444,96 @@ static const char* apzNetbsd_Extra_SemicolonPatch[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Newlib_Stdint_1 fix
+ */
+tSCC zNewlib_Stdint_1Name[] =
+ "newlib_stdint_1";
+
+/*
+ * File name selection pattern
+ */
+tSCC zNewlib_Stdint_1List[] =
+ "stdint-newlib.h\0stdint.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzNewlib_Stdint_1Machs (const char**)NULL
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zNewlib_Stdint_1Select0[] =
+ "@todo - Add support for wint_t types";
+
+#define NEWLIB_STDINT_1_TEST_CT 1
+static tTestDesc aNewlib_Stdint_1Tests[] = {
+ { TT_EGREP, zNewlib_Stdint_1Select0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Newlib_Stdint_1
+ */
+static const char* apzNewlib_Stdint_1Patch[] = { sed_cmd_z,
+ "-e", "s@#define INT32_MIN.*@#define INT32_MIN (-INT32_MAX - 1)@",
+ "-e", "s@#define INT32_MAX.*@#define INT32_MAX __INT32_MAX__@",
+ "-e", "s@#define UINT32_MAX.*@#define UINT32_MAX __UINT32_MAX__@",
+ "-e", "s@#define INT_LEAST32_MIN.*@#define INT_LEAST32_MIN (-INT_LEAST32_MAX - 1)@",
+ "-e", "s@#define INT_LEAST32_MAX.*@#define INT_LEAST32_MAX __INT_LEAST32_MAX__@",
+ "-e", "s@#define UINT_LEAST32_MAX.*@#define UINT_LEAST32_MAX __UINT_LEAST32_MAX__@",
+ "-e", "s@#define INT_FAST\\([0-9]*\\)_MIN.*@#define INT_FAST\\1_MIN (-INT_FAST\\1_MAX - 1)@",
+ "-e", "s@#define INT_FAST\\([0-9]*\\)_MAX.*@#define INT_FAST\\1_MAX __INT_FAST\\1_MAX__@",
+ "-e", "s@#define UINT_FAST\\([0-9]*\\)_MAX.*@#define UINT_FAST\\1_MAX __UINT_FAST\\1_MAX__@",
+ "-e", "s@#define SIZE_MAX.*@#define SIZE_MAX __SIZE_MAX__@",
+ "-e", "s@#define PTRDIFF_MIN.*@#define PTRDIFF_MIN (-PTRDIFF_MAX - 1)@",
+ "-e", "s@#define PTRDIFF_MAX.*@#define PTRDIFF_MAX __PTRDIFF_MAX__@",
+ "-e", "s@#define UINT8_C.*@#define UINT8_C(c) __UINT8_C(c)@",
+ "-e", "s@#define UINT16_C.*@#define UINT16_C(c) __UINT16_C(c)@",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Newlib_Stdint_2 fix
+ */
+tSCC zNewlib_Stdint_2Name[] =
+ "newlib_stdint_2";
+
+/*
+ * File name selection pattern
+ */
+tSCC zNewlib_Stdint_2List[] =
+ "stdint-newlib.h\0stdint.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzNewlib_Stdint_2Machs (const char**)NULL
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zNewlib_Stdint_2Select0[] =
+ "@todo - Add support for wint_t types";
+
+#define NEWLIB_STDINT_2_TEST_CT 1
+static tTestDesc aNewlib_Stdint_2Tests[] = {
+ { TT_EGREP, zNewlib_Stdint_2Select0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Newlib_Stdint_2
+ */
+static const char* apzNewlib_Stdint_2Patch[] = {
+ "format",
+ "#define INTMAX_MAX __INTMAX_MAX__\n\
+#define INTMAX_MIN (-INTMAX_MAX - 1)\n\
+#define UINTMAX_MAX __UINTMAX_MAX__\n\
+#define WCHAR_MAX __WCHAR_MAX__\n\
+#define WCHAR_MIN __WCHAR_MIN__\n\
+#define WINT_MAX __WINT_MAX__\n\
+#define WINT_MIN __WINT_MIN__\n\n\
+%0",
+ "/\\*\\* Macros for minimum-width integer constant expressions \\*/",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Next_Math_Prefix fix
*/
tSCC zNext_Math_PrefixName[] =
@@ -4725,6 +5712,60 @@ static const char* apzNodeent_SyntaxPatch[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Openbsd_Null_Definition fix
+ */
+tSCC zOpenbsd_Null_DefinitionName[] =
+ "openbsd_null_definition";
+
+/*
+ * File name selection pattern
+ */
+tSCC zOpenbsd_Null_DefinitionList[] =
+ "locale.h\0stddef.h\0stdio.h\0string.h\0time.h\0unistd.h\0wchar.h\0sys/param.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzOpenbsd_Null_DefinitionMachs[] = {
+ "*-*-openbsd*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zOpenbsd_Null_DefinitionSelect0[] =
+ "__GNUG__";
+
+#define OPENBSD_NULL_DEFINITION_TEST_CT 1
+static tTestDesc aOpenbsd_Null_DefinitionTests[] = {
+ { TT_EGREP, zOpenbsd_Null_DefinitionSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Openbsd_Null_Definition
+ */
+static const char* apzOpenbsd_Null_DefinitionPatch[] = {
+ "format",
+ "#ifndef NULL\n\
+#ifdef __cplusplus\n\
+#ifdef __GNUG__\n\
+#define NULL\t__null\n\
+#else\t /* ! __GNUG__ */\n\
+#define NULL\t0L\n\
+#endif\t /* __GNUG__ */\n\
+#else\t /* ! __cplusplus */\n\
+#define NULL\t((void *)0)\n\
+#endif\t /* __cplusplus */\n\
+#endif\t /* !NULL */",
+ "^#ifndef[ \t]*NULL\n\
+^#ifdef[ \t]*__GNUG__\n\
+^#define[ \t]*NULL[ \t]*__null\n\
+^#else\n\
+^#define[ \t]*NULL[ \t]*0L\n\
+^#endif\n\
+^#endif",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Obstack_Lvalue_Cast fix
*/
tSCC zObstack_Lvalue_CastName[] =
@@ -4760,6 +5801,43 @@ static const char* apzObstack_Lvalue_CastPatch[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Openbsd_Va_Start fix
+ */
+tSCC zOpenbsd_Va_StartName[] =
+ "openbsd_va_start";
+
+/*
+ * File name selection pattern
+ */
+tSCC zOpenbsd_Va_StartList[] =
+ "stdarg.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzOpenbsd_Va_StartMachs[] = {
+ "*-*-openbsd*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zOpenbsd_Va_StartSelect0[] =
+ "__builtin_stdarg_start";
+
+#define OPENBSD_VA_START_TEST_CT 1
+static tTestDesc aOpenbsd_Va_StartTests[] = {
+ { TT_EGREP, zOpenbsd_Va_StartSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Openbsd_Va_Start
+ */
+static const char* apzOpenbsd_Va_StartPatch[] = {
+ "format",
+ "__builtin_va_start",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Osf_Namespace_A fix
*/
tSCC zOsf_Namespace_AName[] =
@@ -4859,41 +5937,6 @@ typedef __regmatch_t\tregmatch_t;",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Pthread_Page_Size fix
- */
-tSCC zPthread_Page_SizeName[] =
- "pthread_page_size";
-
-/*
- * File name selection pattern
- */
-tSCC zPthread_Page_SizeList[] =
- "pthread.h\0";
-/*
- * Machine/OS name selection pattern
- */
-#define apzPthread_Page_SizeMachs (const char**)NULL
-
-/*
- * content selection pattern - do fix if pattern found
- */
-tSCC zPthread_Page_SizeSelect0[] =
- "^int __page_size";
-
-#define PTHREAD_PAGE_SIZE_TEST_CT 1
-static tTestDesc aPthread_Page_SizeTests[] = {
- { TT_EGREP, zPthread_Page_SizeSelect0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for Pthread_Page_Size
- */
-static const char* apzPthread_Page_SizePatch[] = {
- "format",
- "extern %0",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
* Description of Pthread_Incomplete_Struct_Argument fix
*/
tSCC zPthread_Incomplete_Struct_ArgumentName[] =
@@ -5147,165 +6190,385 @@ static const char* apzRs6000_ParamPatch[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Sco_Math fix
+ * Description of Solaris___Restrict fix
*/
-tSCC zSco_MathName[] =
- "sco_math";
+tSCC zSolaris___RestrictName[] =
+ "solaris___restrict";
/*
* File name selection pattern
*/
-tSCC zSco_MathList[] =
- "math.h\0*/math.h\0";
+tSCC zSolaris___RestrictList[] =
+ "sys/feature_tests.h\0";
/*
* Machine/OS name selection pattern
*/
-#define apzSco_MathMachs (const char**)NULL
+tSCC* apzSolaris___RestrictMachs[] = {
+ "*-*-solaris2*",
+ (const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
-tSCC zSco_MathSelect0[] =
- "inline double abs";
-
-/*
- * content bypass pattern - skip fix if pattern found
- */
-tSCC zSco_MathBypass0[] =
- "__GNUG__";
+tSCC zSolaris___RestrictSelect0[] =
+ "#define[ \t]*_RESTRICT_KYWD[ \t]*restrict";
-#define SCO_MATH_TEST_CT 2
-static tTestDesc aSco_MathTests[] = {
- { TT_NEGREP, zSco_MathBypass0, (regex_t*)NULL },
- { TT_EGREP, zSco_MathSelect0, (regex_t*)NULL }, };
+#define SOLARIS___RESTRICT_TEST_CT 1
+static tTestDesc aSolaris___RestrictTests[] = {
+ { TT_EGREP, zSolaris___RestrictSelect0, (regex_t*)NULL }, };
/*
- * Fix Command Arguments for Sco_Math
+ * Fix Command Arguments for Solaris___Restrict
*/
-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\
+static const char* apzSolaris___RestrictPatch[] = {
+ "format",
+ "#ifdef __cplusplus\n\
+#define\t_RESTRICT_KYWD\t__restrict\n\
+#else\n\
+%0\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 Solaris_Math_1 fix
+ * Description of Solaris_Complex fix
*/
-tSCC zSolaris_Math_1Name[] =
- "solaris_math_1";
+tSCC zSolaris_ComplexName[] =
+ "solaris_complex";
/*
* File name selection pattern
*/
-tSCC zSolaris_Math_1List[] =
- "iso/math_c99.h\0";
+tSCC zSolaris_ComplexList[] =
+ "complex.h\0";
/*
* Machine/OS name selection pattern
*/
-#define apzSolaris_Math_1Machs (const char**)NULL
+tSCC* apzSolaris_ComplexMachs[] = {
+ "*-*-solaris2.*",
+ (const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
-tSCC zSolaris_Math_1Select0[] =
- "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+tSCC zSolaris_ComplexSelect0[] =
+ "#define[ \t]_Complex_I[ \t]_Complex_I";
+
+#define SOLARIS_COMPLEX_TEST_CT 1
+static tTestDesc aSolaris_ComplexTests[] = {
+ { TT_EGREP, zSolaris_ComplexSelect0, (regex_t*)NULL }, };
/*
- * content bypass pattern - skip fix if pattern found
+ * Fix Command Arguments for Solaris_Complex
*/
-tSCC zSolaris_Math_1Bypass0[] =
- "__GNUC__";
+static const char* apzSolaris_ComplexPatch[] = { sed_cmd_z,
+ "-e", "s/#define[ \t]_Complex_I[ \t]_Complex_I/#define\t_Complex_I\t(__extension__ 1.0iF)/",
+ "-e", "/#define[ \t]_Imaginary_I[ \t]_Imaginary_I/d",
+ "-e", "/#define[ \t]imaginary[ \t]_Imaginary/d",
+ "-e", "s/#define[ \t]I[ \t]\\{1,\\}_Imaginary_I/#define\tI\t\t_Complex_I/",
+ (char*)NULL };
-#define SOLARIS_MATH_1_TEST_CT 2
-static tTestDesc aSolaris_Math_1Tests[] = {
- { TT_NEGREP, zSolaris_Math_1Bypass0, (regex_t*)NULL },
- { TT_EGREP, zSolaris_Math_1Select0, (regex_t*)NULL }, };
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Solaris_Complex_Cxx fix
+ */
+tSCC zSolaris_Complex_CxxName[] =
+ "solaris_complex_cxx";
/*
- * Fix Command Arguments for Solaris_Math_1
+ * File name selection pattern
*/
-static const char* apzSolaris_Math_1Patch[] = {
- "format",
- "#define\tHUGE_VA%1\t(__builtin_huge_va%2())",
- "^#define[ \t]+HUGE_VA([LF]+)[ \t]+__builtin_huge_va([lf]+)",
+tSCC zSolaris_Complex_CxxList[] =
+ "complex.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_Complex_CxxMachs[] = {
+ "*-*-solaris2.*",
+ (const char*)NULL };
+#define SOLARIS_COMPLEX_CXX_TEST_CT 0
+#define aSolaris_Complex_CxxTests (tTestDesc*)NULL
+
+/*
+ * Fix Command Arguments for Solaris_Complex_Cxx
+ */
+static const char* apzSolaris_Complex_CxxPatch[] = { sed_cmd_z,
+ "-e", "/#if[ \t]*!defined(__cplusplus)/c\\\n\
+#ifdef\t__cplusplus\\\n\
+extern \"C\" {\\\n\
+#endif",
+ "-e", "/#endif[ \t]*\\/\\* !defined(__cplusplus) \\*\\//c\\\n\
+#ifdef\t__cplusplus\\\n\
+}\\\n\
+#endif",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Solaris_Math_2 fix
+ * Description of Solaris_Cond_Init fix
*/
-tSCC zSolaris_Math_2Name[] =
- "solaris_math_2";
+tSCC zSolaris_Cond_InitName[] =
+ "solaris_cond_init";
/*
* File name selection pattern
*/
-tSCC zSolaris_Math_2List[] =
- "iso/math_c99.h\0";
+tSCC zSolaris_Cond_InitList[] =
+ "pthread.h\0";
/*
* Machine/OS name selection pattern
*/
-#define apzSolaris_Math_2Machs (const char**)NULL
+tSCC* apzSolaris_Cond_InitMachs[] = {
+ "*-*-solaris2.8",
+ (const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
-tSCC zSolaris_Math_2Select0[] =
- "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
-
-/*
- * content bypass pattern - skip fix if pattern found
- */
-tSCC zSolaris_Math_2Bypass0[] =
- "__GNUC__";
+tSCC zSolaris_Cond_InitSelect0[] =
+ "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
-#define SOLARIS_MATH_2_TEST_CT 2
-static tTestDesc aSolaris_Math_2Tests[] = {
- { TT_NEGREP, zSolaris_Math_2Bypass0, (regex_t*)NULL },
- { TT_EGREP, zSolaris_Math_2Select0, (regex_t*)NULL }, };
+#define SOLARIS_COND_INIT_TEST_CT 1
+static tTestDesc aSolaris_Cond_InitTests[] = {
+ { TT_EGREP, zSolaris_Cond_InitSelect0, (regex_t*)NULL }, };
/*
- * Fix Command Arguments for Solaris_Math_2
+ * Fix Command Arguments for Solaris_Cond_Init
*/
-static const char* apzSolaris_Math_2Patch[] = {
+static const char* apzSolaris_Cond_InitPatch[] = {
"format",
- "#define\tINFINITY\t(__builtin_inff())",
- "^#define[ \t]+INFINITY[ \t]+__builtin_infinity",
+ "%1, 0x4356%2",
+ "^(#define[ \t]+PTHREAD_COND_INITIALIZER[ \t]+\\{.*0)(\\},[ \t]*0\\}.*)$",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Solaris_Math_3 fix
+ * Description of Solaris_Cxx_Linkage fix
*/
-tSCC zSolaris_Math_3Name[] =
- "solaris_math_3";
+tSCC zSolaris_Cxx_LinkageName[] =
+ "solaris_cxx_linkage";
/*
* File name selection pattern
*/
-tSCC zSolaris_Math_3List[] =
- "iso/math_c99.h\0";
+tSCC zSolaris_Cxx_LinkageList[] =
+ "iso/stdlib_iso.h\0";
/*
* Machine/OS name selection pattern
*/
-#define apzSolaris_Math_3Machs (const char**)NULL
+tSCC* apzSolaris_Cxx_LinkageMachs[] = {
+ "*-*-solaris2*",
+ (const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
-tSCC zSolaris_Math_3Select0[] =
+tSCC zSolaris_Cxx_LinkageSelect0[] =
+ "(#if __cplusplus >= 199711L)\n\
+(extern \"C\\+\\+\" \\{\n\
+)(.*(bsearch|qsort).*)";
+
+#define SOLARIS_CXX_LINKAGE_TEST_CT 1
+static tTestDesc aSolaris_Cxx_LinkageTests[] = {
+ { TT_EGREP, zSolaris_Cxx_LinkageSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Solaris_Cxx_Linkage
+ */
+static const char* apzSolaris_Cxx_LinkagePatch[] = {
+ "format",
+ "%1 && !__GNUG__\n\
+%2%3",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Solaris_Getc_Strict_Stdc fix
+ */
+tSCC zSolaris_Getc_Strict_StdcName[] =
+ "solaris_getc_strict_stdc";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_Getc_Strict_StdcList[] =
+ "iso/stdio_iso.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_Getc_Strict_StdcMachs[] = {
+ "*-*-solaris2*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Getc_Strict_StdcSelect0[] =
+ "(.*&& )!defined\\(_STRICT_STDC\\)(.*)";
+
+#define SOLARIS_GETC_STRICT_STDC_TEST_CT 1
+static tTestDesc aSolaris_Getc_Strict_StdcTests[] = {
+ { TT_EGREP, zSolaris_Getc_Strict_StdcSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Solaris_Getc_Strict_Stdc
+ */
+static const char* apzSolaris_Getc_Strict_StdcPatch[] = {
+ "format",
+ "%1(!defined(_STRICT_STDC) || (__cplusplus >= 199711L))%2",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Solaris_Longjmp_Noreturn fix
+ */
+tSCC zSolaris_Longjmp_NoreturnName[] =
+ "solaris_longjmp_noreturn";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_Longjmp_NoreturnList[] =
+ "iso/setjmp_iso.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_Longjmp_NoreturnMachs[] = {
+ "*-*-solaris2*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Longjmp_NoreturnSelect0[] =
+ "(.*longjmp\\(jmp_buf.*[^)]+\\));";
+
+/*
+ * content bypass pattern - skip fix if pattern found
+ */
+tSCC zSolaris_Longjmp_NoreturnBypass0[] =
+ "__NORETURN";
+
+#define SOLARIS_LONGJMP_NORETURN_TEST_CT 2
+static tTestDesc aSolaris_Longjmp_NoreturnTests[] = {
+ { TT_NEGREP, zSolaris_Longjmp_NoreturnBypass0, (regex_t*)NULL },
+ { TT_EGREP, zSolaris_Longjmp_NoreturnSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Solaris_Longjmp_Noreturn
+ */
+static const char* apzSolaris_Longjmp_NoreturnPatch[] = {
+ "format",
+ "%1 __attribute__ ((__noreturn__));",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Solaris_Math_1 fix
+ */
+tSCC zSolaris_Math_1Name[] =
+ "solaris_math_1";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_Math_1List[] =
+ "iso/math_c99.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzSolaris_Math_1Machs (const char**)NULL
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Math_1Select0[] =
+ "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+
+/*
+ * content bypass pattern - skip fix if pattern found
+ */
+tSCC zSolaris_Math_1Bypass0[] =
+ "__GNUC__";
+
+#define SOLARIS_MATH_1_TEST_CT 2
+static tTestDesc aSolaris_Math_1Tests[] = {
+ { TT_NEGREP, zSolaris_Math_1Bypass0, (regex_t*)NULL },
+ { TT_EGREP, zSolaris_Math_1Select0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Solaris_Math_1
+ */
+static const char* apzSolaris_Math_1Patch[] = {
+ "format",
+ "#define\tHUGE_VA%1\t(__builtin_huge_va%2())",
+ "^#define[ \t]+HUGE_VA([LF]+)[ \t]+__builtin_huge_va([lf]+)",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Solaris_Math_2 fix
+ */
+tSCC zSolaris_Math_2Name[] =
+ "solaris_math_2";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_Math_2List[] =
+ "iso/math_c99.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzSolaris_Math_2Machs (const char**)NULL
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Math_2Select0[] =
+ "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+
+/*
+ * content bypass pattern - skip fix if pattern found
+ */
+tSCC zSolaris_Math_2Bypass0[] =
+ "__GNUC__";
+
+#define SOLARIS_MATH_2_TEST_CT 2
+static tTestDesc aSolaris_Math_2Tests[] = {
+ { TT_NEGREP, zSolaris_Math_2Bypass0, (regex_t*)NULL },
+ { TT_EGREP, zSolaris_Math_2Select0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Solaris_Math_2
+ */
+static const char* apzSolaris_Math_2Patch[] = {
+ "format",
+ "#define\tINFINITY\t(__builtin_inff())",
+ "^#define[ \t]+INFINITY[ \t]+__builtin_infinity",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Solaris_Math_3 fix
+ */
+tSCC zSolaris_Math_3Name[] =
+ "solaris_math_3";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_Math_3List[] =
+ "iso/math_c99.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzSolaris_Math_3Machs (const char**)NULL
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Math_3Select0[] =
"@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
/*
@@ -5393,7 +6656,7 @@ tSCC zSolaris_Math_8List[] =
* content selection pattern - do fix if pattern found
*/
tSCC zSolaris_Math_8Select0[] =
- "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+ "@\\(#\\)math_c99\\.h[ \t]+1\\.[0-9]+[ \t]+[0-9/]+ SMI";
/*
* content bypass pattern - skip fix if pattern found
@@ -5490,182 +6753,504 @@ static tTestDesc aSolaris_Math_10Tests[] = {
{ TT_EGREP, zSolaris_Math_10Select0, (regex_t*)NULL }, };
/*
- * Fix Command Arguments for Solaris_Math_10
+ * Fix Command Arguments for Solaris_Math_10
+ */
+static const char* apzSolaris_Math_10Patch[] = {
+ "format",
+ "#define\tisinf(x) __builtin_isinf(x)",
+ "^#define[ \t]+isinf\\(x\\)[ \t]+__extension__\\([ \t]*\\\\\n\
+[ \t]*\\{[ \t]*__typeof\\(x\\)[ \t]*__x_i[ \t]*=[ \t]*\\(x\\);[ \t]*\\\\\n\
+[ \t]*__x_i[ \t]*==[ \t]*\\(__typeof\\(__x_i\\)\\)[ \t]*INFINITY[ \t]*\\|\\|[ \t]*\\\\\n\
+[ \t]*__x_i[ \t]*==[ \t]*\\(__typeof\\(__x_i\\)\\)[ \t]*\\(-INFINITY\\);[ \t]*\\}\\)",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Solaris_Mutex_Init_2 fix
+ */
+tSCC zSolaris_Mutex_Init_2Name[] =
+ "solaris_mutex_init_2";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_Mutex_Init_2List[] =
+ "pthread.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_Mutex_Init_2Machs[] = {
+ "*-*-solaris2.[0-9]",
+ "*-*-solaris2.[0-9][!0-9]*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Mutex_Init_2Select0[] =
+ "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+
+#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_2
+ */
+static const char* apzSolaris_Mutex_Init_2Patch[] = {
+ "format",
+ "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n\
+%0\n\
+#else\n\
+%1, {0}}%4\n\
+#endif",
+ "(^#define[ \t]+PTHREAD_(MUTEX|COND)_INITIALIZER[ \t]+(|/*.**/[ \t]*\\\\\n\
+[ \t]*)\\{.*),[ \t]*0\\}(|[ \t].*)$",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Solaris_Pow_Int_Overload fix
+ */
+tSCC zSolaris_Pow_Int_OverloadName[] =
+ "solaris_pow_int_overload";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_Pow_Int_OverloadList[] =
+ "iso/math_iso.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_Pow_Int_OverloadMachs[] = {
+ "*-*-solaris2*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Pow_Int_OverloadSelect0[] =
+ "^[ \t]*inline [a-z ]* pow\\([^()]*, int [^()]*\\) *\\{[^{}]*\n\
+[^{}]*\\}";
+
+#define SOLARIS_POW_INT_OVERLOAD_TEST_CT 1
+static tTestDesc aSolaris_Pow_Int_OverloadTests[] = {
+ { TT_EGREP, zSolaris_Pow_Int_OverloadSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Solaris_Pow_Int_Overload
+ */
+static const char* apzSolaris_Pow_Int_OverloadPatch[] = {
+ "format",
+ "#ifndef __GXX_EXPERIMENTAL_CXX0X__\n\
+%0\n\
+#endif",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Solaris_Rwlock_Init_1 fix
+ */
+tSCC zSolaris_Rwlock_Init_1Name[] =
+ "solaris_rwlock_init_1";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_Rwlock_Init_1List[] =
+ "pthread.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_Rwlock_Init_1Machs[] = {
+ "*-*-solaris*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Rwlock_Init_1Select0[] =
+ "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+
+#define SOLARIS_RWLOCK_INIT_1_TEST_CT 1
+static tTestDesc aSolaris_Rwlock_Init_1Tests[] = {
+ { TT_EGREP, zSolaris_Rwlock_Init_1Select0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Solaris_Rwlock_Init_1
+ */
+static const char* apzSolaris_Rwlock_Init_1Patch[] = {
+ "format",
+ "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n\
+%0\n\
+#else\n\
+%1{0, 0, 0, {{0}, {0}, {0}}, {{0}, {0}}, {{0}, {0}}}\n\
+#endif",
+ "(^#define[ \t]+PTHREAD_RWLOCK_INITIALIZER[ \t]+)\\{0, 0, 0, \\{0, 0, 0\\}, \\{0, 0\\}, \\{0, 0\\}\\}[ \t]*$",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Solaris_Once_Init_1 fix
+ */
+tSCC zSolaris_Once_Init_1Name[] =
+ "solaris_once_init_1";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_Once_Init_1List[] =
+ "pthread.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_Once_Init_1Machs[] = {
+ "*-*-solaris*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Once_Init_1Select0[] =
+ "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+
+#define SOLARIS_ONCE_INIT_1_TEST_CT 1
+static tTestDesc aSolaris_Once_Init_1Tests[] = {
+ { TT_EGREP, zSolaris_Once_Init_1Select0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Solaris_Once_Init_1
+ */
+static const char* apzSolaris_Once_Init_1Patch[] = {
+ "format",
+ "%1{%2}%3",
+ "(^#define[ \t]+PTHREAD_ONCE_INIT[ \t]+\\{)([^}]+)(\\})[ \t]*$",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Solaris_Once_Init_2 fix
+ */
+tSCC zSolaris_Once_Init_2Name[] =
+ "solaris_once_init_2";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_Once_Init_2List[] =
+ "pthread.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_Once_Init_2Machs[] = {
+ "*-*-solaris2.[0-9]",
+ "*-*-solaris2.[0-9][!0-9]*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Once_Init_2Select0[] =
+ "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+
+#define SOLARIS_ONCE_INIT_2_TEST_CT 1
+static tTestDesc aSolaris_Once_Init_2Tests[] = {
+ { TT_EGREP, zSolaris_Once_Init_2Select0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Solaris_Once_Init_2
+ */
+static const char* apzSolaris_Once_Init_2Patch[] = {
+ "format",
+ "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n\
+%0\n\
+#else\n\
+%1{0}, {0}, {0}, {%3}%4\n\
+#endif",
+ "(^#define[ \t]+PTHREAD_ONCE_INIT[ \t]+\\{\\{)(0, 0, 0, )(PTHREAD_[A-Z_]+)(\\}\\})[ \t]*$",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Solaris_Int_Const fix
+ */
+tSCC zSolaris_Int_ConstName[] =
+ "solaris_int_const";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_Int_ConstList[] =
+ "sys/int_const.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_Int_ConstMachs[] = {
+ "*-*-solaris2*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Int_ConstSelect0[] =
+ "^#define[ \t]+UINT8_C\\(c\\)[ \t]+__CONCAT__.*\n\
+(/*.**/)\n\
+#define[ \t]+UINT16_C\\(c\\)[ \t]+__CONCAT__.*";
+
+#define SOLARIS_INT_CONST_TEST_CT 1
+static tTestDesc aSolaris_Int_ConstTests[] = {
+ { TT_EGREP, zSolaris_Int_ConstSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Solaris_Int_Const
+ */
+static const char* apzSolaris_Int_ConstPatch[] = {
+ "format",
+ "#define\tUINT8_C(c)\t(c)\n\
+%1\n\
+#define\tUINT16_C(c)\t(c)",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Solaris_Int_Limits_1 fix
+ */
+tSCC zSolaris_Int_Limits_1Name[] =
+ "solaris_int_limits_1";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_Int_Limits_1List[] =
+ "sys/int_limits.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_Int_Limits_1Machs[] = {
+ "*-*-solaris2*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Int_Limits_1Select0[] =
+ "^#define[ \t]+UINT8_MAX[ \t]+\\(255U\\)\n\
+#define[ \t]+UINT16_MAX[ \t]+\\(65535U\\)";
+
+#define SOLARIS_INT_LIMITS_1_TEST_CT 1
+static tTestDesc aSolaris_Int_Limits_1Tests[] = {
+ { TT_EGREP, zSolaris_Int_Limits_1Select0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Solaris_Int_Limits_1
+ */
+static const char* apzSolaris_Int_Limits_1Patch[] = {
+ "format",
+ "#define\tUINT8_MAX\t(255)\n\
+#define\tUINT16_MAX\t(65535)",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Solaris_Int_Limits_2 fix
+ */
+tSCC zSolaris_Int_Limits_2Name[] =
+ "solaris_int_limits_2";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_Int_Limits_2List[] =
+ "sys/int_limits.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_Int_Limits_2Machs[] = {
+ "*-*-solaris2*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Int_Limits_2Select0[] =
+ "^#define[ \t]+(INT|UINT)_FAST16_(MAX|MIN)[ \t](INT|UINT)16.*";
+
+#define SOLARIS_INT_LIMITS_2_TEST_CT 1
+static tTestDesc aSolaris_Int_Limits_2Tests[] = {
+ { TT_EGREP, zSolaris_Int_Limits_2Select0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Solaris_Int_Limits_2
*/
-static const char* apzSolaris_Math_10Patch[] = {
+static const char* apzSolaris_Int_Limits_2Patch[] = {
"format",
- "#define\tisinf(x) __builtin_isinf(x)",
- "^#define[ \t]+isinf\\(x\\)[ \t]+__extension__\\([ \t]*\\\\\n\
-[ \t]*\\{[ \t]*__typeof\\(x\\)[ \t]*__x_i[ \t]*=[ \t]*\\(x\\);[ \t]*\\\\\n\
-[ \t]*__x_i[ \t]*==[ \t]*\\(__typeof\\(__x_i\\)\\)[ \t]*INFINITY[ \t]*\\|\\|[ \t]*\\\\\n\
-[ \t]*__x_i[ \t]*==[ \t]*\\(__typeof\\(__x_i\\)\\)[ \t]*\\(-INFINITY\\);[ \t]*\\}\\)",
+ "#define\t%1_FAST16_%2 %132_%2",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Solaris_Mutex_Init_2 fix
+ * Description of Solaris_Int_Limits_3 fix
*/
-tSCC zSolaris_Mutex_Init_2Name[] =
- "solaris_mutex_init_2";
+tSCC zSolaris_Int_Limits_3Name[] =
+ "solaris_int_limits_3";
/*
* File name selection pattern
*/
-tSCC zSolaris_Mutex_Init_2List[] =
- "pthread.h\0";
+tSCC zSolaris_Int_Limits_3List[] =
+ "sys/int_limits.h\0";
/*
* Machine/OS name selection pattern
*/
-tSCC* apzSolaris_Mutex_Init_2Machs[] = {
- "*-*-solaris2.[0-9]",
- "*-*-solaris2.[0-9][!0-9]*",
+tSCC* apzSolaris_Int_Limits_3Machs[] = {
+ "*-*-solaris2*",
(const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
-tSCC zSolaris_Mutex_Init_2Select0[] =
- "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+tSCC zSolaris_Int_Limits_3Select0[] =
+ "^#define[ \t]+SIZE_MAX[ \t]+4294967295UL";
-#define SOLARIS_MUTEX_INIT_2_TEST_CT 1
-static tTestDesc aSolaris_Mutex_Init_2Tests[] = {
- { TT_EGREP, zSolaris_Mutex_Init_2Select0, (regex_t*)NULL }, };
+#define SOLARIS_INT_LIMITS_3_TEST_CT 1
+static tTestDesc aSolaris_Int_Limits_3Tests[] = {
+ { TT_EGREP, zSolaris_Int_Limits_3Select0, (regex_t*)NULL }, };
/*
- * Fix Command Arguments for Solaris_Mutex_Init_2
+ * Fix Command Arguments for Solaris_Int_Limits_3
*/
-static const char* apzSolaris_Mutex_Init_2Patch[] = {
+static const char* apzSolaris_Int_Limits_3Patch[] = {
"format",
- "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n\
-%0\n\
-#else\n\
-%1, {0}}%4\n\
-#endif",
- "(^#define[ \t]+PTHREAD_(MUTEX|COND)_INITIALIZER[ \t]+(|/*.**/[ \t]*\\\\\n\
-[ \t]*)\\{.*),[ \t]*0\\}(|[ \t].*)$",
+ "#define\tSIZE_MAX\t4294967295U",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Solaris_Rwlock_Init_1 fix
+ * Description of Solaris_Int_Types fix
*/
-tSCC zSolaris_Rwlock_Init_1Name[] =
- "solaris_rwlock_init_1";
+tSCC zSolaris_Int_TypesName[] =
+ "solaris_int_types";
/*
* File name selection pattern
*/
-tSCC zSolaris_Rwlock_Init_1List[] =
- "pthread.h\0";
+tSCC zSolaris_Int_TypesList[] =
+ "sys/int_types.h\0";
/*
* Machine/OS name selection pattern
*/
-tSCC* apzSolaris_Rwlock_Init_1Machs[] = {
- "*-*-solaris*",
- (const char*)NULL };
+#define apzSolaris_Int_TypesMachs (const char**)NULL
/*
* content selection pattern - do fix if pattern found
*/
-tSCC zSolaris_Rwlock_Init_1Select0[] =
- "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+tSCC zSolaris_Int_TypesSelect0[] =
+ "__STDC__ - 0 == 0";
-#define SOLARIS_RWLOCK_INIT_1_TEST_CT 1
-static tTestDesc aSolaris_Rwlock_Init_1Tests[] = {
- { TT_EGREP, zSolaris_Rwlock_Init_1Select0, (regex_t*)NULL }, };
+/*
+ * content bypass pattern - skip fix if pattern found
+ */
+tSCC zSolaris_Int_TypesBypass0[] =
+ "_LONGLONG_TYPE";
+
+#define SOLARIS_INT_TYPES_TEST_CT 2
+static tTestDesc aSolaris_Int_TypesTests[] = {
+ { TT_NEGREP, zSolaris_Int_TypesBypass0, (regex_t*)NULL },
+ { TT_EGREP, zSolaris_Int_TypesSelect0, (regex_t*)NULL }, };
/*
- * Fix Command Arguments for Solaris_Rwlock_Init_1
+ * Fix Command Arguments for Solaris_Int_Types
*/
-static const char* apzSolaris_Rwlock_Init_1Patch[] = {
+static const char* apzSolaris_Int_TypesPatch[] = {
"format",
- "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n\
-%0\n\
-#else\n\
-%1{0, 0, 0, {{0}, {0}, {0}}, {{0}, {0}}, {{0}, {0}}}\n\
-#endif",
- "(^#define[ \t]+PTHREAD_RWLOCK_INITIALIZER[ \t]+)\\{0, 0, 0, \\{0, 0, 0\\}, \\{0, 0\\}, \\{0, 0\\}\\}[ \t]*$",
+ "(defined(_STDC_C99) || !defined(_STRICT_STDC) || defined(__GNUC__))",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Solaris_Once_Init_1 fix
+ * Description of Solaris_Posix_Spawn_Restrict fix
*/
-tSCC zSolaris_Once_Init_1Name[] =
- "solaris_once_init_1";
+tSCC zSolaris_Posix_Spawn_RestrictName[] =
+ "solaris_posix_spawn_restrict";
/*
* File name selection pattern
*/
-tSCC zSolaris_Once_Init_1List[] =
- "pthread.h\0";
+tSCC zSolaris_Posix_Spawn_RestrictList[] =
+ "spawn.h\0";
/*
* Machine/OS name selection pattern
*/
-tSCC* apzSolaris_Once_Init_1Machs[] = {
- "*-*-solaris*",
+tSCC* apzSolaris_Posix_Spawn_RestrictMachs[] = {
+ "*-*-solaris2*",
(const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
-tSCC zSolaris_Once_Init_1Select0[] =
- "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+tSCC zSolaris_Posix_Spawn_RestrictSelect0[] =
+ "(.*[ \t]+)([a-z]+)\\[_RESTRICT_KYWD\\](.*)";
-#define SOLARIS_ONCE_INIT_1_TEST_CT 1
-static tTestDesc aSolaris_Once_Init_1Tests[] = {
- { TT_EGREP, zSolaris_Once_Init_1Select0, (regex_t*)NULL }, };
+#define SOLARIS_POSIX_SPAWN_RESTRICT_TEST_CT 1
+static tTestDesc aSolaris_Posix_Spawn_RestrictTests[] = {
+ { TT_EGREP, zSolaris_Posix_Spawn_RestrictSelect0, (regex_t*)NULL }, };
/*
- * Fix Command Arguments for Solaris_Once_Init_1
+ * Fix Command Arguments for Solaris_Posix_Spawn_Restrict
*/
-static const char* apzSolaris_Once_Init_1Patch[] = {
+static const char* apzSolaris_Posix_Spawn_RestrictPatch[] = {
"format",
- "%1{%2}%3",
- "(^#define[ \t]+PTHREAD_ONCE_INIT[ \t]+\\{)([^}]+)(\\})[ \t]*$",
+ "%1*_RESTRICT_KYWD %2%3",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Solaris_Once_Init_2 fix
+ * Description of Solaris_Std___Filbuf fix
*/
-tSCC zSolaris_Once_Init_2Name[] =
- "solaris_once_init_2";
+tSCC zSolaris_Std___FilbufName[] =
+ "solaris_std___filbuf";
/*
* File name selection pattern
*/
-tSCC zSolaris_Once_Init_2List[] =
- "pthread.h\0";
+tSCC zSolaris_Std___FilbufList[] =
+ "stdio.h\0";
/*
* Machine/OS name selection pattern
*/
-tSCC* apzSolaris_Once_Init_2Machs[] = {
- "*-*-solaris2.[0-9]",
- "*-*-solaris2.[0-9][!0-9]*",
+tSCC* apzSolaris_Std___FilbufMachs[] = {
+ "*-*-solaris2*",
(const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
-tSCC zSolaris_Once_Init_2Select0[] =
- "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+tSCC zSolaris_Std___FilbufSelect0[] =
+ "(using std::perror;\n\
+)(#endif)";
-#define SOLARIS_ONCE_INIT_2_TEST_CT 1
-static tTestDesc aSolaris_Once_Init_2Tests[] = {
- { TT_EGREP, zSolaris_Once_Init_2Select0, (regex_t*)NULL }, };
+/*
+ * content bypass pattern - skip fix if pattern found
+ */
+tSCC zSolaris_Std___FilbufBypass0[] =
+ "using std::__filbuf";
+
+#define SOLARIS_STD___FILBUF_TEST_CT 2
+static tTestDesc aSolaris_Std___FilbufTests[] = {
+ { TT_NEGREP, zSolaris_Std___FilbufBypass0, (regex_t*)NULL },
+ { TT_EGREP, zSolaris_Std___FilbufSelect0, (regex_t*)NULL }, };
/*
- * Fix Command Arguments for Solaris_Once_Init_2
+ * Fix Command Arguments for Solaris_Std___Filbuf
*/
-static const char* apzSolaris_Once_Init_2Patch[] = {
+static const char* apzSolaris_Std___FilbufPatch[] = {
"format",
- "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n\
-%0\n\
-#else\n\
-%1{0}, {0}, {0}, {%3}%4\n\
-#endif",
- "(^#define[ \t]+PTHREAD_ONCE_INIT[ \t]+\\{\\{)(0, 0, 0, )(PTHREAD_[A-Z_]+)(\\}\\})[ \t]*$",
+ "%1#ifndef _LP64\n\
+using std::__filbuf;\n\
+using std::__flsbuf;\n\
+#endif\n\
+%2",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -5705,12 +7290,57 @@ static tTestDesc aSolaris_Stdio_TagTests[] = {
/*
* Fix Command Arguments for Solaris_Stdio_Tag
*/
-static const char* apzSolaris_Stdio_TagPatch[] = { "sed",
+static const char* apzSolaris_Stdio_TagPatch[] = { sed_cmd_z,
"-e", "s/defined(__cplusplus) && (__cplusplus < 54321L)/0/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Solaris_Sys_Va_List fix
+ */
+tSCC zSolaris_Sys_Va_ListName[] =
+ "solaris_sys_va_list";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_Sys_Va_ListList[] =
+ "sys/va_list.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_Sys_Va_ListMachs[] = {
+ "*-*-solaris2.[89]",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Sys_Va_ListSelect0[] =
+ "#if.*__STDC__.*\n\
+typedef void \\*__va_list;\n\
+#else\n\
+typedef char \\*__va_list;\n\
+#endif";
+
+#define SOLARIS_SYS_VA_LIST_TEST_CT 1
+static tTestDesc aSolaris_Sys_Va_ListTests[] = {
+ { TT_EGREP, zSolaris_Sys_Va_ListSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Solaris_Sys_Va_List
+ */
+static const char* apzSolaris_Sys_Va_ListPatch[] = {
+ "format",
+ "#ifdef __GNUC__\n\
+typedef __builtin_va_list __va_list;\n\
+#else\n\
+%0\n\
+#endif",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Statsswtch fix
*/
tSCC zStatsswtchName[] =
@@ -5814,7 +7444,7 @@ static tTestDesc aStdio_Va_ListTests[] = {
/*
* Fix Command Arguments for Stdio_Va_List
*/
-static const char* apzStdio_Va_ListPatch[] = { "sed",
+static const char* apzStdio_Va_ListPatch[] = { sed_cmd_z,
"-e", "s@[ \t]va_list\\([ \t)]\\)@ __gnuc_va_list\\1@\n\
s@(va_list)&@(__gnuc_va_list)\\&@\n\
s@ _VA_LIST_));@ __gnuc_va_list));@\n\
@@ -5864,7 +7494,7 @@ static tTestDesc aStdio_Va_List_ClientsTests[] = {
/*
* Fix Command Arguments for Stdio_Va_List_Clients
*/
-static const char* apzStdio_Va_List_ClientsPatch[] = { "sed",
+static const char* apzStdio_Va_List_ClientsPatch[] = { sed_cmd_z,
"-e", "s@[ \t]va_list\\([ \t)]\\)@ __gnuc_va_list\\1@\n\
s@(va_list)&@(__gnuc_va_list)\\&@\n\
s@ _VA_LIST_));@ __gnuc_va_list));@\n\
@@ -6245,7 +7875,7 @@ static tTestDesc aSun_MallocTests[] = {
/*
* Fix Command Arguments for Sun_Malloc
*/
-static const char* apzSun_MallocPatch[] = { "sed",
+static const char* apzSun_MallocPatch[] = { sed_cmd_z,
"-e", "s/typedef[ \t]char \\*\tmalloc_t/typedef void \\*\tmalloc_t/g",
"-e", "s/int[ \t][ \t]*free/void\tfree/g",
"-e", "s/char\\([ \t]*\\*[ \t]*malloc\\)/void\\1/g",
@@ -6283,7 +7913,7 @@ static tTestDesc aSun_Rusers_SemiTests[] = {
/*
* Fix Command Arguments for Sun_Rusers_Semi
*/
-static const char* apzSun_Rusers_SemiPatch[] = { "sed",
+static const char* apzSun_Rusers_SemiPatch[] = { sed_cmd_z,
"-e", "/^struct/,/^};/s/_cnt$/_cnt;/",
(char*)NULL };
@@ -6391,7 +8021,7 @@ static tTestDesc aSvr4_Disable_OptTests[] = {
/*
* Fix Command Arguments for Svr4_Disable_Opt
*/
-static const char* apzSvr4_Disable_OptPatch[] = { "sed",
+static const char* apzSvr4_Disable_OptPatch[] = { sed_cmd_z,
"-e", "/#define.*__std_hdr_/d",
(char*)NULL };
@@ -6581,7 +8211,7 @@ static tTestDesc aSysv68_StringTests[] = {
/*
* Fix Command Arguments for Sysv68_String
*/
-static const char* apzSysv68_StringPatch[] = { "sed",
+static const char* apzSysv68_StringPatch[] = { sed_cmd_z,
"-e", "s/extern[ \t]*int[ \t]*strlen();/extern unsigned int strlen();/",
"-e", "s/extern[ \t]*int[ \t]*ffs[ \t]*(long);/extern int ffs(int);/",
"-e", "s/strdup(char \\*s1);/strdup(const char *s1);/",
@@ -6816,6 +8446,121 @@ static const char* apzVa_I960_MacroPatch[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Vms_Define_Can_Use_Extern_Prefix fix
+ */
+tSCC zVms_Define_Can_Use_Extern_PrefixName[] =
+ "vms_define_can_use_extern_prefix";
+
+/*
+ * File name selection pattern
+ */
+tSCC zVms_Define_Can_Use_Extern_PrefixList[] =
+ "rtldef/decc$types.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzVms_Define_Can_Use_Extern_PrefixMachs[] = {
+ "*-*-*vms*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zVms_Define_Can_Use_Extern_PrefixSelect0[] =
+ "#[ \t]*else\n\
+#[ \t]*if defined\\(__DECCXX\\)\n\
+#[ \t]*define __CAN_USE_EXTERN_PREFIX 1\n";
+
+#define VMS_DEFINE_CAN_USE_EXTERN_PREFIX_TEST_CT 1
+static tTestDesc aVms_Define_Can_Use_Extern_PrefixTests[] = {
+ { TT_EGREP, zVms_Define_Can_Use_Extern_PrefixSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Vms_Define_Can_Use_Extern_Prefix
+ */
+static const char* apzVms_Define_Can_Use_Extern_PrefixPatch[] = {
+ "format",
+ "%0# elif defined (__GNUC__)\n\
+#\tdefine __CAN_USE_EXTERN_PREFIX 1\n",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Vms_Use_Pragma_Extern_Model fix
+ */
+tSCC zVms_Use_Pragma_Extern_ModelName[] =
+ "vms_use_pragma_extern_model";
+
+/*
+ * File name selection pattern
+ */
+#define zVms_Use_Pragma_Extern_ModelList (char*)NULL
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzVms_Use_Pragma_Extern_ModelMachs[] = {
+ "*-*-*vms*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zVms_Use_Pragma_Extern_ModelSelect0[] =
+ "#if defined\\(__DECC\\) \\|\\| defined\\(__DECCXX\\)\n\
+# pragma extern_model __save\n";
+
+#define VMS_USE_PRAGMA_EXTERN_MODEL_TEST_CT 1
+static tTestDesc aVms_Use_Pragma_Extern_ModelTests[] = {
+ { TT_EGREP, zVms_Use_Pragma_Extern_ModelSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Vms_Use_Pragma_Extern_Model
+ */
+static const char* apzVms_Use_Pragma_Extern_ModelPatch[] = {
+ "format",
+ "#if defined(__DECC) || defined(__DECCXX) || defined(__GNUC__)\n\
+# pragma extern_model __save\n",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Vms_Disable_Decc_String_Builtins fix
+ */
+tSCC zVms_Disable_Decc_String_BuiltinsName[] =
+ "vms_disable_decc_string_builtins";
+
+/*
+ * File name selection pattern
+ */
+tSCC zVms_Disable_Decc_String_BuiltinsList[] =
+ "rtldef/string.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzVms_Disable_Decc_String_BuiltinsMachs[] = {
+ "*-*-*vms*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zVms_Disable_Decc_String_BuiltinsSelect0[] =
+ "#if !defined\\(__VAX\\)\n";
+
+#define VMS_DISABLE_DECC_STRING_BUILTINS_TEST_CT 1
+static tTestDesc aVms_Disable_Decc_String_BuiltinsTests[] = {
+ { TT_EGREP, zVms_Disable_Decc_String_BuiltinsSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Vms_Disable_Decc_String_Builtins
+ */
+static const char* apzVms_Disable_Decc_String_BuiltinsPatch[] = {
+ "format",
+ "#if !defined(__VAX) && !defined(__GNUC__)\n",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Void_Null fix
*/
tSCC zVoid_NullName[] =
@@ -6842,10 +8587,13 @@ tSCC zVoid_NullSelect0[] =
*/
tSCC zVoid_NullBypass0[] =
"__cplusplus";
+tSCC zVoid_NullBypass1[] =
+ "__null";
-#define VOID_NULL_TEST_CT 2
+#define VOID_NULL_TEST_CT 3
static tTestDesc aVoid_NullTests[] = {
{ TT_NEGREP, zVoid_NullBypass0, (regex_t*)NULL },
+ { TT_NEGREP, zVoid_NullBypass1, (regex_t*)NULL },
{ TT_EGREP, zVoid_NullSelect0, (regex_t*)NULL }, };
/*
@@ -6886,7 +8634,7 @@ static tTestDesc aVxworks_Gcc_ProblemTests[] = {
/*
* Fix Command Arguments for Vxworks_Gcc_Problem
*/
-static const char* apzVxworks_Gcc_ProblemPatch[] = { "sed",
+static const char* apzVxworks_Gcc_ProblemPatch[] = { sed_cmd_z,
"-e", "s/#ifdef __GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__/#if 1/",
"-e", "/[ \t]size_t/i\\\n\
#ifndef _GCC_SIZE_T\\\n\
@@ -6983,7 +8731,7 @@ static tTestDesc aVxworks_Needs_VxworksTests[] = {
/*
* Fix Command Arguments for Vxworks_Needs_Vxworks
*/
-static const char* apzVxworks_Needs_VxworksPatch[] = { "sed",
+static const char* apzVxworks_Needs_VxworksPatch[] = { sed_cmd_z,
"-e", "/#[ \t]define[ \t][ \t]*__INCstath/a\\\n\
#include \n",
(char*)NULL };
@@ -7156,10 +8904,10 @@ static tTestDesc aX11_NewTests[] = {
/*
* Fix Command Arguments for X11_New
*/
-static const char* apzX11_NewPatch[] = { "sed",
+static const char* apzX11_NewPatch[] = { sed_cmd_z,
"-e", "/Widget\told, new;/i\\\n\
#ifdef __cplusplus\\\n\
-\tWidget\told, c_new;\\\n\
+\\\tWidget\told, c_new;\\\n\
#else\n",
"-e", "/Widget\told, new;/a\\\n\
#endif\n",
@@ -7208,9 +8956,9 @@ static const char* apzX11_SprintfPatch[] = {
*
* List of all fixes
*/
-#define REGEX_COUNT 223
+#define REGEX_COUNT 262
#define MACH_LIST_SIZE_LIMIT 181
-#define FIX_COUNT 177
+#define FIX_COUNT 220
/*
* Enumerate the fixes
@@ -7224,9 +8972,15 @@ typedef enum {
AAB_FD_ZERO_SELECTBITS_H_FIXIDX,
AAB_SOLARIS_SYS_VARARGS_H_FIXIDX,
AAB_SUN_MEMCPY_FIXIDX,
+ AIX_COMPLEX_FIXIDX,
+ AIX_NET_IF_ARP_FIXIDX,
AIX_PTHREAD_FIXIDX,
+ AIX_STDINT_1_FIXIDX,
+ AIX_STDINT_2_FIXIDX,
+ AIX_STDINT_3_FIXIDX,
+ AIX_STDINT_4_FIXIDX,
+ AIX_STDINT_5_FIXIDX,
AIX_SYSMACHINE_FIXIDX,
- AIX_SYSWAIT_FIXIDX,
AIX_SYSWAIT_2_FIXIDX,
AIX_VOLATILE_FIXIDX,
ALPHA___ASSERT_FIXIDX,
@@ -7236,12 +8990,12 @@ typedef enum {
ALPHA_ASSERT_FIXIDX,
ALPHA_BAD_LVAL_FIXIDX,
ALPHA_GETOPT_FIXIDX,
+ ALPHA_IF_SEMICOLON_FIXIDX,
ALPHA_PARENS_FIXIDX,
ALPHA_PTHREAD_FIXIDX,
ALPHA_PTHREAD_GCC_FIXIDX,
ALPHA_PTHREAD_INIT_FIXIDX,
ALPHA_SBRK_FIXIDX,
- ALPHA_WCHAR_FIXIDX,
AVOID_BOOL_DEFINE_FIXIDX,
AVOID_BOOL_TYPE_FIXIDX,
AVOID_WCHAR_T_TYPE_FIXIDX,
@@ -7258,10 +9012,16 @@ typedef enum {
DARWIN_EXTERNC_FIXIDX,
DARWIN_GCC4_BREAKAGE_FIXIDX,
DARWIN_PRIVATE_EXTERN_FIXIDX,
+ DARWIN_STDINT_1_FIXIDX,
+ DARWIN_STDINT_2_FIXIDX,
+ DARWIN_STDINT_3_FIXIDX,
+ DARWIN_STDINT_4_FIXIDX,
+ DARWIN_STDINT_5_FIXIDX,
+ DARWIN_STDINT_6_FIXIDX,
+ DARWIN_STDINT_7_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,
@@ -7270,32 +9030,41 @@ typedef enum {
GLIBC_C99_INLINE_3_FIXIDX,
GLIBC_C99_INLINE_4_FIXIDX,
GLIBC_MUTEX_INIT_FIXIDX,
+ GLIBC_STDINT_FIXIDX,
+ GLIBC_STRNCPY_FIXIDX,
+ GLIBC_TGMATH_FIXIDX,
GNU_TYPES_FIXIDX,
HP_INLINE_FIXIDX,
HP_SYSFILE_FIXIDX,
+ HPPA_HPUX_FP_MACROS_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,
HPUX11_ABS_FIXIDX,
HPUX11_FABSF_FIXIDX,
+ HPUX11_PTHREAD_CONST_FIXIDX,
HPUX11_SIZE_T_FIXIDX,
HPUX11_SNPRINTF_FIXIDX,
- HPUX11_UINT32_C_FIXIDX,
HPUX11_VSNPRINTF_FIXIDX,
HPUX8_BOGUS_INLINES_FIXIDX,
HPUX_CTYPE_MACROS_FIXIDX,
HPUX_HTONL_FIXIDX,
HPUX_LONG_DOUBLE_FIXIDX,
+ HPUX_LONG_DOUBLE_2_FIXIDX,
HPUX_SYSTIME_FIXIDX,
HPUX_SPU_INFO_FIXIDX,
HPUX11_EXTERN_SENDFILE_FIXIDX,
HPUX11_EXTERN_SENDPATH_FIXIDX,
HPUX_EXTERN_ERRNO_FIXIDX,
- HPUX11_PTHREAD_CONST_FIXIDX,
HPUX_PTHREAD_INITIALIZERS_FIXIDX,
+ HPUX_C99_INTPTR_FIXIDX,
+ HPUX_C99_INTTYPES_FIXIDX,
+ HPUX_C99_INTTYPES2_FIXIDX,
+ HPUX_STDINT_LEAST_FAST_FIXIDX,
+ HPUX_INTTYPE_INT8_T_FIXIDX,
+ HPUX_IMAGINARY_I_FIXIDX,
HUGE_VAL_HEX_FIXIDX,
HUGE_VALF_HEX_FIXIDX,
HUGE_VALL_HEX_FIXIDX,
@@ -7307,13 +9076,15 @@ typedef enum {
IRIX___GENERIC1_FIXIDX,
IRIX___GENERIC2_FIXIDX,
IRIX_ASM_APOSTROPHE_FIXIDX,
+ IRIX_COMPLEX_FIXIDX,
IRIX_LIMITS_CONST_FIXIDX,
+ IRIX_PTHREAD_INIT_FIXIDX,
IRIX_SOCKLEN_T_FIXIDX,
- IRIX_STDINT_C99_FIXIDX,
+ IRIX_STDINT_C99_MODE_FIXIDX,
+ IRIX_STDINT_C99_TYPES_FIXIDX,
+ IRIX_STDINT_C99_MACROS_FIXIDX,
IRIX_STDIO_VA_LIST_FIXIDX,
IRIX_WCSFTIME_FIXIDX,
- ISC_FMOD_FIXIDX,
- ISC_OMITS_WITH_STDC_FIXIDX,
KANDR_CONCAT_FIXIDX,
LINUX_IA64_UCONTEXT_FIXIDX,
LYNXOS_NO_WARNING_IN_SYS_TIME_H_FIXIDX,
@@ -7323,19 +9094,21 @@ typedef enum {
MATH_EXCEPTION_FIXIDX,
MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX,
NESTED_AUTH_DES_FIXIDX,
- NESTED_SYS_LIMITS_FIXIDX,
NETBSD_C99_INLINE_1_FIXIDX,
NETBSD_C99_INLINE_2_FIXIDX,
NETBSD_EXTRA_SEMICOLON_FIXIDX,
+ NEWLIB_STDINT_1_FIXIDX,
+ NEWLIB_STDINT_2_FIXIDX,
NEXT_MATH_PREFIX_FIXIDX,
NEXT_TEMPLATE_FIXIDX,
NEXT_VOLITILE_FIXIDX,
NEXT_WAIT_UNION_FIXIDX,
NODEENT_SYNTAX_FIXIDX,
+ OPENBSD_NULL_DEFINITION_FIXIDX,
OBSTACK_LVALUE_CAST_FIXIDX,
+ OPENBSD_VA_START_FIXIDX,
OSF_NAMESPACE_A_FIXIDX,
OSF_NAMESPACE_C_FIXIDX,
- PTHREAD_PAGE_SIZE_FIXIDX,
PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_FIXIDX,
READ_RET_TYPE_FIXIDX,
RPC_XDR_LVALUE_CAST_A_FIXIDX,
@@ -7343,7 +9116,13 @@ typedef enum {
RS6000_DOUBLE_FIXIDX,
RS6000_FCHMOD_FIXIDX,
RS6000_PARAM_FIXIDX,
- SCO_MATH_FIXIDX,
+ SOLARIS___RESTRICT_FIXIDX,
+ SOLARIS_COMPLEX_FIXIDX,
+ SOLARIS_COMPLEX_CXX_FIXIDX,
+ SOLARIS_COND_INIT_FIXIDX,
+ SOLARIS_CXX_LINKAGE_FIXIDX,
+ SOLARIS_GETC_STRICT_STDC_FIXIDX,
+ SOLARIS_LONGJMP_NORETURN_FIXIDX,
SOLARIS_MATH_1_FIXIDX,
SOLARIS_MATH_2_FIXIDX,
SOLARIS_MATH_3_FIXIDX,
@@ -7352,10 +9131,19 @@ typedef enum {
SOLARIS_MATH_9_FIXIDX,
SOLARIS_MATH_10_FIXIDX,
SOLARIS_MUTEX_INIT_2_FIXIDX,
+ SOLARIS_POW_INT_OVERLOAD_FIXIDX,
SOLARIS_RWLOCK_INIT_1_FIXIDX,
SOLARIS_ONCE_INIT_1_FIXIDX,
SOLARIS_ONCE_INIT_2_FIXIDX,
+ SOLARIS_INT_CONST_FIXIDX,
+ SOLARIS_INT_LIMITS_1_FIXIDX,
+ SOLARIS_INT_LIMITS_2_FIXIDX,
+ SOLARIS_INT_LIMITS_3_FIXIDX,
+ SOLARIS_INT_TYPES_FIXIDX,
+ SOLARIS_POSIX_SPAWN_RESTRICT_FIXIDX,
+ SOLARIS_STD___FILBUF_FIXIDX,
SOLARIS_STDIO_TAG_FIXIDX,
+ SOLARIS_SYS_VA_LIST_FIXIDX,
STATSSWTCH_FIXIDX,
STDIO_STDARG_H_FIXIDX,
STDIO_VA_LIST_FIXIDX,
@@ -7384,6 +9172,9 @@ typedef enum {
ULTRIX_CONST_FIXIDX,
ULTRIX_CONST2_FIXIDX,
VA_I960_MACRO_FIXIDX,
+ VMS_DEFINE_CAN_USE_EXTERN_PREFIX_FIXIDX,
+ VMS_USE_PRAGMA_EXTERN_MODEL_FIXIDX,
+ VMS_DISABLE_DECC_STRING_BUILTINS_FIXIDX,
VOID_NULL_FIXIDX,
VXWORKS_GCC_PROBLEM_FIXIDX,
VXWORKS_NEEDS_VXTYPES_FIXIDX,
@@ -7436,21 +9227,51 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
AAB_SUN_MEMCPY_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
aAab_Sun_MemcpyTests, apzAab_Sun_MemcpyPatch, 0 },
+ { zAix_ComplexName, zAix_ComplexList,
+ apzAix_ComplexMachs,
+ AIX_COMPLEX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aAix_ComplexTests, apzAix_ComplexPatch, 0 },
+
+ { zAix_Net_If_ArpName, zAix_Net_If_ArpList,
+ apzAix_Net_If_ArpMachs,
+ AIX_NET_IF_ARP_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aAix_Net_If_ArpTests, apzAix_Net_If_ArpPatch, 0 },
+
{ zAix_PthreadName, zAix_PthreadList,
apzAix_PthreadMachs,
AIX_PTHREAD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aAix_PthreadTests, apzAix_PthreadPatch, 0 },
+ { zAix_Stdint_1Name, zAix_Stdint_1List,
+ apzAix_Stdint_1Machs,
+ AIX_STDINT_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aAix_Stdint_1Tests, apzAix_Stdint_1Patch, 0 },
+
+ { zAix_Stdint_2Name, zAix_Stdint_2List,
+ apzAix_Stdint_2Machs,
+ AIX_STDINT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aAix_Stdint_2Tests, apzAix_Stdint_2Patch, 0 },
+
+ { zAix_Stdint_3Name, zAix_Stdint_3List,
+ apzAix_Stdint_3Machs,
+ AIX_STDINT_3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aAix_Stdint_3Tests, apzAix_Stdint_3Patch, 0 },
+
+ { zAix_Stdint_4Name, zAix_Stdint_4List,
+ apzAix_Stdint_4Machs,
+ AIX_STDINT_4_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aAix_Stdint_4Tests, apzAix_Stdint_4Patch, 0 },
+
+ { zAix_Stdint_5Name, zAix_Stdint_5List,
+ apzAix_Stdint_5Machs,
+ AIX_STDINT_5_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aAix_Stdint_5Tests, apzAix_Stdint_5Patch, 0 },
+
{ zAix_SysmachineName, zAix_SysmachineList,
apzAix_SysmachineMachs,
AIX_SYSMACHINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aAix_SysmachineTests, apzAix_SysmachinePatch, 0 },
- { zAix_SyswaitName, zAix_SyswaitList,
- apzAix_SyswaitMachs,
- AIX_SYSWAIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
- aAix_SyswaitTests, apzAix_SyswaitPatch, 0 },
-
{ zAix_Syswait_2Name, zAix_Syswait_2List,
apzAix_Syswait_2Machs,
AIX_SYSWAIT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -7496,6 +9317,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
ALPHA_GETOPT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aAlpha_GetoptTests, apzAlpha_GetoptPatch, 0 },
+ { zAlpha_If_SemicolonName, zAlpha_If_SemicolonList,
+ apzAlpha_If_SemicolonMachs,
+ ALPHA_IF_SEMICOLON_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aAlpha_If_SemicolonTests, apzAlpha_If_SemicolonPatch, 0 },
+
{ zAlpha_ParensName, zAlpha_ParensList,
apzAlpha_ParensMachs,
ALPHA_PARENS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -7521,11 +9347,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
ALPHA_SBRK_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aAlpha_SbrkTests, apzAlpha_SbrkPatch, 0 },
- { zAlpha_WcharName, zAlpha_WcharList,
- apzAlpha_WcharMachs,
- ALPHA_WCHAR_TEST_CT, FD_MACH_ONLY,
- aAlpha_WcharTests, apzAlpha_WcharPatch, 0 },
-
{ zAvoid_Bool_DefineName, zAvoid_Bool_DefineList,
apzAvoid_Bool_DefineMachs,
AVOID_BOOL_DEFINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -7606,6 +9427,41 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
DARWIN_PRIVATE_EXTERN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aDarwin_Private_ExternTests, apzDarwin_Private_ExternPatch, 0 },
+ { zDarwin_Stdint_1Name, zDarwin_Stdint_1List,
+ apzDarwin_Stdint_1Machs,
+ DARWIN_STDINT_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aDarwin_Stdint_1Tests, apzDarwin_Stdint_1Patch, 0 },
+
+ { zDarwin_Stdint_2Name, zDarwin_Stdint_2List,
+ apzDarwin_Stdint_2Machs,
+ DARWIN_STDINT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aDarwin_Stdint_2Tests, apzDarwin_Stdint_2Patch, 0 },
+
+ { zDarwin_Stdint_3Name, zDarwin_Stdint_3List,
+ apzDarwin_Stdint_3Machs,
+ DARWIN_STDINT_3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aDarwin_Stdint_3Tests, apzDarwin_Stdint_3Patch, 0 },
+
+ { zDarwin_Stdint_4Name, zDarwin_Stdint_4List,
+ apzDarwin_Stdint_4Machs,
+ DARWIN_STDINT_4_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aDarwin_Stdint_4Tests, apzDarwin_Stdint_4Patch, 0 },
+
+ { zDarwin_Stdint_5Name, zDarwin_Stdint_5List,
+ apzDarwin_Stdint_5Machs,
+ DARWIN_STDINT_5_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aDarwin_Stdint_5Tests, apzDarwin_Stdint_5Patch, 0 },
+
+ { zDarwin_Stdint_6Name, zDarwin_Stdint_6List,
+ apzDarwin_Stdint_6Machs,
+ DARWIN_STDINT_6_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aDarwin_Stdint_6Tests, apzDarwin_Stdint_6Patch, 0 },
+
+ { zDarwin_Stdint_7Name, zDarwin_Stdint_7List,
+ apzDarwin_Stdint_7Machs,
+ DARWIN_STDINT_7_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aDarwin_Stdint_7Tests, apzDarwin_Stdint_7Patch, 0 },
+
{ zDec_Intern_AsmName, zDec_Intern_AsmList,
apzDec_Intern_AsmMachs,
DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY,
@@ -7621,11 +9477,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
ECD_CURSOR_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aEcd_CursorTests, apzEcd_CursorPatch, 0 },
- { zException_StructureName, zException_StructureList,
- apzException_StructureMachs,
- EXCEPTION_STRUCTURE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
- aException_StructureTests, apzException_StructurePatch, 0 },
-
{ zFreebsd_Gcc3_BreakageName, zFreebsd_Gcc3_BreakageList,
apzFreebsd_Gcc3_BreakageMachs,
FREEBSD_GCC3_BREAKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -7666,6 +9517,21 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
GLIBC_MUTEX_INIT_TEST_CT, FD_MACH_ONLY,
aGlibc_Mutex_InitTests, apzGlibc_Mutex_InitPatch, 0 },
+ { zGlibc_StdintName, zGlibc_StdintList,
+ apzGlibc_StdintMachs,
+ GLIBC_STDINT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aGlibc_StdintTests, apzGlibc_StdintPatch, 0 },
+
+ { zGlibc_StrncpyName, zGlibc_StrncpyList,
+ apzGlibc_StrncpyMachs,
+ GLIBC_STRNCPY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aGlibc_StrncpyTests, apzGlibc_StrncpyPatch, 0 },
+
+ { zGlibc_TgmathName, zGlibc_TgmathList,
+ apzGlibc_TgmathMachs,
+ GLIBC_TGMATH_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aGlibc_TgmathTests, apzGlibc_TgmathPatch, 0 },
+
{ zGnu_TypesName, zGnu_TypesList,
apzGnu_TypesMachs,
GNU_TYPES_TEST_CT, FD_MACH_IFNOT | FD_SUBROUTINE,
@@ -7681,6 +9547,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
HP_SYSFILE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aHp_SysfileTests, apzHp_SysfilePatch, 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_Cpp_Pow_InlineName, zHpux10_Cpp_Pow_InlineList,
apzHpux10_Cpp_Pow_InlineMachs,
HPUX10_CPP_POW_INLINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -7691,11 +9562,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
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,
@@ -7721,6 +9587,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
HPUX11_FABSF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aHpux11_FabsfTests, apzHpux11_FabsfPatch, 0 },
+ { zHpux11_Pthread_ConstName, zHpux11_Pthread_ConstList,
+ apzHpux11_Pthread_ConstMachs,
+ HPUX11_PTHREAD_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aHpux11_Pthread_ConstTests, apzHpux11_Pthread_ConstPatch, 0 },
+
{ zHpux11_Size_TName, zHpux11_Size_TList,
apzHpux11_Size_TMachs,
HPUX11_SIZE_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -7731,11 +9602,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
HPUX11_SNPRINTF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aHpux11_SnprintfTests, apzHpux11_SnprintfPatch, 0 },
- { zHpux11_Uint32_CName, zHpux11_Uint32_CList,
- apzHpux11_Uint32_CMachs,
- HPUX11_UINT32_C_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
- aHpux11_Uint32_CTests, apzHpux11_Uint32_CPatch, 0 },
-
{ zHpux11_VsnprintfName, zHpux11_VsnprintfList,
apzHpux11_VsnprintfMachs,
HPUX11_VSNPRINTF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -7761,6 +9627,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
HPUX_LONG_DOUBLE_TEST_CT, FD_MACH_ONLY,
aHpux_Long_DoubleTests, apzHpux_Long_DoublePatch, 0 },
+ { zHpux_Long_Double_2Name, zHpux_Long_Double_2List,
+ apzHpux_Long_Double_2Machs,
+ HPUX_LONG_DOUBLE_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aHpux_Long_Double_2Tests, apzHpux_Long_Double_2Patch, 0 },
+
{ zHpux_SystimeName, zHpux_SystimeList,
apzHpux_SystimeMachs,
HPUX_SYSTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -7786,16 +9657,41 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
HPUX_EXTERN_ERRNO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aHpux_Extern_ErrnoTests, apzHpux_Extern_ErrnoPatch, 0 },
- { zHpux11_Pthread_ConstName, zHpux11_Pthread_ConstList,
- apzHpux11_Pthread_ConstMachs,
- HPUX11_PTHREAD_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
- aHpux11_Pthread_ConstTests, apzHpux11_Pthread_ConstPatch, 0 },
-
{ zHpux_Pthread_InitializersName, zHpux_Pthread_InitializersList,
apzHpux_Pthread_InitializersMachs,
HPUX_PTHREAD_INITIALIZERS_TEST_CT, FD_MACH_ONLY,
aHpux_Pthread_InitializersTests, apzHpux_Pthread_InitializersPatch, 0 },
+ { zHpux_C99_IntptrName, zHpux_C99_IntptrList,
+ apzHpux_C99_IntptrMachs,
+ HPUX_C99_INTPTR_TEST_CT, FD_MACH_ONLY,
+ aHpux_C99_IntptrTests, apzHpux_C99_IntptrPatch, 0 },
+
+ { zHpux_C99_InttypesName, zHpux_C99_InttypesList,
+ apzHpux_C99_InttypesMachs,
+ HPUX_C99_INTTYPES_TEST_CT, FD_MACH_ONLY,
+ aHpux_C99_InttypesTests, apzHpux_C99_InttypesPatch, 0 },
+
+ { zHpux_C99_Inttypes2Name, zHpux_C99_Inttypes2List,
+ apzHpux_C99_Inttypes2Machs,
+ HPUX_C99_INTTYPES2_TEST_CT, FD_MACH_ONLY,
+ aHpux_C99_Inttypes2Tests, apzHpux_C99_Inttypes2Patch, 0 },
+
+ { zHpux_Stdint_Least_FastName, zHpux_Stdint_Least_FastList,
+ apzHpux_Stdint_Least_FastMachs,
+ HPUX_STDINT_LEAST_FAST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aHpux_Stdint_Least_FastTests, apzHpux_Stdint_Least_FastPatch, 0 },
+
+ { zHpux_Inttype_Int8_TName, zHpux_Inttype_Int8_TList,
+ apzHpux_Inttype_Int8_TMachs,
+ HPUX_INTTYPE_INT8_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aHpux_Inttype_Int8_TTests, apzHpux_Inttype_Int8_TPatch, 0 },
+
+ { zHpux_Imaginary_IName, zHpux_Imaginary_IList,
+ apzHpux_Imaginary_IMachs,
+ HPUX_IMAGINARY_I_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aHpux_Imaginary_ITests, apzHpux_Imaginary_IPatch, 0 },
+
{ zHuge_Val_HexName, zHuge_Val_HexList,
apzHuge_Val_HexMachs,
HUGE_VAL_HEX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -7851,20 +9747,40 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
IRIX_ASM_APOSTROPHE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aIrix_Asm_ApostropheTests, apzIrix_Asm_ApostrophePatch, 0 },
+ { zIrix_ComplexName, zIrix_ComplexList,
+ apzIrix_ComplexMachs,
+ IRIX_COMPLEX_TEST_CT, FD_MACH_ONLY,
+ aIrix_ComplexTests, apzIrix_ComplexPatch, 0 },
+
{ zIrix_Limits_ConstName, zIrix_Limits_ConstList,
apzIrix_Limits_ConstMachs,
IRIX_LIMITS_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aIrix_Limits_ConstTests, apzIrix_Limits_ConstPatch, 0 },
+ { zIrix_Pthread_InitName, zIrix_Pthread_InitList,
+ apzIrix_Pthread_InitMachs,
+ IRIX_PTHREAD_INIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aIrix_Pthread_InitTests, apzIrix_Pthread_InitPatch, 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_Stdint_C99Name, zIrix_Stdint_C99List,
- apzIrix_Stdint_C99Machs,
- IRIX_STDINT_C99_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
- aIrix_Stdint_C99Tests, apzIrix_Stdint_C99Patch, 0 },
+ { zIrix_Stdint_C99_ModeName, zIrix_Stdint_C99_ModeList,
+ apzIrix_Stdint_C99_ModeMachs,
+ IRIX_STDINT_C99_MODE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aIrix_Stdint_C99_ModeTests, apzIrix_Stdint_C99_ModePatch, 0 },
+
+ { zIrix_Stdint_C99_TypesName, zIrix_Stdint_C99_TypesList,
+ apzIrix_Stdint_C99_TypesMachs,
+ IRIX_STDINT_C99_TYPES_TEST_CT, FD_MACH_ONLY,
+ aIrix_Stdint_C99_TypesTests, apzIrix_Stdint_C99_TypesPatch, 0 },
+
+ { zIrix_Stdint_C99_MacrosName, zIrix_Stdint_C99_MacrosList,
+ apzIrix_Stdint_C99_MacrosMachs,
+ IRIX_STDINT_C99_MACROS_TEST_CT, FD_MACH_ONLY,
+ aIrix_Stdint_C99_MacrosTests, apzIrix_Stdint_C99_MacrosPatch, 0 },
{ zIrix_Stdio_Va_ListName, zIrix_Stdio_Va_ListList,
apzIrix_Stdio_Va_ListMachs,
@@ -7876,16 +9792,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
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,
- aIsc_FmodTests, apzIsc_FmodPatch, 0 },
-
- { zIsc_Omits_With_StdcName, zIsc_Omits_With_StdcList,
- apzIsc_Omits_With_StdcMachs,
- ISC_OMITS_WITH_STDC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
- aIsc_Omits_With_StdcTests, apzIsc_Omits_With_StdcPatch, 0 },
-
{ zKandr_ConcatName, zKandr_ConcatList,
apzKandr_ConcatMachs,
KANDR_CONCAT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -7931,11 +9837,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
NESTED_AUTH_DES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aNested_Auth_DesTests, apzNested_Auth_DesPatch, 0 },
- { zNested_Sys_LimitsName, zNested_Sys_LimitsList,
- apzNested_Sys_LimitsMachs,
- 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,
@@ -7951,6 +9852,16 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
NETBSD_EXTRA_SEMICOLON_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aNetbsd_Extra_SemicolonTests, apzNetbsd_Extra_SemicolonPatch, 0 },
+ { zNewlib_Stdint_1Name, zNewlib_Stdint_1List,
+ apzNewlib_Stdint_1Machs,
+ NEWLIB_STDINT_1_TEST_CT, FD_MACH_ONLY,
+ aNewlib_Stdint_1Tests, apzNewlib_Stdint_1Patch, 0 },
+
+ { zNewlib_Stdint_2Name, zNewlib_Stdint_2List,
+ apzNewlib_Stdint_2Machs,
+ NEWLIB_STDINT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aNewlib_Stdint_2Tests, apzNewlib_Stdint_2Patch, 0 },
+
{ zNext_Math_PrefixName, zNext_Math_PrefixList,
apzNext_Math_PrefixMachs,
NEXT_MATH_PREFIX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -7976,11 +9887,21 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
NODEENT_SYNTAX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aNodeent_SyntaxTests, apzNodeent_SyntaxPatch, 0 },
+ { zOpenbsd_Null_DefinitionName, zOpenbsd_Null_DefinitionList,
+ apzOpenbsd_Null_DefinitionMachs,
+ OPENBSD_NULL_DEFINITION_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aOpenbsd_Null_DefinitionTests, apzOpenbsd_Null_DefinitionPatch, 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 },
+ { zOpenbsd_Va_StartName, zOpenbsd_Va_StartList,
+ apzOpenbsd_Va_StartMachs,
+ OPENBSD_VA_START_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aOpenbsd_Va_StartTests, apzOpenbsd_Va_StartPatch, 0 },
+
{ zOsf_Namespace_AName, zOsf_Namespace_AList,
apzOsf_Namespace_AMachs,
OSF_NAMESPACE_A_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -7991,11 +9912,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
OSF_NAMESPACE_C_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aOsf_Namespace_CTests, apzOsf_Namespace_CPatch, 0 },
- { zPthread_Page_SizeName, zPthread_Page_SizeList,
- apzPthread_Page_SizeMachs,
- PTHREAD_PAGE_SIZE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
- aPthread_Page_SizeTests, apzPthread_Page_SizePatch, 0 },
-
{ zPthread_Incomplete_Struct_ArgumentName, zPthread_Incomplete_Struct_ArgumentList,
apzPthread_Incomplete_Struct_ArgumentMachs,
PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -8031,10 +9947,40 @@ 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 },
+ { zSolaris___RestrictName, zSolaris___RestrictList,
+ apzSolaris___RestrictMachs,
+ SOLARIS___RESTRICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSolaris___RestrictTests, apzSolaris___RestrictPatch, 0 },
+
+ { zSolaris_ComplexName, zSolaris_ComplexList,
+ apzSolaris_ComplexMachs,
+ SOLARIS_COMPLEX_TEST_CT, FD_MACH_ONLY,
+ aSolaris_ComplexTests, apzSolaris_ComplexPatch, 0 },
+
+ { zSolaris_Complex_CxxName, zSolaris_Complex_CxxList,
+ apzSolaris_Complex_CxxMachs,
+ SOLARIS_COMPLEX_CXX_TEST_CT, FD_MACH_ONLY,
+ aSolaris_Complex_CxxTests, apzSolaris_Complex_CxxPatch, 0 },
+
+ { zSolaris_Cond_InitName, zSolaris_Cond_InitList,
+ apzSolaris_Cond_InitMachs,
+ SOLARIS_COND_INIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSolaris_Cond_InitTests, apzSolaris_Cond_InitPatch, 0 },
+
+ { zSolaris_Cxx_LinkageName, zSolaris_Cxx_LinkageList,
+ apzSolaris_Cxx_LinkageMachs,
+ SOLARIS_CXX_LINKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSolaris_Cxx_LinkageTests, apzSolaris_Cxx_LinkagePatch, 0 },
+
+ { zSolaris_Getc_Strict_StdcName, zSolaris_Getc_Strict_StdcList,
+ apzSolaris_Getc_Strict_StdcMachs,
+ SOLARIS_GETC_STRICT_STDC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSolaris_Getc_Strict_StdcTests, apzSolaris_Getc_Strict_StdcPatch, 0 },
+
+ { zSolaris_Longjmp_NoreturnName, zSolaris_Longjmp_NoreturnList,
+ apzSolaris_Longjmp_NoreturnMachs,
+ SOLARIS_LONGJMP_NORETURN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSolaris_Longjmp_NoreturnTests, apzSolaris_Longjmp_NoreturnPatch, 0 },
{ zSolaris_Math_1Name, zSolaris_Math_1List,
apzSolaris_Math_1Machs,
@@ -8076,6 +10022,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
SOLARIS_MUTEX_INIT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aSolaris_Mutex_Init_2Tests, apzSolaris_Mutex_Init_2Patch, 0 },
+ { zSolaris_Pow_Int_OverloadName, zSolaris_Pow_Int_OverloadList,
+ apzSolaris_Pow_Int_OverloadMachs,
+ SOLARIS_POW_INT_OVERLOAD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSolaris_Pow_Int_OverloadTests, apzSolaris_Pow_Int_OverloadPatch, 0 },
+
{ zSolaris_Rwlock_Init_1Name, zSolaris_Rwlock_Init_1List,
apzSolaris_Rwlock_Init_1Machs,
SOLARIS_RWLOCK_INIT_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -8091,11 +10042,51 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
SOLARIS_ONCE_INIT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aSolaris_Once_Init_2Tests, apzSolaris_Once_Init_2Patch, 0 },
+ { zSolaris_Int_ConstName, zSolaris_Int_ConstList,
+ apzSolaris_Int_ConstMachs,
+ SOLARIS_INT_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSolaris_Int_ConstTests, apzSolaris_Int_ConstPatch, 0 },
+
+ { zSolaris_Int_Limits_1Name, zSolaris_Int_Limits_1List,
+ apzSolaris_Int_Limits_1Machs,
+ SOLARIS_INT_LIMITS_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSolaris_Int_Limits_1Tests, apzSolaris_Int_Limits_1Patch, 0 },
+
+ { zSolaris_Int_Limits_2Name, zSolaris_Int_Limits_2List,
+ apzSolaris_Int_Limits_2Machs,
+ SOLARIS_INT_LIMITS_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSolaris_Int_Limits_2Tests, apzSolaris_Int_Limits_2Patch, 0 },
+
+ { zSolaris_Int_Limits_3Name, zSolaris_Int_Limits_3List,
+ apzSolaris_Int_Limits_3Machs,
+ SOLARIS_INT_LIMITS_3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSolaris_Int_Limits_3Tests, apzSolaris_Int_Limits_3Patch, 0 },
+
+ { zSolaris_Int_TypesName, zSolaris_Int_TypesList,
+ apzSolaris_Int_TypesMachs,
+ SOLARIS_INT_TYPES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSolaris_Int_TypesTests, apzSolaris_Int_TypesPatch, 0 },
+
+ { zSolaris_Posix_Spawn_RestrictName, zSolaris_Posix_Spawn_RestrictList,
+ apzSolaris_Posix_Spawn_RestrictMachs,
+ SOLARIS_POSIX_SPAWN_RESTRICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSolaris_Posix_Spawn_RestrictTests, apzSolaris_Posix_Spawn_RestrictPatch, 0 },
+
+ { zSolaris_Std___FilbufName, zSolaris_Std___FilbufList,
+ apzSolaris_Std___FilbufMachs,
+ SOLARIS_STD___FILBUF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSolaris_Std___FilbufTests, apzSolaris_Std___FilbufPatch, 0 },
+
{ zSolaris_Stdio_TagName, zSolaris_Stdio_TagList,
apzSolaris_Stdio_TagMachs,
SOLARIS_STDIO_TAG_TEST_CT, FD_MACH_ONLY,
aSolaris_Stdio_TagTests, apzSolaris_Stdio_TagPatch, 0 },
+ { zSolaris_Sys_Va_ListName, zSolaris_Sys_Va_ListList,
+ apzSolaris_Sys_Va_ListMachs,
+ SOLARIS_SYS_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSolaris_Sys_Va_ListTests, apzSolaris_Sys_Va_ListPatch, 0 },
+
{ zStatsswtchName, zStatsswtchList,
apzStatsswtchMachs,
STATSSWTCH_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -8236,6 +10227,21 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
VA_I960_MACRO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aVa_I960_MacroTests, apzVa_I960_MacroPatch, 0 },
+ { zVms_Define_Can_Use_Extern_PrefixName, zVms_Define_Can_Use_Extern_PrefixList,
+ apzVms_Define_Can_Use_Extern_PrefixMachs,
+ VMS_DEFINE_CAN_USE_EXTERN_PREFIX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aVms_Define_Can_Use_Extern_PrefixTests, apzVms_Define_Can_Use_Extern_PrefixPatch, 0 },
+
+ { zVms_Use_Pragma_Extern_ModelName, zVms_Use_Pragma_Extern_ModelList,
+ apzVms_Use_Pragma_Extern_ModelMachs,
+ VMS_USE_PRAGMA_EXTERN_MODEL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aVms_Use_Pragma_Extern_ModelTests, apzVms_Use_Pragma_Extern_ModelPatch, 0 },
+
+ { zVms_Disable_Decc_String_BuiltinsName, zVms_Disable_Decc_String_BuiltinsList,
+ apzVms_Disable_Decc_String_BuiltinsMachs,
+ VMS_DISABLE_DECC_STRING_BUILTINS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aVms_Disable_Decc_String_BuiltinsTests, apzVms_Disable_Decc_String_BuiltinsPatch, 0 },
+
{ zVoid_NullName, zVoid_NullList,
apzVoid_NullMachs,
VOID_NULL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,