inclhack.def (hpux_long_double): Tighten select and add bypass regexp.

	* inclhack.def (hpux_long_double): Tighten select and add bypass
	regexp.
	* fixincl.x: Rebuilt.

From-SVN: r62886

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b60757702ba563f2e86c5e321dbfb1a17c6cc6d1..ad633eecc45b3851f64c46ff81fc76d0d2d0fa4e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-13  John David Anglin  <dave.anglin@nrc-crnc.gc.ca>
+
+       * inclhack.def (hpux_long_double): Tighten select and add bypass
+       regexp.
+       * fixincl.x: Rebuilt.
+
 2003-02-13  Josef Zlomek  <zlomekj@suse.cz>
 
        * cfgcleanup.c (outgoing_edges_match): When there is single outgoing

diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index 6c59b58e92c81abe86186aa2bea79ce567dbf6f5..7d3861f82b38063fb7c06ce2de30e0ab5679fc29 100644 (file)
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -1716,10 +1716,17 @@ tSCC zHpux_Long_DoubleList[] =
  *  content selection pattern - do fix if pattern found
  */
 tSCC zHpux_Long_DoubleSelect0[] =
-       "long_double";
+       "extern[ \t]long_double[ \t]strtold";
 
-#define    HPUX_LONG_DOUBLE_TEST_CT  1
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zHpux_Long_DoubleBypass0[] =
+       "long_double_t";
+
+#define    HPUX_LONG_DOUBLE_TEST_CT  2
 static tTestDesc aHpux_Long_DoubleTests[] = {
+  { TT_NEGREP,   zHpux_Long_DoubleBypass0, (regex_t*)NULL },
   { TT_EGREP,    zHpux_Long_DoubleSelect0, (regex_t*)NULL }, };
 
 /*
@@ -5601,7 +5608,7 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          153
+#define REGEX_COUNT          154
 #define MACH_LIST_SIZE_LIMIT 261
 #define FIX_COUNT            142
 

diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 62b1284e0c97257e35dfbc7a516f3ef0ca184e10..4381fb594867dcd0ac0877ff65cc3d0a719ab67e 100644 (file)
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -1022,7 +1022,8 @@ fix = {
 fix = {
     hackname  = hpux_long_double;
     files     = stdlib.h;
-    select    = "long_double";
+    select    = "extern[ \t]long_double[ \t]strtold";
+    bypass    = "long_double_t";
     sed       = "/^#[ \t]*ifndef _LONG_DOUBLE/,/\\/\\* _LONG_DOUBLE \\*\\//D";
     sed       = "s/long_double/long double/g";