OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

__FD_ZERO fixes for gnu libc1&2

Browse Source 
From-SVN: r30613
This commit is contained in:
Bruce Korb 1999-11-22 15:05:48 +00:00 committed by Bruce Korb
parent ee265800a5
commit 8aeb3b0e4c
6 changed files with 610 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gcc/ChangeLog
View File

@ -1,3 +1,20 @@
1999-11-22 Bruce Korb <autogen@linuxbox.com
* fixinc/mkfisinc.sh(i?86-*-linux): disable script, run fixincl exe
(mips-dec-bsd*): non-functional code
(alpha*-*-linux-gnu*): redundant, duplicated by "*-*-linux-gnu*"
* fixinc/inclhack.def(AAB_fd_zero_glibc_*):
added three replacement fixes
(no_double_slash): removed comments that are not (any longer) pertinent
(bad_lval): this fix currently runs against many files.
The comment seems to indicate that we should select for files
containing 'pragma extern_prefix'.
* fixinc/inclhack.sh: regen
* fixinc/fixincl.x: regen
* fixinc/fixincl.sh: regen
Fri Nov 12 14:08:40 1999 Andrew Haley <aph@cygnus.com>
* emit-rtl.c (gen_sequence): Only return the pattern of an insn if

2
gcc/fixinc/fixincl.sh
View File

@ -6,7 +6,7 @@
# files which are fixed to work correctly with ANSI C and placed in a
# directory that GNU C will search.
#
# This script contains 109 fixup scripts.
# This script contains 112 fixup scripts.
#
# See README-fixinc for more information.
#

377
gcc/fixinc/fixincl.x
View File

File diff suppressed because it is too large Load Diff

175
gcc/fixinc/inclhack.def
View File

