inclhack.def (stdio_va_list): Removed _ap fix.

	* fixinc/inclhack.def (stdio_va_list): Removed _ap fix.
	(irix_stdio_va_list): Don't require leading printf, IRIX 6.5.21
	introduced some multi-line prototypes.
	* fixinc/fixincl.x: Regenerate.

From-SVN: r72165

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4e459331e02da355423e9bdd7a0760d56e81a45e..fd59fc86f708f3a8c9a33fcbd3c96f454fed9cd0 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-06  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+       * fixinc/inclhack.def (stdio_va_list): Removed _ap fix.
+       (irix_stdio_va_list): Don't require leading printf, IRIX 6.5.21
+       introduced some multi-line prototypes.
+       * fixinc/fixincl.x: Regenerate.
+
 2003-10-06  Richard Sandiford  <rsandifo@redhat.com>
 
        * config/mips/mips.h (PREDICATE_CODES): Add stack_operand.

diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index 7e2045f1f17d86c824eb0d4a9829a3571339c66c..a30a384e95e4e2d7af3623f1622061ca8ee0c410 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  Monday September  1, 2003 at 01:54:41 PM MEST
+ * It has been AutoGen-ed  Monday October  6, 2003 at 09:28:53 PM MEST
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT CVS-MERGE THIS FILE, EITHER Mon Sep  1 13:54:42 MEST 2003
+/* DO NOT CVS-MERGE THIS FILE, EITHER Mon Oct  6 21:28:53 MEST 2003
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -2610,7 +2610,7 @@ tSCC zIrix_Stdio_Va_ListList[] =
  *  content selection pattern - do fix if pattern found
  */
 tSCC zIrix_Stdio_Va_ListSelect0[] =
-       "(printf\\(.*), /\\* va_list \\*/ char \\*";
+       "/\\* va_list \\*/ char \\*";
 
 #define    IRIX_STDIO_VA_LIST_TEST_CT  1
 static tTestDesc aIrix_Stdio_Va_ListTests[] = {
@@ -2621,7 +2621,7 @@ static tTestDesc aIrix_Stdio_Va_ListTests[] = {
  */
 static const char* apzIrix_Stdio_Va_ListPatch[] = {
     "format",
-    "%1, __gnuc_va_list",
+    "__gnuc_va_list",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -4276,7 +4276,6 @@ static tTestDesc aStdio_Va_ListTests[] = {
 static const char* apzStdio_Va_ListPatch[] = { "sed",
     "-e", "s@ va_list @ __gnuc_va_list @\n\
 s@ va_list)@ __gnuc_va_list)@\n\
-s@va_list _ap;@__gnuc_va_list _ap;@\n\
 s@(va_list)&@(__gnuc_va_list)\\&@\n\
 s@ _VA_LIST_));@ __gnuc_va_list));@\n\
 s@ __VA_LIST__));@ __gnuc_va_list));@\n\

diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 47339b4e4e96cc65da8785a4171a19ae9b1cda39..636ac0fcb18a00f9769f15b514a0e7377a6be9c6 100644 (file)
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -1480,9 +1480,9 @@ fix = {
     files     = stdio.h;
     files     = internal/stdio_core.h;
 
-    select = '(printf\(.*), /\* va_list \*/ char \*';
+    select = '/\* va_list \*/ char \*';
     c_fix  = format;
-    c_fix_arg = "%1, __gnuc_va_list";
+    c_fix_arg = "__gnuc_va_list";
     test_text =
     "extern int printf( const char *, /* va_list */ char * );";
 };
@@ -2406,7 +2406,6 @@ fix = {
      */
     sed = "s@ va_list @ __gnuc_va_list @\n"
           "s@ va_list)@ __gnuc_va_list)@\n"
-         "s@va_list _ap;@__gnuc_va_list _ap;@\n"
          "s@(va_list)&@(__gnuc_va_list)\\&@\n"
           "s@ _VA_LIST_));@ __gnuc_va_list));@\n"
           "s@ __VA_LIST__));@ __gnuc_va_list));@\n"