Accommodate Solaris 2.5.1 in solaris_mutex_init_1 fix

From-SVN: r65022

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5e93bc0e44549e75ae0f620f389a8e76d3b50186..be4f3dd3aceb7800315e81b085bab0b9938aeb70 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -27,6 +27,11 @@
        TARGET_HARD_FLOAT.  Reformat.
        (FUNCTION_ARG_REGNO_P): Likewise, and remove unneeded casts.
 
+2003-03-28  Albert Chin-A-Young  <china@thewrittenword.com>
+
+       * gcc/fixinc/inclhack.def: Update solaris_mutex_init_1 to
+       work on Solaris 2.5.1.
+
 2003-03-28  Kazu Hirata  <kazu@cs.umass.edu>
 
        * config/h8300/h8300.md (*addsi3_and_r_1): Put under plus:SI

diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index 79bea142b64b5ba240d2b9af4971cb81ace00d43..fd9d3311e5513f2214d5fe308c4e47fadda7c93b 100644 (file)
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -3768,7 +3768,7 @@ tSCC zSolaris_Mutex_Init_1List[] =
  *  content selection pattern - do fix if pattern found
  */
 tSCC zSolaris_Mutex_Init_1Select0[] =
-       "@\\(#\\)pthread.h[ \t]+1.1[0-9][ \t]+97/[0-9/]+ SMI";
+       "@\\(#\\)pthread.h[ \t]+1.1[0-9][ \t]+9[567]/[0-9/]+ SMI";
 
 #define    SOLARIS_MUTEX_INIT_1_TEST_CT  1
 static tTestDesc aSolaris_Mutex_Init_1Tests[] = {

diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 5ceadfb1a3230abd8c7c668e67bc074b9a96f00b..763df48270cdfcb4fd046a786ca9f046c27f4afe 100644 (file)
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -2057,14 +2057,15 @@ fix = {
 
 
 /*
- *  Sun Solaris 2.6 defines PTHREAD_{MUTEX|COND}_INITIALIZER incorrectly,
- *  so we replace them with versions that correspond to the definition.  We
- *  also explicitly name this fix "1" and the next fix "2" because this one
- *  does not deal with the last field.  This fix needs to run before the next.
+ *  Sun Solaris 2.5.1, 2.6 defines PTHREAD_{MUTEX|COND}_INITIALIZER
+ *  incorrectly, so we replace them with versions that correspond to
+ *  the definition.  We also explicitly name this fix "1" and the next
+ *  fix "2" because this one does not deal with the last field.  This
+ *  fix needs to run before the next.
  */
 fix = {
     hackname = solaris_mutex_init_1;
-    select = '@\(#\)pthread.h' "[ \t]+1.1[0-9][ \t]+97/[0-9/]+ SMI";
+    select = '@\(#\)pthread.h' "[ \t]+1.1[0-9][ \t]+9[567]/[0-9/]+ SMI";
     files = pthread.h;
     sed   = "/define[ \t]*PTHREAD_MUTEX_INI/s/{0, 0,/{{{0}, 0}, {{{0}}},/\n"
             "/define[ \t]*PTHREAD_COND_INI/s/{0,/{{{0},0},/";