From 6d638aac8a58088e8a21e3dcba96f627646df122 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Thu, 6 Dec 2001 21:52:42 +0000 Subject: [PATCH] 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 --- gcc/ChangeLog | 7 +++++++ gcc/fixinc/fixincl.x | 1 + gcc/fixinc/inclhack.def | 4 +++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 167de28..23f5012 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2001-12-06 Rainer Orth + + * 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 Richard Henderson diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index 32e8e71..1b8f23f 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 ef776e2..af0d3f4 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" -- 2.7.4