OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

inclhack.def (solaris_cond_init): New fix. 

* inclhack.def (solaris_cond_init): New fix.
	* fixincl.x: Regenerate.
	* tests/base/pthread.h [SOLARIS_COND_INIT_CHECK]: New test.
	[SOLARIS_MUTEX_INIT_2_CHECK]: Adapt.

From-SVN: r162080
This commit is contained in:
Rainer Orth 2010-07-12 14:29:50 +00:00 committed by Rainer Orth
parent fb2f8cf836
commit 872cc2d3c9
4 changed files with 88 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fixincludes/ChangeLog
View File

@ -1,3 +1,10 @@
2010-07-12 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* inclhack.def (solaris_cond_init): New fix.
* fixincl.x: Regenerate.
* tests/base/pthread.h [SOLARIS_COND_INIT_CHECK]: New test.
[SOLARIS_MUTEX_INIT_2_CHECK]: Adapt.
2010-06-21 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* inclhack.def (solaris__restrict, solaris_complex_cxx): New fixes

54
fixincludes/fixincl.x
View File

@ -2,11 +2,11 @@
*
* DO NOT EDIT THIS FILE (fixincl.x)
*
* It has been AutoGen-ed Friday May 7, 2010 at 02:41:29 PM MEST
* It has been AutoGen-ed Sunday June 27, 2010 at 12:52:26 PM MEST
* From the definitions inclhack.def
* and the template file fixincl
*/
/* DO NOT SVN-MERGE THIS FILE, EITHER Fri May 7 14:41:29 MEST 2010
/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Jun 27 12:52:26 MEST 2010
*
* You must regenerate it. Use the ./genfixes script.
*
@ -15,7 +15,7 @@
* certain ANSI-incompatible system header files which are fixed to work
* correctly with ANSI C and placed in a directory that GNU C will search.
*
* This file contains 207 fixup descriptions.
* This file contains 208 fixup descriptions.
*
* See README for more information.
*
@ -6227,6 +6227,44 @@ extern \"C\" {\\\n\
#endif",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Solaris_Cond_Init fix
*/
tSCC zSolaris_Cond_InitName[] =
"solaris_cond_init";
/*
* File name selection pattern
*/
tSCC zSolaris_Cond_InitList[] =
"pthread.h\0";
/*
* Machine/OS name selection pattern
*/
tSCC* apzSolaris_Cond_InitMachs[] = {
"*-*-solaris2.8",
(const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
tSCC zSolaris_Cond_InitSelect0[] =
"@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
#define SOLARIS_COND_INIT_TEST_CT 1
static tTestDesc aSolaris_Cond_InitTests[] = {
{ TT_EGREP, zSolaris_Cond_InitSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Solaris_Cond_Init
*/
static const char* apzSolaris_Cond_InitPatch[] = {
"format",
"%1, 0x4356%2",
"^(#define[ \t]+PTHREAD_COND_INITIALIZER[ \t]+\\{.*0)(\\},[ \t]*0\\}.*)$",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Solaris_Math_1 fix
@ -8432,9 +8470,9 @@ static const char* apzX11_SprintfPatch[] = {
*
* List of all fixes
*/
#define REGEX_COUNT 246
#define REGEX_COUNT 247
#define MACH_LIST_SIZE_LIMIT 181
#define FIX_COUNT 207
#define FIX_COUNT 208
/*
* Enumerate the fixes
@ -8593,6 +8631,7 @@ typedef enum {
SOLARIS___RESTRICT_FIXIDX,
SOLARIS_COMPLEX_FIXIDX,
SOLARIS_COMPLEX_CXX_FIXIDX,
SOLARIS_COND_INIT_FIXIDX,
SOLARIS_MATH_1_FIXIDX,
SOLARIS_MATH_2_FIXIDX,
SOLARIS_MATH_3_FIXIDX,
@ -9415,6 +9454,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
SOLARIS_COMPLEX_CXX_TEST_CT, FD_MACH_ONLY,
aSolaris_Complex_CxxTests, apzSolaris_Complex_CxxPatch, 0 },
{ zSolaris_Cond_InitName, zSolaris_Cond_InitList,
apzSolaris_Cond_InitMachs,
SOLARIS_COND_INIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aSolaris_Cond_InitTests, apzSolaris_Cond_InitPatch, 0 },
{ zSolaris_Math_1Name, zSolaris_Math_1List,
apzSolaris_Math_1Machs,
SOLARIS_MATH_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,

20
fixincludes/inclhack.def
View File

@ -3306,6 +3306,26 @@ fix = {
};
/*
* Solaris 8 PTHREAD_COND_INITIALIZER lacks the __pthread_cond_magic field.
* COND_MAGIC is only defined in <synch.h> and pollutes the namespace, so
* use the value literally instead.
*/
fix = {
hackname = solaris_cond_init;
select = '@\(#\)pthread.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
files = pthread.h;
mach = '*-*-solaris2.8';
c_fix = format;
c_fix_arg = "%1, 0x4356%2";
c_fix_arg = "^(#define[ \t]+PTHREAD_COND_INITIALIZER[ \t]+"
"\\{.*0)(\\},[ \t]*0\\}.*)$";
test_text =
'#pragma ident "@(#)pthread.h 1.29 01/07/07 SMI"'"\n"
'#define PTHREAD_COND_INITIALIZER {{{0}, 0}, 0} /* = DEFAULTCV */';
};
/*
* Sun Solaris 10 defines several C99 math macros in terms of
* builtins specific to the Studio compiler, in particular not

14
fixincludes/tests/base/pthread.h
View File

@ -101,6 +101,16 @@ extern int __sigsetjmp (struct __jmp_buf_tag *__env, int __savemask);
#endif /* PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_CHECK */
#if defined( SOLARIS_COND_INIT_CHECK )
#pragma ident "@(#)pthread.h 1.29 01/07/07 SMI"
#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)
#define PTHREAD_COND_INITIALIZER {{{0}, 0, 0x4356}, 0} /* = DEFAULTCV */
#else
#define PTHREAD_COND_INITIALIZER {{{0}, 0, 0x4356}, {0}} /* = DEFAULTCV */
#endif
#endif /* SOLARIS_COND_INIT_CHECK */
#if defined( SOLARIS_MUTEX_INIT_2_CHECK )
#ident "@(#)pthread.h 1.26 98/04/12 SMI"
#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)
@ -109,9 +119,9 @@ extern int __sigsetjmp (struct __jmp_buf_tag *__env, int __savemask);
#define PTHREAD_MUTEX_INITIALIZER {{{0},0}, {{{0}}}, {0}}
#endif
#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)
#define PTHREAD_COND_INITIALIZER {{{0}, 0}, 0} /* DEFAULTCV */
#define PTHREAD_COND_INITIALIZER {{{0}, 0, 0x4356}, 0} /* DEFAULTCV */
#else
#define PTHREAD_COND_INITIALIZER {{{0}, 0}, {0}} /* DEFAULTCV */
#define PTHREAD_COND_INITIALIZER {{{0}, 0, 0x4356}, {0}} /* DEFAULTCV */
#endif
#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)
#define PTHREAD_MUTEX_INITIALIZER /* = DEFAULTMUTEX */ \