Commit ce4a8f7d by Albert Chin-A-Young Committed by Bruce Korb

Accommodate Solaris 2.5.1 in solaris_mutex_init_1 fix

From-SVN: r65022
parent 44fc3a6f
...@@ -27,6 +27,11 @@ ...@@ -27,6 +27,11 @@
TARGET_HARD_FLOAT. Reformat. TARGET_HARD_FLOAT. Reformat.
(FUNCTION_ARG_REGNO_P): Likewise, and remove unneeded casts. (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> 2003-03-28 Kazu Hirata <kazu@cs.umass.edu>
* config/h8300/h8300.md (*addsi3_and_r_1): Put under plus:SI * config/h8300/h8300.md (*addsi3_and_r_1): Put under plus:SI
......
...@@ -3768,7 +3768,7 @@ tSCC zSolaris_Mutex_Init_1List[] = ...@@ -3768,7 +3768,7 @@ tSCC zSolaris_Mutex_Init_1List[] =
* content selection pattern - do fix if pattern found * content selection pattern - do fix if pattern found
*/ */
tSCC zSolaris_Mutex_Init_1Select0[] = 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 #define SOLARIS_MUTEX_INIT_1_TEST_CT 1
static tTestDesc aSolaris_Mutex_Init_1Tests[] = { static tTestDesc aSolaris_Mutex_Init_1Tests[] = {
......
...@@ -2057,14 +2057,15 @@ fix = { ...@@ -2057,14 +2057,15 @@ fix = {
/* /*
* Sun Solaris 2.6 defines PTHREAD_{MUTEX|COND}_INITIALIZER incorrectly, * Sun Solaris 2.5.1, 2.6 defines PTHREAD_{MUTEX|COND}_INITIALIZER
* so we replace them with versions that correspond to the definition. We * incorrectly, so we replace them with versions that correspond to
* also explicitly name this fix "1" and the next fix "2" because this one * the definition. We also explicitly name this fix "1" and the next
* does not deal with the last field. This fix needs to run before the next. * fix "2" because this one does not deal with the last field. This
* fix needs to run before the next.
*/ */
fix = { fix = {
hackname = solaris_mutex_init_1; 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; files = pthread.h;
sed = "/define[ \t]*PTHREAD_MUTEX_INI/s/{0, 0,/{{{0}, 0}, {{{0}}},/\n" sed = "/define[ \t]*PTHREAD_MUTEX_INI/s/{0, 0,/{{{0}, 0}, {{{0}}},/\n"
"/define[ \t]*PTHREAD_COND_INI/s/{0,/{{{0},0},/"; "/define[ \t]*PTHREAD_COND_INI/s/{0,/{{{0},0},/";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment