diff options
| author | Albert Chin-A-Young <china@thewrittenword.com> | 2003-03-29 21:07:21 +0000 |
|---|---|---|
| committer | Bruce Korb <korbb@gcc.gnu.org> | 2003-03-29 21:07:21 +0000 |
| commit | ce4a8f7d84f5688bce84a545ab467371d7212715 (patch) | |
| tree | 6bf4ef8d23770812be347b4bc7b648dd20c5b5fe | |
| parent | 44fc3a6f54fac6234b15e1292ac61198a2e5e40d (diff) | |
| download | gcc-ce4a8f7d84f5688bce84a545ab467371d7212715.zip gcc-ce4a8f7d84f5688bce84a545ab467371d7212715.tar.gz gcc-ce4a8f7d84f5688bce84a545ab467371d7212715.tar.bz2 | |
Accommodate Solaris 2.5.1 in solaris_mutex_init_1 fix
From-SVN: r65022
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fixinc/fixincl.x | 2 | ||||
| -rw-r--r-- | gcc/fixinc/inclhack.def | 11 |
3 files changed, 12 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5e93bc0..be4f3dd 100644 --- 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 79bea14..fd9d331 100644 --- 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 5ceadfb..763df48 100644 --- 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},/"; |