diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-05-17 05:56:15 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-05-17 05:56:15 +0000 |
| commit | f259ef2dde37cdc1994ab89de4202de11db1758d (patch) | |
| tree | fa16d409fa166f36caaced4b9b18b5c11655a10f /fixincludes | |
| parent | f901aa342fec3c1daf7be7c1f6258571542389b1 (diff) | |
| download | gcc-f259ef2dde37cdc1994ab89de4202de11db1758d.tar.gz | |
2008-05-17 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk r135459
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@135460 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'fixincludes')
| -rw-r--r-- | fixincludes/ChangeLog | 6 | ||||
| -rw-r--r-- | fixincludes/fixincl.x | 13 | ||||
| -rw-r--r-- | fixincludes/inclhack.def | 1 |
3 files changed, 15 insertions, 5 deletions
diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog index 913e34e5c47..3f7e9918163 100644 --- a/fixincludes/ChangeLog +++ b/fixincludes/ChangeLog @@ -1,3 +1,9 @@ +2008-05-14 Joseph Myers <joseph@codesourcery.com> + + * inclhack.def (AAB_fd_zero_asm_posix_types_h): Bypass on + posix_types_64. + * fixincl.x: Regenerate. + 2008-04-25 Kai Tietz <kai.tietz@onvision.com> * fixincl.c (fix_with_system): Cast pointer difference to long. diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index 4338150135c..e6dbe9e1bd9 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 Friday March 7, 2008 at 07:37:21 AM CET + * It has been AutoGen-ed Saturday May 17, 2008 at 07:43:42 AM MEST * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Fr 7. Mär 07:37:22 CET 2008 +/* DO NOT SVN-MERGE THIS FILE, EITHER Sat May 17 07:43:42 MEST 2008 * * You must regenerate it. Use the ./genfixes script. * @@ -272,11 +272,14 @@ tSCC zAab_Fd_Zero_Asm_Posix_Types_HBypass0[] = "} while"; tSCC zAab_Fd_Zero_Asm_Posix_Types_HBypass1[] = "x86_64"; +tSCC zAab_Fd_Zero_Asm_Posix_Types_HBypass2[] = + "posix_types_64"; -#define AAB_FD_ZERO_ASM_POSIX_TYPES_H_TEST_CT 2 +#define AAB_FD_ZERO_ASM_POSIX_TYPES_H_TEST_CT 3 static tTestDesc aAab_Fd_Zero_Asm_Posix_Types_HTests[] = { { TT_NEGREP, zAab_Fd_Zero_Asm_Posix_Types_HBypass0, (regex_t*)NULL }, - { TT_NEGREP, zAab_Fd_Zero_Asm_Posix_Types_HBypass1, (regex_t*)NULL }, }; + { TT_NEGREP, zAab_Fd_Zero_Asm_Posix_Types_HBypass1, (regex_t*)NULL }, + { TT_NEGREP, zAab_Fd_Zero_Asm_Posix_Types_HBypass2, (regex_t*)NULL }, }; /* * Fix Command Arguments for Aab_Fd_Zero_Asm_Posix_Types_H @@ -8664,7 +8667,7 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 256 +#define REGEX_COUNT 257 #define MACH_LIST_SIZE_LIMIT 261 #define FIX_COUNT 213 diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def index 04b0c82ed6c..a64566e5e0b 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -182,6 +182,7 @@ fix = { mach = 'i[34567]86-*-linux*'; bypass = '} while'; bypass = 'x86_64'; + bypass = 'posix_types_64'; /* * Define _POSIX_TYPES_H_WRAPPER at the end of the wrapper, not |