diff options
author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2016-08-09 17:58:00 +0000 |
---|---|---|
committer | Bernd Edlinger <edlinger@gcc.gnu.org> | 2016-08-09 17:58:00 +0000 |
commit | ef19a444b3945c11a99ffac1512c39e5cbf8efd8 (patch) | |
tree | 1d6018ced7a53f2e2e09b4f3cfda9db1d5d3a773 /fixincludes/fixincl.x | |
parent | 408702b44570a4c92e4f9d05cd97f98cf12a4eb4 (diff) | |
download | gcc-ef19a444b3945c11a99ffac1512c39e5cbf8efd8.zip gcc-ef19a444b3945c11a99ffac1512c39e5cbf8efd8.tar.gz gcc-ef19a444b3945c11a99ffac1512c39e5cbf8efd8.tar.bz2 |
re PR bootstrap/72833 (error in fortran/parse.c (unexpected_eof) on Mac OS X 10.7)
2016-08-09 Bernd Edlinger <bernd.edlinger@hotmail.de>
PR bootstrap/72833
* fixincl.tpl (version-compare): Fix generation with autogen 5.18.
* inclhack.def (darwin_longjmp_noreturn): New fix.
* fixincl.x: Regenerated.
* tests/base/i386/setjmp.h [DARWIN_LONGJMP_NORETURN_CHECK]: new test.
From-SVN: r239301
Diffstat (limited to 'fixincludes/fixincl.x')
-rw-r--r-- | fixincludes/fixincl.x | 64 |
1 files changed, 57 insertions, 7 deletions
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index c79a6e4..6cd1b60 100644 --- a/fixincludes/fixincl.x +++ b/fixincludes/fixincl.x @@ -1,12 +1,12 @@ /* -*- buffer-read-only: t -*- vi: set ro: - * + * * DO NOT EDIT THIS FILE (fixincl.x) - * - * It has been AutoGen-ed June 10, 2016 at 12:56:52 PM by AutoGen 5.18.3 + * + * It has been AutoGen-ed August 8, 2016 at 08:46:37 PM by AutoGen 5.18 * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Fri Jun 10 12:56:52 UTC 2016 +/* DO NOT SVN-MERGE THIS FILE, EITHER Mon Aug 8 20:46:37 CEST 2016 * * 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 235 fixup descriptions. + * This file contains 236 fixup descriptions. * * See README for more information. * @@ -2699,6 +2699,50 @@ static const char* apzDarwin_Gcc4_BreakagePatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Darwin_Longjmp_Noreturn fix + */ +tSCC zDarwin_Longjmp_NoreturnName[] = + "darwin_longjmp_noreturn"; + +/* + * File name selection pattern + */ +tSCC zDarwin_Longjmp_NoreturnList[] = + "i386/setjmp.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzDarwin_Longjmp_NoreturnMachs[] = { + "*-*-darwin*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zDarwin_Longjmp_NoreturnSelect0[] = + "(.*longjmp\\(.*jmp_buf.*[^)]+\\));"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zDarwin_Longjmp_NoreturnBypass0[] = + "__dead2"; + +#define DARWIN_LONGJMP_NORETURN_TEST_CT 2 +static tTestDesc aDarwin_Longjmp_NoreturnTests[] = { + { TT_NEGREP, zDarwin_Longjmp_NoreturnBypass0, (regex_t*)NULL }, + { TT_EGREP, zDarwin_Longjmp_NoreturnSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Darwin_Longjmp_Noreturn + */ +static const char* apzDarwin_Longjmp_NoreturnPatch[] = { + "format", + "%1 __attribute__ ((__noreturn__));", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Darwin_Private_Extern fix */ tSCC zDarwin_Private_ExternName[] = @@ -9633,9 +9677,9 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 272 +#define REGEX_COUNT 274 #define MACH_LIST_SIZE_LIMIT 187 -#define FIX_COUNT 235 +#define FIX_COUNT 236 /* * Enumerate the fixes @@ -9703,6 +9747,7 @@ typedef enum { DARWIN_9_LONG_DOUBLE_FUNCS_2_FIXIDX, DARWIN_EXTERNC_FIXIDX, DARWIN_GCC4_BREAKAGE_FIXIDX, + DARWIN_LONGJMP_NORETURN_FIXIDX, DARWIN_PRIVATE_EXTERN_FIXIDX, DARWIN_STDINT_1_FIXIDX, DARWIN_STDINT_2_FIXIDX, @@ -10189,6 +10234,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { DARWIN_GCC4_BREAKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aDarwin_Gcc4_BreakageTests, apzDarwin_Gcc4_BreakagePatch, 0 }, + { zDarwin_Longjmp_NoreturnName, zDarwin_Longjmp_NoreturnList, + apzDarwin_Longjmp_NoreturnMachs, + DARWIN_LONGJMP_NORETURN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Longjmp_NoreturnTests, apzDarwin_Longjmp_NoreturnPatch, 0 }, + { zDarwin_Private_ExternName, zDarwin_Private_ExternList, apzDarwin_Private_ExternMachs, DARWIN_PRIVATE_EXTERN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, |