This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: 3.3.2/3.4 PATCH: Correctly fix IRIX 6.5.19 <internal/stdio_core.h>
- From: Rainer Orth <ro at TechFak dot Uni-Bielefeld dot DE>
- To: Albert Chin-A-Young <china at thewrittenword dot com>
- Cc: gcc-patches at gcc dot gnu dot org, Bruce Korb <bkorb at gnu dot org>, sfeehan at sbb dot uvm dot edu
- Date: Fri, 31 Oct 2003 21:30:45 +0100 (MET)
- Subject: Re: 3.3.2/3.4 PATCH: Correctly fix IRIX 6.5.19 <internal/stdio_core.h>
- References: <16288.11381.285042.906660@xayide.TechFak.Uni-Bielefeld.DE><20031031050334.GA92740@spuckler.il.thewrittenword.com>
Albert Chin-A-Young writes:
> > Ok for mainline and 3.3 branch if that passes?
>
> It passes on 6.5.19m.
Excellent, thanks for testing.
Would you mind testing the following patch instead, derived from Bruce's
suggestion to simplify the substitution.
Thanks in advance.
Rainer
-----------------------------------------------------------------------------
Rainer Orth, Faculty of Technology, Bielefeld University
Tue Oct 28 19:43:30 2003 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* fixinc/inclhack.def (stdio_va_list): Allow tab before va_list.
Merge two substitutions.
Fixes PR bootstrap/12666.
* fixinc/fixincl.x: Regenerate.
Index: gcc/fixinc/inclhack.def
===================================================================
RCS file: /cvs/gcc/gcc/gcc/fixinc/inclhack.def,v
retrieving revision 1.186
diff -u -p -r1.186 inclhack.def
--- gcc/fixinc/inclhack.def 25 Oct 2003 17:43:13 -0000 1.186
+++ gcc/fixinc/inclhack.def 31 Oct 2003 17:28:13 -0000
@@ -2469,8 +2536,7 @@ fix = {
* instead of va_list.
* Don't claim to have defined va_list.
*/
- sed = "s@ va_list @ __gnuc_va_list @\n"
- "s@ va_list)@ __gnuc_va_list)@\n"
+ sed = "s@[ \t]va_list\\([ \t)]\\)@ __gnuc_va_list\\1@\n"
"s@(va_list)&@(__gnuc_va_list)\\&@\n"
"s@ _VA_LIST_));@ __gnuc_va_list));@\n"
"s@ __VA_LIST__));@ __gnuc_va_list));@\n"