From bae2e52bfd676c447862b9baec535db401aab075 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Thu, 23 Feb 2012 21:24:56 -0500 Subject: cleanup and work around visibility bug in gcc 3 that affects x86_64 in gcc 3, the visibility attribute must be placed on both the declaration and on the definition. if it's omitted from the definition, the compiler fails to emit the ".hidden" directive in the assembly, and the linker will either generate textrels (if supported, such as on i386) or refuse to link (on targets where certain types of textrels are forbidden or impossible without further assumptions about memory layout, such as on x86_64). this patch also unifies the decision about when to use visibility into libc.h and makes the visibility in the utf-8 state machine tables based on libc.h rather than a duplicate test. --- src/internal/libc.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'src/internal/libc.h') diff --git a/src/internal/libc.h b/src/internal/libc.h index d985902c..45d5c9e7 100644 --- a/src/internal/libc.h +++ b/src/internal/libc.h @@ -19,16 +19,21 @@ struct __libc { }; -#if 100*__GNUC__+__GNUC_MINOR__ >= 303 || defined(__PCC__) || defined(__TINYC__) -extern struct __libc __libc __attribute__((visibility("hidden"))); -#define libc __libc +#if !defined(__PIC__) || 100*__GNUC__+__GNUC_MINOR__ >= 303 || defined(__PCC__) || defined(__TINYC__) -#elif !defined(__PIC__) -extern struct __libc __libc; +#ifdef __PIC__ +#define ATTR_LIBC_VISIBILITY __attribute__((visibility("hidden"))) +#else +#define ATTR_LIBC_VISIBILITY +#endif + +extern struct __libc __libc ATTR_LIBC_VISIBILITY; #define libc __libc #else + #define USE_LIBC_ACCESSOR +#define ATTR_LIBC_VISIBILITY extern struct __libc *__libc_loc(void) __attribute__((const)); #define libc (*__libc_loc()) -- cgit v1.2.1