@ -154,6 +154,127 @@ typedef char * va_list;
};
/*
* This fixes __FD_ZERO bug for glibc-1.0.x
*/
fix = {
hackname = AAB_fd_zero_glibc_1_0;
files = asm/posix_types.h;
select = 'i[34567]86-*-linux-gnu*';
/*
* 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>.
*/
replace =
'/* This file fixes __FD_ZERO bug for glibc-1.x. */
\#ifndef _POSIX_TYPES_H_WRAPPER
\#include <features.h>
\#include_next <asm/posix_types.h>
\#if defined(__FD_ZERO) && !defined(__GLIBC__)
\#undef __FD_ZERO
\#define __FD_ZERO(fdsetp) \
do { \
int __d0, __d1; \
__asm__ __volatile__("cld ; rep ; stosl" \
: "=&c" (__d0), "=&D" (__d1) \
: "a" (0), "0" (__FDSET_LONGS), \
"1" ((__kernel_fd_set *) (fdsetp)) :"memory"); \
} while (0)
\#endif
\#define _POSIX_TYPES_H_WRAPPER
\#endif /* _POSIX_TYPES_H_WRAPPER */
';
};
/*
* This fixes __FD_ZERO bug for glibc-1.x
*/
fix = {
hackname = AAB_fd_zero_glibc_1_x;
files = gnu/types.h;
select = 'i[34567]86-*-linux-gnu*';
/*
* 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>.
*/
replace =
'/* This file fixes __FD_ZERO bug for glibc-1.x. */
\#ifndef _TYPES_H_WRAPPER
\#include <features.h>
\#include_next <gnu/types.h>
\#if defined(__FD_ZERO) && !defined(__GLIBC__)
\#undef __FD_ZERO
\# define __FD_ZERO(fdsetp) \
do { \
int __d0, __d1; \
__asm__ __volatile__("cld ; rep ; stosl" \
: "=&c" (__d0), "=&D" (__d1) \
: "a" (0), "0" (__FDSET_LONGS), \
"1" ((__fd_set *) (fdsetp)) :"memory"); \
} while (0)
\#endif
\#define _TYPES_H_WRAPPER
\#endif /* _TYPES_H_WRAPPER */
';
};
/*
* This fixes __FD_ZERO bug for glibc-2.0.x
*/
fix = {
hackname = AAB_fd_zero_glibc_2_0;
files = selectbits.h;
select = 'i[34567]86-*-linux-gnu*';
/*
* 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>.
*/
replace =
'/* This file fixes __FD_ZERO bug for glibc-2.0.x. */
\#ifndef _SELECTBITS_H_WRAPPER
\#include <features.h>
\#include_next <selectbits.h>
\#if defined(__FD_ZERO) && defined(__GLIBC__) \
&& defined(__GLIBC_MINOR__) && __GLIBC__ == 2 \
&& __GLIBC_MINOR__ == 0
\#undef __FD_ZERO
\#define __FD_ZERO(fdsetp) \
do { \
int __d0, __d1; \
__asm__ __volatile__ ("cld; rep; stosl" \
: "=&c" (__d0), "=&D" (__d1) \
: "a" (0), "0" (sizeof (__fd_set) \
/ sizeof (__fd_mask)), \
"1" ((__fd_mask *) (fdsetp)) \
: "memory"); \
} while (0)
\#endif
\#define _SELECTBITS_H_WRAPPER
\#endif /* _SELECTBITS_H_WRAPPER */
';
};
/*
* Completely replace <sys/byteorder.h>; with a file that implements gcc's
* optimized byteswapping. Restricted to "SVR4" machines until either
@ -519,6 +640,9 @@ fix = {
*/
fix = {
hackname = bad_lval;
select = "^[ \t]*#[ \t]*pragma[ \t][ \t]*extern_prefix";
files = libgen.h;
files = dirent.h;
files = ftw.h;
@ -597,56 +721,15 @@ fix = {
/*
* Remove the double-slash comments
* They *must* be removed so it will not create nested comments!!
* However, they will *not* be removed if the file name ends with
* any of "++", ".hh" or ".H", or if the file name contains "cxx/".
*
* There *used* to be a number of similar problems in various OSes:
* Turning // comments into normal comments trashes this IRIX 4.0.1
* header file, which embeds // comments inside multi-line
* comments. If this looks like the IRIX header file, we refix it by
* just throwing away the // comments.
* Same problem with a file from SunOS 4.1.3 : a header file containing
* the string "//" embedded in "/ * * /"
* There is a similar problem with the VxWorks drv/netif/if_med.h file.
* And also with the HP-UX 10 and HP-UX 11 sys/pci.h file
* Now that we delete the // comments instead of converting them to / * * /,
* traditional hacks like irix_bogus_cxx_cmnt, no longer work (which
* strangely enough was also used on alpha-dec-osf4.0d). If we skip the
* hack whenever we see ``"//"' ', then the need for the secondary hack
* disappears. Note: it is painful to ensure that the first quote
* exists, so we just check for the trailing quote directly abutting
* the //. Note: We should never touch a line that has // completely
* within quotes but this is somewhat hard to check for.
* Ultimately, this fix ought to go inside of C code where
* we can do a better analysis on the need and method for fixing.
* Remove the double-slash comments. The "double_slash" test will
* try to ignore C++ headers by checking for "CC/", "xx/" and "++/"
* in the file name. There are still the occasional C++ headers
* that have their comments stripped. Too bad.
*/
fix = {
hackname = no_double_slash;
/*
* Test that the file-to-fix does not from a C++ directory
* Also, only accept double slashes that are not part of URL's
* and do not appear to be within a single-line C-style comment
* and are not the end of a quoted string.
*/
#ifdef NO_C_TESTS
test = ' -z "`echo ${file} | egrep \'(CC|cxx|\+\+)/\'`"';
select = '(^|[^:])//[^"*]';
sed = 's,^//.*$,,';
sed = 's,\(/\*.*\)//\(.*\*/\),\1/ /\2,g';
sed = 's,\([^:]\)//[^"].*$,\1,';
sed = 's,[^:]//[^"].*$,,';
#else
c_test = "double_slash";
c_fix = "no_double_slash";
#endif
};
@ -660,6 +743,7 @@ fix = {
sed = "s/ecd.cursor/ecd_cursor/";
};
/*
* On SCO OpenServer 5.0.0 through (at least) 5.0.5 <sys/stat.h> contains
* tiny static wrappers that aren't C++ safe.
@ -682,7 +766,6 @@ fix = {
};
/*
* Fix else and endif directives that contain non-commentary text
*/

296
gcc/fixinc/inclhack.sh
View File

@ -6,7 +6,7 @@
# files which are fixed to work correctly with ANSI C and placed in a
# directory that GNU C will search.
#
# This script contains 109 fixup scripts.
# This script contains 112 fixup scripts.
#
# See README-fixinc for more information.
#
@ -521,7 +521,94 @@ _EOF_
#
# Fix 8: Aab_Svr4_Replace_Byteorder
# Fix 8: Aab_Fd_Zero_Glibc_1_0
#
case "${file}" in ./asm/posix_types.h )
if ( test -n "`egrep 'i[34567]86-*-linux-gnu*' ${file}`"
) > /dev/null 2>&1 ; then
echo "aab_fd_zero_glibc_1_0 replacing file ${file}" >&2
cat > ${DESTFILE} << '_EOF_'
/* This file fixes __FD_ZERO bug for glibc-1.x. */
#ifndef _POSIX_TYPES_H_WRAPPER
#include <features.h>
#include_next <asm/posix_types.h>
#if defined(__FD_ZERO) && !defined(__GLIBC__)
#undef __FD_ZERO
#define __FD_ZERO(fdsetp) do { int __d0, __d1; __asm__ __volatile__("cld ; rep ; stosl" : "=&c" (__d0), "=&D" (__d1) : "a" (0), "0" (__FDSET_LONGS), "1" ((__kernel_fd_set *) (fdsetp)) :"memory"); } while (0)
#endif
#define _POSIX_TYPES_H_WRAPPER
#endif /* _POSIX_TYPES_H_WRAPPER */
_EOF_
continue
fi # end of select 'if'
;; # case end for file name test
esac
#
# Fix 9: Aab_Fd_Zero_Glibc_1_X
#
case "${file}" in ./gnu/types.h )
if ( test -n "`egrep 'i[34567]86-*-linux-gnu*' ${file}`"
) > /dev/null 2>&1 ; then
echo "aab_fd_zero_glibc_1_x replacing file ${file}" >&2
cat > ${DESTFILE} << '_EOF_'
/* This file fixes __FD_ZERO bug for glibc-1.x. */
#ifndef _TYPES_H_WRAPPER
#include <features.h>
#include_next <gnu/types.h>
#if defined(__FD_ZERO) && !defined(__GLIBC__)
#undef __FD_ZERO
# define __FD_ZERO(fdsetp) do { int __d0, __d1; __asm__ __volatile__("cld ; rep ; stosl" : "=&c" (__d0), "=&D" (__d1) : "a" (0), "0" (__FDSET_LONGS), "1" ((__fd_set *) (fdsetp)) :"memory"); } while (0)
#endif
#define _TYPES_H_WRAPPER
#endif /* _TYPES_H_WRAPPER */
_EOF_
continue
fi # end of select 'if'
;; # case end for file name test
esac
#
# Fix 10: Aab_Fd_Zero_Glibc_2_0
#
case "${file}" in ./selectbits.h )
if ( test -n "`egrep 'i[34567]86-*-linux-gnu*' ${file}`"
) > /dev/null 2>&1 ; then
echo "aab_fd_zero_glibc_2_0 replacing file ${file}" >&2
cat > ${DESTFILE} << '_EOF_'
/* This file fixes __FD_ZERO bug for glibc-2.0.x. */
#ifndef _SELECTBITS_H_WRAPPER
#include <features.h>
#include_next <selectbits.h>
#if defined(__FD_ZERO) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && __GLIBC__ == 2 && __GLIBC_MINOR__ == 0
#undef __FD_ZERO
#define __FD_ZERO(fdsetp) do { int __d0, __d1; __asm__ __volatile__ ("cld; rep; stosl" : "=&c" (__d0), "=&D" (__d1) : "a" (0), "0" (sizeof (__fd_set) / sizeof (__fd_mask)), "1" ((__fd_mask *) (fdsetp)) : "memory"); } while (0)
#endif
#define _SELECTBITS_H_WRAPPER
#endif /* _SELECTBITS_H_WRAPPER */
_EOF_
continue
fi # end of select 'if'
;; # case end for file name test
esac
#
# Fix 11: Aab_Svr4_Replace_Byteorder
#
case "${file}" in ./sys/byteorder.h )
case "$target_canonical" in *-*-sysv4* | \
@ -684,7 +771,7 @@ _EOF_
#
# Fix 9: Aix_Syswait
# Fix 12: Aix_Syswait
#
case "${file}" in ./sys/wait.h )
if ( test -n "`egrep 'bos325,' ${file}`"
@ -707,7 +794,7 @@ struct rusage;
#
# Fix 10: Aix_Volatile
# Fix 13: Aix_Volatile
#
case "${file}" in ./sys/signal.h )
if ( test -n "`egrep 'typedef volatile int sig_atomic_t' ${file}`"
@ -728,7 +815,7 @@ struct rusage;
#
# Fix 11: Alpha_Getopt
# Fix 14: Alpha_Getopt
#
case "${file}" in ./stdio.h | \
./stdlib.h )
@ -750,7 +837,7 @@ struct rusage;
#
# Fix 12: Alpha_Parens
# Fix 15: Alpha_Parens
#
case "${file}" in ./sym.h )
if ( test -n "`egrep '#ifndef\\(__mips64\\)' ${file}`"
@ -771,7 +858,7 @@ struct rusage;
#
# Fix 13: Alpha_Sbrk
# Fix 16: Alpha_Sbrk
#
case "${file}" in ./unistd.h )
if ( test -n "`egrep 'char[ ]*\\*[ ]*sbrk[ ]*\\(' ${file}`"
@ -792,7 +879,7 @@ struct rusage;
#
# Fix 14: Arm_Norcroft_Hint
# Fix 17: Arm_Norcroft_Hint
#
case "${file}" in ./X11/Intrinsic.h )
if ( test -n "`egrep '___type p_type' ${file}`"
@ -813,7 +900,7 @@ struct rusage;
#
# Fix 15: Arm_Wchar
# Fix 18: Arm_Wchar
#
case "${file}" in ./stdlib.h )
if ( test -n "`egrep '#[ ]*define[ ]*__wchar_t' ${file}`"
@ -835,7 +922,7 @@ struct rusage;
#
# Fix 16: Aux_Asm
# Fix 19: Aux_Asm
#
case "${file}" in ./sys/param.h )
if ( test -n "`egrep '#ifndef NOINLINE' ${file}`"
@ -856,7 +943,7 @@ struct rusage;
#
# Fix 17: Avoid_Bool
# Fix 20: Avoid_Bool
#
case "${file}" in ./curses.h | \
./curses_colr/curses.h | \
@ -906,7 +993,7 @@ struct rusage;
#
# Fix 18: Bad_Struct_Term
# Fix 21: Bad_Struct_Term
#
case "${file}" in ./curses.h )
if ( test -n "`egrep '^[ ]*typedef[ ]+struct[ ]+term[ ]*;' ${file}`"
@ -927,7 +1014,7 @@ struct rusage;
#
# Fix 19: Badquote
# Fix 22: Badquote
#
case "${file}" in ./sundev/vuid_event.h )
fixlist="${fixlist}
@ -945,7 +1032,7 @@ struct rusage;
#
# Fix 20: Bad_Lval
# Fix 23: Bad_Lval
#
case "${file}" in ./libgen.h | \
./dirent.h | \
@ -961,6 +1048,8 @@ struct rusage;
./stropts.h | \
./time.h | \
./unistd.h )
if ( test -n "`egrep '^[ ]*#[ ]*pragma[ ][ ]*extern_prefix' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
bad_lval"
if [ ! -r ${DESTFILE} ]
@ -971,12 +1060,13 @@ struct rusage;
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of select 'if'
;; # case end for file name test
esac
#
# Fix 21: Broken_Assert_Stdio
# Fix 24: Broken_Assert_Stdio
#
case "${file}" in ./assert.h )
if ( test -n "`egrep 'stderr' ${file}`"
@ -1003,7 +1093,7 @@ struct rusage;
#
# Fix 22: Broken_Assert_Stdlib
# Fix 25: Broken_Assert_Stdlib
#
case "${file}" in ./assert.h )
if ( test -n "`egrep 'exit *\\(|abort *\\(' ${file}`"
@ -1032,7 +1122,7 @@ struct rusage;
#
# Fix 23: Bsd43_Io_Macros
# Fix 26: Bsd43_Io_Macros
#
if ( test -n "`egrep 'BSD43__IO' ${file}`"
) > /dev/null 2>&1 ; then
@ -1051,7 +1141,7 @@ struct rusage;
#
# Fix 24: Dec_Intern_Asm
# Fix 27: Dec_Intern_Asm
#
case "${file}" in ./c_asm.h )
fixlist="${fixlist}
@ -1074,7 +1164,7 @@ struct rusage;
#
# Fix 25: No_Double_Slash
# Fix 28: No_Double_Slash
#
if ${FIXTESTS} ${file} double_slash
then
@ -1090,7 +1180,7 @@ struct rusage;
#
# Fix 26: Ecd_Cursor
# Fix 29: Ecd_Cursor
#
case "${file}" in ./sunwindow/win_lock.h | \
./sunwindow/win_cursor.h )
@ -1109,7 +1199,7 @@ struct rusage;
#
# Fix 27: Sco5_Stat_Wrappers
# Fix 30: Sco5_Stat_Wrappers
#
case "${file}" in ./sys/stat.h )
case "$target_canonical" in i*86-*-sco3.2v5* )
@ -1140,7 +1230,7 @@ extern "C"\
#
# Fix 28: End_Else_Label
# Fix 31: End_Else_Label
#
if ${FIXTESTS} ${file} else_endif_label
then
@ -1156,7 +1246,7 @@ extern "C"\
#
# Fix 29: Hp_Inline
# Fix 32: Hp_Inline
#
case "${file}" in ./sys/spinlock.h )
if ( test -n "`egrep 'include.*\"\\.\\./machine/' ${file}`"
@ -1178,7 +1268,7 @@ extern "C"\
#
# Fix 30: Hp_Sysfile
# Fix 33: Hp_Sysfile
#
case "${file}" in ./sys/file.h )
if ( test -n "`egrep 'HPUX_SOURCE' ${file}`"
@ -1199,7 +1289,7 @@ extern "C"\
#
# Fix 31: Cxx_Unready
# Fix 34: Cxx_Unready
#
case "${file}" in ./sys/mman.h | \
./rpc/types.h )
@ -1232,7 +1322,7 @@ extern "C" {\
#
# Fix 32: Hpux_Maxint
# Fix 35: Hpux_Maxint
#
case "${file}" in ./sys/param.h )
fixlist="${fixlist}
@ -1255,7 +1345,7 @@ extern "C" {\
#
# Fix 33: Hpux_Systime
# Fix 36: Hpux_Systime
#
case "${file}" in ./sys/time.h )
if ( test -n "`egrep '^extern struct sigevent;' ${file}`"
@ -1276,7 +1366,7 @@ extern "C" {\
#
# Fix 34: Hpux11_Uint32_C
# Fix 37: Hpux11_Uint32_C
#
case "${file}" in ./inttypes.h )
if ( test -n "`egrep '^#define UINT32_C\\(__c\\)[ ]*__CONCAT__\\(__CONCAT_U__\\(__c\\),l\\)' ${file}`"
@ -1297,7 +1387,7 @@ extern "C" {\
#
# Fix 35: Interactv_Add1
# Fix 38: Interactv_Add1
#
case "${file}" in ./stdio.h | \
./math.h | \
@ -1324,7 +1414,7 @@ extern "C" {\
#
# Fix 36: Interactv_Add2
# Fix 39: Interactv_Add2
#
case "${file}" in ./math.h )
if ( test '(' -d /etc/conf/kconfig.d ')' -a \
@ -1346,7 +1436,7 @@ extern "C" {\
#
# Fix 37: Interactv_Add3
# Fix 40: Interactv_Add3
#
case "${file}" in ./sys/limits.h )
if ( test '(' -d /etc/conf/kconfig.d ')' -a \
@ -1369,7 +1459,7 @@ extern "C" {\
#
# Fix 38: Io_Def_Quotes
# Fix 41: Io_Def_Quotes
#
if ( test -n "`egrep '[ ]*[ ](_|DES)IO[A-Z]*[ ]*\\( *[^,'\\'']' ${file}`"
) > /dev/null 2>&1 ; then
@ -1390,7 +1480,7 @@ extern "C" {\
#
# Fix 39: Ioctl_Fix_Ctrl
# Fix 42: Ioctl_Fix_Ctrl
#
if ( test -n "`egrep 'CTRL[ ]*\\(' ${file}`"
) > /dev/null 2>&1 ; then
@ -1413,7 +1503,7 @@ extern "C" {\
#
# Fix 40: Ip_Missing_Semi
# Fix 43: Ip_Missing_Semi
#
case "${file}" in ./netinet/ip.h )
fixlist="${fixlist}
@ -1431,7 +1521,7 @@ extern "C" {\
#
# Fix 41: Irix_Multiline_Cmnt
# Fix 44: Irix_Multiline_Cmnt
#
case "${file}" in ./sys/types.h )
fixlist="${fixlist}
@ -1450,7 +1540,7 @@ extern "C" {\
#
# Fix 42: Irix_Sockaddr
# Fix 45: Irix_Sockaddr
#
case "${file}" in ./rpc/auth.h )
if ( test -n "`egrep 'authdes_create.*struct sockaddr' ${file}`"
@ -1473,7 +1563,7 @@ struct sockaddr;
#
# Fix 43: Irix_Struct__File
# Fix 46: Irix_Struct__File
#
case "${file}" in ./rpc/xdr.h )
fixlist="${fixlist}
@ -1493,7 +1583,7 @@ struct __file_s;
#
# Fix 44: Irix_Asm_Apostrophe
# Fix 47: Irix_Asm_Apostrophe
#
case "${file}" in ./sys/asm.h )
if ( test -n "`egrep '^[ ]*#.*[Ww]e'\\''re' ${file}`"
@ -1514,7 +1604,7 @@ struct __file_s;
#
# Fix 45: Isc_Fmod
# Fix 48: Isc_Fmod
#
case "${file}" in ./math.h )
if ( test -n "`egrep 'fmod\\(double\\)' ${file}`"
@ -1535,7 +1625,7 @@ struct __file_s;
#
# Fix 46: Motorola_Nested
# Fix 49: Motorola_Nested
#
case "${file}" in ./limits.h | \
./sys/limits.h )
@ -1558,7 +1648,7 @@ struct __file_s;
#
# Fix 47: Isc_Sys_Limits
# Fix 50: Isc_Sys_Limits
#
case "${file}" in ./sys/limits.h )
if ( test -n "`egrep 'CHILD_MAX' ${file}`"
@ -1580,7 +1670,7 @@ struct __file_s;
#
# Fix 48: Kandr_Concat
# Fix 51: Kandr_Concat
#
case "${file}" in ./sparc/asm_linkage.h | \
./sun3/asm_linkage.h | \
@ -1618,7 +1708,7 @@ struct __file_s;
#
# Fix 49: Limits_Ifndefs
# Fix 52: Limits_Ifndefs
#
case "${file}" in ./limits.h | \
./sys/limits.h )
@ -1677,7 +1767,7 @@ struct __file_s;
#
# Fix 50: Lynx_Void_Int
# Fix 53: Lynx_Void_Int
#
case "${file}" in ./curses.h )
if ( test -n "`egrep '#[ ]*define[ ]+void[ ]+int' ${file}`"
@ -1698,7 +1788,7 @@ struct __file_s;
#
# Fix 51: Lynxos_Fcntl_Proto
# Fix 54: Lynxos_Fcntl_Proto
#
case "${file}" in ./fcntl.h )
if ( test -n "`egrep 'fcntl.*\\(int, int, int\\)' ${file}`"
@ -1719,7 +1809,7 @@ struct __file_s;
#
# Fix 52: M88k_Bad_Hypot_Opt
# Fix 55: M88k_Bad_Hypot_Opt
#
case "${file}" in ./math.h )
case "$target_canonical" in m88k-motorola-sysv3* )
@ -1754,7 +1844,7 @@ static __inline__ double fake_hypot (x, y)\
#
# Fix 53: M88k_Bad_S_If
# Fix 56: M88k_Bad_S_If
#
case "${file}" in ./sys/stat.h )
case "$target_canonical" in m88k-*-sysv3* )
@ -1779,7 +1869,7 @@ static __inline__ double fake_hypot (x, y)\
#
# Fix 54: M88k_Multi_Incl
# Fix 57: M88k_Multi_Incl
#
case "${file}" in ./time.h )
case "$target_canonical" in m88k-tektronix-sysv3* )
@ -1813,7 +1903,7 @@ static __inline__ double fake_hypot (x, y)\
#
# Fix 55: Machine_Name
# Fix 58: Machine_Name
#
if ( test -n "`egrep '^#[ ]*(if|elif).*[^a-zA-Z0-9_](_*[MSRrhim]|[Mbimnpstuv])[a-zA-Z0-9_]' ${file}`"
) > /dev/null 2>&1 ; then
@ -1865,7 +1955,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 56: Math_Exception
# Fix 59: Math_Exception
#
case "${file}" in ./math.h )
if ( test -n "`egrep 'struct exception' ${file}`"
@ -1905,7 +1995,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 57: Math_Gcc_Ifndefs
# Fix 60: Math_Gcc_Ifndefs
#
case "${file}" in ./math.h )
fixlist="${fixlist}
@ -1939,7 +2029,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 58: Nested_Comment
# Fix 61: Nested_Comment
#
case "${file}" in ./rpc/rpc.h )
fixlist="${fixlist}
@ -1957,7 +2047,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 59: News_Os_Recursion
# Fix 62: News_Os_Recursion
#
case "${file}" in ./stdlib.h )
if ( test -n "`egrep '#include <stdlib.h>' ${file}`"
@ -1983,7 +2073,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 60: Next_Math_Prefix
# Fix 63: Next_Math_Prefix
#
case "${file}" in ./ansi/math.h )
if ( test -n "`egrep '^extern.*double.*__const__.*' ${file}`"
@ -2008,7 +2098,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 61: Next_Template
# Fix 64: Next_Template
#
case "${file}" in ./bsd/libc.h )
if ( test -n "`egrep 'template' ${file}`"
@ -2030,7 +2120,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 62: Next_Volitile
# Fix 65: Next_Volitile
#
case "${file}" in ./ansi/stdlib.h )
if ( test -n "`egrep 'volatile' ${file}`"
@ -2052,7 +2142,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 63: Next_Wait_Union
# Fix 66: Next_Wait_Union
#
case "${file}" in ./sys/wait.h )
if ( test -n "`egrep 'wait\\(union wait' ${file}`"
@ -2073,7 +2163,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 64: Nodeent_Syntax
# Fix 67: Nodeent_Syntax
#
case "${file}" in ./netdnet/dnetdb.h )
fixlist="${fixlist}
@ -2091,7 +2181,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 65: Osf_Namespace_A
# Fix 68: Osf_Namespace_A
#
case "${file}" in ./reg_types.h | \
./sys/lc_core.h )
@ -2118,7 +2208,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 66: Osf_Namespace_B
# Fix 69: Osf_Namespace_B
#
case "${file}" in ./regex.h )
if ( test '(' -r reg_types.h ')' -a \
@ -2146,7 +2236,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 67: Pthread_Page_Size
# Fix 70: Pthread_Page_Size
#
case "${file}" in ./pthread.h )
if ( test -n "`egrep '^int __page_size' ${file}`"
@ -2167,7 +2257,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 68: Read_Ret_Type
# Fix 71: Read_Ret_Type
#
case "${file}" in ./stdio.h )
if ( test -n "`egrep 'extern int .*, fread\\(\\), fwrite\\(\\)' ${file}`"
@ -2189,7 +2279,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 69: Rs6000_Double
# Fix 72: Rs6000_Double
#
case "${file}" in ./math.h )
if ( test -n "`egrep '[^a-zA-Z_]class\\(' ${file}`"
@ -2215,7 +2305,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 70: Rs6000_Fchmod
# Fix 73: Rs6000_Fchmod
#
case "${file}" in ./sys/stat.h )
if ( test -n "`egrep 'fchmod\\(char' ${file}`"
@ -2236,7 +2326,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 71: Rs6000_Param
# Fix 74: Rs6000_Param
#
case "${file}" in ./stdio.h | \
./unistd.h )
@ -2255,7 +2345,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 72: Sony_Include
# Fix 75: Sony_Include
#
case "${file}" in ./machine/machparam.h )
if ( test -n "`egrep '\"\\.\\./machine/endian.h\"' ${file}`"
@ -2276,7 +2366,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 73: Statsswtch
# Fix 76: Statsswtch
#
case "${file}" in ./rpcsvc/rstat.h )
if ( test -n "`egrep 'boottime$' ${file}`"
@ -2297,7 +2387,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 74: Stdio_Va_List
# Fix 77: Stdio_Va_List
#
case "${file}" in ./stdio.h )
fixlist="${fixlist}
@ -2336,7 +2426,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 75: Sun_Bogus_Ifdef
# Fix 78: Sun_Bogus_Ifdef
#
case "${file}" in ./hsfs/hsfs_spec.h | \
./hsfs/iso_spec.h )
@ -2358,7 +2448,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 76: Sun_Bogus_Ifdef_Sun4c
# Fix 79: Sun_Bogus_Ifdef_Sun4c
#
case "${file}" in ./hsfs/hsnode.h )
if ( test -n "`egrep '#ifdef __i386__ || __sun4c__' ${file}`"
@ -2379,7 +2469,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 77: Sun_Catmacro
# Fix 80: Sun_Catmacro
#
case "${file}" in ./pixrect/memvar.h )
if ( test -n "`egrep '^#define[ ]+CAT\\(a,b\\)' ${file}`"
@ -2407,7 +2497,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 78: Sun_Malloc
# Fix 81: Sun_Malloc
#
case "${file}" in ./malloc.h )
fixlist="${fixlist}
@ -2428,7 +2518,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 79: Sun_Memcpy
# Fix 82: Sun_Memcpy
#
case "${file}" in ./memory.h )
if ( test -n "`egrep '/\\* @\\(#\\)(head/memory.h 50.1 |memory\\.h 1\\.[2-4] 8./../.. SMI; from S5R2 1\\.2 )\\*/' ${file}`"
@ -2470,7 +2560,7 @@ extern int memcmp();\
#
# Fix 80: Sun_Rusers_Semi
# Fix 83: Sun_Rusers_Semi
#
case "${file}" in ./rpcsvc/rusers.h )
if ( test -n "`egrep '_cnt$' ${file}`"
@ -2491,7 +2581,7 @@ extern int memcmp();\
#
# Fix 81: Sun_Signal
# Fix 84: Sun_Signal
#
case "${file}" in ./sys/signal.h | \
./signal.h )
@ -2520,7 +2610,7 @@ void (*signal(...))(...);\
#
# Fix 82: Sun_Auth_Proto
# Fix 85: Sun_Auth_Proto
#
case "${file}" in ./rpc/auth.h | \
./rpc/clnt.h | \
@ -2549,7 +2639,7 @@ void (*signal(...))(...);\
#
# Fix 83: Sunos_Matherr_Decl
# Fix 86: Sunos_Matherr_Decl
#
case "${file}" in ./math.h )
fixlist="${fixlist}
@ -2570,7 +2660,7 @@ struct exception;
#
# Fix 84: Sunos_Strlen
# Fix 87: Sunos_Strlen
#
case "${file}" in ./strings.h )
fixlist="${fixlist}
@ -2588,7 +2678,7 @@ struct exception;
#
# Fix 85: Systypes
# Fix 88: Systypes
#
case "${file}" in ./sys/types.h | \
./stdlib.h | \
@ -2642,7 +2732,7 @@ typedef __SIZE_TYPE__ size_t;\
#
# Fix 86: Systypes_For_Aix
# Fix 89: Systypes_For_Aix
#
case "${file}" in ./sys/types.h )
if ( test -n "`egrep 'typedef[ ][ ]*[A-Za-z_][ A-Za-z_]*[ ]size_t' ${file}`"
@ -2673,7 +2763,7 @@ typedef __SIZE_TYPE__ size_t;\
#
# Fix 87: Sysv68_String
# Fix 90: Sysv68_String
#
case "${file}" in ./string.h )
fixlist="${fixlist}
@ -2701,7 +2791,7 @@ extern unsigned int\
#
# Fix 88: Sysz_Stdlib_For_Sun
# Fix 91: Sysz_Stdlib_For_Sun
#
case "${file}" in ./stdlib.h )
fixlist="${fixlist}
@ -2732,7 +2822,7 @@ extern unsigned int\
#
# Fix 89: Sysz_Stdtypes_For_Sun
# Fix 92: Sysz_Stdtypes_For_Sun
#
case "${file}" in ./sys/stdtypes.h )
fixlist="${fixlist}
@ -2770,7 +2860,7 @@ extern unsigned int\
#
# Fix 90: Tinfo_Cplusplus
# Fix 93: Tinfo_Cplusplus
#
case "${file}" in ./tinfo.h )
fixlist="${fixlist}
@ -2788,7 +2878,7 @@ extern unsigned int\
#
# Fix 91: Ultrix_Ansi_Compat
# Fix 94: Ultrix_Ansi_Compat
#
case "${file}" in ./ansi_compat.h )
if ( test -n "`egrep 'ULTRIX' ${file}`"
@ -2812,7 +2902,7 @@ extern unsigned int\
#
# Fix 92: Ultrix_Fix_Fixproto
# Fix 95: Ultrix_Fix_Fixproto
#
case "${file}" in ./sys/utsname.h )
if ( test -n "`egrep 'ULTRIX' ${file}`"
@ -2835,7 +2925,7 @@ struct utsname;
#
# Fix 93: Ultrix_Atof_Param
# Fix 96: Ultrix_Atof_Param
#
case "${file}" in ./math.h )
fixlist="${fixlist}
@ -2857,7 +2947,7 @@ struct utsname;
#
# Fix 94: Ultrix_Const
# Fix 97: Ultrix_Const
#
case "${file}" in ./stdio.h )
fixlist="${fixlist}
@ -2883,7 +2973,7 @@ struct utsname;
#
# Fix 95: Ultrix_Ifdef
# Fix 98: Ultrix_Ifdef
#
case "${file}" in ./sys/file.h )
if ( test -n "`egrep '#ifdef KERNEL' ${file}`"
@ -2904,7 +2994,7 @@ struct utsname;
#
# Fix 96: Ultrix_Nested_Cmnt
# Fix 99: Ultrix_Nested_Cmnt
#
case "${file}" in ./rpc/svc.h )
fixlist="${fixlist}
@ -2922,7 +3012,7 @@ struct utsname;
#
# Fix 97: Ultrix_Static
# Fix 100: Ultrix_Static
#
case "${file}" in ./machine/cpu.h )
if ( test -n "`egrep '#include \"r[34]_cpu' ${file}`"
@ -2945,7 +3035,7 @@ struct utsname;
#
# Fix 98: Undefine_Null
# Fix 101: Undefine_Null
#
if ( test -n "`egrep '^#[ ]*define[ ]*[ ]NULL[ ]' ${file}`"
) > /dev/null 2>&1 ; then
@ -2969,7 +3059,7 @@ struct utsname;
#
# Fix 99: Unixware7_Byteorder_Fix
# Fix 102: Unixware7_Byteorder_Fix
#
case "${file}" in ./arpa/inet.h )
case "$target_canonical" in *-*-sysv4* | \
@ -2999,7 +3089,7 @@ struct utsname;
#
# Fix 100: Va_I960_Macro
# Fix 103: Va_I960_Macro
#
case "${file}" in ./arch/i960/archI960.h )
if ( test -n "`egrep '__(vsiz|vali|vpad|alignof__)' ${file}`"
@ -3023,7 +3113,7 @@ struct utsname;
#
# Fix 101: Void_Null
# Fix 104: Void_Null
#
case "${file}" in ./curses.h | \
./dbm.h | \
@ -3054,7 +3144,7 @@ struct utsname;
#
# Fix 102: Vxworks_Gcc_Problem
# Fix 105: Vxworks_Gcc_Problem
#
case "${file}" in ./types/vxTypesBase.h )
if ( test -n "`egrep '__GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__' ${file}`"
@ -3096,7 +3186,7 @@ struct utsname;
#
# Fix 103: Vxworks_Needs_Vxtypes
# Fix 106: Vxworks_Needs_Vxtypes
#
case "${file}" in ./time.h )
if ( test -n "`egrep 'uint_t[ ][ ]*_clocks_per_sec' ${file}`"
@ -3117,7 +3207,7 @@ struct utsname;
#
# Fix 104: Vxworks_Needs_Vxworks
# Fix 107: Vxworks_Needs_Vxworks
#
case "${file}" in ./sys/stat.h )
if ( test -n "`egrep '#[ ]define[ ][ ]*__INCstath' ${file}`"
@ -3145,7 +3235,7 @@ struct utsname;
#
# Fix 105: Vxworks_Time
# Fix 108: Vxworks_Time
#
case "${file}" in ./time.h )
if ( test -n "`egrep 'VOIDFUNCPTR' ${file}`"
@ -3179,7 +3269,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
#
# Fix 106: X11_Class
# Fix 109: X11_Class
#
case "${file}" in ./X11/ShellP.h )
if ( test -a \
@ -3208,7 +3298,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
#
# Fix 107: X11_Class_Usage
# Fix 110: X11_Class_Usage
#
case "${file}" in ./Xm/BaseClassI.h )
if ( test -a \
@ -3230,7 +3320,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
#
# Fix 108: X11_New
# Fix 111: X11_New
#
case "${file}" in ./Xm/Traversal.h )
if ( test -a \
@ -3260,7 +3350,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
#
# Fix 109: X11_Sprintf
# Fix 112: X11_Sprintf
#
case "${file}" in ./X11*/Xmu.h )
fixlist="${fixlist}

7
gcc/fixinc/mkfixinc.sh
View File

@ -14,17 +14,13 @@ fixincludes="${target}"
case $machine in
i[34567]86-*-linux-gnu*)
fixincludes=fixinc.x86-linux-gnu
:
;;
*-*-sysv4*)
fixincludes=fixinc.svr4
;;
mips-dec-bsd*)
:
;;
i[34567]86-*-sysv5* | \
i[34567]86-*-udk* | \
i[34567]86-*-solaris2.[0-4] | \
@ -62,7 +58,6 @@ case $machine in
fixincludes=fixinc.sco
;;
alpha*-*-linux-gnu* | \
alpha*-dec-vms* | \
arm-semi-aout | armel-semi-aout | \
arm-semi-aof | armel-semi-aof | \