From 34ce8863cf09f630d648492bded19091fbafd126 Mon Sep 17 00:00:00 2001 From: Bruce Korb Date: Fri, 18 May 2001 03:13:20 +0000 Subject: regeneration based on new engine git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@42236 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fixinc/fixincl.x | 191 +++++++++++++++++---------------------------------- 1 file changed, 64 insertions(+), 127 deletions(-) diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index 939e11106ce..1f50035e681 100644 --- a/gcc/fixinc/fixincl.x +++ b/gcc/fixinc/fixincl.x @@ -12,7 +12,7 @@ * inclhack copyright (c) 1998, 1999, 2000, 2001 * The Free Software Foundation, Inc. * - * inclhack is free software. + * inclhack is free software. * * You may redistribute it and/or modify it under the terms of the * GNU General Public License, as published by the Free Software @@ -285,64 +285,48 @@ tSCC zAab_Dgux_Int_VarargsList[] = */ static const char* apzAab_Dgux_Int_VarargsPatch[] = { "#ifndef __INT_VARARGS_H\n\ -#define __INT_VARARGS_H\n\ -\n\ +#define __INT_VARARGS_H\n\n\ /************************************************************************/\n\ /* _INT_VARARGS.H - Define the common stuff for varargs/stdarg/stdio. */\n\ -/************************************************************************/\n\ -\n\ +/************************************************************************/\n\n\ /*\n\ ** This file is a DG internal header. Never include this\n\ ** file directly.\n\ -*/\n\ -\n\ +*/\n\n\ #ifndef ___int_features_h\n\ #include \n\ -#endif\n\ -\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\ +#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\ +#endif\n\n\ #else\n\ -#if _M88K_ANY\n\ -\n\ -#if defined(__DCC__)\n\ -\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\ +} 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\ +} 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\n\n\ +#endif /* _IX86_ANY */\n\n\ #endif /* __LINT__ */\n\ #endif /* !(defined(_VA_LIST) || defined(_VA_LIST_)) */\n\ #endif /* #ifndef __INT_VARARGS_H */\n", @@ -386,8 +370,7 @@ static const char* apzAab_Fd_Zero_Asm_Posix_Types_HPatch[] = { for older versions of the Linux kernel. */\n\ #ifndef _POSIX_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\ @@ -398,8 +381,7 @@ static const char* apzAab_Fd_Zero_Asm_Posix_Types_HPatch[] = { \t\t\t: \"a\" (0), \"0\" (__FDSET_LONGS), \\\n\ \t\t\t \"1\" ((__kernel_fd_set *) (fdsetp)) :\"memory\"); \\\n\ } while (0)\n\ -#endif\n\ -\n\ +#endif\n\n\ #define _POSIX_TYPES_H_WRAPPER\n\ #endif /* _POSIX_TYPES_H_WRAPPER */\n", (char*)NULL }; @@ -433,8 +415,7 @@ 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\ @@ -445,8 +426,7 @@ static const char* apzAab_Fd_Zero_Gnu_Types_HPatch[] = { \t: \"a\" (0), \"0\" (__FDSET_LONGS), \\\n\ \t\t \"1\" ((__fd_set *) (fdsetp)) :\"memory\"); \\\n\ } while (0)\n\ -#endif\n\ -\n\ +#endif\n\n\ #define _TYPES_H_WRAPPER\n\ #endif /* _TYPES_H_WRAPPER */\n", (char*)NULL }; @@ -480,8 +460,7 @@ 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\ + #include_next \n\n\ #if defined(__FD_ZERO) && defined(__GLIBC__) \\\n\ \t&& defined(__GLIBC_MINOR__) && __GLIBC__ == 2 \\\n\ \t&& __GLIBC_MINOR__ == 0\n\ @@ -496,8 +475,7 @@ static const char* apzAab_Fd_Zero_Selectbits_HPatch[] = { \"1\" ((__fd_mask *) (fdsetp)) \\\n\ : \"memory\"); \\\n\ } while (0)\n\ -#endif\n\ -\n\ +#endif\n\n\ #define _SELECTBITS_H_WRAPPER\n\ #endif /* _SELECTBITS_H_WRAPPER */\n", (char*)NULL }; @@ -536,8 +514,7 @@ 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\ +#define __memory_h__\n\n\ #ifdef __STDC__\n\ extern void *memccpy();\n\ extern void *memchr();\n\ @@ -548,10 +525,8 @@ 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 /* __STDC__ */\n\n\ +extern int memcmp();\n\n\ #endif /* __memory_h__ */\n", (char*)NULL }; @@ -587,142 +562,106 @@ tSCC* apzAab_Svr4_Replace_ByteorderMachs[] = { */ static const char* apzAab_Svr4_Replace_ByteorderPatch[] = { "#ifndef _SYS_BYTEORDER_H\n\ -#define _SYS_BYTEORDER_H\n\ -\n\ +#define _SYS_BYTEORDER_H\n\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\ - For big-endian machines these functions are essentially no-ops.\n\ -\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\ + 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\ + 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\ -#endif\n\ -\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\ -#endif\n\ -\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\ -#endif /* defined (__STDC__) */\n\ -\n\ -#if defined (__i386__)\n\ -\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\ +#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\ + 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\ +}\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\ + register unsigned short __result;\n\n\ __asm__ (\"xchg%B0 %b0,%h0\" : \"=q\" (__result) : \"0\" (__arg));\n\ return __result;\n\ -}\n\ -\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\ + || defined (__spur__) || defined (__arm__))\n\n\ #ifndef __BYTE_ORDER__\n\ #define __BYTE_ORDER__ __LITTLE_ENDIAN__\n\ -#endif\n\ -\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\ + 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\ + 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\ +}\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\ + 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\ +}\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\ +#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\ +}\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\ +}\n\n\ +#endif /* big-endian */\n\n\ +/* Convert a network long to a host long. */\n\n\ static __inline__ unsigned long\n\ ntohl (unsigned long __arg)\n\ {\n\ return htonl (__arg);\n\ -}\n\ -\n\ -/* Convert a network short to a host short. */\n\ -\n\ +}\n\n\ +/* Convert a network short to a host short. */\n\n\ static __inline__ unsigned short\n\ ntohs (unsigned int __arg)\n\ {\n\ @@ -2995,8 +2934,7 @@ static tTestDesc aMath_Huge_Val_From_Dbl_MaxTests[] = { * Fix Command Arguments for Math_Huge_Val_From_Dbl_Max */ static const char* apzMath_Huge_Val_From_Dbl_MaxPatch[] = { "sh", "-c", - "\tdbl_max_def=`egrep 'define[ \t]+DBL_MAX[ \t]+.*' float.h | sed 's/.*DBL_MAX[ \t]*//' 2>/dev/null`\n\ -\n\ + "\tdbl_max_def=`egrep 'define[ \t]+DBL_MAX[ \t]+.*' float.h | sed 's/.*DBL_MAX[ \t]*//' 2>/dev/null`\n\n\ \tif ( test -n \"${dbl_max_def}\" ) > /dev/null 2>&1\n\ \tthen sed -e '/define[ \t]*HUGE_VAL[ \t]*DBL_MAX/s@DBL_MAX@'\"$dbl_max_def@\"\n\ \telse cat\n\ @@ -4971,8 +4909,7 @@ static const char* apzUltrix_StatPatch[] = { "sed", "-e", "/^#define[ \t]S_IFPORT[ \t]*S_IFIFO$/a\\\n\ \\\n\ /* macro to test for symbolic link */\\\n\ -#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK)\\\n\ -\n", +#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK)\\\n\n", "-e", "/^[ \t]*fstat(),$/a\\\n\ \tlstat(),\n", (char*)NULL }; -- cgit v1.2.3