-
/* -*- Mode: C -*- */
autogen definitions fixincl;
This is the sort command:
- blocksort output=XXX \
+ blocksort output=inclhack.sorted \
pattern='^/\*$' \
- start='== REPLACEMENT FIXES ==' \
trailer='^/\*EOF\*[/]' \
input=inclhack.def \
key='hackname[ ]*=[ ]*(.*);'
FIXINC_DEBUG = yes;
#endif
-/* == REPLACEMENT FIXES == */
-
-/*
- * 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 <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 */
- _EOF_;
-};
-
-
/*
* This fixes __FD_ZERO bug for linux 2.x.y (x <= 2 && y <= some n)
*/
* the wrapper, this will follow the #include_next chain until
* we arrive at the real <asm/posix_types.h>.
*/
- 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
#define _POSIX_TYPES_H_WRAPPER
#endif /* _POSIX_TYPES_H_WRAPPER */
- _EOF_;
+ _EndOfHeader_;
};
* the wrapper, this will follow the #include_next chain until
* we arrive at the real <gnu/types.h>.
*/
- replace =
-
-'/* This file fixes a bug in the __FD_ZERO macro present in glibc 1.x. */
-\#ifndef _TYPES_H_WRAPPER
-\#include <features.h>
- \#include_next <gnu/types.h>
-
-\#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 <features.h>
+ #include_next <gnu/types.h>
+
+ #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_;
};
* the wrapper, this will follow the #include_next chain until
* we arrive at the real <selectbits.h>.
*/
- replace =
-
-'/* This file fixes a bug in the __FD_ZERO macro present in glibc 2.0.x. */
-\#ifndef _SELECTBITS_H_WRAPPER
-\#include <features.h>
- \#include_next <selectbits.h>
-
-\#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 <features.h>
+ #include_next <selectbits.h>
+
+ #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 <sys/varargs.h> is a DDK (aka kernel-land) header providing
+ * the same interface as <stdarg.h>. 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 <stdarg.h>
+ #else
+ #include <varargs.h>
+ #endif
+ _EndOfHeader_;
};
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__
-
-\#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__ */
+ replace = <<- _EndOfHeader_
+ /* This file was generated by fixincludes */
+ #ifndef __memory_h__
+ #define __memory_h__
-extern int memcmp();
+ #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__ */
-\#endif /* __memory_h__ */
-';
+ extern int memcmp();
+ #endif /* __memory_h__ */
+ _EndOfHeader;
};
/*
- * Completely replace <sys/byteorder.h>; 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 ;-)
+ * Completely replace <sys/byteorder.h> with a file that implements gcc's
+ * optimized byteswapping. (The original probably implemented some
+ * incompatible 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]";
+ mach = "i[34567]86-sequent-ptx*";
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_;
};
hackname = AAB_ultrix_limits;
files = limits.h;
mach = "*-*-ultrix4.3";
- replace =
-'#ifndef _LIMITS_INCLUDED
-\#define _LIMITS_INCLUDED
-\#include <sys/limits.h>
-\#endif /* _LIMITS_INCLUDED */
-';
+ replace = <<- _EndOfHeader_
+ #ifndef _LIMITS_INCLUDED
+ #define _LIMITS_INCLUDED
+ #include <sys/limits.h>
+ #endif /* _LIMITS_INCLUDED */
+ _EndOfHeader_;
};
hackname = AAB_ultrix_memory;
files = memory.h;
mach = "*-*-ultrix4.3";
- replace =
-'#ifndef _MEMORY_INCLUDED
-\#define _MEMORY_INCLUDED
-\#include <strings.h>
-\#endif /* _MEMORY_INCLUDED */
-';
+ replace = <<- _EndOfHeader_
+ #ifndef _MEMORY_INCLUDED
+ #define _MEMORY_INCLUDED
+ #include <strings.h>
+ #endif /* _MEMORY_INCLUDED */
+ _EndOfHeader_;
};
hackname = AAB_ultrix_string;
files = string.h;
mach = "*-*-ultrix4.3";
- replace =
-'#ifndef _STRING_INCLUDED
-\#define _STRING_INCLUDED
-\#include <strings.h>
-\#endif /* _STRING_INCLUDED */
-';
+ replace = <<- _EndOfHeader_
+ #ifndef _STRING_INCLUDED
+ #define _STRING_INCLUDED
+ #include <strings.h>
+ #endif /* _STRING_INCLUDED */
+ _EndOfHeader_;
};
};
+/*
+ * Obey __PRAGMA_EXTERN_PREFIX for Tru64 UNIX V4/5 headers.
+ */
+fix = {
+ hackname = alpha___extern_prefix;
+ select = "(.*)(defined\\(__DECC\\)|def[ \t]*__DECC)[ \t]*\n(#[ \t]*pragma[ \t]*extern_prefix.*)";
+
+ mach = "alpha*-dec-osf*";
+ c_fix = format;
+ c_fix_arg = "%1 (defined(__DECC) || defined(__PRAGMA_EXTERN_PREFIX))\n%3";
+
+ test_text = "#ifdef __DECC\n"
+ "#pragma extern_prefix \"_P\"\n"
+ "# if defined(__DECC)\n"
+ "# pragma extern_prefix \"_E\"\n"
+ "# if !defined(_LIBC_POLLUTION_H_) && defined(__DECC)\n"
+ "# pragma extern_prefix \"\"";
+};
+
+
+/*
+ * Obey __PRAGMA_EXTERN_PREFIX for Tru64 UNIX V4/5 <standards.h>.
+ */
+fix = {
+ hackname = alpha___extern_prefix_standards;
+ files = standards.h;
+ select = ".*!defined\\(_LIBC_POLLUTION_H_\\) && !defined\\(__DECC\\)";
+
+ mach = "alpha*-dec-osf*";
+ c_fix = format;
+ c_fix_arg = "%0 && !defined(__PRAGMA_EXTERN_PREFIX)";
+
+ test_text = "#if (_ISO_C_SOURCE>=19990L) && !defined(_LIBC_POLLUTION_H_) && !defined(__DECC)";
+};
+
+
+/*
+ * Obey __PRAGMA_EXTERN_PREFIX for Tru64 UNIX V5 <sys/mount.h> and
+ * <sys/stat.h>. The tests for __DECC are special in various ways, so
+ * alpha__extern_prefix cannot be used.
+ */
+fix = {
+ hackname = alpha___extern_prefix_sys_stat;
+ files = sys/stat.h;
+ files = sys/mount.h;
+ select = "#[ \t]*if[ \t]*defined\\(__DECC\\)";
+
+ mach = "alpha*-dec-osf5*";
+ c_fix = format;
+ c_fix_arg = "%0 || defined(__PRAGMA_EXTERN_PREFIX)";
+
+ test_text = "# if defined(__DECC)";
+};
+
+
+/*
+ * Fix assert macro in assert.h on Alpha OSF/1.
+ * The superfluous int cast breaks C++.
+ */
+fix = {
+ hackname = alpha_assert;
+ files = "assert.h";
+ select = '(#define assert\(EX\).*)\(\(int\) \(EX\)\)';
+ c_fix = format;
+ c_fix_arg = "%1(EX)";
+ test_text = '#define assert(EX) (((int) (EX)) ? (void)0 : __assert(#EX, __FILE__, __LINE__))';
+};
+
+
/*
* Fix getopt declarations in stdio.h and stdlib.h on Alpha OSF/1 and AIX.
*/
/*
- * Fix return value of sbrk in unistd.h on Alpha OSF/1 V2.0
+ * Obey __PRAGMA_EXTERN_PREFIX for Tru64 UNIX <pthread.h>.
*/
fix = {
- hackname = alpha_sbrk;
- files = unistd.h;
- select = "char[ \t]*\\*[\t ]*sbrk[ \t]*\\(";
+ hackname = alpha_pthread;
+ files = pthread.h;
+ select = "((#[ \t]*if)([ \t]*defined[ \t]*\\(_PTHREAD_ENV_DECC\\)|def _PTHREAD_ENV_DECC)(.*))\n"
+ "(#[ \t]*define _PTHREAD_USE_PTDNAM_)";
+
+ mach = "alpha*-dec-osf*";
c_fix = format;
- c_fix_arg = "void *sbrk(";
- test_text = "extern char* sbrk(ptrdiff_t increment);";
+ c_fix_arg = "%2 defined (_PTHREAD_ENV_DECC)%4 || defined (__PRAGMA_EXTERN_PREFIX)\n%5";
+
+ test_text = "# if defined (_PTHREAD_ENV_DECC) || defined (_PTHREAD_ENV_EPCC)\n"
+ "# define _PTHREAD_USE_PTDNAM_\n"
+ "# endif\n"
+ "# ifdef _PTHREAD_ENV_DECC\n"
+ "# define _PTHREAD_USE_PTDNAM_\n"
+ "# endif";
};
/*
- * Fix this ARM/RISCiX file where ___type is a Compiler
- * hint that is specific to the Norcroft compiler.
+ * Recognize GCC in Tru64 UNIX V5.1B <pthread.h>.
*/
fix = {
- hackname = arm_norcroft_hint;
- select = "___type p_type";
- files = "X11/Intrinsic.h";
+ hackname = alpha_pthread_gcc;
+ files = pthread.h;
+ select = "#else\n# error <pthread.h>: unrecognized compiler.";
+
+ mach = "alpha*-dec-osf*";
c_fix = format;
- c_fix_arg = "p_type";
- test_text = "___type p_type mumble;";
+ c_fix_arg = "#elif defined (__GNUC__)\n"
+ "# define _PTHREAD_ENV_GCC\n"
+ "%0";
+
+ test_text = "# define _PTHREAD_ENV_INTELC\n"
+ "#else\n"
+ "# error <pthread.h>: unrecognized compiler.\n"
+ "#endif";
};
/*
- * Fix this ARM/RISCiX file to avoid interfering
- * with the use of __wchar_t in cc1plus.
+ * Fix return value of sbrk in unistd.h on Alpha OSF/1 V2.0
+ * And OpenBSD.
*/
fix = {
- hackname = arm_wchar;
- files = stdlib.h;
- select = "#[ \t]*define[ \t]*__wchar_t";
-
+ hackname = alpha_sbrk;
+ files = unistd.h;
+ select = "char[ \t]*\\*[\t ]*sbrk[ \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 */";
+ c_fix_arg = "void *sbrk(";
+ test_text = "extern char* sbrk(ptrdiff_t increment);";
};
/*
- * This file in A/UX 3.0.x/3.1.x contains an __asm directive for c89;
- * gcc doesn't understand it.
+ * Change external names of wcstok/wcsftime via asm instead of macros on
+ * Tru64 UNIX V4.0.
*/
fix = {
- hackname = aux_asm;
- files = sys/param.h;
- select = "#ifndef NOINLINE";
-
- c_fix = format;
- c_fix_arg = "#if !defined(NOINLINE) && !defined(__GNUC__)";
+ hackname = alpha_wchar;
+ files = wchar.h;
- test_text =
- "#ifndef NOINLINE /* ain't got no inline, so we got it */\n"
- "#endif /* NOINLINE */";
+ mach = "alpha*-dec-osf4*";
+ select = "#define wcstok wcstok_r";
+ sed = "s@#define wcstok wcstok_r@extern wchar_t *wcstok __((wchar_t *, const wchar_t *, wchar_t **)) __asm__(\"wcstok_r\");@";
+ sed = "s@#define wcsftime __wcsftime_isoc@extern size_t wcsftime __((wchar_t *, size_t, const wchar_t *, const struct tm *)) __asm__(\"__wcsftime_isoc\");@";
+ test_text = "#define wcstok wcstok_r\n"
+ "#define wcsftime __wcsftime_isoc";
};
files = tinfo.h;
select = "#[ \t]*define[ \t]+bool[ \t]";
- bypass = "we must use the C\\+\\+ compiler's type";
+ bypass = "__cplusplus";
c_fix = format;
c_fix_arg = "#ifndef __cplusplus\n%0\n#endif";
test_text = "# define bool\t char \n";
};
+
fix = {
hackname = avoid_bool_type;
files = curses.h;
files = tinfo.h;
select = "^[ \t]*typedef[ \t].*[ \t]bool[ \t]*;";
- bypass = "we must use the C\\+\\+ compiler's type";
+ bypass = "__cplusplus";
c_fix = format;
c_fix_arg = "#ifndef __cplusplus\n%0\n#endif";
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.
+ * Don't do this for headers that are smart enough to do the right
+ * thing (recent [n]curses.h and Xlib.h).
+ * Don't do it for <linux/nls.h> which is never used from C++ anyway,
+ * and will be broken by the edit.
*/
fix = {
hackname = avoid_wchar_t_type;
select = "^[ \t]*typedef[ \t].*[ \t]wchar_t[ \t]*;";
+ bypass = "__cplusplus";
+ bypass = "_LINUX_NLS_H";
+ bypass = "XFree86: xc/lib/X11/Xlib\\.h";
c_fix = format;
c_fix_arg = "#ifndef __cplusplus\n%0\n#endif";
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
select = "^[ \t]*#[ \t]*pragma[ \t]+extern_prefix";
- files = libgen.h;
files = dirent.h;
files = ftw.h;
files = grp.h;
+ files = libgen.h;
files = ndbm.h;
files = pthread.h;
files = pwd.h;
files = signal.h;
files = standards.h;
+ files = stdio.h;
files = stdlib.h;
files = string.h;
files = stropts.h;
+ files = sys/mount.h;
+ files = sys/resource.h;
+ files = sys/signal.h;
+ files = sys/socket.h;
+ files = sys/stat.h;
+ files = sys/stropts.h;
+ files = sys/uio.h;
files = time.h;
files = unistd.h;
+ files = utmp.h;
+ files = utmpx.h;
+ files = wchar.h;
sed =
"s/^[ \t]*#[ \t]*define[ \t][ \t]*\\([^(]*\\)\\(([^)]*)\\)[ \t]*"
* This conflicts with C99. Discovered on AIX.
* SunOS4 has its cabs() declaration followed by a comment which
* terminates on the following line.
+ * Darwin hides its broken cabs in architecture-specific subdirs.
*/
fix = {
hackname = broken_cabs;
- files = "math.h";
- select = '^extern[ \t]+double[ \t]+cabs';
+ files = "math.h";
+ files = "architecture/ppc/math.h";
+ files = "architecture/i386/math.h";
+ select = '^extern[ \t]+double[ \t]+cabs';
c_fix = format;
c_fix_arg = "";
- c_fix_arg = "^extern[ \t]+double[ \t]+cabs\\((struct dbl_hypot|)\\);";
+ c_fix_arg = "^extern[ \t]+double[ \t]+cabs[ \t]*\\([^\\)]*\\);";
test_text = "#ifdef __STDC__\n"
"extern double cabs(struct dbl_hypot);\n"
"#else\n"
"extern double cabs();\n"
"#endif\n"
+ "extern double cabs ( _Complex z );\n"
"extern double cabs(); /* This is a comment\n"
" and it ends here. */";
};
+/*
+ * 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:
};
+/*
+ * __private_extern__ doesn't exist in FSF GCC. Even if it did,
+ * why would you ever put it in a system header file?
+ */
+fix = {
+ hackname = darwin_private_extern;
+ mach = "*-*-darwin*";
+ files = mach-o/dyld.h;
+ select = "__private_extern__ [a-z_]+ _dyld_";
+ c_fix = format;
+ c_fix_arg = "extern";
+ c_fix_arg = "__private_extern__";
+ test_text = "__private_extern__ int _dyld_func_lookup(\n"
+ "const char *dyld_func_name,\n"
+ "unsigned long *address);\n";
+};
+
+
/*
* Fix <c_asm.h> on Digital UNIX V4.0:
* It contains a prototype for a DEC C internal asm() function,
"extern __DJ_wint_t x;\n";
};
+
/*
* Fix these Sun OS files to avoid an invalid identifier in an #ifdef.
*/
};
-/*
- * 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
/*
- * Fix these files to use the same types that we think they should.
+ * Fix these files to use the types we think they should for
+ * ptrdiff_t, size_t, and wchar_t.
+ *
+ * This defines the types in terms of macros predefined by our 'cpp'.
+ * This is supposedly necessary for glibc's handling of these types.
+ * It's probably not necessary for anyone else, but it doesn't hurt.
*/
fix = {
hackname = gnu_types;
files = fixinc-test-limits.h, math.h;
select = <<- END_POW_INLINE
^# +ifdef +__cplusplus
- +}
- +inline +double +pow\(double +__d,int +__expon\) +{
+ +\}
+ +inline +double +pow\(double +__d,int +__expon\) +\{
[ ]+return +pow\(__d,\(double\)__expon\);
- +}
- +extern +"C" +{
+ +\}
+ +extern +"C" +\{
#else
# +endif
END_POW_INLINE;
fix = {
hackname = hpux11_cpp_pow_inline;
files = math.h;
- select = " +inline double pow\\(double d,int expon\\) {\n"
+ select = " +inline double pow\\(double d,int expon\\) \\{\n"
" +return pow\\(d, \\(double\\)expon\\);\n"
- " +}\n";
+ " +\\}\n";
c_fix = format;
c_fix_arg = "";
};
+/*
+ * 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.
};
+/*
+ * Fix hpux 11.00 broken snprintf declaration
+ * (third argument is char *, needs to be const char * to prevent
+ * spurious warnings with -Wwrite-strings or in C++).
+ */
+fix = {
+ hackname = hpux11_snprintf;
+ files = stdio.h;
+ select = '(extern int snprintf *\(char *\*, *(|__|_hpux_)size_t,)'
+ ' *(char *\*, *\.\.\.\);)';
+ c_fix = format;
+ c_fix_arg = '%1 const %3';
+
+ test_text = "extern int snprintf(char *, size_t, char *, ...);\n"
+ "extern int snprintf(char *, __size_t, char *, ...);\n"
+ "extern int snprintf(char *, _hpux_size_t, char *, ...);";
+};
+
+
/*
* In inttypes.h on HPUX 11, the use of __CONCAT__ in the definition
* of UINT32_C has undefined behavior according to ISO/ANSI:
};
+/*
+ * Fix hpux broken ctype macros
+ */
+fix = {
+ 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 = "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
*/
};
+/*
+ * IRIX 6.5.1[89] <internal/sgimacros.h> 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 = "%1"
+ "# ifndef __cplusplus\n%2\n# endif";
+
+ test_text = "#ifdef __c99\n# define __restrict restrict";
+};
+
/*
* IRIX 5.2's <sys/asm.h> contains an asm comment with a contraction
* that causes the assembly preprocessor to complain about an
/*
- * IRIX 5.x's stdio.h declares some functions that take a va_list as
+ * IRIX 6.5.1[78] <sys/socket.h> 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 = 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 and IRIX 6.5's internal/stdio_core.h declare
+ * 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;
+ files = internal/stdio_core.h;
- select = '(printf\(.*), /\* va_list \*/ char \*';
+ select = '/\* va_list \*/ char \*';
c_fix = format;
- c_fix_arg = "%1, __gnuc_va_list";
+ c_fix_arg = "__gnuc_va_list";
test_text =
"extern int printf( const char *, /* va_list */ char * );";
};
+/*
+ * IRIX 6.5.19 <internal/wchar_core.h> provides the XPG4 variant of
+ * wcsftime by default. ISO C99 requires the XPG5 variant instead.
+ */
+fix = {
+ hackname = irix_wcsftime;
+ files = internal/wchar_core.h;
+ select = "#if _NO_XOPEN5\n(extern size_t[ \t]+wcsftime.*const char \*.*)";
+
+ mach = "mips-sgi-irix6.5";
+ c_fix = format;
+ 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
*/
};
+/*
+ * 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
* 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";
+ select = "^[ \t]*#[ \t]*define[ \t]+"
+ "((FLT|DBL)_(MIN|MAX|DIG))[ \t].*";
+ bypass = "ifndef[ \t]+FLT_(MIN|MAX)";
c_fix = format;
c_fix_arg = "#ifndef %1\n%0\n#endif";
- c_fix_arg = "^[ \t]*#[ \t]*define[ \t]+"
- "((FLT|DBL)_(MIN|MAX|DIG))[ \t].*";
+ /* Second arg is select expression */
test_text = " #\tdefine\tDBL_DIG \t 0 /* somthin' */";
};
+/*
+ * Apparently some SVR4 systems typedef longlong_t to long ?
+ */
+#ifdef SVR4
+fix = {
+ hackname = longlong_t;
+ select = "typedef[ \t]+(unsigned[ \t]+)?long[ \t]+(u_)?longlong_t";
+ c_fix = format;
+ c_fix_arg = "typedef %1long long %2longlong_t";
+ test_text = "typedef long longlong_t\n"
+ "typedef unsigned long u_longlong_t";
+};
+#endif
+
+
/*
* Delete the '#define void int' line from curses.h on Lynx
*/
};
-/*
- * 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_.
*
/*
- * Some math.h files define struct exception, which conflicts with
+ * Some math.h files define struct exception (it's in the System V
+ * Interface Definition), which conflicts with
* the class exception defined in the C++ file std/stdexcept.h. We
* redefine it to __math_exception. This is not a great fix, but I
* haven't been able to think of anything better.
hackname = math_exception;
files = math.h;
select = "struct exception";
- bypass = 'We have a problem when using C\+\+';
+ bypass = '__cplusplus';
c_fix = wrap;
c_fix_arg = "#ifdef __cplusplus\n"
"#define OPEN_MAX 20 /* Max, Max, ... */\n";
};
+
/*
- * 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 <stdlib\\.h>.*";
+ 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 <stdlib.h>";
+ c_fix_arg = "#define __END_DECLS }";
+
+ test_text = "#define __END_DECLS };";
};
};
+/*
+ * obstack.h used casts as lvalues.
+ *
+ * We need to change postincrements of casted pointers (which are
+ * then dereferenced and assigned into) of the form
+ *
+ * *((TYPE*)PTRVAR)++ = (VALUE)
+ *
+ * into expressions like
+ *
+ * ((*((TYPE*)PTRVAR) = (VALUE)), (PTRVAR += sizeof (TYPE)))
+ *
+ * which is correct for the cases used in obstack.h since PTRVAR is
+ * of type char * and the value of the expression is not used.
+ */
+fix = {
+ hackname = obstack_lvalue_cast;
+ files = obstack.h;
+ select = '\*\(\(([^()]*)\*\)(.*)\)\+\+ = \(([^()]*)\)';
+ c_fix = format;
+ c_fix_arg = "((*((%1*)%2) = (%3)), (%2 += sizeof (%1)))";
+ test_text = "*((void **) (h)->next_free)++ = (aptr)";
+};
+
+
/*
* sys/lc_core.h on some versions of OSF1/4.x pollutes the namespace by
* defining regex.h related types. This causes libg++ build and usage
};
+/*
+ * On DYNIX/ptx, sys/mc_param.h has an embedded asm for the cpuid instruction
+ * on the P5. This is not used by anything else so we ifdef it out.
+ * Current GCC doesn't seem to complain about the asm, though.
+ */
+#ifdef PTX
+fix = {
+ hackname = ptx_sys_mc_param_h;
+ files = sys/mc_param.h;
+ sed = "/__asm/,/}/{"
+ "/__asm/i\\\n"
+ "#if !defined (__GNUC__) && !defined (__GNUG__)\n"
+ "/}/a\\\n"
+ "#endif\n"
+ "}";
+ test_text = "__asm\n"
+ "int _CPUID()\n"
+ "{\n"
+ " non-GNU assembly here\n"
+ "}";
+};
+#endif
+
+
/*
* Fix return type of fread and fwrite on sysV68
*/
};
+/*
+ * On OpenServer and on UnixWare 7, <math.h> uses the native compiler
+ * __builtin_generic. We fix that usage to use the GCC equivalent.
+ * It also has a plethora of inline functions that conflict with libstdc++.
+ */
+fix = {
+ hackname = sco_math;
+ files = math.h;
+ 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, <sys/regset.h> and <ieeefp.h>
+ * 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 <sys/stat.h>
* cause G++ grief since they're not wrapped in "if __cplusplus".
"#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"
};
+/*
+ * 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.
+ */
+fix = {
+ 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";
+};
+
+
/*
* Sun Solaris defines PTHREAD_MUTEX_INITIALIZER with a trailing
* "0" for the last field of the pthread_mutex_t structure, which is
* initializer to "{0}" instead
*/
fix = {
- hackname = solaris_mutex_init;
+ hackname = solaris_mutex_init_2;
select = '@\(#\)pthread.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
files = pthread.h;
c_fix = format;
"#else\n"
"%1, {0}}%3\n"
"#endif";
- c_fix_arg = "(^#define[ \t]+PTHREAD_(MUTEX|COND)_INITIALIZER[ \t]+{.*)"
- ",[ \t]*0}" "(|[ \t].*)$";
+ 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"
/*
- * Sony NEWSOS 5.0 does not support the complete ANSI C standard.
+ * Solaris 2.5.1 and 2.6 use an outdated prototype for send & recv
+ * in sys/socket.h. This is corrected in Solaris 7 and up.
*/
-#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_socket;
+ files = sys/socket.h;
+ select = '@\(#\)socket.h' "[ \t]+1.[123][0-9][ \t]+9[567]/[0-9/]+ SMI";
+ c_fix = format;
+ c_fix_arg = "extern int %1(int, %2void *, int, int);";
+ c_fix_arg = '^extern int (recv|send)\(int,'
+ ' (const )*char '
+ '\*, int, int\);';
+
+ test_text = '#ident "@(#)socket.h 1.30 97/01/20 SMI"'"\n"
+ "extern int recv(int, char *, int, int);\n"
+ "extern int send(int, const char *, int, int);";
};
-#endif
/*
- * Sony NEWSOS 5.0 does not support the complete ANSI C standard.
+ * 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.
*/
-#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_stdio_tag;
+ files = stdio_tag.h;
+
+ select = '__cplusplus < 54321L';
+ sed = 's/defined(__cplusplus) && (__cplusplus < 54321L)/0/';
+
+ test_text = "#if\tdefined(__cplusplus) && (__cplusplus < 54321L)";
};
-#endif
/*
- * Add a `static' declaration of `getrnge' into <regexp.h>.
- *
- * Don't do this if there is already a `static void getrnge' declaration
- * present, since this would cause a redeclaration error. Solaris 2.x has
- * such a declaration.
+ * Sun Solaris 2.5.1 doesn't define 'getpagesize' in <unistd.h>, as is done
+ * on Solaris 2.6 and up.
*/
-#ifdef SVR4
fix = {
- hackname = static_getrnge;
- files = regexp.h;
- bypass = "static void getrnge";
- sed = "/^static int[ \t]*size;/c\\\n"
- "static int size ;\\\n\\\n"
- "static int getrnge ();";
+ hackname = solaris_unistd;
+ files = unistd.h;
+ select = '@\(#\)unistd.h' "[ \t]+1.3[0-9][ \t]+9[567]/[0-9/]+ SMI";
+ bypass = "getpagesize";
+ c_fix = format;
+ c_fix_arg = "extern int getpagesize();\n%0";
+ c_fix_arg = '^extern (pid_t|int) getpgid\(.*\);';
+ test_text = '#ident "@(#)unistd.h 1.33 95/08/28 SMI"'"\n"
+ "extern pid_t getpgid(pid_t);\n"
+ "extern int getpgid();";
+};
+
+
+/*
+ * <widec.h> until Solaris 2.5.1 defines macros for a couple of <wchar.h>
+ * functions, breaking their prototypes if that file is included afterwards.
+ * Include <wchar.h> 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]';
+ mach = '*-*-solaris2.[0-5].*';
+ bypass = "include.*wchar\\.h";
+ select = "#include <euc.h>";
+ c_fix = format;
+ c_fix_arg = "%0\n#include <wchar.h>";
+ test_text = "#include <euc.h>";
};
-#endif
/*
/*
* Don't use or define the name va_list in stdio.h.
- * This is for ANSI and also to interoperate properly with gcc's varargs.h.
- * Note _BSD_VA_LIST_ is dealt with elsewhere.
+ * This is for ANSI and also to interoperate properly with gcc's
+ * varargs.h. Note _BSD_VA_LIST_ is dealt with elsewhere. The
+ * presence of __gnuc_va_list, __DJ_va_list, or _G_va_list is taken
+ * to indicate that the header knows what it's doing -- under SUSv2,
+ * stdio.h is required to define va_list, and we shouldn't break that.
+ * On IRIX 6.5, internal/wchar_core.h used to get its definition of
+ * va_list from stdio.h. Since this doesn't happen any longer, use
+ * __gnuc_va_list there, too.
*/
fix = {
hackname = stdio_va_list;
files = stdio.h;
- bypass = '__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list';
+ files = internal/stdio_core.h;
+ files = internal/wchar_core.h;
+ bypass = '__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list';
/*
* Use __gnuc_va_list in arg types in place of va_list.
* instead of va_list.
* Don't claim to have defined va_list.
*/
- sed = "s@ va_list @ __gnuc_va_list @\n"
- "s@ va_list)@ __gnuc_va_list)@\n"
+ sed = "s@[ \t]va_list\\([ \t)]\\)@ __gnuc_va_list\\1@\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)@ __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@_VA_LIST_DEFINED@_Va_LIST_DEFINED@\n"
"s@_NEED___VA_LIST@_NEED___Va_LIST@\n"
"s@VA_LIST@DUMMY_VA_LIST@\n"
"s@_Va_LIST@_VA_LIST@";
"|__STDC__[ \t]*==[ \t]*0"
"|__STDC__[ \t]*!=[ \t]*1"
"|__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*0)";
+ /* Tru64 UNIX V4.0F/V5.1 <standards.h> supports GCC usage of __STDC__. */
+ bypass = 'GNU and MIPS C compilers define __STDC__ differently';
+ /* GNU gmp.h uses "__STDC__ != 1" only if __SCO_VERSION__, which
+ is not defined by GCC, so it is safe. */
+ bypass = '__SCO_VERSION__.*__STDC__ != 1';
c_test = stdc_0_in_system_headers;
c_fix = format;
/*
* IRIX 4.0.5 <rpc/auth.h> uses struct sockaddr
* in prototype without previous definition.
+ *
+ * Don't fix OpenBSD, which uses struct sockaddr_in prototyping the same
+ * function, and does define it.
*/
fix = {
hackname = struct_sockaddr;
files = rpc/auth.h;
- select = "^.*authdes_create.*struct sockaddr";
+ select = "^.*authdes_create.*struct sockaddr[^_]";
bypass = "<sys/socket\.h>";
+ bypass = "struct sockaddr;\n";
c_fix = format;
c_fix_arg = "struct sockaddr;\n%0";
test_text = "extern AUTH* authdes_create( struct sockaddr* );";
* 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
/*
/*
- * set ifdef _KERNEL
+ * Wrap some files on System V r4 and DYNIX/ptx systems with
+ * #ifdef _KERNEL, presumably to prevent kernel headers from
+ * leaking into userspace. This may not be necessary at all,
+ * but it was in the old scripts, so it seems safest to keep it for now.
*/
-#ifdef SVR4
fix = {
- hackname = svr4_kernel;
+ /* Can't name this with _kernel, or the test case will hit the bypass! */
+ hackname = svr4_krnl;
+ /* Since I'm rather unsure about the validity of this, limit it
+ * to the specific systems it was operating on before. It should
+ * also be bypassed for i?86-*-sysv4.3uw2, by that rule, but I didn't
+ * see an easy way to do that. Hopefully it will be harmless
+ * in any case. -- Nathanael */
+ mach = '*-*-sysv4*';
+ mach = 'i?86-sequent-ptx*';
files = fs/rfs/rf_cache.h;
files = sys/erec.h;
files = sys/err.h;
files = sys/map.h;
files = sys/cmn_err.h;
files = sys/kdebugger.h;
+
+ /* This bypass will match _KERNEL, __KERNEL, __KERNEL__, etc.
+ * It will also match SVR4_KERNEL_CHECK, which means that the
+ * testsuite case will always be bypassed. Which is fine with me. */
bypass = '_KERNEL';
- c_fix = wrap;
+ c_fix = wrap;
c_fix_arg = "#ifdef _KERNEL\n";
c_fix_arg = "#endif /* _KERNEL */\n";
+
+ /* There's no reasonable test for this given that we don't know exactly
+ * what problem inspired it in the first place. */
test_text = "";
};
-#endif
+
/*
* Delete any #defines of `__i386' which may be present in <ieeefp.h>. They
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
#endif
+/*
+ * Some SVR4 systems supposedly use these non-ANSI preprocessor directives.
+ */
+#ifdef SVR4
+fix = {
+ hackname = svr4_preproc_lint_on;
+ select = '#lint\(on\)';
+ c_fix = format;
+ c_fix_arg = 'defined(lint)';
+ test_text = "#if #lint(on)";
+};
+fix = {
+ hackname = svr4_preproc_lint_off;
+ select = '#lint\(off\)';
+ c_fix = format;
+ c_fix_arg = '!defined(lint)';
+ test_text = "#if #lint(off)";
+};
+fix = {
+ hackname = svr4_preproc_machine;
+ select = '#(machine|system|cpu)\(([^)]*)\)';
+ c_fix = format;
+ c_fix_arg = 'defined(__%1__)';
+ test_text = "#if #machine(i386) || #system(vax) || #cpu(sparc)";
+};
+#endif
+
+
/*
* Fix broken decl of profil present on some svr4 systems.
*/
};
#endif
+
+/*
+ * Correct types for signal handler constants like SIG_DFL; they might be
+ * void (*) (), and should be void (*) (int). C++ doesn't like the
+ * old style.
+ */
+fix = {
+ hackname = svr4_sighandler_type;
+ files = sys/signal.h;
+ select = 'void *\(\*\)\(\)';
+ c_fix = format;
+ c_fix_arg = "void (*)(int)";
+ test_text = "#define SIG_DFL (void(*)())0\n"
+ "#define SIG_IGN (void (*)())0\n";
+};
+
/*
* Put storage class at start of decl, to avoid warning.
*/
#endif
+/*
+ * Some SysV r4 systems, including Sequent's DYNIX/ptx, use the local
+ * function 'getrnge' in <regexp.h> before they declare it. For these
+ * systems add a 'static int' declaration of 'getrnge' into <regexp.h>
+ * early on.
+ *
+ * 'getrnge' traditionally manipulates a file-scope global called 'size',
+ * so put the declaration right after the declaration of 'size'.
+ *
+ * Don't do this if there is already a `static void getrnge' declaration
+ * present, since this would cause a redeclaration error. Solaris 2.x has
+ * such a declaration.
+ */
+fix = {
+ hackname = svr4_undeclared_getrnge;
+ files = regexp.h;
+ select = "getrnge";
+ bypass = "static void getrnge";
+ c_fix = format;
+ c_fix_arg = "%0\n"
+ "static int getrnge ();";
+ c_fix_arg = "^static int[ \t]+size;";
+ test_text = "static int size;\n"
+ "/* stuff which calls getrnge() */\n"
+ "static getrnge()\n"
+ "{}";
+};
+
+
/*
* Like svr4_mach_defines, but with newfangled syntax.
* Source lines are of #define __i386 #machine(i386). Delete them.
};
+/*
+ * __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
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 */";
};
/*
* Fix multiple defines for NULL. Sometimes, we stumble into \r\n
* terminated lines, so accommodate these. Test both ways.
+ * Don't bother to reproduce the \r\n termination, as GCC has to
+ * recognize \n termination anyway.
*/
fix = {
hackname = undefine_null;
bypass = "#[ \t]*(ifn|un)def[ \t]+NULL($|[ \t\r])";
c_fix = format;
- c_fix_arg = "#ifndef NULL%2\n#define NULL%1%2\n#endif%2\n";
- c_fix_arg = "^#[ \t]*define[ \t]*[ \t]NULL([^\r\n]+)([\r]*)\n";
+ c_fix_arg = "#ifndef NULL\n#define NULL%1\n#endif\n";
+ c_fix_arg = "^#[ \t]*define[ \t]+NULL([^\r\n]+)[\r]*\n";
- test_text = "#define NULL 0UL\r\n#define NULL\t((void*)0)\n";
+ test_text = "#define NULL 0UL\r\n"
+ "#define NULL\t((void*)0)\n";
};
/*
/*
- * AIX headers define NULL to be cast to a void pointer,
+ * AIX and Interix headers define NULL to be cast to a void pointer,
* which is illegal in ANSI C++.
*/
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 <diab/va_list.h>";
+};
+
/*
* 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
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 );";
};