diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index 43c1e7cacb3..37258669eed 100644
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,12 @@
+2009-09-15 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ * inclhack.def (isc_fmod, isc_omits_with_stdc)
+ (nested_sys_limits, sco_math): Remove.
+ * tests/base/math.h (ISC_FMOD_CHECK, SCO_MATH_CHECK): Remove.
+ * tests/base/stdio.h (ISC_OMITS_WITH_STDC_CHECK): Remove.
+ * tests/base/sys/limits.h: Remove.
+ * fixincl.x: Regenerate.
+
2009-09-08 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
PR testsuite/29737
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index 21a6ef18b4e..b9b9b040f4d 100644
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -2,11 +2,11 @@
*
* DO NOT EDIT THIS FILE (fixincl.x)
*
- * It has been AutoGen-ed Tuesday September 8, 2009 at 07:26:10 PM CEST
+ * It has been AutoGen-ed Tuesday September 15, 2009 at 06:55:13 AM CEST
* From the definitions inclhack.def
* and the template file fixincl
*/
-/* DO NOT SVN-MERGE THIS FILE, EITHER Di 8. Sep 19:26:11 CEST 2009
+/* DO NOT SVN-MERGE THIS FILE, EITHER Di 15. Sep 06:55:13 CEST 2009
*
* 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 206 fixup descriptions.
+ * This file contains 202 fixup descriptions.
*
* See README for more information.
*
@@ -4820,76 +4820,6 @@ static const char* apzIrix_WcsftimePatch[] = {
%1",
(char*)NULL };
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description of Isc_Fmod fix
- */
-tSCC zIsc_FmodName[] =
- "isc_fmod";
-
-/*
- * File name selection pattern
- */
-tSCC zIsc_FmodList[] =
- "math.h\0";
-/*
- * Machine/OS name selection pattern
- */
-#define apzIsc_FmodMachs (const char**)NULL
-
-/*
- * content selection pattern - do fix if pattern found
- */
-tSCC zIsc_FmodSelect0[] =
- "fmod\\(double\\)";
-
-#define ISC_FMOD_TEST_CT 1
-static tTestDesc aIsc_FmodTests[] = {
- { TT_EGREP, zIsc_FmodSelect0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for Isc_Fmod
- */
-static const char* apzIsc_FmodPatch[] = {
- "format",
- "fmod(double, double)",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description of Isc_Omits_With_Stdc fix
- */
-tSCC zIsc_Omits_With_StdcName[] =
- "isc_omits_with_stdc";
-
-/*
- * File name selection pattern
- */
-tSCC zIsc_Omits_With_StdcList[] =
- "stdio.h\0math.h\0ctype.h\0sys/limits.h\0sys/fcntl.h\0sys/dirent.h\0";
-/*
- * Machine/OS name selection pattern
- */
-#define apzIsc_Omits_With_StdcMachs (const char**)NULL
-
-/*
- * content selection pattern - do fix if pattern found
- */
-tSCC zIsc_Omits_With_StdcSelect0[] =
- "!defined\\(__STDC__\\) && !defined\\(_POSIX_SOURCE\\)";
-
-#define ISC_OMITS_WITH_STDC_TEST_CT 1
-static tTestDesc aIsc_Omits_With_StdcTests[] = {
- { TT_EGREP, zIsc_Omits_With_StdcSelect0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for Isc_Omits_With_Stdc
- */
-static const char* apzIsc_Omits_With_StdcPatch[] = {
- "format",
- "!defined(_POSIX_SOURCE)",
- (char*)NULL };
-
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Kandr_Concat fix
@@ -5244,41 +5174,6 @@ static const char* apzNested_Auth_DesPatch[] = {
"%1*/ /*",
(char*)NULL };
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description of Nested_Sys_Limits fix
- */
-tSCC zNested_Sys_LimitsName[] =
- "nested_sys_limits";
-
-/*
- * File name selection pattern
- */
-tSCC zNested_Sys_LimitsList[] =
- "sys/limits.h\0";
-/*
- * Machine/OS name selection pattern
- */
-#define apzNested_Sys_LimitsMachs (const char**)NULL
-
-/*
- * content selection pattern - do fix if pattern found
- */
-tSCC zNested_Sys_LimitsSelect0[] =
- "CHILD_MAX";
-
-#define NESTED_SYS_LIMITS_TEST_CT 1
-static tTestDesc aNested_Sys_LimitsTests[] = {
- { TT_EGREP, zNested_Sys_LimitsSelect0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for Nested_Sys_Limits
- */
-static const char* apzNested_Sys_LimitsPatch[] = { sed_cmd_z,
- "-e", "/CHILD_MAX/s,/\\* Max, Max,",
- "-e", "/OPEN_MAX/s,/\\* Max, Max,",
- (char*)NULL };
-
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Netbsd_C99_Inline_1 fix
@@ -6144,60 +6039,6 @@ static const char* apzRs6000_ParamPatch[] = {
"rename(const char *_old, const char *_new)",
(char*)NULL };
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description of Sco_Math fix
- */
-tSCC zSco_MathName[] =
- "sco_math";
-
-/*
- * File name selection pattern
- */
-tSCC zSco_MathList[] =
- "math.h\0*/math.h\0";
-/*
- * Machine/OS name selection pattern
- */
-#define apzSco_MathMachs (const char**)NULL
-
-/*
- * content selection pattern - do fix if pattern found
- */
-tSCC zSco_MathSelect0[] =
- "inline double abs";
-
-/*
- * content bypass pattern - skip fix if pattern found
- */
-tSCC zSco_MathBypass0[] =
- "__GNUG__";
-
-#define SCO_MATH_TEST_CT 2
-static tTestDesc aSco_MathTests[] = {
- { TT_NEGREP, zSco_MathBypass0, (regex_t*)NULL },
- { TT_EGREP, zSco_MathSelect0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for Sco_Math
- */
-static const char* apzSco_MathPatch[] = { sed_cmd_z,
- "-e", "/#define.*__fp_class(a) \\\\/i\\\n\
-#ifndef __GNUC__\n",
- "-e", "/.*__builtin_generic/a\\\n\
-#else\\\n\
-#define __fp_class(a) \\\\\\\n\
-\\ __builtin_choose_expr(__builtin_types_compatible_p(typeof(a),long double),\\\\\\\n\
-\\ __fpclassifyl(a), \\\\\\\n\
-\\ __builtin_choose_expr(__builtin_types_compatible_p(typeof(a), float), \\\\\\\n\
-\\ __fpclassifyf(a),__fpclassify(a)))\\\n\
-#endif\n",
- "-e", "/extern \"C++\"/N;/inline double abs/i\\\n\
-#ifndef __GNUC__\n",
- "-e", "/inline long double trunc/N;/inline long double trunc.*}.*extern \"C++\"/a\\\n\
-#endif /* ! __GNUC__ */\n",
- (char*)NULL };
-
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Solaris_Complex fix
@@ -8402,9 +8243,9 @@ static const char* apzX11_SprintfPatch[] = {
*
* List of all fixes
*/
-#define REGEX_COUNT 249
+#define REGEX_COUNT 244
#define MACH_LIST_SIZE_LIMIT 181
-#define FIX_COUNT 206
+#define FIX_COUNT 202
/*
* Enumerate the fixes
@@ -8527,8 +8368,6 @@ typedef enum {
IRIX_STDINT_C99_FIXIDX,
IRIX_STDIO_VA_LIST_FIXIDX,
IRIX_WCSFTIME_FIXIDX,
- ISC_FMOD_FIXIDX,
- ISC_OMITS_WITH_STDC_FIXIDX,
KANDR_CONCAT_FIXIDX,
LINUX_IA64_UCONTEXT_FIXIDX,
LYNXOS_NO_WARNING_IN_SYS_TIME_H_FIXIDX,
@@ -8538,7 +8377,6 @@ typedef enum {
MATH_EXCEPTION_FIXIDX,
MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX,
NESTED_AUTH_DES_FIXIDX,
- NESTED_SYS_LIMITS_FIXIDX,
NETBSD_C99_INLINE_1_FIXIDX,
NETBSD_C99_INLINE_2_FIXIDX,
NETBSD_EXTRA_SEMICOLON_FIXIDX,
@@ -8561,7 +8399,6 @@ typedef enum {
RS6000_DOUBLE_FIXIDX,
RS6000_FCHMOD_FIXIDX,
RS6000_PARAM_FIXIDX,
- SCO_MATH_FIXIDX,
SOLARIS_COMPLEX_FIXIDX,
SOLARIS_MATH_1_FIXIDX,
SOLARIS_MATH_2_FIXIDX,
@@ -9204,16 +9041,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
IRIX_WCSFTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aIrix_WcsftimeTests, apzIrix_WcsftimePatch, 0 },
- { zIsc_FmodName, zIsc_FmodList,
- apzIsc_FmodMachs,
- ISC_FMOD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
- aIsc_FmodTests, apzIsc_FmodPatch, 0 },
-
- { zIsc_Omits_With_StdcName, zIsc_Omits_With_StdcList,
- apzIsc_Omits_With_StdcMachs,
- ISC_OMITS_WITH_STDC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
- aIsc_Omits_With_StdcTests, apzIsc_Omits_With_StdcPatch, 0 },
-
{ zKandr_ConcatName, zKandr_ConcatList,
apzKandr_ConcatMachs,
KANDR_CONCAT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9259,11 +9086,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
NESTED_AUTH_DES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aNested_Auth_DesTests, apzNested_Auth_DesPatch, 0 },
- { zNested_Sys_LimitsName, zNested_Sys_LimitsList,
- apzNested_Sys_LimitsMachs,
- NESTED_SYS_LIMITS_TEST_CT, FD_MACH_ONLY,
- aNested_Sys_LimitsTests, apzNested_Sys_LimitsPatch, 0 },
-
{ zNetbsd_C99_Inline_1Name, zNetbsd_C99_Inline_1List,
apzNetbsd_C99_Inline_1Machs,
NETBSD_C99_INLINE_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9374,11 +9196,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
RS6000_PARAM_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aRs6000_ParamTests, apzRs6000_ParamPatch, 0 },
- { zSco_MathName, zSco_MathList,
- apzSco_MathMachs,
- SCO_MATH_TEST_CT, FD_MACH_ONLY,
- aSco_MathTests, apzSco_MathPatch, 0 },
-
{ zSolaris_ComplexName, zSolaris_ComplexList,
apzSolaris_ComplexMachs,
SOLARIS_COMPLEX_TEST_CT, FD_MACH_ONLY,
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index 0d2602df6f9..72841b31f7a 100644
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -2568,42 +2568,6 @@ fix = {
"const struct tm *);";
};
-/*
- * Fixing ISC fmod declaration
- */
-fix = {
- hackname = isc_fmod;
- files = math.h;
- select = 'fmod\(double\)';
- c_fix = format;
- c_fix_arg = "fmod(double, double)";
- test_text = "extern double fmod(double);";
-};
-
-
-/*
- * On Interactive Unix 2.2, certain traditional Unix definitions
- * (notably getc and putc in stdio.h) are omitted if __STDC__ is
- * defined, not just if _POSIX_SOURCE is defined. This makes it
- * impossible to compile any nontrivial program except with -posix.
- */
-fix = {
- hackname = isc_omits_with_stdc;
-
- files = "stdio.h";
- files = "math.h";
- files = "ctype.h";
- files = "sys/limits.h";
- files = "sys/fcntl.h";
- files = "sys/dirent.h";
-
- select = '!defined\(__STDC__\) && !defined\(_POSIX_SOURCE\)';
- c_fix = format;
- c_fix_arg = '!defined(_POSIX_SOURCE)';
- test_text = "#if !defined(__STDC__) && !defined(_POSIX_SOURCE) /* ? ! */"
- "\nint foo;\n#endif";
-};
-
/*
* These files in Sun OS 4.x and ARM/RISCiX and BSD4.3
@@ -2796,20 +2760,6 @@ fix = {
};
-/*
- * Fixing nested comments in ISC <sys/limits.h>
- */
-fix = {
- hackname = nested_sys_limits;
- files = sys/limits.h;
- select = CHILD_MAX;
- sed = "/CHILD_MAX/s,/\\* Max, Max,";
- sed = "/OPEN_MAX/s,/\\* Max, Max,";
- test_text = "/*\n#define CHILD_MAX 20 /* Max, Max, ... */ /*\n"
- "#define OPEN_MAX 20 /* Max, Max, ... */\n";
-};
-
-
/*
* Some versions of NetBSD don't expect the C99 inline semantics.
*/
@@ -3223,42 +3173,6 @@ fix = {
};
-/*
- * On OpenServer and on UnixWare 7, <math.h> uses the native compiler
- * __builtin_generic. We fix that usage to use the GCC equivalent.
- * It also has a plethora of inline functions that conflict with libstdc++.
- */
-fix = {
- hackname = sco_math;
- files = math.h, '*/math.h';
- select = "inline double abs";
- bypass = "__GNUG__";
- sed = "/#define.*__fp_class(a) \\\\/i\\\n"
- "#ifndef __GNUC__\n";
- sed =
-"/.*__builtin_generic/a\\\n"
-"#else\\\n"
-"#define __fp_class(a) \\\\\\\n"
-"\\ __builtin_choose_expr(__builtin_types_compatible_p(typeof(a),long double),\\\\\\\n"
-"\\ __fpclassifyl(a), \\\\\\\n"
-"\\ __builtin_choose_expr(__builtin_types_compatible_p(typeof(a), float), \\\\\\\n"
-"\\ __fpclassifyf(a),__fpclassify(a)))\\\n"
-"#endif\n";
-
- sed = "/extern \"C++\"/N;"
- "/inline double abs/i\\\n"
- "#ifndef __GNUC__\n";
- sed = "/inline long double trunc/N;"
- "/inline long double trunc.*}.*extern \"C++\"/a\\\n"
- "#endif /* ! __GNUC__ */\n";
-
- test_text =
- "#define __fp_class(a) \\\\\n"
- " __builtin_generic(a,\"ld:__fplcassifyl;f:__fpclassifyf;:__fpclassify\")\n";
-
-};
-
-
/*
* Solaris 10+ complex.h defines _Complex_I and _Imaginary_I in terms of
* themselves, which are Sun Studio compiler intrinsics. Remove _Imaginary_I
diff --git a/fixincludes/tests/base/math.h b/fixincludes/tests/base/math.h
index 88b24d33e34..9733744eafc 100644
--- a/fixincludes/tests/base/math.h
+++ b/fixincludes/tests/base/math.h
@@ -71,11 +71,6 @@ extern "C" int abs(int);
#endif /* HPUX8_BOGUS_INLINES_CHECK */
-#if defined( ISC_FMOD_CHECK )
-extern double fmod(double, double);
-#endif /* ISC_FMOD_CHECK */
-
-
#if defined( MATH_EXCEPTION_CHECK )
typedef struct exception t_math_exception;
#endif /* MATH_EXCEPTION_CHECK */
@@ -94,13 +89,6 @@ extern int class();
#endif /* RS6000_DOUBLE_CHECK */
-#if defined( SCO_MATH_CHECK )
-#define __fp_class(a) \
- __builtin_generic(a,"ld:__fplcassifyl;f:__fpclassifyf;:__fpclassify")
-
-#endif /* SCO_MATH_CHECK */
-
-
#if defined( STRICT_ANSI_NOT_CTD_CHECK )
#if 1 && \
&& defined(mumbling) |& ( !defined(__STRICT_ANSI__)) \
diff --git a/fixincludes/tests/base/stdio.h b/fixincludes/tests/base/stdio.h
index 8c46498af9f..5fda7bd34d1 100644
--- a/fixincludes/tests/base/stdio.h
+++ b/fixincludes/tests/base/stdio.h
@@ -54,13 +54,6 @@ extern int printf( const char *, __gnuc_va_list );
#endif /* IRIX_STDIO_DUMMY_VA_LIST_CHECK */
-#if defined( ISC_OMITS_WITH_STDC_CHECK )
-#if !defined(_POSIX_SOURCE) /* ? ! */
-int foo;
-#endif
-#endif /* ISC_OMITS_WITH_STDC_CHECK */
-
-
#if defined( READ_RET_TYPE_CHECK )
extern unsigned int fread(), fwrite();
extern int fclose(), fflush(), foo();
diff --git a/fixincludes/tests/base/sys/limits.h b/fixincludes/tests/base/sys/limits.h
deleted file mode 100644
index 4a80d3bb298..00000000000
--- a/fixincludes/tests/base/sys/limits.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* DO NOT EDIT THIS FILE.
-
- It has been auto-edited by fixincludes from:
-
- "fixinc/tests/inc/sys/limits.h"
-
- This had to be done to correct non-standard usages in the
- original, manufacturer supplied header file. */
-
-
-
-#if defined( NESTED_SYS_LIMITS_CHECK )
-/*
-#define CHILD_MAX 20 Max, Max, ... */ /*
-#define OPEN_MAX 20 Max, Max, ... */
-
-#endif /* NESTED_SYS_LIMITS_CHECK */