diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2011-07-25 15:56:27 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2011-07-25 15:56:27 +0000 |
| commit | 9d7b2124158025c9b2939dd6651bf6cd95284d01 (patch) | |
| tree | 424c40d91a22cc59cd12ad27c269c0c260a8c9c4 /fixincludes/fixincl.x | |
| parent | f4da258f520dd886a7a1dd9d1c4d71c02f68b46a (diff) | |
| download | gcc-9d7b2124158025c9b2939dd6651bf6cd95284d01.zip gcc-9d7b2124158025c9b2939dd6651bf6cd95284d01.tar.gz gcc-9d7b2124158025c9b2939dd6651bf6cd95284d01.tar.bz2 | |
re PR c++/49347 (G++ rejects Solaris spawn.h use of __restrict)
PR c++/49347
* inclhack.def (solaris_posix_spawn_restrict): New fix.
* fixincl.x: Regenerate.
* tests/base/spawn.h: New test.
From-SVN: r176758
Diffstat (limited to 'fixincludes/fixincl.x')
| -rw-r--r-- | fixincludes/fixincl.x | 53 |
1 files changed, 48 insertions, 5 deletions
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index ac3343d..9363ae9 100644 --- a/fixincludes/fixincl.x +++ b/fixincludes/fixincl.x @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (fixincl.x) * - * It has been AutoGen-ed Sunday June 5, 2011 at 09:04:54 PM CDT + * It has been AutoGen-ed Saturday July 23, 2011 at 01:16:35 AM MEST * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Jun 5 21:04:54 CDT 2011 +/* DO NOT SVN-MERGE THIS FILE, EITHER Sat Jul 23 01:16:35 MEST 2011 * * 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 211 fixup descriptions. + * This file contains 212 fixup descriptions. * * See README for more information. * @@ -7008,6 +7008,43 @@ static const char* apzSolaris_Int_TypesPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Solaris_Posix_Spawn_Restrict fix + */ +tSCC zSolaris_Posix_Spawn_RestrictName[] = + "solaris_posix_spawn_restrict"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Posix_Spawn_RestrictList[] = + "spawn.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzSolaris_Posix_Spawn_RestrictMachs[] = { + "*-*-solaris2*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Posix_Spawn_RestrictSelect0[] = + "(.*[ \t]+)([a-z]+)\\[_RESTRICT_KYWD\\](.*)"; + +#define SOLARIS_POSIX_SPAWN_RESTRICT_TEST_CT 1 +static tTestDesc aSolaris_Posix_Spawn_RestrictTests[] = { + { TT_EGREP, zSolaris_Posix_Spawn_RestrictSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Solaris_Posix_Spawn_Restrict + */ +static const char* apzSolaris_Posix_Spawn_RestrictPatch[] = { + "format", + "%1*_RESTRICT_KYWD %2%3", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Solaris_Stdio_Tag fix */ tSCC zSolaris_Stdio_TagName[] = @@ -8591,9 +8628,9 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 250 +#define REGEX_COUNT 251 #define MACH_LIST_SIZE_LIMIT 181 -#define FIX_COUNT 211 +#define FIX_COUNT 212 /* * Enumerate the fixes @@ -8771,6 +8808,7 @@ typedef enum { SOLARIS_INT_LIMITS_2_FIXIDX, SOLARIS_INT_LIMITS_3_FIXIDX, SOLARIS_INT_TYPES_FIXIDX, + SOLARIS_POSIX_SPAWN_RESTRICT_FIXIDX, SOLARIS_STDIO_TAG_FIXIDX, SOLARIS_SYS_VA_LIST_FIXIDX, STATSSWTCH_FIXIDX, @@ -9673,6 +9711,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { SOLARIS_INT_TYPES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aSolaris_Int_TypesTests, apzSolaris_Int_TypesPatch, 0 }, + { zSolaris_Posix_Spawn_RestrictName, zSolaris_Posix_Spawn_RestrictList, + apzSolaris_Posix_Spawn_RestrictMachs, + SOLARIS_POSIX_SPAWN_RESTRICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Posix_Spawn_RestrictTests, apzSolaris_Posix_Spawn_RestrictPatch, 0 }, + { zSolaris_Stdio_TagName, zSolaris_Stdio_TagList, apzSolaris_Stdio_TagMachs, SOLARIS_STDIO_TAG_TEST_CT, FD_MACH_ONLY, |