*
* DO NOT EDIT THIS FILE (fixincl.x)
*
- * It has been AutoGen-ed June 8, 2017 at 10:50:04 AM by AutoGen 5.18.4
+ * It has been AutoGen-ed July 23, 2018 at 07:27:34 PM by AutoGen 5.18
* From the definitions inclhack.def
* and the template file fixincl
*/
-/* DO NOT SVN-MERGE THIS FILE, EITHER Thu Jun 8 10:50:04 CEST 2017
+/* DO NOT SVN-MERGE THIS FILE, EITHER Mon Jul 23 19:27:34 UTC 2018
*
* You must regenerate it. Use the ./genfixes script.
*
* 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 247 fixup descriptions.
+ * This file contains 251 fixup descriptions.
*
* See README for more information.
*
* 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\
#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 };
"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
"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
"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 <unistd.h>",
+ (char*)NULL };
+
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of X11_Class fix
*
* List of all fixes
*/
-#define REGEX_COUNT 285
+#define REGEX_COUNT 289
#define MACH_LIST_SIZE_LIMIT 187
-#define FIX_COUNT 247
+#define FIX_COUNT 251
/*
* Enumerate the fixes
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,
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,
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,
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,
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,
projects / gcc.git / blobdiff