Skip to content

R
riscv-gcc-1
Commit 929a75b2 by Bruce Korb
Options

Remove commentary fixes. Regenerate fixincl.x just to show there is no difference. 

From-SVN: r136561
parent c1db9545
Showing with 22 additions and 335 deletions
fixincludes/fixincl.x
......@@ -2,11 +2,11 @@
*
* DO NOT EDIT THIS FILE (fixincl.x)
*
* It has been AutoGen-ed Saturday June 7, 2008 at 03:19:21 PM PDT
* It has been AutoGen-ed Sunday June 8, 2008 at 09:04:48 AM PDT
* From the definitions inclhack.def
* and the template file fixincl
*/
/* DO NOT SVN-MERGE THIS FILE, EITHER Sat Jun 7 15:19:21 PDT 2008
/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Jun 8 09:04:48 PDT 2008
*
* You must regenerate it. Use the ./genfixes script.
*
......
fixincludes/inclhack.def
......@@ -75,24 +75,24 @@ fix = {
files = architecture/ppc/math.h;
bypass = "powl";
replace = <<- _EndOfHeader_
/* This file prototypes the long double functions available on Mac OS
/* 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
#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
# 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);
......@@ -150,11 +150,11 @@ fix = {
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
# ifdef __cplusplus
}
# endif
#endif /* __MATH__ */
_EndOfHeader_;
# endif
#endif /* __MATH__ */
_EndOfHeader_;
};
......@@ -356,29 +356,6 @@ fix = {
/*
* Completely replace <sys/varargs.h> with a file that includes gcc's
* stdarg.h or varargs.h files as appropriate.
*/
#ifdef SVR4
fix = {
hackname = AAB_svr4_no_varargs;
files = sys/varargs.h;
replace = "/* This file was generated by fixincludes. */\n"
"#ifndef _SYS_VARARGS_H\n"
"#define _SYS_VARARGS_H\n\n"
"#ifdef __STDC__\n"
"#include <stdarg.h>\n"
"#else\n"
"#include <varargs.h>\n"
"#endif\n\n"
"#endif /* _SYS_VARARGS_H */\n";
};
#endif
/*
* pthread.h on AIX 4.3.3 tries to define a macro without whitspace
* which violates a requirement of ISO C.
*/
......@@ -2218,20 +2195,6 @@ fix = {
/*
* Apparently some SVR4 systems typedef longlong_t to long ?
*/
#ifdef SVR4
fix = {
hackname = longlong_t;
select = "typedef[ \t]+(unsigned[ \t]+)?long[ \t]+(u_)?longlong_t";
c_fix = format;
c_fix_arg = "typedef %1long long %2longlong_t";
test_text = "typedef long longlong_t\n"
"typedef unsigned long u_longlong_t";
};
#endif
/*
* 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.
......@@ -3415,98 +3378,6 @@ fix = {
/*
* Conditionalize some of <sys/endian.h> on __GNUC__ and __GNUG__.
* On some systems (UnixWare 2, UnixWare 7), the file is byteorder.h
* but we still "hijack" it and redirect it to the GNU byteorder.h..
*/
#ifdef SVR5
fix = {
hackname = svr4_endian;
files = sys/endian.h;
#ifdef LATER
/*
* since we emit our own sys/byteorder.h,
* this fix can never be applied to that file.
*/
files = sys/byteorder.h;
#endif
bypass = '__GNUC__';
sed = "/#\tifdef\t__STDC__/i\\\n"
"# if !defined (__GNUC__) && !defined (__GNUG__)\n";
sed = "/#\t\tinclude\t<sys\\/byteorder.h>/s/\t\t/ /";
sed = "/# include\t<sys\\/byteorder.h>/i\\\n"
"# endif /* !defined (__GNUC__) && !defined (__GNUG__) */\n";
};
#endif /* SVR5 */
/*
* Remove useless extern keyword from struct forward declarations
* in <sys/stream.h> and <sys/strsubr.h>
*/
#ifdef SVR4
fix = {
hackname = svr4_extern_struct;
files = sys/stream.h;
files = sys/strsubr.h;
select = 'extern struct [a-z_]*;';
sed = 's/extern struct \([a-z][a-z_]*\)/struct \1/';
};
#endif
/*
* Fix declarations of `ftw' and `nftw' in <ftw.h>. On some/most SVR4
* systems the file <ftw.h> contains extern declarations of these
* functions followed by explicitly `static' definitions of these
* functions... and that's not allowed according to ANSI C. (Note
* however that on Solaris, this header file glitch has been pre-fixed by
* Sun. In the Solaris version of <ftw.h> there are no static
* definitions of any function so we don't need to do any of this stuff
* when on Solaris.
*/
#ifdef SVR4
#ifndef SOLARIS
fix = {
hackname = svr4_ftw;
files = ftw.h;
select = '^extern int ftw\(const';
sed = '/^extern int ftw(const/i' "\\\n"
"#if !defined(_STYPES)\\\n"
"static\\\n"
"#else\\\n"
"extern\\\n"
"#endif";
sed = 's/extern \(int ftw(const.*\)$/\1/';
sed = "/^extern int nftw/i\\\n"
"#if defined(_STYPES)\\\n"
"static\\\n"
"#else\\\n"
"extern\\\n"
"#endif";
sed = 's/extern \(int nftw.*\)$/\1/';
sed = "/^extern int ftw(),/c\\\n"
"#if !defined(_STYPES)\\\n"
"static\\\n"
"#else\\\n"
"extern\\\n"
"#endif\\\n"
" int ftw();\\\n"
"#if defined(_STYPES)\\\n"
"static\\\n"
"#else\\\n"
"extern\\\n"
"#endif\\\n"
" int nftw();";
};
#endif
#endif
/*
* Fix broken decl of getcwd present on some svr4 systems.
*/
fix = {
......@@ -3524,95 +3395,6 @@ fix = {
/*
* Delete any #defines of `__i386' which may be present in <ieeefp.h>. They
* tend to conflict with the compiler's own definition of this symbol. (We
* will use the compiler's definition.)
* Likewise __sparc, for Solaris, and __i860, and a few others
* (guessing it is necessary for all of them).
*/
#ifdef SVR4
fix = {
hackname = svr4_mach_defines;
files = ieeefp.h;
select = "#define[ \t]*__(i386|mips|sparc|m88k|m68k)[ \t]";
sed = "/#define[ \t]*__\\(i386|mips|sparc|m88k|m68k\\)[ \t]/d";
};
#endif
/*
* Fix declarations of `makedev', `major', and `minor' in <sys/mkdev.h>.
* They are declared as non-static then immediately redeclared as static.
*/
#ifdef SVR5
fix = {
hackname = svr4_mkdev;
files = sys/mkdev.h;
select = '^static';
sed = "/^dev_t makedev(/s/^/static /";
sed = "/^major_t major(/s/^/static /";
sed = "/^minor_t minor(/s/^/static /";
};
#endif /* SVR5 */
/*
* Fix reference to NC_NPI_RAW in <sys/netcspace.h>.
* Also fix types of array initializers.
*/
#ifdef SVR4
fix = {
hackname = svr4_netcspace;
files = sys/netcspace.h;
select = 'NC_NPI_RAW';
sed = 's/NC_NPI_RAW/NC_TPI_RAW/g';
sed = 's/NC_/(unsigned long) NC_/';
};
#endif
/*
* Fix reference to NMSZ in <sys/adv.h>.
*/
#ifdef SVR4
fix = {
hackname = svr4_nmsz;
files = sys/adv.h;
select = '\[NMSZ\]';
sed = 's/\[NMSZ\]/\[RFS_NMSZ\]/g';
};
#endif
/*
* Some SVR4 systems supposedly use these non-ANSI preprocessor directives.
*/
#ifdef SVR4
fix = {
hackname = svr4_preproc_lint_on;
select = '#lint\(on\)';
c_fix = format;
c_fix_arg = 'defined(lint)';
test_text = "#if #lint(on)";
};
fix = {
hackname = svr4_preproc_lint_off;
select = '#lint\(off\)';
c_fix = format;
c_fix_arg = '!defined(lint)';
test_text = "#if #lint(off)";
};
fix = {
hackname = svr4_preproc_machine;
select = '#(machine|system|cpu)\(([^)]*)\)';
c_fix = format;
c_fix_arg = 'defined(__%1__)';
test_text = "#if #machine(i386) || #system(vax) || #cpu(sparc)";
};
#endif
/*
* Fix broken decl of profil present on some svr4 systems.
*/
fix = {
......@@ -3634,75 +3416,6 @@ fix = {
/*
* Convert functions to prototype form, and fix arg names in <sys/stat.h>.
*/
#ifdef SVR4
fix = {
hackname = svr4_proto_form;
files = sys/stat.h;
select = 'const extern';
sed = "/^stat([ \t]*[^c]/ {\nN\nN\n"
"s/(.*)\\n/( /\n"
"s/;\\n/, /\n"
"s/;$/)/\n" "}";
sed = "/^lstat([ \t]*[^c]/ {\nN\nN\n"
"s/(.*)\\n/( /\n"
"s/;\\n/, /\n"
"s/;$/)/\n" "}";
sed = "/^fstat([ \t]*[^i]/ {\nN\nN\n"
"s/(.*)\\n/( /\n"
"s/;\\n/, /\n"
"s/;$/)/\n" "}";
sed = "/^mknod([ \t]*[^c]/{\nN\nN\nN\n"
"s/(.*)\\n/( /\n"
"s/;\\n/, /g\n"
"s/;$/)/\n" "}";
sed = "1,$s/\\([^A-Za-z]\\)path\\([^A-Za-z]\\)/\\1__path\\2/g";
sed = "1,$s/\\([^A-Za-z]\\)buf\\([^A-Za-z]\\)/\\1__buf\\2/g";
sed = "1,$s/\\([^A-Za-z]\\)fd\\([^A-Za-z]\\)/\\1__fd\\2/g";
sed = "1,$s/ret\\([^u]\\)/__ret\\1/g";
sed = "1,$s/\\([^_]\\)mode\\([^_]\\)/\\1__mode\\2/g";
sed = "1,$s/\\([^_r]\\)dev\\([^_]\\)/\\1__dev\\2/g";
};
#endif
/*
* Add a prototyped declaration of mmap to <sys/mman.h>.
*/
#ifdef SVR4
fix = {
hackname = svr4_proto_mmap;
files = sys/mman.h;
select = '^extern caddr_t mmap();$';
sed = '/^extern caddr_t mmap();$/c' "\\\n"
"#ifdef __STDC__\\\n"
"extern caddr_t mmap (caddr_t, size_t, int, int, int, off_t);\\\n"
"#else /* !defined(__STDC__) */\\\n"
"extern caddr_t mmap ();\\\n"
"#endif /* !defined(__STDC__) */\\\n";
};
#endif
/*
* Add a #define of _SIGACTION_ into <sys/signal.h>.
*/
#ifdef SVR4
fix = {
hackname = svr4_sigaction;
files = sys/signal.h;
sed = "/^struct sigaction {/i\\\n"
"#define _SIGACTION_";
sed = 's/(void *(\*)())/(void (*)(int))/';
};
#endif
/*
* Correct types for signal handler constants like SIG_DFL; they might be
* void (*) (), and should be void (*) (int). C++ doesn't like the
* old style.
......@@ -3717,18 +3430,6 @@ fix = {
"#define SIG_IGN (void (*)())0\n";
};
/*
* Put storage class at start of decl, to avoid warning.
*/
#ifdef SVR4
fix = {
hackname = svr4_storage_class;
files = rpc/types.h;
select = 'const extern';
sed = 's/const extern/extern const/g';
};
#endif
/*
* Some SysV r4 systems, including Sequent's DYNIX/ptx, use the local
......@@ -3760,20 +3461,6 @@ fix = {
/*
* Like svr4_mach_defines, but with newfangled syntax.
* Source lines are of #define __i386 #machine(i386). Delete them.
*/
#ifdef SVR5
fix = {
hackname = svr5_mach_defines;
files = ieeefp.h;
select = "#define[ \t]*__i386.*\(i386\)";
sed = "/#define[ \t]*__i386.*/d";
};
#endif /* SVR5 */
/*
* 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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment