inclhack.def (svr4_profil): Don't apply on IRIX 5/6.

	* fixinc/inclhack.def (svr4_profil): Don't apply on IRIX 5/6.
	* fixinc/fixincl.x: Regenerate.

From-SVN: r81437

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bcf0c0ebb76536fb1e6beca0d42564cb0adedd3e..cba6deffee77c29e4c51d408815ae98bc1105cd7 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-03  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+       * fixinc/inclhack.def (svr4_profil): Don't apply on IRIX 5/6.
+       * fixinc/fixincl.x: Regenerate.
+
 2004-05-03  Uros Bizjak  <uros@kss-loka.si>
 
        * config/i386/i386.md (*fyl2x_sfxf3, *fyl2x_dfxf3): Remove insn

diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index efd41f300e8fcad6b6f09e077d6ada46751a29d2..a1b650e5dc6c37d69864929288b1457345481f55 100644 (file)
--- 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  Friday April 23, 2004 at 06:53:51 AM MDT
+ * It has been AutoGen-ed  Monday May  3, 2004 at 05:17:48 PM MEST
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT CVS-MERGE THIS FILE, EITHER Fri Apr 23 06:53:51 MDT 2004
+/* DO NOT CVS-MERGE THIS FILE, EITHER Mon May  3 17:17:49 MEST 2004
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -5382,8 +5382,15 @@ tSCC zSvr4_ProfilList[] =
 tSCC zSvr4_ProfilSelect0[] =
        "profil\\(unsigned short \\*, unsigned int, unsigned int, unsigned int\\)";
 
-#define    SVR4_PROFIL_TEST_CT  1
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zSvr4_ProfilBypass0[] =
+       "Silicon Graphics";
+
+#define    SVR4_PROFIL_TEST_CT  2
 static tTestDesc aSvr4_ProfilTests[] = {
+  { TT_NEGREP,   zSvr4_ProfilBypass0, (regex_t*)NULL },
   { TT_EGREP,    zSvr4_ProfilSelect0, (regex_t*)NULL }, };
 
 /*
@@ -6929,7 +6936,7 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          196
+#define REGEX_COUNT          197
 #define MACH_LIST_SIZE_LIMIT 261
 #define FIX_COUNT            175
 

diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 2e57d0f0e5c2504f2c687a48e1590fe874c8d88b..aa26ff7c01399893ca9a0c85e20e3023e755cca6 100644 (file)
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -3161,6 +3161,9 @@ fix = {
 
     select    =
     'profil\(unsigned short \*, unsigned int, unsigned int, unsigned int\)';
+    /* The fix is wrong on IRIX 5/6 and creates a conflict with another
+       prototype in <sys/profil.h>.  */
+    bypass    = 'Silicon Graphics';
     c_fix     = format;
     c_fix_arg = 'profil(unsigned short *, size_t, int, unsigned int)';