diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2004-11-02 13:30:19 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2004-11-02 13:30:19 +0000 |
| commit | 5acf2e2cb412b7ceba599c6f5af43aa53e3fe04d (patch) | |
| tree | 21b153196ae7e15dfd9a02987bd580cee9dfadc0 | |
| parent | bb21d92c368e80e22a8f16f5313ff259087daca1 (diff) | |
* include/features.h (__USE_FORTIFY_LEVEL): Also set for Red Hat
GCC 3.4.x-RH >= 3.4.2-8.
* libio/bits/features.h (printf, fprintf, vprintf, vfprintf): For
GCC 3.4.x-RH use __builtin___{,v}{,f}printf_chk instead of
__{,v}{,f}printf_chk.
* debug/tst-chk1.c (do_test): Deal with GCC 3.4.x-RH not
being able to recognize subobjects.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | debug/tst-chk1.c | 4 | ||||
| -rw-r--r-- | include/features.h | 6 | ||||
| -rw-r--r-- | libio/bits/stdio2.h | 19 |
4 files changed, 32 insertions, 7 deletions
@@ -1,3 +1,13 @@ +2004-11-02 Jakub Jelinek <jakub@redhat.com> + + * include/features.h (__USE_FORTIFY_LEVEL): Also set for Red Hat + GCC 3.4.x-RH >= 3.4.2-8. + * libio/bits/features.h (printf, fprintf, vprintf, vfprintf): For + GCC 3.4.x-RH use __builtin___{,v}{,f}printf_chk instead of + __{,v}{,f}printf_chk. + * debug/tst-chk1.c (do_test): Deal with GCC 3.4.x-RH not + being able to recognize subobjects. + 2004-11-01 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/x86_64/sys/procfs.h [__WORDSIZE == 32] diff --git a/debug/tst-chk1.c b/debug/tst-chk1.c index 639da3847c..27b4f15346 100644 --- a/debug/tst-chk1.c +++ b/debug/tst-chk1.c @@ -201,7 +201,7 @@ do_test (void) if (memcmp (a.buf1, "aabcdabcjj", 10)) FAIL (); -#if __USE_FORTIFY_LEVEL < 2 +#if __USE_FORTIFY_LEVEL < 2 || !__GNUC_PREREQ (4, 0) /* The following tests are supposed to crash with -D_FORTIFY_SOURCE=2 and sufficient GCC support, as the string operations overflow from a.buf1 into a.buf2. */ @@ -300,7 +300,7 @@ do_test (void) memset (a.buf1 + 9, 'j', l0 + 2); CHK_FAIL_END -#if __USE_FORTIFY_LEVEL >= 2 +#if __USE_FORTIFY_LEVEL >= 2 && __GNUC_PREREQ (4, 0) # define O 0 #else # define O 1 diff --git a/include/features.h b/include/features.h index 7551dcc5cc..ff1de8f472 100644 --- a/include/features.h +++ b/include/features.h @@ -264,7 +264,11 @@ #if _FORTIFY_SOURCE > 0 && __OPTIMIZE__ > 0 \ && (__GNUC_PREREQ (4, 1) \ - || (defined __GNUC_RH_RELEASE__ && __GNUC_PREREQ (4, 0))) + || (defined __GNUC_RH_RELEASE__ && __GNUC_PREREQ (4, 0)) \ + || (defined __GNUC_RH_RELEASE__ && __GNUC_PREREQ (3, 4) \ + && __GNUC_MINOR__ == 4 \ + && (__GNUC_PATCHLEVEL__ > 2 \ + || (__GNUC_PATCHLEVEL__ == 2 && __GNUC_RH_RELEASE__ >= 8)))) # if _FORTIFY_SOURCE == 1 # define __USE_FORTIFY_LEVEL 1 # elif _FORTIFY_SOURCE > 1 diff --git a/libio/bits/stdio2.h b/libio/bits/stdio2.h index acf07ea91b..42a326c60a 100644 --- a/libio/bits/stdio2.h +++ b/libio/bits/stdio2.h @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restrict __stream, int __flag, extern int __vprintf_chk (int __flag, __const char *__restrict __format, _G_va_list __ap); -# define printf(...) \ +# if __GNUC_PREREQ (4, 0) +# define printf(...) \ __printf_chk (__USE_FORTIFY_LEVEL - 1, __VA_ARGS__) -# define fprintf(stream, ...) \ +# define fprintf(stream, ...) \ __fprintf_chk (stream, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__) -# define vprintf(format, ap) \ +# define vprintf(format, ap) \ __vprintf_chk (__USE_FORTIFY_LEVEL - 1, format, ap) -# define vfprintf(stream, format, ap) \ +# define vfprintf(stream, format, ap) \ __vfprintf_chk (stream, __USE_FORTIFY_LEVEL - 1, format, ap) +# else +# define printf(...) \ + __builtin___printf_chk (__USE_FORTIFY_LEVEL - 1, __VA_ARGS__) +# define fprintf(stream, ...) \ + __builtin___fprintf_chk (stream, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__) +# define vprintf(format, ap) \ + __builtin___vprintf_chk (__USE_FORTIFY_LEVEL - 1, format, ap) +# define vfprintf(stream, format, ap) \ + __builtin___vfprintf_chk (stream, __USE_FORTIFY_LEVEL - 1, format, ap) +# endif #endif |