path: root/src/multibyte
diff options
authorRich Felker <>2012-02-23 21:24:56 -0500
committerRich Felker <>2012-02-23 21:24:56 -0500
commitbae2e52bfd676c447862b9baec535db401aab075 (patch)
tree2ce86c4968124da4cd7b27b02ea8570e2bc49bdd /src/multibyte
parent00b883a95561b7ed31b0907fcd7cb16267de6e4d (diff)
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.
Diffstat (limited to 'src/multibyte')
2 files changed, 4 insertions, 6 deletions
diff --git a/src/multibyte/internal.c b/src/multibyte/internal.c
index 11b9818f..1a4ddc3f 100644
--- a/src/multibyte/internal.c
+++ b/src/multibyte/internal.c
@@ -23,7 +23,7 @@
| ( R(0x80,0xc0) >> 12 ) \
| x )
-const uint32_t bittab[] = {
+const uint32_t bittab[] ATTR_LIBC_VISIBILITY = {
diff --git a/src/multibyte/internal.h b/src/multibyte/internal.h
index df47331e..cd1196ba 100644
--- a/src/multibyte/internal.h
+++ b/src/multibyte/internal.h
@@ -6,11 +6,9 @@
#define bittab __fsmu8
-#if 100*__GNUC__+__GNUC_MINOR__ >= 303 || defined(__PCC__) || defined(__TINYC__)
-extern const uint32_t bittab[] __attribute__((visibility("hidden")));
-extern const uint32_t bittab[];
+#include "libc.h"
+extern const uint32_t bittab[] ATTR_LIBC_VISIBILITY;
/* Upper 6 state bits are a negative integer offset to bound-check next byte */
/* equivalent to: ( (b-0x80) | (b+offset) ) & ~0x3f */