diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fixinc/fixincl.x | 21 | ||||
| -rw-r--r-- | gcc/fixinc/inclhack.def | 2 |
3 files changed, 22 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 97b8198..364d76f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2002-01-28 Loren J. Rittle <ljrittle@acm.org> + + * fixinc/inclhack.def (strict_ansi_not): Add a bypass based on + the old, removed AAA_standards fix. + * fixinc/fixincl.x: Rebuilt. + 2002-01-28 Hans-Peter Nilsson <hp@axis.com> * config/cris/cris.h (CRT_CALL_STATIC_FUNCTION): Change to emit diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index 93eb51e..e2a2222 100644 --- a/gcc/fixinc/fixincl.x +++ b/gcc/fixinc/fixincl.x @@ -144,14 +144,14 @@ static const char* apzAab_Fd_Zero_Asm_Posix_Types_HPatch[] = { #define __FD_ZERO(fdsetp) \\\n\ do { \\\n\ int __d0, __d1; \\\n\ -\t\t__asm__ __volatile__(\"cld ; rep ; stosl\" \\\n\ -\t\t\t: \"=&c\" (__d0), \"=&D\" (__d1) \\\n\ -\t\t\t: \"a\" (0), \"0\" (__FDSET_LONGS), \\\n\ -\t\t\t \"1\" ((__kernel_fd_set *) (fdsetp)) :\"memory\"); \\\n\ +__asm__ __volatile__(\"cld ; rep ; stosl\" \\\n\ +: \"=&c\" (__d0), \"=&D\" (__d1) \\\n\ +: \"a\" (0), \"0\" (__FDSET_LONGS), \\\n\ + \"1\" ((__kernel_fd_set *) (fdsetp)) :\"memory\"); \\\n\ } while (0)\n\ #endif\n\n\ #define _POSIX_TYPES_H_WRAPPER\n\ -#endif /* _POSIX_TYPES_H_WRAPPER */\n", +#endif /* _POSIX_TYPES_H_WRAPPER */", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -3764,13 +3764,20 @@ tSCC zStrict_Ansi_NotSelect0[] = "^([ \t]*#[ \t]*if.*)(!__STDC__|__STDC__[ \t]*==[ \t]*0|__STDC__[ \t]*!=[ \t]*1|__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*0)"; /* + * content bypass pattern - skip fix if pattern found + */ +tSCC zStrict_Ansi_NotBypass0[] = + "GNU and MIPS C compilers define __STDC__ differently"; + +/* * perform the C function call test */ tSCC zStrict_Ansi_NotFTst0[] = "stdc_0_in_system_headers"; -#define STRICT_ANSI_NOT_TEST_CT 2 +#define STRICT_ANSI_NOT_TEST_CT 3 static tTestDesc aStrict_Ansi_NotTests[] = { { TT_FUNCTION, zStrict_Ansi_NotFTst0, 0 /* unused */ }, + { TT_NEGREP, zStrict_Ansi_NotBypass0, (regex_t*)NULL }, { TT_EGREP, zStrict_Ansi_NotSelect0, (regex_t*)NULL }, }; /* @@ -5428,7 +5435,7 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 146 +#define REGEX_COUNT 147 #define MACH_LIST_SIZE_LIMIT 279 #define FIX_COUNT 138 diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index 4e26034..d322d2f 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -2173,6 +2173,8 @@ fix = { "|__STDC__[ \t]*==[ \t]*0" "|__STDC__[ \t]*!=[ \t]*1" "|__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*0)"; + /* Tru64 UNIX V4.0F/V5.1 <standards.h> supports GCC usage of __STDC__. */ + bypass = 'GNU and MIPS C compilers define __STDC__ differently'; c_test = stdc_0_in_system_headers; c_fix = format; |