-
/* -*- Mode: C -*- */
autogen definitions fixincl;
This is the sort command:
- blocksort output=XXX \
+ blocksort output=inclhack.sorted \
pattern='^/\*$' \
- start='DO +NOT +DO +BROKEN +FIXES' \
trailer='^/\*EOF\*[/]' \
input=inclhack.def \
key='hackname[ ]*=[ ]*(.*);'
FIXINC_DEBUG = yes;
#endif
-/* DO NOT DO BROKEN FIXES (empty replacement fixes) */
-
-/*
- * 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_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 */
-};
-
-
-/*
- * 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 */
-};
-
-
-/*
- * Tru64 UNIX V4.0F/V5.1 <standards.h> defines _NO_PROTO and _NONSTD_TYPES
- * correctly for GCC, but strict_ansi_not breaks it.
- */
-fix = {
- hackname = AAA_standards;
- files = standards.h;
- select = 'GNU and MIPS C compilers define __STDC__ differently';
- 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)
*/
* the wrapper, this will follow the #include_next chain until
* we arrive at the real <asm/posix_types.h>.
*/
- replace =
-
-'/* This file fixes a bug in the __FD_ZERO macro
- for older versions of the Linux kernel. */
-\#ifndef _POSIX_TYPES_H_WRAPPER
-\#include <features.h>
- \#include_next <asm/posix_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" ((__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 <features.h>
+ #include_next <asm/posix_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" ((__kernel_fd_set *) (fdsetp)) :"memory"); \
+ } while (0)
+ #endif
+
+ #define _POSIX_TYPES_H_WRAPPER
+ #endif /* _POSIX_TYPES_H_WRAPPER */
+ _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;
};
replace = "/* This file was generated by fixincludes. */\n"
"#ifndef _SYS_VARARGS_H\n"
"#define _SYS_VARARGS_H\n\n"
-
+
"#ifdef __STDC__\n"
"#include <stdarg.h>\n"
"#else\n"
"#include <varargs.h>\n"
"#endif\n\n"
-
+
"#endif /* _SYS_VARARGS_H */\n";
};
#endif
fix = {
hackname = AAB_svr4_replace_byteorder;
#ifndef SVR5
- mach = "*-*-sysv4*";
- mach = "i[34567]86-*-sysv5*";
- mach = "i[34567]86-*-udk*";
- mach = "i[34567]86-*-solaris2.[0-4]";
- mach = "powerpcle-*-solaris2.[0-4]";
- mach = "sparc-*-solaris2.[0-4]";
+ mach = "*-*-sysv4*";
+ mach = "i[34567]86-*-sysv5*";
+ mach = "i[34567]86-*-udk*";
+ mach = "i[34567]86-*-solaris2.[0-4]";
+ mach = "powerpcle-*-solaris2.[0-4]";
+ mach = "sparc-*-solaris2.[0-4]";
#endif /* SVR5 */
files = sys/byteorder.h;
- replace = '#ifndef _SYS_BYTEORDER_H
-\#define _SYS_BYTEORDER_H
+ replace = <<- _EndOfHeader_
+ #ifndef _SYS_BYTEORDER_H
+ #define _SYS_BYTEORDER_H
-/* Functions to convert `short\' and `long\' quantities from host byte order
- to (internet) network byte order (i.e. big-endian).
+ /* Functions to convert `short' and `long' quantities from host byte order
+ to (internet) network byte order (i.e. big-endian).
- Written by Ron Guilmette (rfg@ncd.com).
+ Written by Ron Guilmette (rfg@ncd.com).
- This isn\'t actually used by GCC. It is installed by fixinc.svr4.
+ This isn't actually used by GCC. It is installed by fixinc.svr4.
- For big-endian machines these functions are essentially no-ops.
+ For big-endian machines these functions are essentially no-ops.
- For little-endian machines, we define the functions using specialized
- asm sequences in cases where doing so yields better code (e.g. i386). */
+ For little-endian machines, we define the functions using specialized
+ asm sequences in cases where doing so yields better code (e.g. i386). */
-\#if !defined (__GNUC__) && !defined (__GNUG__)
-\#error You lose! This file is only useful with GNU compilers.
-\#endif
+ #if !defined (__GNUC__) && !defined (__GNUG__)
+ #error You lose! This file is only useful with GNU compilers.
+ #endif
-\#ifndef __BYTE_ORDER__
-/* Byte order defines. These are as defined on UnixWare 1.1, but with
- double underscores added at the front and back. */
-\#define __LITTLE_ENDIAN__ 1234
-\#define __BIG_ENDIAN__ 4321
-\#define __PDP_ENDIAN__ 3412
-\#endif
+ #ifndef __BYTE_ORDER__
+ /* Byte order defines. These are as defined on UnixWare 1.1, but with
+ double underscores added at the front and back. */
+ #define __LITTLE_ENDIAN__ 1234
+ #define __BIG_ENDIAN__ 4321
+ #define __PDP_ENDIAN__ 3412
+ #endif
-\#ifdef __STDC__
-static __inline__ unsigned long htonl (unsigned long);
-static __inline__ unsigned short htons (unsigned int);
-static __inline__ unsigned long ntohl (unsigned long);
-static __inline__ unsigned short ntohs (unsigned int);
-\#endif /* defined (__STDC__) */
+ #ifdef __STDC__
+ static __inline__ unsigned long htonl (unsigned long);
+ static __inline__ unsigned short htons (unsigned int);
+ static __inline__ unsigned long ntohl (unsigned long);
+ static __inline__ unsigned short ntohs (unsigned int);
+ #endif /* defined (__STDC__) */
-\#if defined (__i386__)
+ #if defined (__i386__)
-\#ifndef __BYTE_ORDER__
-\#define __BYTE_ORDER__ __LITTLE_ENDIAN__
-\#endif
+ #ifndef __BYTE_ORDER__
+ #define __BYTE_ORDER__ __LITTLE_ENDIAN__
+ #endif
-/* Convert a host long to a network long. */
+ /* Convert a host long to a network long. */
-/* We must use a new-style function definition, so that this will also
- be valid for C++. */
-static __inline__ unsigned long
-htonl (unsigned long __arg)
-{
- register unsigned long __result;
+ /* We must use a new-style function definition, so that this will also
+ be valid for C++. */
+ static __inline__ unsigned long
+ htonl (unsigned long __arg)
+ {
+ register unsigned long __result;
- __asm__ ("xchg%B0 %b0,%h0
- ror%L0 $16,%0
- xchg%B0 %b0,%h0" : "=q" (__result) : "0" (__arg));
- return __result;
-}
+ __asm__ ("xchg%B0 %b0,%h0
+ ror%L0 $16,%0
+ xchg%B0 %b0,%h0" : "=q" (__result) : "0" (__arg));
+ return __result;
+ }
-/* Convert a host short to a network short. */
+ /* Convert a host short to a network short. */
-static __inline__ unsigned short
-htons (unsigned int __arg)
-{
- register unsigned short __result;
+ static __inline__ unsigned short
+ htons (unsigned int __arg)
+ {
+ register unsigned short __result;
- __asm__ ("xchg%B0 %b0,%h0" : "=q" (__result) : "0" (__arg));
- return __result;
-}
+ __asm__ ("xchg%B0 %b0,%h0" : "=q" (__result) : "0" (__arg));
+ return __result;
+ }
-\#elif ((defined (__i860__) && !defined (__i860_big_endian__)) \\
- || defined (__ns32k__) || defined (__vax__) \\
- || defined (__spur__) || defined (__arm__))
+ #elif (defined (__ns32k__) || defined (__vax__) || defined (__arm__))
-\#ifndef __BYTE_ORDER__
-\#define __BYTE_ORDER__ __LITTLE_ENDIAN__
-\#endif
+ #ifndef __BYTE_ORDER__
+ #define __BYTE_ORDER__ __LITTLE_ENDIAN__
+ #endif
-/* For other little-endian machines, using C code is just as efficient as
- using assembly code. */
+ /* For other little-endian machines, using C code is just as efficient as
+ using assembly code. */
-/* Convert a host long to a network long. */
+ /* Convert a host long to a network long. */
-static __inline__ unsigned long
-htonl (unsigned long __arg)
-{
- register unsigned long __result;
+ static __inline__ unsigned long
+ htonl (unsigned long __arg)
+ {
+ register unsigned long __result;
- __result = (__arg >> 24) & 0x000000ff;
- __result |= (__arg >> 8) & 0x0000ff00;
- __result |= (__arg << 8) & 0x00ff0000;
- __result |= (__arg << 24) & 0xff000000;
- return __result;
-}
+ __result = (__arg >> 24) & 0x000000ff;
+ __result |= (__arg >> 8) & 0x0000ff00;
+ __result |= (__arg << 8) & 0x00ff0000;
+ __result |= (__arg << 24) & 0xff000000;
+ return __result;
+ }
-/* Convert a host short to a network short. */
+ /* Convert a host short to a network short. */
-static __inline__ unsigned short
-htons (unsigned int __arg)
-{
- register unsigned short __result;
+ static __inline__ unsigned short
+ htons (unsigned int __arg)
+ {
+ register unsigned short __result;
- __result = (__arg << 8) & 0xff00;
- __result |= (__arg >> 8) & 0x00ff;
- return __result;
-}
+ __result = (__arg << 8) & 0xff00;
+ __result |= (__arg >> 8) & 0x00ff;
+ return __result;
+ }
-\#else /* must be a big-endian machine */
+ #else /* must be a big-endian machine */
-\#ifndef __BYTE_ORDER__
-\#define __BYTE_ORDER__ __BIG_ENDIAN__
-\#endif
+ #ifndef __BYTE_ORDER__
+ #define __BYTE_ORDER__ __BIG_ENDIAN__
+ #endif
-/* Convert a host long to a network long. */
+ /* Convert a host long to a network long. */
-static __inline__ unsigned long
-htonl (unsigned long __arg)
-{
- return __arg;
-}
+ static __inline__ unsigned long
+ htonl (unsigned long __arg)
+ {
+ return __arg;
+ }
-/* Convert a host short to a network short. */
+ /* Convert a host short to a network short. */
-static __inline__ unsigned short
-htons (unsigned int __arg)
-{
- return __arg;
-}
+ static __inline__ unsigned short
+ htons (unsigned int __arg)
+ {
+ return __arg;
+ }
-\#endif /* big-endian */
+ #endif /* big-endian */
-/* Convert a network long to a host long. */
+ /* Convert a network long to a host long. */
-static __inline__ unsigned long
-ntohl (unsigned long __arg)
-{
- return htonl (__arg);
-}
+ static __inline__ unsigned long
+ ntohl (unsigned long __arg)
+ {
+ return htonl (__arg);
+ }
-/* Convert a network short to a host short. */
+ /* Convert a network short to a host short. */
-static __inline__ unsigned short
-ntohs (unsigned int __arg)
-{
- return htons (__arg);
-}
-\#endif
-';
+ static __inline__ unsigned short
+ ntohs (unsigned int __arg)
+ {
+ return htons (__arg);
+ }
+ #endif
+ _EndOfHeader_;
};
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_;
};
/*
+ * 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 = {
/*
- * Fix this ARM/RISCiX file where ___type is a Compiler
- * hint that is specific to the Norcroft compiler.
- */
-fix = {
- hackname = arm_norcroft_hint;
- select = "___type p_type";
- files = "X11/Intrinsic.h";
- c_fix = format;
- c_fix_arg = "p_type";
- test_text = "___type p_type mumble;";
-};
-
-
-/*
- * Fix this ARM/RISCiX file to avoid interfering
- * with the use of __wchar_t in cc1plus.
- */
-fix = {
- hackname = arm_wchar;
- files = stdlib.h;
- select = "#[ \t]*define[ \t]*__wchar_t";
-
- c_fix = format;
- c_fix_arg = "%1_GCC_WCHAR_T";
- c_fix_arg = "(#[ \t]*(ifndef|define)[ \t]+)__wchar_t";
-
- test_text =
- "# ifndef \t __wchar_t /* we don't have wchar_t yet, ... */\n"
- "# define __wchar_t short\n"
- "# endif /* __wchar_t */";
-};
-
-
-/*
- * This file in A/UX 3.0.x/3.1.x contains an __asm directive for c89;
- * gcc doesn't understand it.
- */
-fix = {
- hackname = aux_asm;
- files = sys/param.h;
- select = "#ifndef NOINLINE";
-
- c_fix = format;
- c_fix_arg = "#if !defined(NOINLINE) && !defined(__GNUC__)";
-
- test_text =
- "#ifndef NOINLINE /* ain't got no inline, so we got it */\n"
- "#endif /* NOINLINE */";
-};
-
-
-/*
* For C++, avoid any typedef or macro definition of bool,
* and use the built in type instead.
* HP/UX 10.20 also has it in curses_colr/curses.h.
test_text = "# define bool\t char \n";
};
+
fix = {
hackname = avoid_bool_type;
files = curses.h;
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.
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
"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
* (by design?) when __GNUC__ is set beyond 2.
/*
- * Delete C++ double pow (double, int) inline function from HP-UX 10
+ * 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 = math.h;
+ files = fixinc-test-limits.h, math.h;
select = <<- END_POW_INLINE
^# +ifdef +__cplusplus
+}
"# 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";
+};
+
+
+/*
+ * 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
/*
+ * 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
/*
+ * 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 = {
/*
+ * 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++.
/*
- * 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
"#define OPEN_MAX 20 /* Max, Max, ... */\n";
};
-/*
- * fix bogus recursive stdlib.h in NEWS-OS 4.0C
- */
-fix = {
- hackname = news_os_recursion;
- files = stdlib.h;
- select = "[ \t]*#include <stdlib\\.h>.*";
-
- c_fix = format;
- c_fix_arg = "#ifdef BOGUS_RECURSION\n%0\n#endif";
- test_text = "#include <stdlib.h>";
-};
-
/*
* NeXT 3.2 adds const prefix to some math functions.
/*
- * Sun Solaris 2.7 defines PTHREAD_MUTEX_INITIALIZER with a trailing
+ * 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
*/
fix = {
- hackname = solaris27_mutex_init;
- select = '@\(#\)pthread.h' "[ \t]+1.26[ \t]+98/04/12 SMI";
- files = pthread.h;
- c_fix = format;
- c_fix_arg = "%1, {0}}";
- c_fix_arg = "(define[ \t]+PTHREAD_MUTEX_INITIALIZER.*),[ \t]*0}$";
- test_text =
- '#ident "@(#)pthread.h 1.26 98/04/12 SMI"'"\n"
- "#define PTHREAD_MUTEX_INITIALIZER {{{0},0}, {{{0}}}, 0}";
+ hackname = solaris_mutex_init;
+ 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}}";
};
/*
- * 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_ctype;
- files = ctype.h;
- test = " -x /bin/sony";
- test = " ! -z \"`if /bin/sony ; then echo true ; fi`\"";
- sed = "s/__ctype/_ctype/g";
-};
-#endif
+ 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)";
+};
/*
- * Sony NEWSOS 5.0 does not support the complete ANSI C standard.
+ * <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.
*/
-#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_widec;
+ files = widec.h;
+ 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
/*
/*
* 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.
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"
"(!__STDC__"
"|__STDC__[ \t]*==[ \t]*0"
"|__STDC__[ \t]*!=[ \t]*1"
- "|__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*0"
- ")(.*)";
+ "|__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';
c_test = stdc_0_in_system_headers;
c_fix = format;
- c_fix_arg = "%1 !defined(__STRICT_ANSI__)%3";
+ c_fix_arg = "%1 !defined(__STRICT_ANSI__)";
test_text = "#if !__STDC__ \n"
"#if __STDC__ == 0\n"
*/
fix = {
hackname = strict_ansi_not_ctd;
- files = math.h, limits.h, stdio.h, signal.h, stdlib.h, time.h;
- select = "^([ \t]*[|&][|&][ \t(]*)"
- "(__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*0"
- ")(.*)";
+ 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__)%3";
+ c_fix_arg = "%1 !defined(__STRICT_ANSI__)";
- test_text = "#if 1\\\n"
- "|| __STDC__ - 0 == 0 /* not std C */\nint foo;\n#endif";
+ 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__ )"
"(__STDC__[ \t]*!=[ \t]*0"
"|__STDC__[ \t]*==[ \t]*1"
"|__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*1"
- "|__STDC__[ \t]*-[ \t]*0[ \t]*!=[ \t]*0"
- ")(.*)";
+ "|__STDC__[ \t]*-[ \t]*0[ \t]*!=[ \t]*0)";
c_test = stdc_0_in_system_headers;
c_fix = format;
- c_fix_arg = "%1 defined(__STRICT_ANSI__)%3";
+ c_fix_arg = "%1 defined(__STRICT_ANSI__)";
test_text = "#if __STDC__ == 1 /* is std C\n */\nint foo;\n#endif";
};
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
/*
+ * __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
*/
/*
+ * 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 = {
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
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*";
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`";
};
};
+/*
+ * 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
OSDN Git Service
