Skip to content

R
riscv-gcc-1
Commit 68f674e9 by Joseph Myers Committed by Joseph Myers
Options

inclhack.def (hpux_maxint, [...]): Remove. 

	* inclhack.def (hpux_maxint, limits_ifndefs, math_huge_val_ifndef,
	svr4__p, undefine_null): Remove.
	* fixincl.x: Regenerate.
	* tests/base/AvailabilityMacros.h, tests/base/com_err.h: New.
	* tests/base/sys/param.h: Remove.
	* tests/base/curses.h, tests/base/math.h, tests/base/testing.h,
	tests/base/sys/limits.h: Update.

From-SVN: r90594
parent ae8cacc6
Showing with 44 additions and 404 deletions
fixincludes/ChangeLog
2004-11-13 Joseph S. Myers <joseph@codesourcery.com>
* inclhack.def (hpux_maxint, limits_ifndefs, math_huge_val_ifndef,
svr4__p, undefine_null): Remove.
* fixincl.x: Regenerate.
* tests/base/AvailabilityMacros.h, tests/base/com_err.h: New.
* tests/base/sys/param.h: Remove.
* tests/base/curses.h, tests/base/math.h, tests/base/testing.h,
tests/base/sys/limits.h: Update.
2004-11-12 Mike Stump <mrs@apple.com>
* Makefile.in (html): Add html generation support.
......
fixincludes/inclhack.def
......@@ -1481,26 +1481,6 @@ fix = {
/*
* HPUX 10.x sys/param.h defines MAXINT which clashes with values.h
*/
fix = {
hackname = hpux_maxint;
files = sys/param.h;
files = values.h;
select = "^#[ \t]*define[ \t]+MAXINT[ \t]";
bypass = "^#[ \t]*ifndef[ \t]+MAXINT";
test =
"-n \"`egrep '#[ \t]*define[ \t]+MAXINT[ \t]' sys/param.h`\"";
c_fix = format;
c_fix_arg = "#ifndef MAXINT\n%0\n#endif";
c_fix_arg = "^#[ \t]*define[ \t]+MAXINT[ \t].*";
test_text = '#define MAXINT 0x7FFFFFFF';
};
/*
* Fix hpux10.20 <sys/time.h> to avoid invalid forward decl
*/
fix = {
......@@ -1863,34 +1843,6 @@ fix = {
};
/*
* In limits.h, put #ifndefs around things that are supposed to be defined
* in float.h to avoid redefinition errors if float.h is included first.
* On HP/UX this patch does not work, because on HP/UX limits.h uses
* multi line comments and the inserted #endif winds up inside the
* comment. Fortunately, HP/UX already uses #ifndefs in limits.h; if
* we find a #ifndef FLT_MIN we assume that all the required #ifndefs
* are there, and we do not add them ourselves.
*
* QNX Software Systems also guards the defines, but doesn't define
* FLT_MIN. Therefore, bypass the fix for *either* guarded FLT_MIN
* or guarded FLT_MAX.
*/
fix = {
hackname = limits_ifndefs;
files = "sys/limits.h";
files = "limits.h";
select = "^[ \t]*#[ \t]*define[ \t]+"
"((FLT|DBL)_(MIN|MAX|DIG))[ \t].*";
bypass = "ifndef[ \t]+FLT_(MIN|MAX)";
c_fix = format;
c_fix_arg = "#ifndef %1\n%0\n#endif";
/* Second arg is select expression */
test_text = " #\tdefine\tDBL_DIG \t 0 /* somthin' */";
};
/* The /usr/include/sys/ucontext.h on ia64-*linux-gnu systems defines
* an _SC_GR0_OFFSET macro using an idiom that isn't a compile time
* constant on recent versions of g++.
......@@ -2060,23 +2012,6 @@ fix = {
/*
* In any case, put #ifndef .. #endif around #define HUGE_VAL in math.h.
*/
fix = {
hackname = math_huge_val_ifndef;
files = math.h;
files = math/math.h;
select = "define[ \t]+HUGE_VAL";
c_fix = format;
c_fix_arg = "#ifndef HUGE_VAL\n%0\n#endif";
c_fix_arg = "^[ \t]*#[ \t]*define[ \t]+HUGE_VAL[ \t].*";
test_text = "# define\tHUGE_VAL 3.4e+40";
};
/*
* nested comment
*/
fix = {
......@@ -3037,23 +2972,6 @@ fix = {
/*
* Solaris math.h and floatingpoint.h define __P without protection,
* which conflicts with the fixproto definition. The fixproto
* definition and the Solaris definition are used the same way.
*/
fix = {
hackname = svr4__p;
files = math.h;
files = floatingpoint.h;
select = "^#define[ \t]+__P.*";
c_fix = format;
c_fix_arg = "#ifndef __P\n%0\n#endif";
test_text = "#define __P(a) a";
};
/*
* Disable apparent native compiler optimization cruft in SVR4.2 <string.h>
* that is visible to any ANSI compiler using this include. Simply
* delete the lines that #define some string functions to internal forms.
......@@ -3908,25 +3826,6 @@ fix = {
/*
* Fix multiple defines for NULL. Sometimes, we stumble into \r\n
* terminated lines, so accommodate these. Test both ways.
* Don't bother to reproduce the \r\n termination, as GCC has to
* recognize \n termination anyway.
*/
fix = {
hackname = undefine_null;
select = "^#[ \t]*define[ \t]+NULL[ \t]";
bypass = "#[ \t]*(ifn|un)def[ \t]+NULL($|[ \t\r])";
c_fix = format;
c_fix_arg = "#ifndef NULL\n#define NULL%1\n#endif\n";
c_fix_arg = "^#[ \t]*define[ \t]+NULL([^\r\n]+)[\r]*\n";
test_text = "#define NULL 0UL\r\n"
"#define NULL\t((void*)0)\n";
};
/*
* On Cray Unicos/Mk some standard headers use the C99 keyword "restrict"
* which must be replaced by __restrict__ for GCC.
*/
......
fixincludes/tests/base/AvailabilityMacros.h 0 → 100644
/* DO NOT EDIT THIS FILE.
It has been auto-edited by fixincludes from:
"fixinc/tests/inc/AvailabilityMacros.h"
This had to be done to correct non-standard usages in the
original, manufacturer supplied header file. */
#if defined( DARWIN_GCC4_BREAKAGE_CHECK )
#if defined(__GNUC__) && ((__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
#endif /* DARWIN_GCC4_BREAKAGE_CHECK */
fixincludes/tests/base/com_err.h 0 → 100644
/* DO NOT EDIT THIS FILE.
It has been auto-edited by fixincludes from:
"fixinc/tests/inc/com_err.h"
This had to be done to correct non-standard usages in the
original, manufacturer supplied header file. */
#if defined( STDIO_DUMMY_VA_LIST_CLIENTS_CHECK )
extern void mumble( __gnuc_va_list);
#endif /* STDIO_DUMMY_VA_LIST_CLIENTS_CHECK */
fixincludes/tests/base/curses.h
......@@ -31,7 +31,5 @@ struct term;
#if defined( VOID_NULL_CHECK )
#ifndef NULL
#define NULL 0 /* typed NULL */
#endif
#endif /* VOID_NULL_CHECK */
fixincludes/tests/base/math.h
......@@ -68,19 +68,10 @@ typedef struct exception t_math_exception;
#if defined( MATH_HUGE_VAL_FROM_DBL_MAX_CHECK )
#ifndef HUGE_VAL
#define HUGE_VAL 3.1415e+9 /* really big */
#endif
#endif /* MATH_HUGE_VAL_FROM_DBL_MAX_CHECK */
#if defined( MATH_HUGE_VAL_IFNDEF_CHECK )
#ifndef HUGE_VAL
# define HUGE_VAL 3.4e+40
#endif
#endif /* MATH_HUGE_VAL_IFNDEF_CHECK */
#if defined( RS6000_DOUBLE_CHECK )
#ifndef __cplusplus
extern int class();
......@@ -105,13 +96,6 @@ int foo;
#endif /* STRICT_ANSI_NOT_CTD_CHECK */
#if defined( SVR4__P_CHECK )
#ifndef __P
#define __P(a) a
#endif
#endif /* SVR4__P_CHECK */
#if defined( ULTRIX_ATOF_PARAM_CHECK )
extern double atof(const char *__nptr);
......
fixincludes/tests/base/sys/limits.h
......@@ -9,13 +9,6 @@
#if defined( LIMITS_IFNDEFS_CHECK )
#ifndef DBL_DIG
# define DBL_DIG 0 /* somthin' */
#endif
#endif /* LIMITS_IFNDEFS_CHECK */
#if defined( NESTED_MOTOROLA_CHECK )
#undef PIPE_BUF /* max # bytes atomic in write to a */
/* PIPE */
......
fixincludes/tests/base/sys/param.h deleted 100644 → 0
/* DO NOT EDIT THIS FILE.
It has been auto-edited by fixincludes from:
"fixinc/tests/inc/sys/param.h"
This had to be done to correct non-standard usages in the
original, manufacturer supplied header file. */
#if defined( HPUX_MAXINT_CHECK )
#ifndef MAXINT
#define MAXINT 0x7FFFFFFF
#endif
#endif /* HPUX_MAXINT_CHECK */
fixincludes/tests/base/testing.h
......@@ -129,17 +129,6 @@ extern size_t
#endif /* SYSV68_STRING_CHECK */
#if defined( UNDEFINE_NULL_CHECK )
#ifndef NULL
#define NULL 0UL
#endif
#ifndef NULL
#define NULL ((void*)0)
#endif
#endif /* UNDEFINE_NULL_CHECK */
#if defined( WINDISS_VALIST_CHECK )
#include <stdarg.h>
#endif /* WINDISS_VALIST_CHECK */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment