diff options
| author | Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> | 2003-11-03 21:07:34 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2003-11-03 21:07:34 +0000 |
| commit | 871a312206d8bdaa75088ea61c1971fc5d73f4f9 (patch) | |
| tree | 152c159a4b57d46d1f99a1c19c19d9bfc622b82b /gcc | |
| parent | 0968e7fa1eb679814b628788442cf7642abae62a (diff) | |
| download | gcc-871a312206d8bdaa75088ea61c1971fc5d73f4f9.zip gcc-871a312206d8bdaa75088ea61c1971fc5d73f4f9.tar.gz gcc-871a312206d8bdaa75088ea61c1971fc5d73f4f9.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fixinc/fixincl.x | 7 | ||||
| -rw-r--r-- | gcc/fixinc/inclhack.def | 3 |
3 files changed, 11 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 309519e..39a83e9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +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> * doc/install-old.texi: Remove VMS documentation. diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index 08e2959..5795b7f 100644 --- a/gcc/fixinc/fixincl.x +++ b/gcc/fixinc/fixincl.x @@ -2,11 +2,11 @@ * * 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 * 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. * @@ -4384,8 +4384,7 @@ static tTestDesc aStdio_Va_ListTests[] = { * Fix Command Arguments for Stdio_Va_List */ static const char* apzStdio_Va_ListPatch[] = { "sed", - "-e", "s@ va_list @ __gnuc_va_list @\n\ -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\ diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index 432d016..1715fe2 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -2469,8 +2469,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" |