X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=gcc%2Ffixinc%2Finclhack.def;h=3aa46c4943dbac4ba83e852273167a69d31a2f36;hp=f040130a588a3a6d868796f06467be3d2fef5932;hb=e537c8311461bdf6ef85419aee1da79726120162;hpb=94f426d156080503ff9132d549bc29faab96ee3d diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index f040130a588..3aa46c4943d 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -1,4 +1,3 @@ - /* -*- Mode: C -*- */ autogen definitions fixincl; @@ -6,6 +5,14 @@ autogen definitions fixincl; /* Define all the fixes we know about for repairing damaged headers. Please see the README before adding or changing entries in this file. + This is the sort command: + + blocksort output=inclhack.sorted \ + pattern='^/\*$' \ + trailer='^/\*EOF\*[/]' \ + input=inclhack.def \ + key='hackname[ ]*=[ ]*(.*);' + Set up a debug test so we can make the templates emit special code while debugging these fixes: */ @@ -13,157 +20,13 @@ autogen definitions fixincl; FIXINC_DEBUG = yes; #endif -/* DO NOT DO BROKEN FIXES (empty replacement fixes) */ - -/* - * Purge some HP-UX 11 files that are only broken after they are "fixed". - */ -fix = { - hackname = AAA_ki_iface; - files = sys/ki_iface.h; - select = 'These definitions are for HP Internal developers'; - replace; /* empty replacement -> no fixing the file */ -}; - - -/* - * Purge some HP-UX 11 files that are only broken after they are "fixed". - */ -fix = { - hackname = AAA_ki; - files = sys/ki.h; - select = '11.00 HP-UX LP64'; - replace; /* empty replacement -> no fixing the file */ -}; - - -/* - * Purge some HP-UX 11 files that are only broken after they are "fixed". - */ -fix = { - hackname = AAA_ki_calls; - files = sys/ki_calls.h; - select = 'kthread_create_caller_t'; - replace; /* empty replacement -> no fixing the file */ -}; - - -/* - * Purge some HP-UX 11 files that are only broken after they are "fixed". - */ -fix = { - hackname = AAA_ki_defs; - files = sys/ki_defs.h; - select = 'Kernel Instrumentation Definitions'; - replace; /* empty replacement -> no fixing the file */ -}; - - -/* - * This file on SunOS 4 has a very large macro. When the sed loop - * tries pull it in, it overflows the pattern space size of the SunOS - * sed (GNU sed does not have this problem). Since the file does not - * require fixing, we remove it from the fixed directory. - */ -fix = { - hackname = AAA_bad_fixes; - files = sundev/ipi_error.h; - /* shouldn't there be a select expression here??? */ - replace; /* empty replacement -> no fixing the file */ -}; - - -/* - * Purge some HP-UX 11 files that are only broken after they are "fixed". - */ -fix = { - hackname = AAA_time; - files = sys/time.h; - select = '11.0 and later representation of ki time'; - replace; /* empty replacement -> no fixing the file */ -}; - -/* And now, the real fixes, replacement text fixes first: */ - -/* - * 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 = "#ifndef __INT_VARARGS_H -\#define __INT_VARARGS_H - -/************************************************************************/ -/* _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 <sys/_int_features.h> -\#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 */\n"; -}; - - /* * This fixes __FD_ZERO bug for linux 2.x.y (x <= 2 && y <= some n) */ fix = { hackname = AAB_fd_zero_asm_posix_types_h; files = asm/posix_types.h; - mach = 'i[34567]86-*-linux-gnu*'; + mach = 'i[34567]86-*-linux*'; bypass = '} while'; /* @@ -172,29 +35,28 @@ fix = { * the wrapper, this will follow the #include_next chain until * we arrive at the real . */ - replace = - -'/* This file fixes a bug in the __FD_ZERO macro - for older versions of the Linux kernel. */ -\#ifndef _POSIX_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" \\ - : "=&c" (__d0), "=&D" (__d1) \\ - : "a" (0), "0" (__FDSET_LONGS), \\ - "1" ((__kernel_fd_set *) (fdsetp)) :"memory"); \\ - } while (0) -\#endif - -\#define _POSIX_TYPES_H_WRAPPER -\#endif /* _POSIX_TYPES_H_WRAPPER */ -'; + replace = <<- _EndOfHeader_ + /* This file fixes a bug in the __FD_ZERO macro + for older versions of the Linux kernel. */ + #ifndef _POSIX_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" \ + : "=&c" (__d0), "=&D" (__d1) \ + : "a" (0), "0" (__FDSET_LONGS), \ + "1" ((__kernel_fd_set *) (fdsetp)) :"memory"); \ + } while (0) + #endif + + #define _POSIX_TYPES_H_WRAPPER + #endif /* _POSIX_TYPES_H_WRAPPER */ + _EndOfHeader_; }; @@ -204,7 +66,7 @@ fix = { fix = { hackname = AAB_fd_zero_gnu_types_h; files = gnu/types.h; - mach = 'i[34567]86-*-linux-gnu*'; + mach = 'i[34567]86-*-linux*'; /* * Define _TYPES_H_WRAPPER at the end of the wrapper, not @@ -212,28 +74,27 @@ fix = { * the wrapper, this will follow the #include_next chain until * we arrive at the real . */ - replace = - -'/* 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" \\ + replace = <<- _EndOfHeader_ + /* 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" \\ : "=&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_; }; @@ -243,7 +104,7 @@ fix = { fix = { hackname = AAB_fd_zero_selectbits_h; files = selectbits.h; - mach = 'i[34567]86-*-linux-gnu*'; + mach = 'i[34567]86-*-linux*'; /* * Define _SELECTBITS_H_WRAPPER at the end of the wrapper, not @@ -251,32 +112,50 @@ fix = { * the wrapper, this will follow the #include_next chain until * we arrive at the real . */ - replace = - -'/* 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" \\ + 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 + + #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_; +}; + + +/* + * Solaris is a DDK (aka kernel-land) header providing + * the same interface as . No idea why they couldn't have just + * used the standard header. + */ +fix = { + hackname = AAB_solaris_sys_varargs_h; + files = "sys/varargs.h"; + mach = '*-*-solaris*'; + replace = <<- _EndOfHeader_ + #ifdef __STDC__ + #include + #else + #include + #endif + _EndOfHeader_; }; @@ -290,222 +169,218 @@ 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(); -extern int memcmp(); + #endif /* __memory_h__ */ + _EndOfHeader; +}; -\#endif /* __memory_h__ */ -'; +/* + * Completely replace with a file that includes gcc's + * stdarg.h or varargs.h files as appropriate. + */ +#ifdef SVR4 +fix = { + hackname = AAB_svr4_no_varargs; + files = sys/varargs.h; + 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 /* * Completely replace ; with a file that implements gcc's - * optimized byteswapping. Restricted to "SVR4" machines until either - * it is shown to be safe to replace this file always, or we get bolder ;-) + * optimized byteswapping. */ 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]"; -#endif /* SVR5 */ + mach = "*-*-sysv4*"; + mach = "i[34567]86-*-sysv5*"; + mach = "i[34567]86-*-sco3.2v5*"; + mach = "i[34567]86-*-udk*"; + mach = "i[34567]86-*-solaris2.[0-4]"; + mach = "powerpcle-*-solaris2.[0-4]"; + mach = "sparc-*-solaris2.[0-4]"; 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_; }; /* - * Completely replace with a file that includes gcc's - * stdarg.h or varargs.h files as appropriate. - */ -#ifdef SVR4 -fix = { - hackname = AAB_svr4_no_varargs; - files = sys/varargs.h; - 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 - - -/* * Cancel out ansi_compat.h on Ultrix. Replace it with an empty file. */ fix = { @@ -524,14 +399,12 @@ fix = { hackname = AAB_ultrix_limits; files = limits.h; mach = "*-*-ultrix4.3"; - replace = -'/* @(#)limits.h */ -/* This file was generated by fixincludes */ -\#ifndef _LIMITS_INCLUDED -\#define _LIMITS_INCLUDED -\#include -\#endif /* _LIMITS_INCLUDED */ -'; + replace = <<- _EndOfHeader_ + #ifndef _LIMITS_INCLUDED + #define _LIMITS_INCLUDED + #include + #endif /* _LIMITS_INCLUDED */ + _EndOfHeader_; }; @@ -544,14 +417,12 @@ fix = { hackname = AAB_ultrix_memory; files = memory.h; mach = "*-*-ultrix4.3"; - replace = -'/* @(#)memory.h */ -/* This file was generated by fixincludes */ -\#ifndef _MEMORY_INCLUDED -\#define _MEMORY_INCLUDED -\#include -\#endif /* _MEMORY_INCLUDED */ -'; + replace = <<- _EndOfHeader_ + #ifndef _MEMORY_INCLUDED + #define _MEMORY_INCLUDED + #include + #endif /* _MEMORY_INCLUDED */ + _EndOfHeader_; }; @@ -564,14 +435,42 @@ fix = { hackname = AAB_ultrix_string; files = string.h; mach = "*-*-ultrix4.3"; - replace = -'/* @(#)string.h */ -/* This file was generated by fixincludes */ -\#ifndef _STRING_INCLUDED -\#define _STRING_INCLUDED -\#include -\#endif /* _STRING_INCLUDED */ -'; + replace = <<- _EndOfHeader_ + #ifndef _STRING_INCLUDED + #define _STRING_INCLUDED + #include + #endif /* _STRING_INCLUDED */ + _EndOfHeader_; +}; + + +/* + * pthread.h on AIX 4.3.3 tries to define a macro without whitspace + * which violates a requirement of ISO C. + */ +fix = { + hackname = aix_pthread; + files = "pthread.h"; + select = "(#define [A-Za-z_0-9]+)(\\\\\n[^A-Za-z_0-9 \t\n(])"; + c_fix = format; + c_fix_arg = "%1 %2"; + test_text = "#define PTHREAD_MUTEX_INITIALIZER\\\\\n" + "{...init stuff...}"; +}; + + +/* + * sys/machine.h on AIX 4.3.3 puts whitespace between a \ and a newline + * in an otherwise harmless (and #ifed out) macro definition + */ +fix = { + hackname = aix_sysmachine; + files = sys/machine.h; + select = "\\\\ +\n"; + c_fix = format; + c_fix_arg = "\\\n"; + test_text = "#define FOO \\\n" + " bar \\ \n baz \\ \n bat"; }; @@ -609,94 +508,85 @@ fix = { /* - * Fix getopt declarations in stdio.h and stdlib.h on Alpha OSF/1 and AIX. + * Fix __assert declaration in assert.h on Alpha OSF/1. */ fix = { - hackname = alpha_getopt; - files = "stdio.h"; - files = "stdlib.h"; - select = 'getopt\(int, char \*\[\], *char \*\)'; + hackname = alpha___assert; + files = "assert.h"; + select = '__assert\(char \*, char \*, int\)'; c_fix = format; - c_fix_arg = "getopt(int, char *const[], const char *)"; - test_text = 'extern int getopt(int, char *[], char *);'; + c_fix_arg = "__assert(const char *, const char *, int)"; + test_text = 'extern void __assert(char *, char *, int);'; }; /* - * Remove erroneous parentheses in sym.h on Alpha OSF/1. + * Obey __PRAGMA_EXTERN_PREFIX for Tru64 UNIX V5 . */ fix = { - hackname = alpha_parens; - files = sym.h; - select = '#ifndef\(__mips64\)'; + hackname = alpha___extern_prefix; + files = sys/stat.h; + select = "#[ \t]*if[ \t]*defined\\(__DECC\\)"; + + mach = "alpha*-dec-osf5*"; c_fix = format; - c_fix_arg = "#ifndef __mips64"; - test_text = "#ifndef(__mips64) /* bogus */\nextern int foo;\n#endif"; + c_fix_arg = "%0 || defined(__PRAGMA_EXTERN_PREFIX)"; + + test_text = "# if defined(__DECC)"; }; /* - * Fix return value of sbrk in unistd.h on Alpha OSF/1 V2.0 + * Fix assert macro in assert.h on Alpha OSF/1. + * The superfluous int cast breaks C++. */ fix = { - hackname = alpha_sbrk; - files = unistd.h; - select = "char[ \t]*\\*[\t ]*sbrk[ \t]*\\("; + hackname = alpha_assert; + files = "assert.h"; + select = '(#define assert\(EX\).*)\(\(int\) \(EX\)\)'; c_fix = format; - c_fix_arg = "void *sbrk("; - test_text = "extern char* sbrk(ptrdiff_t increment);"; + c_fix_arg = "%1(EX)"; + test_text = '#define assert(EX) (((int) (EX)) ? (void)0 : __assert(#EX, __FILE__, __LINE__))'; }; /* - * Fix this ARM/RISCiX file where ___type is a Compiler - * hint that is specific to the Norcroft compiler. + * Fix getopt declarations in stdio.h and stdlib.h on Alpha OSF/1 and AIX. */ fix = { - hackname = arm_norcroft_hint; - select = "___type p_type"; - files = "X11/Intrinsic.h"; + hackname = alpha_getopt; + files = "stdio.h"; + files = "stdlib.h"; + select = 'getopt\(int, char \*\[\], *char \*\)'; c_fix = format; - c_fix_arg = "p_type"; - test_text = "___type p_type mumble;"; + c_fix_arg = "getopt(int, char *const[], const char *)"; + test_text = 'extern int getopt(int, char *[], char *);'; }; /* - * Fix this ARM/RISCiX file to avoid interfering - * with the use of __wchar_t in cc1plus. + * Remove erroneous parentheses in sym.h on Alpha OSF/1. */ fix = { - hackname = arm_wchar; - files = stdlib.h; - select = "#[ \t]*define[ \t]*__wchar_t"; - + hackname = alpha_parens; + files = sym.h; + select = '#ifndef\(__mips64\)'; 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 */"; + c_fix_arg = "#ifndef __mips64"; + test_text = "#ifndef(__mips64) /* bogus */\nextern int foo;\n#endif"; }; /* - * This file in A/UX 3.0.x/3.1.x contains an __asm directive for c89; - * gcc doesn't understand it. + * Fix return value of sbrk in unistd.h on Alpha OSF/1 V2.0 */ fix = { - hackname = aux_asm; - files = sys/param.h; - select = "#ifndef NOINLINE"; - + hackname = alpha_sbrk; + files = unistd.h; + select = "char[ \t]*\\*[\t ]*sbrk[ \t]*\\("; 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 */"; + c_fix_arg = "void *sbrk("; + test_text = "extern char* sbrk(ptrdiff_t increment);"; }; @@ -722,6 +612,7 @@ fix = { test_text = "# define bool\t char \n"; }; + fix = { hackname = avoid_bool_type; files = curses.h; @@ -734,9 +625,25 @@ fix = { c_fix = format; c_fix_arg = "#ifndef __cplusplus\n%0\n#endif"; - c_fix_arg = "^[ \t]*typedef[ \t].*[ \t]bool[ \t]*;.*"; - test_text = "typedef unsigned int\tbool \t; /* bool type */"; + 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. + */ + +fix = { + hackname = avoid_wchar_t_type; + + select = "^[ \t]*typedef[ \t].*[ \t]wchar_t[ \t]*;"; + + c_fix = format; + c_fix_arg = "#ifndef __cplusplus\n%0\n#endif"; + + test_text = "typedef unsigned short\twchar_t \t; /* wchar_t\n type */"; }; @@ -846,23 +753,23 @@ fix = { /* * Remove `extern double cabs' declarations from math.h. - * This conflicts with C9x. Discovered on AIX. + * This conflicts with C99. Discovered on AIX. * SunOS4 has its cabs() declaration followed by a comment which * terminates on the following line. */ fix = { hackname = broken_cabs; files = "math.h"; - select = '^extern double cabs'; + select = '^extern[ \t]+double[ \t]+cabs'; c_fix = format; c_fix_arg = ""; - c_fix_arg = "^extern double cabs\\((struct dbl_hypot|)\\);"; + c_fix_arg = "^extern[ \t]+double[ \t]+cabs\\((struct dbl_hypot|)\\);"; test_text = "#ifdef __STDC__\n" - "extern double cabs(struct dbl_hypot);\n" + "extern double cabs(struct dbl_hypot);\n" "#else\n" - "extern double cabs();\n" + "extern double cabs();\n" "#endif\n" "extern double cabs(); /* This is a comment\n" " and it ends here. */"; @@ -870,6 +777,26 @@ fix = { /* + * Various systems derived from BSD4.4 contain a macro definition + * for vfscanf that interacts badly with requirements of builtin-attrs.def. + * Known to be fixed in FreeBSD 5 system headers. + */ +fix = { + hackname = bsd_stdio_attrs_conflict; + mach = *-*-*bsd*; + mach = *-*-*darwin*; + files = stdio.h; + select = "^#define[ \t]*vfscanf[ \t]*__svfscanf[ \t]*$"; + c_fix = format; + c_fix_arg = '#define _BSD_STRING(_BSD_X) _BSD_STRINGX(_BSD_X)' "\n" + '#define _BSD_STRINGX(_BSD_X) #_BSD_X' "\n" + 'int vfscanf(FILE *, const char *, __builtin_va_list) ' + '__asm__ (_BSD_STRING(__USER_LABEL_PREFIX__) "__svfscanf");'; + test_text = '#define vfscanf __svfscanf'; +}; + + +/* * Fix various macros used to define ioctl numbers. * The traditional syntax was: * @@ -956,6 +883,22 @@ fix = { /* + * Fix typo in on DJGPP 2.03. + */ +fix = { + hackname = djgpp_wchar_h; + file = wchar.h; + select = "__DJ_wint_t"; + bypass = "sys/djtypes.h"; + c_fix = format; + c_fix_arg = "%0\n#include "; + c_fix_arg = "#include "; + test_text = "#include \n" + "extern __DJ_wint_t x;\n"; +}; + + +/* * Fix these Sun OS files to avoid an invalid identifier in an #ifdef. */ fix = { @@ -971,18 +914,40 @@ fix = { /* - * fix-header doesn't fix fabs' prototype, and I have no idea why. + * 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 + * (by design?) when __GNUC__ is set beyond 2. */ fix = { - hackname = fix_header_breakage; - mach = "m88k-motorola-sysv3*"; - files = "math.h"; - - select = 'extern double floor\(\), ceil\(\), fmod\(\), fabs\(\);'; + hackname = freebsd_gcc3_breakage; + mach = *-*-freebsd*; + files = sys/cdefs.h; + select = '^#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7$'; + bypass = '__GNUC__[ \t]*([>=]=[ \t]*[3-9]|>[ \t]*2)'; c_fix = format; - c_fix_arg = - 'extern double floor(), ceil(), fmod(), fabs _PARAMS((double));'; - test_text = 'extern double floor(), ceil(), fmod(), fabs();'; + c_fix_arg = '%0 || __GNUC__ >= 3'; + test_text = '#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7'; +}; + + +/* + * Fix these files to use the same types that we think they should. + */ +fix = { + hackname = gnu_types; + files = "sys/types.h"; + files = "stdlib.h"; + files = "sys/stdtypes.h"; + files = "stddef.h"; + files = "memory.h"; + files = "unistd.h"; + bypass = '_GCC_(PTRDIFF|SIZE|WCHAR)_T'; + select = "^[ \t]*typedef[ \t]+.*[ \t](ptrdiff|size|wchar)_t;"; + c_fix = gnu_type; + + test_text = "typedef long int ptrdiff_t; /* long int */\n" + "typedef uint_t size_t; /* uint_t */\n" + "typedef ushort_t wchar_t; /* ushort_t */"; }; @@ -1023,6 +988,132 @@ fix = { /* + * Delete C++ double pow (double, int) inline function from HP-UX 10 & 11 + * math.h to prevent clash with define in c_std/bits/std_cmath.h. + */ +fix = { + hackname = hpux10_cpp_pow_inline; + files = fixinc-test-limits.h, math.h; + select = <<- END_POW_INLINE + ^# +ifdef +__cplusplus + +} + +inline +double +pow\(double +__d,int +__expon\) +{ + [ ]+return +pow\(__d,\(double\)__expon\); + +} + +extern +"C" +{ + #else + # +endif + END_POW_INLINE; + + c_fix = format; + c_fix_arg = ""; + + test_text = + "# ifdef __cplusplus\n" + " }\n" + " inline double pow(double __d,int __expon) {\n" + "\t return pow(__d,(double)__expon);\n" + " }\n" + ' extern "C"' " {\n" + "#else\n" + "# endif"; +}; + +fix = { + hackname = hpux11_cpp_pow_inline; + files = math.h; + select = " +inline double pow\\(double d,int expon\\) {\n" + " +return pow\\(d, \\(double\\)expon\\);\n" + " +}\n"; + c_fix = format; + c_fix_arg = ""; + + test_text = + " inline double pow(double d,int expon) {\n" + " return pow(d, (double)expon);\n" + " }\n"; +}; + + +/* + * Fix hpux 10.X missing ctype declarations 1 + */ +fix = { + hackname = hpux10_ctype_declarations1; + files = ctype.h; + select = "^#[ \t]*define _toupper\\(__c\\)[ \t]*__toupper\\(__c\\)"; + bypass = "^[ \t]*extern[ \t]*int[ \t]*__tolower[ \t]*\\("; + c_fix = format; + c_fix_arg = "#ifdef _PROTOTYPES\n" + "extern int __tolower(int);\n" + "extern int __toupper(int);\n" + "#else /* NOT _PROTOTYPES */\n" + "extern int __tolower();\n" + "extern int __toupper();\n" + "#endif /* _PROTOTYPES */\n\n" + "%0\n"; + + test_text = "# define _toupper(__c) __toupper(__c)\n"; +}; + + +/* + * Fix hpux 10.X missing ctype declarations 2 + */ +fix = { + hackname = hpux10_ctype_declarations2; + files = ctype.h; + select = "^# if defined\\(_SB_CTYPE_MACROS\\) && \\!defined\\(__lint\\)"; + bypass = "^[ \t]*extern[ \t]*int[ \t]*_isalnum[ \t]*\\("; + c_fix = format; + c_fix_arg = "%0\n\n" + "#ifdef _PROTOTYPES\n" + " extern int _isalnum(int);\n" + " extern int _isalpha(int);\n" + " extern int _iscntrl(int);\n" + " extern int _isdigit(int);\n" + " extern int _isgraph(int);\n" + " extern int _islower(int);\n" + " extern int _isprint(int);\n" + " extern int _ispunct(int);\n" + " extern int _isspace(int);\n" + " extern int _isupper(int);\n" + " extern int _isxdigit(int);\n" + "# else /* not _PROTOTYPES */\n" + " extern int _isalnum();\n" + " extern int _isalpha();\n" + " extern int _iscntrl();\n" + " extern int _isdigit();\n" + " extern int _isgraph();\n" + " extern int _islower();\n" + " extern int _isprint();\n" + " extern int _ispunct();\n" + " extern int _isspace();\n" + " extern int _isupper();\n" + " extern int _isxdigit();\n" + "#endif /* _PROTOTYPES */\n"; + + test_text = "# if defined(_SB_CTYPE_MACROS) && !defined(__lint)\n" + " extern unsigned int *__SB_masks;\n"; +}; + + +/* + * Make sure hpux defines abs in header. + */ +fix = { + hackname = hpux11_abs; + mach = ia64-hp-hpux11*; + files = stdlib.h; + select = "ifndef _MATH_INCLUDED"; + c_fix = format; + c_fix_arg = "if !defined(_MATH_INCLUDED) || defined(__GNUG__)"; +// sed = "s/ifndef _MATH_INCLUDED/if !defined(_MATH_INCLUDED) || defined(__GNUG__)/"; + test_text = "#ifndef _MATH_INCLUDED"; +}; + + +/* * Keep HP-UX 11 from stomping on C++ math namespace * with defines for fabsf. */ @@ -1043,7 +1134,25 @@ fix = { /* - * In inttypes.h on HPUX 11, the use of __CONCAT__ in the definition + * Prevent HP-UX 11 from defining __size_t and preventing size_t from + * being defined by having it define _hpux_size_t instead. + */ +fix = { + hackname = hpux11_size_t; + mach = "*-hp-hpux11*"; + select = "__size_t"; + + c_fix = format; + c_fix_arg = "_hpux_size_t"; + + test_text = + "#define __size_t size_t\n" + " extern int getpwuid_r( char *, __size_t, struct passwd **);\n"; +}; + + +/* + * In inttypes.h on HPUX 11, the use of __CONCAT__ in the definition * of UINT32_C has undefined behavior according to ISO/ANSI: * the arguments to __CONCAT__ are not macro expanded before the * concatination happens so the trailing ')' in the first argument @@ -1051,7 +1160,7 @@ fix = { * invalid pp token. The behavior of invalid pp tokens is undefined. * GCC does not handle these invalid tokens the way the HP compiler does. * This problem will potentially occur anytime macros are used in the - * arguments to __CONCAT__. A general solution to this problem would be to + * arguments to __CONCAT__. A general solution to this problem would be to * insert another layer of macro between __CONCAT__ and its use * in UINT32_C. An example of this solution can be found in the C standard. * A more specific solution, the one used here, is to change the UINT32_C @@ -1071,6 +1180,22 @@ fix = { /* + * Fix hpux 11.00 broken vsnprintf declaration + */ +fix = { + hackname = hpux11_vsnprintf; + files = stdio.h; + select = '(extern int vsnprintf\(char \*, _[hpux]*_size_t, ' + 'const char \*,) __va__list\);'; + c_fix = format; + c_fix_arg = "%1 __va_list);"; + + test_text = 'extern int vsnprintf(char *, _hpux_size_t, const char *,' + ' __va__list);'; +}; + + +/* * get rid of bogus inline definitions in HP-UX 8.0 */ fix = { @@ -1088,43 +1213,91 @@ fix = { /* - * Fix return type of abort and free + * Fix hpux broken ctype macros */ fix = { - hackname = int_abort_free_and_exit; + hackname = hpux_ctype_macros; + files = ctype.h; + select = '((: |\()__SB_masks \? )' + '(__SB_masks\[__(alnum|c)\] & _IS)'; + c_fix = format; + c_fix_arg = "%1(int)%3"; + + test_text = ": __SB_masks ? __SB_masks[__alnum] & _ISCNTRL\n" + "# define isalpha(__c) (__SB_masks ? __SB_masks[__c] & _IS\n"; +}; + + +/* + * HP-UX long_double + */ +fix = { + hackname = hpux_long_double; files = stdlib.h; - select = "int[ \t]+(abort|free|exit)[ \t]*\\("; + select = "extern[ \t]long_double[ \t]strtold"; + bypass = "long_double_t"; + sed = "/^#[ \t]*ifndef _LONG_DOUBLE/,/\\/\\* _LONG_DOUBLE \\*\\//D"; + sed = "s/long_double/long double/g"; + + test_text = "# ifndef _LONG_DOUBLE\n" + "# define _LONG_DOUBLE\n" + " typedef struct {\n" + " unsigned int word1, word2, word3, word4;\n" + " } long_double;\n" + "# endif /* _LONG_DOUBLE */\n" + "extern long_double strtold(const char *, char **);\n"; +}; + + +/* + * 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 = "void\t%1("; + c_fix_arg = "#ifndef MAXINT\n%0\n#endif"; + c_fix_arg = "^#[ \t]*define[ \t]+MAXINT[ \t].*"; - test_text = "extern int abort(int);\n" - "extern int free(void*);\n" - "extern int exit(void*);"; + test_text = '#define MAXINT 0x7FFFFFFF'; }; /* - * 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 hpux10.20 to avoid invalid forward decl */ fix = { - hackname = isc_omits_with_stdc; + hackname = hpux_systime; + files = sys/time.h; + select = "^extern struct sigevent;"; - files = "stdio.h"; - files = "math.h"; - files = "ctype.h"; - files = "sys/limits.h"; - files = "sys/fcntl.h"; - files = "sys/dirent.h"; + c_fix = format; + c_fix_arg = "struct sigevent;"; + + test_text = 'extern struct sigevent;'; +}; + + +/* + * Fix return type of abort and free + */ +fix = { + hackname = int_abort_free_and_exit; + files = stdlib.h; + select = "int[ \t]+(abort|free|exit)[ \t]*\\("; - 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"; + c_fix_arg = "void\t%1("; + + test_text = "extern int abort(int);\n" + "extern int free(void*);\n" + "extern int exit(void*);"; }; @@ -1171,69 +1344,126 @@ fix = { /* - * HPUX 10.x sys/param.h defines MAXINT which clashes with values.h + * Check for missing ';' in struct */ fix = { - hackname = hpux_maxint; - files = sys/param.h; - select = "^#[ \t]*define[ \t]*MAXINT[ \t]"; + hackname = ip_missing_semi; + files = netinet/ip.h; + select = "}$"; + sed = "/^struct/,/^};/s/}$/};/"; + test_text= + "struct mumble {\n" + " union {\n" + " int x;\n" + " }\n" + "}; /* mumbled struct */\n"; +}; + +/* + * IRIX 6.5.1[89] unconditionally defines + * __restrict as restrict iff __c99. This is wrong for C++, which + * needs many C99 features, but only supports __restrict. + */ +fix = { + hackname = irix___restrict; + files = internal/sgimacros.h; + select = "(#ifdef __c99\n)(#[ \t]*define __restrict restrict)"; + + mach = "mips-sgi-irix6.5"; c_fix = format; - c_fix_arg = "#ifndef MAXINT\n%0\n#endif"; - c_fix_arg = "^#[ \t]*define[ \t]*MAXINT[ \t].*"; + c_fix_arg = "%1" + "# ifndef __cplusplus\n%2\n# endif"; - test_text = '#define MAXINT 0x7FFFFFFF'; + test_text = "#ifdef __c99\n# define __restrict restrict"; }; - /* - * Fix hpux10.20 to avoid invalid forward decl + * IRIX 5.2's contains an asm comment with a contraction + * that causes the assembly preprocessor to complain about an + * unterminated character constant. */ fix = { - hackname = hpux_systime; - files = sys/time.h; - select = "^extern struct sigevent;"; + hackname = irix_asm_apostrophe; + files = sys/asm.h; + select = "^[ \t]*#.*[Ww]e're"; c_fix = format; - c_fix_arg = "struct sigevent;"; + c_fix_arg = "%1 are"; + c_fix_arg = "^([ \t]*#.*[Ww]e)'re"; + test_text = "\t# and we're on vacation"; +}; - test_text = 'extern struct sigevent;'; + +/* + * Non-traditional "const" declaration in Irix's limits.h. + */ +fix = { + hackname = irix_limits_const; + files = fixinc-test-limits.h, limits.h; + select = "^extern const "; + c_fix = format; + c_fix_arg = "extern __const "; + test_text = "extern const char limit; /* test limits */"; }; /* - * Check for missing ';' in struct + * IRIX 6.5.1[78] has a broken definition of socklen_t. + * Various socket function prototypes use different types instead, + * depending on the API in use (BSD, XPG4/5), but the socklen_t + * definition doesn't reflect this (SGI Bug Id 864477, fixed in + * IRIX 6.5.19). */ fix = { - hackname = ip_missing_semi; - files = netinet/ip.h; - select = "}$"; - sed = "/^struct/,/^};/s/}$/};/"; - test_text= - "struct mumble {\n" - " union {\n" - " int x;\n" - " }\n" - "}; /* mumbled struct */\n"; + hackname = irix_socklen_t; + files = sys/socket.h; + select = "(#define _SOCKLEN_T\n)(typedef u_int32_t socklen_t;)"; + + mach = "mips-sgi-irix6.5"; + c_fix = format; + c_fix_arg = "%1" + "#if _NO_XOPEN4 && _NO_XOPEN5\n" + "typedef int socklen_t;\n" + "#else\n" + "%2\n" + "#endif /* _NO_XOPEN4 && _NO_XOPEN5 */"; + + test_text = "#define _SOCKLEN_T\ntypedef u_int32_t socklen_t;"; +}; + +/* + * IRIX 5.x's stdio.h declares some functions that take a va_list as + * taking char *. However, GCC uses void * for va_list, so + * calling vfprintf with a va_list fails in C++. */ +fix = { + hackname = irix_stdio_va_list; + files = stdio.h; + + select = '(printf\(.*), /\* va_list \*/ char \*'; + c_fix = format; + c_fix_arg = "%1, __gnuc_va_list"; + test_text = + "extern int printf( const char *, /* va_list */ char * );"; }; /* - * IRIX 5.2's contains an asm comment with a contraction - * that causes the assembly preprocessor to complain about an - * unterminated character constant. + * IRIX 6.5.19 provides the XPG4 variant of + * wcsftime by default. ISO C99 requires the XPG5 variant instead. */ fix = { - hackname = irix_asm_apostrophe; - files = sys/asm.h; + hackname = irix_wcsftime; + files = internal/wchar_core.h; + select = "#if _NO_XOPEN5\n(extern size_t[ \t]+wcsftime.*const char \*.*)"; - select = "^[ \t]*#.*[Ww]e're"; + mach = "mips-sgi-irix6.5"; c_fix = format; - c_fix_arg = "%1 are"; - c_fix_arg = "^([ \t]*#.*[Ww]e)'re"; - test_text = "\t# and we're on vacation"; -}; + c_fix_arg = "#if _NO_XOPEN5 && !defined(__c99)\n%1"; + test_text = "#if _NO_XOPEN5\n" + "extern size_t wcsftime(wchar_t *, __SGI_LIBC_NAMESPACE_QUALIFIER size_t, const char *, const struct tm *);"; +}; /* * Fixing ISC fmod declaration @@ -1249,6 +1479,30 @@ fix = { /* + * 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 * use / * * / to concatenate tokens. */ @@ -1280,6 +1534,21 @@ fix = { /* + * Fix libc1 _G_va_list definition, used in declarations of several + * more-or-less standard functions, for example vasprintf. + */ +fix = { + hackname = libc1_G_va_list; + files = _G_config.h; + mach = '*-*-linux*libc1'; + select = 'typedef void \* _G_va_list;'; + c_fix = format; + c_fix_arg = "typedef __builtin_va_list _G_va_list;"; + test_text = 'typedef void * _G_va_list;'; +}; + + +/* * GNU libc1 string.h does not prototype memcpy and memcmp for gcc * versions > 1. This fix will open up the declaration for all * versions of GCC and for g++. @@ -1322,12 +1591,16 @@ fix = { * 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"; - bypass = "ifndef[ \t]+FLT_MIN"; + bypass = "ifndef[ \t]+FLT_(MIN|MAX)"; c_fix = format; c_fix_arg = "#ifndef %1\n%0\n#endif"; @@ -1365,72 +1638,13 @@ 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_. + * + * On NetBSD, machine is a symbolic link to an architecture specific + * directory name, so we can't match a specific file name here. */ fix = { hackname = machine_ansi_h_va_list; - files = machine/ansi.h; select = "define[ \t]+_BSD_VA_LIST_[ \t]"; bypass = '__builtin_va_list'; @@ -1540,6 +1754,19 @@ fix = { /* + * nested comment + */ +fix = { + hackname = nested_auth_des; + files = rpc/rpc.h; + select = '(/\*.*rpc/auth_des\.h>.*)/\*'; + c_fix = format; + c_fix_arg = "%1*/ /*"; + test_text = "/*#include /* skip this */"; +}; + + +/* * Fix nested comments in Motorola's and */ fix = { @@ -1574,30 +1801,20 @@ fix = { "#define OPEN_MAX 20 /* Max, Max, ... */\n"; }; -/* - * nested comment - */ -fix = { - hackname = nested_auth_des; - files = rpc/rpc.h; - select = '(/\*.*rpc/auth_des\.h>.*)/\*'; - c_fix = format; - c_fix_arg = "%1*/ /*"; - test_text = "/*#include /* skip this */"; -}; - /* - * fix bogus recursive stdlib.h in NEWS-OS 4.0C + * NetBSD has a semicolon after the ending '}' for some extern "C". */ fix = { - hackname = news_os_recursion; - files = stdlib.h; - select = "[ \t]*#include .*"; + hackname = netbsd_extra_semicolon; + mach = *-*-netbsd*; + files = sys/cdefs.h; + select = "#define[ \t]*__END_DECLS[ \t]*};"; c_fix = format; - c_fix_arg = "#ifdef BOGUS_RECURSION\n%0\n#endif"; - test_text = "#include "; + c_fix_arg = "#define __END_DECLS }"; + + test_text = "#define __END_DECLS };"; }; @@ -1757,7 +1974,7 @@ fix = { /* - * function class(double x) conflicts with C++ keyword on rs/6000 + * function class(double x) conflicts with C++ keyword on rs/6000 */ fix = { hackname = rs6000_double; @@ -1786,7 +2003,7 @@ fix = { /* - * parameters conflict with C++ new on rs/6000 + * parameters conflict with C++ new on rs/6000 */ fix = { hackname = rs6000_param; @@ -1802,7 +2019,77 @@ fix = { /* - * The static functions lstat() and fchmod() in + * On OpenServer and on UnixWare 7, 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; + files = ansi/math.h; + files = posix/math.h; + files = xpg4/math.h; + files = xpg4v2/math.h; + files = xpg4plus/math.h; + files = ods_30_compat/math.h; + files = oldstyle/math.h; + select = "inline double abs"; + 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"; + + 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__ */"; + + test_text = + "#define __fp_class(a) \\\\\n" + " __builtin_generic(a,\"ld:__fplcassifyl;f:__fpclassifyf;:__fpclassify\")\n"; + +}; + + +/* + * On SCO OpenServer prior to 5.0.7UP1, and + * have a clash on struct _fpstate and struct fpstate. + */ +fix = { + hackname = sco_regset; + files = sys/regset.h; + mach = "*-*-sco3.2v5*"; + select = "(struct[ \t]+.*)fpstate"; + c_fix = format; + c_fix_arg = "%1rsfpstate"; + + test_text = + "union u_fps {\n" + " struct\tfpstate\n" + " {\n" + " int whatever;\n" + " }\n" + "};\n" + "union _u_fps {\n" + " struct _fpstate\n" + " {\n" + " int whatever;\n" + " }\n" + "};\n"; +}; + + +/* + * The static functions lstat() and fchmod() in * cause G++ grief since they're not wrapped in "if __cplusplus". * * On SCO OpenServer 5.0.0 through (at least) 5.0.5 contains @@ -1828,7 +2115,7 @@ fix = { "#ifdef __STDC__\n" "static int\tstat(const char *__f, struct stat *__p) {\n" "\treturn __stat32(__f, __p);\n" - "}\n\n# else /* !__STDC__ */\n" + "}\n\n# else /* !__STDC__ THIS FAILS ON BSD SYSTEMS */\n" "static int\tstat(__f, __p)\n" "\tchar *__f;\n" @@ -1841,22 +2128,6 @@ fix = { /* - * "!__STDC__" is "!defined( __STRICT_ANSI__ )" - */ -fix = { - hackname = sco_strict_ansi; - mach = "i?86-*-sco3.2*"; - select = "^[ \t]*#[ \t]*if.*!__STDC__"; - - c_fix = format; - c_fix_arg = "%1defined(__STRICT_ANSI__)%2"; - c_fix_arg = "^([ \t]*#[ \t]*if[ \t].*!)__STDC__(.*)"; - - test_text = "#if !__STDC__ /* not standard C */\nint foo;\n#endif"; -}; - - -/* * Fix prototype declaration of utime in sys/times.h. * In 3.2v4.0 the const is missing. */ @@ -1874,33 +2145,84 @@ fix = { /* - * Sony NEWSOS 5.0 does not support the complete ANSI C standard. + * Sun Solaris 2.5.1, 2.6 defines PTHREAD_{MUTEX|COND}_INITIALIZER + * incorrectly, so we replace them with versions that correspond to + * the definition. We also explicitly name this fix "1" and the next + * fix "2" because this one does not deal with the last field. This + * fix needs to run before the next. */ -#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"; + hackname = solaris_mutex_init_1; + select = '@\(#\)pthread.h' "[ \t]+1.1[0-9][ \t]+9[567]/[0-9/]+ SMI"; + files = pthread.h; + sed = "/define[ \t]*PTHREAD_MUTEX_INI/s/{0, 0,/{{{0}, 0}, {{{0}}},/\n" + "/define[ \t]*PTHREAD_COND_INI/s/{0,/{{{0},0},/"; + test_text = + '#ident "@(#)pthread.h 1.16 97/05/05 SMI"'"\n" + "#define PTHREAD_MUTEX_INITIALIZER\t{0, 0, 0}\n" + "#define PTHREAD_COND_INITIALIZER\t{0, 0} /* */\n"; }; -#endif /* - * Sony NEWSOS 5.0 does not support the complete ANSI C standard. + * Sun Solaris defines PTHREAD_MUTEX_INITIALIZER with a trailing + * "0" for the last field of the pthread_mutex_t structure, which is + * of type upad64_t, which itself is typedef'd to int64_t, but with + * __STDC__ defined (e.g. by -ansi) it is a union. So change the + * initializer to "{0}" instead */ -#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"; + hackname = solaris_mutex_init_2; + select = '@\(#\)pthread.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; + files = pthread.h; + c_fix = format; + c_fix_arg = "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n" + "%0\n" + "#else\n" + "%1, {0}}%3\n" + "#endif"; + c_fix_arg = "(^#define[ \t]+PTHREAD_(MUTEX|COND)_INITIALIZER[ \t]+{.*)" + ",[ \t]*0}" "(|[ \t].*)$"; + test_text = + '#ident "@(#)pthread.h 1.26 98/04/12 SMI"'"\n" + "#define PTHREAD_MUTEX_INITIALIZER\t{{{0},0}, {{{0}}}, 0}\n" + "#define PTHREAD_COND_INITIALIZER\t{{{0}, 0}, 0}\t/* DEFAULTCV */\n" + "#define PTHREAD_RWLOCK_INITIALIZER\t" + "{0, 0, 0, {0, 0, 0}, {0, 0}, {0, 0}}"; +}; + + +/* + * Solaris 2.8 has what appears to be some gross workaround for + * some old version of their c++ compiler. G++ doesn't want it + * either, but doesn't want to be tied to SunPRO version numbers. + */ +fix = { + hackname = solaris_stdio_tag; + files = stdio_tag.h; + + select = '__cplusplus < 54321L'; + sed = 's/defined(__cplusplus) && (__cplusplus < 54321L)/0/'; + + test_text = "#if\tdefined(__cplusplus) && (__cplusplus < 54321L)"; +}; + +/* + * until Solaris 2.5.1 defines macros for a couple of + * functions, breaking their prototypes if that file is included afterwards. + * Include early to avoid this issue, as is done on Solaris 2.6 + * and up. + */ +fix = { + hackname = solaris_widec; + files = widec.h; + mach = '*-*-solaris2.[0-5]*'; + bypass = "include.*wchar\\.h"; + select = "#include "; + c_fix = format; + c_fix_arg = "%0\n#include "; + test_text = "#include "; }; -#endif /* @@ -1961,11 +2283,12 @@ fix = { fix = { hackname = stdio_va_list; files = stdio.h; - bypass = '__gnuc_va_list|_BSD_VA_LIST_'; + bypass = '__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list'; /* * Use __gnuc_va_list in arg types in place of va_list. - * On 386BSD use __gnuc_va_list instead of _VA_LIST_. We're hoping the + * On 386BSD use __gnuc_va_list instead of _VA_LIST_. On Tru64 UNIX V5.1A + * use __gnuc_va_list instead of __VA_LIST__. We're hoping the * trailing parentheses and semicolon save all other systems from this. * Define __not_va_list__ (something harmless and unused) * instead of va_list. @@ -1974,11 +2297,13 @@ fix = { sed = "s@ va_list @ __gnuc_va_list @\n" "s@ va_list)@ __gnuc_va_list)@\n" "s@ _VA_LIST_));@ __gnuc_va_list));@\n" + "s@ __VA_LIST__));@ __gnuc_va_list));@\n" "s@ va_list@ __not_va_list__@\n" "s@\\*va_list@*__not_va_list__@\n" "s@ __va_list)@ __gnuc_va_list)@\n" "s@typedef[ \t]\\(.*\\)[ \t]va_list[ \t]*;" "@typedef \\1 __not_va_list__;@\n" + "s@typedef[ \t]*__va_list__@typedef __gnuc_va_list@\n" "s@GNUC_VA_LIST@GNUC_Va_LIST@\n" "s@_NEED___VA_LIST@_NEED___Va_LIST@\n" "s@VA_LIST@DUMMY_VA_LIST@\n" @@ -1988,18 +2313,83 @@ fix = { /* - * Check for strict ansi compliance + * "!__STDC__" or "__STDC__==0" or "__STDC__!=1" or "__STDC__-0==0" + * is "!defined( __STRICT_ANSI__ )" */ -#ifdef STRICT_ANSI fix = { - hackname = strict_ansi; - select = "__STDC__[ \t]*[=!]=[ \t]*[01]"; - sed = "s/__STDC__[ \t]*==[ \t]*0/!defined (__STRICT_ANSI__)/g"; - sed = "s/__STDC__[ \t]*!=[ \t]*0/defined (__STRICT_ANSI__)/g"; - sed = "s/__STDC__[ \t]*==[ \t]*1/defined (__STRICT_ANSI__)/g"; - sed = "s/__STDC__[ \t]*!=[ \t]*1/!defined (__STRICT_ANSI__)/g"; + hackname = strict_ansi_not; + select = "^([ \t]*#[ \t]*if.*)" + "(!__STDC__" + "|__STDC__[ \t]*==[ \t]*0" + "|__STDC__[ \t]*!=[ \t]*1" + "|__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*0)"; + /* Tru64 UNIX V4.0F/V5.1 supports GCC usage of __STDC__. */ + bypass = 'GNU and MIPS C compilers define __STDC__ differently'; + c_test = stdc_0_in_system_headers; + + c_fix = format; + c_fix_arg = "%1 !defined(__STRICT_ANSI__)"; + + test_text = "#if !__STDC__ \n" + "#if __STDC__ == 0\n" + "#if __STDC__ != 1\n" + "#if __STDC__ - 0 == 0" + "/* not std C */\nint foo;\n" + "\n#end-end-end-end-if :-)"; +}; + +/* + * "__STDC__-0==0" + * is "!defined( __STRICT_ANSI__ )" on continued #if-s + */ +fix = { + hackname = strict_ansi_not_ctd; + files = math.h, limits.h, stdio.h, signal.h, + stdlib.h, sys/signal.h, time.h; + /* + * Starting at the beginning of a line, skip white space and + * a leading "(" or "&&" or "||". One of those must be found. + * Then, zero, one or more copies of a "defined(_FOO_BAR_) &&" + * expression. If these are nested, then they must accumulate + * because we won't match any closing parentheses. Finally, + * after skipping over all that, we must then match our suspect + * phrase: "__STDC__-0==0" with or without white space. + */ + select = "^([ \t]*" '(\(|&&|\|\|)' + "([ \t(]*!*[ \t]*defined\\([a-zA-Z_0-9]+\\)[ \t]*[|&][|&])*" + "[ \t(]*)" + "(__STDC__[ \t]*(|-[ \t]*0[ \t]*)==[ \t]*0)"; + c_test = stdc_0_in_system_headers; + + c_fix = format; + c_fix_arg = "%1 !defined(__STRICT_ANSI__)"; + + test_text = "#if 1 && \\\\\n" + "&& defined(mumbling) |& (__STDC__ - 0 == 0) \\\\\n" + "( __STDC__ == 0 && !defined(_XOPEN_SOURCE) \\\\\n" + "|| __STDC__ - 0 == 0 ) /* not std C */\n" + "int foo;\n#endif"; +}; + + +/* + * "__STDC__!=0" or "__STDC__==1" or "__STDC__-0==1" + * is "defined( __STRICT_ANSI__ )" + */ +fix = { + hackname = strict_ansi_only; + select = "^([ \t]*#[ \t]*if.*)" + "(__STDC__[ \t]*!=[ \t]*0" + "|__STDC__[ \t]*==[ \t]*1" + "|__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*1" + "|__STDC__[ \t]*-[ \t]*0[ \t]*!=[ \t]*0)"; + c_test = stdc_0_in_system_headers; + + c_fix = format; + c_fix_arg = "%1 defined(__STRICT_ANSI__)"; + + test_text = "#if __STDC__ == 1 /* is std C\n */\nint foo;\n#endif"; }; -#endif /* @@ -2156,7 +2546,7 @@ fix = { files = math.h; /* If matherr has a prototype already, the header needs no fix. */ - bypass = 'matherr.*struct exception'; + bypass = 'matherr.*(struct exception|__MATH_EXCEPTION)'; select = matherr; c_fix = wrap; @@ -2201,14 +2591,13 @@ fix = { * that is visible to any ANSI compiler using this include. Simply * delete the lines that #define some string functions to internal forms. */ -#ifdef SVR4 fix = { hackname = svr4_disable_opt; files = string.h; select = '#define.*__std_hdr_'; sed = '/#define.*__std_hdr_/d'; + test_text = "#define strlen __std_hdr_strlen\n"; }; -#endif /* @@ -2354,8 +2743,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 @@ -2503,7 +2892,7 @@ fix = { #endif -/* +/* * Like svr4_mach_defines, but with newfangled syntax. * Source lines are of #define __i386 #machine(i386). Delete them. */ @@ -2518,27 +2907,6 @@ fix = { /* - * Fix these files to use the same types that we think they should. - */ -fix = { - hackname = gnu_types; - files = "sys/types.h"; - files = "stdlib.h"; - files = "sys/stdtypes.h"; - files = "stddef.h"; - files = "memory.h"; - files = "unistd.h"; - bypass = '_GCC_(PTRDIFF|SIZE|WCHAR)_T'; - select = "^[ \t]*typedef[ \t]+.*[ \t](ptrdiff|size|wchar)_t;"; - c_fix = gnu_type; - - test_text = "typedef long int ptrdiff_t; /* long int */\n" - "typedef uint_t size_t; /* uint_t */\n" - "typedef ushort_t wchar_t; /* ushort_t */"; -}; - - -/* * Fix return value of mem{ccpy,chr,cpy,set} and str{len,spn,cspn} * in string.h on sysV68 * Correct the return type for strlen in string.h on Lynx. @@ -2558,17 +2926,13 @@ fix = { sed = "/^extern char$/N"; sed = "s/^extern char\\(\\n\t\\*memccpy(),\\)$/extern void\\1/"; - /* - * This sed expression is broken inside fixincl. - * The same expression seems to work outside, however :-( - */ + sed = "/^extern int$/N"; + sed = "s/^extern int\\(\\n\tstrlen(),\\)/extern size_t\\1/"; + sed = "/^\tstrncmp(),$/N"; sed = 's/^\(' "\t" 'strncmp()\),\n\(' "\t" 'strlen(),\)$/' '\1;' "\\\nextern unsigned int\\\n\\2/"; - sed = "/^extern int$/N"; - sed = "s/^extern int\\(\\n\tstrlen(),\\)/extern size_t\\1/"; - test_text = "extern int strlen();\n" @@ -2579,6 +2943,7 @@ fix = { "\tmemcpy();\n" "extern int\n" + "\tstrcmp(),\n" "\tstrncmp(),\n" "\tstrlen(),\n" "\tstrspn();\n" @@ -2608,6 +2973,23 @@ fix = { /* + * __thread is now a keyword. + */ +fix = { + hackname = thread_keyword; + files = "pthread.h"; + files = "bits/sigthread.h"; + select = "([* ])__thread([,)])"; + c_fix = format; + c_fix_arg = "%1__thr%2"; + + test_text = + "extern int pthread_create (pthread_t *__restrict __thread,\n" + "extern int pthread_kill (pthread_t __thread, int __signo);\n" + "extern int pthread_cancel (pthread_t __thread);"; +}; + +/* * if the #if says _cplusplus, not the double underscore __cplusplus * that it should be */ @@ -2623,6 +3005,21 @@ fix = { /* + * function parameter to atexit is missing "void" on VAX Ultrix 4.3. + */ +fix = { + hackname = ultrix_atexit_param; + files = stdlib.h; + select = 'atexit\(.*\(\)'; + + c_fix = format; + c_fix_arg = "atexit( void (*__func)( void )"; + + test_text = "int atexit( void (*__func)() );\n"; +}; + + +/* * parameter to atof not const on DECstation Ultrix V4.0 and NEWS-OS 4.2R. */ fix = { @@ -2773,7 +3170,7 @@ fix = { test_text = "@(#)stat.h 6.1 (ULTRIX)\n" "#define S_IFPORT S_IFIFO\n" - "\tfstat(),\n"; + "\tfstat(),\n/* THE INSERTION LINE FAILS ON BSD SYSTEMS */"; }; @@ -2823,6 +3220,23 @@ fix = { 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. + */ +fix = { + hackname = unicosmk_restrict; + files = stdio.h; + files = stdlib.h; + files = wchar.h; + mach = "*-*-unicosmk*"; + select = "(\\*[ \t]*)restrict([ \t]+)"; + + c_fix = format; + c_fix_arg = "%1__restrict__%2"; + + test_text = "void f (char * restrict x);"; +}; /* * If arpa/inet.h prototypes are incompatible with the ones we just @@ -2834,7 +3248,7 @@ fix = { hackname = uw7_byteorder_fix; files = arpa/inet.h; select = "in_port_t"; - test = "-f $DESTDIR/sys/byteorder.h"; + test = "-f sys/byteorder.h"; #ifndef SVR5 mach = "*-*-sysv4*"; mach = "i?86-*-sysv5*"; @@ -2846,12 +3260,12 @@ fix = { c_fix = format; c_fix_arg = ""; - c_fix_arg = "^extern.*(htons|ntohs).*\\(in_port_t\\).*\n"; + c_fix_arg = "^extern.*[ \t](htons|ntohs).*\\(in_port_t\\).*;"; - test_text = "extern htons(in_port_t);" + test_text = "extern in_port_t\thtons __P((in_port_t));\n" + "extern in_port_t\tntohs __P((in_port_t));" "`[ ! -d $DESTDIR/sys ] && mkdir $DESTDIR/sys\n" - "echo '/* DUMMY */' >> sys/byteorder.h\n" - "touch $DESTDIR/sys/byteorder.h`"; + "echo '/* DUMMY */' >> sys/byteorder.h`"; }; @@ -2999,6 +3413,41 @@ fix = { }; +/* + * WindISS math.h headers include bogus extern declarations of + * numerous math functions that conflict with libstdc++-v3. + */ +fix = { + hackname = windiss_math1; + files = math.h; + mach = "*-*-windiss"; + sed = "s|inline long double cosl.*|#ifndef __GNUC__|"; + + test_text = "inline long double cosl(long double);"; +}; + +fix = { + hackname = windiss_math2; + files = math.h; + mach = "*-*-windiss"; + sed = "s|/\\* long double declarations \\*/|" + "#endif /* __GNUC__ */|"; + + test_text = "/* long double declarations */"; +}; + +/* + * WindISS headers include "diab/va_list.h" instead of "stdarg.h" + */ +fix = { + select = '(#include.*)diab/va_list.h'; + hackname = windiss_valist; + sed = "s|diab/va_list.h|stdarg.h|"; + mach = "*-*-windiss"; + + test_text = "#include "; +}; + /* * There are several name conflicts with C++ reserved words in X11 header * files. These are fixed in some versions, so don't do the fixes if @@ -3054,7 +3503,7 @@ fix = { sed = "s/Widget new,/Widget c_new,/g"; test_text = "struct wedge {\n" - " Widget\told, new; /* fix the new */\n" + " Widget\told, new; /* fixinc check FAILS ON BSD */\n" "};\nextern Wedged( Widget new, Widget old );"; };