diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f5ee6e68c99..92b3da1e4f6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,22 @@ +2002-12-31 Larin Hennessy + + * fixinc/fixinc.svr4: Remove references to i860, Sony NewsOS, and spur. + * fixinc/inclhack.def: Remove tests for Apple A/UX, ARM/RISCiX, DG/UX, + m88k-*-sysv3*, Sony NewsOS. Remove references to i860. + Cleanup handling of replacement text. + * fixinc/mkfixinc.sh: Remove reference to i?86-*-osf1* + +2003-01-04 Bruce Korb + + * fixinc/tests/base/math.h: removed obsolete results + * fixinc/tests/base/stdlib.h: ditto + * fixinc/tests/base/sys/param.h: ditto + * fixinc/tests/base/sys/stat.h: ditto + * fixinc/tests/base/time.h: ditto + * fixinc/tests/base/X11/Intrinsic.h: removed obsolete file + * fixinc/tests/base/sys/byteorder.h: ditto + * fixinc/inclhack.def: Remove superfluous backslashes + 2003-01-04 Kazu Hirata * config/h8300/h8300-protos.h: Add prototypes for diff --git a/gcc/fixinc/fixinc.svr4 b/gcc/fixinc/fixinc.svr4 index 36906f97bee..88972f01a13 100755 --- a/gcc/fixinc/fixinc.svr4 +++ b/gcc/fixinc/fixinc.svr4 @@ -197,8 +197,6 @@ while [ $# != 0 ]; do /#[a-z]*if.*[ (]m68k/ s/\([^_]\)m68k/\1__m68k__/g /#[a-z]*if.*[ (]__i386\([^_]\)/ s/__i386/__i386__/g /#[a-z]*if.*[ (]i386/ s/\([^_]\)i386/\1__i386__/g - /#[a-z]*if.*[ (!]__i860\([^_]\)/ s/__i860/__i860__/g - /#[a-z]*if.*[ (!]i860/ s/\([^_]\)i860/\1__i860__/g /#[a-z]*if.*[ (]sparc/ s/\([^_]\)sparc/\1__sparc__/g /#[a-z]*if.*[ (]mc68000/ s/\([^_]\)mc68000/\1__mc68000__/g /#[a-z]*if.*[ (]vax/ s/\([^_]\)vax/\1__vax__/g @@ -659,8 +657,8 @@ if [ \! -z "$file_to_fix" ]; then cp $file_to_fix /tmp/$base chmod +w /tmp/$base sed -e '/#define[ ]*__i386 /d' -e '/#define[ ]*__sparc /d' \ - -e '/#define[ ]*__i860 /d' -e '/#define[ ]*__m88k /d' \ - -e '/#define[ ]*__mips /d' -e '/#define[ ]*__m68k /d' \ + -e '/#define[ ]*__m88k /d' -e '/#define[ ]*__mips /d' \ + -e '/#define[ ]*__m68k /d' \ /tmp/$base > /tmp/$base.sed if cmp $file_to_fix /tmp/$base.sed >/dev/null 2>&1; then \ true @@ -1274,79 +1272,6 @@ s/;$/)/ rm -f /tmp/$base /tmp/$base.sed fi -# Sony NEWSOS 5.0 does not support the complete ANSI C standard. - -if [ -x /bin/sony ]; then - if /bin/sony; then - - # Change to not define __filbuf, __flsbuf, and __iob - - file=stdio.h - base=`basename $file`.$$ - if [ -r ${LIB}/$file ]; then - file_to_fix=${LIB}/$file - else - if [ -r ${INPUT}/$file ]; then - file_to_fix=${INPUT}/$file - else - file_to_fix="" - fi - fi - if [ \! -z "$file_to_fix" ]; then - echo Checking $file_to_fix - cp $file_to_fix /tmp/$base - chmod +w /tmp/$base - sed -e ' - s/__filbuf/_filbuf/g - s/__flsbuf/_flsbuf/g - s/__iob/_iob/g - ' /tmp/$base > /tmp/$base.sed - mv /tmp/$base.sed /tmp/$base - if cmp $file_to_fix /tmp/$base.sed >/dev/null 2>&1; then - true - else - echo Fixed $file_to_fix - rm -f ${LIB}/$file - cp /tmp/$base ${LIB}/$file - chmod a+r ${LIB}/$file - fi - rm -f /tmp/$base - fi - - # Change to not define __ctype - - file=ctype.h - base=`basename $file`.$$ - if [ -r ${LIB}/$file ]; then - file_to_fix=${LIB}/$file - else - if [ -r ${INPUT}/$file ]; then - file_to_fix=${INPUT}/$file - else - file_to_fix="" - fi - fi - if [ \! -z "$file_to_fix" ]; then - echo Checking $file_to_fix - cp $file_to_fix /tmp/$base - chmod +w /tmp/$base - sed -e ' - s/__ctype/_ctype/g - ' /tmp/$base > /tmp/$base.sed - mv /tmp/$base.sed /tmp/$base - if cmp $file_to_fix /tmp/$base.sed >/dev/null 2>&1; then - true - else - echo Fixed $file_to_fix - rm -f ${LIB}/$file - cp /tmp/$base ${LIB}/$file - chmod a+r ${LIB}/$file - fi - rm -f /tmp/$base - fi - fi -fi - # 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. # Solaris 2.1 has this problem. @@ -1701,9 +1626,7 @@ htons (unsigned int __arg) return __result; } -#elif ((defined (__i860__) && !defined (__i860_big_endian__)) \ - || defined (__ns32k__) || defined (__vax__) \ - || defined (__spur__) || defined (__arm__)) +#elif (defined (__ns32k__) || defined (__vax__) || defined (__arm__)) #ifndef __BYTE_ORDER__ #define __BYTE_ORDER__ __LITTLE_ENDIAN__ diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index 1340b562403..b2bd70d594c 100644 --- a/gcc/fixinc/fixincl.x +++ b/gcc/fixinc/fixincl.x @@ -5,7 +5,7 @@ * files which are fixed to work correctly with ANSI C and placed in a * directory that GNU C will search. * - * This file contains 148 fixup descriptions. + * This file contains 138 fixup descriptions. * * See README for more information. * @@ -30,77 +30,6 @@ * Boston, MA 02111-1307, USA. */ -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Aab_Dgux_Int_Varargs fix - */ -tSCC zAab_Dgux_Int_VarargsName[] = - "AAB_dgux_int_varargs"; - -/* - * File name selection pattern - */ -tSCC zAab_Dgux_Int_VarargsList[] = - "|_int_varargs.h|"; -/* - * Machine/OS name selection pattern - */ -#define apzAab_Dgux_Int_VarargsMachs (const char**)NULL -#define AAB_DGUX_INT_VARARGS_TEST_CT 0 -#define aAab_Dgux_Int_VarargsTests (tTestDesc*)NULL - -/* - * Fix Command Arguments for Aab_Dgux_Int_Varargs - */ -static const char* apzAab_Dgux_Int_VarargsPatch[] = { -"#ifndef __INT_VARARGS_H\n\ -#define __INT_VARARGS_H\n\n\ -/********************************************************/\n\ -/* Define the common stuff for varargs/stdarg/stdio. */\n\ -/********************************************************/\n\n\ -/*\n\ -** This file is a DG internal header. Never include this\n\ -** file directly.\n\ -*/\n\n\ -#ifndef ___int_features_h\n\ -#include \n\ -#endif\n\n\ -#if !(defined(_VA_LIST) || defined(_VA_LIST_))\n\ -#define _VA_LIST\n\ -#define _VA_LIST_\n\n\ -#ifdef __LINT__\n\n\ -#ifdef __STDC__\n\ -typedef void * va_list;\n\ -#else\n\ -typedef char * va_list;\n\ -#endif\n\n\ -#else\n\ -#if _M88K_ANY\n\n\ -#if defined(__DCC__)\n\n\ -typedef struct {\n\ - int next_arg;\n\ - int *mem_ptr;\n\ - int *reg_ptr;\n\ -} va_list;\n\n\ -#else /* ! defined(__DCC__) */\n\n\ -typedef struct {\n\ - int __va_arg; /* argument number */\n\ - int *__va_stk; /* start of args passed on stack */\n\ - int *__va_reg; /* start of args passed in regs */\n\ -} va_list;\n\n\ -#endif /* ! defined(__DCC__) */\n\n\ -#elif _IX86_ANY\n\n\ -#if defined(__GNUC__) || defined(__STDC__)\n\ -typedef void * va_list;\n\ -#else\n\ -typedef char * va_list;\n\ -#endif\n\n\ -#endif /* _IX86_ANY */\n\n\ -#endif /* __LINT__ */\n\ -#endif /* !(defined(_VA_LIST) || defined(_VA_LIST_)) */\n\ -#endif /* #ifndef __INT_VARARGS_H */", - (char*)NULL }; - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * Description of Aab_Fd_Zero_Asm_Posix_Types_H fix @@ -182,20 +111,20 @@ static const char* apzAab_Fd_Zero_Gnu_Types_HPatch[] = { "/* This file fixes a bug in the __FD_ZERO macro present in glibc 1.x. */\n\ #ifndef _TYPES_H_WRAPPER\n\ #include \n\ - #include_next \n\n\ +#include_next \n\n\ #if defined(__FD_ZERO) && !defined(__GLIBC__)\n\ #undef __FD_ZERO\n\ -# define __FD_ZERO(fdsetp) \\\n\ - do { \\\n\ - int __d0, __d1; \\\n\ -\t__asm__ __volatile__(\"cld ; rep ; stosl\" \\\n\ - \t: \"=&c\" (__d0), \"=&D\" (__d1) \\\n\ - \t: \"a\" (0), \"0\" (__FDSET_LONGS), \\\n\ -\t\t \"1\" ((__fd_set *) (fdsetp)) :\"memory\"); \\\n\ +# define __FD_ZERO(fdsetp) \\\\\n\ + do { \\\\\n\ + int __d0, __d1; \\\\\n\ +__asm__ __volatile__(\"cld ; rep ; stosl\" \\\\\n\ + \t: \"=&c\" (__d0), \"=&D\" (__d1) \\\\\n\ + \t: \"a\" (0), \"0\" (__FDSET_LONGS), \\\\\n\ + \"1\" ((__fd_set *) (fdsetp)) :\"memory\"); \\\\\n\ } while (0)\n\ #endif\n\n\ #define _TYPES_H_WRAPPER\n\ -#endif /* _TYPES_H_WRAPPER */\n", +#endif /* _TYPES_H_WRAPPER */", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -225,25 +154,25 @@ tSCC* apzAab_Fd_Zero_Selectbits_HMachs[] = { static const char* apzAab_Fd_Zero_Selectbits_HPatch[] = { "/* This file fixes a bug in the __FD_ZERO macro present in glibc 2.0.x. */\n\ #ifndef _SELECTBITS_H_WRAPPER\n\ -#include \n\ - #include_next \n\n\ -#if defined(__FD_ZERO) && defined(__GLIBC__) \\\n\ -\t&& defined(__GLIBC_MINOR__) && __GLIBC__ == 2 \\\n\ -\t&& __GLIBC_MINOR__ == 0\n\ -#undef __FD_ZERO\n\ -#define __FD_ZERO(fdsetp) \\\n\ - do { \\\n\ - int __d0, __d1; \\\n\ - __asm__ __volatile__ (\"cld; rep; stosl\" \\\n\ - : \"=&c\" (__d0), \"=&D\" (__d1) \\\n\ - : \"a\" (0), \"0\" (sizeof (__fd_set) \\\n\ - / sizeof (__fd_mask)), \\\n\ - \"1\" ((__fd_mask *) (fdsetp)) \\\n\ - : \"memory\"); \\\n\ - } while (0)\n\ -#endif\n\n\ -#define _SELECTBITS_H_WRAPPER\n\ -#endif /* _SELECTBITS_H_WRAPPER */\n", + #include \n\ + #include_next \n\n\ + #if defined(__FD_ZERO) && defined(__GLIBC__) \\\\\n\ + && defined(__GLIBC_MINOR__) && __GLIBC__ == 2 \\\\\n\ + && __GLIBC_MINOR__ == 0\n\ + #undef __FD_ZERO\n\ + #define __FD_ZERO(fdsetp) \\\\\n\ + do { \\\\\n\ + int __d0, __d1; \\\\\n\ + __asm__ __volatile__ (\"cld; rep; stosl\" \\\\\n\ + : \"=&c\" (__d0), \"=&D\" (__d1) \\\\\n\ + : \"a\" (0), \"0\" (sizeof (__fd_set) \\\\\n\ + / sizeof (__fd_mask)), \\\\\n\ + \"1\" ((__fd_mask *) (fdsetp)) \\\\\n\ + : \"memory\"); \\\\\n\ + } while (0)\n\ + #endif\n\n\ + #define _SELECTBITS_H_WRAPPER\n\ +#endif /* _SELECTBITS_H_WRAPPER */", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -272,10 +201,10 @@ tSCC* apzAab_Solaris_Sys_Varargs_HMachs[] = { */ static const char* apzAab_Solaris_Sys_Varargs_HPatch[] = { "#ifdef __STDC__\n\ -#include \n\ + #include \n\ #else\n\ -#include \n\ -#endif\n", + #include \n\ +#endif", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -311,145 +240,151 @@ static tTestDesc aAab_Sun_MemcpyTests[] = { static const char* apzAab_Sun_MemcpyPatch[] = { "/* This file was generated by fixincludes */\n\ #ifndef __memory_h__\n\ -#define __memory_h__\n\n\ -#ifdef __STDC__\n\ -extern void *memccpy();\n\ -extern void *memchr();\n\ -extern void *memcpy();\n\ -extern void *memset();\n\ -#else\n\ -extern char *memccpy();\n\ -extern char *memchr();\n\ -extern char *memcpy();\n\ -extern char *memset();\n\ -#endif /* __STDC__ */\n\n\ -extern int memcmp();\n\n\ -#endif /* __memory_h__ */\n", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Aab_Svr4_Replace_Byteorder fix - */ -tSCC zAab_Svr4_Replace_ByteorderName[] = - "AAB_svr4_replace_byteorder"; - -/* - * File name selection pattern - */ -tSCC zAab_Svr4_Replace_ByteorderList[] = - "|sys/byteorder.h|"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzAab_Svr4_Replace_ByteorderMachs[] = { - "*-*-sysv4*", - "i[34567]86-*-sysv5*", - "i[34567]86-*-udk*", - "i[34567]86-*-solaris2.[0-4]", - "powerpcle-*-solaris2.[0-4]", - "sparc-*-solaris2.[0-4]", - (const char*)NULL }; -#define AAB_SVR4_REPLACE_BYTEORDER_TEST_CT 0 -#define aAab_Svr4_Replace_ByteorderTests (tTestDesc*)NULL - -/* - * Fix Command Arguments for Aab_Svr4_Replace_Byteorder - */ -static const char* apzAab_Svr4_Replace_ByteorderPatch[] = { -"#ifndef _SYS_BYTEORDER_H\n\ + #define __memory_h__\n\n\ + #ifdef __STDC__\n\ + extern void *memccpy();\n\ + extern void *memchr();\n\ + extern void *memcpy();\n\ + extern void *memset();\n\ + #else\n\ + extern char *memccpy();\n\ + extern char *memchr();\n\ + extern char *memcpy();\n\ + extern char *memset();\n\ + #endif /* __STDC__ */\n\n\ + extern int memcmp();\n\n\ +#endif /* __memory_h__ */\n\ +_EndOfHeader;\n\ +};\n\n\n\ +/*\n\ + * Completely replace with a file that includes gcc's\n\ + * stdarg.h or varargs.h files as appropriate.\n\ + */\n\ +#ifdef SVR4\n\ +fix = {\n\ + hackname = AAB_svr4_no_varargs;\n\ + files = sys/varargs.h;\n\ + replace = \"/* This file was generated by fixincludes. */\\n\"\n\ + \"#ifndef _SYS_VARARGS_H\\n\"\n\ + \"#define _SYS_VARARGS_H\\n\\n\"\n\ + \n\ + \"#ifdef __STDC__\\n\"\n\ + \"#include \\n\"\n\ + \"#else\\n\"\n\ + \"#include \\n\"\n\ + \"#endif\\n\\n\"\n\ + \n\ + \"#endif /* _SYS_VARARGS_H */\\n\";\n\ +};\n\ +#endif\n\n\n\ +/*\n\ + * Completely replace ; with a file that implements gcc's\n\ + * optimized byteswapping. Restricted to \"SVR4\" machines until either\n\ + * it is shown to be safe to replace this file always, or we get bolder ;-)\n\ + */\n\ +fix = {\n\ + hackname = AAB_svr4_replace_byteorder;\n\ +#ifndef SVR5\n\ + mach = \"*-*-sysv4*\";\n\ + mach = \"i[34567]86-*-sysv5*\";\n\ + mach = \"i[34567]86-*-udk*\";\n\ + mach = \"i[34567]86-*-solaris2.[0-4]\";\n\ + mach = \"powerpcle-*-solaris2.[0-4]\";\n\ + mach = \"sparc-*-solaris2.[0-4]\";\n\ +#endif /* SVR5 */\n\ + files = sys/byteorder.h;\n\ + replace = <<- _EndOfHeader_\n\ +#ifndef _SYS_BYTEORDER_H\n\ #define _SYS_BYTEORDER_H\n\n\ -/* Functions to convert `short' and `long' quantities from host byte order\n\ +/* Functions to convert `short\\' and `long\\' quantities from host byte order\n\ to (internet) network byte order (i.e. big-endian).\n\n\ Written by Ron Guilmette (rfg@ncd.com).\n\n\ - This isn't actually used by GCC. It is installed by fixinc.svr4.\n\n\ + This isn\\'t actually used by GCC. It is installed by fixinc.svr4.\n\n\ For big-endian machines these functions are essentially no-ops.\n\n\ For little-endian machines, we define the functions using specialized\n\ asm sequences in cases where doing so yields better code (e.g. i386). */\n\n\ #if !defined (__GNUC__) && !defined (__GNUG__)\n\ -#error You lose! This file is only useful with GNU compilers.\n\ + #error You lose! This file is only useful with GNU compilers.\n\ #endif\n\n\ #ifndef __BYTE_ORDER__\n\ -/* Byte order defines. These are as defined on UnixWare 1.1, but with\n\ - double underscores added at the front and back. */\n\ -#define __LITTLE_ENDIAN__ 1234\n\ -#define __BIG_ENDIAN__ 4321\n\ -#define __PDP_ENDIAN__ 3412\n\ + /* Byte order defines. These are as defined on UnixWare 1.1, but with\n\ + double underscores added at the front and back. */\n\ + #define __LITTLE_ENDIAN__ 1234\n\ + #define __BIG_ENDIAN__ 4321\n\ + #define __PDP_ENDIAN__ 3412\n\ #endif\n\n\ #ifdef __STDC__\n\ -static __inline__ unsigned long htonl (unsigned long);\n\ -static __inline__ unsigned short htons (unsigned int);\n\ -static __inline__ unsigned long ntohl (unsigned long);\n\ -static __inline__ unsigned short ntohs (unsigned int);\n\ + static __inline__ unsigned long htonl (unsigned long);\n\ + static __inline__ unsigned short htons (unsigned int);\n\ + static __inline__ unsigned long ntohl (unsigned long);\n\ + static __inline__ unsigned short ntohs (unsigned int);\n\ #endif /* defined (__STDC__) */\n\n\ #if defined (__i386__)\n\n\ -#ifndef __BYTE_ORDER__\n\ -#define __BYTE_ORDER__ __LITTLE_ENDIAN__\n\ -#endif\n\n\ -/* Convert a host long to a network long. */\n\n\ -/* We must use a new-style function definition, so that this will also\n\ - be valid for C++. */\n\ -static __inline__ unsigned long\n\ -htonl (unsigned long __arg)\n\ -{\n\ - register unsigned long __result;\n\n\ - __asm__ (\"xchg%B0 %b0,%h0\n\ -\tror%L0 $16,%0\n\ -\txchg%B0 %b0,%h0\" : \"=q\" (__result) : \"0\" (__arg));\n\ - return __result;\n\ -}\n\n\ -/* Convert a host short to a network short. */\n\n\ -static __inline__ unsigned short\n\ -htons (unsigned int __arg)\n\ -{\n\ - register unsigned short __result;\n\n\ - __asm__ (\"xchg%B0 %b0,%h0\" : \"=q\" (__result) : \"0\" (__arg));\n\ - return __result;\n\ -}\n\n\ -#elif ((defined (__i860__) && !defined (__i860_big_endian__))\t\\\n\ - || defined (__ns32k__) || defined (__vax__)\t\t\\\n\ - || defined (__spur__) || defined (__arm__))\n\n\ -#ifndef __BYTE_ORDER__\n\ -#define __BYTE_ORDER__ __LITTLE_ENDIAN__\n\ -#endif\n\n\ -/* For other little-endian machines, using C code is just as efficient as\n\ - using assembly code. */\n\n\ -/* Convert a host long to a network long. */\n\n\ -static __inline__ unsigned long\n\ -htonl (unsigned long __arg)\n\ -{\n\ - register unsigned long __result;\n\n\ - __result = (__arg >> 24) & 0x000000ff;\n\ - __result |= (__arg >> 8) & 0x0000ff00;\n\ - __result |= (__arg << 8) & 0x00ff0000;\n\ - __result |= (__arg << 24) & 0xff000000;\n\ - return __result;\n\ -}\n\n\ -/* Convert a host short to a network short. */\n\n\ -static __inline__ unsigned short\n\ -htons (unsigned int __arg)\n\ -{\n\ - register unsigned short __result;\n\n\ - __result = (__arg << 8) & 0xff00;\n\ - __result |= (__arg >> 8) & 0x00ff;\n\ - return __result;\n\ -}\n\n\ + #ifndef __BYTE_ORDER__\n\ + #define __BYTE_ORDER__ __LITTLE_ENDIAN__\n\ + #endif\n\n\ + /* Convert a host long to a network long. */\n\n\ + /* We must use a new-style function definition, so that this will also\n\ + be valid for C++. */\n\ + static __inline__ unsigned long\n\ + htonl (unsigned long __arg)\n\ + {\n\ + register unsigned long __result;\n\n\ + __asm__ (\"xchg%B0 %b0,%h0\n\ + ror%L0 $16,%0\n\ + xchg%B0 %b0,%h0\" : \"=q\" (__result) : \"0\" (__arg));\n\ + return __result;\n\ + }\n\n\ + /* Convert a host short to a network short. */\n\n\ + static __inline__ unsigned short\n\ + htons (unsigned int __arg)\n\ + {\n\ + register unsigned short __result;\n\n\ + __asm__ (\"xchg%B0 %b0,%h0\" : \"=q\" (__result) : \"0\" (__arg));\n\ + return __result;\n\ + }\n\n\ +#elif (defined (__ns32k__) || defined (__vax__) || defined (__arm__))\n\n\ + #ifndef __BYTE_ORDER__\n\ + #define __BYTE_ORDER__ __LITTLE_ENDIAN__\n\ + #endif\n\n\ + /* For other little-endian machines, using C code is just as efficient as\n\ + using assembly code. */\n\n\ + /* Convert a host long to a network long. */\n\n\ + static __inline__ unsigned long\n\ + htonl (unsigned long __arg)\n\ + {\n\ + register unsigned long __result;\n\n\ + __result = (__arg >> 24) & 0x000000ff;\n\ + __result |= (__arg >> 8) & 0x0000ff00;\n\ + __result |= (__arg << 8) & 0x00ff0000;\n\ + __result |= (__arg << 24) & 0xff000000;\n\ + return __result;\n\ + }\n\n\ + /* Convert a host short to a network short. */\n\n\ + static __inline__ unsigned short\n\ + htons (unsigned int __arg)\n\ + {\n\ + register unsigned short __result;\n\n\ + __result = (__arg << 8) & 0xff00;\n\ + __result |= (__arg >> 8) & 0x00ff;\n\ + return __result;\n\ + }\n\n\ #else /* must be a big-endian machine */\n\n\ -#ifndef __BYTE_ORDER__\n\ -#define __BYTE_ORDER__ __BIG_ENDIAN__\n\ -#endif\n\n\ -/* Convert a host long to a network long. */\n\n\ -static __inline__ unsigned long\n\ -htonl (unsigned long __arg)\n\ -{\n\ - return __arg;\n\ -}\n\n\ -/* Convert a host short to a network short. */\n\n\ -static __inline__ unsigned short\n\ -htons (unsigned int __arg)\n\ -{\n\ - return __arg;\n\ -}\n\n\ + #ifndef __BYTE_ORDER__\n\ + #define __BYTE_ORDER__ __BIG_ENDIAN__\n\ + #endif\n\n\ + /* Convert a host long to a network long. */\n\n\ + static __inline__ unsigned long\n\ + htonl (unsigned long __arg)\n\ + {\n\ + return __arg;\n\ + }\n\n\ + /* Convert a host short to a network short. */\n\n\ + static __inline__ unsigned short\n\ + htons (unsigned int __arg)\n\ + {\n\ + return __arg;\n\ + }\n\n\ #endif /* big-endian */\n\n\ /* Convert a network long to a host long. */\n\n\ static __inline__ unsigned long\n\ @@ -463,7 +398,7 @@ ntohs (unsigned int __arg)\n\ {\n\ return htons (__arg);\n\ }\n\ -#endif\n", +#endif", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -526,9 +461,9 @@ tSCC* apzAab_Ultrix_LimitsMachs[] = { */ static const char* apzAab_Ultrix_LimitsPatch[] = { "#ifndef _LIMITS_INCLUDED\n\ -#define _LIMITS_INCLUDED\n\ -#include \n\ -#endif /* _LIMITS_INCLUDED */\n", + #define _LIMITS_INCLUDED\n\ + #include \n\ +#endif /* _LIMITS_INCLUDED */", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -557,9 +492,9 @@ tSCC* apzAab_Ultrix_MemoryMachs[] = { */ static const char* apzAab_Ultrix_MemoryPatch[] = { "#ifndef _MEMORY_INCLUDED\n\ -#define _MEMORY_INCLUDED\n\ -#include \n\ -#endif /* _MEMORY_INCLUDED */\n", + #define _MEMORY_INCLUDED\n\ + #include \n\ +#endif /* _MEMORY_INCLUDED */", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -588,9 +523,9 @@ tSCC* apzAab_Ultrix_StringMachs[] = { */ static const char* apzAab_Ultrix_StringPatch[] = { "#ifndef _STRING_INCLUDED\n\ -#define _STRING_INCLUDED\n\ -#include \n\ -#endif /* _STRING_INCLUDED */\n", + #define _STRING_INCLUDED\n\ + #include \n\ +#endif /* _STRING_INCLUDED */", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -914,112 +849,6 @@ static const char* apzAlpha_SbrkPatch[] = { "void *sbrk(", (char*)NULL }; -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Arm_Norcroft_Hint fix - */ -tSCC zArm_Norcroft_HintName[] = - "arm_norcroft_hint"; - -/* - * File name selection pattern - */ -tSCC zArm_Norcroft_HintList[] = - "|X11/Intrinsic.h|"; -/* - * Machine/OS name selection pattern - */ -#define apzArm_Norcroft_HintMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zArm_Norcroft_HintSelect0[] = - "___type p_type"; - -#define ARM_NORCROFT_HINT_TEST_CT 1 -static tTestDesc aArm_Norcroft_HintTests[] = { - { TT_EGREP, zArm_Norcroft_HintSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Arm_Norcroft_Hint - */ -static const char* apzArm_Norcroft_HintPatch[] = { - "format", - "p_type", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Arm_Wchar fix - */ -tSCC zArm_WcharName[] = - "arm_wchar"; - -/* - * File name selection pattern - */ -tSCC zArm_WcharList[] = - "|stdlib.h|"; -/* - * Machine/OS name selection pattern - */ -#define apzArm_WcharMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zArm_WcharSelect0[] = - "#[ \t]*define[ \t]*__wchar_t"; - -#define ARM_WCHAR_TEST_CT 1 -static tTestDesc aArm_WcharTests[] = { - { TT_EGREP, zArm_WcharSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Arm_Wchar - */ -static const char* apzArm_WcharPatch[] = { - "format", - "%1_GCC_WCHAR_T", - "(#[ \t]*(ifndef|define)[ \t]+)__wchar_t", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Aux_Asm fix - */ -tSCC zAux_AsmName[] = - "aux_asm"; - -/* - * File name selection pattern - */ -tSCC zAux_AsmList[] = - "|sys/param.h|"; -/* - * Machine/OS name selection pattern - */ -#define apzAux_AsmMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zAux_AsmSelect0[] = - "#ifndef NOINLINE"; - -#define AUX_ASM_TEST_CT 1 -static tTestDesc aAux_AsmTests[] = { - { TT_EGREP, zAux_AsmSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Aux_Asm - */ -static const char* apzAux_AsmPatch[] = { - "format", - "#if !defined(NOINLINE) && !defined(__GNUC__)", - (char*)NULL }; - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * Description of Avoid_Bool_Define fix @@ -1593,43 +1422,6 @@ static const char* apzEcd_CursorPatch[] = { "ecd_cursor", (char*)NULL }; -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Fix_Header_Breakage fix - */ -tSCC zFix_Header_BreakageName[] = - "fix_header_breakage"; - -/* - * File name selection pattern - */ -tSCC zFix_Header_BreakageList[] = - "|math.h|"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzFix_Header_BreakageMachs[] = { - "m88k-motorola-sysv3*", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zFix_Header_BreakageSelect0[] = - "extern double floor\\(\\), ceil\\(\\), fmod\\(\\), fabs\\(\\);"; - -#define FIX_HEADER_BREAKAGE_TEST_CT 1 -static tTestDesc aFix_Header_BreakageTests[] = { - { TT_EGREP, zFix_Header_BreakageSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Fix_Header_Breakage - */ -static const char* apzFix_Header_BreakagePatch[] = { - "format", - "extern double floor(), ceil(), fmod(), fabs _PARAMS((double));", - (char*)NULL }; - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * Description of Freebsd_Gcc3_Breakage fix @@ -2719,128 +2511,6 @@ static const char* apzLynxos_Fcntl_ProtoPatch[] = { "(fcntl[ \t]*\\(int, int, )int\\)", (char*)NULL }; -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of M88k_Bad_Hypot_Opt fix - */ -tSCC zM88k_Bad_Hypot_OptName[] = - "m88k_bad_hypot_opt"; - -/* - * File name selection pattern - */ -tSCC zM88k_Bad_Hypot_OptList[] = - "|math.h|"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzM88k_Bad_Hypot_OptMachs[] = { - "m88k-motorola-sysv3*", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zM88k_Bad_Hypot_OptSelect0[] = - "^extern double hypot\\(\\);\n"; - -#define M88K_BAD_HYPOT_OPT_TEST_CT 1 -static tTestDesc aM88k_Bad_Hypot_OptTests[] = { - { TT_EGREP, zM88k_Bad_Hypot_OptSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for M88k_Bad_Hypot_Opt - */ -static const char* apzM88k_Bad_Hypot_OptPatch[] = { - "format", - "%0/* Workaround a stupid Motorola optimization if one\n\ - of x or y is 0.0 and the other is negative! */\n\ -#ifdef __STDC__\n\ -static __inline__ double fake_hypot (double x, double y)\n\ -#else\n\ -static __inline__ double fake_hypot (x, y)\n\ -\tdouble x, y;\n\ -#endif\n\ -{\n\ -\treturn fabs (hypot (x, y));\n\ -}\n\ -#define hypot\tfake_hypot\n", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of M88k_Bad_S_If fix - */ -tSCC zM88k_Bad_S_IfName[] = - "m88k_bad_s_if"; - -/* - * File name selection pattern - */ -tSCC zM88k_Bad_S_IfList[] = - "|sys/stat.h|"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzM88k_Bad_S_IfMachs[] = { - "m88k-*-sysv3*", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zM88k_Bad_S_IfSelect0[] = - "#define[ \t]+S_IS[A-Z]+\\(m\\)[ \t]+\\(m[ \t]*&"; - -#define M88K_BAD_S_IF_TEST_CT 1 -static tTestDesc aM88k_Bad_S_IfTests[] = { - { TT_EGREP, zM88k_Bad_S_IfSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for M88k_Bad_S_If - */ -static const char* apzM88k_Bad_S_IfPatch[] = { - "format", - "#define %1(m) (((m) & S_IFMT) == %2)", - "#define[ \t]+(S_IS[A-Z]+)\\(m\\)[ \t]+\\(m[ \t]*&[ \t]*(S_IF[A-Z][A-Z][A-Z]+|0[0-9]+)[ \t]*\\)", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of M88k_Multi_Incl fix - */ -tSCC zM88k_Multi_InclName[] = - "m88k_multi_incl"; - -/* - * File name selection pattern - */ -tSCC zM88k_Multi_InclList[] = - "|time.h|"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzM88k_Multi_InclMachs[] = { - "m88k-tektronix-sysv3*", - (const char*)NULL }; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zM88k_Multi_InclBypass0[] = - "#ifndef"; - -#define M88K_MULTI_INCL_TEST_CT 1 -static tTestDesc aM88k_Multi_InclTests[] = { - { TT_NEGREP, zM88k_Multi_InclBypass0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for M88k_Multi_Incl - */ -static const char* apzM88k_Multi_InclPatch[] = { - "wrap", - (char*)NULL }; - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * Description of Machine_Ansi_H_Va_List fix @@ -3152,43 +2822,6 @@ static const char* apzNested_Sys_LimitsPatch[] = { "sed", "-e", "/OPEN_MAX/s,/\\* Max, Max,", (char*)NULL }; -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of News_Os_Recursion fix - */ -tSCC zNews_Os_RecursionName[] = - "news_os_recursion"; - -/* - * File name selection pattern - */ -tSCC zNews_Os_RecursionList[] = - "|stdlib.h|"; -/* - * Machine/OS name selection pattern - */ -#define apzNews_Os_RecursionMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zNews_Os_RecursionSelect0[] = - "[ \t]*#include .*"; - -#define NEWS_OS_RECURSION_TEST_CT 1 -static tTestDesc aNews_Os_RecursionTests[] = { - { TT_EGREP, zNews_Os_RecursionSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for News_Os_Recursion - */ -static const char* apzNews_Os_RecursionPatch[] = { - "format", - "#ifdef BOGUS_RECURSION\n\ -%0\n\ -#endif", - (char*)NULL }; - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * Description of Next_Math_Prefix fix @@ -5782,21 +5415,19 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 155 -#define MACH_LIST_SIZE_LIMIT 279 -#define FIX_COUNT 148 +#define REGEX_COUNT 147 +#define MACH_LIST_SIZE_LIMIT 261 +#define FIX_COUNT 138 /* * Enumerate the fixes */ typedef enum { - AAB_DGUX_INT_VARARGS_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_SVR4_REPLACE_BYTEORDER_FIXIDX, AAB_ULTRIX_ANSI_COMPAT_FIXIDX, AAB_ULTRIX_LIMITS_FIXIDX, AAB_ULTRIX_MEMORY_FIXIDX, @@ -5810,9 +5441,6 @@ typedef enum { ALPHA_GETOPT_FIXIDX, ALPHA_PARENS_FIXIDX, ALPHA_SBRK_FIXIDX, - ARM_NORCROFT_HINT_FIXIDX, - ARM_WCHAR_FIXIDX, - AUX_ASM_FIXIDX, AVOID_BOOL_DEFINE_FIXIDX, AVOID_BOOL_TYPE_FIXIDX, AVOID_WCHAR_T_TYPE_FIXIDX, @@ -5828,7 +5456,6 @@ typedef enum { DEC_INTERN_ASM_FIXIDX, DJGPP_WCHAR_H_FIXIDX, ECD_CURSOR_FIXIDX, - FIX_HEADER_BREAKAGE_FIXIDX, FREEBSD_GCC3_BREAKAGE_FIXIDX, GNU_TYPES_FIXIDX, HP_INLINE_FIXIDX, @@ -5858,9 +5485,6 @@ typedef enum { LIMITS_IFNDEFS_FIXIDX, LYNX_VOID_INT_FIXIDX, LYNXOS_FCNTL_PROTO_FIXIDX, - M88K_BAD_HYPOT_OPT_FIXIDX, - M88K_BAD_S_IF_FIXIDX, - M88K_MULTI_INCL_FIXIDX, MACHINE_ANSI_H_VA_LIST_FIXIDX, MACHINE_NAME_FIXIDX, MATH_EXCEPTION_FIXIDX, @@ -5869,7 +5493,6 @@ typedef enum { NESTED_AUTH_DES_FIXIDX, NESTED_MOTOROLA_FIXIDX, NESTED_SYS_LIMITS_FIXIDX, - NEWS_OS_RECURSION_FIXIDX, NEXT_MATH_PREFIX_FIXIDX, NEXT_TEMPLATE_FIXIDX, NEXT_VOLITILE_FIXIDX, @@ -5941,11 +5564,6 @@ typedef enum { } t_fixinc_idx; tFixDesc fixDescList[ FIX_COUNT ] = { - { zAab_Dgux_Int_VarargsName, zAab_Dgux_Int_VarargsList, - apzAab_Dgux_Int_VarargsMachs, - AAB_DGUX_INT_VARARGS_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, - aAab_Dgux_Int_VarargsTests, apzAab_Dgux_Int_VarargsPatch, 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, @@ -5971,11 +5589,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = { AAB_SUN_MEMCPY_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, aAab_Sun_MemcpyTests, apzAab_Sun_MemcpyPatch, 0 }, - { zAab_Svr4_Replace_ByteorderName, zAab_Svr4_Replace_ByteorderList, - apzAab_Svr4_Replace_ByteorderMachs, - AAB_SVR4_REPLACE_BYTEORDER_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, - aAab_Svr4_Replace_ByteorderTests, apzAab_Svr4_Replace_ByteorderPatch, 0 }, - { zAab_Ultrix_Ansi_CompatName, zAab_Ultrix_Ansi_CompatList, apzAab_Ultrix_Ansi_CompatMachs, AAB_ULTRIX_ANSI_COMPAT_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, @@ -6041,21 +5654,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = { ALPHA_SBRK_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aAlpha_SbrkTests, apzAlpha_SbrkPatch, 0 }, - { zArm_Norcroft_HintName, zArm_Norcroft_HintList, - apzArm_Norcroft_HintMachs, - ARM_NORCROFT_HINT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aArm_Norcroft_HintTests, apzArm_Norcroft_HintPatch, 0 }, - - { zArm_WcharName, zArm_WcharList, - apzArm_WcharMachs, - ARM_WCHAR_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aArm_WcharTests, apzArm_WcharPatch, 0 }, - - { zAux_AsmName, zAux_AsmList, - apzAux_AsmMachs, - AUX_ASM_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aAux_AsmTests, apzAux_AsmPatch, 0 }, - { zAvoid_Bool_DefineName, zAvoid_Bool_DefineList, apzAvoid_Bool_DefineMachs, AVOID_BOOL_DEFINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -6131,11 +5729,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = { ECD_CURSOR_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aEcd_CursorTests, apzEcd_CursorPatch, 0 }, - { zFix_Header_BreakageName, zFix_Header_BreakageList, - apzFix_Header_BreakageMachs, - FIX_HEADER_BREAKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aFix_Header_BreakageTests, apzFix_Header_BreakagePatch, 0 }, - { zFreebsd_Gcc3_BreakageName, zFreebsd_Gcc3_BreakageList, apzFreebsd_Gcc3_BreakageMachs, FREEBSD_GCC3_BREAKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -6281,21 +5874,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = { LYNXOS_FCNTL_PROTO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aLynxos_Fcntl_ProtoTests, apzLynxos_Fcntl_ProtoPatch, 0 }, - { zM88k_Bad_Hypot_OptName, zM88k_Bad_Hypot_OptList, - apzM88k_Bad_Hypot_OptMachs, - M88K_BAD_HYPOT_OPT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aM88k_Bad_Hypot_OptTests, apzM88k_Bad_Hypot_OptPatch, 0 }, - - { zM88k_Bad_S_IfName, zM88k_Bad_S_IfList, - apzM88k_Bad_S_IfMachs, - M88K_BAD_S_IF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aM88k_Bad_S_IfTests, apzM88k_Bad_S_IfPatch, 0 }, - - { zM88k_Multi_InclName, zM88k_Multi_InclList, - apzM88k_Multi_InclMachs, - M88K_MULTI_INCL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aM88k_Multi_InclTests, apzM88k_Multi_InclPatch, 0 }, - { zMachine_Ansi_H_Va_ListName, zMachine_Ansi_H_Va_ListList, apzMachine_Ansi_H_Va_ListMachs, MACHINE_ANSI_H_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -6336,11 +5914,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = { NESTED_SYS_LIMITS_TEST_CT, FD_MACH_ONLY, aNested_Sys_LimitsTests, apzNested_Sys_LimitsPatch, 0 }, - { zNews_Os_RecursionName, zNews_Os_RecursionList, - apzNews_Os_RecursionMachs, - NEWS_OS_RECURSION_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aNews_Os_RecursionTests, apzNews_Os_RecursionPatch, 0 }, - { zNext_Math_PrefixName, zNext_Math_PrefixList, apzNext_Math_PrefixMachs, NEXT_MATH_PREFIX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index f332965da06..3e7d8181ea8 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -20,80 +20,6 @@ autogen definitions fixincl; FIXINC_DEBUG = yes; #endif -/* - * Completely replace <_int_varargs.h> with a file that includes gcc's - * stdarg.h or varargs.h files as appropriate on DG/UX - */ -fix = { - hackname = AAB_dgux_int_varargs; - files = _int_varargs.h; - replace = <<- _EOF_ - #ifndef __INT_VARARGS_H - #define __INT_VARARGS_H - - /********************************************************/ - /* Define the common stuff for varargs/stdarg/stdio. */ - /********************************************************/ - - /* - ** This file is a DG internal header. Never include this - ** file directly. - */ - - #ifndef ___int_features_h - #include - #endif - - #if !(defined(_VA_LIST) || defined(_VA_LIST_)) - #define _VA_LIST - #define _VA_LIST_ - - #ifdef __LINT__ - - #ifdef __STDC__ - typedef void * va_list; - #else - typedef char * va_list; - #endif - - #else - #if _M88K_ANY - - #if defined(__DCC__) - - typedef struct { - int next_arg; - int *mem_ptr; - int *reg_ptr; - } va_list; - - #else /* ! defined(__DCC__) */ - - typedef struct { - int __va_arg; /* argument number */ - int *__va_stk; /* start of args passed on stack */ - int *__va_reg; /* start of args passed in regs */ - } va_list; - - #endif /* ! defined(__DCC__) */ - - #elif _IX86_ANY - - #if defined(__GNUC__) || defined(__STDC__) - typedef void * va_list; - #else - typedef char * va_list; - #endif - - #endif /* _IX86_ANY */ - - #endif /* __LINT__ */ - #endif /* !(defined(_VA_LIST) || defined(_VA_LIST_)) */ - #endif /* #ifndef __INT_VARARGS_H */ - _EOF_; -}; - - /* * This fixes __FD_ZERO bug for linux 2.x.y (x <= 2 && y <= some n) */ @@ -109,7 +35,7 @@ fix = { * the wrapper, this will follow the #include_next chain until * we arrive at the real . */ - replace = <<- _EOF_ + replace = <<- _EndOfHeader_ /* This file fixes a bug in the __FD_ZERO macro for older versions of the Linux kernel. */ #ifndef _POSIX_TYPES_H_WRAPPER @@ -130,7 +56,7 @@ fix = { #define _POSIX_TYPES_H_WRAPPER #endif /* _POSIX_TYPES_H_WRAPPER */ - _EOF_; + _EndOfHeader_; }; @@ -148,28 +74,27 @@ fix = { * the wrapper, this will follow the #include_next chain until * we arrive at the real . */ - replace = + replace = <<- _EndOfHeader_ + /* This file fixes a bug in the __FD_ZERO macro present in glibc 1.x. */ + #ifndef _TYPES_H_WRAPPER + #include + #include_next -'/* This file fixes a bug in the __FD_ZERO macro present in glibc 1.x. */ -\#ifndef _TYPES_H_WRAPPER -\#include - \#include_next - -\#if defined(__FD_ZERO) && !defined(__GLIBC__) -\#undef __FD_ZERO -\# define __FD_ZERO(fdsetp) \\ - do { \\ - int __d0, __d1; \\ - __asm__ __volatile__("cld ; rep ; stosl" \\ + #if defined(__FD_ZERO) && !defined(__GLIBC__) + #undef __FD_ZERO + # define __FD_ZERO(fdsetp) \\ + do { \\ + int __d0, __d1; \\ + __asm__ __volatile__("cld ; rep ; stosl" \\ : "=&c" (__d0), "=&D" (__d1) \\ : "a" (0), "0" (__FDSET_LONGS), \\ "1" ((__fd_set *) (fdsetp)) :"memory"); \\ - } while (0) -\#endif + } while (0) + #endif -\#define _TYPES_H_WRAPPER -\#endif /* _TYPES_H_WRAPPER */ -'; + #define _TYPES_H_WRAPPER + #endif /* _TYPES_H_WRAPPER */ + _EndOfHeader_; }; @@ -187,32 +112,31 @@ fix = { * the wrapper, this will follow the #include_next chain until * we arrive at the real . */ - replace = + replace = <<- _EndOfHeader_ + /* This file fixes a bug in the __FD_ZERO macro present in glibc 2.0.x. */ + #ifndef _SELECTBITS_H_WRAPPER + #include + #include_next -'/* This file fixes a bug in the __FD_ZERO macro present in glibc 2.0.x. */ -\#ifndef _SELECTBITS_H_WRAPPER -\#include - \#include_next - -\#if defined(__FD_ZERO) && defined(__GLIBC__) \\ - && defined(__GLIBC_MINOR__) && __GLIBC__ == 2 \\ - && __GLIBC_MINOR__ == 0 -\#undef __FD_ZERO -\#define __FD_ZERO(fdsetp) \\ - do { \\ - int __d0, __d1; \\ - __asm__ __volatile__ ("cld; rep; stosl" \\ + #if defined(__FD_ZERO) && defined(__GLIBC__) \\ + && defined(__GLIBC_MINOR__) && __GLIBC__ == 2 \\ + && __GLIBC_MINOR__ == 0 + #undef __FD_ZERO + #define __FD_ZERO(fdsetp) \\ + do { \\ + int __d0, __d1; \\ + __asm__ __volatile__ ("cld; rep; stosl" \\ : "=&c" (__d0), "=&D" (__d1) \\ : "a" (0), "0" (sizeof (__fd_set) \\ / sizeof (__fd_mask)), \\ "1" ((__fd_mask *) (fdsetp)) \\ : "memory"); \\ - } while (0) -\#endif + } while (0) + #endif -\#define _SELECTBITS_H_WRAPPER -\#endif /* _SELECTBITS_H_WRAPPER */ -'; + #define _SELECTBITS_H_WRAPPER + #endif /* _SELECTBITS_H_WRAPPER */ + _EndOfHeader_; }; @@ -225,11 +149,13 @@ fix = { hackname = AAB_solaris_sys_varargs_h; files = "sys/varargs.h"; mach = '*-*-solaris*'; - replace = "#ifdef __STDC__\n" - "#include \n" - "#else\n" - "#include \n" - "#endif\n"; + replace = <<- _EndOfHeader_ + #ifdef __STDC__ + #include + #else + #include + #endif + _EndOfHeader_; }; @@ -243,32 +169,31 @@ fix = { fix = { hackname = AAB_sun_memcpy; files = memory.h; - select = "/\\*\t@\\(#\\)" + select = "/\\*\t@\\(#\\)" "(head/memory.h\t50.1\t " "|memory\\.h 1\\.[2-4] 8./../.. SMI; from S5R2 1\\.2\t)\\*/"; - replace = -'/* This file was generated by fixincludes */ -\#ifndef __memory_h__ -\#define __memory_h__ + replace = <<- _EndOfHeader_ + /* This file was generated by fixincludes */ + #ifndef __memory_h__ + #define __memory_h__ -\#ifdef __STDC__ -extern void *memccpy(); -extern void *memchr(); -extern void *memcpy(); -extern void *memset(); -\#else -extern char *memccpy(); -extern char *memchr(); -extern char *memcpy(); -extern char *memset(); -\#endif /* __STDC__ */ + #ifdef __STDC__ + extern void *memccpy(); + extern void *memchr(); + extern void *memcpy(); + extern void *memset(); + #else + extern char *memccpy(); + extern char *memchr(); + extern char *memcpy(); + extern char *memset(); + #endif /* __STDC__ */ -extern int memcmp(); - -\#endif /* __memory_h__ */ -'; + extern int memcmp(); + #endif /* __memory_h__ */ + _EndOfHeader; }; @@ -283,13 +208,13 @@ fix = { replace = "/* This file was generated by fixincludes. */\n" "#ifndef _SYS_VARARGS_H\n" "#define _SYS_VARARGS_H\n\n" - + "#ifdef __STDC__\n" "#include \n" "#else\n" "#include \n" "#endif\n\n" - + "#endif /* _SYS_VARARGS_H */\n"; }; #endif @@ -303,158 +228,157 @@ fix = { fix = { hackname = AAB_svr4_replace_byteorder; #ifndef SVR5 - mach = "*-*-sysv4*"; - mach = "i[34567]86-*-sysv5*"; - mach = "i[34567]86-*-udk*"; - mach = "i[34567]86-*-solaris2.[0-4]"; - mach = "powerpcle-*-solaris2.[0-4]"; - mach = "sparc-*-solaris2.[0-4]"; + mach = "*-*-sysv4*"; + mach = "i[34567]86-*-sysv5*"; + mach = "i[34567]86-*-udk*"; + mach = "i[34567]86-*-solaris2.[0-4]"; + mach = "powerpcle-*-solaris2.[0-4]"; + mach = "sparc-*-solaris2.[0-4]"; #endif /* SVR5 */ files = sys/byteorder.h; - replace = '#ifndef _SYS_BYTEORDER_H -\#define _SYS_BYTEORDER_H + replace = <<- _EndOfHeader_ + #ifndef _SYS_BYTEORDER_H + #define _SYS_BYTEORDER_H -/* Functions to convert `short\' and `long\' quantities from host byte order - to (internet) network byte order (i.e. big-endian). + /* Functions to convert `short' and `long' quantities from host byte order + to (internet) network byte order (i.e. big-endian). - Written by Ron Guilmette (rfg@ncd.com). + Written by Ron Guilmette (rfg@ncd.com). - This isn\'t actually used by GCC. It is installed by fixinc.svr4. + This isn't actually used by GCC. It is installed by fixinc.svr4. - For big-endian machines these functions are essentially no-ops. + For big-endian machines these functions are essentially no-ops. - For little-endian machines, we define the functions using specialized - asm sequences in cases where doing so yields better code (e.g. i386). */ + For little-endian machines, we define the functions using specialized + asm sequences in cases where doing so yields better code (e.g. i386). */ -\#if !defined (__GNUC__) && !defined (__GNUG__) -\#error You lose! This file is only useful with GNU compilers. -\#endif + #if !defined (__GNUC__) && !defined (__GNUG__) + #error You lose! This file is only useful with GNU compilers. + #endif -\#ifndef __BYTE_ORDER__ -/* Byte order defines. These are as defined on UnixWare 1.1, but with - double underscores added at the front and back. */ -\#define __LITTLE_ENDIAN__ 1234 -\#define __BIG_ENDIAN__ 4321 -\#define __PDP_ENDIAN__ 3412 -\#endif + #ifndef __BYTE_ORDER__ + /* Byte order defines. These are as defined on UnixWare 1.1, but with + double underscores added at the front and back. */ + #define __LITTLE_ENDIAN__ 1234 + #define __BIG_ENDIAN__ 4321 + #define __PDP_ENDIAN__ 3412 + #endif -\#ifdef __STDC__ -static __inline__ unsigned long htonl (unsigned long); -static __inline__ unsigned short htons (unsigned int); -static __inline__ unsigned long ntohl (unsigned long); -static __inline__ unsigned short ntohs (unsigned int); -\#endif /* defined (__STDC__) */ + #ifdef __STDC__ + static __inline__ unsigned long htonl (unsigned long); + static __inline__ unsigned short htons (unsigned int); + static __inline__ unsigned long ntohl (unsigned long); + static __inline__ unsigned short ntohs (unsigned int); + #endif /* defined (__STDC__) */ -\#if defined (__i386__) + #if defined (__i386__) -\#ifndef __BYTE_ORDER__ -\#define __BYTE_ORDER__ __LITTLE_ENDIAN__ -\#endif + #ifndef __BYTE_ORDER__ + #define __BYTE_ORDER__ __LITTLE_ENDIAN__ + #endif -/* Convert a host long to a network long. */ + /* Convert a host long to a network long. */ -/* We must use a new-style function definition, so that this will also - be valid for C++. */ -static __inline__ unsigned long -htonl (unsigned long __arg) -{ - register unsigned long __result; + /* We must use a new-style function definition, so that this will also + be valid for C++. */ + static __inline__ unsigned long + htonl (unsigned long __arg) + { + register unsigned long __result; - __asm__ ("xchg%B0 %b0,%h0 - ror%L0 $16,%0 - xchg%B0 %b0,%h0" : "=q" (__result) : "0" (__arg)); - return __result; -} + __asm__ ("xchg%B0 %b0,%h0 + ror%L0 $16,%0 + xchg%B0 %b0,%h0" : "=q" (__result) : "0" (__arg)); + return __result; + } -/* Convert a host short to a network short. */ + /* Convert a host short to a network short. */ -static __inline__ unsigned short -htons (unsigned int __arg) -{ - register unsigned short __result; + static __inline__ unsigned short + htons (unsigned int __arg) + { + register unsigned short __result; - __asm__ ("xchg%B0 %b0,%h0" : "=q" (__result) : "0" (__arg)); - return __result; -} + __asm__ ("xchg%B0 %b0,%h0" : "=q" (__result) : "0" (__arg)); + return __result; + } -\#elif ((defined (__i860__) && !defined (__i860_big_endian__)) \\ - || defined (__ns32k__) || defined (__vax__) \\ - || defined (__spur__) || defined (__arm__)) + #elif (defined (__ns32k__) || defined (__vax__) || defined (__arm__)) -\#ifndef __BYTE_ORDER__ -\#define __BYTE_ORDER__ __LITTLE_ENDIAN__ -\#endif + #ifndef __BYTE_ORDER__ + #define __BYTE_ORDER__ __LITTLE_ENDIAN__ + #endif -/* For other little-endian machines, using C code is just as efficient as - using assembly code. */ + /* For other little-endian machines, using C code is just as efficient as + using assembly code. */ -/* Convert a host long to a network long. */ + /* Convert a host long to a network long. */ -static __inline__ unsigned long -htonl (unsigned long __arg) -{ - register unsigned long __result; + static __inline__ unsigned long + htonl (unsigned long __arg) + { + register unsigned long __result; - __result = (__arg >> 24) & 0x000000ff; - __result |= (__arg >> 8) & 0x0000ff00; - __result |= (__arg << 8) & 0x00ff0000; - __result |= (__arg << 24) & 0xff000000; - return __result; -} + __result = (__arg >> 24) & 0x000000ff; + __result |= (__arg >> 8) & 0x0000ff00; + __result |= (__arg << 8) & 0x00ff0000; + __result |= (__arg << 24) & 0xff000000; + return __result; + } -/* Convert a host short to a network short. */ + /* Convert a host short to a network short. */ -static __inline__ unsigned short -htons (unsigned int __arg) -{ - register unsigned short __result; + static __inline__ unsigned short + htons (unsigned int __arg) + { + register unsigned short __result; - __result = (__arg << 8) & 0xff00; - __result |= (__arg >> 8) & 0x00ff; - return __result; -} + __result = (__arg << 8) & 0xff00; + __result |= (__arg >> 8) & 0x00ff; + return __result; + } -\#else /* must be a big-endian machine */ + #else /* must be a big-endian machine */ -\#ifndef __BYTE_ORDER__ -\#define __BYTE_ORDER__ __BIG_ENDIAN__ -\#endif + #ifndef __BYTE_ORDER__ + #define __BYTE_ORDER__ __BIG_ENDIAN__ + #endif -/* Convert a host long to a network long. */ + /* Convert a host long to a network long. */ -static __inline__ unsigned long -htonl (unsigned long __arg) -{ - return __arg; -} + static __inline__ unsigned long + htonl (unsigned long __arg) + { + return __arg; + } -/* Convert a host short to a network short. */ + /* Convert a host short to a network short. */ -static __inline__ unsigned short -htons (unsigned int __arg) -{ - return __arg; -} + static __inline__ unsigned short + htons (unsigned int __arg) + { + return __arg; + } -\#endif /* big-endian */ + #endif /* big-endian */ -/* Convert a network long to a host long. */ + /* Convert a network long to a host long. */ -static __inline__ unsigned long -ntohl (unsigned long __arg) -{ - return htonl (__arg); -} + static __inline__ unsigned long + ntohl (unsigned long __arg) + { + return htonl (__arg); + } -/* Convert a network short to a host short. */ + /* Convert a network short to a host short. */ -static __inline__ unsigned short -ntohs (unsigned int __arg) -{ - return htons (__arg); -} -\#endif -'; + static __inline__ unsigned short + ntohs (unsigned int __arg) + { + return htons (__arg); + } + #endif + _EndOfHeader_; }; @@ -477,12 +401,12 @@ fix = { hackname = AAB_ultrix_limits; files = limits.h; mach = "*-*-ultrix4.3"; - replace = -'#ifndef _LIMITS_INCLUDED -\#define _LIMITS_INCLUDED -\#include -\#endif /* _LIMITS_INCLUDED */ -'; + replace = <<- _EndOfHeader_ + #ifndef _LIMITS_INCLUDED + #define _LIMITS_INCLUDED + #include + #endif /* _LIMITS_INCLUDED */ + _EndOfHeader_; }; @@ -495,12 +419,12 @@ fix = { hackname = AAB_ultrix_memory; files = memory.h; mach = "*-*-ultrix4.3"; - replace = -'#ifndef _MEMORY_INCLUDED -\#define _MEMORY_INCLUDED -\#include -\#endif /* _MEMORY_INCLUDED */ -'; + replace = <<- _EndOfHeader_ + #ifndef _MEMORY_INCLUDED + #define _MEMORY_INCLUDED + #include + #endif /* _MEMORY_INCLUDED */ + _EndOfHeader_; }; @@ -513,12 +437,12 @@ fix = { hackname = AAB_ultrix_string; files = string.h; mach = "*-*-ultrix4.3"; - replace = -'#ifndef _STRING_INCLUDED -\#define _STRING_INCLUDED -\#include -\#endif /* _STRING_INCLUDED */ -'; + replace = <<- _EndOfHeader_ + #ifndef _STRING_INCLUDED + #define _STRING_INCLUDED + #include + #endif /* _STRING_INCLUDED */ + _EndOfHeader_; }; @@ -652,58 +576,6 @@ fix = { }; -/* - * Fix this ARM/RISCiX file where ___type is a Compiler - * hint that is specific to the Norcroft compiler. - */ -fix = { - hackname = arm_norcroft_hint; - select = "___type p_type"; - files = "X11/Intrinsic.h"; - c_fix = format; - c_fix_arg = "p_type"; - test_text = "___type p_type mumble;"; -}; - - -/* - * Fix this ARM/RISCiX file to avoid interfering - * with the use of __wchar_t in cc1plus. - */ -fix = { - hackname = arm_wchar; - files = stdlib.h; - select = "#[ \t]*define[ \t]*__wchar_t"; - - c_fix = format; - c_fix_arg = "%1_GCC_WCHAR_T"; - c_fix_arg = "(#[ \t]*(ifndef|define)[ \t]+)__wchar_t"; - - test_text = - "# ifndef \t __wchar_t /* we don't have wchar_t yet, ... */\n" - "# define __wchar_t short\n" - "# endif /* __wchar_t */"; -}; - - -/* - * This file in A/UX 3.0.x/3.1.x contains an __asm directive for c89; - * gcc doesn't understand it. - */ -fix = { - hackname = aux_asm; - files = sys/param.h; - select = "#ifndef NOINLINE"; - - c_fix = format; - c_fix_arg = "#if !defined(NOINLINE) && !defined(__GNUC__)"; - - test_text = - "#ifndef NOINLINE /* ain't got no inline, so we got it */\n" - "#endif /* NOINLINE */"; -}; - - /* * For C++, avoid any typedef or macro definition of bool, * and use the built in type instead. @@ -726,6 +598,7 @@ fix = { test_text = "# define bool\t char \n"; }; + fix = { hackname = avoid_bool_type; files = curses.h; @@ -742,6 +615,7 @@ fix = { test_text = "typedef unsigned int\tbool \t; /* bool\n type */"; }; + /* * For C++, avoid any typedef definition of wchar_t, * and use the built in type instead. @@ -758,6 +632,7 @@ fix = { test_text = "typedef unsigned short\twchar_t \t; /* wchar_t\n type */"; }; + /* * Fix #defines under Alpha OSF/1: * The following files contain '#pragma extern_prefix "_FOO"' followed by @@ -988,6 +863,7 @@ fix = { "extern __DJ_wint_t x;\n"; }; + /* * Fix these Sun OS files to avoid an invalid identifier in an #ifdef. */ @@ -1003,22 +879,6 @@ fix = { }; -/* - * fix-header doesn't fix fabs' prototype, and I have no idea why. - */ -fix = { - hackname = fix_header_breakage; - mach = "m88k-motorola-sysv3*"; - files = "math.h"; - - select = 'extern double floor\(\), ceil\(\), fmod\(\), fabs\(\);'; - c_fix = format; - c_fix_arg = - 'extern double floor(), ceil(), fmod(), fabs _PARAMS((double));'; - test_text = 'extern double floor(), ceil(), fmod(), fabs();'; -}; - - /* * Between 8/24/1998 and 2/17/2001, FreeBSD system headers presume * neither the existence of GCC 3 nor its exact feature set yet break @@ -1580,67 +1440,6 @@ fix = { }; -/* - * libm.a on m88k-motorola-sysv3 contains a stupid optimization for - * function hypot(), which returns the second argument without even - * looking at its value, if the other is 0.0. - */ -fix = { - hackname = m88k_bad_hypot_opt; - mach = "m88k-motorola-sysv3*"; - files = "math.h"; - select = "^extern double hypot\\(\\);\n"; - c_fix = format; - c_fix_arg = "%0" - "/* Workaround a stupid Motorola optimization if one\n" - " of x or y is 0.0 and the other is negative! */\n" - "#ifdef __STDC__\n" - "static __inline__ double fake_hypot (double x, double y)\n" - "#else\n" - "static __inline__ double fake_hypot (x, y)\n" - "\tdouble x, y;\n" - "#endif\n" - "{\n" - "\treturn fabs (hypot (x, y));\n" - "}\n" - "#define hypot\tfake_hypot\n"; - test_text = "extern double hypot();"; -}; - - -/* - * Fix incorrect S_IF* definitions on m88k-sysv3. - */ -fix = { - hackname = m88k_bad_s_if; - mach = "m88k-*-sysv3*"; - files = sys/stat.h; - select = "#define[ \t]+S_IS[A-Z]+\\(m\\)[ \t]+\\(m[ \t]*&"; - - c_fix = format; - c_fix_arg = '#define %1(m) (((m) & S_IFMT) == %2)'; - c_fix_arg = "#define[ \t]+(S_IS[A-Z]+)\\(m\\)[ \t]+" - "\\(m[ \t]*&[ \t]*" - "(S_IF[A-Z][A-Z][A-Z]+|0[0-9]+)" - "[ \t]*\\)"; - test_text = '#define S_ISREG(m) (m & S_IFREG) /* is regular? */'; -}; - - -/* - * Put cpp wrappers around these include files to avoid redeclaration - * errors during multiple inclusion on m88k-tektronix-sysv3. - */ -fix = { - hackname = m88k_multi_incl; - mach = "m88k-tektronix-sysv3*"; - files = "time.h"; - bypass = "#ifndef"; - c_fix = wrap; - test_text = ""; -}; - - /* * Fix BSD machine/ansi.h to use __builtin_va_list to define _BSD_VA_LIST_. * @@ -1805,19 +1604,6 @@ fix = { "#define OPEN_MAX 20 /* Max, Max, ... */\n"; }; -/* - * fix bogus recursive stdlib.h in NEWS-OS 4.0C - */ -fix = { - hackname = news_os_recursion; - files = stdlib.h; - select = "[ \t]*#include .*"; - - c_fix = format; - c_fix_arg = "#ifdef BOGUS_RECURSION\n%0\n#endif"; - test_text = "#include "; -}; - /* * NeXT 3.2 adds const prefix to some math functions. @@ -2135,35 +1921,6 @@ fix = { test_text = "#include "; }; -/* - * Sony NEWSOS 5.0 does not support the complete ANSI C standard. - */ -#ifdef SONY -fix = { - hackname = sony_ctype; - files = ctype.h; - test = " -x /bin/sony"; - test = " ! -z \"`if /bin/sony ; then echo true ; fi`\""; - sed = "s/__ctype/_ctype/g"; -}; -#endif - - -/* - * Sony NEWSOS 5.0 does not support the complete ANSI C standard. - */ -#ifdef SONY -fix = { - hackname = sony_stdio; - files = stdio.h; - test = " -x /bin/sony"; - test = " ! -z \"`if /bin/sony ; then echo true ; fi`\""; - sed = "s/__filbuf/_filbuf/g\n" - "s/__flsbuf/_flsbuf/g\n" - "s/__iob/_iob/g"; -}; -#endif - /* * Add a `static' declaration of `getrnge' into . @@ -2684,8 +2441,8 @@ fix = { fix = { hackname = svr4_mach_defines; files = ieeefp.h; - select = "#define[ \t]*__(i386|i860|mips|sparc|m88k|m68k)[ \t]"; - sed = "/#define[ \t]*__\\(i386|i860|mips|sparc|m88k|m68k\\)[ \t]/d"; + select = "#define[ \t]*__(i386|mips|sparc|m88k|m68k)[ \t]"; + sed = "/#define[ \t]*__\\(i386|mips|sparc|m88k|m68k\\)[ \t]/d"; }; #endif diff --git a/gcc/fixinc/mkfixinc.sh b/gcc/fixinc/mkfixinc.sh index f3679486ab5..8bd00d5cd62 100755 --- a/gcc/fixinc/mkfixinc.sh +++ b/gcc/fixinc/mkfixinc.sh @@ -73,7 +73,6 @@ case $machine in i370-*-openedition | \ i?86-moss-msdos* | \ i?86-*-moss* | \ - i?86-*-osf1* | \ i?86-*-win32 | \ i?86-*-pe | \ i?86-*-cygwin* | \ diff --git a/gcc/fixinc/tests/base/X11/Intrinsic.h b/gcc/fixinc/tests/base/X11/Intrinsic.h deleted file mode 100644 index 989ce063608..00000000000 --- a/gcc/fixinc/tests/base/X11/Intrinsic.h +++ /dev/null @@ -1,14 +0,0 @@ -/* DO NOT EDIT THIS FILE. - - It has been auto-edited by fixincludes from: - - "fixinc/tests/inc/X11/Intrinsic.h" - - This had to be done to correct non-standard usages in the - original, manufacturer supplied header file. */ - - - -#if defined( ARM_NORCROFT_HINT_CHECK ) -p_type mumble; -#endif /* ARM_NORCROFT_HINT_CHECK */ diff --git a/gcc/fixinc/tests/base/math.h b/gcc/fixinc/tests/base/math.h index 4d9907c3910..292e567eeb1 100644 --- a/gcc/fixinc/tests/base/math.h +++ b/gcc/fixinc/tests/base/math.h @@ -30,11 +30,6 @@ struct exception; #endif /* BROKEN_CABS_CHECK */ -#if defined( FIX_HEADER_BREAKAGE_CHECK ) -extern double floor(), ceil(), fmod(), fabs _PARAMS((double)); -#endif /* FIX_HEADER_BREAKAGE_CHECK */ - - #if defined( HPUX11_CPP_POW_INLINE_CHECK ) #endif /* HPUX11_CPP_POW_INLINE_CHECK */ @@ -60,23 +55,6 @@ extern double fmod(double, double); #endif /* ISC_FMOD_CHECK */ -#if defined( M88K_BAD_HYPOT_OPT_CHECK ) -extern double hypot(); -/* Workaround a stupid Motorola optimization if one - of x or y is 0.0 and the other is negative! */ -#ifdef __STDC__ -static __inline__ double fake_hypot (double x, double y) -#else -static __inline__ double fake_hypot (x, y) - double x, y; -#endif -{ - return fabs (hypot (x, y)); -} -#define hypot fake_hypot -#endif /* M88K_BAD_HYPOT_OPT_CHECK */ - - #if defined( MATH_EXCEPTION_CHECK ) typedef struct exception t_math_exception; #endif /* MATH_EXCEPTION_CHECK */ diff --git a/gcc/fixinc/tests/base/stdlib.h b/gcc/fixinc/tests/base/stdlib.h index 857989cb9cb..48f0043debe 100644 --- a/gcc/fixinc/tests/base/stdlib.h +++ b/gcc/fixinc/tests/base/stdlib.h @@ -9,13 +9,6 @@ -#if defined( ARM_WCHAR_CHECK ) -# ifndef _GCC_WCHAR_T /* we don't have wchar_t yet, ... */ -# define _GCC_WCHAR_T short -# endif /* __wchar_t */ -#endif /* ARM_WCHAR_CHECK */ - - #if defined( HPUX11_ABS_CHECK ) #if !defined(_MATH_INCLUDED) || defined(__GNUG__) #endif /* HPUX11_ABS_CHECK */ @@ -28,13 +21,6 @@ extern void exit(void*); #endif /* INT_ABORT_FREE_AND_EXIT_CHECK */ -#if defined( NEWS_OS_RECURSION_CHECK ) -#ifdef BOGUS_RECURSION -#include -#endif -#endif /* NEWS_OS_RECURSION_CHECK */ - - #if defined( SVR4_GETCWD_CHECK ) extern char* getcwd(char *, size_t); #endif /* SVR4_GETCWD_CHECK */ diff --git a/gcc/fixinc/tests/base/sys/byteorder.h b/gcc/fixinc/tests/base/sys/byteorder.h deleted file mode 100644 index 46ca752f7e9..00000000000 --- a/gcc/fixinc/tests/base/sys/byteorder.h +++ /dev/null @@ -1,152 +0,0 @@ -/* DO NOT EDIT THIS FILE. - - It has been auto-edited by fixincludes from: - - "fixinc/tests/inc/sys/byteorder.h" - - This had to be done to correct non-standard usages in the - original, manufacturer supplied header file. */ - -#ifndef _SYS_BYTEORDER_H -#define _SYS_BYTEORDER_H - -/* Functions to convert `short' and `long' quantities from host byte order - to (internet) network byte order (i.e. big-endian). - - Written by Ron Guilmette (rfg@ncd.com). - - This isn't actually used by GCC. It is installed by fixinc.svr4. - - For big-endian machines these functions are essentially no-ops. - - For little-endian machines, we define the functions using specialized - asm sequences in cases where doing so yields better code (e.g. i386). */ - -#if !defined (__GNUC__) && !defined (__GNUG__) -#error You lose! This file is only useful with GNU compilers. -#endif - -#ifndef __BYTE_ORDER__ -/* Byte order defines. These are as defined on UnixWare 1.1, but with - double underscores added at the front and back. */ -#define __LITTLE_ENDIAN__ 1234 -#define __BIG_ENDIAN__ 4321 -#define __PDP_ENDIAN__ 3412 -#endif - -#ifdef __STDC__ -static __inline__ unsigned long htonl (unsigned long); -static __inline__ unsigned short htons (unsigned int); -static __inline__ unsigned long ntohl (unsigned long); -static __inline__ unsigned short ntohs (unsigned int); -#endif /* defined (__STDC__) */ - -#if defined (__i386__) - -#ifndef __BYTE_ORDER__ -#define __BYTE_ORDER__ __LITTLE_ENDIAN__ -#endif - -/* Convert a host long to a network long. */ - -/* We must use a new-style function definition, so that this will also - be valid for C++. */ -static __inline__ unsigned long -htonl (unsigned long __arg) -{ - register unsigned long __result; - - __asm__ ("xchg%B0 %b0,%h0 - ror%L0 $16,%0 - xchg%B0 %b0,%h0" : "=q" (__result) : "0" (__arg)); - return __result; -} - -/* Convert a host short to a network short. */ - -static __inline__ unsigned short -htons (unsigned int __arg) -{ - register unsigned short __result; - - __asm__ ("xchg%B0 %b0,%h0" : "=q" (__result) : "0" (__arg)); - return __result; -} - -#elif ((defined (__i860__) && !defined (__i860_big_endian__)) \ - || defined (__ns32k__) || defined (__vax__) \ - || defined (__spur__) || defined (__arm__)) - -#ifndef __BYTE_ORDER__ -#define __BYTE_ORDER__ __LITTLE_ENDIAN__ -#endif - -/* For other little-endian machines, using C code is just as efficient as - using assembly code. */ - -/* Convert a host long to a network long. */ - -static __inline__ unsigned long -htonl (unsigned long __arg) -{ - register unsigned long __result; - - __result = (__arg >> 24) & 0x000000ff; - __result |= (__arg >> 8) & 0x0000ff00; - __result |= (__arg << 8) & 0x00ff0000; - __result |= (__arg << 24) & 0xff000000; - return __result; -} - -/* Convert a host short to a network short. */ - -static __inline__ unsigned short -htons (unsigned int __arg) -{ - register unsigned short __result; - - __result = (__arg << 8) & 0xff00; - __result |= (__arg >> 8) & 0x00ff; - return __result; -} - -#else /* must be a big-endian machine */ - -#ifndef __BYTE_ORDER__ -#define __BYTE_ORDER__ __BIG_ENDIAN__ -#endif - -/* Convert a host long to a network long. */ - -static __inline__ unsigned long -htonl (unsigned long __arg) -{ - return __arg; -} - -/* Convert a host short to a network short. */ - -static __inline__ unsigned short -htons (unsigned int __arg) -{ - return __arg; -} - -#endif /* big-endian */ - -/* Convert a network long to a host long. */ - -static __inline__ unsigned long -ntohl (unsigned long __arg) -{ - return htonl (__arg); -} - -/* Convert a network short to a host short. */ - -static __inline__ unsigned short -ntohs (unsigned int __arg) -{ - return htons (__arg); -} -#endif diff --git a/gcc/fixinc/tests/base/sys/param.h b/gcc/fixinc/tests/base/sys/param.h index e0c839b490d..41269247bbb 100644 --- a/gcc/fixinc/tests/base/sys/param.h +++ b/gcc/fixinc/tests/base/sys/param.h @@ -9,12 +9,6 @@ -#if defined( AUX_ASM_CHECK ) -#if !defined(NOINLINE) && !defined(__GNUC__) /* ain't got no inline, so we got it */ -#endif /* NOINLINE */ -#endif /* AUX_ASM_CHECK */ - - #if defined( HPUX_MAXINT_CHECK ) #ifndef MAXINT #define MAXINT 0x7FFFFFFF diff --git a/gcc/fixinc/tests/base/sys/stat.h b/gcc/fixinc/tests/base/sys/stat.h index 46a4623cd27..a0da6db01b2 100644 --- a/gcc/fixinc/tests/base/sys/stat.h +++ b/gcc/fixinc/tests/base/sys/stat.h @@ -9,11 +9,6 @@ -#if defined( M88K_BAD_S_IF_CHECK ) -#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) /* is regular? */ -#endif /* M88K_BAD_S_IF_CHECK */ - - #if defined( RS6000_FCHMOD_CHECK ) extern int fchmod(int, mode_t); #endif /* RS6000_FCHMOD_CHECK */ diff --git a/gcc/fixinc/tests/base/time.h b/gcc/fixinc/tests/base/time.h index 100992442b7..cf22e2014d6 100644 --- a/gcc/fixinc/tests/base/time.h +++ b/gcc/fixinc/tests/base/time.h @@ -7,14 +7,6 @@ This had to be done to correct non-standard usages in the original, manufacturer supplied header file. */ -#ifndef FIXINC_M88K_MULTI_INCL_CHECK -#define FIXINC_M88K_MULTI_INCL_CHECK 1 - - - -#if defined( M88K_MULTI_INCL_CHECK ) - -#endif /* M88K_MULTI_INCL_CHECK */ #if defined( VXWORKS_NEEDS_VXTYPES_CHECK ) @@ -33,5 +25,3 @@ typedef void (*__gcc_VOIDFUNCPTR) (); #endif #define VOIDFUNCPTR __gcc_VOIDFUNCPTR #endif /* VXWORKS_TIME_CHECK */ - -#endif /* FIXINC_M88K_MULTI_INCL_CHECK */