Mercurial > hg > CbC > CbC_gcc
diff fixincludes/fixincl.x @ 111:04ced10e8804
gcc 7
| author | kono |
|---|---|
| date | Fri, 27 Oct 2017 22:46:09 +0900 |
| parents | f6334be47118 |
| children | 84e7813d76e9 |
line wrap: on
line diff
--- a/fixincludes/fixincl.x Sun Aug 21 07:07:55 2011 +0900 +++ b/fixincludes/fixincl.x Fri Oct 27 22:46:09 2017 +0900 @@ -1,12 +1,12 @@ /* -*- buffer-read-only: t -*- vi: set ro: - * + * * DO NOT EDIT THIS FILE (fixincl.x) - * - * It has been AutoGen-ed Monday November 8, 2010 at 08:33:47 PM MET + * + * It has been AutoGen-ed June 8, 2017 at 10:50:04 AM by AutoGen 5.18.4 * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Mon Nov 8 20:33:47 MET 2010 +/* DO NOT SVN-MERGE THIS FILE, EITHER Thu Jun 8 10:50:04 CEST 2017 * * You must regenerate it. Use the ./genfixes script. * @@ -15,7 +15,7 @@ * 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 210 fixup descriptions. + * This file contains 247 fixup descriptions. * * See README for more information. * @@ -101,6 +101,60 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Aab_Aix_Fcntl fix + */ +tSCC zAab_Aix_FcntlName[] = + "AAB_aix_fcntl"; + +/* + * File name selection pattern + */ +tSCC zAab_Aix_FcntlList[] = + "fcntl.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAab_Aix_FcntlMachs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAab_Aix_FcntlSelect0[] = + "define open[ \t]open64"; + +#define AAB_AIX_FCNTL_TEST_CT 1 +static tTestDesc aAab_Aix_FcntlTests[] = { + { TT_EGREP, zAab_Aix_FcntlSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aab_Aix_Fcntl + */ +static const char* apzAab_Aix_FcntlPatch[] = { + "wrap", + "", + "\n\ +#if defined __GNUG__ && defined _LARGE_FILES && defined __cplusplus\n\ +#define __need__aix_fcntl_h_fix\n\ +#ifdef __need__aix_fcntl_h_fix\n\ +#undef open\n\ +#undef creat\n\ +#undef openat\n\ +/* Alias the symbols using asm */\n\ +extern \"C\" {\n\ +extern int open(const char *, int, ...) __asm__(\"open64\");\n\ +extern int creat(const char *, mode_t) __asm__(\"creat64\");\n\ +#if (_XOPEN_SOURCE >= 700)\n\ +extern int openat(int, const char *, int, ...) __asm__(\"open64at\");\n\ +#endif\n\ +}\n\ +#endif\n\ +#endif\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Aab_Darwin7_9_Long_Double_Funcs fix */ tSCC zAab_Darwin7_9_Long_Double_FuncsName[] = @@ -215,44 +269,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Aab_Darwin7_9_Long_Double_Funcs_2 fix - */ -tSCC zAab_Darwin7_9_Long_Double_Funcs_2Name[] = - "AAB_darwin7_9_long_double_funcs_2"; - -/* - * File name selection pattern - */ -tSCC zAab_Darwin7_9_Long_Double_Funcs_2List[] = - "math.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzAab_Darwin7_9_Long_Double_Funcs_2Machs[] = { - "*-*-darwin7.9*", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zAab_Darwin7_9_Long_Double_Funcs_2Select0[] = - "#include[ \\t]+\\\""; - -#define AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_2_TEST_CT 1 -static tTestDesc aAab_Darwin7_9_Long_Double_Funcs_2Tests[] = { - { TT_EGREP, zAab_Darwin7_9_Long_Double_Funcs_2Select0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Aab_Darwin7_9_Long_Double_Funcs_2 - */ -static const char* apzAab_Darwin7_9_Long_Double_Funcs_2Patch[] = { - "format", - "%1<%2.h>", - "([ \\t]*#[ \\t]*include[ \\t]+)\"([a-z0-9/]+)\\.h\"", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * * Description of Aab_Fd_Zero_Asm_Posix_Types_H fix */ tSCC zAab_Fd_Zero_Asm_Posix_Types_HName[] = @@ -485,6 +501,166 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Aab_Vxworks_Assert fix + */ +tSCC zAab_Vxworks_AssertName[] = + "AAB_vxworks_assert"; + +/* + * File name selection pattern + */ +tSCC zAab_Vxworks_AssertList[] = + "assert.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAab_Vxworks_AssertMachs[] = { + "*-*-vxworks*", + (const char*)NULL }; +#define AAB_VXWORKS_ASSERT_TEST_CT 0 +#define aAab_Vxworks_AssertTests (tTestDesc*)NULL + +/* + * Fix Command Arguments for Aab_Vxworks_Assert + */ +static const char* apzAab_Vxworks_AssertPatch[] = { +"#ifndef _ASSERT_H\n\ +#define _ASSERT_H\n\n\ +#ifdef assert\n\ +#undef assert\n\ +#endif\n\n\ +#if defined(__STDC__) || defined(__cplusplus)\n\ +extern void __assert (const char*);\n\ +#else\n\ +extern void __assert ();\n\ +#endif\n\n\ +#ifdef NDEBUG\n\ +#define assert(ign) ((void)0)\n\ +#else\n\n\ +#define ASSERT_STRINGIFY(str) ASSERT_STRINGIFY_HELPER(str)\n\ +#define ASSERT_STRINGIFY_HELPER(str) #str\n\n\ +#define assert(test) ((void) \\\n\ + ((test) ? ((void)0) : \\\n\ + __assert(\"Assertion failed: \" ASSERT_STRINGIFY(test) \", file \" \\\n\ + __FILE__ \", line \" ASSERT_STRINGIFY(__LINE__) \"\\n\")))\n\n\ +#endif\n\n\ +#endif", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aab_Vxworks_Regs_Vxtypes fix + */ +tSCC zAab_Vxworks_Regs_VxtypesName[] = + "AAB_vxworks_regs_vxtypes"; + +/* + * File name selection pattern + */ +tSCC zAab_Vxworks_Regs_VxtypesList[] = + "regs.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAab_Vxworks_Regs_VxtypesMachs[] = { + "*-*-vxworks*", + (const char*)NULL }; +#define AAB_VXWORKS_REGS_VXTYPES_TEST_CT 0 +#define aAab_Vxworks_Regs_VxtypesTests (tTestDesc*)NULL + +/* + * Fix Command Arguments for Aab_Vxworks_Regs_Vxtypes + */ +static const char* apzAab_Vxworks_Regs_VxtypesPatch[] = { +"#ifndef _REGS_H\n\ +#define _REGS_H\n\ +#include <types/vxTypesOld.h>\n\ +#include_next <arch/../regs.h>\n\ +#endif", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aab_Vxworks_Unistd fix + */ +tSCC zAab_Vxworks_UnistdName[] = + "AAB_vxworks_unistd"; + +/* + * File name selection pattern + */ +tSCC zAab_Vxworks_UnistdList[] = + "unistd.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAab_Vxworks_UnistdMachs[] = { + "*-*-vxworks*", + (const char*)NULL }; +#define AAB_VXWORKS_UNISTD_TEST_CT 0 +#define aAab_Vxworks_UnistdTests (tTestDesc*)NULL + +/* + * Fix Command Arguments for Aab_Vxworks_Unistd + */ +static const char* apzAab_Vxworks_UnistdPatch[] = { +"#ifndef _UNISTD_H\n\ +#define _UNISTD_H\n\ +#include_next <unistd.h>\n\ +#include <ioLib.h>\n\ +#ifndef STDIN_FILENO\n\ +#define STDIN_FILENO 0\n\ +#endif\n\ +#ifndef STDOUT_FILENO\n\ +#define STDOUT_FILENO 1\n\ +#endif\n\ +#ifndef STDERR_FILENO\n\ +#define STDERR_FILENO 2\n\ +#endif\n\ +#endif /* _UNISTD_H */", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aix_Assert fix + */ +tSCC zAix_AssertName[] = + "aix_assert"; + +/* + * File name selection pattern + */ +tSCC zAix_AssertList[] = + "assert.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_AssertMachs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_AssertSelect0[] = + "#define[ \t]static_assert[ \t]_Static_assert"; + +#define AIX_ASSERT_TEST_CT 1 +static tTestDesc aAix_AssertTests[] = { + { TT_EGREP, zAix_AssertSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Assert + */ +static const char* apzAix_AssertPatch[] = { + "format", + "#ifndef __cplusplus\n\ +%0\n\ +#endif", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Aix_Complex fix */ tSCC zAix_ComplexName[] = @@ -522,6 +698,447 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Aix_Externc fix + */ +tSCC zAix_ExterncName[] = + "aix_externc"; + +/* + * File name selection pattern + */ +tSCC zAix_ExterncList[] = + "ctype.h\0fcntl.h\0langinfo.h\0ldfcn.h\0sys/localedef.h\0sys/times.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_ExterncMachs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zAix_ExterncBypass0[] = + "extern \"C\""; + +#define AIX_EXTERNC_TEST_CT 1 +static tTestDesc aAix_ExterncTests[] = { + { TT_NEGREP, zAix_ExterncBypass0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Externc + */ +static const char* apzAix_ExterncPatch[] = { + "wrap", + "#ifdef __cplusplus\n\ +extern \"C\" {\n\ +#endif\n", + "#ifdef __cplusplus\n\ +}\n\ +#endif\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aix_Externcpp1 fix + */ +tSCC zAix_Externcpp1Name[] = + "aix_externcpp1"; + +/* + * File name selection pattern + */ +tSCC zAix_Externcpp1List[] = + "sys/socket.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_Externcpp1Machs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_Externcpp1Select0[] = + "#ifdef __cplusplus"; + +#define AIX_EXTERNCPP1_TEST_CT 1 +static tTestDesc aAix_Externcpp1Tests[] = { + { TT_EGREP, zAix_Externcpp1Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Externcpp1 + */ +static const char* apzAix_Externcpp1Patch[] = { + "format", + "#ifdef __cplusplus\n\ +extern \"C++\" {", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aix_Externcpp2 fix + */ +tSCC zAix_Externcpp2Name[] = + "aix_externcpp2"; + +/* + * File name selection pattern + */ +tSCC zAix_Externcpp2List[] = + "sys/socket.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_Externcpp2Machs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_Externcpp2Select0[] = + "#else /\\* __cplusplus \\*/"; + +#define AIX_EXTERNCPP2_TEST_CT 1 +static tTestDesc aAix_Externcpp2Tests[] = { + { TT_EGREP, zAix_Externcpp2Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Externcpp2 + */ +static const char* apzAix_Externcpp2Patch[] = { + "format", + "} /* extern \"C++\" */\n\ +#else /* __cplusplus */", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aix_Malloc fix + */ +tSCC zAix_MallocName[] = + "aix_malloc"; + +/* + * File name selection pattern + */ +tSCC zAix_MallocList[] = + "malloc.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_MallocMachs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_MallocSelect0[] = + "#ifdef __cplusplus"; + +#define AIX_MALLOC_TEST_CT 1 +static tTestDesc aAix_MallocTests[] = { + { TT_EGREP, zAix_MallocSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Malloc + */ +static const char* apzAix_MallocPatch[] = { + "format", + "#if (defined(__cplusplus) && defined(__IBMCPP__))", + (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 }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aix_Null fix + */ +tSCC zAix_NullName[] = + "aix_null"; + +/* + * File name selection pattern + */ +tSCC zAix_NullList[] = + "curses.h\0dbm.h\0locale.h\0stdio.h\0stdlib.h\0string.h\0time.h\0unistd.h\0wchar.h\0sys/dir.h\0sys/param.h\0sys/types.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_NullMachs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_NullSelect0[] = + "#define[ \t]+NULL[ \t]+\\(*0L*\\)*"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zAix_NullBypass0[] = + "__null"; + +#define AIX_NULL_TEST_CT 2 +static tTestDesc aAix_NullTests[] = { + { TT_NEGREP, zAix_NullBypass0, (regex_t*)NULL }, + { TT_EGREP, zAix_NullSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Null + */ +static const char* apzAix_NullPatch[] = { + "format", + "#ifndef NULL\n\ +#ifdef __cplusplus\n\ +#ifdef __GNUG__\n\ +#define NULL __null\n\ +#else /* ! __GNUG__ */\n\ +#define NULL 0L\n\ +#endif /* __GNUG__ */\n\ +#else /* ! __cplusplus */\n\ +#define NULL ((void *)0)\n\ +#endif /* __cplusplus */\n\ +#endif /* !NULL */", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aix_Once_Init_1 fix + */ +tSCC zAix_Once_Init_1Name[] = + "aix_once_init_1"; + +/* + * File name selection pattern + */ +tSCC zAix_Once_Init_1List[] = + "pthread.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_Once_Init_1Machs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_Once_Init_1Select0[] = + "#define[ \t]PTHREAD_ONCE_INIT \\\\\n\ +\\{ \\\\\n"; + +#define AIX_ONCE_INIT_1_TEST_CT 1 +static tTestDesc aAix_Once_Init_1Tests[] = { + { TT_EGREP, zAix_Once_Init_1Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Once_Init_1 + */ +static const char* apzAix_Once_Init_1Patch[] = { + "format", + "#define PTHREAD_ONCE_INIT \\\n\ +{{ \\\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aix_Once_Init_2 fix + */ +tSCC zAix_Once_Init_2Name[] = + "aix_once_init_2"; + +/* + * File name selection pattern + */ +tSCC zAix_Once_Init_2List[] = + "pthread.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_Once_Init_2Machs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_Once_Init_2Select0[] = + "[ \t]0 \\\\\n\ +\\}\n"; + +#define AIX_ONCE_INIT_2_TEST_CT 1 +static tTestDesc aAix_Once_Init_2Tests[] = { + { TT_EGREP, zAix_Once_Init_2Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Once_Init_2 + */ +static const char* apzAix_Once_Init_2Patch[] = { + "format", + "\t0 \\\n\ +}}\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aix_Mutex_Initializer_1 fix + */ +tSCC zAix_Mutex_Initializer_1Name[] = + "aix_mutex_initializer_1"; + +/* + * File name selection pattern + */ +tSCC zAix_Mutex_Initializer_1List[] = + "pthread.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_Mutex_Initializer_1Machs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_Mutex_Initializer_1Select0[] = + "#define[ \t]PTHREAD_MUTEX_INITIALIZER \\\\\n\ +\\{ \\\\\n"; + +#define AIX_MUTEX_INITIALIZER_1_TEST_CT 1 +static tTestDesc aAix_Mutex_Initializer_1Tests[] = { + { TT_EGREP, zAix_Mutex_Initializer_1Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Mutex_Initializer_1 + */ +static const char* apzAix_Mutex_Initializer_1Patch[] = { + "format", + "#define PTHREAD_MUTEX_INITIALIZER \\\n\ +{{ \\\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aix_Cond_Initializer_1 fix + */ +tSCC zAix_Cond_Initializer_1Name[] = + "aix_cond_initializer_1"; + +/* + * File name selection pattern + */ +tSCC zAix_Cond_Initializer_1List[] = + "pthread.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_Cond_Initializer_1Machs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_Cond_Initializer_1Select0[] = + "#define[ \t]PTHREAD_COND_INITIALIZER \\\\\n\ +\\{ \\\\\n"; + +#define AIX_COND_INITIALIZER_1_TEST_CT 1 +static tTestDesc aAix_Cond_Initializer_1Tests[] = { + { TT_EGREP, zAix_Cond_Initializer_1Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Cond_Initializer_1 + */ +static const char* apzAix_Cond_Initializer_1Patch[] = { + "format", + "#define PTHREAD_COND_INITIALIZER \\\n\ +{{ \\\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aix_Rwlock_Initializer_1 fix + */ +tSCC zAix_Rwlock_Initializer_1Name[] = + "aix_rwlock_initializer_1"; + +/* + * File name selection pattern + */ +tSCC zAix_Rwlock_Initializer_1List[] = + "pthread.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_Rwlock_Initializer_1Machs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_Rwlock_Initializer_1Select0[] = + "#define[ \t]PTHREAD_RWLOCK_INITIALIZER \\\\\n\ +\\{ \\\\\n"; + +#define AIX_RWLOCK_INITIALIZER_1_TEST_CT 1 +static tTestDesc aAix_Rwlock_Initializer_1Tests[] = { + { TT_EGREP, zAix_Rwlock_Initializer_1Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Rwlock_Initializer_1 + */ +static const char* apzAix_Rwlock_Initializer_1Patch[] = { + "format", + "#define PTHREAD_RWLOCK_INITIALIZER \\\n\ +{{ \\\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Aix_Pthread fix */ tSCC zAix_PthreadName[] = @@ -541,7 +1158,7 @@ * content selection pattern - do fix if pattern found */ tSCC zAix_PthreadSelect0[] = - "(#define [A-Za-z_0-9]+)(\\\\\n\ + "(#define[\t ][A-Za-z_0-9]+)(\\\\\n\ [^A-Za-z_0-9 \t\n\ (])"; @@ -772,6 +1389,235 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Aix_Stdio_Inline fix + */ +tSCC zAix_Stdio_InlineName[] = + "aix_stdio_inline"; + +/* + * File name selection pattern + */ +tSCC zAix_Stdio_InlineList[] = + "stdio.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_Stdio_InlineMachs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_Stdio_InlineSelect0[] = + "#ifdef __cplusplus\\\n\ +}\\\n\ +\\\n\ +#ifdef ferror\\\n"; + +#define AIX_STDIO_INLINE_TEST_CT 1 +static tTestDesc aAix_Stdio_InlineTests[] = { + { TT_EGREP, zAix_Stdio_InlineSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Stdio_Inline + */ +static const char* apzAix_Stdio_InlinePatch[] = { + "format", + "#ifdef __cplusplus\n\ +}\n\ +#endif\n\n\ +#if (defined(__cplusplus) && defined(__IBMCPP__))\n\ +#ifdef ferror\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aix_Stdlib_Malloc fix + */ +tSCC zAix_Stdlib_MallocName[] = + "aix_stdlib_malloc"; + +/* + * File name selection pattern + */ +tSCC zAix_Stdlib_MallocList[] = + "stdlib.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_Stdlib_MallocMachs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_Stdlib_MallocSelect0[] = + "#define[ \t]+malloc[ \t]+__linux_malloc"; + +#define AIX_STDLIB_MALLOC_TEST_CT 1 +static tTestDesc aAix_Stdlib_MallocTests[] = { + { TT_EGREP, zAix_Stdlib_MallocSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Stdlib_Malloc + */ +static const char* apzAix_Stdlib_MallocPatch[] = { + "format", + "extern void *malloc(size_t) __asm__(\"__linux_malloc\");", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aix_Stdlib_Realloc fix + */ +tSCC zAix_Stdlib_ReallocName[] = + "aix_stdlib_realloc"; + +/* + * File name selection pattern + */ +tSCC zAix_Stdlib_ReallocList[] = + "stdlib.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_Stdlib_ReallocMachs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_Stdlib_ReallocSelect0[] = + "#define[ \t]+realloc[ \t]+__linux_realloc"; + +#define AIX_STDLIB_REALLOC_TEST_CT 1 +static tTestDesc aAix_Stdlib_ReallocTests[] = { + { TT_EGREP, zAix_Stdlib_ReallocSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Stdlib_Realloc + */ +static const char* apzAix_Stdlib_ReallocPatch[] = { + "format", + "extern void *realloc(void *, size_t) __asm__(\"__linux_realloc\");", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aix_Stdlib_Calloc fix + */ +tSCC zAix_Stdlib_CallocName[] = + "aix_stdlib_calloc"; + +/* + * File name selection pattern + */ +tSCC zAix_Stdlib_CallocList[] = + "stdlib.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_Stdlib_CallocMachs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_Stdlib_CallocSelect0[] = + "#define[ \t]+calloc[ \t]+__linux_calloc"; + +#define AIX_STDLIB_CALLOC_TEST_CT 1 +static tTestDesc aAix_Stdlib_CallocTests[] = { + { TT_EGREP, zAix_Stdlib_CallocSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Stdlib_Calloc + */ +static const char* apzAix_Stdlib_CallocPatch[] = { + "format", + "extern void *calloc(size_t, size_t) __asm__(\"__linux_calloc\");", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aix_Stdlib_Valloc fix + */ +tSCC zAix_Stdlib_VallocName[] = + "aix_stdlib_valloc"; + +/* + * File name selection pattern + */ +tSCC zAix_Stdlib_VallocList[] = + "stdlib.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_Stdlib_VallocMachs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_Stdlib_VallocSelect0[] = + "#define[ \t]+valloc[ \t]+__linux_valloc"; + +#define AIX_STDLIB_VALLOC_TEST_CT 1 +static tTestDesc aAix_Stdlib_VallocTests[] = { + { TT_EGREP, zAix_Stdlib_VallocSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Stdlib_Valloc + */ +static const char* apzAix_Stdlib_VallocPatch[] = { + "format", + "extern void *valloc(size_t) __asm__(\"__linux_valloc\");", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aix_Strtof_Const fix + */ +tSCC zAix_Strtof_ConstName[] = + "aix_strtof_const"; + +/* + * File name selection pattern + */ +tSCC zAix_Strtof_ConstList[] = + "stdlib.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_Strtof_ConstMachs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_Strtof_ConstSelect0[] = + "((extern[ \t]+)?float[ \t]+strtof)\\(char \\*, char \\*\\*\\);"; + +#define AIX_STRTOF_CONST_TEST_CT 1 +static tTestDesc aAix_Strtof_ConstTests[] = { + { TT_EGREP, zAix_Strtof_ConstSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Strtof_Const + */ +static const char* apzAix_Strtof_ConstPatch[] = { + "format", + "%1(const char *, char **);", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Aix_Sysmachine fix */ tSCC zAix_SysmachineName[] = @@ -785,7 +1631,9 @@ /* * Machine/OS name selection pattern */ -#define apzAix_SysmachineMachs (const char**)NULL +tSCC* apzAix_SysmachineMachs[] = { + "*-*-aix*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found @@ -820,7 +1668,9 @@ /* * Machine/OS name selection pattern */ -#define apzAix_Syswait_2Machs (const char**)NULL +tSCC* apzAix_Syswait_2Machs[] = { + "*-*-aix*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found @@ -855,7 +1705,9 @@ /* * Machine/OS name selection pattern */ -#define apzAix_VolatileMachs (const char**)NULL +tSCC* apzAix_VolatileMachs[] = { + "*-*-aix*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found @@ -912,118 +1764,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Alpha___Extern_Prefix fix - */ -tSCC zAlpha___Extern_PrefixName[] = - "alpha___extern_prefix"; - -/* - * File name selection pattern - */ -#define zAlpha___Extern_PrefixList (char*)NULL -/* - * Machine/OS name selection pattern - */ -tSCC* apzAlpha___Extern_PrefixMachs[] = { - "alpha*-dec-osf*", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zAlpha___Extern_PrefixSelect0[] = - "(.*)(defined\\(__DECC\\)|def[ \t]*__DECC)[ \t]*\n\ -(#[ \t]*pragma[ \t]*extern_prefix.*)"; - -#define ALPHA___EXTERN_PREFIX_TEST_CT 1 -static tTestDesc aAlpha___Extern_PrefixTests[] = { - { TT_EGREP, zAlpha___Extern_PrefixSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Alpha___Extern_Prefix - */ -static const char* apzAlpha___Extern_PrefixPatch[] = { - "format", - "%1 (defined(__DECC) || defined(__PRAGMA_EXTERN_PREFIX))\n\ -%3", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Alpha___Extern_Prefix_Standards fix - */ -tSCC zAlpha___Extern_Prefix_StandardsName[] = - "alpha___extern_prefix_standards"; - -/* - * File name selection pattern - */ -tSCC zAlpha___Extern_Prefix_StandardsList[] = - "standards.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzAlpha___Extern_Prefix_StandardsMachs[] = { - "alpha*-dec-osf*", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zAlpha___Extern_Prefix_StandardsSelect0[] = - ".*!defined\\(_LIBC_POLLUTION_H_\\) && !defined\\(__DECC\\)"; - -#define ALPHA___EXTERN_PREFIX_STANDARDS_TEST_CT 1 -static tTestDesc aAlpha___Extern_Prefix_StandardsTests[] = { - { TT_EGREP, zAlpha___Extern_Prefix_StandardsSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Alpha___Extern_Prefix_Standards - */ -static const char* apzAlpha___Extern_Prefix_StandardsPatch[] = { - "format", - "%0 && !defined(__PRAGMA_EXTERN_PREFIX)", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Alpha___Extern_Prefix_Sys_Stat fix - */ -tSCC zAlpha___Extern_Prefix_Sys_StatName[] = - "alpha___extern_prefix_sys_stat"; - -/* - * File name selection pattern - */ -tSCC zAlpha___Extern_Prefix_Sys_StatList[] = - "sys/stat.h\0sys/mount.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzAlpha___Extern_Prefix_Sys_StatMachs[] = { - "alpha*-dec-osf5*", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zAlpha___Extern_Prefix_Sys_StatSelect0[] = - "#[ \t]*if[ \t]*defined\\(__DECC\\)"; - -#define ALPHA___EXTERN_PREFIX_SYS_STAT_TEST_CT 1 -static tTestDesc aAlpha___Extern_Prefix_Sys_StatTests[] = { - { TT_EGREP, zAlpha___Extern_Prefix_Sys_StatSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Alpha___Extern_Prefix_Sys_Stat - */ -static const char* apzAlpha___Extern_Prefix_Sys_StatPatch[] = { - "format", - "%0 || defined(__PRAGMA_EXTERN_PREFIX)", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * * Description of Alpha_Assert fix */ tSCC zAlpha_AssertName[] = @@ -1059,41 +1799,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Alpha_Bad_Lval fix - */ -tSCC zAlpha_Bad_LvalName[] = - "alpha_bad_lval"; - -/* - * File name selection pattern - */ -#define zAlpha_Bad_LvalList (char*)NULL -/* - * Machine/OS name selection pattern - */ -tSCC* apzAlpha_Bad_LvalMachs[] = { - "alpha*-dec-osf*", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zAlpha_Bad_LvalSelect0[] = - "^[ \t]*#[ \t]*pragma[ \t]+extern_prefix"; - -#define ALPHA_BAD_LVAL_TEST_CT 1 -static tTestDesc aAlpha_Bad_LvalTests[] = { - { TT_EGREP, zAlpha_Bad_LvalSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Alpha_Bad_Lval - */ -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 }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * * Description of Alpha_Getopt fix */ tSCC zAlpha_GetoptName[] = @@ -1199,126 +1904,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Alpha_Pthread fix - */ -tSCC zAlpha_PthreadName[] = - "alpha_pthread"; - -/* - * File name selection pattern - */ -tSCC zAlpha_PthreadList[] = - "pthread.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzAlpha_PthreadMachs[] = { - "alpha*-dec-osf*", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zAlpha_PthreadSelect0[] = - "((#[ \t]*if)([ \t]*defined[ \t]*\\(_PTHREAD_ENV_DECC\\)|def _PTHREAD_ENV_DECC)(.*))\n\ -(#[ \t]*define _PTHREAD_USE_PTDNAM_)"; - -#define ALPHA_PTHREAD_TEST_CT 1 -static tTestDesc aAlpha_PthreadTests[] = { - { TT_EGREP, zAlpha_PthreadSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Alpha_Pthread - */ -static const char* apzAlpha_PthreadPatch[] = { - "format", - "%2 defined (_PTHREAD_ENV_DECC)%4 || defined (__PRAGMA_EXTERN_PREFIX)\n\ -%5", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Alpha_Pthread_Gcc fix - */ -tSCC zAlpha_Pthread_GccName[] = - "alpha_pthread_gcc"; - -/* - * File name selection pattern - */ -tSCC zAlpha_Pthread_GccList[] = - "pthread.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzAlpha_Pthread_GccMachs[] = { - "alpha*-dec-osf*", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zAlpha_Pthread_GccSelect0[] = - "#else\n\ -# error <pthread.h>: unrecognized compiler."; - -#define ALPHA_PTHREAD_GCC_TEST_CT 1 -static tTestDesc aAlpha_Pthread_GccTests[] = { - { TT_EGREP, zAlpha_Pthread_GccSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Alpha_Pthread_Gcc - */ -static const char* apzAlpha_Pthread_GccPatch[] = { - "format", - "#elif defined (__GNUC__)\n\ -# define _PTHREAD_ENV_GCC\n\ -%0", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Alpha_Pthread_Init fix - */ -tSCC zAlpha_Pthread_InitName[] = - "alpha_pthread_init"; - -/* - * File name selection pattern - */ -tSCC zAlpha_Pthread_InitList[] = - "pthread.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzAlpha_Pthread_InitMachs[] = { - "alpha*-dec-osf*", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zAlpha_Pthread_InitSelect0[] = - " \\* @\\(#\\).RCSfile: pthread\\.h,v \\$ .Revision: 1\\.1\\.33\\.21 \\$ \\(DEC\\) .Date: 2000/08/15 15:30:13 \\$"; - -#define ALPHA_PTHREAD_INIT_TEST_CT 1 -static tTestDesc aAlpha_Pthread_InitTests[] = { - { TT_EGREP, zAlpha_Pthread_InitSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Alpha_Pthread_Init - */ -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\ -s@CVALID\\(.*\\)_}@CVALID\\1_, 0, 0 }@\n\ -s@WVALID\\(.*\\)A}@WVALID\\1A, 0, 0, 0, 0, 0, 0, 0, 0, 0 }@\n\ -s@WVALID\\(.*\\)_}@WVALID\\1_, 0, 0, 0, 0, 0, 0, 0 }@\n", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * * Description of Alpha_Sbrk fix */ tSCC zAlpha_SbrkName[] = @@ -1702,7 +2287,7 @@ * content selection pattern - do fix if pattern found */ tSCC zBroken_NanSelect0[] = - "#if defined(__APPLE_CC__) && (__APPLE_CC__ >= 1345)"; + "#if defined\\(__APPLE_CC__\\) && \\(__APPLE_CC__ >= 1345\\)"; /* * content bypass pattern - skip fix if pattern found @@ -1880,6 +2465,89 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Darwin_Availabilityinternal fix + */ +tSCC zDarwin_AvailabilityinternalName[] = + "darwin_availabilityinternal"; + +/* + * File name selection pattern + */ +tSCC zDarwin_AvailabilityinternalList[] = + "AvailabilityInternal.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzDarwin_AvailabilityinternalMachs[] = { + "*-*-darwin*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zDarwin_AvailabilityinternalSelect0[] = + "#define[ \t]+(__API_[ADU]\\([^)]*\\)).*"; + +#define DARWIN_AVAILABILITYINTERNAL_TEST_CT 1 +static tTestDesc aDarwin_AvailabilityinternalTests[] = { + { TT_EGREP, zDarwin_AvailabilityinternalSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Darwin_Availabilityinternal + */ +static const char* apzDarwin_AvailabilityinternalPatch[] = { + "format", + "#if defined(__has_attribute)\n\ + #if __has_attribute(availability)\n\ +%0\n\ + #else\n\ + #define %1\n\ + #endif\n\ +#else\n\ + #define %1\n\ +#endif", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Darwin_9_Long_Double_Funcs_2 fix + */ +tSCC zDarwin_9_Long_Double_Funcs_2Name[] = + "darwin_9_long_double_funcs_2"; + +/* + * File name selection pattern + */ +tSCC zDarwin_9_Long_Double_Funcs_2List[] = + "math.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzDarwin_9_Long_Double_Funcs_2Machs[] = { + "*-*-darwin7.9*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zDarwin_9_Long_Double_Funcs_2Select0[] = + "#include[ \\t]+\\\""; + +#define DARWIN_9_LONG_DOUBLE_FUNCS_2_TEST_CT 1 +static tTestDesc aDarwin_9_Long_Double_Funcs_2Tests[] = { + { TT_EGREP, zDarwin_9_Long_Double_Funcs_2Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Darwin_9_Long_Double_Funcs_2 + */ +static const char* apzDarwin_9_Long_Double_Funcs_2Patch[] = { + "format", + "%1<%2.h>", + "([ \\t]*#[ \\t]*include[ \\t]+)\"([a-z0-9/]+)\\.h\"", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Darwin_Externc fix */ tSCC zDarwin_ExterncName[] = @@ -1962,6 +2630,168 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Darwin_Longjmp_Noreturn fix + */ +tSCC zDarwin_Longjmp_NoreturnName[] = + "darwin_longjmp_noreturn"; + +/* + * File name selection pattern + */ +tSCC zDarwin_Longjmp_NoreturnList[] = + "i386/setjmp.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzDarwin_Longjmp_NoreturnMachs[] = { + "*-*-darwin*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zDarwin_Longjmp_NoreturnSelect0[] = + "(.*longjmp\\(.*jmp_buf.*[^)]+\\));"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zDarwin_Longjmp_NoreturnBypass0[] = + "__dead2"; + +#define DARWIN_LONGJMP_NORETURN_TEST_CT 2 +static tTestDesc aDarwin_Longjmp_NoreturnTests[] = { + { TT_NEGREP, zDarwin_Longjmp_NoreturnBypass0, (regex_t*)NULL }, + { TT_EGREP, zDarwin_Longjmp_NoreturnSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Darwin_Longjmp_Noreturn + */ +static const char* apzDarwin_Longjmp_NoreturnPatch[] = { + "format", + "%1 __attribute__ ((__noreturn__));", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Darwin_Os_Trace_1 fix + */ +tSCC zDarwin_Os_Trace_1Name[] = + "darwin_os_trace_1"; + +/* + * File name selection pattern + */ +tSCC zDarwin_Os_Trace_1List[] = + "os/trace.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzDarwin_Os_Trace_1Machs[] = { + "*-*-darwin*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zDarwin_Os_Trace_1Select0[] = + "^(_os_trace_verify_printf.*) (__attribute__.*)"; + +#define DARWIN_OS_TRACE_1_TEST_CT 1 +static tTestDesc aDarwin_Os_Trace_1Tests[] = { + { TT_EGREP, zDarwin_Os_Trace_1Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Darwin_Os_Trace_1 + */ +static const char* apzDarwin_Os_Trace_1Patch[] = { + "format", + "%1", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Darwin_Os_Trace_2 fix + */ +tSCC zDarwin_Os_Trace_2Name[] = + "darwin_os_trace_2"; + +/* + * File name selection pattern + */ +tSCC zDarwin_Os_Trace_2List[] = + "os/trace.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzDarwin_Os_Trace_2Machs[] = { + "*-*-darwin*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zDarwin_Os_Trace_2Select0[] = + "typedef.*\\^os_trace_payload_t.*"; + +#define DARWIN_OS_TRACE_2_TEST_CT 1 +static tTestDesc aDarwin_Os_Trace_2Tests[] = { + { TT_EGREP, zDarwin_Os_Trace_2Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Darwin_Os_Trace_2 + */ +static const char* apzDarwin_Os_Trace_2Patch[] = { + "format", + "#if __BLOCKS__\n\ +%0\n\ +#endif", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Darwin_Os_Trace_3 fix + */ +tSCC zDarwin_Os_Trace_3Name[] = + "darwin_os_trace_3"; + +/* + * File name selection pattern + */ +tSCC zDarwin_Os_Trace_3List[] = + "os/trace.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzDarwin_Os_Trace_3Machs[] = { + "*-*-darwin*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zDarwin_Os_Trace_3Select0[] = + "__(API|OSX)_.*\n\ +OS_EXPORT.*\n\ +.*\n\ +_os_trace.*os_trace_payload_t payload);"; + +#define DARWIN_OS_TRACE_3_TEST_CT 1 +static tTestDesc aDarwin_Os_Trace_3Tests[] = { + { TT_EGREP, zDarwin_Os_Trace_3Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Darwin_Os_Trace_3 + */ +static const char* apzDarwin_Os_Trace_3Patch[] = { + "format", + "#if __BLOCKS__\n\ +%0\n\ +#endif", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Darwin_Private_Extern fix */ tSCC zDarwin_Private_ExternName[] = @@ -2425,6 +3255,108 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Feraiseexcept_Nosse_Divbyzero fix + */ +tSCC zFeraiseexcept_Nosse_DivbyzeroName[] = + "feraiseexcept_nosse_divbyzero"; + +/* + * File name selection pattern + */ +tSCC zFeraiseexcept_Nosse_DivbyzeroList[] = + "bits/fenv.h\0*/bits/fenv.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzFeraiseexcept_Nosse_DivbyzeroMachs[] = { + "i[34567]86-*-linux*", + "x86*-linux*", + "amd64-*-linux*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zFeraiseexcept_Nosse_DivbyzeroSelect0[] = + "^([\t ]*)__asm__ __volatile__ \\(\"divss %1, %0 *\" : : \"x\" \\(__f\\), \"x\" \\(__g\\)\\);$"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zFeraiseexcept_Nosse_DivbyzeroBypass0[] = + "\"fdivp .*; fwait\""; + +#define FERAISEEXCEPT_NOSSE_DIVBYZERO_TEST_CT 2 +static tTestDesc aFeraiseexcept_Nosse_DivbyzeroTests[] = { + { TT_NEGREP, zFeraiseexcept_Nosse_DivbyzeroBypass0, (regex_t*)NULL }, + { TT_EGREP, zFeraiseexcept_Nosse_DivbyzeroSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Feraiseexcept_Nosse_Divbyzero + */ +static const char* apzFeraiseexcept_Nosse_DivbyzeroPatch[] = { + "format", + "# ifdef __SSE_MATH__\n\ +%0\n\ +# else\n\ +%1__asm__ __volatile__ (\"fdivp %%%%st, %%%%st(1); fwait\"\n\ +%1\t\t\t: \"=t\" (__f) : \"0\" (__f), \"u\" (__g) : \"st(1)\");\n\ +# endif", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Feraiseexcept_Nosse_Invalid fix + */ +tSCC zFeraiseexcept_Nosse_InvalidName[] = + "feraiseexcept_nosse_invalid"; + +/* + * File name selection pattern + */ +tSCC zFeraiseexcept_Nosse_InvalidList[] = + "bits/fenv.h\0*/bits/fenv.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzFeraiseexcept_Nosse_InvalidMachs[] = { + "i[34567]86-*-linux*", + "x86*-linux*", + "amd64-*-linux*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zFeraiseexcept_Nosse_InvalidSelect0[] = + "^([\t ]*)__asm__ __volatile__ \\(\"divss %0, %0 *\" : : \"x\" \\(__f\\)\\);$"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zFeraiseexcept_Nosse_InvalidBypass0[] = + "\"fdiv .*; fwait\""; + +#define FERAISEEXCEPT_NOSSE_INVALID_TEST_CT 2 +static tTestDesc aFeraiseexcept_Nosse_InvalidTests[] = { + { TT_NEGREP, zFeraiseexcept_Nosse_InvalidBypass0, (regex_t*)NULL }, + { TT_EGREP, zFeraiseexcept_Nosse_InvalidSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Feraiseexcept_Nosse_Invalid + */ +static const char* apzFeraiseexcept_Nosse_InvalidPatch[] = { + "format", + "# ifdef __SSE_MATH__\n\ +%0\n\ +# else\n\ +%1__asm__ __volatile__ (\"fdiv %%%%st, %%%%st(0); fwait\"\n\ +%1\t\t\t: \"=t\" (__f) : \"0\" (__f));\n\ +# endif", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Freebsd_Gcc3_Breakage fix */ tSCC zFreebsd_Gcc3_BreakageName[] = @@ -2687,7 +3619,7 @@ * File name selection pattern */ tSCC zGlibc_C99_Inline_4List[] = - "sys/sysmacros.h\0*/sys/sysmacros.h\0wchar.h\0*/wchar.h\0"; + "sys/sysmacros.h\0*/sys/sysmacros.h\0wchar.h\0*/wchar.h\0pthread.h\0*/pthread.h\0"; /* * Machine/OS name selection pattern */ @@ -2819,7 +3751,7 @@ * File name selection pattern */ tSCC zGlibc_StrncpyList[] = - "bits/string2.h\0"; + "bits/string2.h\0*/bits/string2.h\0"; /* * Machine/OS name selection pattern */ @@ -3296,6 +4228,46 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Hppa_Hpux11_Alloca fix + */ +tSCC zHppa_Hpux11_AllocaName[] = + "hppa_hpux11_alloca"; + +/* + * File name selection pattern + */ +tSCC zHppa_Hpux11_AllocaList[] = + "alloca.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzHppa_Hpux11_AllocaMachs[] = { + "hppa*-*-hpux11*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHppa_Hpux11_AllocaSelect0[] = + "#ifndef _STDDEF_INCLUDED"; + +#define HPPA_HPUX11_ALLOCA_TEST_CT 1 +static tTestDesc aHppa_Hpux11_AllocaTests[] = { + { TT_EGREP, zHppa_Hpux11_AllocaSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hppa_Hpux11_Alloca + */ +static const char* apzHppa_Hpux11_AllocaPatch[] = { + "format", + "#ifndef _SYS_STDSYMS_INCLUDED\n\ +# include <sys/stdsyms.h>\n\ +#endif /* _SYS_STDSYMS_INCLUDED */\n\n\ +%0", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Hpux11_Abs fix */ tSCC zHpux11_AbsName[] = @@ -3310,7 +4282,7 @@ * Machine/OS name selection pattern */ tSCC* apzHpux11_AbsMachs[] = { - "ia64-hp-hpux11*", + "*-hp-hpux11*", (const char*)NULL }; /* @@ -3333,6 +4305,121 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Hpux11_Lwp_Rwlock_Valid fix + */ +tSCC zHpux11_Lwp_Rwlock_ValidName[] = + "hpux11_lwp_rwlock_valid"; + +/* + * File name selection pattern + */ +tSCC zHpux11_Lwp_Rwlock_ValidList[] = + "sys/pthread.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzHpux11_Lwp_Rwlock_ValidMachs[] = { + "*-hp-hpux11*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux11_Lwp_Rwlock_ValidSelect0[] = + "#define __LWP_RWLOCK_VALID[ \t]*0x8c91"; + +#define HPUX11_LWP_RWLOCK_VALID_TEST_CT 1 +static tTestDesc aHpux11_Lwp_Rwlock_ValidTests[] = { + { TT_EGREP, zHpux11_Lwp_Rwlock_ValidSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux11_Lwp_Rwlock_Valid + */ +static const char* apzHpux11_Lwp_Rwlock_ValidPatch[] = { + "format", + "#define __LWP_RWLOCK_VALID -29551", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Hpux11_Extern_Sendfile fix + */ +tSCC zHpux11_Extern_SendfileName[] = + "hpux11_extern_sendfile"; + +/* + * File name selection pattern + */ +tSCC zHpux11_Extern_SendfileList[] = + "sys/socket.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzHpux11_Extern_SendfileMachs[] = { + "*-hp-hpux11.[12]*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux11_Extern_SendfileSelect0[] = + "^[ \t]*extern sbsize_t sendfile.*\n\ +.*, int\\)\\);\n"; + +#define HPUX11_EXTERN_SENDFILE_TEST_CT 1 +static tTestDesc aHpux11_Extern_SendfileTests[] = { + { TT_EGREP, zHpux11_Extern_SendfileSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux11_Extern_Sendfile + */ +static const char* apzHpux11_Extern_SendfilePatch[] = { + "format", + "#ifndef _APP32_64BIT_OFF_T\n\ +%0#endif\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Hpux11_Extern_Sendpath fix + */ +tSCC zHpux11_Extern_SendpathName[] = + "hpux11_extern_sendpath"; + +/* + * File name selection pattern + */ +tSCC zHpux11_Extern_SendpathList[] = + "sys/socket.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzHpux11_Extern_SendpathMachs[] = { + "*-hp-hpux11.[12]*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux11_Extern_SendpathSelect0[] = + "^[ \t]*extern sbsize_t sendpath.*\n\ +.*, int\\)\\);\n"; + +#define HPUX11_EXTERN_SENDPATH_TEST_CT 1 +static tTestDesc aHpux11_Extern_SendpathTests[] = { + { TT_EGREP, zHpux11_Extern_SendpathSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux11_Extern_Sendpath + */ +static const char* apzHpux11_Extern_SendpathPatch[] = { + "format", + "#ifndef _APP32_64BIT_OFF_T\n\ +%0#endif\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Hpux11_Fabsf fix */ tSCC zHpux11_FabsfName[] = @@ -3346,7 +4433,9 @@ /* * Machine/OS name selection pattern */ -#define apzHpux11_FabsfMachs (const char**)NULL +tSCC* apzHpux11_FabsfMachs[] = { + "*-hp-hpux11*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found @@ -3354,15 +4443,8 @@ tSCC zHpux11_FabsfSelect0[] = "^[ \t]*#[ \t]*define[ \t]+fabsf\\(.*"; -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zHpux11_FabsfBypass0[] = - "__cplusplus"; - -#define HPUX11_FABSF_TEST_CT 2 +#define HPUX11_FABSF_TEST_CT 1 static tTestDesc aHpux11_FabsfTests[] = { - { TT_NEGREP, zHpux11_FabsfBypass0, (regex_t*)NULL }, { TT_EGREP, zHpux11_FabsfSelect0, (regex_t*)NULL }, }; /* @@ -3377,6 +4459,43 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Hpux11_Pthread_Pointer fix + */ +tSCC zHpux11_Pthread_PointerName[] = + "hpux11_pthread_pointer"; + +/* + * File name selection pattern + */ +tSCC zHpux11_Pthread_PointerList[] = + "sys/pthread.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzHpux11_Pthread_PointerMachs[] = { + "*-hp-hpux11.[0-3]*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux11_Pthread_PointerSelect0[] = + "(void[ \t]*\\*)(m|c|rw)(_ptr)"; + +#define HPUX11_PTHREAD_POINTER_TEST_CT 1 +static tTestDesc aHpux11_Pthread_PointerTests[] = { + { TT_EGREP, zHpux11_Pthread_PointerSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux11_Pthread_Pointer + */ +static const char* apzHpux11_Pthread_PointerPatch[] = { + "format", + "long\t%2%3", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Hpux11_Pthread_Const fix */ tSCC zHpux11_Pthread_ConstName[] = @@ -3398,7 +4517,7 @@ * content selection pattern - do fix if pattern found */ tSCC zHpux11_Pthread_ConstSelect0[] = - "^#define[ \t]*__POINTER_SET[ \t]*\\(\\(void \\*\\) 1LL\\)"; + "^(#define[ \t]+__POINTER_SET[ \t0,]*)(.*\\))"; #define HPUX11_PTHREAD_CONST_TEST_CT 1 static tTestDesc aHpux11_Pthread_ConstTests[] = { @@ -3409,7 +4528,7 @@ */ static const char* apzHpux11_Pthread_ConstPatch[] = { "format", - "#define __POINTER_SET\t\t((void *) 1L)", + "%11", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -3520,6 +4639,43 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Hpux_Vsscanf fix + */ +tSCC zHpux_VsscanfName[] = + "hpux_vsscanf"; + +/* + * File name selection pattern + */ +tSCC zHpux_VsscanfList[] = + "stdio.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzHpux_VsscanfMachs[] = { + "*-*-hpux*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux_VsscanfSelect0[] = + "(extern int vsscanf\\()char"; + +#define HPUX_VSSCANF_TEST_CT 1 +static tTestDesc aHpux_VsscanfTests[] = { + { TT_EGREP, zHpux_VsscanfSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux_Vsscanf + */ +static const char* apzHpux_VsscanfPatch[] = { + "format", + "%1const char", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Hpux8_Bogus_Inlines fix */ tSCC zHpux8_Bogus_InlinesName[] = @@ -3564,399 +4720,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux_Ctype_Macros fix - */ -tSCC zHpux_Ctype_MacrosName[] = - "hpux_ctype_macros"; - -/* - * File name selection pattern - */ -tSCC zHpux_Ctype_MacrosList[] = - "ctype.h\0"; -/* - * Machine/OS name selection pattern - */ -#define apzHpux_Ctype_MacrosMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zHpux_Ctype_MacrosSelect0[] = - "((: |\\()__SB_masks \\? )(__SB_masks\\[__(alnum|c)\\] & _IS)"; - -#define HPUX_CTYPE_MACROS_TEST_CT 1 -static tTestDesc aHpux_Ctype_MacrosTests[] = { - { TT_EGREP, zHpux_Ctype_MacrosSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Hpux_Ctype_Macros - */ -static const char* apzHpux_Ctype_MacrosPatch[] = { - "format", - "%1(int)%3", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Hpux_Htonl fix - */ -tSCC zHpux_HtonlName[] = - "hpux_htonl"; - -/* - * File name selection pattern - */ -tSCC zHpux_HtonlList[] = - "netinet/in.h\0"; -/* - * Machine/OS name selection pattern - */ -#define apzHpux_HtonlMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zHpux_HtonlSelect0[] = - "#ifndef _XOPEN_SOURCE_EXTENDED[ \t]*\n\ -(/\\*\n\ - \\* Macros for number representation conversion\\.\n\ - \\*/\n\ -#ifndef ntohl)"; - -#define HPUX_HTONL_TEST_CT 1 -static tTestDesc aHpux_HtonlTests[] = { - { TT_EGREP, zHpux_HtonlSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Hpux_Htonl - */ -static const char* apzHpux_HtonlPatch[] = { - "format", - "#if 1\n\ -%1", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Hpux_Long_Double fix - */ -tSCC zHpux_Long_DoubleName[] = - "hpux_long_double"; - -/* - * File name selection pattern - */ -tSCC zHpux_Long_DoubleList[] = - "stdlib.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzHpux_Long_DoubleMachs[] = { - "*-*-hpux10*", - "*-*-hpux11.[012]*", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zHpux_Long_DoubleSelect0[] = - "extern[ \t]long_double[ \t]strtold"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zHpux_Long_DoubleBypass0[] = - "long_double_t"; - -#define HPUX_LONG_DOUBLE_TEST_CT 2 -static tTestDesc aHpux_Long_DoubleTests[] = { - { TT_NEGREP, zHpux_Long_DoubleBypass0, (regex_t*)NULL }, - { TT_EGREP, zHpux_Long_DoubleSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Hpux_Long_Double - */ -static const char* apzHpux_Long_DoublePatch[] = { sed_cmd_z, - "-e", "/^#[ \t]*ifndef _LONG_DOUBLE/,/\\/\\* _LONG_DOUBLE \\*\\//D", - "-e", "s/long_double/long double/g", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Hpux_Long_Double_2 fix - */ -tSCC zHpux_Long_Double_2Name[] = - "hpux_long_double_2"; - -/* - * File name selection pattern - */ -tSCC zHpux_Long_Double_2List[] = - "stdlib.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzHpux_Long_Double_2Machs[] = { - "hppa*-*-hpux11.3*", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zHpux_Long_Double_2Select0[] = - "#[ \t]*if[ \t]*!defined\\(__ia64\\) \\|\\| defined\\(_PROTOTYPES\\) \\|\\| defined\\(_LONG_DOUBLE_STRUCT\\)"; - -#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 }, }; - -/* - * Fix Command Arguments for Hpux_Systime - */ -static const char* apzHpux_SystimePatch[] = { - "format", - "struct sigevent;", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Hpux_Spu_Info fix - */ -tSCC zHpux_Spu_InfoName[] = - "hpux_spu_info"; - -/* - * File name selection pattern - */ -tSCC zHpux_Spu_InfoList[] = - "ia64/sys/getppdp.h\0*/sys/getppdp.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzHpux_Spu_InfoMachs[] = { - "*-hp-hpux*", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zHpux_Spu_InfoSelect0[] = - "^.*extern.*spu_info.*"; - -#define HPUX_SPU_INFO_TEST_CT 1 -static tTestDesc aHpux_Spu_InfoTests[] = { - { TT_EGREP, zHpux_Spu_InfoSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Hpux_Spu_Info - */ -static const char* apzHpux_Spu_InfoPatch[] = { - "format", - "#ifdef _KERNEL\n\ -%0\n\ -#endif", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Hpux11_Extern_Sendfile fix - */ -tSCC zHpux11_Extern_SendfileName[] = - "hpux11_extern_sendfile"; - -/* - * File name selection pattern - */ -tSCC zHpux11_Extern_SendfileList[] = - "sys/socket.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzHpux11_Extern_SendfileMachs[] = { - "*-hp-hpux11.[12]*", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zHpux11_Extern_SendfileSelect0[] = - "^[ \t]*extern sbsize_t sendfile.*\n\ -.*, int\\)\\);\n"; - -#define HPUX11_EXTERN_SENDFILE_TEST_CT 1 -static tTestDesc aHpux11_Extern_SendfileTests[] = { - { TT_EGREP, zHpux11_Extern_SendfileSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Hpux11_Extern_Sendfile - */ -static const char* apzHpux11_Extern_SendfilePatch[] = { - "format", - "#ifndef _APP32_64BIT_OFF_T\n\ -%0#endif\n", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Hpux11_Extern_Sendpath fix - */ -tSCC zHpux11_Extern_SendpathName[] = - "hpux11_extern_sendpath"; - -/* - * File name selection pattern - */ -tSCC zHpux11_Extern_SendpathList[] = - "sys/socket.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzHpux11_Extern_SendpathMachs[] = { - "*-hp-hpux11.[12]*", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zHpux11_Extern_SendpathSelect0[] = - "^[ \t]*extern sbsize_t sendpath.*\n\ -.*, int\\)\\);\n"; - -#define HPUX11_EXTERN_SENDPATH_TEST_CT 1 -static tTestDesc aHpux11_Extern_SendpathTests[] = { - { TT_EGREP, zHpux11_Extern_SendpathSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Hpux11_Extern_Sendpath - */ -static const char* apzHpux11_Extern_SendpathPatch[] = { - "format", - "#ifndef _APP32_64BIT_OFF_T\n\ -%0#endif\n", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Hpux_Extern_Errno fix - */ -tSCC zHpux_Extern_ErrnoName[] = - "hpux_extern_errno"; - -/* - * File name selection pattern - */ -tSCC zHpux_Extern_ErrnoList[] = - "errno.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzHpux_Extern_ErrnoMachs[] = { - "*-hp-hpux10.*", - "*-hp-hpux11.[0-2]*", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zHpux_Extern_ErrnoSelect0[] = - "^[ \t]*extern int errno;$"; - -#define HPUX_EXTERN_ERRNO_TEST_CT 1 -static tTestDesc aHpux_Extern_ErrnoTests[] = { - { TT_EGREP, zHpux_Extern_ErrnoSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Hpux_Extern_Errno - */ -static const char* apzHpux_Extern_ErrnoPatch[] = { - "format", - "#ifdef __cplusplus\n\ -extern \"C\" {\n\ -#endif\n\ -%0\n\ -#ifdef __cplusplus\n\ -}\n\ -#endif", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Hpux_Pthread_Initializers fix - */ -tSCC zHpux_Pthread_InitializersName[] = - "hpux_pthread_initializers"; - -/* - * File name selection pattern - */ -tSCC zHpux_Pthread_InitializersList[] = - "sys/pthread.h\0"; -/* - * Machine/OS name selection pattern - */ -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[] = @@ -4052,39 +4815,158 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * 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 zHpux_Stdint_Least_FastSelect0[] = - "^[ \t]*#[ \t]*define[ \t]+UINT_(LEAST|FAST)64_MAX[ \t]+ULLONG_MAX"; - -#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 Hpux_Stdint_Least_Fast - */ -static const char* apzHpux_Stdint_Least_FastPatch[] = { - "format", - "# define\tUINT_%164_MAX\t__UINT64_MAX__", + * Description of Hpux_Ctype_Macros fix + */ +tSCC zHpux_Ctype_MacrosName[] = + "hpux_ctype_macros"; + +/* + * File name selection pattern + */ +tSCC zHpux_Ctype_MacrosList[] = + "ctype.h\0"; +/* + * Machine/OS name selection pattern + */ +#define apzHpux_Ctype_MacrosMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux_Ctype_MacrosSelect0[] = + "((: |\\()__SB_masks \\? )(__SB_masks\\[__(alnum|c)\\] & _IS)"; + +#define HPUX_CTYPE_MACROS_TEST_CT 1 +static tTestDesc aHpux_Ctype_MacrosTests[] = { + { TT_EGREP, zHpux_Ctype_MacrosSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux_Ctype_Macros + */ +static const char* apzHpux_Ctype_MacrosPatch[] = { + "format", + "%1(int)%3", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Hpux_Extern_Errno fix + */ +tSCC zHpux_Extern_ErrnoName[] = + "hpux_extern_errno"; + +/* + * File name selection pattern + */ +tSCC zHpux_Extern_ErrnoList[] = + "errno.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzHpux_Extern_ErrnoMachs[] = { + "*-hp-hpux10.*", + "*-hp-hpux11.[0-2]*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux_Extern_ErrnoSelect0[] = + "^[ \t]*extern int errno;$"; + +#define HPUX_EXTERN_ERRNO_TEST_CT 1 +static tTestDesc aHpux_Extern_ErrnoTests[] = { + { TT_EGREP, zHpux_Extern_ErrnoSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux_Extern_Errno + */ +static const char* apzHpux_Extern_ErrnoPatch[] = { + "format", + "#ifdef __cplusplus\n\ +extern \"C\" {\n\ +#endif\n\ +%0\n\ +#ifdef __cplusplus\n\ +}\n\ +#endif", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Hpux_Htonl fix + */ +tSCC zHpux_HtonlName[] = + "hpux_htonl"; + +/* + * File name selection pattern + */ +tSCC zHpux_HtonlList[] = + "netinet/in.h\0"; +/* + * Machine/OS name selection pattern + */ +#define apzHpux_HtonlMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux_HtonlSelect0[] = + "#ifndef _XOPEN_SOURCE_EXTENDED[ \t]*\n\ +(/\\*\n\ + \\* Macros for number representation conversion\\.\n\ + \\*/\n\ +#ifndef ntohl)"; + +#define HPUX_HTONL_TEST_CT 1 +static tTestDesc aHpux_HtonlTests[] = { + { TT_EGREP, zHpux_HtonlSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux_Htonl + */ +static const char* apzHpux_HtonlPatch[] = { + "format", + "#if 1\n\ +%1", + (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 }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -4126,39 +5008,272 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * 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)", + * Description of Hpux_Long_Double fix + */ +tSCC zHpux_Long_DoubleName[] = + "hpux_long_double"; + +/* + * File name selection pattern + */ +tSCC zHpux_Long_DoubleList[] = + "stdlib.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzHpux_Long_DoubleMachs[] = { + "*-*-hpux10*", + "*-*-hpux11.[012]*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux_Long_DoubleSelect0[] = + "extern[ \t]long_double[ \t]strtold"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zHpux_Long_DoubleBypass0[] = + "long_double_t"; + +#define HPUX_LONG_DOUBLE_TEST_CT 2 +static tTestDesc aHpux_Long_DoubleTests[] = { + { TT_NEGREP, zHpux_Long_DoubleBypass0, (regex_t*)NULL }, + { TT_EGREP, zHpux_Long_DoubleSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux_Long_Double + */ +static const char* apzHpux_Long_DoublePatch[] = { sed_cmd_z, + "-e", "/^#[ \t]*ifndef _LONG_DOUBLE/,/\\/\\* _LONG_DOUBLE \\*\\//D", + "-e", "s/long_double/long double/g", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Hpux_Long_Double_2 fix + */ +tSCC zHpux_Long_Double_2Name[] = + "hpux_long_double_2"; + +/* + * File name selection pattern + */ +tSCC zHpux_Long_Double_2List[] = + "stdlib.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzHpux_Long_Double_2Machs[] = { + "hppa*-*-hpux11.3*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux_Long_Double_2Select0[] = + "#[ \t]*if[ \t]*!defined\\(__ia64\\) \\|\\| defined\\(_PROTOTYPES\\) \\|\\| defined\\(_LONG_DOUBLE_STRUCT\\)"; + +#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_Pthread_Initializers fix + */ +tSCC zHpux_Pthread_InitializersName[] = + "hpux_pthread_initializers"; + +/* + * File name selection pattern + */ +tSCC zHpux_Pthread_InitializersList[] = + "sys/pthread.h\0"; +/* + * Machine/OS name selection pattern + */ +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_Spu_Info fix + */ +tSCC zHpux_Spu_InfoName[] = + "hpux_spu_info"; + +/* + * File name selection pattern + */ +tSCC zHpux_Spu_InfoList[] = + "ia64/sys/getppdp.h\0*/sys/getppdp.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzHpux_Spu_InfoMachs[] = { + "*-hp-hpux*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux_Spu_InfoSelect0[] = + "^.*extern.*spu_info.*"; + +#define HPUX_SPU_INFO_TEST_CT 1 +static tTestDesc aHpux_Spu_InfoTests[] = { + { TT_EGREP, zHpux_Spu_InfoSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux_Spu_Info + */ +static const char* apzHpux_Spu_InfoPatch[] = { + "format", + "#ifdef _KERNEL\n\ +%0\n\ +#endif", + (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 zHpux_Stdint_Least_FastSelect0[] = + "^[ \t]*#[ \t]*define[ \t]+UINT_(LEAST|FAST)64_MAX[ \t]+ULLONG_MAX"; + +#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 Hpux_Stdint_Least_Fast + */ +static const char* apzHpux_Stdint_Least_FastPatch[] = { + "format", + "# define\tUINT_%164_MAX\t__UINT64_MAX__", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Hpux_Longjmp fix + */ +tSCC zHpux_LongjmpName[] = + "hpux_longjmp"; + +/* + * File name selection pattern + */ +tSCC zHpux_LongjmpList[] = + "setjmp.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzHpux_LongjmpMachs[] = { + "*-hp-hpux*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux_LongjmpSelect0[] = + "^[ \t]*extern[ \t]+void[ \t]+.*longjmp[ \t]*(__\\(\\(.*int\\)\\)|\\(.*int\\)|\\(\\))"; + +#define HPUX_LONGJMP_TEST_CT 1 +static tTestDesc aHpux_LongjmpTests[] = { + { TT_EGREP, zHpux_LongjmpSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux_Longjmp + */ +static const char* apzHpux_LongjmpPatch[] = { + "format", + "%0 __attribute__ ((__noreturn__))", + (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 }, }; + +/* + * Fix Command Arguments for Hpux_Systime + */ +static const char* apzHpux_SystimePatch[] = { + "format", + "struct sigevent;", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -4172,7 +5287,7 @@ * File name selection pattern */ tSCC zHuge_Val_HexList[] = - "bits/huge_val.h\0"; + "bits/huge_val.h\0*/bits/huge_val.h\0"; /* * Machine/OS name selection pattern */ @@ -4214,7 +5329,7 @@ * File name selection pattern */ tSCC zHuge_Valf_HexList[] = - "bits/huge_val.h\0"; + "bits/huge_val.h\0*/bits/huge_val.h\0"; /* * Machine/OS name selection pattern */ @@ -4256,7 +5371,7 @@ * File name selection pattern */ tSCC zHuge_Vall_HexList[] = - "bits/huge_val.h\0"; + "bits/huge_val.h\0*/bits/huge_val.h\0"; /* * Machine/OS name selection pattern */ @@ -4433,203 +5548,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Irix___Restrict fix - */ -tSCC zIrix___RestrictName[] = - "irix___restrict"; - -/* - * File name selection pattern - */ -tSCC zIrix___RestrictList[] = - "internal/sgimacros.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzIrix___RestrictMachs[] = { - "mips-sgi-irix6.5", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zIrix___RestrictSelect0[] = - "(#ifdef __c99\n\ -)(#[ \t]*define __restrict restrict)"; - -#define IRIX___RESTRICT_TEST_CT 1 -static tTestDesc aIrix___RestrictTests[] = { - { TT_EGREP, zIrix___RestrictSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Irix___Restrict - */ -static const char* apzIrix___RestrictPatch[] = { - "format", - "%1# ifndef __cplusplus\n\ -%2\n\ -# endif", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Irix___Generic1 fix - */ -tSCC zIrix___Generic1Name[] = - "irix___generic1"; - -/* - * File name selection pattern - */ -tSCC zIrix___Generic1List[] = - "internal/math_core.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzIrix___Generic1Machs[] = { - "mips-sgi-irix6.5", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zIrix___Generic1Select0[] = - "#define ([a-z]+)\\(x\\) *__generic.*"; - -#define IRIX___GENERIC1_TEST_CT 1 -static tTestDesc aIrix___Generic1Tests[] = { - { TT_EGREP, zIrix___Generic1Select0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Irix___Generic1 - */ -static const char* apzIrix___Generic1Patch[] = { - "format", - "extern int %1(double);\n\ -extern int %1f(float);\n\ -extern int %1l(long double);\n\ -#define %1(x) (sizeof(x) == sizeof(double) ? _%1(x) \\\n\ - : sizeof(x) == sizeof(float) ? _%1f(x) \\\n\ - : _%1l(x))\n", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Irix___Generic2 fix - */ -tSCC zIrix___Generic2Name[] = - "irix___generic2"; - -/* - * File name selection pattern - */ -tSCC zIrix___Generic2List[] = - "internal/math_core.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzIrix___Generic2Machs[] = { - "mips-sgi-irix6.5", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zIrix___Generic2Select0[] = - "#define ([a-z]+)\\(x,y\\) *__generic.*"; - -#define IRIX___GENERIC2_TEST_CT 1 -static tTestDesc aIrix___Generic2Tests[] = { - { TT_EGREP, zIrix___Generic2Select0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Irix___Generic2 - */ -static const char* apzIrix___Generic2Patch[] = { - "format", - "#define %1(x,y) \\\n\ - ((sizeof(x)<=4 && sizeof(y)<=4) ? _%1f(x,y) \\\n\ - : (sizeof(x)<=8 && sizeof(y)<=8) ? _%1(x,y) \\\n\ - : _%1l(x,y))\n", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Irix_Asm_Apostrophe fix - */ -tSCC zIrix_Asm_ApostropheName[] = - "irix_asm_apostrophe"; - -/* - * File name selection pattern - */ -tSCC zIrix_Asm_ApostropheList[] = - "sys/asm.h\0"; -/* - * Machine/OS name selection pattern - */ -#define apzIrix_Asm_ApostropheMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zIrix_Asm_ApostropheSelect0[] = - "^[ \t]*#.*[Ww]e're"; - -#define IRIX_ASM_APOSTROPHE_TEST_CT 1 -static tTestDesc aIrix_Asm_ApostropheTests[] = { - { TT_EGREP, zIrix_Asm_ApostropheSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Irix_Asm_Apostrophe - */ -static const char* apzIrix_Asm_ApostrophePatch[] = { - "format", - "%1 are", - "^([ \t]*#.*[Ww]e)'re", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * 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[] = @@ -4665,201 +5583,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * 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[] = - "irix_socklen_t"; - -/* - * File name selection pattern - */ -tSCC zIrix_Socklen_TList[] = - "sys/socket.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzIrix_Socklen_TMachs[] = { - "mips-sgi-irix6.5", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zIrix_Socklen_TSelect0[] = - "(#define _SOCKLEN_T\n\ -)(typedef u_int32_t socklen_t;)"; - -#define IRIX_SOCKLEN_T_TEST_CT 1 -static tTestDesc aIrix_Socklen_TTests[] = { - { TT_EGREP, zIrix_Socklen_TSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Irix_Socklen_T - */ -static const char* apzIrix_Socklen_TPatch[] = { - "format", - "%1#if _NO_XOPEN4 && _NO_XOPEN5\n\ -typedef int socklen_t;\n\ -#else\n\ -%2\n\ -#endif /* _NO_XOPEN4 && _NO_XOPEN5 */", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Irix_Stdint_C99_Mode fix - */ -tSCC zIrix_Stdint_C99_ModeName[] = - "irix_stdint_c99_mode"; - -/* - * File name selection pattern - */ -tSCC zIrix_Stdint_C99_ModeList[] = - "stdint.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzIrix_Stdint_C99_ModeMachs[] = { - "mips-sgi-irix6.5", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -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_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_Mode - */ -static const char* apzIrix_Stdint_C99_ModePatch[] = { - "format", - "#if 0\n\ -%2", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Irix_Stdint_C99_Types fix - */ -tSCC zIrix_Stdint_C99_TypesName[] = - "irix_stdint_c99_types"; - -/* - * File name selection pattern - */ -tSCC zIrix_Stdint_C99_TypesList[] = - "stdint-irix65.h\0stdint.h\0"; -/* - * Machine/OS name selection pattern - */ -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_Stdint_C99_Types - */ -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_Stdint_C99_Macros fix - */ -tSCC zIrix_Stdint_C99_MacrosName[] = - "irix_stdint_c99_macros"; - -/* - * File name selection pattern - */ -tSCC zIrix_Stdint_C99_MacrosList[] = - "stdint-irix65.h\0stdint.h\0"; -/* - * Machine/OS name selection pattern - */ -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 - -/* - * Fix Command Arguments for Irix_Stdint_C99_Macros - */ -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 Irix_Stdio_Va_List fix */ tSCC zIrix_Stdio_Va_ListName[] = @@ -4869,7 +5592,7 @@ * File name selection pattern */ tSCC zIrix_Stdio_Va_ListList[] = - "stdio.h\0internal/stdio_core.h\0"; + "stdio.h\0"; /* * Machine/OS name selection pattern */ @@ -4895,45 +5618,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Irix_Wcsftime fix - */ -tSCC zIrix_WcsftimeName[] = - "irix_wcsftime"; - -/* - * File name selection pattern - */ -tSCC zIrix_WcsftimeList[] = - "internal/wchar_core.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzIrix_WcsftimeMachs[] = { - "mips-sgi-irix6.5", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zIrix_WcsftimeSelect0[] = - "#if _NO_XOPEN5\n\ -(extern size_t[ \t]+wcsftime.*const char *.*)"; - -#define IRIX_WCSFTIME_TEST_CT 1 -static tTestDesc aIrix_WcsftimeTests[] = { - { TT_EGREP, zIrix_WcsftimeSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Irix_Wcsftime - */ -static const char* apzIrix_WcsftimePatch[] = { - "format", - "#if _NO_XOPEN5 && !defined(__c99)\n\ -%1", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * * Description of Kandr_Concat fix */ tSCC zKandr_ConcatName[] = @@ -5174,7 +5858,9 @@ /* * Machine/OS name selection pattern */ -#define apzMath_ExceptionMachs (const char**)NULL +tSCC* apzMath_ExceptionMachs[] = { + "*-*-solaris2.1[0-9]*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found @@ -6256,50 +6942,323 @@ * Fix Command Arguments for Solaris_Complex_Cxx */ static const char* apzSolaris_Complex_CxxPatch[] = { sed_cmd_z, - "-e", "/#if[ \t]*!defined(__cplusplus)/c#ifdef\t__cplusplus\\\n\ + "-e", "/#if[ \t]*!defined(__cplusplus)/c\\\n\ +#ifdef\t__cplusplus\\\n\ extern \"C\" {\\\n\ #endif", - "-e", "/#endif[ \t]*\\/\\* !defined(__cplusplus) \\*\\//c#ifdef\t__cplusplus\\\n\ + "-e", "/#endif[ \t]*\\/\\* !defined(__cplusplus) \\*\\//c\\\n\ +#ifdef\t__cplusplus\\\n\ }\\\n\ #endif", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Solaris_Cond_Init fix - */ -tSCC zSolaris_Cond_InitName[] = - "solaris_cond_init"; - -/* - * File name selection pattern - */ -tSCC zSolaris_Cond_InitList[] = - "pthread.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzSolaris_Cond_InitMachs[] = { - "*-*-solaris2.8", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zSolaris_Cond_InitSelect0[] = - "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; - -#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_Cond_Init - */ -static const char* apzSolaris_Cond_InitPatch[] = { - "format", - "%1, 0x4356%2", - "^(#define[ \t]+PTHREAD_COND_INITIALIZER[ \t]+\\{.*0)(\\},[ \t]*0\\}.*)$", + * Description of Solaris_Cxx_Linkage fix + */ +tSCC zSolaris_Cxx_LinkageName[] = + "solaris_cxx_linkage"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Cxx_LinkageList[] = + "iso/stdlib_iso.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzSolaris_Cxx_LinkageMachs[] = { + "*-*-solaris2*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +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_Gets_C11 fix + */ +tSCC zSolaris_Gets_C11Name[] = + "solaris_gets_c11"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Gets_C11List[] = + "iso/stdio_iso.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzSolaris_Gets_C11Machs[] = { + "*-*-solaris2*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Gets_C11Select0[] = + "(extern char[ \t]*\\*gets\\(char \\*\\));"; + +#define SOLARIS_GETS_C11_TEST_CT 1 +static tTestDesc aSolaris_Gets_C11Tests[] = { + { TT_EGREP, zSolaris_Gets_C11Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Solaris_Gets_C11 + */ +static const char* apzSolaris_Gets_C11Patch[] = { + "format", + "#if __STDC_VERSION__ < 201112L && __cplusplus < 201402L\n\ +%1 __attribute__((__deprecated__));\n\ +#endif", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Solaris_Gets_Cxx14 fix + */ +tSCC zSolaris_Gets_Cxx14Name[] = + "solaris_gets_cxx14"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Gets_Cxx14List[] = + "iso/stdio_iso.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzSolaris_Gets_Cxx14Machs[] = { + "*-*-solaris2*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Gets_Cxx14Select0[] = + "(#if __STDC_VERSION__ < 201112L)\n\ +(extern char\t\\*gets\\(char \\*\\) __ATTR_DEPRECATED;)"; + +#define SOLARIS_GETS_CXX14_TEST_CT 1 +static tTestDesc aSolaris_Gets_Cxx14Tests[] = { + { TT_EGREP, zSolaris_Gets_Cxx14Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Solaris_Gets_Cxx14 + */ +static const char* apzSolaris_Gets_Cxx14Patch[] = { + "format", + "%1 && __cplusplus < 201402L\n\ +%2", + (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_Int_Limits_2Patch[] = { + "format", + "#define\t%1_FAST16_%2 %132_%2", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Solaris_Int_Limits_3 fix + */ +tSCC zSolaris_Int_Limits_3Name[] = + "solaris_int_limits_3"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Int_Limits_3List[] = + "sys/int_limits.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzSolaris_Int_Limits_3Machs[] = { + "*-*-solaris2*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Int_Limits_3Select0[] = + "^#define[ \t]+SIZE_MAX[ \t]+4294967295UL"; + +#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_Int_Limits_3 + */ +static const char* apzSolaris_Int_Limits_3Patch[] = { + "format", + "#define\tSIZE_MAX\t4294967295U", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -6347,6 +7306,45 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Solaris_Math_10 fix + */ +tSCC zSolaris_Math_10Name[] = + "solaris_math_10"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Math_10List[] = + "iso/math_c99.h\0"; +/* + * Machine/OS name selection pattern + */ +#define apzSolaris_Math_10Machs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Math_10Select0[] = + "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; + +#define SOLARIS_MATH_10_TEST_CT 1 +static tTestDesc aSolaris_Math_10Tests[] = { + { TT_EGREP, zSolaris_Math_10Select0, (regex_t*)NULL }, }; + +/* + * 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_Math_2 fix */ tSCC zSolaris_Math_2Name[] = @@ -6567,85 +7565,207 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Solaris_Math_10 fix - */ -tSCC zSolaris_Math_10Name[] = - "solaris_math_10"; - -/* - * File name selection pattern - */ -tSCC zSolaris_Math_10List[] = + * Description of Solaris_Math_11 fix + */ +tSCC zSolaris_Math_11Name[] = + "solaris_math_11"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Math_11List[] = "iso/math_c99.h\0"; /* * Machine/OS name selection pattern */ -#define apzSolaris_Math_10Machs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zSolaris_Math_10Select0[] = - "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; - -#define SOLARIS_MATH_10_TEST_CT 1 -static tTestDesc aSolaris_Math_10Tests[] = { - { TT_EGREP, zSolaris_Math_10Select0, (regex_t*)NULL }, }; - -/* - * 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[] = +#define apzSolaris_Math_11Machs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Math_11Select0[] = + "@\\(#\\)math_c99\\.h[ \t]+1\\.[0-9]+[ \t]+[0-9/]+ "; + +#define SOLARIS_MATH_11_TEST_CT 1 +static tTestDesc aSolaris_Math_11Tests[] = { + { TT_EGREP, zSolaris_Math_11Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Solaris_Math_11 + */ +static const char* apzSolaris_Math_11Patch[] = { + "format", + "#undef\tsignbit\n\ +#define\tsignbit(x)\t(sizeof(x) == sizeof(float) \\\n\ +\t\t\t ? __builtin_signbitf(x) \\\n\ +\t\t\t : sizeof(x) == sizeof(long double) \\\n\ +\t\t\t ? __builtin_signbitl(x) \\\n\ +\t\t\t : __builtin_signbit(x))", + "^#undef[ \t]+signbit\n\ +#if defined\\(__sparc\\)\n\ +#define[ \t]+signbit\\(x\\)[ \t]+__extension__\\( \\\\\n\ +[ \t]+\\{[ \t]*__typeof\\(x\\)[ \t]*__x_s[ \t]*=[ \t]*\\(x\\);[ \t]*\\\\\n\ +[ \t]+\\(int\\)[ \t]*\\(\\*\\(unsigned[ \t]*\\*\\)[ \t]*\\&__x_s[ \t]*>>[ \t]*31\\);[ \t]*\\}\\)\n\ +#elif defined\\(__i386\\) \\|\\| defined\\(__amd64\\)\n\ +#define[ \t]+signbit\\(x\\)[ \t]+__extension__\\( \\\\\n\ +[ \t]+\\{ __typeof\\(x\\) __x_s = \\(x\\); \\\\\n\ +[ \t]+\\(sizeof \\(__x_s\\) == sizeof \\(float\\) \\? \\\\\n\ +[ \t]+\\(int\\) \\(\\*\\(unsigned \\*\\) \\&__x_s >> 31\\) : \\\\\n\ +[ \t]+sizeof \\(__x_s\\) == sizeof \\(double\\) \\? \\\\\n\ +[ \t]+\\(int\\) \\(\\(\\(unsigned \\*\\) \\&__x_s\\)\\[1\\] >> 31\\) : \\\\\n\ +[ \t]+\\(int\\) \\(\\(\\(unsigned short \\*\\) \\&__x_s\\)\\[4\\] >> 15\\)\\); \\}\\)\n\ +#endif", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Solaris_Math_12 fix + */ +tSCC zSolaris_Math_12Name[] = + "solaris_math_12"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Math_12List[] = + "math.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzSolaris_Math_12Machs[] = { + "*-*-solaris2*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Math_12Select0[] = + "#undef.*_GLIBCXX_USE_C99_MATH"; + +#define SOLARIS_MATH_12_TEST_CT 1 +static tTestDesc aSolaris_Math_12Tests[] = { + { TT_EGREP, zSolaris_Math_12Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Solaris_Math_12 + */ +static const char* apzSolaris_Math_12Patch[] = { sed_cmd_z, + "-e", "/#undef[ \t]*_GLIBCXX_USE_C99_MATH/d", + (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_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[] = +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_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\ +#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_Posix_Spawn_Restrict fix + */ +tSCC zSolaris_Posix_Spawn_RestrictName[] = + "solaris_posix_spawn_restrict"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Posix_Spawn_RestrictList[] = + "spawn.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzSolaris_Posix_Spawn_RestrictMachs[] = { + "*-*-solaris2*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Posix_Spawn_RestrictSelect0[] = + "(.*[ \t]+)([a-z]+)\\[_RESTRICT_KYWD\\](.*)"; + +#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_Posix_Spawn_Restrict + */ +static const char* apzSolaris_Posix_Spawn_RestrictPatch[] = { + "format", + "%1*_RESTRICT_KYWD %2%3", + (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", + "#if __cplusplus < 201103L\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 }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -6692,279 +7812,90 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * 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[] = { + * Description of Solaris_Std___Filbuf fix + */ +tSCC zSolaris_Std___FilbufName[] = + "solaris_std___filbuf"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Std___FilbufList[] = + "stdio.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzSolaris_Std___FilbufMachs[] = { "*-*-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_Int_Limits_2Patch[] = { - "format", - "#define\t%1_FAST16_%2 %132_%2", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Solaris_Int_Limits_3 fix - */ -tSCC zSolaris_Int_Limits_3Name[] = - "solaris_int_limits_3"; - -/* - * File name selection pattern - */ -tSCC zSolaris_Int_Limits_3List[] = - "sys/int_limits.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzSolaris_Int_Limits_3Machs[] = { - "*-*-solaris2*", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zSolaris_Int_Limits_3Select0[] = - "^#define[ \t]+SIZE_MAX[ \t]+4294967295UL"; - -#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_Int_Limits_3 - */ -static const char* apzSolaris_Int_Limits_3Patch[] = { - "format", - "#define\tSIZE_MAX\t4294967295U", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Solaris_Int_Types fix - */ -tSCC zSolaris_Int_TypesName[] = - "solaris_int_types"; - -/* - * File name selection pattern - */ -tSCC zSolaris_Int_TypesList[] = - "sys/int_types.h\0"; -/* - * Machine/OS name selection pattern - */ -#define apzSolaris_Int_TypesMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zSolaris_Int_TypesSelect0[] = - "__STDC__ - 0 == 0"; +tSCC zSolaris_Std___FilbufSelect0[] = + "(using std::perror;\n\ +)(#endif)"; /* * 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_Int_Types - */ -static const char* apzSolaris_Int_TypesPatch[] = { - "format", - "(defined(_STDC_C99) || !defined(_STRICT_STDC) || defined(__GNUC__))", +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_Std___Filbuf + */ +static const char* apzSolaris_Std___FilbufPatch[] = { + "format", + "%1#ifndef _LP64\n\ +using std::__filbuf;\n\ +using std::__flsbuf;\n\ +#endif\n\ +%2", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Solaris_Std_Gets_Cxx14 fix + */ +tSCC zSolaris_Std_Gets_Cxx14Name[] = + "solaris_std_gets_cxx14"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Std_Gets_Cxx14List[] = + "stdio.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzSolaris_Std_Gets_Cxx14Machs[] = { + "*-*-solaris2*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Std_Gets_Cxx14Select0[] = + "using std::gets;"; + +#define SOLARIS_STD_GETS_CXX14_TEST_CT 1 +static tTestDesc aSolaris_Std_Gets_Cxx14Tests[] = { + { TT_EGREP, zSolaris_Std_Gets_Cxx14Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Solaris_Std_Gets_Cxx14 + */ +static const char* apzSolaris_Std_Gets_Cxx14Patch[] = { + "format", + "#if __cplusplus < 201402L\n\ +%0\n\ +#endif", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -7010,47 +7941,39 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * 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", + * Description of Solaris_Stdlib_Noreturn fix + */ +tSCC zSolaris_Stdlib_NoreturnName[] = + "solaris_stdlib_noreturn"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Stdlib_NoreturnList[] = + "iso/stdlib_c99.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzSolaris_Stdlib_NoreturnMachs[] = { + "*-*-solaris2*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Stdlib_NoreturnSelect0[] = + "(extern) _Noreturn (void quick_exit\\(int\\));"; + +#define SOLARIS_STDLIB_NORETURN_TEST_CT 1 +static tTestDesc aSolaris_Stdlib_NoreturnTests[] = { + { TT_EGREP, zSolaris_Stdlib_NoreturnSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Solaris_Stdlib_Noreturn + */ +static const char* apzSolaris_Stdlib_NoreturnPatch[] = { + "format", + "%1 %2 __attribute__((__noreturn__));", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -7137,7 +8060,7 @@ * File name selection pattern */ tSCC zStdio_Va_ListList[] = - "stdio.h\0internal/stdio_core.h\0internal/wchar_core.h\0"; + "stdio.h\0"; /* * Machine/OS name selection pattern */ @@ -7707,6 +8630,41 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Suse_Linux_Vt_Cxx fix + */ +tSCC zSuse_Linux_Vt_CxxName[] = + "suse_linux_vt_cxx"; + +/* + * File name selection pattern + */ +tSCC zSuse_Linux_Vt_CxxList[] = + "linux/vt.h\0"; +/* + * Machine/OS name selection pattern + */ +#define apzSuse_Linux_Vt_CxxMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSuse_Linux_Vt_CxxSelect0[] = + "^[ \t]*unsigned int new;"; + +#define SUSE_LINUX_VT_CXX_TEST_CT 1 +static tTestDesc aSuse_Linux_Vt_CxxTests[] = { + { TT_EGREP, zSuse_Linux_Vt_CxxSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Suse_Linux_Vt_Cxx + */ +static const char* apzSuse_Linux_Vt_CxxPatch[] = { + "format", + "unsigned int newev;", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Svr4_Disable_Opt fix */ tSCC zSvr4_Disable_OptName[] = @@ -7797,15 +8755,8 @@ tSCC zSvr4_ProfilSelect0[] = "profil\\(unsigned short \\*, unsigned int, unsigned int, unsigned int\\)"; -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zSvr4_ProfilBypass0[] = - "Silicon Graphics"; - -#define SVR4_PROFIL_TEST_CT 2 +#define SVR4_PROFIL_TEST_CT 1 static tTestDesc aSvr4_ProfilTests[] = { - { TT_NEGREP, zSvr4_ProfilBypass0, (regex_t*)NULL }, { TT_EGREP, zSvr4_ProfilSelect0, (regex_t*)NULL }, }; /* @@ -7992,7 +8943,7 @@ * File name selection pattern */ tSCC zThread_KeywordList[] = - "pthread.h\0bits/sigthread.h\0"; + "pthread.h\0bits/sigthread.h\0*/bits/sigthread.h\0"; /* * Machine/OS name selection pattern */ @@ -8160,6 +9111,387 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Vms_Add_Missing_Braces fix + */ +tSCC zVms_Add_Missing_BracesName[] = + "vms_add_missing_braces"; + +/* + * File name selection pattern + */ +tSCC zVms_Add_Missing_BracesList[] = + "rtldef/signal.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzVms_Add_Missing_BracesMachs[] = { + "*-*-*vms*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zVms_Add_Missing_BracesSelect0[] = + "(_SIG_[A-Z]+_SET[ \t]+= \\{)(0x[0F]+, 0x[0F]+)"; + +#define VMS_ADD_MISSING_BRACES_TEST_CT 1 +static tTestDesc aVms_Add_Missing_BracesTests[] = { + { TT_EGREP, zVms_Add_Missing_BracesSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Vms_Add_Missing_Braces + */ +static const char* apzVms_Add_Missing_BracesPatch[] = { + "format", + "%1 {%2} ", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Vms_Decc_Builtin fix + */ +tSCC zVms_Decc_BuiltinName[] = + "vms_decc_builtin"; + +/* + * File name selection pattern + */ +tSCC zVms_Decc_BuiltinList[] = + "rtldef/string.h\0rtldef/time.h\0rtldef/strings.h\0rtldef/socket.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzVms_Decc_BuiltinMachs[] = { + "*-*-*vms*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zVms_Decc_BuiltinSelect0[] = + "(__MEMSET|__MEMMOVE|__MEMCPY|__STRLEN|__STRCPY)"; + +#define VMS_DECC_BUILTIN_TEST_CT 1 +static tTestDesc aVms_Decc_BuiltinTests[] = { + { TT_EGREP, zVms_Decc_BuiltinSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Vms_Decc_Builtin + */ +static const char* apzVms_Decc_BuiltinPatch[] = { sed_cmd_z, + "-e", "s@__MEMSET@memset@", + "-e", "s@__MEMMOVE@memmove@", + "-e", "s@__MEMCPY@memcpy@", + "-e", "s@__STRLEN@strlen@", + "-e", "s@__STRCPY@strcpy@", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * 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_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 Vms_Do_Not_Redeclare_Hostalias fix + */ +tSCC zVms_Do_Not_Redeclare_HostaliasName[] = + "vms_do_not_redeclare_hostalias"; + +/* + * File name selection pattern + */ +tSCC zVms_Do_Not_Redeclare_HostaliasList[] = + "rtldef/resolv.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzVms_Do_Not_Redeclare_HostaliasMachs[] = { + "*-*-*vms*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zVms_Do_Not_Redeclare_HostaliasSelect0[] = + "(void[ \t]+fp_nquery \\(const u_char \\*, int, FILE \\*\\);)\n\ +(__char_ptr32[ \t]+hostalias \\(const char \\*\\);)"; + +#define VMS_DO_NOT_REDECLARE_HOSTALIAS_TEST_CT 1 +static tTestDesc aVms_Do_Not_Redeclare_HostaliasTests[] = { + { TT_EGREP, zVms_Do_Not_Redeclare_HostaliasSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Vms_Do_Not_Redeclare_Hostalias + */ +static const char* apzVms_Do_Not_Redeclare_HostaliasPatch[] = { + "format", + "%1\n\ +/* %2 */", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Vms_Forward_Declare_Struct fix + */ +tSCC zVms_Forward_Declare_StructName[] = + "vms_forward_declare_struct"; + +/* + * File name selection pattern + */ +tSCC zVms_Forward_Declare_StructList[] = + "rtldef/if.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzVms_Forward_Declare_StructMachs[] = { + "*-*-*vms*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zVms_Forward_Declare_StructSelect0[] = + "(/\\* forward decls for C\\+\\+ \\*/\n\ +)#ifdef __cplusplus\n"; + +#define VMS_FORWARD_DECLARE_STRUCT_TEST_CT 1 +static tTestDesc aVms_Forward_Declare_StructTests[] = { + { TT_EGREP, zVms_Forward_Declare_StructSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Vms_Forward_Declare_Struct + */ +static const char* apzVms_Forward_Declare_StructPatch[] = { + "format", + "%1#if defined (__cplusplus) || defined (__GNUC__)\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Vms_No_64bit_Getopt fix + */ +tSCC zVms_No_64bit_GetoptName[] = + "vms_no_64bit_getopt"; + +/* + * File name selection pattern + */ +tSCC zVms_No_64bit_GetoptList[] = + "rtldef/stdio.h\0rtldef/unistd.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzVms_No_64bit_GetoptMachs[] = { + "*-*-*vms*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zVms_No_64bit_GetoptSelect0[] = + "^[ \t]*(extern[ \t]*)?(int[ \t]*(getopt|optind|opterr|optopt)|(char \\*optarg))([ \t]*\\(.*\\))?;\n"; + +#define VMS_NO_64BIT_GETOPT_TEST_CT 1 +static tTestDesc aVms_No_64bit_GetoptTests[] = { + { TT_EGREP, zVms_No_64bit_GetoptSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Vms_No_64bit_Getopt + */ +static const char* apzVms_No_64bit_GetoptPatch[] = { + "format", + "#if __INITIAL_POINTER_SIZE != 64 /* getopt is short ptr only. */\n\ +%0#endif\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Vms_Use_Fast_Setjmp fix + */ +tSCC zVms_Use_Fast_SetjmpName[] = + "vms_use_fast_setjmp"; + +/* + * File name selection pattern + */ +tSCC zVms_Use_Fast_SetjmpList[] = + "rtldef/setjmp.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzVms_Use_Fast_SetjmpMachs[] = { + "*-*-*vms*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zVms_Use_Fast_SetjmpSelect0[] = + "(#[ \t]*if[ \t]*defined\\(__FAST_SETJMP\\)[ \t]*\\|\\|)"; + +#define VMS_USE_FAST_SETJMP_TEST_CT 1 +static tTestDesc aVms_Use_Fast_SetjmpTests[] = { + { TT_EGREP, zVms_Use_Fast_SetjmpSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Vms_Use_Fast_Setjmp + */ +static const char* apzVms_Use_Fast_SetjmpPatch[] = { + "format", + "%0 defined (__GNUC__) ||", + (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_Use_Quoted_Include fix + */ +tSCC zVms_Use_Quoted_IncludeName[] = + "vms_use_quoted_include"; + +/* + * File name selection pattern + */ +tSCC zVms_Use_Quoted_IncludeList[] = + "rtldef/wait.h\0starlet_c/pthread.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzVms_Use_Quoted_IncludeMachs[] = { + "*-*-*vms*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zVms_Use_Quoted_IncludeSelect0[] = + "(#[ \t]*include[ \t]+)<(resource|builtins)\\.h>"; + +#define VMS_USE_QUOTED_INCLUDE_TEST_CT 1 +static tTestDesc aVms_Use_Quoted_IncludeTests[] = { + { TT_EGREP, zVms_Use_Quoted_IncludeSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Vms_Use_Quoted_Include + */ +static const char* apzVms_Use_Quoted_IncludePatch[] = { + "format", + "%1<sys/%2.h>", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Void_Null fix */ tSCC zVoid_NullName[] = @@ -8186,10 +9518,13 @@ */ tSCC zVoid_NullBypass0[] = "__cplusplus"; - -#define VOID_NULL_TEST_CT 2 +tSCC zVoid_NullBypass1[] = + "__null"; + +#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 }, }; /* @@ -8197,7 +9532,17 @@ */ static const char* apzVoid_NullPatch[] = { "format", - "#define NULL 0", + "#ifndef NULL\n\ +#ifdef __cplusplus\n\ +#ifdef __GNUG__\n\ +#define NULL __null\n\ +#else /* ! __GNUG__ */\n\ +#define NULL 0L\n\ +#endif /* __GNUG__ */\n\ +#else /* ! __cplusplus */\n\ +#define NULL ((void *)0)\n\ +#endif /* __cplusplus */\n\ +#endif /* !NULL */", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -8251,6 +9596,68 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Vxworks_Ioctl_Macro fix + */ +tSCC zVxworks_Ioctl_MacroName[] = + "vxworks_ioctl_macro"; + +/* + * File name selection pattern + */ +tSCC zVxworks_Ioctl_MacroList[] = + "ioLib.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzVxworks_Ioctl_MacroMachs[] = { + "*-*-vxworks*", + (const char*)NULL }; +#define VXWORKS_IOCTL_MACRO_TEST_CT 0 +#define aVxworks_Ioctl_MacroTests (tTestDesc*)NULL + +/* + * Fix Command Arguments for Vxworks_Ioctl_Macro + */ +static const char* apzVxworks_Ioctl_MacroPatch[] = { + "format", + "%0\n\ +#define ioctl(fd, func, arg) (ioctl)(fd, func, (int)(arg))\n", + "extern[\t ]+int[\t ]+ioctl[\t ]*\\([\t ,[:alnum:]]*\\);", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Vxworks_Mkdir_Macro fix + */ +tSCC zVxworks_Mkdir_MacroName[] = + "vxworks_mkdir_macro"; + +/* + * File name selection pattern + */ +tSCC zVxworks_Mkdir_MacroList[] = + "sys/stat.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzVxworks_Mkdir_MacroMachs[] = { + "*-*-vxworks*", + (const char*)NULL }; +#define VXWORKS_MKDIR_MACRO_TEST_CT 0 +#define aVxworks_Mkdir_MacroTests (tTestDesc*)NULL + +/* + * Fix Command Arguments for Vxworks_Mkdir_Macro + */ +static const char* apzVxworks_Mkdir_MacroPatch[] = { + "format", + "%0\n\ +#define mkdir(dir, ...) ((void)0, ##__VA_ARGS__, (mkdir)(dir))\n", + "extern[\t ]+STATUS[\t ]+mkdir[\t ]*\\([\t ]*const[\t ]+char[\t ]*\\*[\t ]*(|[_[:alpha:]][_[:alnum:]]*)\\)[\t ]*;", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Vxworks_Needs_Vxtypes fix */ tSCC zVxworks_Needs_VxtypesName[] = @@ -8334,6 +9741,42 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Vxworks_Regs fix + */ +tSCC zVxworks_RegsName[] = + "vxworks_regs"; + +/* + * File name selection pattern + */ +#define zVxworks_RegsList (char*)NULL +/* + * Machine/OS name selection pattern + */ +tSCC* apzVxworks_RegsMachs[] = { + "*-*-vxworks*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zVxworks_RegsSelect0[] = + "#[\t ]*include[\t ]+[<\"]regs.h[>\"]"; + +#define VXWORKS_REGS_TEST_CT 1 +static tTestDesc aVxworks_RegsTests[] = { + { TT_EGREP, zVxworks_RegsSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Vxworks_Regs + */ +static const char* apzVxworks_RegsPatch[] = { + "format", + "#include <arch/../regs.h>", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Vxworks_Time fix */ tSCC zVxworks_TimeName[] = @@ -8384,6 +9827,36 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Vxworks_Write_Const fix + */ +tSCC zVxworks_Write_ConstName[] = + "vxworks_write_const"; + +/* + * File name selection pattern + */ +tSCC zVxworks_Write_ConstList[] = + "ioLib.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzVxworks_Write_ConstMachs[] = { + "*-*-vxworks*", + (const char*)NULL }; +#define VXWORKS_WRITE_CONST_TEST_CT 0 +#define aVxworks_Write_ConstTests (tTestDesc*)NULL + +/* + * Fix Command Arguments for Vxworks_Write_Const + */ +static const char* apzVxworks_Write_ConstPatch[] = { + "format", + "extern int write (int, const char*, size_t);", + "extern[\t ]+int[\t ]+write[\t ]*\\([\t ]*int[\t ]*,[\t ]*char[\t ]*\\*[\t ]*,[\t ]*size_t[\t ]*\\)[\t ]*;", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of X11_Class fix */ tSCC zX11_ClassName[] = @@ -8552,44 +10025,58 @@ * * List of all fixes */ -#define REGEX_COUNT 249 -#define MACH_LIST_SIZE_LIMIT 181 -#define FIX_COUNT 210 +#define REGEX_COUNT 285 +#define MACH_LIST_SIZE_LIMIT 187 +#define FIX_COUNT 247 /* * Enumerate the fixes */ typedef enum { AAB_AIX_STDIO_FIXIDX, + AAB_AIX_FCNTL_FIXIDX, AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_FIXIDX, - AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_2_FIXIDX, AAB_FD_ZERO_ASM_POSIX_TYPES_H_FIXIDX, AAB_FD_ZERO_GNU_TYPES_H_FIXIDX, AAB_FD_ZERO_SELECTBITS_H_FIXIDX, AAB_SOLARIS_SYS_VARARGS_H_FIXIDX, AAB_SUN_MEMCPY_FIXIDX, + AAB_VXWORKS_ASSERT_FIXIDX, + AAB_VXWORKS_REGS_VXTYPES_FIXIDX, + AAB_VXWORKS_UNISTD_FIXIDX, + AIX_ASSERT_FIXIDX, AIX_COMPLEX_FIXIDX, + AIX_EXTERNC_FIXIDX, + AIX_EXTERNCPP1_FIXIDX, + AIX_EXTERNCPP2_FIXIDX, + AIX_MALLOC_FIXIDX, + AIX_NET_IF_ARP_FIXIDX, + AIX_NULL_FIXIDX, + AIX_ONCE_INIT_1_FIXIDX, + AIX_ONCE_INIT_2_FIXIDX, + AIX_MUTEX_INITIALIZER_1_FIXIDX, + AIX_COND_INITIALIZER_1_FIXIDX, + AIX_RWLOCK_INITIALIZER_1_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_STDIO_INLINE_FIXIDX, + AIX_STDLIB_MALLOC_FIXIDX, + AIX_STDLIB_REALLOC_FIXIDX, + AIX_STDLIB_CALLOC_FIXIDX, + AIX_STDLIB_VALLOC_FIXIDX, + AIX_STRTOF_CONST_FIXIDX, AIX_SYSMACHINE_FIXIDX, AIX_SYSWAIT_2_FIXIDX, AIX_VOLATILE_FIXIDX, ALPHA___ASSERT_FIXIDX, - ALPHA___EXTERN_PREFIX_FIXIDX, - ALPHA___EXTERN_PREFIX_STANDARDS_FIXIDX, - ALPHA___EXTERN_PREFIX_SYS_STAT_FIXIDX, 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, AVOID_BOOL_DEFINE_FIXIDX, AVOID_BOOL_TYPE_FIXIDX, @@ -8604,8 +10091,14 @@ CTRL_QUOTES_DEF_FIXIDX, CTRL_QUOTES_USE_FIXIDX, CXX_UNREADY_FIXIDX, + DARWIN_AVAILABILITYINTERNAL_FIXIDX, + DARWIN_9_LONG_DOUBLE_FUNCS_2_FIXIDX, DARWIN_EXTERNC_FIXIDX, DARWIN_GCC4_BREAKAGE_FIXIDX, + DARWIN_LONGJMP_NORETURN_FIXIDX, + DARWIN_OS_TRACE_1_FIXIDX, + DARWIN_OS_TRACE_2_FIXIDX, + DARWIN_OS_TRACE_3_FIXIDX, DARWIN_PRIVATE_EXTERN_FIXIDX, DARWIN_STDINT_1_FIXIDX, DARWIN_STDINT_2_FIXIDX, @@ -8617,6 +10110,8 @@ DEC_INTERN_ASM_FIXIDX, DJGPP_WCHAR_H_FIXIDX, ECD_CURSOR_FIXIDX, + FERAISEEXCEPT_NOSSE_DIVBYZERO_FIXIDX, + FERAISEEXCEPT_NOSSE_INVALID_FIXIDX, FREEBSD_GCC3_BREAKAGE_FIXIDX, FREEBSD_GCC4_BREAKAGE_FIXIDX, GLIBC_C99_INLINE_1_FIXIDX, @@ -8637,29 +10132,34 @@ HPUX10_CTYPE_DECLARATIONS1_FIXIDX, HPUX10_CTYPE_DECLARATIONS2_FIXIDX, HPUX10_STDIO_DECLARATIONS_FIXIDX, + HPPA_HPUX11_ALLOCA_FIXIDX, HPUX11_ABS_FIXIDX, + HPUX11_LWP_RWLOCK_VALID_FIXIDX, + HPUX11_EXTERN_SENDFILE_FIXIDX, + HPUX11_EXTERN_SENDPATH_FIXIDX, HPUX11_FABSF_FIXIDX, + HPUX11_PTHREAD_POINTER_FIXIDX, HPUX11_PTHREAD_CONST_FIXIDX, HPUX11_SIZE_T_FIXIDX, HPUX11_SNPRINTF_FIXIDX, HPUX11_VSNPRINTF_FIXIDX, + HPUX_VSSCANF_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, - HPUX_PTHREAD_INITIALIZERS_FIXIDX, HPUX_C99_INTPTR_FIXIDX, HPUX_C99_INTTYPES_FIXIDX, HPUX_C99_INTTYPES2_FIXIDX, - HPUX_STDINT_LEAST_FAST_FIXIDX, + HPUX_CTYPE_MACROS_FIXIDX, + HPUX_EXTERN_ERRNO_FIXIDX, + HPUX_HTONL_FIXIDX, + HPUX_IMAGINARY_I_FIXIDX, HPUX_INTTYPE_INT8_T_FIXIDX, - HPUX_IMAGINARY_I_FIXIDX, + HPUX_LONG_DOUBLE_FIXIDX, + HPUX_LONG_DOUBLE_2_FIXIDX, + HPUX_PTHREAD_INITIALIZERS_FIXIDX, + HPUX_SPU_INFO_FIXIDX, + HPUX_STDINT_LEAST_FAST_FIXIDX, + HPUX_LONGJMP_FIXIDX, + HPUX_SYSTIME_FIXIDX, HUGE_VAL_HEX_FIXIDX, HUGE_VALF_HEX_FIXIDX, HUGE_VALL_HEX_FIXIDX, @@ -8667,19 +10167,8 @@ IO_QUOTES_DEF_FIXIDX, IO_QUOTES_USE_FIXIDX, IP_MISSING_SEMI_FIXIDX, - IRIX___RESTRICT_FIXIDX, - IRIX___GENERIC1_FIXIDX, - IRIX___GENERIC2_FIXIDX, - IRIX_ASM_APOSTROPHE_FIXIDX, - IRIX_COMPLEX_FIXIDX, IRIX_LIMITS_CONST_FIXIDX, - IRIX_PTHREAD_INIT_FIXIDX, - IRIX_SOCKLEN_T_FIXIDX, - IRIX_STDINT_C99_MODE_FIXIDX, - IRIX_STDINT_C99_TYPES_FIXIDX, - IRIX_STDINT_C99_MACROS_FIXIDX, IRIX_STDIO_VA_LIST_FIXIDX, - IRIX_WCSFTIME_FIXIDX, KANDR_CONCAT_FIXIDX, LINUX_IA64_UCONTEXT_FIXIDX, LYNXOS_NO_WARNING_IN_SYS_TIME_H_FIXIDX, @@ -8714,25 +10203,31 @@ SOLARIS___RESTRICT_FIXIDX, SOLARIS_COMPLEX_FIXIDX, SOLARIS_COMPLEX_CXX_FIXIDX, - SOLARIS_COND_INIT_FIXIDX, + SOLARIS_CXX_LINKAGE_FIXIDX, + SOLARIS_GETC_STRICT_STDC_FIXIDX, + SOLARIS_GETS_C11_FIXIDX, + SOLARIS_GETS_CXX14_FIXIDX, + SOLARIS_INT_CONST_FIXIDX, + SOLARIS_INT_LIMITS_1_FIXIDX, + SOLARIS_INT_LIMITS_2_FIXIDX, + SOLARIS_INT_LIMITS_3_FIXIDX, SOLARIS_MATH_1_FIXIDX, + SOLARIS_MATH_10_FIXIDX, SOLARIS_MATH_2_FIXIDX, SOLARIS_MATH_3_FIXIDX, SOLARIS_MATH_4_FIXIDX, SOLARIS_MATH_8_FIXIDX, SOLARIS_MATH_9_FIXIDX, - SOLARIS_MATH_10_FIXIDX, - SOLARIS_MUTEX_INIT_2_FIXIDX, - SOLARIS_RWLOCK_INIT_1_FIXIDX, + SOLARIS_MATH_11_FIXIDX, + SOLARIS_MATH_12_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_POW_INT_OVERLOAD_FIXIDX, + SOLARIS_RWLOCK_INIT_1_FIXIDX, + SOLARIS_STD___FILBUF_FIXIDX, + SOLARIS_STD_GETS_CXX14_FIXIDX, SOLARIS_STDIO_TAG_FIXIDX, - SOLARIS_SYS_VA_LIST_FIXIDX, + SOLARIS_STDLIB_NORETURN_FIXIDX, STATSSWTCH_FIXIDX, STDIO_STDARG_H_FIXIDX, STDIO_VA_LIST_FIXIDX, @@ -8749,6 +10244,7 @@ SUN_RUSERS_SEMI_FIXIDX, SUN_SIGNAL_FIXIDX, SUNOS_STRLEN_FIXIDX, + SUSE_LINUX_VT_CXX_FIXIDX, SVR4_DISABLE_OPT_FIXIDX, SVR4_GETCWD_FIXIDX, SVR4_PROFIL_FIXIDX, @@ -8761,11 +10257,25 @@ ULTRIX_CONST_FIXIDX, ULTRIX_CONST2_FIXIDX, VA_I960_MACRO_FIXIDX, + VMS_ADD_MISSING_BRACES_FIXIDX, + VMS_DECC_BUILTIN_FIXIDX, + VMS_DEFINE_CAN_USE_EXTERN_PREFIX_FIXIDX, + VMS_DISABLE_DECC_STRING_BUILTINS_FIXIDX, + VMS_DO_NOT_REDECLARE_HOSTALIAS_FIXIDX, + VMS_FORWARD_DECLARE_STRUCT_FIXIDX, + VMS_NO_64BIT_GETOPT_FIXIDX, + VMS_USE_FAST_SETJMP_FIXIDX, + VMS_USE_PRAGMA_EXTERN_MODEL_FIXIDX, + VMS_USE_QUOTED_INCLUDE_FIXIDX, VOID_NULL_FIXIDX, VXWORKS_GCC_PROBLEM_FIXIDX, + VXWORKS_IOCTL_MACRO_FIXIDX, + VXWORKS_MKDIR_MACRO_FIXIDX, VXWORKS_NEEDS_VXTYPES_FIXIDX, VXWORKS_NEEDS_VXWORKS_FIXIDX, + VXWORKS_REGS_FIXIDX, VXWORKS_TIME_FIXIDX, + VXWORKS_WRITE_CONST_FIXIDX, X11_CLASS_FIXIDX, X11_CLASS_USAGE_FIXIDX, X11_NEW_FIXIDX, @@ -8778,16 +10288,16 @@ AAB_AIX_STDIO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aAab_Aix_StdioTests, apzAab_Aix_StdioPatch, 0 }, + { zAab_Aix_FcntlName, zAab_Aix_FcntlList, + apzAab_Aix_FcntlMachs, + AAB_AIX_FCNTL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAab_Aix_FcntlTests, apzAab_Aix_FcntlPatch, 0 }, + { zAab_Darwin7_9_Long_Double_FuncsName, zAab_Darwin7_9_Long_Double_FuncsList, apzAab_Darwin7_9_Long_Double_FuncsMachs, AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, aAab_Darwin7_9_Long_Double_FuncsTests, apzAab_Darwin7_9_Long_Double_FuncsPatch, 0 }, - { zAab_Darwin7_9_Long_Double_Funcs_2Name, zAab_Darwin7_9_Long_Double_Funcs_2List, - apzAab_Darwin7_9_Long_Double_Funcs_2Machs, - AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aAab_Darwin7_9_Long_Double_Funcs_2Tests, apzAab_Darwin7_9_Long_Double_Funcs_2Patch, 0 }, - { zAab_Fd_Zero_Asm_Posix_Types_HName, zAab_Fd_Zero_Asm_Posix_Types_HList, apzAab_Fd_Zero_Asm_Posix_Types_HMachs, AAB_FD_ZERO_ASM_POSIX_TYPES_H_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, @@ -8813,11 +10323,86 @@ AAB_SUN_MEMCPY_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, aAab_Sun_MemcpyTests, apzAab_Sun_MemcpyPatch, 0 }, + { zAab_Vxworks_AssertName, zAab_Vxworks_AssertList, + apzAab_Vxworks_AssertMachs, + AAB_VXWORKS_ASSERT_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, + aAab_Vxworks_AssertTests, apzAab_Vxworks_AssertPatch, 0 }, + + { zAab_Vxworks_Regs_VxtypesName, zAab_Vxworks_Regs_VxtypesList, + apzAab_Vxworks_Regs_VxtypesMachs, + AAB_VXWORKS_REGS_VXTYPES_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, + aAab_Vxworks_Regs_VxtypesTests, apzAab_Vxworks_Regs_VxtypesPatch, 0 }, + + { zAab_Vxworks_UnistdName, zAab_Vxworks_UnistdList, + apzAab_Vxworks_UnistdMachs, + AAB_VXWORKS_UNISTD_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, + aAab_Vxworks_UnistdTests, apzAab_Vxworks_UnistdPatch, 0 }, + + { zAix_AssertName, zAix_AssertList, + apzAix_AssertMachs, + AIX_ASSERT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_AssertTests, apzAix_AssertPatch, 0 }, + { zAix_ComplexName, zAix_ComplexList, apzAix_ComplexMachs, AIX_COMPLEX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aAix_ComplexTests, apzAix_ComplexPatch, 0 }, + { zAix_ExterncName, zAix_ExterncList, + apzAix_ExterncMachs, + AIX_EXTERNC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_ExterncTests, apzAix_ExterncPatch, 0 }, + + { zAix_Externcpp1Name, zAix_Externcpp1List, + apzAix_Externcpp1Machs, + AIX_EXTERNCPP1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_Externcpp1Tests, apzAix_Externcpp1Patch, 0 }, + + { zAix_Externcpp2Name, zAix_Externcpp2List, + apzAix_Externcpp2Machs, + AIX_EXTERNCPP2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_Externcpp2Tests, apzAix_Externcpp2Patch, 0 }, + + { zAix_MallocName, zAix_MallocList, + apzAix_MallocMachs, + AIX_MALLOC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_MallocTests, apzAix_MallocPatch, 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_NullName, zAix_NullList, + apzAix_NullMachs, + AIX_NULL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_NullTests, apzAix_NullPatch, 0 }, + + { zAix_Once_Init_1Name, zAix_Once_Init_1List, + apzAix_Once_Init_1Machs, + AIX_ONCE_INIT_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_Once_Init_1Tests, apzAix_Once_Init_1Patch, 0 }, + + { zAix_Once_Init_2Name, zAix_Once_Init_2List, + apzAix_Once_Init_2Machs, + AIX_ONCE_INIT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_Once_Init_2Tests, apzAix_Once_Init_2Patch, 0 }, + + { zAix_Mutex_Initializer_1Name, zAix_Mutex_Initializer_1List, + apzAix_Mutex_Initializer_1Machs, + AIX_MUTEX_INITIALIZER_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_Mutex_Initializer_1Tests, apzAix_Mutex_Initializer_1Patch, 0 }, + + { zAix_Cond_Initializer_1Name, zAix_Cond_Initializer_1List, + apzAix_Cond_Initializer_1Machs, + AIX_COND_INITIALIZER_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_Cond_Initializer_1Tests, apzAix_Cond_Initializer_1Patch, 0 }, + + { zAix_Rwlock_Initializer_1Name, zAix_Rwlock_Initializer_1List, + apzAix_Rwlock_Initializer_1Machs, + AIX_RWLOCK_INITIALIZER_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_Rwlock_Initializer_1Tests, apzAix_Rwlock_Initializer_1Patch, 0 }, + { zAix_PthreadName, zAix_PthreadList, apzAix_PthreadMachs, AIX_PTHREAD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -8848,6 +10433,36 @@ AIX_STDINT_5_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aAix_Stdint_5Tests, apzAix_Stdint_5Patch, 0 }, + { zAix_Stdio_InlineName, zAix_Stdio_InlineList, + apzAix_Stdio_InlineMachs, + AIX_STDIO_INLINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_Stdio_InlineTests, apzAix_Stdio_InlinePatch, 0 }, + + { zAix_Stdlib_MallocName, zAix_Stdlib_MallocList, + apzAix_Stdlib_MallocMachs, + AIX_STDLIB_MALLOC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_Stdlib_MallocTests, apzAix_Stdlib_MallocPatch, 0 }, + + { zAix_Stdlib_ReallocName, zAix_Stdlib_ReallocList, + apzAix_Stdlib_ReallocMachs, + AIX_STDLIB_REALLOC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_Stdlib_ReallocTests, apzAix_Stdlib_ReallocPatch, 0 }, + + { zAix_Stdlib_CallocName, zAix_Stdlib_CallocList, + apzAix_Stdlib_CallocMachs, + AIX_STDLIB_CALLOC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_Stdlib_CallocTests, apzAix_Stdlib_CallocPatch, 0 }, + + { zAix_Stdlib_VallocName, zAix_Stdlib_VallocList, + apzAix_Stdlib_VallocMachs, + AIX_STDLIB_VALLOC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_Stdlib_VallocTests, apzAix_Stdlib_VallocPatch, 0 }, + + { zAix_Strtof_ConstName, zAix_Strtof_ConstList, + apzAix_Strtof_ConstMachs, + AIX_STRTOF_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_Strtof_ConstTests, apzAix_Strtof_ConstPatch, 0 }, + { zAix_SysmachineName, zAix_SysmachineList, apzAix_SysmachineMachs, AIX_SYSMACHINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -8868,31 +10483,11 @@ ALPHA___ASSERT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aAlpha___AssertTests, apzAlpha___AssertPatch, 0 }, - { zAlpha___Extern_PrefixName, zAlpha___Extern_PrefixList, - apzAlpha___Extern_PrefixMachs, - ALPHA___EXTERN_PREFIX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aAlpha___Extern_PrefixTests, apzAlpha___Extern_PrefixPatch, 0 }, - - { zAlpha___Extern_Prefix_StandardsName, zAlpha___Extern_Prefix_StandardsList, - apzAlpha___Extern_Prefix_StandardsMachs, - ALPHA___EXTERN_PREFIX_STANDARDS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aAlpha___Extern_Prefix_StandardsTests, apzAlpha___Extern_Prefix_StandardsPatch, 0 }, - - { zAlpha___Extern_Prefix_Sys_StatName, zAlpha___Extern_Prefix_Sys_StatList, - apzAlpha___Extern_Prefix_Sys_StatMachs, - ALPHA___EXTERN_PREFIX_SYS_STAT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aAlpha___Extern_Prefix_Sys_StatTests, apzAlpha___Extern_Prefix_Sys_StatPatch, 0 }, - { zAlpha_AssertName, zAlpha_AssertList, apzAlpha_AssertMachs, ALPHA_ASSERT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aAlpha_AssertTests, apzAlpha_AssertPatch, 0 }, - { zAlpha_Bad_LvalName, zAlpha_Bad_LvalList, - apzAlpha_Bad_LvalMachs, - ALPHA_BAD_LVAL_TEST_CT, FD_MACH_ONLY, - aAlpha_Bad_LvalTests, apzAlpha_Bad_LvalPatch, 0 }, - { zAlpha_GetoptName, zAlpha_GetoptList, apzAlpha_GetoptMachs, ALPHA_GETOPT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -8908,21 +10503,6 @@ ALPHA_PARENS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aAlpha_ParensTests, apzAlpha_ParensPatch, 0 }, - { zAlpha_PthreadName, zAlpha_PthreadList, - apzAlpha_PthreadMachs, - ALPHA_PTHREAD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aAlpha_PthreadTests, apzAlpha_PthreadPatch, 0 }, - - { zAlpha_Pthread_GccName, zAlpha_Pthread_GccList, - apzAlpha_Pthread_GccMachs, - ALPHA_PTHREAD_GCC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aAlpha_Pthread_GccTests, apzAlpha_Pthread_GccPatch, 0 }, - - { zAlpha_Pthread_InitName, zAlpha_Pthread_InitList, - apzAlpha_Pthread_InitMachs, - ALPHA_PTHREAD_INIT_TEST_CT, FD_MACH_ONLY, - aAlpha_Pthread_InitTests, apzAlpha_Pthread_InitPatch, 0 }, - { zAlpha_SbrkName, zAlpha_SbrkList, apzAlpha_SbrkMachs, ALPHA_SBRK_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -8993,6 +10573,16 @@ CXX_UNREADY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aCxx_UnreadyTests, apzCxx_UnreadyPatch, 0 }, + { zDarwin_AvailabilityinternalName, zDarwin_AvailabilityinternalList, + apzDarwin_AvailabilityinternalMachs, + DARWIN_AVAILABILITYINTERNAL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_AvailabilityinternalTests, apzDarwin_AvailabilityinternalPatch, 0 }, + + { zDarwin_9_Long_Double_Funcs_2Name, zDarwin_9_Long_Double_Funcs_2List, + apzDarwin_9_Long_Double_Funcs_2Machs, + DARWIN_9_LONG_DOUBLE_FUNCS_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_9_Long_Double_Funcs_2Tests, apzDarwin_9_Long_Double_Funcs_2Patch, 0 }, + { zDarwin_ExterncName, zDarwin_ExterncList, apzDarwin_ExterncMachs, DARWIN_EXTERNC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -9003,6 +10593,26 @@ DARWIN_GCC4_BREAKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aDarwin_Gcc4_BreakageTests, apzDarwin_Gcc4_BreakagePatch, 0 }, + { zDarwin_Longjmp_NoreturnName, zDarwin_Longjmp_NoreturnList, + apzDarwin_Longjmp_NoreturnMachs, + DARWIN_LONGJMP_NORETURN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Longjmp_NoreturnTests, apzDarwin_Longjmp_NoreturnPatch, 0 }, + + { zDarwin_Os_Trace_1Name, zDarwin_Os_Trace_1List, + apzDarwin_Os_Trace_1Machs, + DARWIN_OS_TRACE_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Os_Trace_1Tests, apzDarwin_Os_Trace_1Patch, 0 }, + + { zDarwin_Os_Trace_2Name, zDarwin_Os_Trace_2List, + apzDarwin_Os_Trace_2Machs, + DARWIN_OS_TRACE_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Os_Trace_2Tests, apzDarwin_Os_Trace_2Patch, 0 }, + + { zDarwin_Os_Trace_3Name, zDarwin_Os_Trace_3List, + apzDarwin_Os_Trace_3Machs, + DARWIN_OS_TRACE_3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Os_Trace_3Tests, apzDarwin_Os_Trace_3Patch, 0 }, + { zDarwin_Private_ExternName, zDarwin_Private_ExternList, apzDarwin_Private_ExternMachs, DARWIN_PRIVATE_EXTERN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -9058,6 +10668,16 @@ ECD_CURSOR_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aEcd_CursorTests, apzEcd_CursorPatch, 0 }, + { zFeraiseexcept_Nosse_DivbyzeroName, zFeraiseexcept_Nosse_DivbyzeroList, + apzFeraiseexcept_Nosse_DivbyzeroMachs, + FERAISEEXCEPT_NOSSE_DIVBYZERO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aFeraiseexcept_Nosse_DivbyzeroTests, apzFeraiseexcept_Nosse_DivbyzeroPatch, 0 }, + + { zFeraiseexcept_Nosse_InvalidName, zFeraiseexcept_Nosse_InvalidList, + apzFeraiseexcept_Nosse_InvalidMachs, + FERAISEEXCEPT_NOSSE_INVALID_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aFeraiseexcept_Nosse_InvalidTests, apzFeraiseexcept_Nosse_InvalidPatch, 0 }, + { zFreebsd_Gcc3_BreakageName, zFreebsd_Gcc3_BreakageList, apzFreebsd_Gcc3_BreakageMachs, FREEBSD_GCC3_BREAKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -9158,16 +10778,41 @@ HPUX10_STDIO_DECLARATIONS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aHpux10_Stdio_DeclarationsTests, apzHpux10_Stdio_DeclarationsPatch, 0 }, + { zHppa_Hpux11_AllocaName, zHppa_Hpux11_AllocaList, + apzHppa_Hpux11_AllocaMachs, + HPPA_HPUX11_ALLOCA_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHppa_Hpux11_AllocaTests, apzHppa_Hpux11_AllocaPatch, 0 }, + { zHpux11_AbsName, zHpux11_AbsList, apzHpux11_AbsMachs, HPUX11_ABS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aHpux11_AbsTests, apzHpux11_AbsPatch, 0 }, + { zHpux11_Lwp_Rwlock_ValidName, zHpux11_Lwp_Rwlock_ValidList, + apzHpux11_Lwp_Rwlock_ValidMachs, + HPUX11_LWP_RWLOCK_VALID_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux11_Lwp_Rwlock_ValidTests, apzHpux11_Lwp_Rwlock_ValidPatch, 0 }, + + { zHpux11_Extern_SendfileName, zHpux11_Extern_SendfileList, + apzHpux11_Extern_SendfileMachs, + HPUX11_EXTERN_SENDFILE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux11_Extern_SendfileTests, apzHpux11_Extern_SendfilePatch, 0 }, + + { zHpux11_Extern_SendpathName, zHpux11_Extern_SendpathList, + apzHpux11_Extern_SendpathMachs, + HPUX11_EXTERN_SENDPATH_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux11_Extern_SendpathTests, apzHpux11_Extern_SendpathPatch, 0 }, + { zHpux11_FabsfName, zHpux11_FabsfList, apzHpux11_FabsfMachs, HPUX11_FABSF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aHpux11_FabsfTests, apzHpux11_FabsfPatch, 0 }, + { zHpux11_Pthread_PointerName, zHpux11_Pthread_PointerList, + apzHpux11_Pthread_PointerMachs, + HPUX11_PTHREAD_POINTER_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux11_Pthread_PointerTests, apzHpux11_Pthread_PointerPatch, 0 }, + { zHpux11_Pthread_ConstName, zHpux11_Pthread_ConstList, apzHpux11_Pthread_ConstMachs, HPUX11_PTHREAD_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -9188,61 +10833,16 @@ HPUX11_VSNPRINTF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aHpux11_VsnprintfTests, apzHpux11_VsnprintfPatch, 0 }, + { zHpux_VsscanfName, zHpux_VsscanfList, + apzHpux_VsscanfMachs, + HPUX_VSSCANF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux_VsscanfTests, apzHpux_VsscanfPatch, 0 }, + { zHpux8_Bogus_InlinesName, zHpux8_Bogus_InlinesList, apzHpux8_Bogus_InlinesMachs, HPUX8_BOGUS_INLINES_TEST_CT, FD_MACH_ONLY, aHpux8_Bogus_InlinesTests, apzHpux8_Bogus_InlinesPatch, 0 }, - { zHpux_Ctype_MacrosName, zHpux_Ctype_MacrosList, - apzHpux_Ctype_MacrosMachs, - HPUX_CTYPE_MACROS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aHpux_Ctype_MacrosTests, apzHpux_Ctype_MacrosPatch, 0 }, - - { zHpux_HtonlName, zHpux_HtonlList, - apzHpux_HtonlMachs, - HPUX_HTONL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aHpux_HtonlTests, apzHpux_HtonlPatch, 0 }, - - { zHpux_Long_DoubleName, zHpux_Long_DoubleList, - apzHpux_Long_DoubleMachs, - HPUX_LONG_DOUBLE_TEST_CT, FD_MACH_ONLY, - aHpux_Long_DoubleTests, apzHpux_Long_DoublePatch, 0 }, - - { zHpux_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, - aHpux_SystimeTests, apzHpux_SystimePatch, 0 }, - - { zHpux_Spu_InfoName, zHpux_Spu_InfoList, - apzHpux_Spu_InfoMachs, - HPUX_SPU_INFO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aHpux_Spu_InfoTests, apzHpux_Spu_InfoPatch, 0 }, - - { zHpux11_Extern_SendfileName, zHpux11_Extern_SendfileList, - apzHpux11_Extern_SendfileMachs, - HPUX11_EXTERN_SENDFILE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aHpux11_Extern_SendfileTests, apzHpux11_Extern_SendfilePatch, 0 }, - - { zHpux11_Extern_SendpathName, zHpux11_Extern_SendpathList, - apzHpux11_Extern_SendpathMachs, - HPUX11_EXTERN_SENDPATH_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aHpux11_Extern_SendpathTests, apzHpux11_Extern_SendpathPatch, 0 }, - - { zHpux_Extern_ErrnoName, zHpux_Extern_ErrnoList, - apzHpux_Extern_ErrnoMachs, - HPUX_EXTERN_ERRNO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aHpux_Extern_ErrnoTests, apzHpux_Extern_ErrnoPatch, 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, @@ -9258,20 +10858,65 @@ 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_Ctype_MacrosName, zHpux_Ctype_MacrosList, + apzHpux_Ctype_MacrosMachs, + HPUX_CTYPE_MACROS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux_Ctype_MacrosTests, apzHpux_Ctype_MacrosPatch, 0 }, + + { zHpux_Extern_ErrnoName, zHpux_Extern_ErrnoList, + apzHpux_Extern_ErrnoMachs, + HPUX_EXTERN_ERRNO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux_Extern_ErrnoTests, apzHpux_Extern_ErrnoPatch, 0 }, + + { zHpux_HtonlName, zHpux_HtonlList, + apzHpux_HtonlMachs, + HPUX_HTONL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux_HtonlTests, apzHpux_HtonlPatch, 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 }, { 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 }, + { zHpux_Long_DoubleName, zHpux_Long_DoubleList, + apzHpux_Long_DoubleMachs, + HPUX_LONG_DOUBLE_TEST_CT, FD_MACH_ONLY, + aHpux_Long_DoubleTests, apzHpux_Long_DoublePatch, 0 }, + + { zHpux_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_Pthread_InitializersName, zHpux_Pthread_InitializersList, + apzHpux_Pthread_InitializersMachs, + HPUX_PTHREAD_INITIALIZERS_TEST_CT, FD_MACH_ONLY, + aHpux_Pthread_InitializersTests, apzHpux_Pthread_InitializersPatch, 0 }, + + { zHpux_Spu_InfoName, zHpux_Spu_InfoList, + apzHpux_Spu_InfoMachs, + HPUX_SPU_INFO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux_Spu_InfoTests, apzHpux_Spu_InfoPatch, 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_LongjmpName, zHpux_LongjmpList, + apzHpux_LongjmpMachs, + HPUX_LONGJMP_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux_LongjmpTests, apzHpux_LongjmpPatch, 0 }, + + { zHpux_SystimeName, zHpux_SystimeList, + apzHpux_SystimeMachs, + HPUX_SYSTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux_SystimeTests, apzHpux_SystimePatch, 0 }, { zHuge_Val_HexName, zHuge_Val_HexList, apzHuge_Val_HexMachs, @@ -9308,71 +10953,16 @@ IP_MISSING_SEMI_TEST_CT, FD_MACH_ONLY, aIp_Missing_SemiTests, apzIp_Missing_SemiPatch, 0 }, - { zIrix___RestrictName, zIrix___RestrictList, - apzIrix___RestrictMachs, - IRIX___RESTRICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aIrix___RestrictTests, apzIrix___RestrictPatch, 0 }, - - { zIrix___Generic1Name, zIrix___Generic1List, - apzIrix___Generic1Machs, - IRIX___GENERIC1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aIrix___Generic1Tests, apzIrix___Generic1Patch, 0 }, - - { zIrix___Generic2Name, zIrix___Generic2List, - apzIrix___Generic2Machs, - IRIX___GENERIC2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aIrix___Generic2Tests, apzIrix___Generic2Patch, 0 }, - - { zIrix_Asm_ApostropheName, zIrix_Asm_ApostropheList, - apzIrix_Asm_ApostropheMachs, - IRIX_ASM_APOSTROPHE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - 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_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, IRIX_STDIO_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aIrix_Stdio_Va_ListTests, apzIrix_Stdio_Va_ListPatch, 0 }, - { zIrix_WcsftimeName, zIrix_WcsftimeList, - apzIrix_WcsftimeMachs, - IRIX_WCSFTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aIrix_WcsftimeTests, apzIrix_WcsftimePatch, 0 }, - { zKandr_ConcatName, zKandr_ConcatList, apzKandr_ConcatMachs, KANDR_CONCAT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -9405,7 +10995,7 @@ { zMath_ExceptionName, zMath_ExceptionList, apzMath_ExceptionMachs, - MATH_EXCEPTION_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + MATH_EXCEPTION_TEST_CT, FD_MACH_IFNOT | FD_SUBROUTINE, aMath_ExceptionTests, apzMath_ExceptionPatch, 0 }, { zMath_Huge_Val_From_Dbl_MaxName, zMath_Huge_Val_From_Dbl_MaxList, @@ -9543,16 +11133,56 @@ 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_Gets_C11Name, zSolaris_Gets_C11List, + apzSolaris_Gets_C11Machs, + SOLARIS_GETS_C11_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Gets_C11Tests, apzSolaris_Gets_C11Patch, 0 }, + + { zSolaris_Gets_Cxx14Name, zSolaris_Gets_Cxx14List, + apzSolaris_Gets_Cxx14Machs, + SOLARIS_GETS_CXX14_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Gets_Cxx14Tests, apzSolaris_Gets_Cxx14Patch, 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_Math_1Name, zSolaris_Math_1List, apzSolaris_Math_1Machs, SOLARIS_MATH_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aSolaris_Math_1Tests, apzSolaris_Math_1Patch, 0 }, + { zSolaris_Math_10Name, zSolaris_Math_10List, + apzSolaris_Math_10Machs, + SOLARIS_MATH_10_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Math_10Tests, apzSolaris_Math_10Patch, 0 }, + { zSolaris_Math_2Name, zSolaris_Math_2List, apzSolaris_Math_2Machs, SOLARIS_MATH_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -9578,65 +11208,55 @@ SOLARIS_MATH_9_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aSolaris_Math_9Tests, apzSolaris_Math_9Patch, 0 }, - { zSolaris_Math_10Name, zSolaris_Math_10List, - apzSolaris_Math_10Machs, - SOLARIS_MATH_10_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aSolaris_Math_10Tests, apzSolaris_Math_10Patch, 0 }, - - { zSolaris_Mutex_Init_2Name, zSolaris_Mutex_Init_2List, - apzSolaris_Mutex_Init_2Machs, - SOLARIS_MUTEX_INIT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aSolaris_Mutex_Init_2Tests, apzSolaris_Mutex_Init_2Patch, 0 }, - - { zSolaris_Rwlock_Init_1Name, zSolaris_Rwlock_Init_1List, - apzSolaris_Rwlock_Init_1Machs, - SOLARIS_RWLOCK_INIT_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aSolaris_Rwlock_Init_1Tests, apzSolaris_Rwlock_Init_1Patch, 0 }, + { zSolaris_Math_11Name, zSolaris_Math_11List, + apzSolaris_Math_11Machs, + SOLARIS_MATH_11_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Math_11Tests, apzSolaris_Math_11Patch, 0 }, + + { zSolaris_Math_12Name, zSolaris_Math_12List, + apzSolaris_Math_12Machs, + SOLARIS_MATH_12_TEST_CT, FD_MACH_ONLY, + aSolaris_Math_12Tests, apzSolaris_Math_12Patch, 0 }, { zSolaris_Once_Init_1Name, zSolaris_Once_Init_1List, apzSolaris_Once_Init_1Machs, SOLARIS_ONCE_INIT_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aSolaris_Once_Init_1Tests, apzSolaris_Once_Init_1Patch, 0 }, - { zSolaris_Once_Init_2Name, zSolaris_Once_Init_2List, - apzSolaris_Once_Init_2Machs, - 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_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, + aSolaris_Rwlock_Init_1Tests, apzSolaris_Rwlock_Init_1Patch, 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_Std_Gets_Cxx14Name, zSolaris_Std_Gets_Cxx14List, + apzSolaris_Std_Gets_Cxx14Machs, + SOLARIS_STD_GETS_CXX14_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Std_Gets_Cxx14Tests, apzSolaris_Std_Gets_Cxx14Patch, 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 }, + { zSolaris_Stdlib_NoreturnName, zSolaris_Stdlib_NoreturnList, + apzSolaris_Stdlib_NoreturnMachs, + SOLARIS_STDLIB_NORETURN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Stdlib_NoreturnTests, apzSolaris_Stdlib_NoreturnPatch, 0 }, { zStatsswtchName, zStatsswtchList, apzStatsswtchMachs, @@ -9718,6 +11338,11 @@ SUNOS_STRLEN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aSunos_StrlenTests, apzSunos_StrlenPatch, 0 }, + { zSuse_Linux_Vt_CxxName, zSuse_Linux_Vt_CxxList, + apzSuse_Linux_Vt_CxxMachs, + SUSE_LINUX_VT_CXX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSuse_Linux_Vt_CxxTests, apzSuse_Linux_Vt_CxxPatch, 0 }, + { zSvr4_Disable_OptName, zSvr4_Disable_OptList, apzSvr4_Disable_OptMachs, SVR4_DISABLE_OPT_TEST_CT, FD_MACH_ONLY, @@ -9778,6 +11403,56 @@ VA_I960_MACRO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aVa_I960_MacroTests, apzVa_I960_MacroPatch, 0 }, + { zVms_Add_Missing_BracesName, zVms_Add_Missing_BracesList, + apzVms_Add_Missing_BracesMachs, + VMS_ADD_MISSING_BRACES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aVms_Add_Missing_BracesTests, apzVms_Add_Missing_BracesPatch, 0 }, + + { zVms_Decc_BuiltinName, zVms_Decc_BuiltinList, + apzVms_Decc_BuiltinMachs, + VMS_DECC_BUILTIN_TEST_CT, FD_MACH_ONLY, + aVms_Decc_BuiltinTests, apzVms_Decc_BuiltinPatch, 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_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 }, + + { zVms_Do_Not_Redeclare_HostaliasName, zVms_Do_Not_Redeclare_HostaliasList, + apzVms_Do_Not_Redeclare_HostaliasMachs, + VMS_DO_NOT_REDECLARE_HOSTALIAS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aVms_Do_Not_Redeclare_HostaliasTests, apzVms_Do_Not_Redeclare_HostaliasPatch, 0 }, + + { zVms_Forward_Declare_StructName, zVms_Forward_Declare_StructList, + apzVms_Forward_Declare_StructMachs, + VMS_FORWARD_DECLARE_STRUCT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aVms_Forward_Declare_StructTests, apzVms_Forward_Declare_StructPatch, 0 }, + + { zVms_No_64bit_GetoptName, zVms_No_64bit_GetoptList, + apzVms_No_64bit_GetoptMachs, + VMS_NO_64BIT_GETOPT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aVms_No_64bit_GetoptTests, apzVms_No_64bit_GetoptPatch, 0 }, + + { zVms_Use_Fast_SetjmpName, zVms_Use_Fast_SetjmpList, + apzVms_Use_Fast_SetjmpMachs, + VMS_USE_FAST_SETJMP_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aVms_Use_Fast_SetjmpTests, apzVms_Use_Fast_SetjmpPatch, 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_Use_Quoted_IncludeName, zVms_Use_Quoted_IncludeList, + apzVms_Use_Quoted_IncludeMachs, + VMS_USE_QUOTED_INCLUDE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aVms_Use_Quoted_IncludeTests, apzVms_Use_Quoted_IncludePatch, 0 }, + { zVoid_NullName, zVoid_NullList, apzVoid_NullMachs, VOID_NULL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -9788,6 +11463,16 @@ VXWORKS_GCC_PROBLEM_TEST_CT, FD_MACH_ONLY, aVxworks_Gcc_ProblemTests, apzVxworks_Gcc_ProblemPatch, 0 }, + { zVxworks_Ioctl_MacroName, zVxworks_Ioctl_MacroList, + apzVxworks_Ioctl_MacroMachs, + VXWORKS_IOCTL_MACRO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aVxworks_Ioctl_MacroTests, apzVxworks_Ioctl_MacroPatch, 0 }, + + { zVxworks_Mkdir_MacroName, zVxworks_Mkdir_MacroList, + apzVxworks_Mkdir_MacroMachs, + VXWORKS_MKDIR_MACRO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aVxworks_Mkdir_MacroTests, apzVxworks_Mkdir_MacroPatch, 0 }, + { zVxworks_Needs_VxtypesName, zVxworks_Needs_VxtypesList, apzVxworks_Needs_VxtypesMachs, VXWORKS_NEEDS_VXTYPES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -9798,11 +11483,21 @@ VXWORKS_NEEDS_VXWORKS_TEST_CT, FD_MACH_ONLY, aVxworks_Needs_VxworksTests, apzVxworks_Needs_VxworksPatch, 0 }, + { zVxworks_RegsName, zVxworks_RegsList, + apzVxworks_RegsMachs, + VXWORKS_REGS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aVxworks_RegsTests, apzVxworks_RegsPatch, 0 }, + { zVxworks_TimeName, zVxworks_TimeList, apzVxworks_TimeMachs, VXWORKS_TIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aVxworks_TimeTests, apzVxworks_TimePatch, 0 }, + { zVxworks_Write_ConstName, zVxworks_Write_ConstList, + apzVxworks_Write_ConstMachs, + VXWORKS_WRITE_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aVxworks_Write_ConstTests, apzVxworks_Write_ConstPatch, 0 }, + { zX11_ClassName, zX11_ClassList, apzX11_ClassMachs, X11_CLASS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,