1999-03-03 08:41:52 +01:00
|
|
|
/* -*- Mode: C -*- */
|
1998-10-16 09:00:18 +02:00
|
|
|
|
2000-05-09 18:21:08 +02:00
|
|
|
autogen definitions fixincl;
|
1998-10-16 09:00:18 +02:00
|
|
|
|
2000-05-01 01:59:45 +02:00
|
|
|
/* Define all the fixes we know about for repairing damaged headers.
|
|
|
|
Please see the README before adding or changing entries in this file.
|
1999-10-12 16:44:18 +02:00
|
|
|
|
2001-05-27 20:21:04 +02:00
|
|
|
This is the sort command:
|
|
|
|
|
2002-10-27 18:02:29 +01:00
|
|
|
blocksort output=inclhack.sorted \
|
2001-05-27 20:21:04 +02:00
|
|
|
pattern='^/\*$' \
|
|
|
|
trailer='^/\*EOF\*[/]' \
|
|
|
|
input=inclhack.def \
|
|
|
|
key='hackname[ ]*=[ ]*(.*);'
|
|
|
|
|
2000-05-01 01:59:45 +02:00
|
|
|
Set up a debug test so we can make the templates emit special
|
|
|
|
code while debugging these fixes: */
|
1999-10-12 16:44:18 +02:00
|
|
|
|
1999-12-29 23:59:16 +01:00
|
|
|
#ifdef DEBUG
|
|
|
|
FIXINC_DEBUG = yes;
|
|
|
|
#endif
|
1999-10-12 16:44:18 +02:00
|
|
|
|
2008-03-07 07:53:59 +01:00
|
|
|
/* On AIX when _LARGE_FILES is defined stdio.h defines fopen to
|
|
|
|
* fopen64 etc. and this causes problems when building with g++
|
|
|
|
* because cstdio udefs everything from stdio.h, leaving us with
|
|
|
|
* ::fopen has not been declared errors. This fixes stdio.h to
|
|
|
|
* undef those defines and use __asm__ to alias the symbols if
|
|
|
|
* building with g++ and -D_LARGE_FILES
|
|
|
|
*/
|
|
|
|
fix = {
|
2008-06-08 00:19:45 +02:00
|
|
|
hackname = AAB_aix_stdio;
|
|
|
|
files = stdio.h;
|
|
|
|
select = "define fopen fopen64";
|
|
|
|
mach = "*-*-aix*";
|
|
|
|
test-text = ''; /* no way to test */
|
|
|
|
|
|
|
|
c_fix = wrap;
|
|
|
|
|
|
|
|
c_fix_arg = "";
|
|
|
|
|
|
|
|
c_fix_arg = <<- _EOArg_
|
|
|
|
|
|
|
|
#if defined __GNUG__ && defined _LARGE_FILES && defined __cplusplus
|
|
|
|
#define __need__aix_stdio_h_fix
|
|
|
|
#ifdef __need__aix_stdio_h_fix
|
|
|
|
#undef fseeko
|
|
|
|
#undef ftello
|
|
|
|
#undef fgetpos
|
|
|
|
#undef fsetpos
|
|
|
|
#undef fopen
|
|
|
|
#undef freopen
|
|
|
|
/* Alias the symbols using asm */
|
|
|
|
extern "C" {
|
|
|
|
extern int fgetpos(FILE *, fpos64_t *) __asm__("fgetpos64");
|
|
|
|
extern FILE *fopen(const char *, const char *) __asm__("fopen64");
|
|
|
|
extern FILE *freopen(const char *, const char *, FILE *) __asm__("freopen64");
|
|
|
|
extern int fseeko(FILE *, off64_t, int) __asm__("fseeko64");
|
|
|
|
extern int fsetpos(FILE *, const fpos64_t *) __asm__("fsetpos64");
|
|
|
|
extern off64_t ftello(FILE *) __asm__("ftello64");
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
_EOArg_;
|
2008-03-07 07:53:59 +01:00
|
|
|
};
|
|
|
|
|
2006-01-19 18:18:29 +01:00
|
|
|
|
2005-06-25 01:43:15 +02:00
|
|
|
/*
|
|
|
|
* On Mac OS 10.3.9, the 'long double' functions are available in
|
|
|
|
* libSystem, but are not prototyped in math.h.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = AAB_darwin7_9_long_double_funcs;
|
|
|
|
mach = "*-*-darwin7.9*";
|
|
|
|
files = architecture/ppc/math.h;
|
|
|
|
bypass = "powl";
|
|
|
|
replace = <<- _EndOfHeader_
|
2008-06-08 18:07:17 +02:00
|
|
|
/* This file prototypes the long double functions available on Mac OS
|
|
|
|
10.3.9. */
|
|
|
|
#ifndef __MATH__
|
|
|
|
# undef __APPLE_CC__
|
|
|
|
# define __APPLE_CC__ 1345
|
|
|
|
# include_next <architecture/ppc/math.h>
|
|
|
|
# undef __APPLE_CC__
|
|
|
|
# define __APPLE_CC__ 1
|
|
|
|
# ifndef __LIBMLDBL_COMPAT
|
|
|
|
# ifdef __LONG_DOUBLE_128__
|
|
|
|
# define __LIBMLDBL_COMPAT(sym) __asm("_" #sym "$LDBL128")
|
|
|
|
# else
|
|
|
|
# define __LIBMLDBL_COMPAT(sym)
|
|
|
|
# endif /* __LONG_DOUBLE_128__ */
|
|
|
|
# endif /* __LIBMLDBL_COMPAT */
|
|
|
|
# ifdef __cplusplus
|
|
|
|
extern "C" {
|
|
|
|
# endif
|
|
|
|
extern long double acosl( long double ) __LIBMLDBL_COMPAT(acosl);
|
|
|
|
extern long double asinl( long double ) __LIBMLDBL_COMPAT(asinl);
|
|
|
|
extern long double atanl( long double ) __LIBMLDBL_COMPAT(atanl);
|
|
|
|
extern long double atan2l( long double, long double ) __LIBMLDBL_COMPAT(atan2l);
|
|
|
|
extern long double cosl( long double ) __LIBMLDBL_COMPAT(cosl);
|
|
|
|
extern long double sinl( long double ) __LIBMLDBL_COMPAT(sinl);
|
|
|
|
extern long double tanl( long double ) __LIBMLDBL_COMPAT(tanl);
|
|
|
|
extern long double acoshl( long double ) __LIBMLDBL_COMPAT(acoshl);
|
|
|
|
extern long double asinhl( long double ) __LIBMLDBL_COMPAT(asinhl);
|
|
|
|
extern long double atanhl( long double ) __LIBMLDBL_COMPAT(atanhl);
|
|
|
|
extern long double coshl( long double ) __LIBMLDBL_COMPAT(coshl);
|
|
|
|
extern long double sinhl( long double ) __LIBMLDBL_COMPAT(sinhl);
|
|
|
|
extern long double tanhl( long double ) __LIBMLDBL_COMPAT(tanhl);
|
|
|
|
extern long double expl( long double ) __LIBMLDBL_COMPAT(expl);
|
|
|
|
extern long double exp2l( long double ) __LIBMLDBL_COMPAT(exp2l);
|
|
|
|
extern long double expm1l( long double ) __LIBMLDBL_COMPAT(expm1l);
|
|
|
|
extern long double logl( long double ) __LIBMLDBL_COMPAT(logl);
|
|
|
|
extern long double log10l( long double ) __LIBMLDBL_COMPAT(log10l);
|
|
|
|
extern long double log2l( long double ) __LIBMLDBL_COMPAT(log2l);
|
|
|
|
extern long double log1pl( long double ) __LIBMLDBL_COMPAT(log1pl);
|
|
|
|
extern long double logbl( long double ) __LIBMLDBL_COMPAT(logbl);
|
|
|
|
extern long double modfl( long double, long double * ) __LIBMLDBL_COMPAT(modfl);
|
|
|
|
extern long double ldexpl( long double, int ) __LIBMLDBL_COMPAT(ldexpl);
|
|
|
|
extern long double frexpl( long double, int * ) __LIBMLDBL_COMPAT(frexpl);
|
|
|
|
extern int ilogbl( long double ) __LIBMLDBL_COMPAT(ilogbl);
|
|
|
|
extern long double scalbnl( long double, int ) __LIBMLDBL_COMPAT(scalbnl);
|
|
|
|
extern long double scalblnl( long double, long int ) __LIBMLDBL_COMPAT(scalblnl);
|
|
|
|
extern long double fabsl( long double ) __LIBMLDBL_COMPAT(fabsl);
|
|
|
|
extern long double cbrtl( long double ) __LIBMLDBL_COMPAT(cbrtl);
|
|
|
|
extern long double hypotl( long double, long double ) __LIBMLDBL_COMPAT(hypotl);
|
|
|
|
extern long double powl( long double, long double ) __LIBMLDBL_COMPAT(powl);
|
|
|
|
extern long double sqrtl( long double ) __LIBMLDBL_COMPAT(sqrtl);
|
|
|
|
extern long double erfl( long double ) __LIBMLDBL_COMPAT(erfl);
|
|
|
|
extern long double erfcl( long double ) __LIBMLDBL_COMPAT(erfcl);
|
|
|
|
extern long double lgammal( long double ) __LIBMLDBL_COMPAT(lgammal);
|
|
|
|
extern long double tgammal( long double ) __LIBMLDBL_COMPAT(tgammal);
|
|
|
|
extern long double ceill( long double ) __LIBMLDBL_COMPAT(ceill);
|
|
|
|
extern long double floorl( long double ) __LIBMLDBL_COMPAT(floorl);
|
|
|
|
extern long double nearbyintl( long double ) __LIBMLDBL_COMPAT(nearbyintl);
|
|
|
|
extern long double rintl( long double ) __LIBMLDBL_COMPAT(rintl);
|
|
|
|
extern long int lrintl( long double ) __LIBMLDBL_COMPAT(lrintl);
|
|
|
|
extern long long int llrintl( long double ) __LIBMLDBL_COMPAT(llrintl);
|
|
|
|
extern long double roundl( long double ) __LIBMLDBL_COMPAT(roundl);
|
|
|
|
extern long int lroundl( long double ) __LIBMLDBL_COMPAT(lroundl);
|
|
|
|
extern long long int llroundl( long double ) __LIBMLDBL_COMPAT(llroundl);
|
|
|
|
extern long double truncl( long double ) __LIBMLDBL_COMPAT(truncl);
|
|
|
|
extern long double fmodl( long double, long double) __LIBMLDBL_COMPAT(fmodl);
|
|
|
|
extern long double remainderl( long double, long double ) __LIBMLDBL_COMPAT(remainderl);
|
|
|
|
extern long double remquol( long double, long double, int * ) __LIBMLDBL_COMPAT(remquol);
|
|
|
|
extern long double copysignl( long double, long double ) __LIBMLDBL_COMPAT(copysignl);
|
|
|
|
extern long double nanl( const char * ) __LIBMLDBL_COMPAT(nanl);
|
|
|
|
extern long double nextafterl( long double, long double ) __LIBMLDBL_COMPAT(nextafterl);
|
|
|
|
extern long double nexttowardl( long double, long double ) __LIBMLDBL_COMPAT(nexttowardl);
|
|
|
|
extern long double fdiml( long double, long double ) __LIBMLDBL_COMPAT(fdiml);
|
|
|
|
extern long double fmaxl( long double, long double ) __LIBMLDBL_COMPAT(fmaxl);
|
|
|
|
extern long double fminl( long double, long double ) __LIBMLDBL_COMPAT(fminl);
|
|
|
|
extern long double fmal( long double, long double, long double ) __LIBMLDBL_COMPAT(fmal);
|
|
|
|
# ifdef __cplusplus
|
|
|
|
}
|
|
|
|
# endif
|
|
|
|
#endif /* __MATH__ */
|
|
|
|
_EndOfHeader_;
|
2005-06-25 01:43:15 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ... and for the previous fix to be useful, you have to not use ""
|
|
|
|
* includes.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = AAB_darwin7_9_long_double_funcs_2;
|
|
|
|
mach = "*-*-darwin7.9*";
|
|
|
|
files = math.h;
|
|
|
|
select = '#include[ \t]+\"';
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "%1<%2.h>";
|
|
|
|
|
|
|
|
c_fix_arg = '([ \t]*#[ \t]*include[ \t]+)"([a-z0-9/]+)\.h"';
|
|
|
|
|
|
|
|
test_text = '#include "architecture/ppc/math.h"';
|
|
|
|
};
|
|
|
|
|
|
|
|
|
1999-11-22 16:05:48 +01:00
|
|
|
/*
|
fixtests.c (is_cxx_header): New fn, split out of double_slash_test.
1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu>
* fixtests.c (is_cxx_header): New fn, split out of
double_slash_test.
(else_endif_label): Allow "#endif // comment" in C++ headers,
as determined by is_cxx_header.
* fixfixes.c (else_endif_label_fix): Update comment.
* fixincl.c: Don't output VERB_PROGRESS lines if stdout is not
a tty.
* genfixes: Correct double thinko in commandline parsing.
* hackshell.tpl: Generate correct sh syntax for bypass
entries.
* inclhack.def (all): Whenever an inserted preprocessor
conditional is split over multiple lines, use double
backslashes in this file so the fixed header will be readable.
(AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h
and add bypass entry for correct version of this header.
(AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h.
(AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h.
(hpux8_bogus_inlines): New fix, split from...
(ultrix_atof_param) ... here.
(math_expression): Add bypass entry keyed to glibc comment
indicating the problem has been dealt with; disable
unnecessary sed operations; update commentary.
(math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max,
add select and bypass entries, simplify shell operation.
(math_huge_val_ifndef): Split from math_gcc_ifndefs.
(ip_missing_semi, rs6000_param, tinfo_cplusplus,
ultrix_atof_param): Add select entry.
(stdio_va_list, sunos_mather_decl): Add bypass entry.
(systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the
comments with the fixes they describe.
* fixincl.x, fixincl.sh, inclhack.sh: Regen.
From-SVN: r30999
1999-12-17 22:49:30 +01:00
|
|
|
* This fixes __FD_ZERO bug for linux 2.x.y (x <= 2 && y <= some n)
|
1999-11-22 16:05:48 +01:00
|
|
|
*/
|
|
|
|
fix = {
|
fixtests.c (is_cxx_header): New fn, split out of double_slash_test.
1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu>
* fixtests.c (is_cxx_header): New fn, split out of
double_slash_test.
(else_endif_label): Allow "#endif // comment" in C++ headers,
as determined by is_cxx_header.
* fixfixes.c (else_endif_label_fix): Update comment.
* fixincl.c: Don't output VERB_PROGRESS lines if stdout is not
a tty.
* genfixes: Correct double thinko in commandline parsing.
* hackshell.tpl: Generate correct sh syntax for bypass
entries.
* inclhack.def (all): Whenever an inserted preprocessor
conditional is split over multiple lines, use double
backslashes in this file so the fixed header will be readable.
(AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h
and add bypass entry for correct version of this header.
(AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h.
(AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h.
(hpux8_bogus_inlines): New fix, split from...
(ultrix_atof_param) ... here.
(math_expression): Add bypass entry keyed to glibc comment
indicating the problem has been dealt with; disable
unnecessary sed operations; update commentary.
(math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max,
add select and bypass entries, simplify shell operation.
(math_huge_val_ifndef): Split from math_gcc_ifndefs.
(ip_missing_semi, rs6000_param, tinfo_cplusplus,
ultrix_atof_param): Add select entry.
(stdio_va_list, sunos_mather_decl): Add bypass entry.
(systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the
comments with the fixes they describe.
* fixincl.x, fixincl.sh, inclhack.sh: Regen.
From-SVN: r30999
1999-12-17 22:49:30 +01:00
|
|
|
hackname = AAB_fd_zero_asm_posix_types_h;
|
1999-11-22 16:05:48 +01:00
|
|
|
files = asm/posix_types.h;
|
2000-08-14 20:08:46 +02:00
|
|
|
mach = 'i[34567]86-*-linux*';
|
fixtests.c (is_cxx_header): New fn, split out of double_slash_test.
1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu>
* fixtests.c (is_cxx_header): New fn, split out of
double_slash_test.
(else_endif_label): Allow "#endif // comment" in C++ headers,
as determined by is_cxx_header.
* fixfixes.c (else_endif_label_fix): Update comment.
* fixincl.c: Don't output VERB_PROGRESS lines if stdout is not
a tty.
* genfixes: Correct double thinko in commandline parsing.
* hackshell.tpl: Generate correct sh syntax for bypass
entries.
* inclhack.def (all): Whenever an inserted preprocessor
conditional is split over multiple lines, use double
backslashes in this file so the fixed header will be readable.
(AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h
and add bypass entry for correct version of this header.
(AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h.
(AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h.
(hpux8_bogus_inlines): New fix, split from...
(ultrix_atof_param) ... here.
(math_expression): Add bypass entry keyed to glibc comment
indicating the problem has been dealt with; disable
unnecessary sed operations; update commentary.
(math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max,
add select and bypass entries, simplify shell operation.
(math_huge_val_ifndef): Split from math_gcc_ifndefs.
(ip_missing_semi, rs6000_param, tinfo_cplusplus,
ultrix_atof_param): Add select entry.
(stdio_va_list, sunos_mather_decl): Add bypass entry.
(systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the
comments with the fixes they describe.
* fixincl.x, fixincl.sh, inclhack.sh: Regen.
From-SVN: r30999
1999-12-17 22:49:30 +01:00
|
|
|
bypass = '} while';
|
2006-10-29 17:35:50 +01:00
|
|
|
bypass = 'x86_64';
|
2008-05-14 17:13:40 +02:00
|
|
|
bypass = 'posix_types_64';
|
1999-11-22 16:05:48 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Define _POSIX_TYPES_H_WRAPPER at the end of the wrapper, not
|
|
|
|
* the start, so that if #include_next gets another instance of
|
|
|
|
* the wrapper, this will follow the #include_next chain until
|
|
|
|
* we arrive at the real <asm/posix_types.h>.
|
|
|
|
*/
|
2003-01-04 19:44:04 +01:00
|
|
|
replace = <<- _EndOfHeader_
|
2001-12-20 05:09:40 +01:00
|
|
|
/* 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; \
|
2008-06-08 00:19:45 +02:00
|
|
|
__asm__ __volatile__("cld ; rep ; stosl" \
|
|
|
|
: "=&c" (__d0), "=&D" (__d1) \
|
|
|
|
: "a" (0), "0" (__FDSET_LONGS), \
|
|
|
|
"1" ((__kernel_fd_set *) (fdsetp)) :"memory"); \
|
2001-12-20 05:09:40 +01:00
|
|
|
} while (0)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#define _POSIX_TYPES_H_WRAPPER
|
|
|
|
#endif /* _POSIX_TYPES_H_WRAPPER */
|
2003-01-04 19:44:04 +01:00
|
|
|
_EndOfHeader_;
|
1999-11-22 16:05:48 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This fixes __FD_ZERO bug for glibc-1.x
|
|
|
|
*/
|
|
|
|
fix = {
|
fixtests.c (is_cxx_header): New fn, split out of double_slash_test.
1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu>
* fixtests.c (is_cxx_header): New fn, split out of
double_slash_test.
(else_endif_label): Allow "#endif // comment" in C++ headers,
as determined by is_cxx_header.
* fixfixes.c (else_endif_label_fix): Update comment.
* fixincl.c: Don't output VERB_PROGRESS lines if stdout is not
a tty.
* genfixes: Correct double thinko in commandline parsing.
* hackshell.tpl: Generate correct sh syntax for bypass
entries.
* inclhack.def (all): Whenever an inserted preprocessor
conditional is split over multiple lines, use double
backslashes in this file so the fixed header will be readable.
(AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h
and add bypass entry for correct version of this header.
(AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h.
(AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h.
(hpux8_bogus_inlines): New fix, split from...
(ultrix_atof_param) ... here.
(math_expression): Add bypass entry keyed to glibc comment
indicating the problem has been dealt with; disable
unnecessary sed operations; update commentary.
(math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max,
add select and bypass entries, simplify shell operation.
(math_huge_val_ifndef): Split from math_gcc_ifndefs.
(ip_missing_semi, rs6000_param, tinfo_cplusplus,
ultrix_atof_param): Add select entry.
(stdio_va_list, sunos_mather_decl): Add bypass entry.
(systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the
comments with the fixes they describe.
* fixincl.x, fixincl.sh, inclhack.sh: Regen.
From-SVN: r30999
1999-12-17 22:49:30 +01:00
|
|
|
hackname = AAB_fd_zero_gnu_types_h;
|
1999-11-22 16:05:48 +01:00
|
|
|
files = gnu/types.h;
|
2000-08-14 20:08:46 +02:00
|
|
|
mach = 'i[34567]86-*-linux*';
|
1999-11-22 16:05:48 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Define _TYPES_H_WRAPPER at the end of the wrapper, not
|
|
|
|
* the start, so that if #include_next gets another instance of
|
|
|
|
* the wrapper, this will follow the #include_next chain until
|
|
|
|
* we arrive at the real <gnu/types.h>.
|
|
|
|
*/
|
2003-01-04 19:44:04 +01:00
|
|
|
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
|
2005-05-06 18:33:18 +02:00
|
|
|
# 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"); \
|
2003-01-04 19:44:04 +01:00
|
|
|
} while (0)
|
|
|
|
#endif
|
1999-11-22 16:05:48 +01:00
|
|
|
|
2003-01-04 19:44:04 +01:00
|
|
|
#define _TYPES_H_WRAPPER
|
|
|
|
#endif /* _TYPES_H_WRAPPER */
|
|
|
|
_EndOfHeader_;
|
1999-11-22 16:05:48 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This fixes __FD_ZERO bug for glibc-2.0.x
|
|
|
|
*/
|
|
|
|
fix = {
|
fixtests.c (is_cxx_header): New fn, split out of double_slash_test.
1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu>
* fixtests.c (is_cxx_header): New fn, split out of
double_slash_test.
(else_endif_label): Allow "#endif // comment" in C++ headers,
as determined by is_cxx_header.
* fixfixes.c (else_endif_label_fix): Update comment.
* fixincl.c: Don't output VERB_PROGRESS lines if stdout is not
a tty.
* genfixes: Correct double thinko in commandline parsing.
* hackshell.tpl: Generate correct sh syntax for bypass
entries.
* inclhack.def (all): Whenever an inserted preprocessor
conditional is split over multiple lines, use double
backslashes in this file so the fixed header will be readable.
(AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h
and add bypass entry for correct version of this header.
(AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h.
(AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h.
(hpux8_bogus_inlines): New fix, split from...
(ultrix_atof_param) ... here.
(math_expression): Add bypass entry keyed to glibc comment
indicating the problem has been dealt with; disable
unnecessary sed operations; update commentary.
(math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max,
add select and bypass entries, simplify shell operation.
(math_huge_val_ifndef): Split from math_gcc_ifndefs.
(ip_missing_semi, rs6000_param, tinfo_cplusplus,
ultrix_atof_param): Add select entry.
(stdio_va_list, sunos_mather_decl): Add bypass entry.
(systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the
comments with the fixes they describe.
* fixincl.x, fixincl.sh, inclhack.sh: Regen.
From-SVN: r30999
1999-12-17 22:49:30 +01:00
|
|
|
hackname = AAB_fd_zero_selectbits_h;
|
1999-11-22 16:05:48 +01:00
|
|
|
files = selectbits.h;
|
2000-08-14 20:08:46 +02:00
|
|
|
mach = 'i[34567]86-*-linux*';
|
1999-11-22 16:05:48 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Define _SELECTBITS_H_WRAPPER at the end of the wrapper, not
|
|
|
|
* the start, so that if #include_next gets another instance of
|
|
|
|
* the wrapper, this will follow the #include_next chain until
|
|
|
|
* we arrive at the real <selectbits.h>.
|
|
|
|
*/
|
2003-01-04 19:44:04 +01:00
|
|
|
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" \\
|
fixtests.c (is_cxx_header): New fn, split out of double_slash_test.
1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu>
* fixtests.c (is_cxx_header): New fn, split out of
double_slash_test.
(else_endif_label): Allow "#endif // comment" in C++ headers,
as determined by is_cxx_header.
* fixfixes.c (else_endif_label_fix): Update comment.
* fixincl.c: Don't output VERB_PROGRESS lines if stdout is not
a tty.
* genfixes: Correct double thinko in commandline parsing.
* hackshell.tpl: Generate correct sh syntax for bypass
entries.
* inclhack.def (all): Whenever an inserted preprocessor
conditional is split over multiple lines, use double
backslashes in this file so the fixed header will be readable.
(AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h
and add bypass entry for correct version of this header.
(AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h.
(AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h.
(hpux8_bogus_inlines): New fix, split from...
(ultrix_atof_param) ... here.
(math_expression): Add bypass entry keyed to glibc comment
indicating the problem has been dealt with; disable
unnecessary sed operations; update commentary.
(math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max,
add select and bypass entries, simplify shell operation.
(math_huge_val_ifndef): Split from math_gcc_ifndefs.
(ip_missing_semi, rs6000_param, tinfo_cplusplus,
ultrix_atof_param): Add select entry.
(stdio_va_list, sunos_mather_decl): Add bypass entry.
(systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the
comments with the fixes they describe.
* fixincl.x, fixincl.sh, inclhack.sh: Regen.
From-SVN: r30999
1999-12-17 22:49:30 +01:00
|
|
|
: "=&c" (__d0), "=&D" (__d1) \\
|
|
|
|
: "a" (0), "0" (sizeof (__fd_set) \\
|
|
|
|
/ sizeof (__fd_mask)), \\
|
|
|
|
"1" ((__fd_mask *) (fdsetp)) \\
|
|
|
|
: "memory"); \\
|
2003-01-04 19:44:04 +01:00
|
|
|
} while (0)
|
|
|
|
#endif
|
1999-11-22 16:05:48 +01:00
|
|
|
|
2003-01-04 19:44:04 +01:00
|
|
|
#define _SELECTBITS_H_WRAPPER
|
|
|
|
#endif /* _SELECTBITS_H_WRAPPER */
|
|
|
|
_EndOfHeader_;
|
1999-11-22 16:05:48 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2002-08-31 05:33:09 +02:00
|
|
|
/*
|
|
|
|
* 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*';
|
2003-01-04 19:44:04 +01:00
|
|
|
replace = <<- _EndOfHeader_
|
|
|
|
#ifdef __STDC__
|
|
|
|
#include <stdarg.h>
|
|
|
|
#else
|
|
|
|
#include <varargs.h>
|
|
|
|
#endif
|
|
|
|
_EndOfHeader_;
|
2002-08-31 05:33:09 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2000-01-17 22:45:29 +01:00
|
|
|
/*
|
|
|
|
* Fix non-ANSI memcpy declaration that conflicts with gcc's builtin
|
|
|
|
* declaration on Sun OS 4.x. We must only fix this on Sun OS 4.x, because
|
|
|
|
* many other systems have similar text but correct versions of the file.
|
|
|
|
* To ensure only Sun's is fixed, we grep for a likely unique string.
|
|
|
|
* Fix also on sysV68 R3V7.1 (head/memory.h\t50.1\t )
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = AAB_sun_memcpy;
|
|
|
|
files = memory.h;
|
2003-01-04 19:44:04 +01:00
|
|
|
select = "/\\*\t@\\(#\\)"
|
2000-01-17 22:45:29 +01:00
|
|
|
"(head/memory.h\t50.1\t "
|
|
|
|
"|memory\\.h 1\\.[2-4] 8./../.. SMI; from S5R2 1\\.2\t)\\*/";
|
|
|
|
|
2003-01-04 19:44:04 +01:00
|
|
|
replace = <<- _EndOfHeader_
|
|
|
|
/* This file was generated by fixincludes */
|
|
|
|
#ifndef __memory_h__
|
|
|
|
#define __memory_h__
|
2000-01-17 22:45:29 +01:00
|
|
|
|
2003-01-04 19:44:04 +01:00
|
|
|
#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__ */
|
2000-01-17 22:45:29 +01:00
|
|
|
|
2003-01-04 19:44:04 +01:00
|
|
|
extern int memcmp();
|
2000-01-17 22:45:29 +01:00
|
|
|
|
2003-01-04 19:44:04 +01:00
|
|
|
#endif /* __memory_h__ */
|
2008-06-08 00:19:45 +02:00
|
|
|
_EndOfHeader_;
|
2000-01-17 22:45:29 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2000-08-13 20:00:34 +02:00
|
|
|
/*
|
|
|
|
* 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";
|
2000-08-23 16:08:57 +02:00
|
|
|
test_text = "#define PTHREAD_MUTEX_INITIALIZER\\\\\n"
|
|
|
|
"{...init stuff...}";
|
2000-08-13 20:00:34 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 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";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2004-04-25 00:42:29 +02:00
|
|
|
/*
|
|
|
|
* sys/wait.h on AIX 5.2 defines macros that have both signed and
|
|
|
|
* unsigned types in conditional expressions.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = aix_syswait_2;
|
|
|
|
files = sys/wait.h;
|
|
|
|
select = '\? (\(\(\(\(unsigned[^)]*\)[^)]*\) >> [^)]*\) \& 0xff\) : -1)';
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "? (int)%1";
|
|
|
|
test_text = "#define WSTOPSIG(__x) (int)(WIFSTOPPED(__x) ? ((((unsigned int)__x) >> 8) & 0xff) : -1)";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
1998-10-16 09:00:18 +02:00
|
|
|
/*
|
|
|
|
* sys/signal.h on some versions of AIX uses volatile in the typedef of
|
|
|
|
* sig_atomic_t, which causes gcc to generate a warning about duplicate
|
|
|
|
* volatile when a sig_atomic_t variable is declared volatile, as
|
|
|
|
* required by ANSI C.
|
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-09 18:21:08 +02:00
|
|
|
hackname = aix_volatile;
|
|
|
|
files = sys/signal.h;
|
|
|
|
select = "typedef volatile int sig_atomic_t";
|
2000-05-14 23:20:33 +02:00
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "typedef int sig_atomic_t";
|
2000-05-09 18:21:08 +02:00
|
|
|
test_text = "typedef volatile int sig_atomic_t;";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2001-05-25 23:08:53 +02:00
|
|
|
/*
|
|
|
|
* Fix __assert declaration in assert.h on Alpha OSF/1.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = alpha___assert;
|
|
|
|
files = "assert.h";
|
|
|
|
select = '__assert\(char \*, char \*, int\)';
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "__assert(const char *, const char *, int)";
|
|
|
|
test_text = 'extern void __assert(char *, char *, int);';
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2003-02-24 19:52:51 +01:00
|
|
|
/*
|
2004-01-16 21:58:27 +01:00
|
|
|
* Obey __PRAGMA_EXTERN_PREFIX for Tru64 UNIX V4/5 headers.
|
2003-02-24 19:52:51 +01:00
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = alpha___extern_prefix;
|
2007-02-04 16:10:08 +01:00
|
|
|
select = "(.*)(defined\\(__DECC\\)|def[ \t]*__DECC)[ \t]*\n"
|
|
|
|
"(#[ \t]*pragma[ \t]*extern_prefix.*)";
|
2004-01-16 21:58:27 +01:00
|
|
|
|
|
|
|
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)";
|
|
|
|
|
2007-02-04 16:10:08 +01:00
|
|
|
test_text = "#if (_ISO_C_SOURCE>=19990L) "
|
|
|
|
"&& !defined(_LIBC_POLLUTION_H_) && !defined(__DECC)";
|
2004-01-16 21:58:27 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 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;
|
2003-02-24 19:52:51 +01:00
|
|
|
files = sys/stat.h;
|
2004-01-16 21:58:27 +01:00
|
|
|
files = sys/mount.h;
|
2003-02-24 19:52:51 +01:00
|
|
|
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)";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2002-03-21 02:11:48 +01:00
|
|
|
/*
|
|
|
|
* 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)";
|
2007-02-04 16:10:08 +01:00
|
|
|
test_text = '#define assert(EX) (((int) (EX)) ? (void)0 '
|
|
|
|
': __assert(#EX, __FILE__, __LINE__))';
|
2002-03-21 02:11:48 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2004-01-23 21:40:52 +01:00
|
|
|
/*
|
|
|
|
* Fix #defines under Alpha OSF/1:
|
|
|
|
* The following files contain '#pragma extern_prefix "_FOO"' followed by
|
|
|
|
* a '#define something(x,y,z) _FOOsomething(x,y,z)'. The intent of these
|
|
|
|
* statements is to reduce namespace pollution. While these macros work
|
|
|
|
* properly in most cases, they don't allow you to take a pointer to the
|
|
|
|
* "something" being modified. To get around this limitation, change these
|
|
|
|
* statements to be of the form '#define something _FOOsomething'.
|
|
|
|
*
|
|
|
|
* sed ain't egrep, lesson 2463: sed can use self-referential
|
|
|
|
* regular expressions. In the substitute expression below,
|
|
|
|
* "\\1" and "\\2" refer to subexpressions found earlier in the
|
|
|
|
* same match. So, we continue to use sed. "extern_prefix" will
|
|
|
|
* be a rare match anyway...
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = alpha_bad_lval;
|
|
|
|
|
|
|
|
select = "^[ \t]*#[ \t]*pragma[ \t]+extern_prefix";
|
|
|
|
mach = "alpha*-dec-osf*";
|
|
|
|
|
|
|
|
sed =
|
|
|
|
"s/^[ \t]*#[ \t]*define[ \t][ \t]*\\([^(]*\\)\\(([^)]*)\\)[ \t]*"
|
|
|
|
"\\(_.*\\)\\1\\2[ \t]*$/#define \\1 \\3\\1/";
|
|
|
|
|
|
|
|
test_text = '#pragma extern_prefix "_FOO"'"\n"
|
|
|
|
"#define something(x,y,z) _FOOsomething(x,y,z)\n"
|
|
|
|
"#define mumble _FOOmumble";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
1998-10-16 09:00:18 +02:00
|
|
|
/*
|
|
|
|
* Fix getopt declarations in stdio.h and stdlib.h on Alpha OSF/1 and AIX.
|
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-09 18:21:08 +02:00
|
|
|
hackname = alpha_getopt;
|
|
|
|
files = "stdio.h";
|
|
|
|
files = "stdlib.h";
|
|
|
|
select = 'getopt\(int, char \*\[\], *char \*\)';
|
2000-05-14 23:20:33 +02:00
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "getopt(int, char *const[], const char *)";
|
2000-05-09 18:21:08 +02:00
|
|
|
test_text = 'extern int getopt(int, char *[], char *);';
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2009-02-28 19:13:31 +01:00
|
|
|
/*
|
|
|
|
* Fix missing semicolon on Alpha OSF/4 in <net/if.h>
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = alpha_if_semicolon;
|
|
|
|
files = net/if.h;
|
|
|
|
select = "struct[ \t]+sockaddr[ \t]+vmif_paddr[ \t]+/\\*";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "struct sockaddr vmif_paddr;\t/*";
|
|
|
|
test_text = ' struct sockaddr vmif_paddr /* protocol address */';
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2000-07-12 00:20:38 +02:00
|
|
|
/*
|
1999-03-31 14:02:19 +02:00
|
|
|
* Remove erroneous parentheses in sym.h on Alpha OSF/1.
|
1998-10-16 09:00:18 +02:00
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-09 18:21:08 +02:00
|
|
|
hackname = alpha_parens;
|
|
|
|
files = sym.h;
|
|
|
|
select = '#ifndef\(__mips64\)';
|
2000-05-14 23:20:33 +02:00
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#ifndef __mips64";
|
2000-05-09 18:21:08 +02:00
|
|
|
test_text = "#ifndef(__mips64) /* bogus */\nextern int foo;\n#endif";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2003-07-31 14:01:07 +02:00
|
|
|
/*
|
|
|
|
* Obey __PRAGMA_EXTERN_PREFIX for Tru64 UNIX <pthread.h>.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = alpha_pthread;
|
|
|
|
files = pthread.h;
|
2007-02-04 16:10:08 +01:00
|
|
|
select = "((#[ \t]*if)([ \t]*defined[ \t]*\\(_PTHREAD_ENV_DECC\\)"
|
|
|
|
"|def _PTHREAD_ENV_DECC)(.*))\n"
|
2003-07-31 14:01:07 +02:00
|
|
|
"(#[ \t]*define _PTHREAD_USE_PTDNAM_)";
|
|
|
|
|
|
|
|
mach = "alpha*-dec-osf*";
|
|
|
|
c_fix = format;
|
2007-02-04 16:10:08 +01:00
|
|
|
c_fix_arg = "%2 defined (_PTHREAD_ENV_DECC)%4 "
|
|
|
|
"|| defined (__PRAGMA_EXTERN_PREFIX)\n%5";
|
2003-07-31 14:01:07 +02:00
|
|
|
|
2007-02-04 16:10:08 +01:00
|
|
|
test_text = "# if defined (_PTHREAD_ENV_DECC) "
|
|
|
|
"|| defined (_PTHREAD_ENV_EPCC)\n"
|
2004-01-16 21:58:27 +01:00
|
|
|
"# define _PTHREAD_USE_PTDNAM_\n"
|
|
|
|
"# endif\n"
|
|
|
|
"# ifdef _PTHREAD_ENV_DECC\n"
|
2003-07-31 14:01:07 +02:00
|
|
|
"# define _PTHREAD_USE_PTDNAM_\n"
|
|
|
|
"# endif";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2003-10-14 13:46:47 +02:00
|
|
|
/*
|
|
|
|
* Recognize GCC in Tru64 UNIX V5.1B <pthread.h>.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
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 = "#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";
|
|
|
|
};
|
|
|
|
|
2008-09-06 21:57:26 +02:00
|
|
|
|
2004-11-21 17:25:07 +01:00
|
|
|
/*
|
|
|
|
* Compaq Tru64 v5.1 defines all of its PTHREAD_*_INITIALIZER macros
|
|
|
|
* incorrectly, specifying less fields in the initializers than are
|
|
|
|
* defined in the corresponding structure types. Use of these macros
|
|
|
|
* in user code results in spurious warnings.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = alpha_pthread_init;
|
|
|
|
files = pthread.h;
|
2004-11-22 00:01:44 +01:00
|
|
|
select = ' \* @\(#\).RCSfile: pthread\.h,v \$'
|
|
|
|
' .Revision: 1\.1\.33\.21 \$ \(DEC\)'
|
|
|
|
' .Date: 2000/08/15 15:30:13 \$';
|
2004-11-21 17:25:07 +01:00
|
|
|
mach = "alpha*-dec-osf*";
|
|
|
|
sed = "s@MVALID\\(.*\\)A}@MVALID\\1A, 0, 0, 0, 0, 0, 0 }@\n"
|
|
|
|
"s@MVALID\\(.*\\)_}@MVALID\\1_, 0, 0, 0, 0 }@\n"
|
|
|
|
"s@CVALID\\(.*\\)A}@CVALID\\1A, 0, 0, 0, 0 }@\n"
|
|
|
|
"s@CVALID\\(.*\\)_}@CVALID\\1_, 0, 0 }@\n"
|
|
|
|
"s@WVALID\\(.*\\)A}@WVALID\\1A, 0, 0, 0, 0, 0, 0, 0, 0, 0 }@\n"
|
|
|
|
"s@WVALID\\(.*\\)_}@WVALID\\1_, 0, 0, 0, 0, 0, 0, 0 }@\n";
|
2008-09-06 21:57:26 +02:00
|
|
|
test_text = <<- _EOText_
|
|
|
|
/*
|
|
|
|
* @(#)_RCSfile: pthread.h,v $ _Revision: 1.1.33.21 $ (DEC) _Date: 2000/08/15 15:30:13 $
|
|
|
|
*/
|
|
|
|
#ifndef _PTHREAD_NOMETER_STATIC
|
|
|
|
# define PTHREAD_MUTEX_INITIALIZER \
|
|
|
|
{_PTHREAD_MSTATE_CONFIG, _PTHREAD_MVALID | _PTHREAD_MVF_STA}
|
|
|
|
# define PTHREAD_COND_INITIALIZER \
|
|
|
|
{_PTHREAD_CSTATE_SLOW, _PTHREAD_CVALID | _PTHREAD_CVF_STA}
|
|
|
|
# define PTHREAD_MUTEX_INITWITHNAME_NP(_n_,_a_) \
|
|
|
|
{_PTHREAD_MSTATE_CONFIG, _PTHREAD_MVALID | _PTHREAD_MVF_STA, _n_, _a_}
|
|
|
|
# define PTHREAD_COND_INITWITHNAME_NP(_n_,_a_) \
|
|
|
|
{_PTHREAD_CSTATE_SLOW, _PTHREAD_CVALID | _PTHREAD_CVF_STA, _n_, _a_}
|
|
|
|
#else
|
|
|
|
# define PTHREAD_MUTEX_INITIALIZER {0, _PTHREAD_MVALID | _PTHREAD_MVF_STA}
|
|
|
|
# define PTHREAD_MUTEX_INITWITHNAME_NP(_n_,_a_) \
|
|
|
|
{0, _PTHREAD_MVALID | _PTHREAD_MVF_STA, _n_, _a_}
|
|
|
|
# define PTHREAD_COND_INITWITHNAME_NP(_n_,_a_) \
|
|
|
|
{0, _PTHREAD_CVALID | _PTHREAD_CVF_STA, _n_, _a_}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#define PTHREAD_RWLOCK_INITIALIZER {_PTHREAD_RWVALID | _PTHREAD_RWVF_STA}
|
|
|
|
#define PTHREAD_RWLOCK_INITWITHNAME_NP(_n_,_a_) \
|
|
|
|
{_PTHREAD_RWVALID | _PTHREAD_RWVF_STA, _n_, _a_}
|
|
|
|
_EOText_;
|
2004-11-21 17:25:07 +01:00
|
|
|
};
|
2003-10-14 13:46:47 +02:00
|
|
|
|
2008-09-06 21:57:26 +02:00
|
|
|
|
1998-10-16 09:00:18 +02:00
|
|
|
/*
|
|
|
|
* Fix return value of sbrk in unistd.h on Alpha OSF/1 V2.0
|
2003-07-12 22:12:52 +02:00
|
|
|
* And OpenBSD.
|
1998-10-16 09:00:18 +02:00
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = alpha_sbrk;
|
|
|
|
files = unistd.h;
|
|
|
|
select = "char[ \t]*\\*[\t ]*sbrk[ \t]*\\(";
|
2000-05-14 23:20:33 +02:00
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "void *sbrk(";
|
2000-05-09 18:21:08 +02:00
|
|
|
test_text = "extern char* sbrk(ptrdiff_t increment);";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2003-12-12 02:19:25 +01:00
|
|
|
/*
|
|
|
|
* Change external names of wcstok/wcsftime via asm instead of macros on
|
|
|
|
* Tru64 UNIX V4.0.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = alpha_wchar;
|
|
|
|
files = wchar.h;
|
|
|
|
|
|
|
|
mach = "alpha*-dec-osf4*";
|
|
|
|
select = "#define wcstok wcstok_r";
|
2007-02-04 16:10:08 +01:00
|
|
|
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\");@";
|
2003-12-12 02:19:25 +01:00
|
|
|
test_text = "#define wcstok wcstok_r\n"
|
|
|
|
"#define wcsftime __wcsftime_isoc";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
1998-10-16 09:00:18 +02:00
|
|
|
/*
|
|
|
|
* For C++, avoid any typedef or macro definition of bool,
|
|
|
|
* and use the built in type instead.
|
1999-03-31 14:02:19 +02:00
|
|
|
* HP/UX 10.20 also has it in curses_colr/curses.h.
|
1998-10-16 09:00:18 +02:00
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-20 20:54:45 +02:00
|
|
|
hackname = avoid_bool_define;
|
|
|
|
files = curses.h;
|
|
|
|
files = curses_colr/curses.h;
|
|
|
|
files = term.h;
|
|
|
|
files = tinfo.h;
|
Makefile.in: Correct dependencies of fixincl and fixincl.o.
* fixinc/Makefile.in: Correct dependencies of fixincl and fixincl.o.
* fixinc/fixfixes.c (IO_use, CTRL_use, IO_defn, CTRL_defn): New fixes.
(fix_char_macro_defines, fix_char_macro_uses): New functions.
* fixinc/fixlib.c (is_cxx_header): Do the text scan with a regexp.
Recognize Emacs mode markers also.
* fixinc/fixtests.c (else_endif_label): Fix bug in recognition of
C++ comments in C++ headers. Call is_cxx_header only if
necessary.
* fixinc/inclhack.def (avoid_bool): Add select for the problem and
bypass for ncurses.
(bsd43_io_macros, io_def_quotes, ioctl_fix_ctrl): Replace with...
(io_def_quotes, io_use_quotes, ctrl_def_quotes, ctrl_use_quotes):
... these, which use the new C fixes.
(math_exception): Escape literal '+' in bypass expression.
* fixinc/fixincl.x, fixinc/fixincl.sh, fixinc/inclhack.sh:
Regenerate.
From-SVN: r31512
2000-01-19 22:41:04 +01:00
|
|
|
|
2000-05-20 20:54:45 +02:00
|
|
|
select = "#[ \t]*define[ \t]+bool[ \t]";
|
2003-07-15 02:43:24 +02:00
|
|
|
bypass = "__cplusplus";
|
1998-10-16 09:00:18 +02:00
|
|
|
|
2000-05-20 20:54:45 +02:00
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#ifndef __cplusplus\n%0\n#endif";
|
|
|
|
c_fix_arg = "^[ \t]*#[ \t]*define[ \t]+bool[ \t].*";
|
1999-04-27 00:57:01 +02:00
|
|
|
|
2000-05-20 20:54:45 +02:00
|
|
|
test_text = "# define bool\t char \n";
|
|
|
|
};
|
1999-06-08 02:10:51 +02:00
|
|
|
|
2003-01-04 19:44:04 +01:00
|
|
|
|
2000-05-20 20:54:45 +02:00
|
|
|
fix = {
|
|
|
|
hackname = avoid_bool_type;
|
|
|
|
files = curses.h;
|
|
|
|
files = curses_colr/curses.h;
|
|
|
|
files = term.h;
|
|
|
|
files = tinfo.h;
|
1999-06-08 02:10:51 +02:00
|
|
|
|
2000-05-20 20:54:45 +02:00
|
|
|
select = "^[ \t]*typedef[ \t].*[ \t]bool[ \t]*;";
|
2003-07-15 02:43:24 +02:00
|
|
|
bypass = "__cplusplus";
|
1999-06-08 02:10:51 +02:00
|
|
|
|
2000-05-20 20:54:45 +02:00
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#ifndef __cplusplus\n%0\n#endif";
|
1999-06-08 02:10:51 +02:00
|
|
|
|
2000-11-12 04:37:33 +01:00
|
|
|
test_text = "typedef unsigned int\tbool \t; /* bool\n type */";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
2003-01-04 19:44:04 +01:00
|
|
|
|
2000-11-11 22:40:27 +01:00
|
|
|
/*
|
|
|
|
* For C++, avoid any typedef definition of wchar_t,
|
|
|
|
* and use the built in type instead.
|
2003-05-22 19:03:57 +02:00
|
|
|
* 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.
|
2000-11-11 22:40:27 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
fix = {
|
|
|
|
hackname = avoid_wchar_t_type;
|
|
|
|
|
|
|
|
select = "^[ \t]*typedef[ \t].*[ \t]wchar_t[ \t]*;";
|
2003-07-13 08:52:25 +02:00
|
|
|
bypass = "__cplusplus";
|
2003-05-22 19:03:57 +02:00
|
|
|
bypass = "_LINUX_NLS_H";
|
|
|
|
bypass = "XFree86: xc/lib/X11/Xlib\\.h";
|
2000-11-11 22:40:27 +01:00
|
|
|
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#ifndef __cplusplus\n%0\n#endif";
|
|
|
|
|
2000-11-12 04:37:33 +01:00
|
|
|
test_text = "typedef unsigned short\twchar_t \t; /* wchar_t\n type */";
|
2000-11-11 22:40:27 +01:00
|
|
|
};
|
1998-10-16 09:00:18 +02:00
|
|
|
|
2003-01-04 19:44:04 +01:00
|
|
|
|
2000-05-16 16:01:34 +02:00
|
|
|
/*
|
|
|
|
* Fix `typedef struct term;' on hppa1.1-hp-hpux9.
|
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-20 20:54:45 +02:00
|
|
|
hackname = bad_struct_term;
|
|
|
|
files = curses.h;
|
|
|
|
select = "^[ \t]*typedef[ \t]+struct[ \t]+term[ \t]*;";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "struct term;";
|
|
|
|
|
2000-05-16 16:01:34 +02:00
|
|
|
test_text = 'typedef struct term;';
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Fix one other error in this file:
|
|
|
|
* a mismatched quote not inside a C comment.
|
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-20 20:54:45 +02:00
|
|
|
hackname = badquote;
|
|
|
|
files = sundev/vuid_event.h;
|
|
|
|
select = "doesn't";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "does not";
|
|
|
|
|
2000-05-16 16:01:34 +02:00
|
|
|
test_text = "/* doesn't have matched single quotes */";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
1998-10-16 09:00:18 +02:00
|
|
|
/*
|
|
|
|
* check for broken assert.h that needs stdio.h
|
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-14 21:29:02 +02:00
|
|
|
hackname = broken_assert_stdio;
|
|
|
|
files = assert.h;
|
|
|
|
select = stderr;
|
|
|
|
bypass = "include.*stdio\\.h";
|
|
|
|
c_fix = wrap;
|
|
|
|
c_fix_arg = "#include <stdio.h>\n";
|
2000-05-09 18:21:08 +02:00
|
|
|
test_text = "extern FILE* stderr;";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* check for broken assert.h that needs stdlib.h
|
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-14 21:29:02 +02:00
|
|
|
hackname = broken_assert_stdlib;
|
|
|
|
files = assert.h;
|
|
|
|
select = 'exit *\(|abort *\(';
|
|
|
|
bypass = "include.*stdlib\\.h";
|
|
|
|
c_fix = wrap;
|
|
|
|
c_fix_arg = "#ifdef __cplusplus\n"
|
|
|
|
"#include <stdlib.h>\n"
|
|
|
|
"#endif\n";
|
2000-05-09 18:21:08 +02:00
|
|
|
test_text = "extern void exit ( int );";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2000-05-04 16:50:14 +02:00
|
|
|
/*
|
|
|
|
* Remove `extern double cabs' declarations from math.h.
|
2000-10-29 20:34:53 +01:00
|
|
|
* This conflicts with C99. Discovered on AIX.
|
2005-06-15 01:59:48 +02:00
|
|
|
* IRIX 5 and IRIX 6 before 6.5.18 (where C99 support was introduced)
|
|
|
|
* declares cabs() to take a struct __cabs_s argument.
|
2000-05-18 17:47:31 +02:00
|
|
|
* SunOS4 has its cabs() declaration followed by a comment which
|
|
|
|
* terminates on the following line.
|
2003-08-02 00:48:24 +02:00
|
|
|
* Darwin hides its broken cabs in architecture-specific subdirs.
|
2000-05-04 16:50:14 +02:00
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = broken_cabs;
|
2007-01-06 19:03:50 +01:00
|
|
|
files = math.h, "architecture/*/math.h";
|
2005-06-15 01:59:48 +02:00
|
|
|
select = "^extern[ \t]+double[ \t]+cabs";
|
2000-05-20 20:54:45 +02:00
|
|
|
|
2007-01-25 20:25:01 +01:00
|
|
|
sed = "s/^extern[ \t]*double[ \t]*cabs[ \t]*\([^\\\)]*\);//";
|
|
|
|
sed = "s/^extern[ \t]*long[ \t]*double[ \t]*cabsl[ \t]*\([^\\\)]*\);//";
|
2000-05-20 20:54:45 +02:00
|
|
|
|
2000-05-09 18:21:08 +02:00
|
|
|
test_text = "#ifdef __STDC__\n"
|
2000-09-29 19:47:32 +02:00
|
|
|
"extern double cabs(struct dbl_hypot);\n"
|
2000-05-09 18:21:08 +02:00
|
|
|
"#else\n"
|
2000-09-29 19:47:32 +02:00
|
|
|
"extern double cabs();\n"
|
2000-05-18 17:47:31 +02:00
|
|
|
"#endif\n"
|
2003-08-02 00:48:24 +02:00
|
|
|
"extern double cabs ( _Complex z );\n"
|
2000-05-18 17:47:31 +02:00
|
|
|
"extern double cabs(); /* This is a comment\n"
|
2005-06-15 01:59:48 +02:00
|
|
|
" and it ends here. */\n"
|
2007-01-25 20:25:01 +01:00
|
|
|
"extern double cabs(struct __cabs_s);\n"
|
|
|
|
"extern long double cabsl( struct __cabsl_s );";
|
2000-05-04 16:50:14 +02:00
|
|
|
};
|
|
|
|
|
2008-09-06 21:57:26 +02:00
|
|
|
|
2006-01-19 18:18:29 +01:00
|
|
|
/*
|
|
|
|
* Fixup Darwin's broken check for __builtin_nanf.
|
2008-09-06 21:57:26 +02:00
|
|
|
*/
|
2006-01-19 18:18:29 +01:00
|
|
|
fix = {
|
|
|
|
hackname = broken_nan;
|
2007-01-06 19:03:50 +01:00
|
|
|
/*
|
|
|
|
* It is tempting to omit the first "files" entry. Do not.
|
|
|
|
* The testing machinery will take the first "files" entry as the name
|
|
|
|
* of a test file to play with. It would be a nuisance to have a directory
|
|
|
|
* with the name "*".
|
|
|
|
*/
|
2006-01-19 18:18:29 +01:00
|
|
|
files = "architecture/ppc/math.h";
|
2007-01-06 19:03:50 +01:00
|
|
|
files = "architecture/*/math.h";
|
2006-01-19 18:18:29 +01:00
|
|
|
select = "#if defined(__APPLE_CC__) && (__APPLE_CC__ >= 1345)";
|
|
|
|
bypass = "powl";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#if 1";
|
|
|
|
test_text = "#if defined(__APPLE_CC__) && (__APPLE_CC__ >= 1345)";
|
2008-09-06 21:57:26 +02:00
|
|
|
};
|
2006-01-19 18:18:29 +01:00
|
|
|
|
2000-05-04 16:50:14 +02:00
|
|
|
|
2003-05-04 00:48:59 +02:00
|
|
|
/*
|
|
|
|
* 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;
|
2008-02-05 03:36:32 +01:00
|
|
|
mach = "*-*-*bsd*";
|
|
|
|
mach = "*-*-*darwin*";
|
2003-05-04 00:48:59 +02:00
|
|
|
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';
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2000-05-16 16:01:34 +02:00
|
|
|
/*
|
|
|
|
* Fix various macros used to define ioctl numbers.
|
|
|
|
* The traditional syntax was:
|
|
|
|
*
|
|
|
|
* #define _CTRL(n, x) (('n'<<8)+x)
|
|
|
|
* #define TCTRLCFOO _CTRL(T, 1)
|
|
|
|
*
|
|
|
|
* but this does not work with the C standard, which disallows macro
|
|
|
|
* expansion inside strings. We have to rewrite it thus:
|
|
|
|
*
|
|
|
|
* #define _CTRL(n, x) ((n<<8)+x)
|
|
|
|
* #define TCTRLCFOO _CTRL('T', 1)
|
|
|
|
*
|
|
|
|
* The select expressions match too much, but the c_fix code is cautious.
|
|
|
|
*
|
|
|
|
* CTRL might be: CTRL _CTRL ISCTRL BSD43_CTRL ...
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = ctrl_quotes_def;
|
2000-06-16 22:38:42 +02:00
|
|
|
select = "define[ \t]+[A-Z0-9_]+CTRL\\([a-zA-Z][,)]";
|
2000-05-16 16:01:34 +02:00
|
|
|
c_fix = char_macro_def;
|
|
|
|
c_fix_arg = "CTRL";
|
2000-06-17 19:50:12 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* This is two tests in order to ensure that the "CTRL(c)" can
|
|
|
|
* be selected in isolation from the multi-arg format
|
|
|
|
*/
|
|
|
|
test_text = "#define BSD43_CTRL(n, x) (('n'<<8)+x)\n";
|
|
|
|
test_text = "#define _CTRL(c) ('c'&037)";
|
2000-05-16 16:01:34 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
fix = {
|
|
|
|
hackname = ctrl_quotes_use;
|
|
|
|
select = "define[ \t]+[A-Z0-9_]+[ \t]+[A-Z0-9_]+CTRL[ \t]*\\( *[^,']";
|
|
|
|
c_fix = char_macro_use;
|
|
|
|
c_fix_arg = "CTRL";
|
2000-05-30 22:24:44 +02:00
|
|
|
test_text = "#define TCTRLFOO BSD43_CTRL(T, 1)";
|
2000-05-16 16:01:34 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* sys/mman.h on HP/UX is not C++ ready,
|
|
|
|
* even though NO_IMPLICIT_EXTERN_C is defined on HP/UX.
|
|
|
|
*
|
2000-05-20 20:54:45 +02:00
|
|
|
* rpc/types.h on OSF1/2.0 is not C++ ready,
|
|
|
|
* even though NO_IMPLICIT_EXTERN_C is defined for the alpha.
|
|
|
|
*
|
|
|
|
* The problem is the declaration of malloc.
|
2000-05-16 16:01:34 +02:00
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = cxx_unready;
|
|
|
|
files = sys/mman.h;
|
|
|
|
files = rpc/types.h;
|
|
|
|
select = '[^#]+malloc.*;'; /* Catch any form of declaration
|
|
|
|
not within a macro. */
|
|
|
|
bypass = '"C"|__BEGIN_DECLS';
|
|
|
|
|
|
|
|
c_fix = wrap;
|
|
|
|
c_fix_arg = "#ifdef __cplusplus\n"
|
|
|
|
"extern \"C\" {\n"
|
|
|
|
"#endif\n";
|
|
|
|
c_fix_arg = "#ifdef __cplusplus\n"
|
|
|
|
"}\n"
|
|
|
|
"#endif\n";
|
|
|
|
test_text = "extern void* malloc( size_t );";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2007-10-10 01:22:02 +02:00
|
|
|
/*
|
|
|
|
* On darwin8 and earlier, mach-o/swap.h isn't properly guarded
|
|
|
|
* by 'extern "C"'. On darwin7 some mach/ headers aren't properly guarded.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = darwin_externc;
|
|
|
|
mach = "*-*-darwin*";
|
|
|
|
files = mach-o/swap.h;
|
|
|
|
files = mach/mach_time.h;
|
|
|
|
files = mach/mach_traps.h;
|
|
|
|
files = mach/message.h;
|
|
|
|
files = mach/mig.h;
|
|
|
|
files = mach/semaphore.h;
|
|
|
|
bypass = "extern \"C\"";
|
|
|
|
bypass = "__BEGIN_DECLS";
|
|
|
|
c_fix = wrap;
|
|
|
|
c_fix_arg = "#ifdef __cplusplus\n"
|
|
|
|
"extern \"C\" {\n"
|
|
|
|
"#endif\n";
|
|
|
|
c_fix_arg = "#ifdef __cplusplus\n"
|
|
|
|
"}\n"
|
|
|
|
"#endif\n";
|
|
|
|
test_text = "extern void swap_fat_header();\n";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2004-10-28 01:02:39 +02:00
|
|
|
/*
|
|
|
|
* AvailabilityMacros.h on Darwin breaks with GCC 4.0, because of
|
|
|
|
* bad __GNUC__ tests.
|
|
|
|
*/
|
|
|
|
|
|
|
|
fix = {
|
|
|
|
hackname = darwin_gcc4_breakage;
|
|
|
|
mach = "*-*-darwin*";
|
|
|
|
files = AvailabilityMacros.h;
|
|
|
|
select = "\\(__GNUC__ >= 3\\) && \\(__GNUC_MINOR__ >= 1\\)";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "((__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))";
|
|
|
|
test_text = "#if defined(__GNUC__) && (__GNUC__ >= 3) && "
|
|
|
|
"(__GNUC_MINOR__ >= 1)\n";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2003-12-20 16:49:22 +01:00
|
|
|
/*
|
|
|
|
* __private_extern__ doesn't exist in FSF GCC. Even if it did,
|
|
|
|
* why would you ever put it in a system header file?
|
|
|
|
*/
|
2003-12-19 07:19:26 +01:00
|
|
|
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";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
1999-03-31 14:02:19 +02:00
|
|
|
/*
|
|
|
|
* Fix <c_asm.h> on Digital UNIX V4.0:
|
|
|
|
* It contains a prototype for a DEC C internal asm() function,
|
|
|
|
* clashing with gcc's asm keyword. So protect this with __DECC.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = dec_intern_asm;
|
|
|
|
files = c_asm.h;
|
1999-04-01 02:15:14 +02:00
|
|
|
sed = "/^[ \t]*float[ \t]*fasm/i\\\n#ifdef __DECC\n";
|
|
|
|
sed = "/^[ \t]*#[ \t]*pragma[ \t]*intrinsic([ \t]*dasm/a\\\n"
|
1999-03-31 14:02:19 +02:00
|
|
|
"#endif\n";
|
2000-05-09 18:21:08 +02:00
|
|
|
test_text =
|
|
|
|
"float fasm {\n"
|
|
|
|
" ... asm stuff ...\n"
|
|
|
|
"};\n#pragma intrinsic( dasm )\n/* END ASM TEST*/";
|
1999-03-31 14:02:19 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2001-03-07 20:05:25 +01:00
|
|
|
/*
|
|
|
|
* Fix typo in <wchar.h> 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 <sys/djtypes.h>";
|
|
|
|
c_fix_arg = "#include <stddef.h>";
|
2001-05-26 20:26:29 +02:00
|
|
|
test_text = "#include <stddef.h>\n"
|
|
|
|
"extern __DJ_wint_t x;\n";
|
2001-03-07 20:05:25 +01:00
|
|
|
};
|
|
|
|
|
2003-01-04 19:44:04 +01:00
|
|
|
|
1998-10-16 09:00:18 +02:00
|
|
|
/*
|
|
|
|
* Fix these Sun OS files to avoid an invalid identifier in an #ifdef.
|
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-20 20:54:45 +02:00
|
|
|
hackname = ecd_cursor;
|
|
|
|
files = "sunwindow/win_lock.h";
|
|
|
|
files = "sunwindow/win_cursor.h";
|
|
|
|
select = 'ecd\.cursor';
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = 'ecd_cursor';
|
|
|
|
|
2000-05-09 18:21:08 +02:00
|
|
|
test_text = "#ifdef ecd.cursor\n#error bogus\n#endif /* ecd+cursor */";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
1999-11-22 16:05:48 +01:00
|
|
|
|
2001-02-21 21:01:24 +01:00
|
|
|
/*
|
|
|
|
* 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 = freebsd_gcc3_breakage;
|
2008-02-05 03:36:32 +01:00
|
|
|
mach = "*-*-freebsd*";
|
2001-02-21 21:01:24 +01:00
|
|
|
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 = '%0 || __GNUC__ >= 3';
|
|
|
|
test_text = '#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7';
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2004-09-14 04:45:08 +02:00
|
|
|
/*
|
|
|
|
* Some releases of FreeBSD 4 and FreeBSD 5.0 and 5.1 system headers presume
|
|
|
|
* neither the existence of GCC 4 nor its exact feature set yet break
|
|
|
|
* (by design?) when __GNUC__ is set beyond 3.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = freebsd_gcc4_breakage;
|
2008-02-05 03:36:32 +01:00
|
|
|
mach = "*-*-freebsd*";
|
2004-09-14 04:45:08 +02:00
|
|
|
files = sys/cdefs.h;
|
|
|
|
select = '^#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7 \|\| __GNUC__ == 3$';
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = '#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7 || __GNUC__ >= 3';
|
|
|
|
test_text = '#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7 || __GNUC__ == 3';
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2006-11-03 04:11:50 +01:00
|
|
|
/*
|
|
|
|
* Some versions of glibc don't expect the C99 inline semantics.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = glibc_c99_inline_1;
|
2007-01-06 19:03:50 +01:00
|
|
|
files = features.h, '*/features.h';
|
2006-11-03 04:11:50 +01:00
|
|
|
select = "^ *&& !defined __OPTIMIZE_SIZE__ && !defined __NO_INLINE__$";
|
|
|
|
c_fix = format;
|
2007-03-26 15:25:26 +02:00
|
|
|
c_fix_arg = "%0 && (defined __extern_inline || defined __GNUC_GNU_INLINE__)";
|
2006-11-03 04:11:50 +01:00
|
|
|
test_text = <<-EOT
|
2008-06-08 00:19:45 +02:00
|
|
|
#if __GNUC_PREREQ (2, 7) && defined __OPTIMIZE__ \
|
|
|
|
&& !defined __OPTIMIZE_SIZE__ && !defined __NO_INLINE__
|
|
|
|
# define __USE_EXTERN_INLINES 1
|
|
|
|
#endif
|
|
|
|
EOT;
|
2006-11-03 04:11:50 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2008-02-04 16:31:25 +01:00
|
|
|
/*
|
|
|
|
* Similar, but a version that didn't have __NO_INLINE__
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = glibc_c99_inline_1a;
|
|
|
|
files = features.h, '*/features.h';
|
|
|
|
select = "(\\) && defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__)\n"
|
|
|
|
"(#[ \t]*define[ \t]*__USE_EXTERN_INLINES[ \t]*1)";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "%1 && (defined __extern_inline || defined __GNUC_GNU_INLINE__)\n%2";
|
|
|
|
test_text = <<-EOT
|
2008-06-08 00:19:45 +02:00
|
|
|
#if __GNUC_PREREQ (2, 7) && defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__
|
|
|
|
# define __USE_EXTERN_INLINES 1
|
|
|
|
#endif
|
|
|
|
EOT;
|
2008-02-04 16:31:25 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2006-11-03 04:11:50 +01:00
|
|
|
/*
|
|
|
|
* The glibc_c99_inline_1 fix should have fixed everything. Unfortunately
|
|
|
|
* there are many glibc headers which do not respect __USE_EXTERN_INLINES.
|
|
|
|
* The remaining glibc_c99_inline_* fixes deal with some of those headers.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = glibc_c99_inline_2;
|
2007-01-06 19:03:50 +01:00
|
|
|
files = sys/stat.h, '*/sys/stat.h';
|
2006-11-03 04:11:50 +01:00
|
|
|
select = "extern __inline__ int";
|
2007-02-04 16:10:08 +01:00
|
|
|
sed = "s/extern int \\(stat\\|lstat\\|fstat\\|mknod\\)/"
|
2007-03-26 15:25:26 +02:00
|
|
|
"#ifdef __GNUC_GNU_INLINE__\\\nextern\\\n#endif\\\n"
|
2007-02-04 16:10:08 +01:00
|
|
|
"__inline__ int \\1/";
|
|
|
|
sed = "s/extern int __REDIRECT\\(_NTH\\|\\) (\\(stat\\|lstat\\|fstat\\)/"
|
2007-03-26 15:25:26 +02:00
|
|
|
"#ifdef __GNUC_GNU_INLINE__\\\nextern\\\n#endif\\\n"
|
2007-02-04 16:10:08 +01:00
|
|
|
"__inline__ int __REDIRECT\\1 (\\2/";
|
|
|
|
sed = "s/^extern __inline__ int/"
|
2007-03-26 15:25:26 +02:00
|
|
|
"#ifdef __GNUC_GNU_INLINE__\\\nextern\\\n#endif\\\n"
|
2007-02-04 16:10:08 +01:00
|
|
|
"__inline__ int/";
|
2006-11-03 04:11:50 +01:00
|
|
|
test_text = <<-EOT
|
2007-02-04 16:10:08 +01:00
|
|
|
extern int fstat64 (int __fd, struct stat64 *__buf) __THROW __nonnull ((2));
|
|
|
|
extern __inline__ int
|
|
|
|
__NTH (fstat64 (int __fd, struct stat64 *__statbuf))
|
|
|
|
{}
|
|
|
|
EOT;
|
2006-11-03 04:11:50 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
fix = {
|
|
|
|
hackname = glibc_c99_inline_3;
|
2007-01-06 19:03:50 +01:00
|
|
|
files = bits/string2.h, '*/bits/string2.h';
|
2007-03-26 15:25:26 +02:00
|
|
|
select = "extern __inline";
|
2008-02-04 16:31:25 +01:00
|
|
|
bypass = "__extern_inline|__GNU_STDC_INLINE__";
|
2006-11-03 04:11:50 +01:00
|
|
|
c_fix = format;
|
2007-03-26 15:25:26 +02:00
|
|
|
c_fix_arg = "# if defined(__cplusplus) || defined(__GNUC_STDC_INLINE__)";
|
2006-11-03 04:11:50 +01:00
|
|
|
c_fix_arg = "^# ifdef __cplusplus$";
|
|
|
|
test_text = <<-EOT
|
2007-02-04 16:10:08 +01:00
|
|
|
# ifdef __cplusplus
|
|
|
|
# define __STRING_INLINE inline
|
|
|
|
# else
|
|
|
|
# define __STRING_INLINE extern __inline
|
|
|
|
# endif
|
|
|
|
EOT;
|
2006-11-03 04:11:50 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
fix = {
|
|
|
|
hackname = glibc_c99_inline_4;
|
2008-02-04 16:31:25 +01:00
|
|
|
files = sys/sysmacros.h, '*/sys/sysmacros.h', wchar.h, '*/wchar.h';
|
|
|
|
bypass = "__extern_inline|__gnu_inline__";
|
|
|
|
select = "(^| )extern __inline";
|
2006-11-03 04:11:50 +01:00
|
|
|
c_fix = format;
|
2008-02-04 16:31:25 +01:00
|
|
|
c_fix_arg = "%0 __attribute__ ((__gnu_inline__))";
|
2006-11-03 04:11:50 +01:00
|
|
|
test_text = <<-EOT
|
2007-02-04 16:10:08 +01:00
|
|
|
__extension__ extern __inline unsigned int
|
2007-02-06 02:25:59 +01:00
|
|
|
extern __inline unsigned int
|
2007-02-04 16:10:08 +01:00
|
|
|
EOT;
|
2006-11-03 04:11:50 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2006-10-01 07:47:33 +02:00
|
|
|
/* glibc-2.3.5 defines pthread mutex initializers incorrectly,
|
|
|
|
* so we replace them with versions that correspond to the
|
|
|
|
* definition.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = glibc_mutex_init;
|
|
|
|
files = pthread.h;
|
|
|
|
select = '\{ *\{ *0, *\} *\}';
|
2008-09-06 21:57:26 +02:00
|
|
|
sed = "/define[ \t]\\+PTHREAD_MUTEX_INITIALIZER[ \t]*\\\\/{\n"
|
|
|
|
"N\ns/{ { 0, } }/{ { 0, 0, 0, 0, 0, 0 } }/\n}";
|
|
|
|
sed = "s/{ \\(0, 0, 0, 0, PTHREAD_MUTEX_"
|
|
|
|
"\\(RECURSIVE\\|ERRORCHECK\\|ADAPTIVE\\)_NP\\) }/{ \\1, 0 }/";
|
|
|
|
sed = "s/{ \\(0, 0, 0, PTHREAD_MUTEX_"
|
|
|
|
"\\(RECURSIVE\\|ERRORCHECK\\|ADAPTIVE\\)_NP\\) }/{ \\1, 0, 0 }/";
|
2006-10-01 07:47:33 +02:00
|
|
|
sed = "/define[ \t]\\+PTHREAD_RWLOCK_INITIALIZER[ \t]*\\\\/"
|
|
|
|
"N;s/^[ \t]*#[ \t]*"
|
|
|
|
"\\(define[ \t]\\+PTHREAD_RWLOCK_INITIALIZER[ \t]*\\\\\\)\\n"
|
|
|
|
"[ \t]*{ { 0, } }/# if __WORDSIZE == 64\\n"
|
|
|
|
"# \\1\\n"
|
|
|
|
" { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }\\n"
|
|
|
|
"# else\\n"
|
|
|
|
"# \\1\\n"
|
|
|
|
" { { 0, 0, 0, 0, 0, 0, 0, 0 } }\\n"
|
|
|
|
"# endif/";
|
2008-09-06 21:57:26 +02:00
|
|
|
sed = "s/{ \\(0, 0, 0, 0, 0, 0, "
|
|
|
|
"PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP\\) }/{ \\1, 0 }/";
|
2006-10-01 07:47:33 +02:00
|
|
|
sed = "/define[ \t]\\+PTHREAD_COND_INITIALIZER/"
|
|
|
|
"s/{ { 0, } }/{ { 0, 0, 0, 0, 0, (void *) 0, 0, 0 } }/";
|
|
|
|
|
2006-10-03 07:52:05 +02:00
|
|
|
test_text = <<- _EOText_
|
2008-06-08 00:19:45 +02:00
|
|
|
#define PTHREAD_MUTEX_INITIALIZER \\
|
|
|
|
{ { 0, } }
|
|
|
|
#ifdef __USE_GNU
|
|
|
|
# if __WORDSIZE == 64
|
|
|
|
# define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \\
|
|
|
|
{ { 0, 0, 0, 0, PTHREAD_MUTEX_RECURSIVE_NP } }
|
|
|
|
# define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP \\
|
|
|
|
{ { 0, 0, 0, 0, PTHREAD_MUTEX_ERRORCHECK_NP } }
|
|
|
|
# define PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP \\
|
|
|
|
{ { 0, 0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP } }
|
|
|
|
# else
|
|
|
|
# define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \\
|
|
|
|
{ { 0, 0, 0, PTHREAD_MUTEX_RECURSIVE_NP } }
|
|
|
|
# define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP \\
|
|
|
|
{ { 0, 0, 0, PTHREAD_MUTEX_ERRORCHECK_NP } }
|
|
|
|
# define PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP \\
|
|
|
|
{ { 0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP } }
|
|
|
|
# endif
|
|
|
|
#endif
|
|
|
|
# define PTHREAD_RWLOCK_INITIALIZER \\
|
|
|
|
{ { 0, } }
|
|
|
|
# ifdef __USE_GNU
|
|
|
|
# if __WORDSIZE == 64
|
|
|
|
# define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \\
|
|
|
|
{ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \\
|
|
|
|
PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP } }
|
|
|
|
# else
|
|
|
|
# define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \\
|
|
|
|
{ { 0, 0, 0, 0, 0, 0, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP } }
|
|
|
|
# endif
|
|
|
|
# endif
|
|
|
|
#define PTHREAD_COND_INITIALIZER { { 0, } }
|
|
|
|
_EOText_;
|
2006-10-01 07:47:33 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
re PR c/456 (constant expressions constraints (gcc.dg/c90-const-expr-1))
PR c/456
PR c/5675
PR c/19976
PR c/29116
PR c/31871
PR c/35198
fixincludes:
* inclhack.def (glibc_tgmath): New fix.
* fixincl.x: Regenerate.
* tests/base/tgmath.h: New.
gcc:
* builtins.c (fold_builtin_sincos): Build COMPOUND_EXPR in
void_type_node.
(fold_call_expr): Return a NOP_EXPR from folding rather than the
contained expression.
* c-common.c (c_fully_fold, c_fully_fold_internal, c_save_expr):
New.
(c_common_truthvalue_conversion): Use c_save_expr. Do not fold
conditional expressions for C.
(decl_constant_value_for_optimization): Move from
decl_constant_value_for_broken_optimization in c-typeck.c. Check
whether optimizing and that the expression is a VAR_DECL not of
array type instead of doing such checks in the caller. Do not
check pedantic. Call gcc_unreachable for C++.
* c-common.def (C_MAYBE_CONST_EXPR): New.
* c-common.h (c_fully_fold, c_save_expr,
decl_constant_value_for_optimization): New prototypes.
(C_MAYBE_CONST_EXPR_PRE, C_MAYBE_CONST_EXPR_EXPR,
C_MAYBE_CONST_EXPR_INT_OPERANDS, C_MAYBE_CONST_EXPR_NON_CONST,
EXPR_INT_CONST_OPERANDS): Define.
* c-convert.c (convert): Strip nops from expression.
* c-decl.c (groktypename): Take extra parameters expr and
expr_const_operands. Update call to grokdeclarator.
(start_decl): Update call to grokdeclarator. Add statement for
expressions used in type of decl.
(grokparm): Update call to grokdeclarator.
(push_parm_decl): Update call to grokdeclarator.
(build_compound_literal): Add parameter non_const and build a
C_MAYBE_COSNT_EXPR if applicable.
(grokdeclarator): Take extra parameters expr and
expr_const_operands. Track expressions used in declaration
specifiers and declarators. Fold array sizes and track whether
they are constant expressions and whether they are integer
constant expressions.
(parser_xref_tag): Set expr and expr_const_operands fields in
return value.
(grokfield): Update call to grokdeclarator.
(start_function): Update call to grokdeclarator.
(build_null_declspecs): Set expr and expr_const_operands fields in
return value.
(declspecs_add_type): Handle expressions in typeof specifiers.
* c-parser.c (c_parser_declspecs): Set expr and
expr_const_operands fields for declaration specifiers.
(c_parser_enum_specifier): Likewise.
(c_parser_struct_or_union_specifier): Likewise.
(c_parser_typeof_specifier): Likewise. Update call to
groktypename. Fold expression as needed. Return expressions with
type instead of adding statements.
(c_parser_attributes): Update calls to c_parser_expr_list.
(c_parser_statement_after_labels): Fold expression before passing
to objc_build_throw_stmt.
(c_parser_condition): Fold expression.
(c_parser_asm_operands): Fold expression.
(c_parser_conditional_expression): Use c_save_expr. Update call
to build_conditional_expr.
(c_parser_alignof_expression): Update call to groktypename.
(c_parser_postfix_expression): Preserve C_MAYBE_CONST_EXPR as
original_code. Fold expression argument of va_arg. Create
C_MAYBE_CONST_EXPR to preserve side effects of expressions in type
argument to va_arg. Update calls to groktypename. Fold array
index for offsetof. Verify that first argument to
__builtin_choose_expr has integer type.
(c_parser_postfix_expression_after_paren_type): Update calls to
groktypename and build_compound_literal. Handle expressions with
side effects in type name.
(c_parser_postfix_expression_after_primary): Update call to
c_parser_expr_list. Set original_code for calls to
__builtin_constant_p.
(c_parser_expr_list): Take extra parameter fold_p. Fold
expressions if requested.
(c_parser_objc_type_name): Update call to groktypename.
(c_parser_objc_synchronized_statement): Fold expression.
(c_parser_objc_receiver): Fold expression.
(c_parser_objc_keywordexpr): Update call to c_parser_expr_list.
(c_parser_omp_clause_num_threads, c_parser_omp_clause_schedule,
c_parser_omp_atomic, c_parser_omp_for_loop): Fold expressions.
* c-tree.h (CONSTRUCTOR_NON_CONST): Define.
(struct c_typespec): Add elements expr and expr_const_operands.
(struct c_declspecs): Add elements expr and expr_const_operands.
(groktypename, build_conditional_expr, build_compound_literal):
Update prototypes.
(in_late_binary_op): Declare.
* c-typeck.c (note_integer_operands): New function.
(in_late_binary_op): New variable.
(decl_constant_value_for_broken_optimization): Move to c-common.c
and rename to decl_constant_value_for_optimization.
(default_function_array_conversion): Do not strip nops.
(default_conversion): Do not call
decl_constant_value_for_broken_optimization.
(build_array_ref): Do not fold result.
(c_expr_sizeof_expr): Fold operand. Use C_MAYBE_CONST_EXPR for
result when operand is a VLA.
(c_expr_sizeof_type): Update call to groktypename. Handle
expressions included in type name. Use C_MAYBE_CONST_EXPR for
result when operand names a VLA type.
(build_function_call): Update call to build_compound_literal.
Only fold result for calls to __builtin_* functions. Strip
NOP_EXPR from INTEGER_CST returned from such functions. Fold
the function designator.
(convert_arguments): Fold arguments. Update call to
convert_for_assignment.
(build_unary_op): Handle increment and decrement of
C_MAYBE_CONST_EXPR. Move lvalue checks for increment and
decrement earlier. Fold operand of increment and decrement.
Handle address of C_MAYBE_CONST_EXPR. Only fold expression being
built for integer operand. Wrap returns that are INTEGER_CSTs
without being integer constant expressions or that have integer
constant operands without being INTEGER_CSTs.
(lvalue_p): Handle C_MAYBE_CONST_EXPR.
(build_conditional_expr): Add operand ifexp_bcp. Track whether
result is an integer constant expression or can be used in
unevaluated parts of one and avoid folding and wrap as
appropriate. Fold operands before possibly doing -Wsign-compare
warnings.
(build_compound_expr): Wrap result for C99 if operands can be used
in integer constant expressions.
(build_c_cast): Update call to digest_init. Do not ignore
overflow from casting floating-point constants to integers. Wrap
results that could be confused with integer constant expressions,
null pointer constants or floating-point constants.
(c_cast_expr): Update call to groktypename. Handle expressions
included in type name.
(build_modify_expr): Handle modifying a C_MAYBE_CONST_EXPR. Fold
lhs inside possible SAVE_EXPR. Fold RHS before assignment.
Update calls to convert_for_assignment.
(convert_for_assignment): Take new parameter
null_pointer_constant. Do not strip nops or call
decl_constant_value_for_broken_optimization. Set
in_late_binary_op for conversions to boolean.
(store_init_value): Update call to digest_init.
(digest_init): Take new parameter null_pointer_constant. Do not
call decl_constant_value_for_broken_optimization. pedwarn for
initializers not constant expressions. Update calls to
convert_for_assignment.
(constructor_nonconst): New.
(struct constructor_stack): Add nonconst element.
(really_start_incremental_init, push_init_level, pop_init_level):
Handle constructor_nonconst and nonconst element.
(set_init_index): Call constant_expression_warning for array
designators.
(output_init_element): Fold value. Set constructor_nonconst as
applicable. pedwarn for initializers not constant expressions.
Update call to digest_init. Call constant_expression_warning
where constant initializers are required.
(process_init_element): Use c_save_expr.
(c_finish_goto_ptr): Fold expression.
(c_finish_return): Fold return value. Update call to
convert_for_assignment.
(c_start_case): Fold switch expression.
(c_process_expr_stmt): Fold expression.
(c_finish_stmt_expr): Create C_MAYBE_CONST_EXPR as needed to
ensure statement expression is not evaluated in constant
expression.
(build_binary_op): Track whether results are integer constant
expressions or may occur in such, disable folding and wrap results
as applicable. Fold operands for -Wsign-compare warnings unless
in_late_binary_op.
(c_objc_common_truthvalue_conversion): Handle results folded to
integer constants that are not integer constant expressions.
* doc/extend.texi: Document when typeof operands are evaluated,
that condition of __builtin_choose_expr is an integer constant
expression, and more about use of __builtin_constant_p in
initializers.
gcc/objc:
* objc-act.c (objc_finish_try_stmt): Set in_late_binary_op.
gcc/testsuite:
* gcc.c-torture/compile/20081108-1.c,
gcc.c-torture/compile/20081108-2.c,
gcc.c-torture/compile/20081108-3.c, gcc.dg/bconstp-2.c,
gcc.dg/bconstp-3.c, gcc.dg/bconstp-4.c, gcc.dg/c90-const-expr-6.c,
gcc.dg/c90-const-expr-7.c, gcc.dg/c90-const-expr-8.c,
gcc.dg/c90-const-expr-9.c, gcc.dg/c90-const-expr-10.c,
gcc.dg/c90-const-expr-11.c, gcc.dg/c99-const-expr-6.c,
gcc.dg/c99-const-expr-7.c, gcc.dg/c99-const-expr-8.c,
gcc.dg/c99-const-expr-9.c, gcc.dg/c99-const-expr-10.c,
gcc.dg/c99-const-expr-11.c, gcc.dg/c99-const-expr-12.c,
gcc.dg/c99-const-expr-13.c, gcc.dg/compare10.c,
gcc.dg/gnu89-const-expr-1.c, gcc.dg/gnu89-const-expr-2.c,
gcc.dg/gnu99-const-expr-1.c, gcc.dg/gnu99-const-expr-2.c,
gcc.dg/gnu99-const-expr-3.c, gcc.dg/vla-12.c, gcc.dg/vla-13.c,
gcc.dg/vla-14.c, gcc.dg/vla-15.c, gcc.dg/vla-16.c: New tests.
* gcc.dg/c90-const-expr-1.c, gcc.dg/c90-const-expr-2.c,
gcc.dg/c90-const-expr-3.c, gcc.dg/c99-const-expr-2.c,
gcc.dg/c99-const-expr-3.c, gcc.dg/c99-static-1.c: Remove XFAILs.
* gcc.dg/c90-const-expr-2.c: Use ZERO in place of 0 in another
case.
* gcc.dg/overflow-warn-1.c, gcc.dg/overflow-warn-2.c,
gcc.dg/overflow-warn-3.c, gcc.dg/overflow-warn-4.c: Remove
XFAILs. Update expected messages.
* gcc.dg/pr14649-1.c, gcc.dg/pr19984.c, gcc.dg/pr25682.c: Update
expected messages.
* gcc.dg/real-const-1.c: Replace with test from original PR.
* gcc.dg/vect/pr32230.c: Use intermediate cast to __PTRDIFF_TYPE__
when casting from non-constant integer to pointer.
From-SVN: r145254
2009-03-29 20:13:43 +02:00
|
|
|
/* glibc's tgmath.h relies on an expression that is not an integer
|
|
|
|
constant expression being treated as it was by GCC 4.4 and
|
|
|
|
earlier. */
|
|
|
|
fix = {
|
|
|
|
hackname = glibc_tgmath;
|
|
|
|
files = tgmath.h;
|
|
|
|
select = '\(\(\(type\) 0.25\) && \(\(type\) 0.25 - 1\)\)';
|
|
|
|
bypass = "__floating_type \\\\\n.*__builtin_classify_type";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "(__builtin_classify_type ((type) 0) == 8 || (__builtin_classify_type ((type) 0) == 9 && __builtin_classify_type (__real__ ((type) 0)) == 8))";
|
|
|
|
test_text = "# define __floating_type(type) (((type) 0.25) && ((type) 0.25 - 1))";
|
|
|
|
};
|
|
|
|
|
2001-05-27 20:21:04 +02:00
|
|
|
/*
|
2003-07-12 21:25:59 +02:00
|
|
|
* 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.
|
2001-05-27 20:21:04 +02:00
|
|
|
*/
|
|
|
|
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;
|
2004-11-26 23:00:51 +01:00
|
|
|
/* The Solaris 10 headers already define these types correctly. */
|
|
|
|
mach = '*-*-solaris2.1[0-9]*';
|
|
|
|
not_machine = true;
|
2001-05-27 20:21:04 +02:00
|
|
|
|
|
|
|
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 */";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
1998-10-16 09:00:18 +02:00
|
|
|
/*
|
2000-07-13 16:47:55 +02:00
|
|
|
* Fix HP & Sony's use of "../machine/xxx.h"
|
|
|
|
* to refer to: <machine/xxx.h>
|
1998-10-16 09:00:18 +02:00
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-20 20:54:45 +02:00
|
|
|
hackname = hp_inline;
|
|
|
|
files = sys/spinlock.h;
|
|
|
|
files = machine/machparam.h;
|
|
|
|
select = "[ \t]*#[ \t]*include[ \t]+" '"\.\./machine/';
|
|
|
|
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "%1<machine/%2.h>";
|
|
|
|
|
|
|
|
c_fix_arg = "([ \t]*#[ \t]*include[ \t]+)" '"\.\./machine/'
|
|
|
|
'([a-z]+)\.h"';
|
|
|
|
|
|
|
|
test_text = ' # include "../machine/mumble.h"';
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check for (...) in C++ code in HP/UX sys/file.h.
|
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-09 18:21:08 +02:00
|
|
|
hackname = hp_sysfile;
|
|
|
|
files = sys/file.h;
|
|
|
|
select = "HPUX_SOURCE";
|
2000-05-20 20:54:45 +02:00
|
|
|
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "(struct file *, ...)";
|
|
|
|
c_fix_arg = '\(\.\.\.\)';
|
|
|
|
|
2000-05-12 23:59:39 +02:00
|
|
|
test_text = "extern void foo(...); /* HPUX_SOURCE - bad varargs */";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2008-09-06 21:57:26 +02:00
|
|
|
/*
|
|
|
|
* Un-Hide a series of five FP defines from post-1999 compliance GCC:
|
|
|
|
* FP_NORMAL, FP_ZERO, FP_INFINITE, FP_SUBNORMAL and FP_NAN
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = hppa_hpux_fp_macros;
|
|
|
|
mach = "hppa*-hp-hpux11*";
|
|
|
|
files = math.h;
|
|
|
|
select = "#[ \t]*define[ \t]*FP_NORMAL.*\n"
|
|
|
|
"#[ \t]*define[ \t]*FP_ZERO.*\n"
|
|
|
|
"#[ \t]*define[ \t]*FP_INFINITE.*\n"
|
|
|
|
"#[ \t]*define[ \t]*FP_SUBNORMAL.*\n"
|
|
|
|
"#[ \t]*define[ \t]*FP_NAN.*\n";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = <<- _EOFix_
|
|
|
|
#endif /* _INCLUDE_HPUX_SOURCE */
|
|
|
|
|
|
|
|
#if defined(_INCLUDE_HPUX_SOURCE) || \
|
|
|
|
(defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L))
|
|
|
|
%0#endif
|
|
|
|
|
|
|
|
#ifdef _INCLUDE_HPUX_SOURCE
|
|
|
|
|
|
|
|
_EOFix_;
|
|
|
|
|
|
|
|
test_text =
|
|
|
|
"# define FP_NORMAL 0\n"
|
|
|
|
"# define FP_ZERO 1\n"
|
|
|
|
"# define FP_INFINITE 2\n"
|
|
|
|
"# define FP_SUBNORMAL 3\n"
|
|
|
|
"# define FP_NAN 4\n";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2001-06-14 05:51:26 +02:00
|
|
|
/*
|
2001-06-28 05:13:49 +02:00
|
|
|
* Delete C++ double pow (double, int) inline function from HP-UX 10 & 11
|
2001-06-14 05:51:26 +02:00
|
|
|
* math.h to prevent clash with define in c_std/bits/std_cmath.h.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = hpux10_cpp_pow_inline;
|
2001-07-21 06:04:27 +02:00
|
|
|
files = fixinc-test-limits.h, math.h;
|
2001-06-14 05:51:26 +02:00
|
|
|
select = <<- END_POW_INLINE
|
|
|
|
^# +ifdef +__cplusplus
|
2003-07-08 22:42:19 +02:00
|
|
|
+\}
|
|
|
|
+inline +double +pow\(double +__d,int +__expon\) +\{
|
2001-06-14 05:51:26 +02:00
|
|
|
[ ]+return +pow\(__d,\(double\)__expon\);
|
2003-07-08 22:42:19 +02:00
|
|
|
+\}
|
|
|
|
+extern +"C" +\{
|
2001-06-14 05:51:26 +02:00
|
|
|
#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";
|
|
|
|
};
|
|
|
|
|
2001-06-28 05:13:49 +02:00
|
|
|
fix = {
|
|
|
|
hackname = hpux11_cpp_pow_inline;
|
|
|
|
files = math.h;
|
2003-07-08 22:42:19 +02:00
|
|
|
select = " +inline double pow\\(double d,int expon\\) \\{\n"
|
2001-06-28 05:13:49 +02:00
|
|
|
" +return pow\\(d, \\(double\\)expon\\);\n"
|
2003-07-08 22:42:19 +02:00
|
|
|
" +\\}\n";
|
2001-06-28 05:13:49 +02:00
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "";
|
|
|
|
|
|
|
|
test_text =
|
|
|
|
" inline double pow(double d,int expon) {\n"
|
|
|
|
" return pow(d, (double)expon);\n"
|
|
|
|
" }\n";
|
|
|
|
};
|
2001-06-14 05:51:26 +02:00
|
|
|
|
2001-09-13 04:13:41 +02:00
|
|
|
|
2003-02-19 03:06:11 +01:00
|
|
|
/*
|
|
|
|
* 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";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2004-01-21 21:08:22 +01:00
|
|
|
/*
|
|
|
|
* Fix hpux 10.X missing stdio declarations
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = hpux10_stdio_declarations;
|
|
|
|
files = stdio.h;
|
|
|
|
select = "^#[ \t]*define _iob[ \t]*__iob";
|
|
|
|
bypass = "^[ \t]*extern[ \t]*int[ \t]*vsnprintf[ \t]*\\(";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "%0\n\n"
|
|
|
|
"# if defined(__STDC__) || defined(__cplusplus)\n"
|
|
|
|
" extern int snprintf(char *, size_t, const char *, ...);\n"
|
|
|
|
" extern int vsnprintf(char *, size_t, const char *, __va_list);\n"
|
|
|
|
"# else /* not __STDC__) || __cplusplus */\n"
|
|
|
|
" extern int snprintf();\n"
|
|
|
|
" extern int vsnprintf();\n"
|
|
|
|
"# endif /* __STDC__) || __cplusplus */\n";
|
|
|
|
|
|
|
|
test_text = "# define _iob __iob\n";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2002-10-27 18:02:29 +01:00
|
|
|
/*
|
|
|
|
* Make sure hpux defines abs in header.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = hpux11_abs;
|
2008-02-05 03:36:32 +01:00
|
|
|
mach = "ia64-hp-hpux11*";
|
2002-10-27 18:02:29 +01:00
|
|
|
files = stdlib.h;
|
|
|
|
select = "ifndef _MATH_INCLUDED";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "if !defined(_MATH_INCLUDED) || defined(__GNUG__)";
|
|
|
|
test_text = "#ifndef _MATH_INCLUDED";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2000-05-17 16:59:20 +02:00
|
|
|
/*
|
|
|
|
* Keep HP-UX 11 from stomping on C++ math namespace
|
|
|
|
* with defines for fabsf.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = hpux11_fabsf;
|
|
|
|
files = math.h;
|
|
|
|
select = "^[ \t]*#[ \t]*define[ \t]+fabsf\\(.*";
|
|
|
|
bypass = "__cplusplus";
|
|
|
|
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#ifndef __cplusplus\n%0\n#endif";
|
|
|
|
|
|
|
|
test_text =
|
|
|
|
"#ifdef _PA_RISC\n"
|
|
|
|
"# define fabsf(x) ((float)fabs((double)(float)(x)))\n"
|
|
|
|
"#endif";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2008-09-06 21:57:26 +02:00
|
|
|
/*
|
|
|
|
* Fix C99 constant in __POINTER_SET define.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = hpux11_pthread_const;
|
|
|
|
mach = "*-hp-hpux11.[0-3]*";
|
|
|
|
files = sys/pthread.h;
|
|
|
|
select = "^#define[ \t]*__POINTER_SET[ \t]*\\(\\(void \\*\\) 1LL\\)";
|
|
|
|
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#define __POINTER_SET\t\t((void *) 1L)";
|
|
|
|
test_text = "#define __POINTER_SET\t\t((void *) 1LL)";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2001-09-13 04:13:41 +02:00
|
|
|
/*
|
|
|
|
* 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;
|
2001-12-20 05:09:40 +01:00
|
|
|
mach = "*-hp-hpux11*";
|
|
|
|
select = "__size_t";
|
2001-09-13 04:13:41 +02:00
|
|
|
|
|
|
|
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";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2003-10-25 19:43:13 +02:00
|
|
|
/*
|
|
|
|
* 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 *, ...);";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
fixtests.c (is_cxx_header): New fn, split out of double_slash_test.
1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu>
* fixtests.c (is_cxx_header): New fn, split out of
double_slash_test.
(else_endif_label): Allow "#endif // comment" in C++ headers,
as determined by is_cxx_header.
* fixfixes.c (else_endif_label_fix): Update comment.
* fixincl.c: Don't output VERB_PROGRESS lines if stdout is not
a tty.
* genfixes: Correct double thinko in commandline parsing.
* hackshell.tpl: Generate correct sh syntax for bypass
entries.
* inclhack.def (all): Whenever an inserted preprocessor
conditional is split over multiple lines, use double
backslashes in this file so the fixed header will be readable.
(AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h
and add bypass entry for correct version of this header.
(AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h.
(AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h.
(hpux8_bogus_inlines): New fix, split from...
(ultrix_atof_param) ... here.
(math_expression): Add bypass entry keyed to glibc comment
indicating the problem has been dealt with; disable
unnecessary sed operations; update commentary.
(math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max,
add select and bypass entries, simplify shell operation.
(math_huge_val_ifndef): Split from math_gcc_ifndefs.
(ip_missing_semi, rs6000_param, tinfo_cplusplus,
ultrix_atof_param): Add select entry.
(stdio_va_list, sunos_mather_decl): Add bypass entry.
(systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the
comments with the fixes they describe.
* fixincl.x, fixincl.sh, inclhack.sh: Regen.
From-SVN: r30999
1999-12-17 22:49:30 +01:00
|
|
|
/*
|
2001-05-27 20:21:04 +02:00
|
|
|
* In inttypes.h on HPUX 11, the use of __CONCAT__ in the definition
|
1999-10-15 08:00:29 +02:00
|
|
|
* 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
|
|
|
|
* is concatinated with the 'l' in the second argument creating an
|
|
|
|
* 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
|
2001-05-27 20:21:04 +02:00
|
|
|
* arguments to __CONCAT__. A general solution to this problem would be to
|
1999-10-15 08:00:29 +02:00
|
|
|
* 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
|
|
|
|
* macro to not used macros in the arguments to __CONCAT__.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = hpux11_uint32_c;
|
|
|
|
files = inttypes.h;
|
2000-05-09 18:21:08 +02:00
|
|
|
select = "^#define UINT32_C\\(__c\\)[ \t]*"
|
|
|
|
"__CONCAT__\\(__CONCAT_U__\\(__c\\),l\\)";
|
2000-05-16 16:01:34 +02:00
|
|
|
c_fix = format;
|
2000-05-09 18:21:08 +02:00
|
|
|
c_fix_arg = '#define UINT32_C(__c) __CONCAT__(__c,ul)';
|
2000-05-16 16:01:34 +02:00
|
|
|
test_text =
|
|
|
|
"#define CONCAT_U__(__c)\t__CONCAT__(__c,u)\n"
|
|
|
|
"#define UINT32_C(__c)\t__CONCAT__(__CONCAT_U__(__c),l)";
|
1999-10-15 08:00:29 +02:00
|
|
|
};
|
1998-10-16 09:00:18 +02:00
|
|
|
|
2000-05-20 20:54:45 +02:00
|
|
|
|
2003-02-11 21:43:41 +01:00
|
|
|
/*
|
2003-02-19 03:06:11 +01:00
|
|
|
* Fix hpux 11.00 broken vsnprintf declaration
|
2003-02-11 21:43:41 +01:00
|
|
|
*/
|
|
|
|
fix = {
|
2003-02-19 03:06:11 +01:00
|
|
|
hackname = hpux11_vsnprintf;
|
|
|
|
files = stdio.h;
|
|
|
|
select = '(extern int vsnprintf\(char \*, _[hpux]*_size_t, '
|
|
|
|
'const char \*,) __va__list\);';
|
2003-02-11 21:43:41 +01:00
|
|
|
c_fix = format;
|
2003-02-19 03:06:11 +01:00
|
|
|
c_fix_arg = "%1 __va_list);";
|
2003-02-11 21:43:41 +01:00
|
|
|
|
2003-02-19 03:06:11 +01:00
|
|
|
test_text = 'extern int vsnprintf(char *, _hpux_size_t, const char *,'
|
|
|
|
' __va__list);';
|
2003-02-11 21:43:41 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2003-02-19 03:06:11 +01:00
|
|
|
* get rid of bogus inline definitions in HP-UX 8.0
|
2003-02-11 21:43:41 +01:00
|
|
|
*/
|
|
|
|
fix = {
|
2003-02-19 03:06:11 +01:00
|
|
|
hackname = hpux8_bogus_inlines;
|
|
|
|
files = math.h;
|
|
|
|
select = inline;
|
2004-11-10 00:14:06 +01:00
|
|
|
bypass = "__GNUG__";
|
2003-02-19 03:06:11 +01:00
|
|
|
sed = "s@inline int abs(int [a-z][a-z]*) {.*}"
|
|
|
|
"@extern \"C\" int abs(int);@";
|
|
|
|
sed = "s@inline double abs(double [a-z][a-z]*) {.*}@@";
|
|
|
|
sed = "s@inline int sqr(int [a-z][a-z]*) {.*}@@";
|
|
|
|
sed = "s@inline double sqr(double [a-z][a-z]*) {.*}@@";
|
|
|
|
test_text = "inline int abs(int v) { return (v>=0)?v:-v; }\n"
|
|
|
|
"inline double sqr(double v) { return v**0.5; }";
|
2003-02-11 21:43:41 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 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";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2005-03-15 18:37:03 +01:00
|
|
|
/*
|
|
|
|
* Fix hpux broken #ifndef _XOPEN_SOURCE_EXTENDED conditional on htonl etc.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = hpux_htonl;
|
|
|
|
files = netinet/in.h;
|
|
|
|
select = "#ifndef _XOPEN_SOURCE_EXTENDED\n"
|
|
|
|
"(/\\*\n"
|
|
|
|
" \\* Macros for number representation conversion\\.\n"
|
|
|
|
" \\*/\n"
|
|
|
|
"#ifndef ntohl)";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#if 1\n%1";
|
|
|
|
|
|
|
|
test_text = "#ifndef _XOPEN_SOURCE_EXTENDED\n"
|
|
|
|
"/*\n"
|
|
|
|
" * Macros for number representation conversion.\n"
|
|
|
|
" */\n"
|
|
|
|
"#ifndef ntohl\n"
|
|
|
|
"#define ntohl(x) (x)\n"
|
|
|
|
"#define ntohs(x) (x)\n"
|
|
|
|
"#define htonl(x) (x)\n"
|
|
|
|
"#define htons(x) (x)\n"
|
|
|
|
"#endif\n"
|
|
|
|
"#endif /* ! _XOPEN_SOURCE_EXTENDED */";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2001-07-17 05:02:52 +02:00
|
|
|
/*
|
2003-02-19 03:06:11 +01:00
|
|
|
* HP-UX long_double
|
2001-07-17 05:02:52 +02:00
|
|
|
*/
|
|
|
|
fix = {
|
2003-02-19 03:06:11 +01:00
|
|
|
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";
|
2001-07-17 05:02:52 +02:00
|
|
|
|
2003-02-19 03:06:11 +01:00
|
|
|
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";
|
2000-05-20 20:54:45 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
1998-10-16 09:00:18 +02:00
|
|
|
/*
|
2001-05-27 20:21:04 +02:00
|
|
|
* Fix hpux10.20 <sys/time.h> to avoid invalid forward decl
|
1998-10-16 09:00:18 +02:00
|
|
|
*/
|
|
|
|
fix = {
|
2001-05-27 20:21:04 +02:00
|
|
|
hackname = hpux_systime;
|
|
|
|
files = sys/time.h;
|
|
|
|
select = "^extern struct sigevent;";
|
1998-10-16 09:00:18 +02:00
|
|
|
|
2001-05-27 20:21:04 +02:00
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "struct sigevent;";
|
|
|
|
|
|
|
|
test_text = 'extern struct sigevent;';
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2006-02-18 16:58:06 +01:00
|
|
|
/*
|
|
|
|
* Wrap spu_info in ifdef _KERNEL. GCC cannot handle an array of unknown
|
|
|
|
* type and mpinfou is only defined when _KERNEL is set.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = hpux_spu_info;
|
|
|
|
mach = "*-hp-hpux*";
|
2009-01-06 00:59:41 +01:00
|
|
|
/*
|
|
|
|
* It is tempting to omit the first "files" entry. Do not.
|
|
|
|
* The testing machinery will take the first "files" entry as the name
|
|
|
|
* of a test file to play with. It would be a nuisance to have a directory
|
|
|
|
* with the name "*".
|
|
|
|
*/
|
|
|
|
files = "ia64/sys/getppdp.h";
|
2008-12-15 19:11:19 +01:00
|
|
|
files = "*/sys/getppdp.h";
|
2006-02-18 16:58:06 +01:00
|
|
|
select = "^.*extern.*spu_info.*";
|
|
|
|
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#ifdef _KERNEL\n%0\n#endif";
|
|
|
|
|
|
|
|
test_text = "extern union mpinfou spu_info[];";
|
|
|
|
};
|
|
|
|
|
2006-10-31 23:28:18 +01:00
|
|
|
fix = {
|
|
|
|
hackname = hpux11_extern_sendfile;
|
|
|
|
mach = "*-hp-hpux11.[12]*";
|
|
|
|
files = sys/socket.h;
|
|
|
|
select = "^[ \t]*extern sbsize_t sendfile.*\n.*, int\\)\\);\n";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#ifndef _APP32_64BIT_OFF_T\n%0#endif\n";
|
|
|
|
test_text = " extern sbsize_t sendfile __((int, int, off_t, bsize_t,\n const struct iovec *, int));\n";
|
|
|
|
};
|
|
|
|
|
|
|
|
fix = {
|
|
|
|
hackname = hpux11_extern_sendpath;
|
|
|
|
mach = "*-hp-hpux11.[12]*";
|
|
|
|
files = sys/socket.h;
|
|
|
|
select = "^[ \t]*extern sbsize_t sendpath.*\n.*, int\\)\\);\n";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#ifndef _APP32_64BIT_OFF_T\n%0#endif\n";
|
|
|
|
test_text = " extern sbsize_t sendpath __((int, int, off_t, bsize_t,\n const struct iovec *, int));\n";
|
|
|
|
};
|
|
|
|
|
2006-06-23 18:21:54 +02:00
|
|
|
fix = {
|
|
|
|
hackname = hpux_extern_errno;
|
|
|
|
mach = "*-hp-hpux10.*";
|
|
|
|
mach = "*-hp-hpux11.[0-2]*";
|
|
|
|
files = errno.h;
|
|
|
|
select = "^[ \t]*extern int errno;$";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#ifdef __cplusplus\nextern \"C\" {\n#endif\n%0\n#ifdef __cplusplus\n}\n#endif";
|
|
|
|
test_text = " extern int errno;\n";
|
|
|
|
};
|
|
|
|
|
2007-10-15 00:22:25 +02:00
|
|
|
|
2006-10-07 18:35:11 +02:00
|
|
|
/*
|
|
|
|
* Add missing braces to pthread initializer defines.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = hpux_pthread_initializers;
|
|
|
|
mach = "*-hp-hpux11.[0-3]*";
|
|
|
|
files = sys/pthread.h;
|
|
|
|
sed = "s@^[ \t]*1, 1, 1, 1,[ \t]*\\\\"
|
|
|
|
"@\t{ 1, 1, 1, 1 },\t\t\t\t\t\t\t\\\\@";
|
|
|
|
sed = "s@^[ \t]*1,[ \t]*\\\\"
|
|
|
|
"@\t{ 1, 0 }@";
|
|
|
|
sed = "/^[ \t]*0$/d";
|
|
|
|
sed = "s@__PTHREAD_MUTEX_VALID, 0"
|
|
|
|
"@{ __PTHREAD_MUTEX_VALID, 0 }@";
|
|
|
|
sed = "s@^[ \t]*0, 0, -1, 0,[ \t]*\\\\"
|
|
|
|
"@\t{ 0, 0, -1, 0 },\t\t\t\t\t\t\\\\@";
|
|
|
|
sed = "s@0, __LWP_MTX_VALID, 0, 1, 1, 1, 1,[ \t]*\\\\"
|
|
|
|
"@{ 0, __LWP_MTX_VALID }, { 0, 1, 1, 1, 1 },\t\t\t\\\\@";
|
|
|
|
sed = "s@^[ \t]*__LWP_MTX_VALID, 0, 1, 1, 1, 1,[ \t]*\\\\"
|
|
|
|
"@\t{ 0, __LWP_MTX_VALID }, { 0, 1, 1, 1, 1 },\t\t\t\\\\@";
|
|
|
|
sed = "s@^[ \t]*0, 0[ \t]*\\\\"
|
|
|
|
"@\t{ 0, 0 }\t\t\t\t\t\t\t\\\\@";
|
|
|
|
sed = "s@__PTHREAD_COND_VALID, 0"
|
|
|
|
"@{ __PTHREAD_COND_VALID, 0 }@";
|
|
|
|
sed = "s@__LWP_COND_VALID, 0,[ \t]*\\\\"
|
|
|
|
"@{ __LWP_COND_VALID, 0 },\t\t\t\t\t\\\\@";
|
|
|
|
sed = "s@__PTHREAD_RWLOCK_VALID, 0"
|
|
|
|
"@{ __PTHREAD_RWLOCK_VALID, 0 }@";
|
|
|
|
sed = "s@__LWP_RWLOCK_VALID, 0,[ \t]*\\\\"
|
|
|
|
"@{ __LWP_RWLOCK_VALID, 0 },\t\t\t\t\t\\\\@";
|
|
|
|
sed = "s@^[ \t]*0, 0, 0, 0, 0, 0, 0[ \t]*\\\\"
|
|
|
|
"@\t{ 0, 0, 0, 0, 0 }, { 0, 0}\t\t\t\t\t\\\\@";
|
|
|
|
test_text = "#define PTHREAD_MUTEX_INITIALIZER {\t\t\t\t\t\\\\\n"
|
|
|
|
"\t__PTHREAD_MUTEX_VALID, 0,\t\t\t\t\t\\\\\n"
|
|
|
|
"\t(PTHREAD_MUTEX_DEFAULT | PTHREAD_PROCESS_PRIVATE),\t\t\\\\\n"
|
|
|
|
"\t__SPNLCK_INITIALIZER,\t\t\t\t\t\t\\\\\n"
|
|
|
|
"\t0, 0, -1, 0,\t\t\t\t\t\t\t\\\\\n"
|
|
|
|
"\t0, __LWP_MTX_VALID, 0, 1, 1, 1, 1,\t\t\t\t\\\\\n"
|
|
|
|
"\t0, 0\t\t\t\t\t\t\t\t\\\\\n"
|
|
|
|
"}\n";
|
|
|
|
};
|
2006-02-18 16:58:06 +01:00
|
|
|
|
2005-09-15 21:09:27 +02:00
|
|
|
/*
|
|
|
|
* Fix glibc definition of HUGE_VAL in terms of hex floating point constant
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = huge_val_hex;
|
|
|
|
files = bits/huge_val.h;
|
|
|
|
select = "^#[ \t]*define[ \t]*HUGE_VAL[ \t].*0x1\\.0p.*";
|
|
|
|
bypass = "__builtin_huge_val";
|
|
|
|
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#define HUGE_VAL (__builtin_huge_val())\n";
|
|
|
|
|
|
|
|
test_text = "# define HUGE_VAL\t(__extension__ 0x1.0p2047)";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Fix glibc definition of HUGE_VALF in terms of hex floating point constant
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = huge_valf_hex;
|
|
|
|
files = bits/huge_val.h;
|
|
|
|
select = "^#[ \t]*define[ \t]*HUGE_VALF[ \t].*0x1\\.0p.*";
|
|
|
|
bypass = "__builtin_huge_valf";
|
|
|
|
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#define HUGE_VALF (__builtin_huge_valf())\n";
|
|
|
|
|
|
|
|
test_text = "# define HUGE_VALF (__extension__ 0x1.0p255f)";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Fix glibc definition of HUGE_VALL in terms of hex floating point constant
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = huge_vall_hex;
|
|
|
|
files = bits/huge_val.h;
|
|
|
|
select = "^#[ \t]*define[ \t]*HUGE_VALL[ \t].*0x1\\.0p.*";
|
|
|
|
bypass = "__builtin_huge_vall";
|
|
|
|
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#define HUGE_VALL (__builtin_huge_vall())\n";
|
|
|
|
|
|
|
|
test_text = "# define HUGE_VALL (__extension__ 0x1.0p32767L)";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2001-05-27 20:21:04 +02:00
|
|
|
/*
|
|
|
|
* Fix return type of abort and free
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = int_abort_free_and_exit;
|
|
|
|
files = stdlib.h;
|
|
|
|
select = "int[ \t]+(abort|free|exit)[ \t]*\\(";
|
2004-11-10 00:14:06 +01:00
|
|
|
bypass = "_CLASSIC_ANSI_TYPES";
|
2000-05-09 18:21:08 +02:00
|
|
|
|
2000-05-16 16:01:34 +02:00
|
|
|
c_fix = format;
|
2001-05-27 20:21:04 +02:00
|
|
|
c_fix_arg = "void\t%1(";
|
|
|
|
|
|
|
|
test_text = "extern int abort(int);\n"
|
|
|
|
"extern int free(void*);\n"
|
|
|
|
"extern int exit(void*);";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
2000-05-20 20:54:45 +02:00
|
|
|
|
1998-10-16 09:00:18 +02:00
|
|
|
/*
|
2000-05-14 23:20:33 +02:00
|
|
|
* Fix various macros used to define ioctl numbers.
|
|
|
|
* The traditional syntax was:
|
|
|
|
*
|
|
|
|
* #define _IO(n, x) (('n'<<8)+x)
|
|
|
|
* #define TIOCFOO _IO(T, 1)
|
|
|
|
*
|
Makefile.in: Correct dependencies of fixincl and fixincl.o.
* fixinc/Makefile.in: Correct dependencies of fixincl and fixincl.o.
* fixinc/fixfixes.c (IO_use, CTRL_use, IO_defn, CTRL_defn): New fixes.
(fix_char_macro_defines, fix_char_macro_uses): New functions.
* fixinc/fixlib.c (is_cxx_header): Do the text scan with a regexp.
Recognize Emacs mode markers also.
* fixinc/fixtests.c (else_endif_label): Fix bug in recognition of
C++ comments in C++ headers. Call is_cxx_header only if
necessary.
* fixinc/inclhack.def (avoid_bool): Add select for the problem and
bypass for ncurses.
(bsd43_io_macros, io_def_quotes, ioctl_fix_ctrl): Replace with...
(io_def_quotes, io_use_quotes, ctrl_def_quotes, ctrl_use_quotes):
... these, which use the new C fixes.
(math_exception): Escape literal '+' in bypass expression.
* fixinc/fixincl.x, fixinc/fixincl.sh, fixinc/inclhack.sh:
Regenerate.
From-SVN: r31512
2000-01-19 22:41:04 +01:00
|
|
|
* but this does not work with the C standard, which disallows macro
|
|
|
|
* expansion inside strings. We have to rewrite it thus:
|
2000-05-14 23:20:33 +02:00
|
|
|
*
|
|
|
|
* #define _IO(n, x) ((n<<8)+x)
|
|
|
|
* #define TIOCFOO _IO('T', 1)
|
|
|
|
*
|
Makefile.in: Correct dependencies of fixincl and fixincl.o.
* fixinc/Makefile.in: Correct dependencies of fixincl and fixincl.o.
* fixinc/fixfixes.c (IO_use, CTRL_use, IO_defn, CTRL_defn): New fixes.
(fix_char_macro_defines, fix_char_macro_uses): New functions.
* fixinc/fixlib.c (is_cxx_header): Do the text scan with a regexp.
Recognize Emacs mode markers also.
* fixinc/fixtests.c (else_endif_label): Fix bug in recognition of
C++ comments in C++ headers. Call is_cxx_header only if
necessary.
* fixinc/inclhack.def (avoid_bool): Add select for the problem and
bypass for ncurses.
(bsd43_io_macros, io_def_quotes, ioctl_fix_ctrl): Replace with...
(io_def_quotes, io_use_quotes, ctrl_def_quotes, ctrl_use_quotes):
... these, which use the new C fixes.
(math_exception): Escape literal '+' in bypass expression.
* fixinc/fixincl.x, fixinc/fixincl.sh, fixinc/inclhack.sh:
Regenerate.
From-SVN: r31512
2000-01-19 22:41:04 +01:00
|
|
|
* The select expressions match too much, but the c_fix code is cautious.
|
|
|
|
*
|
|
|
|
* _IO might be: _IO DESIO BSD43__IO with W, R, WR, C, ... suffixes.
|
1998-10-16 09:00:18 +02:00
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-14 23:20:33 +02:00
|
|
|
hackname = io_quotes_def;
|
2000-06-16 22:38:42 +02:00
|
|
|
select = "define[ \t]+[A-Z0-9_]+IO[A-Z]*\\([a-zA-Z][,)]";
|
2000-05-14 23:20:33 +02:00
|
|
|
c_fix = char_macro_def;
|
2000-05-12 17:51:55 +02:00
|
|
|
c_fix_arg = "IO";
|
2000-05-20 20:54:45 +02:00
|
|
|
test_text =
|
|
|
|
"#define BSD43__IOWR(n, x) (('n'<<8)+x)\n"
|
|
|
|
"#define _IOWN(x,y,t) (_IOC_IN|(((t)&_IOCPARM_MASK)<<16)|('x'<<8)|y)\n"
|
|
|
|
"#define _IO(x,y) ('x'<<8|y)";
|
2000-06-17 19:50:12 +02:00
|
|
|
test_text =
|
|
|
|
"#define XX_IO(x) ('x'<<8|256)";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
Makefile.in: Correct dependencies of fixincl and fixincl.o.
* fixinc/Makefile.in: Correct dependencies of fixincl and fixincl.o.
* fixinc/fixfixes.c (IO_use, CTRL_use, IO_defn, CTRL_defn): New fixes.
(fix_char_macro_defines, fix_char_macro_uses): New functions.
* fixinc/fixlib.c (is_cxx_header): Do the text scan with a regexp.
Recognize Emacs mode markers also.
* fixinc/fixtests.c (else_endif_label): Fix bug in recognition of
C++ comments in C++ headers. Call is_cxx_header only if
necessary.
* fixinc/inclhack.def (avoid_bool): Add select for the problem and
bypass for ncurses.
(bsd43_io_macros, io_def_quotes, ioctl_fix_ctrl): Replace with...
(io_def_quotes, io_use_quotes, ctrl_def_quotes, ctrl_use_quotes):
... these, which use the new C fixes.
(math_exception): Escape literal '+' in bypass expression.
* fixinc/fixincl.x, fixinc/fixincl.sh, fixinc/inclhack.sh:
Regenerate.
From-SVN: r31512
2000-01-19 22:41:04 +01:00
|
|
|
fix = {
|
2000-05-14 23:20:33 +02:00
|
|
|
hackname = io_quotes_use;
|
|
|
|
select = "define[ \t]+[A-Z0-9_]+[ \t]+[A-Z0-9_]+IO[A-Z]*[ \t]*"
|
|
|
|
"\\( *[^,']";
|
|
|
|
c_fix = char_macro_use;
|
2000-05-12 17:51:55 +02:00
|
|
|
c_fix_arg = "IO";
|
2000-05-30 22:24:44 +02:00
|
|
|
test_text = "#define TIOCFOO BSD43__IOWR(T, 1)\n"
|
|
|
|
"#define TIOCFOO \\\\\n"
|
|
|
|
"BSD43__IOWR(T, 1) /* Some are multi-line */";
|
Makefile.in: Correct dependencies of fixincl and fixincl.o.
* fixinc/Makefile.in: Correct dependencies of fixincl and fixincl.o.
* fixinc/fixfixes.c (IO_use, CTRL_use, IO_defn, CTRL_defn): New fixes.
(fix_char_macro_defines, fix_char_macro_uses): New functions.
* fixinc/fixlib.c (is_cxx_header): Do the text scan with a regexp.
Recognize Emacs mode markers also.
* fixinc/fixtests.c (else_endif_label): Fix bug in recognition of
C++ comments in C++ headers. Call is_cxx_header only if
necessary.
* fixinc/inclhack.def (avoid_bool): Add select for the problem and
bypass for ncurses.
(bsd43_io_macros, io_def_quotes, ioctl_fix_ctrl): Replace with...
(io_def_quotes, io_use_quotes, ctrl_def_quotes, ctrl_use_quotes):
... these, which use the new C fixes.
(math_exception): Escape literal '+' in bypass expression.
* fixinc/fixincl.x, fixinc/fixincl.sh, fixinc/inclhack.sh:
Regenerate.
From-SVN: r31512
2000-01-19 22:41:04 +01:00
|
|
|
};
|
1998-10-16 09:00:18 +02:00
|
|
|
|
|
|
|
|
|
|
|
/*
|
2000-05-16 16:01:34 +02:00
|
|
|
* Check for missing ';' in struct
|
1998-10-16 09:00:18 +02:00
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-16 16:01:34 +02:00
|
|
|
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";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
1999-08-08 00:42:56 +02:00
|
|
|
|
2003-03-01 21:29:32 +01:00
|
|
|
/*
|
|
|
|
* 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";
|
|
|
|
};
|
|
|
|
|
2004-08-13 23:13:56 +02:00
|
|
|
/*
|
|
|
|
* IRIX 6.5.22 <internal/math_core.h> uses the SGI c99 __generic() intrinsic
|
|
|
|
* to define the fpclasify, isfinite, isinf, isnan, isnormal and signbit
|
|
|
|
* functions.
|
|
|
|
*
|
|
|
|
* This was probably introduced around IRIX 6.5.18
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = irix___generic1;
|
|
|
|
files = internal/math_core.h;
|
|
|
|
mach = "mips-sgi-irix6.5";
|
|
|
|
select = "#define ([a-z]+)\\(x\\) *__generic.*";
|
|
|
|
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "extern int %1(double);\n"
|
|
|
|
"extern int %1f(float);\n"
|
|
|
|
"extern int %1l(long double);\n"
|
|
|
|
"#define %1(x) (sizeof(x) == sizeof(double) ? _%1(x) \\\n"
|
|
|
|
" : sizeof(x) == sizeof(float) ? _%1f(x) \\\n"
|
|
|
|
" : _%1l(x))\n";
|
|
|
|
|
|
|
|
test_text =
|
|
|
|
"#define isnan(x) __generic(x,,, _isnan, _isnanf, _isnanl,,,)(x)\n";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/* Likewise <internal/math_core.h> on IRIX 6.5.19 and later uses the SGI
|
|
|
|
compiler's __generic intrinsic to define isgreater, isgreaterequal,
|
|
|
|
isless, islessequal, islessgreater and isunordered functions. */
|
|
|
|
fix = {
|
|
|
|
hackname = irix___generic2;
|
|
|
|
files = internal/math_core.h;
|
|
|
|
mach = "mips-sgi-irix6.5";
|
|
|
|
select = "#define ([a-z]+)\\(x,y\\) *__generic.*";
|
|
|
|
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#define %1(x,y) \\\n"
|
|
|
|
" ((sizeof(x)<=4 && sizeof(y)<=4) ? _%1f(x,y) \\\n"
|
|
|
|
" : (sizeof(x)<=8 && sizeof(y)<=8) ? _%1(x,y) \\\n"
|
|
|
|
" : _%1l(x,y))\n";
|
|
|
|
|
|
|
|
test_text =
|
|
|
|
"#define isless(x,y) __generic(x,y,, _isless, _islessf, _islessl,,,)(x,y)";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
1999-08-08 00:42:56 +02:00
|
|
|
/*
|
|
|
|
* IRIX 5.2's <sys/asm.h> contains an asm comment with a contraction
|
|
|
|
* that causes the assembly preprocessor to complain about an
|
|
|
|
* unterminated character constant.
|
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-16 16:01:34 +02:00
|
|
|
hackname = irix_asm_apostrophe;
|
|
|
|
files = sys/asm.h;
|
1999-08-08 00:42:56 +02:00
|
|
|
|
2000-05-16 16:01:34 +02:00
|
|
|
select = "^[ \t]*#.*[Ww]e're";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "%1 are";
|
|
|
|
c_fix_arg = "^([ \t]*#.*[Ww]e)'re";
|
|
|
|
test_text = "\t# and we're on vacation";
|
1999-08-08 00:42:56 +02:00
|
|
|
};
|
|
|
|
|
1998-10-16 09:00:18 +02:00
|
|
|
|
2001-05-27 20:21:04 +02:00
|
|
|
/*
|
|
|
|
* 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 */";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2003-02-19 17:39:05 +01:00
|
|
|
/*
|
|
|
|
* 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;";
|
|
|
|
};
|
|
|
|
|
2007-07-05 20:43:16 +02:00
|
|
|
/*
|
|
|
|
* IRIX 6.5 <stdint.h> only works with ISO C99 and errors out
|
|
|
|
* otherwise.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = irix_stdint_c99;
|
|
|
|
files = stdint.h;
|
|
|
|
select = "(#ifndef __c99\n)(#error This header file is to be used only for c99 mode compilations)";
|
|
|
|
|
|
|
|
mach = "mips-sgi-irix6.5";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#if 0\n"
|
|
|
|
"%2";
|
|
|
|
test_text =
|
|
|
|
"#ifndef __c99\n#error This header file is to be used only for c99 mode compilations\n#else";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2001-03-16 04:28:28 +01:00
|
|
|
/*
|
2003-07-02 03:30:10 +02:00
|
|
|
* IRIX 5.x's stdio.h and IRIX 6.5's internal/stdio_core.h declare
|
|
|
|
* some functions that take a va_list as
|
2001-05-27 20:21:04 +02:00
|
|
|
* taking char *. However, GCC uses void * for va_list, so
|
2001-03-16 04:28:28 +01:00
|
|
|
* calling vfprintf with a va_list fails in C++. */
|
|
|
|
fix = {
|
|
|
|
hackname = irix_stdio_va_list;
|
|
|
|
files = stdio.h;
|
2003-07-02 03:30:10 +02:00
|
|
|
files = internal/stdio_core.h;
|
2001-03-16 04:28:28 +01:00
|
|
|
|
2003-10-06 22:49:24 +02:00
|
|
|
select = '/\* va_list \*/ char \*';
|
2001-03-16 04:28:28 +01:00
|
|
|
c_fix = format;
|
2003-10-06 22:49:24 +02:00
|
|
|
c_fix_arg = "__gnuc_va_list";
|
2001-05-26 20:26:29 +02:00
|
|
|
test_text =
|
|
|
|
"extern int printf( const char *, /* va_list */ char * );";
|
2001-03-16 04:28:28 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2003-02-19 17:39:05 +01:00
|
|
|
/*
|
|
|
|
* 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"
|
2008-09-06 21:57:26 +02:00
|
|
|
"extern size_t wcsftime(wchar_t *, "
|
|
|
|
"__SGI_LIBC_NAMESPACE_QUALIFIER size_t, const char *, "
|
|
|
|
"const struct tm *);";
|
2003-02-19 17:39:05 +01:00
|
|
|
};
|
|
|
|
|
1998-10-16 09:00:18 +02:00
|
|
|
/*
|
2000-05-16 16:01:34 +02:00
|
|
|
* Fixing ISC fmod declaration
|
1998-10-16 09:00:18 +02:00
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-16 16:01:34 +02:00
|
|
|
hackname = isc_fmod;
|
|
|
|
files = math.h;
|
|
|
|
select = 'fmod\(double\)';
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "fmod(double, double)";
|
|
|
|
test_text = "extern double fmod(double);";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2001-05-27 20:21:04 +02:00
|
|
|
/*
|
|
|
|
* 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";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
1998-10-16 09:00:18 +02:00
|
|
|
/*
|
|
|
|
* These files in Sun OS 4.x and ARM/RISCiX and BSD4.3
|
|
|
|
* use / * * / to concatenate tokens.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = kandr_concat;
|
|
|
|
files = "sparc/asm_linkage.h";
|
2007-01-06 19:03:50 +01:00
|
|
|
files = "sun*/asm_linkage.h";
|
1998-10-16 09:00:18 +02:00
|
|
|
files = "arm/as_support.h";
|
|
|
|
files = "arm/mc_type.h";
|
|
|
|
files = "arm/xcb.h";
|
|
|
|
files = "dev/chardefmac.h";
|
|
|
|
files = "dev/ps_irq.h";
|
|
|
|
files = "dev/screen.h";
|
|
|
|
files = "dev/scsi.h";
|
|
|
|
files = "sys/tty.h";
|
|
|
|
files = "Xm.acorn/XmP.h";
|
|
|
|
files = bsd43/bsd43_.h;
|
|
|
|
select = '/\*\*/';
|
2000-05-16 16:01:34 +02:00
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = '##';
|
|
|
|
test_text = "#define __CONCAT__(a,b) a/**/b";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2004-09-18 00:58:40 +02:00
|
|
|
/* The /usr/include/sys/ucontext.h on ia64-*linux-gnu systems defines
|
|
|
|
* an _SC_GR0_OFFSET macro using an idiom that isn't a compile time
|
|
|
|
* constant on recent versions of g++.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = linux_ia64_ucontext;
|
|
|
|
files = "sys/ucontext.h";
|
|
|
|
mach = "ia64-*-linux*";
|
|
|
|
select = '\(\(\(char \*\) &\(\(struct sigcontext \*\) 0\)'
|
|
|
|
'->sc_gr\[0\]\) - \(char \*\) 0\)';
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "__builtin_offsetof \(struct sigcontext, sc_gr[0]\)";
|
|
|
|
test_text = "# define _SC_GR0_OFFSET\t\\\\\n"
|
|
|
|
"\t(((char *) &((struct sigcontext *) 0)->sc_gr[0]) - (char *) 0)\n";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2004-09-10 15:56:50 +02:00
|
|
|
/*
|
|
|
|
* Remove header file warning from sys/time.h. Autoconf's
|
|
|
|
* AC_HEADER_TIME recommends to include both sys/time.h and time.h
|
|
|
|
* which causes warning on LynxOS. Remove the warning.
|
1998-10-16 09:00:18 +02:00
|
|
|
*/
|
|
|
|
fix = {
|
2004-09-10 15:56:50 +02:00
|
|
|
hackname = lynxos_no_warning_in_sys_time_h;
|
|
|
|
files = sys/time.h;
|
|
|
|
select = "#warning[ \t]+Using <time.h> instead of <sys/time.h>";
|
2000-05-16 16:01:34 +02:00
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "";
|
2004-09-10 15:56:50 +02:00
|
|
|
test_text = "#warning Using <time.h> instead of <sys/time.h>";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2004-09-10 15:56:50 +02:00
|
|
|
/*
|
|
|
|
* Add missing declaration for putenv.
|
1998-10-16 09:00:18 +02:00
|
|
|
*/
|
|
|
|
fix = {
|
2004-09-10 15:56:50 +02:00
|
|
|
hackname = lynxos_missing_putenv;
|
|
|
|
mach = '*-*-lynxos*';
|
|
|
|
files = stdlib.h;
|
|
|
|
bypass = 'putenv[ \t]*\\(';
|
|
|
|
select = "extern char \\*getenv[ \t]*_AP\\(\\(const char \\*\\)\\);";
|
2000-05-16 16:01:34 +02:00
|
|
|
c_fix = format;
|
2004-09-10 15:56:50 +02:00
|
|
|
c_fix_arg = "%0\n"
|
|
|
|
"extern int putenv _AP((char *));";
|
|
|
|
c_fix_arg = "extern char \\*getenv[ \t]*_AP\\(\\(const char \\*\\)\\);";
|
|
|
|
test_text = "extern char *getenv _AP((const char *));";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2000-01-25 09:06:23 +01:00
|
|
|
/*
|
|
|
|
* Fix BSD machine/ansi.h to use __builtin_va_list to define _BSD_VA_LIST_.
|
2001-05-27 20:21:04 +02:00
|
|
|
*
|
2000-12-05 19:08:09 +01:00
|
|
|
* On NetBSD, machine is a symbolic link to an architecture specific
|
|
|
|
* directory name, so we can't match a specific file name here.
|
2000-01-25 09:06:23 +01:00
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = machine_ansi_h_va_list;
|
2000-05-20 21:47:41 +02:00
|
|
|
select = "define[ \t]+_BSD_VA_LIST_[ \t]";
|
2000-01-25 09:06:23 +01:00
|
|
|
bypass = '__builtin_va_list';
|
|
|
|
|
2000-05-20 21:47:41 +02:00
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "%1__builtin_va_list";
|
|
|
|
c_fix_arg = "(define[ \t]+_BSD_VA_LIST_[ \t]+).*";
|
|
|
|
|
|
|
|
test_text = " # define _BSD_VA_LIST_\tchar**";
|
2000-01-25 09:06:23 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
1998-10-16 09:00:18 +02:00
|
|
|
/*
|
1999-03-31 14:02:19 +02:00
|
|
|
* Fix non-ansi machine name defines
|
1998-10-16 09:00:18 +02:00
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-14 23:20:33 +02:00
|
|
|
hackname = machine_name;
|
|
|
|
c_test = machine_name;
|
|
|
|
c_fix = machine_name;
|
2000-05-20 23:32:42 +02:00
|
|
|
|
2000-05-20 21:47:41 +02:00
|
|
|
test_text = "/* MACH_DIFF: */\n"
|
2000-05-20 23:32:42 +02:00
|
|
|
"#if defined( i386 ) || defined( sparc ) || defined( vax )"
|
2000-05-20 21:47:41 +02:00
|
|
|
"\n/* no uniform test, so be careful :-) */";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2003-07-09 23:00:01 +02:00
|
|
|
* Some math.h files define struct exception (it's in the System V
|
2004-01-21 00:49:34 +01:00
|
|
|
* 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
|
inclhack.def (aix_syswait, [...]): Remove.
fixincludes:
* inclhack.def (aix_syswait, exception_structure,
pthread_page_size): Remove.
(math_exception): Remove mention of fixproto in comment.
* fixincl.x: Regenerate.
* mkheaders.in: Do not handle STMP_FIXPROTO.
gcc:
* config/arm/t-arm-coff, config/h8300/coff.h,
config/i386/i386-aout.h, config/i386/i386-coff.h,
config/libgloss.h, config/m68k/coff.h, config/m68k/m68k-aout.h,
config/pdp11/2bsd.h, config/rs6000/aix41.h,
config/rs6000/aix41.opt, config/rs6000/t-newas, config/sh/coff.h,
fix-header.c, fixproto, gen-protos.c, protoize.c, scan-decls.c,
scan-types.sh, scan.c, scan.h, sort-protos, sys-protos.h,
sys-types.h: Remove.
* Makefile.in: Remove protoize and fixproto support and references
in comments.
(SYSCALLS.c.X-warn, TARGET_GETGROUPS_T, STMP_FIXPROTO,
PROTOIZE_INSTALL_NAME, UNPROTOIZE_INSTALL_NAME, FIXPROTO_DEFINES):
Remove.
(ALL_HOST_OBJS): Remove $(PROTO_OBJS).
(MOSTLYCLEANFILES): Remove protoize$(exeext) and
unprotoize$(exeext).
(rest.encap): Don't depend on $(STMP_FIXPROTO)
(.PHONY): Don't depend on proto.
(libgcc-support): Don't depend on $(STMP_FIXPROTO).
(proto, PROTO_OBJS, protoize$(exeext), unprotoize$(exeext),
protoize.o, unprotoize.o, SYSCALLS.c.X, test-protoize-simple,
deduced.h, GEN_PROTOS_OBJS, build/gen-protos$(build_exeext),
build/gen-protos.o, build/scan.o, xsys-protos.h,
build/fix-header$(build_exeext), build/fix-header.o,
build/scan-decls.o, fixhdr.ready, stmp-fixproto,
stmp-install-fixproto): Remove.
(mostlyclean): Don't remove xsys-protos.hT, SYSCALLS.c.X,
SYSCALLS.c or fixproto files.
(install-common): Don't install protoize.
(install-headers-tar, install-headers-cpio, install-headers-cp):
Don't depend on $(STMP_FIXPROTO).
(install-mkheaders): Don't depend on $(STMP_FIXPROTO). Don't
install fixproto files or write out fixproto settings.
(uninstall): Don't uninstall protoize.
* config.gcc (use_fixproto): Remove.
(arm-*-coff*, armel-*-coff*, h8300-*-*, i[34567]86-*-aout*,
i[34567]86-*-coff*, m68k-*-aout*, m68k-*-coff*, pdp11-*-bsd,
rs6000-ibm-aix4.[12]*, powerpc-ibm-aix4.[12]*, sh-*-*): Remove.
* config/m32r/t-linux (STMP_FIXPROTO): Remove.
* config/m68k/m68k.c: Remove M68K_TARGET_COFF-conditional code.
* config/mips/t-iris (FIXPROTO_DEFINES): Remove.
* config/pa/t-pa-hpux (FIXPROTO_DEFINES): Remove.
* config/pdp11/pdp11.c: Remove TWO_BSD-conditional code.
* config/t-svr4 (FIXPROTO_DEFINES): Remove.
* config/t-vxworks (STMP_FIXPROTO): Remove.
* configure.ac (AC_TYPE_GETGROUPS, TARGET_GETGROUPS_T,
STMP_FIXPROTO): Remove.
* config.in, configure: Regenerate.
* crtstuff.c (gid_t, uid_t): Don't undefine.
* doc/install.texi: Change m68k-coff to m68k-elf in example.
(arm-*-coff, arm-*-aout: Remove target entries.
(*-ibm-aix*): Mention removal of support for AIX 4.2 and older.
Remove mention of AIX 4.1.
(m68k-*-*): Remove mention of m68k-*-aout and m68k-*-coff*.
* doc/invoke.texi (Running Protoize): Remove.
* doc/trouble.texi (Actual Bugs): Remove mention of fixproto.
(Protoize Caveats): Remove.
* tsystem.h: Update comments on headers assumed to exist.
gcc/po:
* EXCLUDES (fix-header.c, gen-protos.c, scan-decls.c, scan.c,
scan.h): Remove.
gcc/testsuite:
* g++.old-deja/g++.ext/attrib5.C, g++.old-deja/g++.jason/thunk3.C,
gcc.c-torture/compile/981006-1.c: Don't XFAIL or add special
options for removed targets.
libgcc:
* config.host (arm-*-coff*, armel-*-coff*, arm-semi-aof,
armel-semi-aof, h8300-*-*, i[34567]86-*-aout*, i[34567]86-*-coff*,
m68k-*-aout*, m68k-*-coff*, pdp11-*-bsd, rs6000-ibm-aix4.[12]*,
powerpc-ibm-aix4.[12]*, sh-*-*): Remove.
From-SVN: r145158
2009-03-28 07:51:09 +01:00
|
|
|
* better.
|
1998-10-16 09:00:18 +02:00
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-14 21:29:02 +02:00
|
|
|
hackname = math_exception;
|
|
|
|
files = math.h;
|
|
|
|
select = "struct exception";
|
2004-01-21 00:49:34 +01:00
|
|
|
/*
|
|
|
|
* This should be bypassed on __cplusplus, but some supposedly C++ C++
|
|
|
|
* aware headers, such as Solaris 8 and 9, don't wrap their struct
|
|
|
|
* exception either. So currently we bypass only for glibc, based on a
|
|
|
|
* comment in the fixed glibc header. Ick.
|
|
|
|
*/
|
2008-09-06 21:57:26 +02:00
|
|
|
bypass = 'We have a problem when using C\+\+|for C\+\+, '
|
|
|
|
'_[a-z0-9A-Z_]+_exception; for C, exception';
|
2000-05-14 21:29:02 +02:00
|
|
|
c_fix = wrap;
|
|
|
|
|
|
|
|
c_fix_arg = "#ifdef __cplusplus\n"
|
|
|
|
"#define exception __math_exception\n"
|
|
|
|
"#endif\n";
|
|
|
|
|
|
|
|
c_fix_arg = "#ifdef __cplusplus\n"
|
|
|
|
"#undef exception\n"
|
|
|
|
"#endif\n";
|
|
|
|
|
|
|
|
test_text = "typedef struct exception t_math_exception;";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
2000-05-20 21:47:41 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* This looks pretty broken to me. ``dbl_max_def'' will contain
|
|
|
|
* "define DBL_MAX " at the start, when what we really want is just
|
|
|
|
* the value portion. Can't figure out how to write a test case
|
|
|
|
* for this either :-(
|
|
|
|
*/
|
1998-10-16 09:00:18 +02:00
|
|
|
fix = {
|
fixtests.c (is_cxx_header): New fn, split out of double_slash_test.
1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu>
* fixtests.c (is_cxx_header): New fn, split out of
double_slash_test.
(else_endif_label): Allow "#endif // comment" in C++ headers,
as determined by is_cxx_header.
* fixfixes.c (else_endif_label_fix): Update comment.
* fixincl.c: Don't output VERB_PROGRESS lines if stdout is not
a tty.
* genfixes: Correct double thinko in commandline parsing.
* hackshell.tpl: Generate correct sh syntax for bypass
entries.
* inclhack.def (all): Whenever an inserted preprocessor
conditional is split over multiple lines, use double
backslashes in this file so the fixed header will be readable.
(AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h
and add bypass entry for correct version of this header.
(AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h.
(AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h.
(hpux8_bogus_inlines): New fix, split from...
(ultrix_atof_param) ... here.
(math_expression): Add bypass entry keyed to glibc comment
indicating the problem has been dealt with; disable
unnecessary sed operations; update commentary.
(math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max,
add select and bypass entries, simplify shell operation.
(math_huge_val_ifndef): Split from math_gcc_ifndefs.
(ip_missing_semi, rs6000_param, tinfo_cplusplus,
ultrix_atof_param): Add select entry.
(stdio_va_list, sunos_mather_decl): Add bypass entry.
(systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the
comments with the fixes they describe.
* fixincl.x, fixincl.sh, inclhack.sh: Regen.
From-SVN: r30999
1999-12-17 22:49:30 +01:00
|
|
|
hackname = math_huge_val_from_dbl_max;
|
1998-10-16 09:00:18 +02:00
|
|
|
files = math.h;
|
2000-07-13 16:47:55 +02:00
|
|
|
|
1999-03-31 14:02:19 +02:00
|
|
|
/*
|
fixtests.c (is_cxx_header): New fn, split out of double_slash_test.
1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu>
* fixtests.c (is_cxx_header): New fn, split out of
double_slash_test.
(else_endif_label): Allow "#endif // comment" in C++ headers,
as determined by is_cxx_header.
* fixfixes.c (else_endif_label_fix): Update comment.
* fixincl.c: Don't output VERB_PROGRESS lines if stdout is not
a tty.
* genfixes: Correct double thinko in commandline parsing.
* hackshell.tpl: Generate correct sh syntax for bypass
entries.
* inclhack.def (all): Whenever an inserted preprocessor
conditional is split over multiple lines, use double
backslashes in this file so the fixed header will be readable.
(AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h
and add bypass entry for correct version of this header.
(AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h.
(AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h.
(hpux8_bogus_inlines): New fix, split from...
(ultrix_atof_param) ... here.
(math_expression): Add bypass entry keyed to glibc comment
indicating the problem has been dealt with; disable
unnecessary sed operations; update commentary.
(math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max,
add select and bypass entries, simplify shell operation.
(math_huge_val_ifndef): Split from math_gcc_ifndefs.
(ip_missing_semi, rs6000_param, tinfo_cplusplus,
ultrix_atof_param): Add select entry.
(stdio_va_list, sunos_mather_decl): Add bypass entry.
(systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the
comments with the fixes they describe.
* fixincl.x, fixincl.sh, inclhack.sh: Regen.
From-SVN: r30999
1999-12-17 22:49:30 +01:00
|
|
|
* IF HUGE_VAL is defined to be DBL_MAX *and* DBL_MAX is _not_ defined
|
|
|
|
* in math.h, this fix applies.
|
1999-03-31 14:02:19 +02:00
|
|
|
*/
|
2000-07-13 16:47:55 +02:00
|
|
|
select = "define[ \t]+HUGE_VAL[ \t]+DBL_MAX";
|
|
|
|
bypass = "define[ \t]+DBL_MAX";
|
1998-10-16 09:00:18 +02:00
|
|
|
|
fixtests.c (is_cxx_header): New fn, split out of double_slash_test.
1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu>
* fixtests.c (is_cxx_header): New fn, split out of
double_slash_test.
(else_endif_label): Allow "#endif // comment" in C++ headers,
as determined by is_cxx_header.
* fixfixes.c (else_endif_label_fix): Update comment.
* fixincl.c: Don't output VERB_PROGRESS lines if stdout is not
a tty.
* genfixes: Correct double thinko in commandline parsing.
* hackshell.tpl: Generate correct sh syntax for bypass
entries.
* inclhack.def (all): Whenever an inserted preprocessor
conditional is split over multiple lines, use double
backslashes in this file so the fixed header will be readable.
(AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h
and add bypass entry for correct version of this header.
(AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h.
(AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h.
(hpux8_bogus_inlines): New fix, split from...
(ultrix_atof_param) ... here.
(math_expression): Add bypass entry keyed to glibc comment
indicating the problem has been dealt with; disable
unnecessary sed operations; update commentary.
(math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max,
add select and bypass entries, simplify shell operation.
(math_huge_val_ifndef): Split from math_gcc_ifndefs.
(ip_missing_semi, rs6000_param, tinfo_cplusplus,
ultrix_atof_param): Add select entry.
(stdio_va_list, sunos_mather_decl): Add bypass entry.
(systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the
comments with the fixes they describe.
* fixincl.x, fixincl.sh, inclhack.sh: Regen.
From-SVN: r30999
1999-12-17 22:49:30 +01:00
|
|
|
shell =
|
1999-03-31 14:02:19 +02:00
|
|
|
/*
|
fixtests.c (is_cxx_header): New fn, split out of double_slash_test.
1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu>
* fixtests.c (is_cxx_header): New fn, split out of
double_slash_test.
(else_endif_label): Allow "#endif // comment" in C++ headers,
as determined by is_cxx_header.
* fixfixes.c (else_endif_label_fix): Update comment.
* fixincl.c: Don't output VERB_PROGRESS lines if stdout is not
a tty.
* genfixes: Correct double thinko in commandline parsing.
* hackshell.tpl: Generate correct sh syntax for bypass
entries.
* inclhack.def (all): Whenever an inserted preprocessor
conditional is split over multiple lines, use double
backslashes in this file so the fixed header will be readable.
(AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h
and add bypass entry for correct version of this header.
(AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h.
(AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h.
(hpux8_bogus_inlines): New fix, split from...
(ultrix_atof_param) ... here.
(math_expression): Add bypass entry keyed to glibc comment
indicating the problem has been dealt with; disable
unnecessary sed operations; update commentary.
(math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max,
add select and bypass entries, simplify shell operation.
(math_huge_val_ifndef): Split from math_gcc_ifndefs.
(ip_missing_semi, rs6000_param, tinfo_cplusplus,
ultrix_atof_param): Add select entry.
(stdio_va_list, sunos_mather_decl): Add bypass entry.
(systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the
comments with the fixes they describe.
* fixincl.x, fixincl.sh, inclhack.sh: Regen.
From-SVN: r30999
1999-12-17 22:49:30 +01:00
|
|
|
* See if we have a definition for DBL_MAX in float.h.
|
|
|
|
* If we do, we will replace the one in math.h with that one.
|
1999-03-31 14:02:19 +02:00
|
|
|
*/
|
1998-10-16 09:00:18 +02:00
|
|
|
|
1999-03-31 14:02:19 +02:00
|
|
|
"\tdbl_max_def=`egrep 'define[ \t]+DBL_MAX[ \t]+.*' float.h "
|
2000-07-13 16:47:55 +02:00
|
|
|
"| sed 's/.*DBL_MAX[ \t]*//' 2>/dev/null`\n\n"
|
1998-10-16 09:00:18 +02:00
|
|
|
|
fixtests.c (is_cxx_header): New fn, split out of double_slash_test.
1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu>
* fixtests.c (is_cxx_header): New fn, split out of
double_slash_test.
(else_endif_label): Allow "#endif // comment" in C++ headers,
as determined by is_cxx_header.
* fixfixes.c (else_endif_label_fix): Update comment.
* fixincl.c: Don't output VERB_PROGRESS lines if stdout is not
a tty.
* genfixes: Correct double thinko in commandline parsing.
* hackshell.tpl: Generate correct sh syntax for bypass
entries.
* inclhack.def (all): Whenever an inserted preprocessor
conditional is split over multiple lines, use double
backslashes in this file so the fixed header will be readable.
(AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h
and add bypass entry for correct version of this header.
(AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h.
(AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h.
(hpux8_bogus_inlines): New fix, split from...
(ultrix_atof_param) ... here.
(math_expression): Add bypass entry keyed to glibc comment
indicating the problem has been dealt with; disable
unnecessary sed operations; update commentary.
(math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max,
add select and bypass entries, simplify shell operation.
(math_huge_val_ifndef): Split from math_gcc_ifndefs.
(ip_missing_semi, rs6000_param, tinfo_cplusplus,
ultrix_atof_param): Add select entry.
(stdio_va_list, sunos_mather_decl): Add bypass entry.
(systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the
comments with the fixes they describe.
* fixincl.x, fixincl.sh, inclhack.sh: Regen.
From-SVN: r30999
1999-12-17 22:49:30 +01:00
|
|
|
"\tif ( test -n \"${dbl_max_def}\" ) > /dev/null 2>&1\n"
|
|
|
|
"\tthen sed -e '/define[ \t]*HUGE_VAL[ \t]*DBL_MAX/"
|
2000-07-13 16:47:55 +02:00
|
|
|
"s@DBL_MAX@'\"$dbl_max_def@\"\n"
|
fixtests.c (is_cxx_header): New fn, split out of double_slash_test.
1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu>
* fixtests.c (is_cxx_header): New fn, split out of
double_slash_test.
(else_endif_label): Allow "#endif // comment" in C++ headers,
as determined by is_cxx_header.
* fixfixes.c (else_endif_label_fix): Update comment.
* fixincl.c: Don't output VERB_PROGRESS lines if stdout is not
a tty.
* genfixes: Correct double thinko in commandline parsing.
* hackshell.tpl: Generate correct sh syntax for bypass
entries.
* inclhack.def (all): Whenever an inserted preprocessor
conditional is split over multiple lines, use double
backslashes in this file so the fixed header will be readable.
(AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h
and add bypass entry for correct version of this header.
(AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h.
(AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h.
(hpux8_bogus_inlines): New fix, split from...
(ultrix_atof_param) ... here.
(math_expression): Add bypass entry keyed to glibc comment
indicating the problem has been dealt with; disable
unnecessary sed operations; update commentary.
(math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max,
add select and bypass entries, simplify shell operation.
(math_huge_val_ifndef): Split from math_gcc_ifndefs.
(ip_missing_semi, rs6000_param, tinfo_cplusplus,
ultrix_atof_param): Add select entry.
(stdio_va_list, sunos_mather_decl): Add bypass entry.
(systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the
comments with the fixes they describe.
* fixincl.x, fixincl.sh, inclhack.sh: Regen.
From-SVN: r30999
1999-12-17 22:49:30 +01:00
|
|
|
"\telse cat\n"
|
|
|
|
"\tfi";
|
2000-07-13 16:47:55 +02:00
|
|
|
|
|
|
|
test_text =
|
|
|
|
"`echo '#define DBL_MAX\t3.1415e+9 /* really big */' >> float.h`\n"
|
|
|
|
"#define HUGE_VAL DBL_MAX";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
2000-05-20 21:47:41 +02:00
|
|
|
|
2001-05-27 20:21:04 +02:00
|
|
|
/*
|
|
|
|
* 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 <rpc/auth_des.h> /* skip this */";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2000-05-16 16:01:34 +02:00
|
|
|
/*
|
|
|
|
* Fixing nested comments in ISC <sys/limits.h>
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = nested_sys_limits;
|
|
|
|
files = sys/limits.h;
|
|
|
|
select = CHILD_MAX;
|
|
|
|
sed = "/CHILD_MAX/s,/\\* Max, Max,";
|
|
|
|
sed = "/OPEN_MAX/s,/\\* Max, Max,";
|
|
|
|
test_text = "/*\n#define CHILD_MAX 20 /* Max, Max, ... */ /*\n"
|
|
|
|
"#define OPEN_MAX 20 /* Max, Max, ... */\n";
|
|
|
|
};
|
|
|
|
|
1998-10-16 09:00:18 +02:00
|
|
|
|
2007-03-19 18:08:14 +01:00
|
|
|
/*
|
|
|
|
* Some versions of NetBSD don't expect the C99 inline semantics.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = netbsd_c99_inline_1;
|
2008-02-05 03:36:32 +01:00
|
|
|
mach = "*-*-netbsd*";
|
2007-03-19 18:08:14 +01:00
|
|
|
files = signal.h;
|
|
|
|
select = "extern __inline int";
|
|
|
|
|
|
|
|
c_fix = format;
|
2008-09-06 21:57:26 +02:00
|
|
|
c_fix_arg = "extern\n"
|
|
|
|
"#ifdef __GNUC_STDC_INLINE__\n"
|
|
|
|
"__attribute__((__gnu_inline__))\n"
|
|
|
|
"#endif\n"
|
|
|
|
"__inline int";
|
2007-03-19 18:08:14 +01:00
|
|
|
|
|
|
|
test_text = "extern __inline int\nsigaddset(sigset_t *set, int signo)\n{}";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2007-07-26 01:51:47 +02:00
|
|
|
fix = {
|
|
|
|
hackname = netbsd_c99_inline_2;
|
2008-02-05 03:36:32 +01:00
|
|
|
mach = "*-*-netbsd*";
|
2007-07-26 01:51:47 +02:00
|
|
|
files = signal.h;
|
|
|
|
select = "#define _SIGINLINE extern __inline";
|
|
|
|
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = <<- _EOArg_
|
|
|
|
#ifdef __GNUC_STDC_INLINE__
|
|
|
|
#define _SIGINLINE extern __attribute__((__gnu_inline__)) __inline
|
|
|
|
#else
|
|
|
|
%0
|
|
|
|
#endif
|
|
|
|
_EOArg_;
|
|
|
|
|
|
|
|
test_text = "#define _SIGINLINE extern __inline";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2003-02-18 21:05:02 +01:00
|
|
|
/*
|
|
|
|
* NetBSD has a semicolon after the ending '}' for some extern "C".
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = netbsd_extra_semicolon;
|
2008-02-05 03:36:32 +01:00
|
|
|
mach = "*-*-netbsd*";
|
2003-02-18 21:05:02 +01:00
|
|
|
files = sys/cdefs.h;
|
|
|
|
select = "#define[ \t]*__END_DECLS[ \t]*};";
|
|
|
|
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#define __END_DECLS }";
|
|
|
|
|
|
|
|
test_text = "#define __END_DECLS };";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
re PR c/448 (<stdint.h>-related issues (C99 issues))
PR c/448
fixincludes:
* inclhack.def (newlib_stdint_1, newlib_stdint_2): New fixes.
* fixincl.x: Regenerate.
* tests/base/stdint.h: Update.
gcc:
* Makefile.in (USE_GCC_STDINT): Define.
(stmp-int-hdrs): Install stdint.h if applicable.
* c-common.c (CHAR16_TYPE): Define in terms of UINT_LEAST16_TYPE
if known.
(CHAR32_TYPE): Define in terms of UINT_LEAST32_TYPE if known.
(SIG_ATOMIC_TYPE, INT8_TYPE, INT16_TYPE, INT32_TYPE, INT64_TYPE,
UINT8_TYPE, UINT16_TYPE, UINT32_TYPE, UINT64_TYPE,
INT_LEAST8_TYPE, INT_LEAST16_TYPE, INT_LEAST32_TYPE,
INT_LEAST64_TYPE, UINT_LEAST8_TYPE, UINT_LEAST16_TYPE,
UINT_LEAST32_TYPE, UINT_LEAST64_TYPE, INT_FAST8_TYPE,
INT_FAST16_TYPE, INT_FAST32_TYPE, INT_FAST64_TYPE,
UINT_FAST8_TYPE, UINT_FAST16_TYPE, UINT_FAST32_TYPE,
UINT_FAST64_TYPE, INTPTR_TYPE, UINTPTR_TYPE): Define.
(c_common_nodes_and_builtins): Initialize
underlying_wchar_type_node. Do not initialize
signed_wchar_type_node or unsigned_wchar_type_node. Initialize
nodes for new types.
(c_stddef_cpp_builtins): Define macros for new types.
* c-common.h (CTI_SIGNED_WCHAR_TYPE, CTI_UNSIGNED_WCHAR_TYPE):
Remove.
(CTI_UNDERLYING_WCHAR_TYPE, CTI_SIG_ATOMIC_TYPE, CTI_INT8_TYPE,
CTI_INT16_TYPE, CTI_INT32_TYPE, CTI_INT64_TYPE, CTI_UINT8_TYPE,
CTI_UINT16_TYPE, CTI_UINT32_TYPE, CTI_UINT64_TYPE,
CTI_INT_LEAST8_TYPE, CTI_INT_LEAST16_TYPE, CTI_INT_LEAST32_TYPE,
CTI_INT_LEAST64_TYPE, CTI_UINT_LEAST8_TYPE, CTI_UINT_LEAST16_TYPE,
CTI_UINT_LEAST32_TYPE, CTI_UINT_LEAST64_TYPE, CTI_INT_FAST8_TYPE,
CTI_INT_FAST16_TYPE, CTI_INT_FAST32_TYPE, CTI_INT_FAST64_TYPE,
CTI_UINT_FAST8_TYPE, CTI_UINT_FAST16_TYPE, CTI_UINT_FAST32_TYPE,
CTI_UINT_FAST64_TYPE, CTI_INTPTR_TYPE, CTI_UINTPTR_TYPE): Define.
(signed_wchar_type_node, unsigned_wchar_type_node): Remove.
(underlying_wchar_type_node, sig_atomic_type_node, int8_type_node,
int16_type_node, int32_type_node, int64_type_node,
uint8_type_node, uint16_type_node, c_uint32_type_node,
c_uint64_type_node, int_least8_type_node, int_least16_type_node,
int_least32_type_node, int_least64_type_node,
uint_least8_type_node, uint_least16_type_node,
uint_least32_type_node, uint_least64_type_node,
int_fast8_type_node, int_fast16_type_node, int_fast32_type_node,
int_fast64_type_node, uint_fast8_type_node, uint_fast16_type_node,
uint_fast32_type_node, uint_fast64_type_node, intptr_type_node,
uintptr_type_node): Define.
* c-cppbuiltin.c (builtin_define_constants,
builtin_define_type_minmax): New.
(builtin_define_stdint_macros): Define more macros.
(c_cpp_builtins): Define more limit macros.
(type_suffix): New.
(builtin_define_type_max): Define in terms of
builtin_define_type_minmax. Remove is_long parameter. All
callers changed.
* config.gcc (use_gcc_stdint): Define.
(tm_file): Add glibc-stdint.h for targets using glibc or uClibc.
Add newlib-stdint.h for generic targets.
* config/glibc-stdint.h, config/newlib-stdint.h,
ginclude/stdint-gcc.h, ginclude/stdint-wrap.h: New.
* config/m32c/m32c.h (UINTPTR_TYPE): Define.
* config/score/score.h (UINTPTR_TYPE): Define.
* config/sol2.h (SIG_ATOMIC_TYPE, INT8_TYPE, INT16_TYPE,
INT32_TYPE, INT64_TYPE, UINT8_TYPE, UINT16_TYPE, UINT32_TYPE,
UINT64_TYPE, INT_LEAST8_TYPE, INT_LEAST16_TYPE, INT_LEAST32_TYPE,
INT_LEAST64_TYPE, UINT_LEAST8_TYPE, UINT_LEAST16_TYPE,
UINT_LEAST32_TYPE, UINT_LEAST64_TYPE, INT_FAST8_TYPE,
INT_FAST16_TYPE, INT_FAST32_TYPE, INT_FAST64_TYPE,
UINT_FAST8_TYPE, UINT_FAST16_TYPE, UINT_FAST32_TYPE,
UINT_FAST64_TYPE, INTPTR_TYPE, UINTPTR_TYPE): Define.
* config/spu/spu.h (STDINT_LONG32): Define.
* configure.ac (use_gcc_stdint): Substitute.
* configure: Regenerate.
* doc/cpp.texi (__SIG_ATOMIC_TYPE__, __INT8_TYPE__,
__INT16_TYPE__, __INT32_TYPE__, __INT64_TYPE__, __UINT8_TYPE__,
__UINT16_TYPE__, __UINT32_TYPE__, __UINT64_TYPE__,
__INT_LEAST8_TYPE__, __INT_LEAST16_TYPE__, __INT_LEAST32_TYPE__,
__INT_LEAST64_TYPE__, __UINT_LEAST8_TYPE__, __UINT_LEAST16_TYPE__,
__UINT_LEAST32_TYPE_, __UINT_LEAST64_TYPE__, __INT_FAST8_TYPE__,
__INT_FAST16_TYPE__, __INT_FAST32_TYPE__, __INT_FAST64_TYPE__,
__UINT_FAST8_TYPE__, __UINT_FAST16_TYPE__, __UINT_FAST32_TYPE__,
__UINT_FAST64_TYPE__, __INTPTR_TYPE__, __UINTPTR_TYPE__,
__WINT_MAX__, __SIZE_MAX__, __PTRDIFF_MAX__, __UINTMAX_MAX__,
__SIG_ATOMIC_MAX__, __INT8_MAX__, __INT16_MAX__, __INT32_MAX__,
__INT64_MAX__, __UINT8_MAX__, __UINT16_MAX__, __UINT32_MAX__,
__UINT64_MAX__, __INT_LEAST8_MAX__, __INT_LEAST16_MAX__,
__INT_LEAST32_MAX__, __INT_LEAST64_MAX__, __UINT_LEAST8_MAX__,
__UINT_LEAST16_MAX__, __UINT_LEAST32_MAX__, __UINT_LEAST64_MAX__,
__INT_FAST8_MAX__, __INT_FAST16_MAX__, __INT_FAST32_MAX__,
__INT_FAST64_MAX__, __UINT_FAST8_MAX__, __UINT_FAST16_MAX__,
__UINT_FAST32_MAX__, __UINT_FAST64_MAX__, __INTPTR_MAX__,
__UINTPTR_MAX__, __WCHAR_MIN__, __WINT_MIN__, __SIG_ATOMIC_MIN__,
__INT8_C, __INT16_C, __INT32_C, __INT64_C, __UINT8_C, __UINT16_C,
__UINT32_C, __UINT64_C, __INTMAX_C, __UINTMAX_C): Document.
* doc/tm.texi (SIG_ATOMIC_TYPE, INT8_TYPE, INT16_TYPE, INT32_TYPE,
INT64_TYPE, UINT8_TYPE, UINT16_TYPE, UINT32_TYPE, UINT64_TYPE,
INT_LEAST8_TYPE, INT_LEAST16_TYPE, INT_LEAST32_TYPE,
INT_LEAST64_TYPE, UINT_LEAST8_TYPE, UINT_LEAST16_TYPE,
UINT_LEAST32_TYPE, UINT_LEAST64_TYPE, INT_FAST8_TYPE,
INT_FAST16_TYPE, INT_FAST32_TYPE, INT_FAST64_TYPE,
UINT_FAST8_TYPE, UINT_FAST16_TYPE, UINT_FAST32_TYPE,
UINT_FAST64_TYPE, INTPTR_TYPE, UINTPTR_TYPE): Document.
gcc/testsuite:
* lib/target-supports.exp (check_effective_target_stdint_types):
Update comment.
(check_effective_target_inttypes_types): New.
* gcc.dg/c99-stdint-1.c, gcc.dg/c99-stdint-2.c,
gcc.dg/c99-stdint-3.c, gcc.dg/c99-stdint-4.c,
gcc.dg/c99-stdint-5.c, gcc.dg/c99-stdint-6.c: New tests.
From-SVN: r145372
2009-03-31 22:30:31 +02:00
|
|
|
/* newlib's stdint.h has several failures to conform to C99. The fix
|
|
|
|
for these removed a comment that can be matched to identify unfixed
|
|
|
|
versions. */
|
|
|
|
fix = {
|
|
|
|
hackname = newlib_stdint_1;
|
|
|
|
files = stdint.h;
|
|
|
|
select = "@todo - Add support for wint_t types";
|
|
|
|
sed = "s@#define INT32_MIN.*@#define INT32_MIN (-INT32_MAX - 1)@";
|
|
|
|
sed = "s@#define INT32_MAX.*@#define INT32_MAX __INT32_MAX__@";
|
|
|
|
sed = "s@#define UINT32_MAX.*@#define UINT32_MAX __UINT32_MAX__@";
|
|
|
|
sed = "s@#define INT_LEAST32_MIN.*@#define INT_LEAST32_MIN (-INT_LEAST32_MAX - 1)@";
|
|
|
|
sed = "s@#define INT_LEAST32_MAX.*@#define INT_LEAST32_MAX __INT_LEAST32_MAX__@";
|
|
|
|
sed = "s@#define UINT_LEAST32_MAX.*@#define UINT_LEAST32_MAX __UINT_LEAST32_MAX__@";
|
|
|
|
sed = 's@#define INT_FAST\([0-9]*\)_MIN.*@#define INT_FAST\1_MIN (-INT_FAST\1_MAX - 1)@';
|
|
|
|
sed = 's@#define INT_FAST\([0-9]*\)_MAX.*@#define INT_FAST\1_MAX __INT_FAST\1_MAX__@';
|
|
|
|
sed = 's@#define UINT_FAST\([0-9]*\)_MAX.*@#define UINT_FAST\1_MAX __UINT_FAST\1_MAX__@';
|
|
|
|
sed = "s@#define SIZE_MAX.*@#define SIZE_MAX __SIZE_MAX__@";
|
|
|
|
sed = "s@#define PTRDIFF_MIN.*@#define PTRDIFF_MIN (-PTRDIFF_MAX - 1)@";
|
|
|
|
sed = "s@#define PTRDIFF_MAX.*@#define PTRDIFF_MAX __PTRDIFF_MAX__@";
|
|
|
|
sed = "s@#define UINT8_C.*@#define UINT8_C(c) __UINT8_C(c)@";
|
|
|
|
sed = "s@#define UINT16_C.*@#define UINT16_C(c) __UINT16_C(c)@";
|
|
|
|
test_text = "/* @todo - Add support for wint_t types. */\n"
|
|
|
|
"#define INT32_MIN (-2147483647-1)\n"
|
|
|
|
"#define INT32_MAX 2147483647\n"
|
|
|
|
"#define UINT32_MAX 4294967295U\n"
|
|
|
|
"#define INT_LEAST32_MIN (-2147483647-1)\n"
|
|
|
|
"#define INT_LEAST32_MAX 2147483647\n"
|
|
|
|
"#define UINT_LEAST32_MAX 4294967295U\n"
|
|
|
|
"#define INT_FAST8_MIN INT8_MIN\n"
|
|
|
|
"#define INT_FAST8_MAX INT8_MAX\n"
|
|
|
|
"#define UINT_FAST8_MAX UINT8_MAX\n"
|
|
|
|
"#define SIZE_MAX (__STDINT_EXP(LONG_MAX) * 2UL + 1)\n"
|
|
|
|
"#define PTRDIFF_MIN (-__STDINT_EXP(LONG_MAX) - 1L)\n"
|
|
|
|
"#define PTRDIFF_MAX __STDINT_EXP(LONG_MAX)\n"
|
|
|
|
"#define UINT8_C(x) x##U\n"
|
|
|
|
"#define UINT16_C(x) x##U";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
fix = {
|
|
|
|
hackname = newlib_stdint_2;
|
|
|
|
files = stdint.h;
|
|
|
|
select = "@todo - Add support for wint_t types";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#define INTMAX_MAX __INTMAX_MAX__\n"
|
|
|
|
"#define INTMAX_MIN (-INTMAX_MAX - 1)\n"
|
|
|
|
"#define UINTMAX_MAX __UINTMAX_MAX__\n"
|
|
|
|
"#define WCHAR_MAX __WCHAR_MAX__\n"
|
|
|
|
"#define WCHAR_MIN __WCHAR_MIN__\n"
|
|
|
|
"#define WINT_MAX __WINT_MAX__\n"
|
|
|
|
"#define WINT_MIN __WINT_MIN__\n\n"
|
|
|
|
"%0";
|
|
|
|
c_fix_arg = '/\*\* Macros for minimum-width integer constant expressions \*/';
|
|
|
|
test_text = "/* @todo - Add support for wint_t types. */\n"
|
|
|
|
"/** Macros for minimum-width integer constant expressions */";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
1998-10-16 09:00:18 +02:00
|
|
|
/*
|
|
|
|
* NeXT 3.2 adds const prefix to some math functions.
|
|
|
|
* These conflict with the built-in functions.
|
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-20 21:47:41 +02:00
|
|
|
hackname = next_math_prefix;
|
|
|
|
files = ansi/math.h;
|
|
|
|
select = "^extern[ \t]+double[ \t]+__const__[ \t]";
|
|
|
|
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "extern double %1(";
|
|
|
|
c_fix_arg = "^extern[ \t]+double[ \t]+__const__[ \t]+([a-z]+)\\(";
|
1998-10-16 09:00:18 +02:00
|
|
|
|
2000-05-20 21:47:41 +02:00
|
|
|
test_text = "extern\tdouble\t__const__\tmumble();";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* NeXT 3.2 uses the word "template" as a parameter for some
|
|
|
|
* functions. GCC reports an invalid use of a reserved key word
|
2000-05-20 21:47:41 +02:00
|
|
|
* with the built-in functions.
|
1998-10-16 09:00:18 +02:00
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = next_template;
|
|
|
|
files = bsd/libc.h;
|
2000-05-20 21:47:41 +02:00
|
|
|
select = "[ \t]template\\)";
|
1998-10-16 09:00:18 +02:00
|
|
|
|
2000-05-20 21:47:41 +02:00
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "(%1)";
|
|
|
|
c_fix_arg = "\\(([^)]*)[ \t]template\\)";
|
|
|
|
test_text = "extern mumble( char * template); /* fix */";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* NeXT 3.2 includes the keyword volatile in the abort() and exit()
|
|
|
|
* function prototypes. That conflicts with the built-in functions.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = next_volitile;
|
|
|
|
files = ansi/stdlib.h;
|
2000-05-20 21:47:41 +02:00
|
|
|
select = "^extern[ \t]+volatile[ \t]+void[ \t]";
|
|
|
|
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "extern void %1(";
|
|
|
|
c_fix_arg = "^extern[ \t]+volatile[ \t]+void[ \t]+(exit|abort)\\(";
|
1998-10-16 09:00:18 +02:00
|
|
|
|
2000-05-20 21:47:41 +02:00
|
|
|
test_text = "extern\tvolatile\tvoid\tabort();";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* NeXT 2.0 defines 'int wait(union wait*)', which conflicts with Posix.1.
|
|
|
|
* Note that version 3 of the NeXT system has wait.h in a different directory,
|
|
|
|
* so that this code won't do anything. But wait.h in version 3 has a
|
|
|
|
* conditional, so it doesn't need this fix. So everything is okay.
|
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-20 23:32:42 +02:00
|
|
|
hackname = next_wait_union;
|
|
|
|
files = sys/wait.h;
|
1998-10-16 09:00:18 +02:00
|
|
|
|
2000-05-20 23:32:42 +02:00
|
|
|
select = 'wait\(union wait';
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "wait(void";
|
|
|
|
test_text = "extern pid_d wait(union wait*);";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* a missing semi-colon at the end of the nodeent structure definition.
|
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-20 23:32:42 +02:00
|
|
|
hackname = nodeent_syntax;
|
|
|
|
files = netdnet/dnetdb.h;
|
|
|
|
select = "char[ \t]*\\*na_addr[ \t]*$";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "%0;";
|
|
|
|
test_text = "char *na_addr\t";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
2009-01-01 00:00:17 +01:00
|
|
|
/*
|
|
|
|
* Fix OpenBSD's NULL definition.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = openbsd_null_definition;
|
|
|
|
mach = "*-*-openbsd*";
|
|
|
|
files = locale.h, stddef.h, stdio.h, string.h,
|
|
|
|
time.h, unistd.h, wchar.h, sys/param.h;
|
|
|
|
select = "__GNUG__";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#ifndef NULL\n"
|
|
|
|
"#ifdef __cplusplus\n"
|
|
|
|
"#ifdef __GNUG__\n"
|
|
|
|
"#define NULL\t__null\n"
|
|
|
|
"#else\t /* ! __GNUG__ */\n"
|
|
|
|
"#define NULL\t0L\n"
|
|
|
|
"#endif\t /* __GNUG__ */\n"
|
|
|
|
"#else\t /* ! __cplusplus */\n"
|
|
|
|
"#define NULL\t((void *)0)\n"
|
|
|
|
"#endif\t /* __cplusplus */\n"
|
|
|
|
"#endif\t /* !NULL */";
|
|
|
|
|
|
|
|
c_fix_arg = "^#ifndef[ \t]*NULL\n"
|
|
|
|
"^#ifdef[ \t]*__GNUG__\n"
|
|
|
|
"^#define[ \t]*NULL[ \t]*__null\n"
|
|
|
|
"^#else\n"
|
|
|
|
"^#define[ \t]*NULL[ \t]*0L\n"
|
|
|
|
"^#endif\n"
|
|
|
|
"^#endif";
|
|
|
|
test_text =
|
|
|
|
"#ifndef NULL\n"
|
|
|
|
"#ifdef __GNUG__\n"
|
|
|
|
"#define NULL __null\n"
|
|
|
|
"#else\n"
|
|
|
|
"#define NULL 0L\n"
|
|
|
|
"#endif\n"
|
|
|
|
"#endif\n";
|
|
|
|
};
|
1998-10-16 09:00:18 +02:00
|
|
|
|
2003-10-23 00:28:39 +02:00
|
|
|
/*
|
|
|
|
* 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)";
|
|
|
|
};
|
|
|
|
|
2008-12-31 14:52:53 +01:00
|
|
|
/*
|
|
|
|
* Fix OpenBSD's va_start define.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = openbsd_va_start;
|
|
|
|
mach = "*-*-openbsd*";
|
|
|
|
files = stdarg.h;
|
|
|
|
select = '__builtin_stdarg_start';
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = __builtin_va_start;
|
|
|
|
|
|
|
|
test_text = "#define va_start(v,l) __builtin_stdarg_start((v),l)";
|
|
|
|
};
|
2003-10-23 00:28:39 +02:00
|
|
|
|
1998-10-16 09:00:18 +02:00
|
|
|
/*
|
|
|
|
* 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
|
|
|
|
* failures. Fixing this correctly requires checking and modifying 3 files.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = osf_namespace_a;
|
|
|
|
files = reg_types.h;
|
|
|
|
files = sys/lc_core.h;
|
1999-03-31 14:02:19 +02:00
|
|
|
test = " -r reg_types.h";
|
|
|
|
test = " -r sys/lc_core.h";
|
|
|
|
test = " -n \"`grep '} regex_t;' reg_types.h`\"";
|
|
|
|
test = " -z \"`grep __regex_t regex.h`\"";
|
1998-10-16 09:00:18 +02:00
|
|
|
|
2000-05-20 23:32:42 +02:00
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "__%0";
|
2000-06-02 13:45:57 +02:00
|
|
|
c_fix_arg = "reg(ex|off|match)_t";
|
2000-05-20 23:32:42 +02:00
|
|
|
|
2000-05-31 16:26:57 +02:00
|
|
|
test_text = "`touch sys/lc_core.h`"
|
2000-05-20 23:32:42 +02:00
|
|
|
"typedef struct {\n int stuff, mo_suff;\n} regex_t;\n"
|
|
|
|
"extern regex_t re;\n"
|
|
|
|
"extern regoff_t ro;\n"
|
|
|
|
"extern regmatch_t rm;\n";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
fix = {
|
2000-05-20 23:32:42 +02:00
|
|
|
hackname = osf_namespace_c;
|
1998-10-16 09:00:18 +02:00
|
|
|
files = regex.h;
|
1999-03-31 14:02:19 +02:00
|
|
|
test = " -r reg_types.h";
|
|
|
|
test = " -r sys/lc_core.h";
|
|
|
|
test = " -n \"`grep '} regex_t;' reg_types.h`\"";
|
|
|
|
test = " -z \"`grep __regex_t regex.h`\"";
|
|
|
|
|
2000-05-20 23:32:42 +02:00
|
|
|
select = "#include <reg_types\.h>.*";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "%0\n"
|
|
|
|
"typedef __regex_t\tregex_t;\n"
|
|
|
|
"typedef __regoff_t\tregoff_t;\n"
|
|
|
|
"typedef __regmatch_t\tregmatch_t;";
|
|
|
|
|
|
|
|
test_text = "#include <reg_types.h>";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2005-03-21 17:46:09 +01:00
|
|
|
/*
|
|
|
|
* On broken glibc-2.3.3 systems an array of incomplete structures is
|
|
|
|
* passed to __sigsetjmp. Fix that to take a pointer instead.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = pthread_incomplete_struct_argument;
|
|
|
|
files = pthread.h;
|
|
|
|
select = "struct __jmp_buf_tag";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "%1 *%2%3";
|
|
|
|
c_fix_arg = "^(extern int __sigsetjmp \\(struct __jmp_buf_tag) (__env)\\[1\\](.*)$";
|
|
|
|
test_text = "extern int __sigsetjmp (struct __jmp_buf_tag __env[1], int __savemask);";
|
|
|
|
};
|
1998-10-16 09:00:18 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Fix return type of fread and fwrite on sysV68
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = read_ret_type;
|
|
|
|
files = stdio.h;
|
1999-06-23 14:29:01 +02:00
|
|
|
select = "extern int\t.*, fread\\(\\), fwrite\\(\\)";
|
2000-05-20 23:32:42 +02:00
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "extern unsigned int fread(), fwrite();\n%1%2";
|
|
|
|
c_fix_arg = "(extern int\t.*), fread\\(\\), fwrite\\(\\)(.*)";
|
|
|
|
|
|
|
|
test_text = "extern int\tfclose(), fflush(), fread(), fwrite(), foo();";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2004-04-08 00:25:33 +02:00
|
|
|
/*
|
|
|
|
* Fix casts as lvalues in glibc's <rpc/xdr.h>.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = rpc_xdr_lvalue_cast_a;
|
|
|
|
files = rpc/xdr.h;
|
|
|
|
select = "#define[ \t]*IXDR_GET_LONG.*\\\\\n.*__extension__.*";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#define IXDR_GET_LONG(buf) ((long)IXDR_GET_U_INT32(buf))";
|
|
|
|
test_text = "#define IXDR_GET_LONG(buf) \\\\\n"
|
|
|
|
"\t((long)ntohl((u_long)*__extension__((u_int32_t*)(buf))++))";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
fix = {
|
|
|
|
hackname = rpc_xdr_lvalue_cast_b;
|
|
|
|
files = rpc/xdr.h;
|
|
|
|
select = "#define[ \t]*IXDR_PUT_LONG.*\\\\\n.*__extension__.*";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#define IXDR_PUT_LONG(buf, v) ((long)IXDR_PUT_INT32(buf, (long)(v)))";
|
|
|
|
test_text = "#define IXDR_PUT_LONG(buf, v) \\\\\n"
|
|
|
|
"\t(*__extension__((u_int32_t*)(buf))++ = (long)htonl((u_long)(v)))";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
1998-10-16 09:00:18 +02:00
|
|
|
/*
|
2001-05-27 20:21:04 +02:00
|
|
|
* function class(double x) conflicts with C++ keyword on rs/6000
|
1998-10-16 09:00:18 +02:00
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-20 23:32:42 +02:00
|
|
|
hackname = rs6000_double;
|
|
|
|
files = math.h;
|
|
|
|
select = '[^a-zA-Z_]class\(';
|
|
|
|
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#ifndef __cplusplus\n%0\n#endif";
|
|
|
|
c_fix_arg = '^.*[^a-zA-Z_]class\(.*';
|
|
|
|
|
|
|
|
test_text = "extern int class();";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Wrong fchmod prototype on RS/6000.
|
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-20 23:32:42 +02:00
|
|
|
hackname = rs6000_fchmod;
|
|
|
|
files = sys/stat.h;
|
|
|
|
select = 'fchmod\(char \*';
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "fchmod(int";
|
|
|
|
test_text = "extern int fchmod(char *, mode_t);";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2001-05-27 20:21:04 +02:00
|
|
|
* parameters conflict with C++ new on rs/6000
|
1998-10-16 09:00:18 +02:00
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-20 23:32:42 +02:00
|
|
|
hackname = rs6000_param;
|
|
|
|
files = "stdio.h";
|
|
|
|
files = "unistd.h";
|
1998-10-16 09:00:18 +02:00
|
|
|
|
2000-05-20 23:32:42 +02:00
|
|
|
select = 'rename\(const char \*old, const char \*new\)';
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = 'rename(const char *_old, const char *_new)';
|
|
|
|
|
|
|
|
test_text = 'extern int rename(const char *old, const char *new);';
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
2003-05-07 03:29:58 +02:00
|
|
|
|
2003-04-19 23:10:08 +02:00
|
|
|
/*
|
|
|
|
* 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;
|
2007-01-06 19:03:50 +01:00
|
|
|
files = math.h, '*/math.h';
|
2003-04-19 23:10:08 +02:00
|
|
|
select = "inline double abs";
|
2004-11-12 23:26:01 +01:00
|
|
|
bypass = "__GNUG__";
|
2003-04-19 23:10:08 +02:00
|
|
|
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";
|
|
|
|
|
|
|
|
};
|
|
|
|
|
2003-05-07 03:29:58 +02:00
|
|
|
|
2005-05-19 09:05:45 +02:00
|
|
|
/*
|
|
|
|
* Sun Solaris 10 defines several C99 math macros in terms of
|
|
|
|
* builtins specific to the Studio compiler, in particular not
|
|
|
|
* compatible with the GNU compiler.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = solaris_math_1;
|
|
|
|
select = '@\(#\)math_c99.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
|
|
|
|
bypass = "__GNUC__";
|
|
|
|
files = iso/math_c99.h;
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#define\tHUGE_VA%1\t(__builtin_huge_va%2())";
|
|
|
|
c_fix_arg = "^#define[ \t]+HUGE_VA([LF]+)[ \t]+__builtin_huge_va([lf]+)";
|
|
|
|
test_text =
|
|
|
|
'#ident "@(#)math_c99.h 1.9 04/11/01 SMI"'"\n"
|
|
|
|
"#undef HUGE_VAL\n"
|
|
|
|
"#define HUGE_VAL __builtin_huge_val\n"
|
|
|
|
"#undef HUGE_VALF\n"
|
|
|
|
"#define HUGE_VALF __builtin_huge_valf\n"
|
|
|
|
"#undef HUGE_VALL\n"
|
|
|
|
"#define HUGE_VALL __builtin_huge_vall";
|
|
|
|
};
|
|
|
|
|
|
|
|
fix = {
|
|
|
|
hackname = solaris_math_2;
|
|
|
|
select = '@\(#\)math_c99.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
|
|
|
|
bypass = "__GNUC__";
|
|
|
|
files = iso/math_c99.h;
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#define\tINFINITY\t(__builtin_inff())";
|
|
|
|
c_fix_arg = "^#define[ \t]+INFINITY[ \t]+__builtin_infinity";
|
|
|
|
test_text =
|
|
|
|
'#ident "@(#)math_c99.h 1.9 04/11/01 SMI"'"\n"
|
|
|
|
"#undef INFINITY\n"
|
|
|
|
"#define INFINITY __builtin_infinity";
|
|
|
|
};
|
|
|
|
|
|
|
|
fix = {
|
|
|
|
hackname = solaris_math_3;
|
|
|
|
select = '@\(#\)math_c99.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
|
|
|
|
bypass = "__GNUC__";
|
|
|
|
files = iso/math_c99.h;
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#define\tNAN\t\t(__builtin_nanf(\"\"))";
|
|
|
|
c_fix_arg = "^#define[ \t]+NAN[ \t]+__builtin_nan";
|
|
|
|
test_text =
|
|
|
|
'#ident "@(#)math_c99.h 1.9 04/11/01 SMI"'"\n"
|
|
|
|
"#undef NAN\n"
|
|
|
|
"#define NAN __builtin_nan";
|
|
|
|
};
|
|
|
|
|
|
|
|
fix = {
|
|
|
|
hackname = solaris_math_4;
|
|
|
|
select = '@\(#\)math_c99.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
|
|
|
|
bypass = "__GNUC__";
|
|
|
|
files = iso/math_c99.h;
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#define\tfpclassify(x) \\\n"
|
2008-05-24 22:52:00 +02:00
|
|
|
" __builtin_fpclassify(FP_NAN, FP_INFINITE, FP_NORMAL, FP_SUBNORMAL, FP_ZERO, (x))";
|
2005-05-19 09:05:45 +02:00
|
|
|
c_fix_arg = "^#define[ \t]+fpclassify\\(x\\)[ \t]+__builtin_fpclassify\\(x\\)";
|
|
|
|
test_text =
|
|
|
|
'#ident "@(#)math_c99.h 1.9 04/11/01 SMI"'"\n"
|
|
|
|
"#undef fpclassify\n"
|
|
|
|
"#define fpclassify(x) __builtin_fpclassify(x)";
|
|
|
|
};
|
|
|
|
|
|
|
|
fix = {
|
|
|
|
hackname = solaris_math_8;
|
|
|
|
select = '@\(#\)math_c99.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
|
|
|
|
bypass = "__GNUC__";
|
|
|
|
files = iso/math_c99.h;
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#define\tsignbit(x)\t(sizeof(x) == sizeof(float) \\\n"
|
|
|
|
"\t\t\t ? __builtin_signbitf(x) \\\n"
|
|
|
|
"\t\t\t : sizeof(x) == sizeof(long double) \\\n"
|
|
|
|
"\t\t\t ? __builtin_signbitl(x) \\\n"
|
|
|
|
"\t\t\t : __builtin_signbit(x))";
|
|
|
|
c_fix_arg = "^#define[ \t]+signbit\\(x\\)[ \t]+__builtin_signbit\\(x\\)";
|
|
|
|
test_text =
|
|
|
|
'#ident "@(#)math_c99.h 1.9 04/11/01 SMI"'"\n"
|
|
|
|
"#undef signbit\n"
|
|
|
|
"#define signbit(x) __builtin_signbit(x)";
|
|
|
|
};
|
|
|
|
|
|
|
|
fix = {
|
|
|
|
hackname = solaris_math_9;
|
|
|
|
select = '@\(#\)math_c99.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
|
|
|
|
bypass = "__GNUC__";
|
|
|
|
files = iso/math_c99.h;
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#define\t%1(x, y)%2__builtin_%1(x, y)";
|
|
|
|
c_fix_arg = "^#define[ \t]+([a-z]+)\\(x, y\\)([ \t]+)\\(\\(x\\) __builtin_[a-z]+\\(y\\)\\)";
|
|
|
|
test_text =
|
|
|
|
'#ident "@(#)math_c99.h 1.9 04/11/01 SMI"'"\n"
|
|
|
|
"#undef isgreater\n"
|
|
|
|
"#define isgreater(x, y) ((x) __builtin_isgreater(y))\n"
|
|
|
|
"#undef isgreaterequal\n"
|
|
|
|
"#define isgreaterequal(x, y) ((x) __builtin_isgreaterequal(y))\n"
|
|
|
|
"#undef isless\n"
|
|
|
|
"#define isless(x, y) ((x) __builtin_isless(y))\n"
|
|
|
|
"#undef islessequal\n"
|
|
|
|
"#define islessequal(x, y) ((x) __builtin_islessequal(y))\n"
|
|
|
|
"#undef islessgreater\n"
|
|
|
|
"#define islessgreater(x, y) ((x) __builtin_islessgreater(y))\n"
|
|
|
|
"#undef isunordered\n"
|
|
|
|
"#define isunordered(x, y) ((x) __builtin_isunordered(y))";
|
|
|
|
};
|
2000-05-01 01:30:15 +02:00
|
|
|
|
2008-02-20 05:20:59 +01:00
|
|
|
/*
|
|
|
|
* On Solaris 11, if you do isinf(NaN) you'll get a floating point
|
|
|
|
* exception. Provide an alternative using GCC's builtin.
|
|
|
|
*/
|
|
|
|
|
|
|
|
fix = {
|
|
|
|
hackname = solaris_math_10;
|
|
|
|
select = '@\(#\)math_c99.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
|
|
|
|
files = iso/math_c99.h;
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#define\tisinf(x) __builtin_isinf(x)";
|
|
|
|
c_fix_arg = "^#define[ \t]+isinf\\(x\\)[ \t]+__extension__\\([ \t]*\\\\\n"
|
|
|
|
"[ \t]*\\{[ \t]*__typeof\\(x\\)[ \t]*__x_i[ \t]*=[ \t]*\\(x\\);[ \t]*\\\\\n"
|
|
|
|
"[ \t]*__x_i[ \t]*==[ \t]*\\(__typeof\\(__x_i\\)\\)[ \t]*INFINITY[ \t]*\\|\\|[ \t]*\\\\\n"
|
|
|
|
"[ \t]*__x_i[ \t]*==[ \t]*\\(__typeof\\(__x_i\\)\\)[ \t]*\\(-INFINITY\\);[ \t]*\\}\\)";
|
|
|
|
test_text =
|
|
|
|
'#pragma ident "@(#)math_c99.h 1.12 07/01/21 SMI"'"\n"
|
|
|
|
"#undef isinf\n"
|
|
|
|
"#define isinf(x) __extension__( \\\\\n"
|
|
|
|
" { __typeof(x) __x_i = (x); \\\\\n"
|
|
|
|
" __x_i == (__typeof(__x_i)) INFINITY || \\\\\n"
|
|
|
|
" __x_i == (__typeof(__x_i)) (-INFINITY); })";
|
|
|
|
};
|
|
|
|
|
2001-05-17 03:27:32 +02:00
|
|
|
/*
|
2001-06-28 05:13:49 +02:00
|
|
|
* Sun Solaris defines PTHREAD_MUTEX_INITIALIZER with a trailing
|
2001-05-17 03:27:32 +02:00
|
|
|
* "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 = {
|
2003-03-22 22:51:04 +01:00
|
|
|
hackname = solaris_mutex_init_2;
|
2001-07-21 06:04:27 +02:00
|
|
|
select = '@\(#\)pthread.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
|
|
|
|
files = pthread.h;
|
2006-09-29 21:14:58 +02:00
|
|
|
/*
|
|
|
|
* On Solaris 10, this fix is unnecessary because upad64_t is
|
|
|
|
* always defined correctly regardless of the definition of the
|
|
|
|
* __STDC__ macro. The first "mach" pattern matches up to
|
|
|
|
* solaris9. The second "mach" pattern will not match any two (or
|
|
|
|
* more) digit solaris version, but it will match e.g. 2.5.1.
|
|
|
|
*/
|
|
|
|
mach = '*-*-solaris2.[0-9]', '*-*-solaris2.[0-9][!0-9]*';
|
2001-07-21 06:04:27 +02:00
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n"
|
|
|
|
"%0\n"
|
|
|
|
"#else\n"
|
2006-09-29 21:14:58 +02:00
|
|
|
"%1, {0}}%4\n"
|
2001-07-21 06:04:27 +02:00
|
|
|
"#endif";
|
2006-09-29 21:14:58 +02:00
|
|
|
c_fix_arg = "(^#define[ \t]+PTHREAD_(MUTEX|COND)_INITIALIZER[ \t]+"
|
|
|
|
"(|/\*.*\*/[ \t]*\\\\\n[ \t]*)\\{.*)"
|
2003-07-17 20:43:37 +02:00
|
|
|
",[ \t]*0\\}" "(|[ \t].*)$";
|
2001-07-21 06:04:27 +02:00
|
|
|
test_text =
|
|
|
|
'#ident "@(#)pthread.h 1.26 98/04/12 SMI"'"\n"
|
|
|
|
"#define PTHREAD_MUTEX_INITIALIZER\t{{{0},0}, {{{0}}}, 0}\n"
|
2006-09-29 21:14:58 +02:00
|
|
|
"#define PTHREAD_COND_INITIALIZER\t{{{0}, 0}, 0}\t/* DEFAULTCV */\n"
|
|
|
|
"#define PTHREAD_MUTEX_INITIALIZER /* = DEFAULTMUTEX */ \\\\\n"
|
|
|
|
" {{0, 0, 0, DEFAULT_TYPE, _MUTEX_MAGIC}, {{{0}}}, 0}\n"
|
|
|
|
"#define PTHREAD_COND_INITIALIZER /* = DEFAULTCV */ \\\\\n"
|
|
|
|
" {{{0, 0, 0, 0}, DEFAULT_TYPE, _COND_MAGIC}, 0}";
|
2006-09-27 06:25:34 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Sun Solaris defines PTHREAD_RWLOCK_INITIALIZER with a "0" for some
|
|
|
|
* fields of the pthread_rwlock_t structure, which are 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 = solaris_rwlock_init_1;
|
|
|
|
select = '@\(#\)pthread.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
|
|
|
|
files = pthread.h;
|
|
|
|
mach = '*-*-solaris*';
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n"
|
|
|
|
"%0\n"
|
|
|
|
"#else\n"
|
|
|
|
"%1{0, 0, 0, {{0}, {0}, {0}}, {{0}, {0}}, {{0}, {0}}}\n"
|
|
|
|
"#endif";
|
|
|
|
c_fix_arg = "(^#define[ \t]+PTHREAD_RWLOCK_INITIALIZER[ \t]+)"
|
|
|
|
"\\{0, 0, 0, \\{0, 0, 0\\}, \\{0, 0\\}, \\{0, 0\\}\\}[ \t]*$";
|
|
|
|
|
|
|
|
test_text =
|
|
|
|
'#ident "@(#)pthread.h 1.26 98/04/12 SMI"'"\n"
|
|
|
|
"#define PTHREAD_RWLOCK_INITIALIZER\t{0, 0, 0, {0, 0, 0}, {0, 0}, {0, 0}}";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Sun Solaris defines PTHREAD_ONCE_INIT as an array containing a
|
|
|
|
* structure. As such, it need two levels of brackets, but only
|
|
|
|
* contains one. Wrap the macro definition in an extra layer.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = solaris_once_init_1;
|
|
|
|
select = '@\(#\)pthread.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
|
|
|
|
files = pthread.h;
|
|
|
|
mach = '*-*-solaris*';
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "%1{%2}%3";
|
|
|
|
c_fix_arg = "(^#define[ \t]+PTHREAD_ONCE_INIT[ \t]+\\{)([^}]+)(\\})[ \t]*$";
|
|
|
|
test_text =
|
|
|
|
'#pragma ident "@(#)pthread.h 1.37 04/09/28 SMI"'"\n"
|
|
|
|
"#define PTHREAD_ONCE_INIT\t{0, 0, 0, PTHREAD_ONCE_NOTDONE}";
|
2001-05-17 03:27:32 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2006-09-28 02:45:56 +02:00
|
|
|
/*
|
|
|
|
* Sun Solaris defines PTHREAD_ONCE_INIT with a "0" for some
|
|
|
|
* fields of the pthread_once_t structure, which are 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. This test relies on solaris_once_init_1.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = solaris_once_init_2;
|
|
|
|
select = '@\(#\)pthread.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
|
|
|
|
files = pthread.h;
|
|
|
|
/*
|
|
|
|
* On Solaris 10, this fix is unnecessary because upad64_t is
|
|
|
|
* always defined correctly regardless of the definition of the
|
2006-09-29 21:14:58 +02:00
|
|
|
* __STDC__ macro. The first "mach" pattern matches up to
|
2006-09-28 02:45:56 +02:00
|
|
|
* solaris9. The second "mach" pattern will not match any two (or
|
|
|
|
* more) digit solaris version, but it will match e.g. 2.5.1.
|
|
|
|
*/
|
|
|
|
mach = '*-*-solaris2.[0-9]', '*-*-solaris2.[0-9][!0-9]*';
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n"
|
|
|
|
"%0\n"
|
|
|
|
"#else\n"
|
|
|
|
"%1{0}, {0}, {0}, {%3}%4\n"
|
|
|
|
"#endif";
|
|
|
|
c_fix_arg = "(^#define[ \t]+PTHREAD_ONCE_INIT[ \t]+\\{\\{)"
|
|
|
|
"(0, 0, 0, )(PTHREAD_[A-Z_]+)(\\}\\})[ \t]*$";
|
|
|
|
test_text =
|
|
|
|
'#ident "@(#)pthread.h 1.26 98/04/12 SMI"'"\n"
|
|
|
|
"#define PTHREAD_ONCE_INIT\t{{0, 0, 0, PTHREAD_ONCE_NOTDONE}}\n";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2002-03-22 03:24:52 +01:00
|
|
|
/*
|
|
|
|
* 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';
|
2004-11-26 23:00:51 +01:00
|
|
|
/* In Solaris 10, the code in stdio_tag.h is conditionalized on
|
|
|
|
"!defined(__GNUC__)" so we no longer need to fix it. */
|
|
|
|
bypass = '__GNUC__';
|
2002-03-22 03:24:52 +01:00
|
|
|
sed = 's/defined(__cplusplus) && (__cplusplus < 54321L)/0/';
|
|
|
|
|
2002-05-02 07:18:08 +02:00
|
|
|
test_text = "#if\tdefined(__cplusplus) && (__cplusplus < 54321L)";
|
2002-03-22 03:24:52 +01:00
|
|
|
};
|
|
|
|
|
2003-05-28 13:53:34 +02:00
|
|
|
|
1998-10-16 09:00:18 +02:00
|
|
|
/*
|
|
|
|
* a missing semi-colon at the end of the statsswtch structure definition.
|
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-20 23:32:42 +02:00
|
|
|
hackname = statsswtch;
|
|
|
|
files = rpcsvc/rstat.h;
|
|
|
|
select = "boottime$";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "boottime;";
|
|
|
|
test_text = "struct statswtch {\n int boottime\n};";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2000-01-25 09:06:23 +01:00
|
|
|
/*
|
|
|
|
* Arrange for stdio.h to use stdarg.h to define __gnuc_va_list.
|
|
|
|
* On 4BSD-derived systems, stdio.h defers to machine/ansi.h; that's
|
|
|
|
* OK too.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = stdio_stdarg_h;
|
|
|
|
files = stdio.h;
|
|
|
|
bypass = "include.*(stdarg\.h|machine/ansi\.h)";
|
2004-11-26 23:00:51 +01:00
|
|
|
/*
|
|
|
|
* On Solaris 10, this fix is unncessary; <stdio.h> includes
|
|
|
|
* <iso/stdio_iso.h>, which includes <sys/va_list.h>.
|
|
|
|
*/
|
2005-05-10 02:26:08 +02:00
|
|
|
mach = '*-*-solaris2.1[0-9]*';
|
2004-11-26 23:00:51 +01:00
|
|
|
not_machine = true;
|
2000-01-25 09:06:23 +01:00
|
|
|
|
2000-05-14 21:29:02 +02:00
|
|
|
c_fix = wrap;
|
2000-01-25 09:06:23 +01:00
|
|
|
|
2000-05-14 21:29:02 +02:00
|
|
|
c_fix_arg = "#define __need___va_list\n#include <stdarg.h>\n";
|
|
|
|
|
|
|
|
test_text = "";
|
2000-01-25 09:06:23 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
1998-10-16 09:00:18 +02:00
|
|
|
/*
|
2004-10-29 04:42:54 +02:00
|
|
|
* Don't use or define the name va_list in stdio.h. This is for
|
|
|
|
* ANSI. 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.
|
1998-10-16 09:00:18 +02:00
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = stdio_va_list;
|
|
|
|
files = stdio.h;
|
2003-07-02 03:30:10 +02:00
|
|
|
files = internal/stdio_core.h;
|
|
|
|
files = internal/wchar_core.h;
|
2004-11-01 20:01:15 +01:00
|
|
|
bypass = '__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list';
|
2004-11-26 23:00:51 +01:00
|
|
|
/*
|
|
|
|
* On Solaris 10, the definition in
|
|
|
|
* <stdio.h> is guarded appropriately by the _XPG4 feature macro;
|
|
|
|
* there is therefore no need for this fix there.
|
|
|
|
*/
|
2005-05-10 02:26:08 +02:00
|
|
|
mach = '*-*-solaris2.1[0-9]*';
|
2004-11-26 23:00:51 +01:00
|
|
|
not_machine = true;
|
2004-11-01 20:01:15 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Use __gnuc_va_list in arg types in place of va_list.
|
|
|
|
* 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.
|
|
|
|
* Don't claim to have defined va_list.
|
|
|
|
*/
|
|
|
|
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@*__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@";
|
|
|
|
test_text = "extern void mumble( va_list);";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Fix headers that use va_list from stdio.h to use the updated
|
|
|
|
* va_list from the stdio_va_list change. 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.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = stdio_va_list_clients;
|
2004-08-14 23:52:08 +02:00
|
|
|
files = com_err.h;
|
|
|
|
files = cps.h;
|
|
|
|
files = curses.h;
|
|
|
|
files = krb5.h;
|
|
|
|
files = lc_core.h;
|
|
|
|
files = pfmt.h;
|
|
|
|
files = wchar.h;
|
|
|
|
files = curses_colr/curses.h;
|
2003-05-22 19:03:57 +02:00
|
|
|
bypass = '__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list';
|
2004-11-01 20:01:15 +01:00
|
|
|
/* Don't fix, if we use va_list from stdarg.h, or if the use is
|
|
|
|
otherwise protected. */
|
|
|
|
bypass = 'include <stdarg\.h>|#ifdef va_start';
|
1998-10-16 09:00:18 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Use __gnuc_va_list in arg types in place of va_list.
|
2001-12-06 22:52:42 +01:00
|
|
|
* 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
|
1998-10-16 09:00:18 +02:00
|
|
|
* trailing parentheses and semicolon save all other systems from this.
|
2000-01-25 09:06:23 +01:00
|
|
|
* Define __not_va_list__ (something harmless and unused)
|
|
|
|
* instead of va_list.
|
1998-10-16 09:00:18 +02:00
|
|
|
* Don't claim to have defined va_list.
|
|
|
|
*/
|
2003-11-03 22:07:34 +01:00
|
|
|
sed = "s@[ \t]va_list\\([ \t)]\\)@ __gnuc_va_list\\1@\n"
|
2003-07-02 03:30:10 +02:00
|
|
|
"s@(va_list)&@(__gnuc_va_list)\\&@\n"
|
2000-01-25 09:06:23 +01:00
|
|
|
"s@ _VA_LIST_));@ __gnuc_va_list));@\n"
|
2001-12-06 22:52:42 +01:00
|
|
|
"s@ __VA_LIST__));@ __gnuc_va_list));@\n"
|
2000-01-25 09:06:23 +01:00
|
|
|
"s@ va_list@ __not_va_list__@\n"
|
|
|
|
"s@\\*va_list@*__not_va_list__@\n"
|
|
|
|
"s@ __va_list)@ __gnuc_va_list)@\n"
|
2000-02-21 00:15:32 +01:00
|
|
|
"s@typedef[ \t]\\(.*\\)[ \t]va_list[ \t]*;"
|
|
|
|
"@typedef \\1 __not_va_list__;@\n"
|
2002-10-04 18:13:12 +02:00
|
|
|
"s@typedef[ \t]*__va_list__@typedef __gnuc_va_list@\n"
|
2000-01-25 09:06:23 +01:00
|
|
|
"s@GNUC_VA_LIST@GNUC_Va_LIST@\n"
|
2003-08-01 01:33:08 +02:00
|
|
|
"s@_VA_LIST_DEFINED@_Va_LIST_DEFINED@\n"
|
2000-01-25 09:06:23 +01:00
|
|
|
"s@_NEED___VA_LIST@_NEED___Va_LIST@\n"
|
|
|
|
"s@VA_LIST@DUMMY_VA_LIST@\n"
|
|
|
|
"s@_Va_LIST@_VA_LIST@";
|
2000-07-13 16:47:55 +02:00
|
|
|
test_text = "extern void mumble( va_list);";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2001-05-27 20:21:04 +02:00
|
|
|
/*
|
|
|
|
* "!__STDC__" or "__STDC__==0" or "__STDC__!=1" or "__STDC__-0==0"
|
|
|
|
* is "!defined( __STRICT_ANSI__ )"
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = strict_ansi_not;
|
|
|
|
select = "^([ \t]*#[ \t]*if.*)"
|
|
|
|
"(!__STDC__"
|
|
|
|
"|__STDC__[ \t]*==[ \t]*0"
|
|
|
|
"|__STDC__[ \t]*!=[ \t]*1"
|
2001-12-20 05:09:40 +01:00
|
|
|
"|__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*0)";
|
2002-01-28 15:17:11 +01:00
|
|
|
/* Tru64 UNIX V4.0F/V5.1 <standards.h> supports GCC usage of __STDC__. */
|
|
|
|
bypass = 'GNU and MIPS C compilers define __STDC__ differently';
|
2003-05-22 19:03:57 +02:00
|
|
|
/* 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';
|
2001-05-27 20:21:04 +02:00
|
|
|
c_test = stdc_0_in_system_headers;
|
|
|
|
|
|
|
|
c_fix = format;
|
2001-12-20 05:09:40 +01:00
|
|
|
c_fix_arg = "%1 !defined(__STRICT_ANSI__)";
|
2001-05-27 20:21:04 +02:00
|
|
|
|
|
|
|
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;
|
2001-12-20 05:09:40 +01:00
|
|
|
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)";
|
2001-05-27 20:21:04 +02:00
|
|
|
c_test = stdc_0_in_system_headers;
|
|
|
|
|
|
|
|
c_fix = format;
|
2001-12-20 05:09:40 +01:00
|
|
|
c_fix_arg = "%1 !defined(__STRICT_ANSI__)";
|
2001-05-27 20:21:04 +02:00
|
|
|
|
2001-12-20 05:09:40 +01:00
|
|
|
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";
|
2001-05-27 20:21:04 +02:00
|
|
|
};
|
|
|
|
|
2001-12-20 05:09:40 +01:00
|
|
|
|
2001-05-27 20:21:04 +02:00
|
|
|
/*
|
|
|
|
* "__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"
|
2001-12-20 05:09:40 +01:00
|
|
|
"|__STDC__[ \t]*-[ \t]*0[ \t]*!=[ \t]*0)";
|
2001-05-27 20:21:04 +02:00
|
|
|
c_test = stdc_0_in_system_headers;
|
|
|
|
|
|
|
|
c_fix = format;
|
2001-12-20 05:09:40 +01:00
|
|
|
c_fix_arg = "%1 defined(__STRICT_ANSI__)";
|
2001-05-27 20:21:04 +02:00
|
|
|
|
|
|
|
test_text = "#if __STDC__ == 1 /* is std C\n */\nint foo;\n#endif";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2000-05-16 16:01:34 +02:00
|
|
|
/*
|
|
|
|
* IRIX 4.0.5 <rpc/xdr.h> uses struct __file_s
|
|
|
|
* in prototype without previous definition.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = struct_file;
|
|
|
|
files = rpc/xdr.h;
|
|
|
|
select = '^.*xdrstdio_create.*struct __file_s';
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "struct __file_s;\n%0";
|
|
|
|
test_text = "extern void xdrstdio_create( struct __file_s* );";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* IRIX 4.0.5 <rpc/auth.h> uses struct sockaddr
|
|
|
|
* in prototype without previous definition.
|
2003-07-12 21:39:44 +02:00
|
|
|
*
|
|
|
|
* Don't fix OpenBSD, which uses struct sockaddr_in prototyping the same
|
|
|
|
* function, and does define it.
|
2000-05-16 16:01:34 +02:00
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = struct_sockaddr;
|
|
|
|
files = rpc/auth.h;
|
2003-07-12 21:39:44 +02:00
|
|
|
select = "^.*authdes_create.*struct sockaddr[^_]";
|
2000-05-16 16:01:34 +02:00
|
|
|
bypass = "<sys/socket\.h>";
|
2003-07-12 21:39:44 +02:00
|
|
|
bypass = "struct sockaddr;\n";
|
2000-05-16 16:01:34 +02:00
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "struct sockaddr;\n%0";
|
|
|
|
test_text = "extern AUTH* authdes_create( struct sockaddr* );";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2000-05-01 01:30:15 +02:00
|
|
|
/*
|
|
|
|
* Apply fix this to all OSs since this problem seems to effect
|
|
|
|
* more than just SunOS.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = sun_auth_proto;
|
|
|
|
files = rpc/auth.h;
|
|
|
|
files = rpc/clnt.h;
|
|
|
|
files = rpc/svc.h;
|
|
|
|
files = rpc/xdr.h;
|
2004-11-10 00:14:06 +01:00
|
|
|
bypass = "__cplusplus";
|
2000-05-01 01:30:15 +02:00
|
|
|
/*
|
|
|
|
* Select those files containing '(*name)()'.
|
|
|
|
*/
|
2000-05-20 23:32:42 +02:00
|
|
|
select = '\(\*[a-z][a-z_]*\)\(\)';
|
2000-05-01 01:30:15 +02:00
|
|
|
|
2000-05-20 23:32:42 +02:00
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#ifdef __cplusplus\n%1(...);%2\n"
|
|
|
|
"#else\n%1();%2\n#endif";
|
|
|
|
c_fix_arg = '(.*\(\*[a-z][a-z_]*\))\(\);(.*)';
|
2000-05-01 01:30:15 +02:00
|
|
|
|
2000-05-20 23:32:42 +02:00
|
|
|
test_text =
|
|
|
|
"struct auth_t {\n"
|
|
|
|
" int (*name)(); /* C++ bad */\n"
|
|
|
|
"};";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Fix bogus #ifdef on SunOS 4.1.
|
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-20 23:32:42 +02:00
|
|
|
hackname = sun_bogus_ifdef;
|
|
|
|
files = "hsfs/hsfs_spec.h";
|
|
|
|
files = "hsfs/iso_spec.h";
|
|
|
|
select = '#ifdef(.*\|\|.*)';
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#if%1";
|
|
|
|
|
|
|
|
test_text = "#ifdef __i386__ || __vax__ || __sun4c__";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Fix the CAT macro in SunOS memvar.h.
|
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-20 23:32:42 +02:00
|
|
|
hackname = sun_catmacro;
|
|
|
|
files = pixrect/memvar.h;
|
|
|
|
select = "^#define[ \t]+CAT\\(a,b\\).*";
|
|
|
|
c_fix = format;
|
1998-10-16 09:00:18 +02:00
|
|
|
|
2000-05-20 23:32:42 +02:00
|
|
|
c_fix_arg =
|
|
|
|
"#ifdef __STDC__\n"
|
|
|
|
"# define CAT(a,b) a##b\n"
|
|
|
|
"#else\n%0\n#endif";
|
|
|
|
|
|
|
|
test_text =
|
|
|
|
"#define CAT(a,b)\ta/**/b";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Fix return type of free and {c,m,re}alloc in <malloc.h> on SunOS 4.1.
|
|
|
|
* Also fix return type of {m,re}alloc in <malloc.h> on sysV68
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = sun_malloc;
|
|
|
|
files = malloc.h;
|
2004-11-10 00:14:06 +01:00
|
|
|
bypass = "_CLASSIC_ANSI_TYPES";
|
1998-10-16 09:00:18 +02:00
|
|
|
|
|
|
|
sed = "s/typedef[ \t]char \\*\tmalloc_t/typedef void \\*\tmalloc_t/g";
|
|
|
|
sed = "s/int[ \t][ \t]*free/void\tfree/g";
|
|
|
|
sed = "s/char\\([ \t]*\\*[ \t]*malloc\\)/void\\1/g";
|
|
|
|
sed = "s/char\\([ \t]*\\*[ \t]*realloc\\)/void\\1/g";
|
2000-05-22 06:02:14 +02:00
|
|
|
sed = "s/char\\([ \t]*\\*[ \t]*calloc\\)/void\\1/g";
|
2000-05-20 23:32:42 +02:00
|
|
|
|
|
|
|
test_text =
|
|
|
|
"typedef char *\tmalloc_t;\n"
|
|
|
|
"int \tfree();\n"
|
|
|
|
"char*\tmalloc();\n"
|
2000-05-22 06:02:14 +02:00
|
|
|
"char*\tcalloc();\n"
|
2000-05-20 23:32:42 +02:00
|
|
|
"char*\trealloc();";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check for yet more missing ';' in struct (in SunOS 4.0.x)
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = sun_rusers_semi;
|
|
|
|
files = rpcsvc/rusers.h;
|
|
|
|
select = "_cnt$";
|
|
|
|
sed = "/^struct/,/^};/s/_cnt$/_cnt;/";
|
2000-05-20 23:32:42 +02:00
|
|
|
test_text = "struct mumble\n int _cnt\n};";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* signal.h on SunOS defines signal using (),
|
|
|
|
* which causes trouble when compiling with g++ -pedantic.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = sun_signal;
|
|
|
|
files = sys/signal.h;
|
|
|
|
files = signal.h;
|
2000-05-20 23:32:42 +02:00
|
|
|
select = "^void\t" '\(\*signal\(\)\)\(\);.*';
|
1998-10-16 09:00:18 +02:00
|
|
|
|
2000-05-20 23:32:42 +02:00
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg =
|
|
|
|
"#ifdef __cplusplus\n"
|
|
|
|
"void\t(*signal(...))(...);\n"
|
|
|
|
"#else\n%0\n#endif";
|
1998-10-16 09:00:18 +02:00
|
|
|
|
2000-05-20 23:32:42 +02:00
|
|
|
test_text = "void\t(*signal())();";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Correct the return type for strlen in strings.h in SunOS 4.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = sunos_strlen;
|
|
|
|
files = strings.h;
|
2000-05-20 23:32:42 +02:00
|
|
|
select = "int[ \t]*strlen\\(\\);(.*)";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "__SIZE_TYPE__ strlen();%1";
|
|
|
|
test_text = " int\tstrlen(); /* string length */";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Disable apparent native compiler optimization cruft in SVR4.2 <string.h>
|
|
|
|
* that is visible to any ANSI compiler using this include. Simply
|
|
|
|
* delete the lines that #define some string functions to internal forms.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = svr4_disable_opt;
|
|
|
|
files = string.h;
|
|
|
|
select = '#define.*__std_hdr_';
|
|
|
|
sed = '/#define.*__std_hdr_/d';
|
2003-04-19 23:10:08 +02:00
|
|
|
test_text = "#define strlen __std_hdr_strlen\n";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
1999-11-15 15:47:53 +01:00
|
|
|
|
2003-05-07 03:29:58 +02:00
|
|
|
|
1998-10-16 09:00:18 +02:00
|
|
|
/*
|
|
|
|
* Fix broken decl of getcwd present on some svr4 systems.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = svr4_getcwd;
|
|
|
|
files = stdlib.h;
|
|
|
|
files = unistd.h;
|
2000-05-01 01:30:15 +02:00
|
|
|
files = prototypes.h;
|
1998-10-16 09:00:18 +02:00
|
|
|
select = 'getcwd\(char \*, int\)';
|
|
|
|
|
2000-05-20 23:32:42 +02:00
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "getcwd(char *, size_t)";
|
|
|
|
|
|
|
|
test_text = "extern char* getcwd(char *, int);";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
2000-05-01 01:30:15 +02:00
|
|
|
|
1998-10-16 09:00:18 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Fix broken decl of profil present on some svr4 systems.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = svr4_profil;
|
|
|
|
files = stdlib.h;
|
|
|
|
files = unistd.h;
|
|
|
|
|
2000-05-20 23:32:42 +02:00
|
|
|
select =
|
|
|
|
'profil\(unsigned short \*, unsigned int, unsigned int, unsigned int\)';
|
2004-05-03 17:19:16 +02:00
|
|
|
/* The fix is wrong on IRIX 5/6 and creates a conflict with another
|
|
|
|
prototype in <sys/profil.h>. */
|
|
|
|
bypass = 'Silicon Graphics';
|
2000-05-20 23:32:42 +02:00
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = 'profil(unsigned short *, size_t, int, unsigned int)';
|
|
|
|
|
|
|
|
test_text =
|
|
|
|
'profil(unsigned short *, unsigned int, unsigned int, unsigned int);';
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
2000-05-01 01:30:15 +02:00
|
|
|
|
1998-10-16 09:00:18 +02:00
|
|
|
|
2003-08-25 23:54:14 +02:00
|
|
|
/*
|
|
|
|
* 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";
|
|
|
|
};
|
|
|
|
|
1999-11-15 15:47:53 +01:00
|
|
|
|
2003-08-04 21:30:11 +02:00
|
|
|
/*
|
|
|
|
* 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"
|
|
|
|
"{}";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
1998-10-16 09:00:18 +02:00
|
|
|
/*
|
2000-01-25 09:06:23 +01:00
|
|
|
* 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.
|
|
|
|
* Correct the argument type for ffs in string.h on Alpha OSF/1 V2.0.
|
|
|
|
* Add missing const for strdup on OSF/1 V3.0.
|
|
|
|
* On sysV88 layout is slightly different.
|
1998-10-16 09:00:18 +02:00
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = sysv68_string;
|
2000-07-13 16:47:55 +02:00
|
|
|
files = testing.h;
|
1998-10-16 09:00:18 +02:00
|
|
|
files = string.h;
|
2004-11-10 00:14:06 +01:00
|
|
|
bypass = "_CLASSIC_ANSI_TYPES";
|
1998-10-16 09:00:18 +02:00
|
|
|
|
|
|
|
sed = "s/extern[ \t]*int[ \t]*strlen();/extern unsigned int strlen();/";
|
|
|
|
sed = "s/extern[ \t]*int[ \t]*ffs[ \t]*(long);/extern int ffs(int);/";
|
|
|
|
sed = "s/strdup(char \\*s1);/strdup(const char *s1);/";
|
2000-07-13 16:47:55 +02:00
|
|
|
|
1998-10-16 09:00:18 +02:00
|
|
|
sed = "/^extern char$/N";
|
|
|
|
sed = "s/^extern char\\(\\n\t\\*memccpy(),\\)$/extern void\\1/";
|
2000-07-13 16:47:55 +02:00
|
|
|
|
2000-08-23 16:03:47 +02:00
|
|
|
sed = "/^extern int$/N";
|
|
|
|
sed = "s/^extern int\\(\\n\tstrlen(),\\)/extern size_t\\1/";
|
|
|
|
|
1998-10-16 09:00:18 +02:00
|
|
|
sed = "/^\tstrncmp(),$/N";
|
2000-07-13 16:47:55 +02:00
|
|
|
sed = 's/^\(' "\t" 'strncmp()\),\n\(' "\t" 'strlen(),\)$/'
|
|
|
|
'\1;' "\\\nextern unsigned int\\\n\\2/";
|
|
|
|
|
|
|
|
test_text =
|
|
|
|
"extern int strlen();\n"
|
|
|
|
|
|
|
|
"extern int ffs(long);\n"
|
|
|
|
|
|
|
|
"extern char\n"
|
|
|
|
"\t*memccpy(),\n"
|
|
|
|
"\tmemcpy();\n"
|
|
|
|
|
|
|
|
"extern int\n"
|
2000-08-23 16:03:47 +02:00
|
|
|
"\tstrcmp(),\n"
|
2000-07-13 16:47:55 +02:00
|
|
|
"\tstrncmp(),\n"
|
|
|
|
"\tstrlen(),\n"
|
|
|
|
"\tstrspn();\n"
|
|
|
|
|
|
|
|
"extern int\n"
|
|
|
|
"\tstrlen(), strspn();";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2000-05-20 23:32:42 +02:00
|
|
|
* Fix return type of calloc, malloc, realloc, bsearch and exit
|
1998-10-16 09:00:18 +02:00
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = sysz_stdlib_for_sun;
|
|
|
|
files = stdlib.h;
|
2004-11-12 23:26:01 +01:00
|
|
|
bypass = "_CLASSIC_ANSI_TYPES";
|
1998-10-16 09:00:18 +02:00
|
|
|
|
2000-05-20 23:32:42 +02:00
|
|
|
select = "char[ \t]*\\*[ \t]*(calloc|malloc|realloc|bsearch)[ \t]*\\(";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "void *\t%1(";
|
|
|
|
|
|
|
|
test_text =
|
|
|
|
"extern char*\tcalloc(size_t);\n"
|
|
|
|
"extern char*\tmalloc(size_t);\n"
|
|
|
|
"extern char*\trealloc(void*,size_t);\n"
|
|
|
|
"extern char*\tbsearch(void*,size_t,size_t);\n";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2002-05-22 03:11:29 +02:00
|
|
|
/*
|
|
|
|
* __thread is now a keyword.
|
|
|
|
*/
|
|
|
|
fix = {
|
2002-05-22 04:59:19 +02:00
|
|
|
hackname = thread_keyword;
|
|
|
|
files = "pthread.h";
|
|
|
|
files = "bits/sigthread.h";
|
2002-06-03 01:17:30 +02:00
|
|
|
select = "([* ])__thread([,)])";
|
2002-05-22 04:59:19 +02:00
|
|
|
c_fix = format;
|
2002-06-03 01:17:30 +02:00
|
|
|
c_fix_arg = "%1__thr%2";
|
2002-05-22 03:11:29 +02:00
|
|
|
|
2002-05-22 22:02:16 +02:00
|
|
|
test_text =
|
|
|
|
"extern int pthread_create (pthread_t *__restrict __thread,\n"
|
2002-05-22 23:29:38 +02:00
|
|
|
"extern int pthread_kill (pthread_t __thread, int __signo);\n"
|
|
|
|
"extern int pthread_cancel (pthread_t __thread);";
|
2002-05-22 03:11:29 +02:00
|
|
|
};
|
|
|
|
|
1998-10-16 09:00:18 +02:00
|
|
|
/*
|
fixtests.c (is_cxx_header): New fn, split out of double_slash_test.
1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu>
* fixtests.c (is_cxx_header): New fn, split out of
double_slash_test.
(else_endif_label): Allow "#endif // comment" in C++ headers,
as determined by is_cxx_header.
* fixfixes.c (else_endif_label_fix): Update comment.
* fixincl.c: Don't output VERB_PROGRESS lines if stdout is not
a tty.
* genfixes: Correct double thinko in commandline parsing.
* hackshell.tpl: Generate correct sh syntax for bypass
entries.
* inclhack.def (all): Whenever an inserted preprocessor
conditional is split over multiple lines, use double
backslashes in this file so the fixed header will be readable.
(AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h
and add bypass entry for correct version of this header.
(AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h.
(AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h.
(hpux8_bogus_inlines): New fix, split from...
(ultrix_atof_param) ... here.
(math_expression): Add bypass entry keyed to glibc comment
indicating the problem has been dealt with; disable
unnecessary sed operations; update commentary.
(math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max,
add select and bypass entries, simplify shell operation.
(math_huge_val_ifndef): Split from math_gcc_ifndefs.
(ip_missing_semi, rs6000_param, tinfo_cplusplus,
ultrix_atof_param): Add select entry.
(stdio_va_list, sunos_mather_decl): Add bypass entry.
(systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the
comments with the fixes they describe.
* fixincl.x, fixincl.sh, inclhack.sh: Regen.
From-SVN: r30999
1999-12-17 22:49:30 +01:00
|
|
|
* if the #if says _cplusplus, not the double underscore __cplusplus
|
|
|
|
* that it should be
|
1998-10-16 09:00:18 +02:00
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = tinfo_cplusplus;
|
|
|
|
files = tinfo.h;
|
fixtests.c (is_cxx_header): New fn, split out of double_slash_test.
1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu>
* fixtests.c (is_cxx_header): New fn, split out of
double_slash_test.
(else_endif_label): Allow "#endif // comment" in C++ headers,
as determined by is_cxx_header.
* fixfixes.c (else_endif_label_fix): Update comment.
* fixincl.c: Don't output VERB_PROGRESS lines if stdout is not
a tty.
* genfixes: Correct double thinko in commandline parsing.
* hackshell.tpl: Generate correct sh syntax for bypass
entries.
* inclhack.def (all): Whenever an inserted preprocessor
conditional is split over multiple lines, use double
backslashes in this file so the fixed header will be readable.
(AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h
and add bypass entry for correct version of this header.
(AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h.
(AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h.
(hpux8_bogus_inlines): New fix, split from...
(ultrix_atof_param) ... here.
(math_expression): Add bypass entry keyed to glibc comment
indicating the problem has been dealt with; disable
unnecessary sed operations; update commentary.
(math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max,
add select and bypass entries, simplify shell operation.
(math_huge_val_ifndef): Split from math_gcc_ifndefs.
(ip_missing_semi, rs6000_param, tinfo_cplusplus,
ultrix_atof_param): Add select entry.
(stdio_va_list, sunos_mather_decl): Add bypass entry.
(systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the
comments with the fixes they describe.
* fixincl.x, fixincl.sh, inclhack.sh: Regen.
From-SVN: r30999
1999-12-17 22:49:30 +01:00
|
|
|
select = "[ \t]_cplusplus";
|
2000-05-31 16:26:57 +02:00
|
|
|
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = " __cplusplus";
|
|
|
|
test_text = "#ifdef _cplusplus\nint bogus;\n#endif";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* parameters not const on DECstation Ultrix V4.0 and OSF/1.
|
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-31 16:26:57 +02:00
|
|
|
hackname = ultrix_const;
|
|
|
|
files = stdio.h;
|
|
|
|
select = 'perror\( char \*';
|
|
|
|
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "%1 const %3 *__";
|
|
|
|
c_fix_arg = "([ \t*](perror|fputs|fwrite|scanf|fscanf)\\(.*)"
|
|
|
|
"[ \t]+(char|void) \\*__";
|
|
|
|
|
|
|
|
test_text =
|
|
|
|
"extern void perror( char *__s );\n"
|
|
|
|
"extern int fputs( char *__s, FILE *);\n"
|
|
|
|
"extern size_t fwrite( void *__ptr, size_t, size_t, FILE *);\n"
|
|
|
|
"extern int fscanf( FILE *__stream, char *__format, ...);\n"
|
|
|
|
"extern int scanf( char *__format, ...);\n";
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* parameters not const on DECstation Ultrix V4.0 and OSF/1.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = ultrix_const2;
|
|
|
|
files = stdio.h;
|
|
|
|
|
|
|
|
select = '\*fopen\( char \*';
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "%1( const char *%3, const char *";
|
|
|
|
c_fix_arg = "([ \t*](fopen|sscanf|popen|tempnam))\\("
|
|
|
|
"[ \t]*char[ \t]*\\*([^,]*),"
|
|
|
|
"[ \t]*char[ \t]*\\*[ \t]*";
|
1998-10-16 09:00:18 +02:00
|
|
|
|
2000-05-31 16:26:57 +02:00
|
|
|
test_text =
|
|
|
|
"extern FILE *fopen( char *__filename, char *__type );\n"
|
|
|
|
"extern int sscanf( char *__s, char *__format, ...);\n"
|
|
|
|
"extern FILE *popen(char *, char *);\n"
|
|
|
|
"extern char *tempnam(char*,char*);\n";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Fix definitions of macros used by va-i960.h in VxWorks header file.
|
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-31 16:26:57 +02:00
|
|
|
hackname = va_i960_macro;
|
|
|
|
files = arch/i960/archI960.h;
|
|
|
|
select = "__(vsiz|vali|vpad|alignof__)";
|
|
|
|
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "__vx%1";
|
|
|
|
|
|
|
|
test_text =
|
|
|
|
"extern int __vsiz vsiz;\n"
|
|
|
|
"extern int __vali vali;\n"
|
|
|
|
"extern int __vpad vpad;\n"
|
|
|
|
"#define __alignof__(x) ...";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2003-07-15 02:43:24 +02:00
|
|
|
* AIX and Interix headers define NULL to be cast to a void pointer,
|
1998-10-16 09:00:18 +02:00
|
|
|
* which is illegal in ANSI C++.
|
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-31 16:26:57 +02:00
|
|
|
hackname = void_null;
|
|
|
|
files = curses.h;
|
|
|
|
files = dbm.h;
|
|
|
|
files = locale.h;
|
|
|
|
files = stdio.h;
|
|
|
|
files = stdlib.h;
|
|
|
|
files = string.h;
|
|
|
|
files = time.h;
|
|
|
|
files = unistd.h;
|
|
|
|
files = sys/dir.h;
|
|
|
|
files = sys/param.h;
|
|
|
|
files = sys/types.h;
|
2004-10-28 23:44:31 +02:00
|
|
|
/* avoid changing C++ friendly NULL */
|
|
|
|
bypass = __cplusplus;
|
2000-05-31 16:26:57 +02:00
|
|
|
select = "^#[ \t]*define[ \t]+NULL[ \t]+\\(\\(void[ \t]*\\*\\)0\\)";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#define NULL 0";
|
|
|
|
test_text = "# define\tNULL \t((void *)0) /* typed NULL */";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Make VxWorks header which is almost gcc ready fully gcc ready.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = vxworks_gcc_problem;
|
|
|
|
files = types/vxTypesBase.h;
|
|
|
|
select = "__GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__";
|
|
|
|
|
|
|
|
sed = "s/#ifdef __GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__/"
|
|
|
|
"#if 1/";
|
|
|
|
|
|
|
|
sed = "/[ \t]size_t/i\\\n"
|
|
|
|
"#ifndef _GCC_SIZE_T\\\n"
|
|
|
|
"#define _GCC_SIZE_T\n";
|
|
|
|
|
|
|
|
sed = "/[ \t]size_t/a\\\n"
|
|
|
|
"#endif\n";
|
|
|
|
|
|
|
|
sed = "/[ \t]ptrdiff_t/i\\\n"
|
|
|
|
"#ifndef _GCC_PTRDIFF_T\\\n"
|
|
|
|
"#define _GCC_PTRDIFF_T\n";
|
|
|
|
|
|
|
|
sed = "/[ \t]ptrdiff_t/a\\\n"
|
|
|
|
"#endif\n";
|
|
|
|
|
|
|
|
sed = "/[ \t]wchar_t/i\\\n"
|
|
|
|
"#ifndef _GCC_WCHAR_T\\\n"
|
|
|
|
"#define _GCC_WCHAR_T\n";
|
|
|
|
|
|
|
|
sed = "/[ \t]wchar_t/a\\\n"
|
|
|
|
"#endif\n";
|
2000-05-31 16:26:57 +02:00
|
|
|
|
|
|
|
test_text =
|
|
|
|
"#ifdef __GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__\n"
|
|
|
|
"typedef unsigned int size_t;\n"
|
|
|
|
"typedef long ptrdiff_t;\n"
|
|
|
|
"typedef unsigned short wchar_t;\n"
|
|
|
|
"#endif /* __GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__ */\n";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Fix VxWorks <time.h> to not require including <vxTypes.h>.
|
|
|
|
*/
|
|
|
|
fix = {
|
2000-05-31 16:26:57 +02:00
|
|
|
hackname = vxworks_needs_vxtypes;
|
|
|
|
files = time.h;
|
|
|
|
select = "uint_t([ \t]+_clocks_per_sec)";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "unsigned int%1";
|
2000-05-09 18:21:08 +02:00
|
|
|
test_text = "uint_t\t_clocks_per_sec;";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Fix VxWorks <sys/stat.h> to not require including <vxWorks.h>.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = vxworks_needs_vxworks;
|
|
|
|
files = sys/stat.h;
|
1999-03-31 14:02:19 +02:00
|
|
|
test = " -r types/vxTypesOld.h";
|
|
|
|
test = " -n \"`egrep '#include' $file`\"";
|
|
|
|
test = " -n \"`egrep ULONG $file`\"";
|
2000-05-31 16:26:57 +02:00
|
|
|
select = "#[ \t]define[ \t]+__INCstath";
|
1998-10-16 09:00:18 +02:00
|
|
|
|
|
|
|
sed = "/#[ \t]define[ \t][ \t]*__INCstath/a\\\n"
|
|
|
|
"#include <types/vxTypesOld.h>\n";
|
2000-05-31 16:26:57 +02:00
|
|
|
|
|
|
|
test_text = "`touch types/vxTypesOld.h`"
|
|
|
|
"#include </dev/null> /* ULONG */\n"
|
|
|
|
"# define\t__INCstath <sys/stat.h>";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Another bad dependency in VxWorks 5.2 <time.h>.
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = vxworks_time;
|
|
|
|
files = time.h;
|
1999-03-31 14:02:19 +02:00
|
|
|
test = " -r vxWorks.h";
|
1998-10-16 09:00:18 +02:00
|
|
|
|
2000-05-31 16:26:57 +02:00
|
|
|
select = "#[ \t]*define[ \t]+VOIDFUNCPTR[ \t].*";
|
|
|
|
c_fix = format;
|
|
|
|
|
|
|
|
c_fix_arg =
|
|
|
|
"#ifndef __gcc_VOIDFUNCPTR_defined\n"
|
|
|
|
"#ifdef __cplusplus\n"
|
|
|
|
"typedef void (*__gcc_VOIDFUNCPTR) (...);\n"
|
|
|
|
"#else\n"
|
|
|
|
"typedef void (*__gcc_VOIDFUNCPTR) ();\n"
|
|
|
|
"#endif\n"
|
|
|
|
"#define __gcc_VOIDFUNCPTR_defined\n"
|
|
|
|
"#endif\n"
|
|
|
|
"#define VOIDFUNCPTR __gcc_VOIDFUNCPTR";
|
|
|
|
|
|
|
|
test_text = "`touch vxWorks.h`"
|
|
|
|
"#define VOIDFUNCPTR (void(*)())";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 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
|
|
|
|
* we find __cplusplus in the file. These were found on the RS/6000.
|
|
|
|
*/
|
|
|
|
fix = {
|
2000-06-17 21:43:21 +02:00
|
|
|
hackname = x11_class;
|
|
|
|
files = X11/ShellP.h;
|
|
|
|
bypass = __cplusplus;
|
|
|
|
select = "^([ \t]*char \\*)class;(.*)";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#ifdef __cplusplus\n%1c_class;%2\n"
|
|
|
|
"#else\n%1class;%2\n#endif";
|
2000-05-09 18:21:08 +02:00
|
|
|
test_text =
|
|
|
|
"struct {\n"
|
|
|
|
" char *class;\n"
|
|
|
|
"} mumble;\n";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* class in Xm/BaseClassI.h
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = x11_class_usage;
|
|
|
|
files = Xm/BaseClassI.h;
|
|
|
|
bypass = "__cplusplus";
|
2000-05-31 16:26:57 +02:00
|
|
|
|
|
|
|
select = " class\\)";
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = " c_class)";
|
|
|
|
|
2000-05-09 18:21:08 +02:00
|
|
|
test_text = "extern mumble (int class);\n";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* new in Xm/Traversal.h
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = x11_new;
|
|
|
|
files = Xm/Traversal.h;
|
|
|
|
bypass = __cplusplus;
|
|
|
|
|
|
|
|
sed = "/Widget\told, new;/i\\\n"
|
|
|
|
"#ifdef __cplusplus\\\n"
|
|
|
|
"\tWidget\told, c_new;\\\n"
|
|
|
|
"#else\n";
|
|
|
|
|
|
|
|
sed = "/Widget\told, new;/a\\\n"
|
|
|
|
"#endif\n";
|
|
|
|
|
|
|
|
sed = "s/Widget new,/Widget c_new,/g";
|
2000-05-09 18:21:08 +02:00
|
|
|
test_text =
|
|
|
|
"struct wedge {\n"
|
2003-02-19 03:38:22 +01:00
|
|
|
" Widget\told, new; /* fixinc check FAILS ON BSD */\n"
|
2000-05-09 18:21:08 +02:00
|
|
|
"};\nextern Wedged( Widget new, Widget old );";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Incorrect sprintf declaration in X11/Xmu.h
|
|
|
|
*/
|
|
|
|
fix = {
|
|
|
|
hackname = x11_sprintf;
|
2000-01-17 22:45:29 +01:00
|
|
|
files = X11/Xmu.h;
|
|
|
|
files = X11/Xmu/Xmu.h;
|
2000-05-31 16:26:57 +02:00
|
|
|
select = "^extern char \\*\tsprintf\\(\\);$";
|
|
|
|
|
|
|
|
c_fix = format;
|
|
|
|
c_fix_arg = "#ifndef __STDC__\n%0\n#endif /* !defined __STDC__ */";
|
2000-01-17 22:45:29 +01:00
|
|
|
|
2000-05-09 18:21:08 +02:00
|
|
|
test_text = "extern char *\tsprintf();";
|
1998-10-16 09:00:18 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
/*EOF*/
|