From 5650fd392a55100f4d1c8cc656954305e4801e4b Mon Sep 17 00:00:00 2001 From: Nathanael Nerode Date: Fri, 29 Aug 2003 18:40:42 +0000 Subject: [PATCH] inclhack.def: Remove special cases for unsupported PTX 1 and PTX 2 (including... * fixinc/inclhack.def: Remove special cases for unsupported PTX 1 and PTX 2 (including i[34567]86-sequent-sysv3). * fixinc/fixincl.x: Regenerate. From-SVN: r70918 --- gcc/ChangeLog | 6 +++++ gcc/fixinc/fixincl.x | 6 ++--- gcc/fixinc/inclhack.def | 51 ----------------------------------------- 3 files changed, 8 insertions(+), 55 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6e61113a7d2..6968af4349f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2003-08-29 Nathanael Nerode + + * fixinc/inclhack.def: Remove special cases for unsupported + PTX 1 and PTX 2 (including i[34567]86-sequent-sysv3). + * fixinc/fixincl.x: Regenerate. + 2003-08-29 Mark Mitchell * Makefile.in (cpp.info): Just state dependencies. diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index e730e47011f..bbc664b4ee8 100644 --- a/gcc/fixinc/fixincl.x +++ b/gcc/fixinc/fixincl.x @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (fixincl.x) * - * It has been AutoGen-ed Wednesday August 27, 2003 at 12:21:31 PM EDT + * It has been AutoGen-ed Friday August 29, 2003 at 01:36:38 PM EDT * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT CVS-MERGE THIS FILE, EITHER Wed Aug 27 12:21:31 EDT 2003 +/* DO NOT CVS-MERGE THIS FILE, EITHER Fri Aug 29 13:36:38 EDT 2003 * * You must regenerate it. Use the ./genfixes script. * @@ -300,7 +300,6 @@ fix = {\n\ mach = \"powerpcle-*-solaris2.[0-4]\";\n\ mach = \"sparc-*-solaris2.[0-4]\";\n\ mach = \"i[34567]86-sequent-ptx*\";\n\ - mach = \"i[34567]86-sequent-sysv3*\";\n\ files = sys/byteorder.h;\n\ replace = <<- _EndOfHeader_\n\ #ifndef _SYS_BYTEORDER_H\n\ @@ -4923,7 +4922,6 @@ tSCC zSvr4_KrnlList[] = tSCC* apzSvr4_KrnlMachs[] = { "*-*-sysv4*", "i?86-sequent-ptx*", - "i?86-sequent-sysv3*", (const char*)NULL }; /* diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index a9472aeb578..edf28b5cf0e 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -235,7 +235,6 @@ fix = { mach = "powerpcle-*-solaris2.[0-4]"; mach = "sparc-*-solaris2.[0-4]"; mach = "i[34567]86-sequent-ptx*"; - mach = "i[34567]86-sequent-sysv3*"; files = sys/byteorder.h; replace = <<- _EndOfHeader_ #ifndef _SYS_BYTEORDER_H @@ -2016,55 +2015,6 @@ fix = { }; -/* - * In netinet/in.h, the network byte swapping asm functions supported by the - * native cc compiler on PTX 1.x and 2.x are not supported by gcc. Instead, - * include , written out by fixincludes, which has - * these same routines written in an asm format supported by gcc. - */ -#ifdef PTX -fix = { - hackname = ptx_netswap; - files = netinet/in.h; - sed = "/#define NETSWAP/a\\\n" - "\\\n" - "#if defined (__GNUC__) || defined (__GNUG__)\\\n" - "#include \\\n" - "#else /* not __GNUC__ */\n"; - sed = "/#endif[ \t]*\\/\\* NETSWAP \\*\\//i\\\n" - "#endif /* not __GNUC__ */\n"; - /* Half-hearted test case: I have no idea what the file this is really - supposed to operate on looks like. */ - test_text = "#define NETSWAP\n" - "#endif /* NETSWAP */"; -}; -#endif - - -/* - * In pwd.h, PTX 1.x needs stdio.h included since FILE * was added in a - * prototype later on in the file. (It's not clear that this is - * still true, and even if it is, FILE * may be added after this fix runs by - * fixproto.) - */ -#ifdef PTX -fix = { - hackname = ptx_pwd_h; - files = pwd.h; - select = 'FILE \*'; - bypass = 'stdio.h'; - sed = "/#include \\\n" - "#endif /* __STDC__ */\\\n" - "\n"; - test_text = "#include \n" - "void foo (FILE *)"; -}; -#endif - - /* * On DYNIX/ptx, sys/mc_param.h has an embedded asm for the cpuid instruction * on the P5. This is not used by anything else so we ifdef it out. @@ -2894,7 +2844,6 @@ fix = { * in any case. -- Nathanael */ mach = '*-*-sysv4*'; mach = 'i?86-sequent-ptx*'; - mach = 'i?86-sequent-sysv3*'; files = fs/rfs/rf_cache.h; files = sys/erec.h; files = sys/err.h; -- 2.30.2