From: Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
Date: Thu, 6 Dec 2001 21:52:42 +0000 (+0000)
Subject: re PR libf2c/4826 (Build error for 3.0.2 on Tru64 Unix 5.1A)
X-Git-Tag: prereleases/libstdc++-3.0.95~400
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d638aac8a58088e8a21e3dcba96f627646df122;p=thirdparty%2Fgcc.git

re PR libf2c/4826 (Build error for 3.0.2 on Tru64 Unix 5.1A)

	* fixinc/inclhack.def (stdio_va_list): Handle __VA_LIST__ in Tru64
	UNIX V5.1A stdio.h.
	* fixinc/fixincl.x: Regenerate.
	Fixes PR libf2c/4826.

From-SVN: r47732
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 167de28dd533..23f501228e95 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-06  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* fixinc/inclhack.def (stdio_va_list): Handle __VA_LIST__ in Tru64
+	UNIX V5.1A stdio.h.
+	* fixinc/fixincl.x: Regenerate.
+	Fixes PR libf2c/4826.
+
 2001-12-06  Aldy Hernandez  <aldyh@redhat.com>
             Richard Henderson  <rth@redhat.com>
 
diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index 32e8e71cdde7..1b8f23f7fdea 100644
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -3954,6 +3954,7 @@ 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_));@ __gnuc_va_list));@\n\
+s@ __VA_LIST__));@ __gnuc_va_list));@\n\
 s@ va_list@ __not_va_list__@\n\
 s@\\*va_list@*__not_va_list__@\n\
 s@ __va_list)@ __gnuc_va_list)@\n\
diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index ef776e25cc79..af0d3f44524a 100644
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -2223,7 +2223,8 @@ fix = {
 
     /*
      * Use __gnuc_va_list in arg types in place of va_list.
-     * On 386BSD use __gnuc_va_list instead of _VA_LIST_.  We're hoping the
+     * On 386BSD use __gnuc_va_list instead of _VA_LIST_.  On Tru64 UNIX V5.1A
+     * use __gnuc_va_list instead of __VA_LIST__.  We're hoping the
      * trailing parentheses and semicolon save all other systems from this.
      * Define __not_va_list__ (something harmless and unused)
      * instead of va_list.
@@ -2232,6 +2233,7 @@ fix = {
     sed = "s@ va_list @ __gnuc_va_list @\n"
           "s@ va_list)@ __gnuc_va_list)@\n"
           "s@ _VA_LIST_));@ __gnuc_va_list));@\n"
+          "s@ __VA_LIST__));@ __gnuc_va_list));@\n"
           "s@ va_list@ __not_va_list__@\n"
           "s@\\*va_list@*__not_va_list__@\n"
           "s@ __va_list)@ __gnuc_va_list)@\n"