don't skip GLIBC files any more, more C++ header testing, corrected spelling of mach

From-SVN: r30704

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a1a0e3980c472b2373aba9d339d2641217ef85b5..d07e23c30a53fd639e93f92f73809e3c60aed9ad 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+1999-11-29  Bruce Korb  <autogen@linuxbox.com>
+
+       * 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  <bernds@cygnus.co.uk>
 
        * 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 2d3159b6be3a786244e3eab26061188747455840..bf7d839a06cc86804638deca9c7abda0bb1509a9 100644 (file)
--- 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 8b001be4e9103ebb94415069cdc0414ef25e351f..a3e2d81284ad43be8c1743697b7af75dd807f0c1 100644 (file)
--- 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 fa4470301d46afdff93a08ca06b365e80b60afbb..4ee9e86ee366b02e9bac735933e45feccea80c4d 100644 (file)
--- 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 36cc3905fd5b8dc55704374346c980559b0f844d..83fb27ce4b1fffd2656a060aabc96b9167435202 100644 (file)
--- 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 d0c4d1db4b34c30f0a8eab3dd0a89f43438a63d5..d1633cfbe5ff2df45a6624fe278bc200dcfd7e04 100644 (file)
--- 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 abcad11dd0d68bb12b08fb39052a572eceb5ff12..2210b4a7b2915873a16ad58146bddc2bcad73f7c 100755 (executable)
--- 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