diff options
author | hp <hp@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-02-04 15:31:25 +0000 |
---|---|---|
committer | hp <hp@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-02-04 15:31:25 +0000 |
commit | 661832db7086a227979240980f1cdc10376c0dd4 (patch) | |
tree | 2f2ed548082372a8ae8ce3b6f30e7708cf25db23 /fixincludes/fixincl.x | |
parent | 5bad702ffba44112598b9583b48782c7c6fedba7 (diff) | |
download | gcc-661832db7086a227979240980f1cdc10376c0dd4.tar.gz |
* inclhack.def: (glibc_c99_inline_1a): Re-add last change.
(glibc_c99_inline_3) <bypass>: Change from __STDC_VERSION__ to
__extern_inline|__GNU_STDC_INLINE__.
(glibc_c99_inline_4) <files>: Add wchar.h and */wchar.h.
<bypass>: Change from __STDC_VERSION__ to
__extern_inline|__GNU_STDC_INLINE__.
<first c_fix_arg>: Change from #ifdef-wrapping the extern part to
appending attribute-gnu_inline.
<second c_fix_arg>: Remove.
<test_text>: Remove __extern_inline line.
* tests/base/features.h: Re-add.
* tests/base/sys/sysmacros.h: Adjust.
* fixincl.x: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@132092 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'fixincludes/fixincl.x')
-rw-r--r-- | fixincludes/fixincl.x | 67 |
1 files changed, 53 insertions, 14 deletions
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index a0daa2a6a4f..3be69a6b4dc 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 October 14, 2007 at 06:17:05 PM EDT + * It has been AutoGen-ed Monday January 7, 2008 at 09:24:53 PM CET * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Oct 14 18:17:05 EDT 2007 +/* DO NOT SVN-MERGE THIS FILE, EITHER Mon Jan 7 21:24:53 CET 2008 * * 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 210 fixup descriptions. + * This file contains 211 fixup descriptions. * * See README for more information. * @@ -2265,6 +2265,43 @@ static const char* apzGlibc_C99_Inline_1Patch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Glibc_C99_Inline_1a fix + */ +tSCC zGlibc_C99_Inline_1aName[] = + "glibc_c99_inline_1a"; + +/* + * File name selection pattern + */ +tSCC zGlibc_C99_Inline_1aList[] = + "features.h\0*/features.h\0"; +/* + * Machine/OS name selection pattern + */ +#define apzGlibc_C99_Inline_1aMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zGlibc_C99_Inline_1aSelect0[] = + "(\\) && defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__)\n\ +(#[ \t]*define[ \t]*__USE_EXTERN_INLINES[ \t]*1)"; + +#define GLIBC_C99_INLINE_1A_TEST_CT 1 +static tTestDesc aGlibc_C99_Inline_1aTests[] = { + { TT_EGREP, zGlibc_C99_Inline_1aSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Glibc_C99_Inline_1a + */ +static const char* apzGlibc_C99_Inline_1aPatch[] = { + "format", + "%1 && (defined __extern_inline || defined __GNUC_GNU_INLINE__)\n\ +%2", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Glibc_C99_Inline_2 fix */ tSCC zGlibc_C99_Inline_2Name[] = @@ -2335,7 +2372,7 @@ tSCC zGlibc_C99_Inline_3Select0[] = * content bypass pattern - skip fix if pattern found */ tSCC zGlibc_C99_Inline_3Bypass0[] = - "__STDC_VERSION__"; + "__extern_inline|__GNU_STDC_INLINE__"; #define GLIBC_C99_INLINE_3_TEST_CT 2 static tTestDesc aGlibc_C99_Inline_3Tests[] = { @@ -2362,7 +2399,7 @@ tSCC zGlibc_C99_Inline_4Name[] = * File name selection pattern */ tSCC zGlibc_C99_Inline_4List[] = - "sys/sysmacros.h\0*/sys/sysmacros.h\0"; + "sys/sysmacros.h\0*/sys/sysmacros.h\0wchar.h\0*/wchar.h\0"; /* * Machine/OS name selection pattern */ @@ -2372,13 +2409,13 @@ tSCC zGlibc_C99_Inline_4List[] = * content selection pattern - do fix if pattern found */ tSCC zGlibc_C99_Inline_4Select0[] = - "extern __inline"; + "(^| )extern __inline"; /* * content bypass pattern - skip fix if pattern found */ tSCC zGlibc_C99_Inline_4Bypass0[] = - "__STDC_VERSION__"; + "__extern_inline|__gnu_inline__"; #define GLIBC_C99_INLINE_4_TEST_CT 2 static tTestDesc aGlibc_C99_Inline_4Tests[] = { @@ -2390,11 +2427,7 @@ static tTestDesc aGlibc_C99_Inline_4Tests[] = { */ static const char* apzGlibc_C99_Inline_4Patch[] = { "format", - "\n\ -#ifdef __GNUC_GNU_INLINE__\n\ -extern\n\ -#endif\n", - "(^| )extern ", + "%0 __attribute__ ((__gnu_inline__))", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -8539,9 +8572,9 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 253 +#define REGEX_COUNT 254 #define MACH_LIST_SIZE_LIMIT 261 -#define FIX_COUNT 210 +#define FIX_COUNT 211 /* * Enumerate the fixes @@ -8599,6 +8632,7 @@ typedef enum { FREEBSD_GCC3_BREAKAGE_FIXIDX, FREEBSD_GCC4_BREAKAGE_FIXIDX, GLIBC_C99_INLINE_1_FIXIDX, + GLIBC_C99_INLINE_1A_FIXIDX, GLIBC_C99_INLINE_2_FIXIDX, GLIBC_C99_INLINE_3_FIXIDX, GLIBC_C99_INLINE_4_FIXIDX, @@ -9020,6 +9054,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { GLIBC_C99_INLINE_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aGlibc_C99_Inline_1Tests, apzGlibc_C99_Inline_1Patch, 0 }, + { zGlibc_C99_Inline_1aName, zGlibc_C99_Inline_1aList, + apzGlibc_C99_Inline_1aMachs, + GLIBC_C99_INLINE_1A_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aGlibc_C99_Inline_1aTests, apzGlibc_C99_Inline_1aPatch, 0 }, + { zGlibc_C99_Inline_2Name, zGlibc_C99_Inline_2List, apzGlibc_C99_Inline_2Machs, GLIBC_C99_INLINE_2_TEST_CT, FD_MACH_ONLY, |