diff options
| author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-11-03 21:07:34 +0000 |
|---|---|---|
| committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-11-03 21:07:34 +0000 |
| commit | 2a024ef8b17ef80a2450df0b17758e1383d4a90a (patch) | |
| tree | 152c159a4b57d46d1f99a1c19c19d9bfc622b82b /gcc/fixinc | |
| parent | 45100280fe119b8ef8058e9a22d878616a1221b1 (diff) | |
| download | gcc-2a024ef8b17ef80a2450df0b17758e1383d4a90a.tar.gz | |
* fixinc/inclhack.def (stdio_va_list): Allow tab before va_list.
Merge two substitutions.
* fixinc/fixincl.x: Regenerate.
Fixes PR bootstrap/12666.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@73226 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fixinc')
| -rw-r--r-- | gcc/fixinc/fixincl.x | 7 | ||||
| -rw-r--r-- | gcc/fixinc/inclhack.def | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index 08e29593334..5795b7fccc6 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 432d0166512..1715fe2debf 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" |