X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=fixincludes%2Ffixincl.x;h=ad5824da01517a7f560e112a446a0526fa8e74bf;hb=fea0709e35733d5a6a558cebda22336974eaf526;hp=b0eeef9dfdf1387e5dd0ba39754d30e758b99621;hpb=3115f94f7fe0388f026837b36d165b026032093e;p=gcc.git diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index b0eeef9dfdf..ad5824da015 100644 --- a/fixincludes/fixincl.x +++ b/fixincludes/fixincl.x @@ -1,12 +1,12 @@ /* -*- buffer-read-only: t -*- vi: set ro: - * + * * DO NOT EDIT THIS FILE (fixincl.x) - * - * It has been AutoGen-ed November 20, 2016 at 12:02:46 PM by AutoGen 5.16.2 + * + * It has been AutoGen-ed October 16, 2018 at 11:38:39 AM by AutoGen 5.18.7 * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Nov 20 12:02:47 MET 2016 +/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Oct 16 11:38:39 CEST 2018 * * 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 242 fixup descriptions. + * This file contains 251 fixup descriptions. * * See README for more information. * @@ -524,11 +524,14 @@ tSCC* apzAab_Vxworks_AssertMachs[] = { * 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\ +"#ifdef _ASSERT_H\n\ +#undef _ASSERT_H\n\ #undef assert\n\ #endif\n\n\ +#define _ASSERT_H\n\n\ +#ifdef __cplusplus\n\ +extern \"C\" {\n\ +#endif\n\n\ #if defined(__STDC__) || defined(__cplusplus)\n\ extern void __assert (const char*);\n\ #else\n\ @@ -541,9 +544,11 @@ extern void __assert ();\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\ + __assert(\"Assertion failed: \" #test \", file \" \\\n\ __FILE__ \", line \" ASSERT_STRINGIFY(__LINE__) \"\\n\")))\n\n\ #endif\n\n\ +#ifdef __cplusplus\n\ +}\n\ #endif", (char*)NULL }; @@ -574,125 +579,21 @@ tSCC* apzAab_Vxworks_Regs_VxtypesMachs[] = { static const char* apzAab_Vxworks_Regs_VxtypesPatch[] = { "#ifndef _REGS_H\n\ #define _REGS_H\n\ +/* regs.h depends on CPU_FAMILY being properly defined, which\n\ + is done by vxCpu.h. */\n\ +#include \n\ +/* regs.h includes a CPU_FAMILY-specific header that requires\n\ + vxTypesOld.h to already have been included. Those headers\n\ + contain proper _ASMLANGUAGE guards around their typedefs,\n\ + but vxTypesOld.h itself does not. So we avoid including\n\ + vxTypesOld.h from assembly. */\n\ +#ifndef _ASMLANGUAGE\n\ #include \n\ +#endif\n\ #include_next \n\ #endif", (char*)NULL }; -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Aab_Vxworks_Stdint fix - */ -tSCC zAab_Vxworks_StdintName[] = - "AAB_vxworks_stdint"; - -/* - * File name selection pattern - */ -tSCC zAab_Vxworks_StdintList[] = - "stdint.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzAab_Vxworks_StdintMachs[] = { - "*-*-vxworks*", - (const char*)NULL }; -#define AAB_VXWORKS_STDINT_TEST_CT 0 -#define aAab_Vxworks_StdintTests (tTestDesc*)NULL - -/* - * Fix Command Arguments for Aab_Vxworks_Stdint - */ -static const char* apzAab_Vxworks_StdintPatch[] = { -"#ifndef _STDINT_H\n\ -#define _STDINT_H\n\ -/* get int*_t, uint*_t */\n\ -#include \n\n\ -/* get legacy vxworks types for compatibility */\n\ -#include \n\n\ -typedef long intptr_t;\n\ -typedef unsigned long uintptr_t;\n\n\ -typedef int64_t intmax_t;\n\ -typedef uint64_t uintmax_t;\n\n\ -typedef int8_t int_least8_t;\n\ -typedef int16_t int_least16_t;\n\ -typedef int32_t int_least32_t;\n\ -typedef int64_t int_least64_t;\n\n\ -typedef uint8_t uint_least8_t;\n\ -typedef uint16_t uint_least16_t;\n\ -typedef uint32_t uint_least32_t;\n\ -typedef uint64_t uint_least64_t;\n\n\ -typedef int8_t int_fast8_t;\n\ -typedef int int_fast16_t;\n\ -typedef int32_t int_fast32_t;\n\ -typedef int64_t int_fast64_t;\n\n\ -typedef uint8_t uint_fast8_t;\n\ -typedef unsigned int uint_fast16_t;\n\ -typedef uint32_t uint_fast32_t;\n\ -typedef uint64_t uint_fast64_t;\n\n\ -/* Ranges */\n\ -#define UINT8_MAX (~(uint8_t)0)\n\ -#define UINT8_MIN 0\n\ -#define UINT16_MAX (~(uint16_t)0)\n\ -#define UINT16_MIN 0\n\ -#define UINT32_MAX (~(uint32_t)0)\n\ -#define UINT32_MIN 0\n\ -#define UINT64_MAX (~(uint64_t)0)\n\ -#define UINT64_MIN 0\n\n\ -#define UINTPTR_MAX (~(uintptr_t)0)\n\ -#define UINTPTR_MIN 0\n\n\ -/* Need to do int_fast16_t as well, as type\n\ - size may be architecture dependent */\n\ -#define UINT_FAST16_MAX (~(uint_fast16_t)0)\n\ -#define UINT_FAST16_MAX 0\n\n\ -#define INT8_MAX (UINT8_MAX>>1)\n\ -#define INT8_MIN (INT8_MAX+1)\n\ -#define INT16_MAX (UINT16_MAX>>1)\n\ -#define INT16_MIN (INT16_MAX+1)\n\ -#define INT32_MAX (UINT32_MAX>>1)\n\ -#define INT32_MIN (INT32_MAX+1)\n\ -#define INT64_MAX (UINT64_MAX>>1)\n\ -#define INT64_MIN (INT64_MAX+1)\n\n\ -#define INTPTR_MAX (UINTPTR_MAX>>1)\n\ -#define INTPTR_MIN (INTPTR_MAX+1)\t\n\n\ -#define INT_FAST16_MAX (UINT_FAST16_MAX>>1)\n\ -#define INT_FAST16_MIN (INT_FAST16_MAX+1)\n\n\ -/* now define equiv. constants */\n\ -#define UINT_FAST8_MAX UINT8_MAX\n\ -#define UINT_FAST8_MIN UINT_FAST8_MIN\n\ -#define INT_FAST8_MAX INT8_MAX\n\ -#define INT_FAST8_MIN INT8_MIN\n\ -#define UINT_FAST32_MAX UINT32_MAX\n\ -#define UINT_FAST32_MIN UINT32_MIN\n\ -#define INT_FAST32_MAX INT32_MAX\n\ -#define INT_FAST32_MIN INT32_MIN\n\ -#define UINT_FAST64_MAX UINT64_MAX\n\ -#define UINT_FAST64_MIN UINT64_MIN\n\ -#define INT_FAST64_MAX INT64_MAX\n\ -#define INT_FAST64_MIN INT64_MIN\n\n\ -#define UINT_LEAST8_MAX UINT8_MAX\n\ -#define UINT_LEAST8_MIN UINT8_MIN\n\ -#define INT_LEAST8_MAX INT8_MAX\n\ -#define INT_LEAST8_MIN INT8_MIN\n\ -#define UINT_LEAST16_MAX UINT16_MAX\n\ -#define UINT_LEAST16_MIN UINT16_MIN\n\ -#define INT_LEAST16_MAX INT16_MAX\n\ -#define INT_LEAST16_MIN INT16_MIN\n\ -#define UINT_LEAST32_MAX UINT32_MAX\n\ -#define UINT_LEAST32_MIN UINT32_MIN\n\ -#define INT_LEAST32_MAX INT32_MAX\n\ -#define INT_LEAST32_MIN INT32_MIN\n\ -#define UINT_LEAST64_MAX UINT64_MAX\n\ -#define UINT_LEAST64_MIN UINT64_MIN\n\ -#define INT_LEAST64_MAX INT64_MAX\n\ -#define INT_LEAST64_MIN INT64_MIN\n\n\ -#define UINTMAX_MAX UINT64_MAX\n\ -#define UINTMAX_MIN UINT64_MIN\n\ -#define INTMAX_MAX INT64_MAX\n\ -#define INTMAX_MIN INT64_MIN\n\n\ -#endif", - (char*)NULL }; - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * Description of Aab_Vxworks_Unistd fix @@ -1693,6 +1594,80 @@ static const char* apzAix_Stdlib_VallocPatch[] = { "extern void *valloc(size_t) __asm__(\"__linux_valloc\");", (char*)NULL }; +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aix_Stdlib_Vec_Malloc fix + */ +tSCC zAix_Stdlib_Vec_MallocName[] = + "aix_stdlib_vec_malloc"; + +/* + * File name selection pattern + */ +tSCC zAix_Stdlib_Vec_MallocList[] = + "stdlib.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_Stdlib_Vec_MallocMachs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_Stdlib_Vec_MallocSelect0[] = + "#define[ \t]+malloc[ \t]+vec_malloc"; + +#define AIX_STDLIB_VEC_MALLOC_TEST_CT 1 +static tTestDesc aAix_Stdlib_Vec_MallocTests[] = { + { TT_EGREP, zAix_Stdlib_Vec_MallocSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Stdlib_Vec_Malloc + */ +static const char* apzAix_Stdlib_Vec_MallocPatch[] = { + "format", + "extern void *malloc(size_t) __asm__(\"vec_malloc\");", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aix_Stdlib_Vec_Calloc fix + */ +tSCC zAix_Stdlib_Vec_CallocName[] = + "aix_stdlib_vec_calloc"; + +/* + * File name selection pattern + */ +tSCC zAix_Stdlib_Vec_CallocList[] = + "stdlib.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_Stdlib_Vec_CallocMachs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_Stdlib_Vec_CallocSelect0[] = + "#define[ \t]+calloc[ \t]+vec_calloc"; + +#define AIX_STDLIB_VEC_CALLOC_TEST_CT 1 +static tTestDesc aAix_Stdlib_Vec_CallocTests[] = { + { TT_EGREP, zAix_Stdlib_Vec_CallocSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Stdlib_Vec_Calloc + */ +static const char* apzAix_Stdlib_Vec_CallocPatch[] = { + "format", + "extern void *calloc(size_t, size_t) __asm__(\"vec_calloc\");", + (char*)NULL }; + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * Description of Aix_Strtof_Const fix @@ -1841,6 +1816,43 @@ static const char* apzAix_VolatilePatch[] = { "typedef int sig_atomic_t", (char*)NULL }; +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aix_Unistd fix + */ +tSCC zAix_UnistdName[] = + "aix_unistd"; + +/* + * File name selection pattern + */ +tSCC zAix_UnistdList[] = + "unistd.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_UnistdMachs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_UnistdSelect0[] = + "[ \t]+static[ \t]+int[ \t]+getdtablesize\\(\\)"; + +#define AIX_UNISTD_TEST_CT 1 +static tTestDesc aAix_UnistdTests[] = { + { TT_EGREP, zAix_UnistdSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Unistd + */ +static const char* apzAix_UnistdPatch[] = { + "format", + "\tstatic int\t\tgetdtablesize(void)", + (char*)NULL }; + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * Description of Alpha___Assert fix @@ -4340,6 +4352,46 @@ static const char* apzHpux10_Stdio_DeclarationsPatch[] = { # endif /* __STDC__) || __cplusplus */\n", (char*)NULL }; +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * 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 \n\ +#endif /* _SYS_STDSYMS_INCLUDED */\n\n\ +%0", + (char*)NULL }; + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * Description of Hpux11_Abs fix @@ -4531,6 +4583,43 @@ static const char* apzHpux11_FabsfPatch[] = { #endif", (char*)NULL }; +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * 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 @@ -4554,7 +4643,7 @@ tSCC* apzHpux11_Pthread_ConstMachs[] = { * 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[] = { @@ -4565,7 +4654,7 @@ static tTestDesc aHpux11_Pthread_ConstTests[] = { */ static const char* apzHpux11_Pthread_ConstPatch[] = { "format", - "#define __POINTER_SET\t\t((void *) 1L)", + "%11", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -7066,6 +7155,84 @@ static const char* apzSolaris_Getc_Strict_StdcPatch[] = { "%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 @@ -7818,6 +7985,45 @@ using std::__flsbuf;\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 }; + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * Description of Solaris_Stdio_Tag fix @@ -7859,6 +8065,43 @@ static const char* apzSolaris_Stdio_TagPatch[] = { sed_cmd_z, "-e", "s/defined(__cplusplus) && (__cplusplus < 54321L)/0/", (char*)NULL }; +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * 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 }; + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * Description of Statsswtch fix @@ -9504,7 +9747,7 @@ tSCC* apzVxworks_Ioctl_MacroMachs[] = { static const char* apzVxworks_Ioctl_MacroPatch[] = { "format", "%0\n\ -#define ioctl(fd, func, arg) (ioctl)(fd, func, (int)(arg))\n", +#define ioctl(fd, func, arg) ioctl(fd, func, (int)(arg))\n", "extern[\t ]+int[\t ]+ioctl[\t ]*\\([\t ,[:alnum:]]*\\);", (char*)NULL }; @@ -9738,6 +9981,43 @@ static const char* apzVxworks_Write_ConstPatch[] = { "extern[\t ]+int[\t ]+write[\t ]*\\([\t ]*int[\t ]*,[\t ]*char[\t ]*\\*[\t ]*,[\t ]*size_t[\t ]*\\)[\t ]*;", (char*)NULL }; +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Vxworks_Iolib_Include_Unistd fix + */ +tSCC zVxworks_Iolib_Include_UnistdName[] = + "vxworks_iolib_include_unistd"; + +/* + * File name selection pattern + */ +tSCC zVxworks_Iolib_Include_UnistdList[] = + "ioLib.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzVxworks_Iolib_Include_UnistdMachs[] = { + "*-*-vxworks*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zVxworks_Iolib_Include_UnistdSelect0[] = + "#include \"unistd.h\""; + +#define VXWORKS_IOLIB_INCLUDE_UNISTD_TEST_CT 1 +static tTestDesc aVxworks_Iolib_Include_UnistdTests[] = { + { TT_EGREP, zVxworks_Iolib_Include_UnistdSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Vxworks_Iolib_Include_Unistd + */ +static const char* apzVxworks_Iolib_Include_UnistdPatch[] = { + "format", + "#include ", + (char*)NULL }; + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * Description of X11_Class fix @@ -9908,9 +10188,9 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 279 +#define REGEX_COUNT 289 #define MACH_LIST_SIZE_LIMIT 187 -#define FIX_COUNT 242 +#define FIX_COUNT 251 /* * Enumerate the fixes @@ -9926,7 +10206,6 @@ typedef enum { AAB_SUN_MEMCPY_FIXIDX, AAB_VXWORKS_ASSERT_FIXIDX, AAB_VXWORKS_REGS_VXTYPES_FIXIDX, - AAB_VXWORKS_STDINT_FIXIDX, AAB_VXWORKS_UNISTD_FIXIDX, AIX_ASSERT_FIXIDX, AIX_COMPLEX_FIXIDX, @@ -9952,10 +10231,13 @@ typedef enum { AIX_STDLIB_REALLOC_FIXIDX, AIX_STDLIB_CALLOC_FIXIDX, AIX_STDLIB_VALLOC_FIXIDX, + AIX_STDLIB_VEC_MALLOC_FIXIDX, + AIX_STDLIB_VEC_CALLOC_FIXIDX, AIX_STRTOF_CONST_FIXIDX, AIX_SYSMACHINE_FIXIDX, AIX_SYSWAIT_2_FIXIDX, AIX_VOLATILE_FIXIDX, + AIX_UNISTD_FIXIDX, ALPHA___ASSERT_FIXIDX, ALPHA_ASSERT_FIXIDX, ALPHA_GETOPT_FIXIDX, @@ -10016,11 +10298,13 @@ typedef enum { 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, @@ -10087,6 +10371,8 @@ typedef enum { SOLARIS_COMPLEX_CXX_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, @@ -10105,7 +10391,9 @@ typedef enum { SOLARIS_POW_INT_OVERLOAD_FIXIDX, SOLARIS_RWLOCK_INIT_1_FIXIDX, SOLARIS_STD___FILBUF_FIXIDX, + SOLARIS_STD_GETS_CXX14_FIXIDX, SOLARIS_STDIO_TAG_FIXIDX, + SOLARIS_STDLIB_NORETURN_FIXIDX, STATSSWTCH_FIXIDX, STDIO_STDARG_H_FIXIDX, STDIO_VA_LIST_FIXIDX, @@ -10154,6 +10442,7 @@ typedef enum { VXWORKS_REGS_FIXIDX, VXWORKS_TIME_FIXIDX, VXWORKS_WRITE_CONST_FIXIDX, + VXWORKS_IOLIB_INCLUDE_UNISTD_FIXIDX, X11_CLASS_FIXIDX, X11_CLASS_USAGE_FIXIDX, X11_NEW_FIXIDX, @@ -10211,11 +10500,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = { AAB_VXWORKS_REGS_VXTYPES_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, aAab_Vxworks_Regs_VxtypesTests, apzAab_Vxworks_Regs_VxtypesPatch, 0 }, - { zAab_Vxworks_StdintName, zAab_Vxworks_StdintList, - apzAab_Vxworks_StdintMachs, - AAB_VXWORKS_STDINT_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, - aAab_Vxworks_StdintTests, apzAab_Vxworks_StdintPatch, 0 }, - { zAab_Vxworks_UnistdName, zAab_Vxworks_UnistdList, apzAab_Vxworks_UnistdMachs, AAB_VXWORKS_UNISTD_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, @@ -10341,6 +10625,16 @@ tFixDesc fixDescList[ FIX_COUNT ] = { AIX_STDLIB_VALLOC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aAix_Stdlib_VallocTests, apzAix_Stdlib_VallocPatch, 0 }, + { zAix_Stdlib_Vec_MallocName, zAix_Stdlib_Vec_MallocList, + apzAix_Stdlib_Vec_MallocMachs, + AIX_STDLIB_VEC_MALLOC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_Stdlib_Vec_MallocTests, apzAix_Stdlib_Vec_MallocPatch, 0 }, + + { zAix_Stdlib_Vec_CallocName, zAix_Stdlib_Vec_CallocList, + apzAix_Stdlib_Vec_CallocMachs, + AIX_STDLIB_VEC_CALLOC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_Stdlib_Vec_CallocTests, apzAix_Stdlib_Vec_CallocPatch, 0 }, + { zAix_Strtof_ConstName, zAix_Strtof_ConstList, apzAix_Strtof_ConstMachs, AIX_STRTOF_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -10361,6 +10655,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { AIX_VOLATILE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aAix_VolatileTests, apzAix_VolatilePatch, 0 }, + { zAix_UnistdName, zAix_UnistdList, + apzAix_UnistdMachs, + AIX_UNISTD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_UnistdTests, apzAix_UnistdPatch, 0 }, + { zAlpha___AssertName, zAlpha___AssertList, apzAlpha___AssertMachs, ALPHA___ASSERT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -10661,6 +10960,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { 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, @@ -10686,6 +10990,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { 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, @@ -11016,6 +11325,16 @@ tFixDesc fixDescList[ FIX_COUNT ] = { 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, @@ -11106,11 +11425,21 @@ tFixDesc fixDescList[ FIX_COUNT ] = { 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_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, STATSSWTCH_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -11351,6 +11680,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { VXWORKS_WRITE_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aVxworks_Write_ConstTests, apzVxworks_Write_ConstPatch, 0 }, + { zVxworks_Iolib_Include_UnistdName, zVxworks_Iolib_Include_UnistdList, + apzVxworks_Iolib_Include_UnistdMachs, + VXWORKS_IOLIB_INCLUDE_UNISTD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aVxworks_Iolib_Include_UnistdTests, apzVxworks_Iolib_Include_UnistdPatch, 0 }, + { zX11_ClassName, zX11_ClassList, apzX11_ClassMachs, X11_CLASS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,