This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
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: gcc-patches at gcc dot gnu dot org
- Cc: Bruce Korb <bkorb at gnu dot org>, bugzilla-gcc at thewrittenword dot com, sfeehan at sbb dot uvm dot edu
- Date: Wed, 29 Oct 2003 22:09:09 +0100 (MET)
- Subject: 3.3.2/3.4 PATCH: Correctly fix IRIX 6.5.19 <internal/stdio_core.h>
This patch should fix PR bootstrap/12666. It turned out that the IRIX
6.5.19m <internal/stdio_core.h> contained (with cat -T):
^Iva_list _ap;
with a leading tab, while the 6.5.21f one has
^I__SGI_LIBC_NAMESPACE_QUALIFIER va_list _ap;
with only a blank before the `va_list'. The following trivial patch allows
both versions and did the right thing when manually running fixincl against
both headers.
Since I don't have IRIX 6.5.19m any longer, could one of you please verify
the patch (preferably both 3.3 branch and mainline) with a full bootstrap
and regtest? (If you don't have autogen installed, I can send you the
generated fixincl.x in private mail.)
Ok for mainline and 3.3 branch if that passes?
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.
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 29 Oct 2003 20:22:11 -0000
@@ -2469,8 +2536,8 @@ 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 @ __gnuc_va_list @\n"
+ "s@[ \t]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"