[llvm-commits] CVS: gcc-3.4/gcc/fixinc/fixincl.x inclhack.def

[John Criswell]

Changes in directory gcc-3.4/gcc/fixinc:

fixincl.x updated: 1.2 -> 1.3
inclhack.def updated: 1.2 -> 1.3

---
Log message:

Commit of merge from September 24, 2003 of mainline GCC.  This merge now
works reasonably on Linux/x86 and probably works on Solaris/Sparc.



---
Diffs of the changes:  (+2 -55)

Index: gcc-3.4/gcc/fixinc/fixincl.x
diff -u gcc-3.4/gcc/fixinc/fixincl.x:1.2 gcc-3.4/gcc/fixinc/fixincl.x:1.3
--- gcc-3.4/gcc/fixinc/fixincl.x:1.2	Fri Jan  9 10:54:32 2004
+++ gcc-3.4/gcc/fixinc/fixincl.x	Thu Feb  5 10:05:47 2004
@@ -2,11 +2,11 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been AutoGen-ed  Wednesday August 27, 2003 at 05:09:27 PM CDT
+ * 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 17:09:27 CDT 2003
+/* DO NOT CVS-MERGE THIS FILE, EITHER Fri Aug 29 13:36:38 EDT 2003
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -338,7 +338,6 @@
     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\
@@ -4961,7 +4960,6 @@
 tSCC* apzSvr4_KrnlMachs[] = {
         "*-*-sysv4*",
         "i?86-sequent-ptx*",
-        "i?86-sequent-sysv3*",
         (const char*)NULL };
 
 /*


Index: gcc-3.4/gcc/fixinc/inclhack.def
diff -u gcc-3.4/gcc/fixinc/inclhack.def:1.2 gcc-3.4/gcc/fixinc/inclhack.def:1.3
--- gcc-3.4/gcc/fixinc/inclhack.def:1.2	Thu Jan  8 17:05:53 2004
+++ gcc-3.4/gcc/fixinc/inclhack.def	Thu Feb  5 10:05:47 2004
@@ -252,7 +252,6 @@
     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
@@ -2034,55 +2033,6 @@
 
 
 /*
- * 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 <sys/byteorder.h>, 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 <sys/byteorder.h>\\\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 <sys\\/types\\.h/a\\\n"
-                "\\\n"
-                "#if defined(__STDC__) || defined(__cplusplus)\\\n"
-                "#include <stdio.h>\\\n"
-                "#endif  /*  __STDC__ */\\\n"
-                "\n";
-    test_text = "#include <sys/types.h>\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.
  * Current GCC doesn't seem to complain about the asm, though.
@@ -2911,7 +2861,6 @@
      * 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;