re PR other/12969 (Including sys/byteorder.h breaks configure checks)

2003-12-03  Kean Johnston  <jkj@sco.com>

	PR 12969
	* fixinc/inclhack.def (AAB_svr4_replace_byteorder): Revert the
	change I made on 2003-08-11 that removes the mach lines.
	Restore them to the same list thats in the head, as per
	Nathanael Nerode's changes.
	* fixinc/fixincl.x: Regenerated
	* fixinc/tests/base/ansi/string.h: Fix test case

From-SVN: r74242

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 13d0705a84ed88adf1d9d70d225fd59ff1c7f41a..7a7bb75f7f295fb418ee9d6bf1c45da560d831cd 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2003-12-03  Kean Johnston  <jkj@sco.com>
+
+       PR 12969
+       * fixinc/inclhack.def (AAB_svr4_replace_byteorder): Revert the
+       change I made on 2003-08-11 that removes the mach lines.
+       Restore them to the same list thats in the head, as per
+       Nathanael Nerode's changes.
+       * fixinc/fixincl.x: Regenerated
+       * fixinc/tests/base/ansi/string.h: Fix test case
+
 2003-12-03  James E Wilson  <wilson@specifixinc.com>
 
        2003-12-01  James E Wilson  <wilson@specifixinc.com>

diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index 5fb0a57755e6da77dbed378909cbd4433451f7db..0f20f3a5806bbf64253b8c08108286fb6f4ed539 100644 (file)
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -342,7 +342,16 @@ tSCC zAab_Svr4_Replace_ByteorderList[] =
 /*
  *  Machine/OS name selection pattern
  */
-#define apzAab_Svr4_Replace_ByteorderMachs (const char**)NULL
+tSCC* apzAab_Svr4_Replace_ByteorderMachs[] = {
+        "*-*-sysv4*",
+        "i[34567]86-*-sysv5*",
+        "i[34567]86-*-sco3.2v5*",
+        "i[34567]86-*-udk*",
+        "i[34567]86-*-solaris2.[0-4]",
+        "powerpcle-*-solaris2.[0-4]",
+        "sparc-*-solaris2.[0-4]",
+        "i[34567]86-sequent-ptx*",
+        (const char*)NULL };
 #define AAB_SVR4_REPLACE_BYTEORDER_TEST_CT  0
 #define aAab_Svr4_Replace_ByteorderTests   (tTestDesc*)NULL
 
@@ -6410,7 +6419,7 @@ static const char* apzX11_SprintfPatch[] = {
  *  List of all fixes
  */
 #define REGEX_COUNT          177
-#define MACH_LIST_SIZE_LIMIT 261
+#define MACH_LIST_SIZE_LIMIT 334
 #define FIX_COUNT            163
 
 /*

diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 72691ab714ac2291ace07696b824a90b49ed4874..676463e24be765e3fde73e98c0207d98c8135944 100644 (file)
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -301,6 +301,14 @@ fix = {
  */
 fix = {
     hackname = AAB_svr4_replace_byteorder;
+    mach     = "*-*-sysv4*";
+    mach     = "i[34567]86-*-sysv5*";
+    mach     = "i[34567]86-*-sco3.2v5*";
+    mach     = "i[34567]86-*-udk*";
+    mach     = "i[34567]86-*-solaris2.[0-4]";
+    mach     = "powerpcle-*-solaris2.[0-4]";
+    mach     = "sparc-*-solaris2.[0-4]";
+    mach     = "i[34567]86-sequent-ptx*";
     files    = sys/byteorder.h;
     replace  = '#ifndef _SYS_BYTEORDER_H
 \#define _SYS_BYTEORDER_H

diff --git a/gcc/fixinc/tests/base/ansi/string.h b/gcc/fixinc/tests/base/ansi/string.h
index 121a6264206339431beb49e0f5008f0f367ecfba..4067275d51531805cf75879387d49014f5806aad 100644 (file)
--- a/gcc/fixinc/tests/base/ansi/string.h
+++ b/gcc/fixinc/tests/base/ansi/string.h
@@ -10,8 +10,8 @@
 
 
 #if defined( SCO_STRING_CHECK )
-extern "C++" {
 #ifndef __GNUC__
+extern "C++" {
 inline void *memchr(void *__1, int __2, size_t __3)
        { return (void *)memchr((const void *)__1, __2, __3); }
 inline char *strstr(char *__1, const char *__2)