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
This commit is contained in:
Jeffrey A Law 1999-05-11 23:06:49 +00:00 committed by Jeff Law
parent c576fce78d
commit 49da3efb1d
4 changed files with 12 additions and 6 deletions

View File

@ -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

View File

@ -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 };

View File

@ -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';
};

View File

@ -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