inclhack.def (io_def_quotes): Consistently allow multiple whitespace characters betwe...

        * 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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7812e47ca93b168203ebdbf21345fd8fc45d3ad6..af3630e13aa9791eaab31fa119c0f6c592edb64a 100644 (file)
--- 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 61c1447642bdcc9f11ea0222537154f3a4bdc696..736943bbd1bd71d0dd4eabb00cd6ca41832407ac 100644 (file)
--- 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 91854a2a3e1fed1db8880ac316bf59a3cdbf859e..c8dbeda69b5b0fcf01fb8cbd6e82260a643c9b19 100644 (file)
--- 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 4c321ddf11faacfa5010263ad5b9d55ea4d473b7..1902744a0df564d1f8a9003a67ee9ee0527d838c 100755 (executable)
--- 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