diff options
| author | Jeffrey A Law <law@cygnus.com> | 1999-05-11 23:06:49 +0000 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 1999-05-11 17:06:49 -0600 |
| commit | 49da3efb1da5766b78c47e75ed8b3841afb42ab9 (patch) | |
| tree | f9dd73ed68228e21289f9e719b47023a48c8f52b | |
| parent | c576fce78d826c60697d5b4efe5661401f00ebcb (diff) | |
| download | gcc-49da3efb1da5766b78c47e75ed8b3841afb42ab9.zip gcc-49da3efb1da5766b78c47e75ed8b3841afb42ab9.tar.gz gcc-49da3efb1da5766b78c47e75ed8b3841afb42ab9.tar.bz2 | |
inclhack.def (io_def_quotes): Consistently allow multiple whitespace characters between the "define" and the...
* fixinc/inclhack.def (io_def_quotes): Consistently allow multiple
whitespace characters between the "define" and the name of the macro.
* fixinc/fixincl.x, fixinc/inclhack.sh: Rebuilt.
From-SVN: r26893
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fixinc/fixincl.x | 4 | ||||
| -rw-r--r-- | gcc/fixinc/inclhack.def | 4 | ||||
| -rwxr-xr-x | gcc/fixinc/inclhack.sh | 4 |
4 files changed, 12 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7812e47..af3630e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +Tue May 11 23:55:49 1999 Jeffrey A Law (law@cygnus.com) + + * fixinc/inclhack.def (io_def_quotes): Consistently allow multiple + whitespace characters between the "define" and the name of the macro. + * fixinc/fixincl.x, fixinc/inclhack.sh: Rebuilt. + Tue May 11 20:46:37 1999 Richard Henderson <rth@cygnus.com> * alpha.c (alpha_expand_block_move): Handle TImode registers diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index 61c1447..736943b 100644 --- a/gcc/fixinc/fixincl.x +++ b/gcc/fixinc/fixincl.x @@ -1092,7 +1092,7 @@ tSCC zIo_Def_QuotesName[] = * content selection pattern - do fix if pattern found */ tSCC zIo_Def_QuotesSelect0[] = - "[ \t](_|DES)IO[A-Z]*[ \t]*\\( *[^,']"; + "[ \t]*[ \t](_|DES)IO[A-Z]*[ \t]*\\( *[^,']"; #define IO_DEF_QUOTES_TEST_CT 1 #define IO_DEF_QUOTES_RE_CT 1 @@ -1103,7 +1103,7 @@ tTestDesc aIo_Def_QuotesTests[] = { * Fix Command Arguments for Io_Def_Quotes */ const char* apzIo_Def_QuotesPatch[] = { "sed", - "-e", "s/\\([ \t](_|DES)IO[A-Z]*[ \t]*(\\)\\([^,']\\),/\\1'\\2',/", + "-e", "s/\\([ \t]*[ \t](_|DES)IO[A-Z]*[ \t]*(\\)\\([^,']\\),/\\1'\\2',/", "-e", "/#[ \t]*define[ \t]*[ \t]_IO/s/'\\([cgxtf]\\)'/\\1/g", "-e", "/#[ \t]*define[ \t]*[ \t]DESIOC/s/'\\([cdgx]\\)'/\\1/g", (char*)NULL }; diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index 91854a2..c8dbeda 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -566,8 +566,8 @@ fix = { */ fix = { hackname = io_def_quotes; - select = "[ \t](_|DES)IO[A-Z]*[ \t]*\\( *[^,']"; - sed = "s/\\([ \t](_|DES)IO[A-Z]*[ \t]*(\\)\\([^,']\\),/\\1'\\2',/"; + select = "[ \t]*[ \t](_|DES)IO[A-Z]*[ \t]*\\( *[^,']"; + sed = "s/\\([ \t]*[ \t](_|DES)IO[A-Z]*[ \t]*(\\)\\([^,']\\),/\\1'\\2',/"; sed = "/#[ \t]*define[ \t]*[ \t]_IO/" "s/'\\([cgxtf]\\)'/\\1/g"; sed = "/#[ \t]*define[ \t]*[ \t]DESIOC/" 's/\'\([cdgx]\)\'/\1/g'; }; diff --git a/gcc/fixinc/inclhack.sh b/gcc/fixinc/inclhack.sh index 4c321dd..1902744 100755 --- a/gcc/fixinc/inclhack.sh +++ b/gcc/fixinc/inclhack.sh @@ -1048,7 +1048,7 @@ extern "C" {\ # # Fix 30: Io_Def_Quotes # - if ( test -n "`egrep '[ ](_|DES)IO[A-Z]*[ ]*\\( *[^,'\\'']' ${file}`" + if ( test -n "`egrep '[ ]*[ ](_|DES)IO[A-Z]*[ ]*\\( *[^,'\\'']' ${file}`" ) > /dev/null 2>&1 ; then fixlist="${fixlist} io_def_quotes" @@ -1056,7 +1056,7 @@ extern "C" {\ then infile=${file} else infile=${DESTFILE} ; fi - sed -e 's/\([ ](_|DES)IO[A-Z]*[ ]*(\)\([^,'\'']\),/\1'\''\2'\'',/' \ + sed -e 's/\([ ]*[ ](_|DES)IO[A-Z]*[ ]*(\)\([^,'\'']\),/\1'\''\2'\'',/' \ -e '/#[ ]*define[ ]*[ ]_IO/s/'\''\([cgxtf]\)'\''/\1/g' \ -e '/#[ ]*define[ ]*[ ]DESIOC/s/'\''\([cdgx]\)'\''/\1/g' \ < $infile > ${DESTDIR}/fixinc.tmp |