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 /libio/bits | |
| parent | bb21d92c368e80e22a8f16f5313ff259087daca1 (diff) | |
| download | glibc-5acf2e2cb412b7ceba599c6f5af43aa53e3fe04d.tar.gz glibc-5acf2e2cb412b7ceba599c6f5af43aa53e3fe04d.tar.xz glibc-5acf2e2cb412b7ceba599c6f5af43aa53e3fe04d.zip | |
* 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.
Diffstat (limited to 'libio/bits')
| -rw-r--r-- | libio/bits/stdio2.h | 19 |
1 files changed, 15 insertions, 4 deletions
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 |