Commit 871a3122 by Rainer Orth Committed by Rainer Orth

re PR bootstrap/12666 (fixincludes problem on IRIX 6.5.19m)

	* fixinc/inclhack.def (stdio_va_list): Allow tab before va_list.
	Merge two substitutions.
	* fixinc/fixincl.x: Regenerate.
	Fixes PR bootstrap/12666.

From-SVN: r73226
parent 0968e7fa
2003-11-03 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* fixinc/inclhack.def (stdio_va_list): Allow tab before va_list.
Merge two substitutions.
* fixinc/fixincl.x: Regenerate.
Fixes PR bootstrap/12666.
2003-11-03 Joseph S. Myers <jsm@polyomino.org.uk> 2003-11-03 Joseph S. Myers <jsm@polyomino.org.uk>
* doc/install-old.texi: Remove VMS documentation. * doc/install-old.texi: Remove VMS documentation.
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
* *
* DO NOT EDIT THIS FILE (fixincl.x) * DO NOT EDIT THIS FILE (fixincl.x)
* *
* It has been AutoGen-ed Saturday October 25, 2003 at 10:36:26 AM PDT * It has been AutoGen-ed Monday November 3, 2003 at 10:05:53 PM MET
* From the definitions inclhack.def * From the definitions inclhack.def
* and the template file fixincl * and the template file fixincl
*/ */
/* DO NOT CVS-MERGE THIS FILE, EITHER Sat Oct 25 10:36:26 PDT 2003 /* DO NOT CVS-MERGE THIS FILE, EITHER Mon Nov 3 22:05:53 MET 2003
* *
* You must regenerate it. Use the ./genfixes script. * You must regenerate it. Use the ./genfixes script.
* *
...@@ -4384,8 +4384,7 @@ static tTestDesc aStdio_Va_ListTests[] = { ...@@ -4384,8 +4384,7 @@ static tTestDesc aStdio_Va_ListTests[] = {
* Fix Command Arguments for Stdio_Va_List * Fix Command Arguments for Stdio_Va_List
*/ */
static const char* apzStdio_Va_ListPatch[] = { "sed", static const char* apzStdio_Va_ListPatch[] = { "sed",
"-e", "s@ va_list @ __gnuc_va_list @\n\ "-e", "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\
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\
......
...@@ -2469,8 +2469,7 @@ fix = { ...@@ -2469,8 +2469,7 @@ fix = {
* instead of va_list. * instead of va_list.
* Don't claim to have defined va_list. * Don't claim to have defined va_list.
*/ */
sed = "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"
"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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment