procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

the undefine_null bypass pattern needs to match for DOS headers

Browse source 
From-SVN: r32199
This commit is contained in:
Bruce Korb 2000-02-26 23:16:59 +00:00 • committed by Bruce Korb
parent 4592bdcbb8
commit 42a2c30e1b
4 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/ChangeLog
View file

@ -1,3 +1,9 @@
2000-02-26 Bruce Korb <bkorb@gnu.org>
fixinc/inclhack.def(undefine_null): the bypass pattern needs to
match for DOS headers, too.
fixinc/inclhack.sh,fixincl.x: regen
2000-02-26 Geoff Keating <geoffk@cygnus.com>
* config/elfos.h (ASM_OUTPUT_LABELREF): Don't define. The default

6
gcc/fixinc/fixincl.x
View file

@ -4010,13 +4010,13 @@ tSCC zUndefine_NullName[] =
* content selection pattern - do fix if pattern found
*/
tSCC zUndefine_NullSelect0[] =
"^#[ \t]*define[ \t]*[ \t]NULL[ \t]";
"^#[ \t]*define[ \t]*[ \t]NULL[ \t\r]";
/*
* content bypass pattern - skip fix if pattern found
*/
tSCC zUndefine_NullBypass0[] =
"#[ \t]*(ifn|un)def[ \t]*[ \t]NULL($|[ \t])";
"#[ \t]*(ifn|un)def[ \t]*[ \t]NULL($|[ \t\r])";
#define UNDEFINE_NULL_TEST_CT 2
tTestDesc aUndefine_NullTests[] = {
@ -4027,7 +4027,7 @@ tTestDesc aUndefine_NullTests[] = {
* Fix Command Arguments for Undefine_Null
*/
const char* apzUndefine_NullPatch[] = { "sed",
"-e", "/^#[ \t]*define[ \t][ \t]*NULL[ \t]/i\\\n\
"-e", "/^#[ \t]*define[ \t][ \t]*NULL[ \t\r]/i\\\n\
#undef NULL\n",
(char*)NULL };

6
gcc/fixinc/inclhack.def
View file

@ -2387,9 +2387,9 @@ fix = {
*/
fix = {
hackname = undefine_null;
select = "^#[ \t]*define[ \t]*[ \t]NULL[ \t]";
bypass = "#[ \t]*(ifn|un)def[ \t]*[ \t]NULL($|[ \t])";
sed = "/^#[ \t]*define[ \t][ \t]*NULL[ \t]/i\\\n"
select = "^#[ \t]*define[ \t]*[ \t]NULL[ \t\r]";
bypass = "#[ \t]*(ifn|un)def[ \t]*[ \t]NULL($|[ \t\r])";
sed = "/^#[ \t]*define[ \t][ \t]*NULL[ \t\r]/i\\\n"
"#undef NULL\n";
};

6
gcc/fixinc/inclhack.sh
View file

@ -3069,9 +3069,9 @@ struct utsname;
#
# Fix Undefine_Null
#
if ( test -n "`egrep '^#[ ]*define[ ]*[ ]NULL[ ]' ${file}`"
if ( test -n "`egrep '^#[ ]*define[ ]*[ ]NULL[ ]' ${file}`"
) > /dev/null 2>&1 ; then
if ( test -z "`egrep '#[ ]*(ifn|un)def[ ]*[ ]NULL($|[ ])' ${file}`"
if ( test -z "`egrep '#[ ]*(ifn|un)def[ ]*[ ]NULL($|[ ])' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
undefine_null"
@ -3079,7 +3079,7 @@ struct utsname;
then infile=${file}
else infile=${DESTFILE} ; fi
sed -e '/^#[ ]*define[ ][ ]*NULL[ ]/i\
sed -e '/^#[ ]*define[ ][ ]*NULL[ ]/i\
#undef NULL
' \
< $infile > ${DESTDIR}/fixinc.tmp