cleanup and work around visibility bug in gcc 3 that affects x86_64

[musl] / src / multibyte / internal.c

diff --git a/src/multibyte/internal.c b/src/multibyte/internal.c
index e9b938d..1a4ddc3 100644 (file)
--- a/src/multibyte/internal.c
+++ b/src/multibyte/internal.c
@@ -15,27 +15,6 @@
                  R(0x80,0xc0) ) \
              | ( R(0x80,0xc0) >> 6 ) \
              | x )
-#ifdef I_FAILED_TO_RTFM_RFC3629
-#define F0(x) (( x==0 ? R(0x90,0xc0) : \
-                 R(0x80,0xc0) ) \
-             | ( R(0x80,0xc0) >> 6 ) \
-             | ( R(0x80,0xc0) >> 12 ) \
-             | x )
-#define F8(x) (( x==0 ? R(0xa0,0xc0) : \
-                 R(0x80,0xc0) ) \
-             | ( R(0x80,0xc0) >> 6 ) \
-             | ( R(0x80,0xc0) >> 12 ) \
-             | ( R(0x80,0xc0) >> 18 ) \
-             | x )
-#define FC(x) (( x==0 ? R(0x88,0xc0) : \
-                 R(0x80,0xc0) ) \
-             | ( R(0x80,0xc0) >> 6 ) \
-             | ( R(0x80,0xc0) >> 12 ) \
-             | ( R(0x80,0xc0) >> 18 ) \
-             | ( R(0x80,0xc0) >> 24 ) \
-             | x )
-#define F(x) ( x<8 ? F0(x) : x<12 ? F8((x&3)) : x<14 ? FC((x&1)) : -1 )
-#else
 #define F(x) ( ( x>=5 ? 0 : \
                  x==0 ? R(0x90,0xc0) : \
                  x==4 ? R(0x80,0xa0) : \
@@ -43,18 +22,13 @@
              | ( R(0x80,0xc0) >> 6 ) \
              | ( R(0x80,0xc0) >> 12 ) \
              | x )
-#endif
 
-const uint32_t bittab[] = {
+const uint32_t bittab[] ATTR_LIBC_VISIBILITY = {
                      C(0x2),C(0x3),C(0x4),C(0x5),C(0x6),C(0x7),
        C(0x8),C(0x9),C(0xa),C(0xb),C(0xc),C(0xd),C(0xe),C(0xf),
        D(0x0),D(0x1),D(0x2),D(0x3),D(0x4),D(0x5),D(0x6),D(0x7),
        D(0x8),D(0x9),D(0xa),D(0xb),D(0xc),D(0xd),D(0xe),D(0xf),
        E(0x0),E(0x1),E(0x2),E(0x3),E(0x4),E(0x5),E(0x6),E(0x7),
        E(0x8),E(0x9),E(0xa),E(0xb),E(0xc),E(0xd),E(0xe),E(0xf),
-       F(0x0),F(0x1),F(0x2),F(0x3),F(0x4),
-#ifdef I_FAILED_TO_RTFM_RFC3629
-                                          F(0x5),F(0x6),F(0x7),
-       F(0x8),F(0x9),F(0xa),F(0xb),F(0xc),F(0xd)
-#endif
+       F(0x0),F(0x1),F(0x2),F(0x3),F(0x4)
 };