diff options
| author | Marek Polacek <polacek@redhat.com> | 2012-04-29 15:34:20 +0200 |
|---|---|---|
| committer | Marek Polacek <polacek@redhat.com> | 2012-04-29 15:34:20 +0200 |
| commit | 5ac3ea17df811a71fa64aff78ea1b900facd3364 (patch) | |
| tree | 47a842e0be1ca4d8c98ecc86d18330d61047560a /misc/sys | |
| parent | ecf0ebfb04f6e31e3ba709521b6955d5f86ff724 (diff) | |
| download | glibc-5ac3ea17df811a71fa64aff78ea1b900facd3364.tar glibc-5ac3ea17df811a71fa64aff78ea1b900facd3364.tar.gz glibc-5ac3ea17df811a71fa64aff78ea1b900facd3364.tar.bz2 glibc-5ac3ea17df811a71fa64aff78ea1b900facd3364.zip | |
Fix attributes for fortify functions.
Diffstat (limited to 'misc/sys')
| -rw-r--r-- | misc/sys/cdefs.h | 23 | ||||
| -rw-r--r-- | misc/sys/syslog.h | 2 |
2 files changed, 12 insertions, 13 deletions
diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h index 724f26e399..f4e96dbe6a 100644 --- a/misc/sys/cdefs.h +++ b/misc/sys/cdefs.h @@ -140,6 +140,7 @@ /* Fortify support. */ #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) #define __bos0(ptr) __builtin_object_size (ptr, 0) +#define __fortify_function __extern_always_inline __attribute_artificial__ #if __GNUC_PREREQ (4,3) # define __warndecl(name, msg) \ @@ -309,26 +310,24 @@ # define __always_inline __inline #endif +/* Associate error messages with the source location of the call site rather + than with the source location inside the function. */ +#if __GNUC_PREREQ (4,3) +# define __attribute_artificial__ __attribute__ ((__artificial__)) +#else +# define __attribute_artificial__ /* Ignore */ +#endif + /* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 inline semantics, unless -fgnu89-inline is used. */ #if !defined __cplusplus || __GNUC_PREREQ (4,3) # if defined __GNUC_STDC_INLINE__ || defined __cplusplus # define __extern_inline extern __inline __attribute__ ((__gnu_inline__)) -# if __GNUC_PREREQ (4,3) -# define __extern_always_inline \ - extern __always_inline __attribute__ ((__gnu_inline__, __artificial__)) -# else -# define __extern_always_inline \ +# define __extern_always_inline \ extern __always_inline __attribute__ ((__gnu_inline__)) -# endif # else # define __extern_inline extern __inline -# if __GNUC_PREREQ (4,3) -# define __extern_always_inline \ - extern __always_inline __attribute__ ((__artificial__)) -# else -# define __extern_always_inline extern __always_inline -# endif +# define __extern_always_inline extern __always_inline # endif #endif diff --git a/misc/sys/syslog.h b/misc/sys/syslog.h index aed419e446..77123ab503 100644 --- a/misc/sys/syslog.h +++ b/misc/sys/syslog.h @@ -203,7 +203,7 @@ extern void vsyslog (int __pri, const char *__fmt, __gnuc_va_list __ap) /* Define some macros helping to catch buffer overflows. */ -#if __USE_FORTIFY_LEVEL > 0 && defined __extern_always_inline +#if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function # include <bits/syslog.h> #endif #ifdef __LDBL_COMPAT |