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: r62888

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0ad26a0c287b8e7066056779cd8167b6504dc659..7b3ae10ab0a11d4e10231bed98e23a0bde7ce4be 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 785b5a890e772df8ffaa1dd0a4c08c9714c3922b..56b7484a152948d74fa315cfd50eefca9d0ec16e 100644 (file)
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -1887,10 +1887,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 }, };
 
 /*
@@ -5767,7 +5774,7 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          157
+#define REGEX_COUNT          158
 #define MACH_LIST_SIZE_LIMIT 279
 #define FIX_COUNT            146
 

diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index d52bd9014c1d8a955644aa61aef6b1aa237f04eb..151e22755530caf2e04edb6deef43de9c8ac0f65 100644 (file)
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -1151,7 +1151,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";