From c5984b7b9e0265e8238564fa15224a0295ce607a Mon Sep 17 00:00:00 2001 From: Bruce Korb Date: Mon, 29 Nov 1999 14:35:50 +0000 Subject: [PATCH] don't skip GLIBC files any more, more C++ header testing, corrected spelling of mach From-SVN: r30704 --- gcc/ChangeLog | 7 +++++ gcc/fixinc/fixincl.c | 8 ------ gcc/fixinc/fixincl.x | 56 ++++++++++++++-------------------------- gcc/fixinc/fixtests.c | 4 ++- gcc/fixinc/hackshell.tpl | 4 +-- gcc/fixinc/inclhack.def | 6 ++--- gcc/fixinc/inclhack.sh | 22 +++++++--------- 7 files changed, 43 insertions(+), 64 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a1a0e3980c47..d07e23c30a53 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +1999-11-29 Bruce Korb + + * fixinc/fixincl.c(process): don't skip GLIBC files any more. + * fixinc/hackshell.tpl: ditto + * fixinc/fixtests.c(double_slash_test): more C++ header testing + * fixinc/inclhack.def(AAB_fd_zero_glibc*): corrected spelling of mach + 1999-11-29 Bernd Schmidt * reload.c (push_reload): When looking for a register to put into diff --git a/gcc/fixinc/fixincl.c b/gcc/fixinc/fixincl.c index 2d3159b6be3a..bf7d839a06cc 100644 --- a/gcc/fixinc/fixincl.c +++ b/gcc/fixinc/fixincl.c @@ -38,9 +38,6 @@ Boston, MA 02111-1307, USA. */ Any file that contains this string is presumed to have been carefully constructed and will not be fixed */ -static const char gnu_lib_mark[] = - "This file is part of the GNU C Library"; - /* The contents of this string are not very important. It is mostly just used as part of the "I am alive and working" test. */ @@ -1341,11 +1338,6 @@ process () #endif if (VLEVEL( VERB_PROGRESS )) fprintf (stderr, "%6d %-50s \r", data_map_size, pz_curr_file ); - if (strstr (pz_curr_data, gnu_lib_mark) != (char *) NULL) - { - UNLOAD_DATA(); - return; - } process_chain_head = NOPROCESS; diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index 8b001be4e910..a3e2d81284ad 100644 --- a/gcc/fixinc/fixincl.x +++ b/gcc/fixinc/fixincl.x @@ -326,18 +326,12 @@ tSCC zAab_Fd_Zero_Glibc_1_0List[] = /* * Machine/OS name selection pattern */ -#define apzAab_Fd_Zero_Glibc_1_0Machs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zAab_Fd_Zero_Glibc_1_0Select0[] = - "i[34567]86-*-linux-gnu*"; - -#define AAB_FD_ZERO_GLIBC_1_0_TEST_CT 1 -#define AAB_FD_ZERO_GLIBC_1_0_RE_CT 1 -tTestDesc aAab_Fd_Zero_Glibc_1_0Tests[] = { - { TT_EGREP, zAab_Fd_Zero_Glibc_1_0Select0, (regex_t*)NULL }, }; +tSCC* apzAab_Fd_Zero_Glibc_1_0Machs[] = { + "i[34567]86-*-linux-gnu*", + (const char*)NULL }; +#define AAB_FD_ZERO_GLIBC_1_0_TEST_CT 0 +#define AAB_FD_ZERO_GLIBC_1_0_RE_CT 0 +#define aAab_Fd_Zero_Glibc_1_0Tests (tTestDesc*)NULL /* * Fix Command Arguments for Aab_Fd_Zero_Glibc_1_0 @@ -372,18 +366,12 @@ tSCC zAab_Fd_Zero_Glibc_1_XList[] = /* * Machine/OS name selection pattern */ -#define apzAab_Fd_Zero_Glibc_1_XMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zAab_Fd_Zero_Glibc_1_XSelect0[] = - "i[34567]86-*-linux-gnu*"; - -#define AAB_FD_ZERO_GLIBC_1_X_TEST_CT 1 -#define AAB_FD_ZERO_GLIBC_1_X_RE_CT 1 -tTestDesc aAab_Fd_Zero_Glibc_1_XTests[] = { - { TT_EGREP, zAab_Fd_Zero_Glibc_1_XSelect0, (regex_t*)NULL }, }; +tSCC* apzAab_Fd_Zero_Glibc_1_XMachs[] = { + "i[34567]86-*-linux-gnu*", + (const char*)NULL }; +#define AAB_FD_ZERO_GLIBC_1_X_TEST_CT 0 +#define AAB_FD_ZERO_GLIBC_1_X_RE_CT 0 +#define aAab_Fd_Zero_Glibc_1_XTests (tTestDesc*)NULL /* * Fix Command Arguments for Aab_Fd_Zero_Glibc_1_X @@ -418,18 +406,12 @@ tSCC zAab_Fd_Zero_Glibc_2_0List[] = /* * Machine/OS name selection pattern */ -#define apzAab_Fd_Zero_Glibc_2_0Machs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zAab_Fd_Zero_Glibc_2_0Select0[] = - "i[34567]86-*-linux-gnu*"; - -#define AAB_FD_ZERO_GLIBC_2_0_TEST_CT 1 -#define AAB_FD_ZERO_GLIBC_2_0_RE_CT 1 -tTestDesc aAab_Fd_Zero_Glibc_2_0Tests[] = { - { TT_EGREP, zAab_Fd_Zero_Glibc_2_0Select0, (regex_t*)NULL }, }; +tSCC* apzAab_Fd_Zero_Glibc_2_0Machs[] = { + "i[34567]86-*-linux-gnu*", + (const char*)NULL }; +#define AAB_FD_ZERO_GLIBC_2_0_TEST_CT 0 +#define AAB_FD_ZERO_GLIBC_2_0_RE_CT 0 +#define aAab_Fd_Zero_Glibc_2_0Tests (tTestDesc*)NULL /* * Fix Command Arguments for Aab_Fd_Zero_Glibc_2_0 @@ -4394,7 +4376,7 @@ extern char *\tsprintf();\\\n\ * * List of all fixes */ -#define REGEX_COUNT 79 +#define REGEX_COUNT 76 #define MACH_LIST_SIZE_LIMIT 279 #define FIX_COUNT 112 diff --git a/gcc/fixinc/fixtests.c b/gcc/fixinc/fixtests.c index fa4470301d46..4ee9e86ee366 100644 --- a/gcc/fixinc/fixtests.c +++ b/gcc/fixinc/fixtests.c @@ -114,7 +114,9 @@ TEST_FOR_FIX_PROC_HEAD( double_slash_test ) return SKIP_FIX; if (strstr( fname, "xx/" ) != NULL) return SKIP_FIX; - if (strstr( fname, "++/" ) != NULL) + if (strstr( fname, "++" ) != NULL) + return SKIP_FIX; + if (strstr( text, "extern \"C++\"" ) != NULL) return SKIP_FIX; /* Now look for the comment markers in the text */ diff --git a/gcc/fixinc/hackshell.tpl b/gcc/fixinc/hackshell.tpl index 36cc3905fd5b..83fb27ce4b1f 100644 --- a/gcc/fixinc/hackshell.tpl +++ b/gcc/fixinc/hackshell.tpl @@ -9,9 +9,7 @@ for file in $files; do # Skip unreadable files, symlinks to directories and glibc files - if test ! -r "${file}" || test -d "${file}/." \ - || fgrep 'This file is part of the GNU C Library' "${file}" \ - > /dev/null 2>&1; then + if test ! -r "${file}" || test -d "${file}/." ; then continue fi diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index d0c4d1db4b34..d1633cfbe5ff 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -160,7 +160,7 @@ typedef char * va_list; fix = { hackname = AAB_fd_zero_glibc_1_0; files = asm/posix_types.h; - select = 'i[34567]86-*-linux-gnu*'; + mach = 'i[34567]86-*-linux-gnu*'; /* * Define _POSIX_TYPES_H_WRAPPER at the end of the wrapper, not @@ -199,7 +199,7 @@ fix = { fix = { hackname = AAB_fd_zero_glibc_1_x; files = gnu/types.h; - select = 'i[34567]86-*-linux-gnu*'; + mach = 'i[34567]86-*-linux-gnu*'; /* * Define _TYPES_H_WRAPPER at the end of the wrapper, not @@ -238,7 +238,7 @@ fix = { fix = { hackname = AAB_fd_zero_glibc_2_0; files = selectbits.h; - select = 'i[34567]86-*-linux-gnu*'; + mach = 'i[34567]86-*-linux-gnu*'; /* * Define _SELECTBITS_H_WRAPPER at the end of the wrapper, not diff --git a/gcc/fixinc/inclhack.sh b/gcc/fixinc/inclhack.sh index abcad11dd0d6..2210b4a7b291 100755 --- a/gcc/fixinc/inclhack.sh +++ b/gcc/fixinc/inclhack.sh @@ -354,9 +354,7 @@ while [ $# != 0 ]; do for file in $files; do # Skip unreadable files, symlinks to directories and glibc files - if test ! -r "${file}" || test -d "${file}/." \ - || fgrep 'This file is part of the GNU C Library' "${file}" \ - > /dev/null 2>&1; then + if test ! -r "${file}" || test -d "${file}/." ; then continue fi @@ -524,8 +522,7 @@ _EOF_ # Fix 8: Aab_Fd_Zero_Glibc_1_0 # case "${file}" in ./asm/posix_types.h ) - if ( test -n "`egrep 'i[34567]86-*-linux-gnu*' ${file}`" - ) > /dev/null 2>&1 ; then + case "$target_canonical" in i[34567]86-*-linux-gnu* ) echo "aab_fd_zero_glibc_1_0 replacing file ${file}" >&2 cat > ${DESTFILE} << '_EOF_' /* This file fixes __FD_ZERO bug for glibc-1.x. */ @@ -544,7 +541,8 @@ _EOF_ _EOF_ continue - fi # end of select 'if' + ;; # case end for machine type test + esac ;; # case end for file name test esac @@ -553,8 +551,7 @@ _EOF_ # Fix 9: Aab_Fd_Zero_Glibc_1_X # case "${file}" in ./gnu/types.h ) - if ( test -n "`egrep 'i[34567]86-*-linux-gnu*' ${file}`" - ) > /dev/null 2>&1 ; then + case "$target_canonical" in i[34567]86-*-linux-gnu* ) echo "aab_fd_zero_glibc_1_x replacing file ${file}" >&2 cat > ${DESTFILE} << '_EOF_' /* This file fixes __FD_ZERO bug for glibc-1.x. */ @@ -573,7 +570,8 @@ _EOF_ _EOF_ continue - fi # end of select 'if' + ;; # case end for machine type test + esac ;; # case end for file name test esac @@ -582,8 +580,7 @@ _EOF_ # Fix 10: Aab_Fd_Zero_Glibc_2_0 # case "${file}" in ./selectbits.h ) - if ( test -n "`egrep 'i[34567]86-*-linux-gnu*' ${file}`" - ) > /dev/null 2>&1 ; then + case "$target_canonical" in i[34567]86-*-linux-gnu* ) echo "aab_fd_zero_glibc_2_0 replacing file ${file}" >&2 cat > ${DESTFILE} << '_EOF_' /* This file fixes __FD_ZERO bug for glibc-2.0.x. */ @@ -602,7 +599,8 @@ _EOF_ _EOF_ continue - fi # end of select 'if' + ;; # case end for machine type test + esac ;; # case end for file name test esac -- 2.43.5