patches/gcc-4.8.0-musl.diff

   1 11b7c7e47a01 tip
   2 # HG changeset patch
   3 # Parent 6b1b8174ce29396d7dbd482296f43eba38948222
   4 Support for arm-linux-musl.
   5
   6 diff -r 6b1b8174ce29 gcc/config/arm/linux-eabi.h
   7 --- a/gcc/config/arm/linux-eabi.h       Fri Mar 29 16:41:20 2013 -0400
   8 +++ b/gcc/config/arm/linux-eabi.h       Fri Mar 29 16:41:23 2013 -0400
   9 @@ -77,6 +77,10 @@
  10      %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \
  11      %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}"
  12
  13 +/* musl has no "classic" (i.e. broken) mode */
  14 +#undef  MUSL_DYNAMIC_LINKER
  15 +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-arm.so.1"
  16 +
  17  /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
  18     use the GNU/Linux version, not the generic BPABI version.  */
  19  #undef  LINK_SPEC
  20 diff -r 6b1b8174ce29 libitm/config/arm/hwcap.cc
  21 --- a/libitm/config/arm/hwcap.cc        Fri Mar 29 16:41:20 2013 -0400
  22 +++ b/libitm/config/arm/hwcap.cc        Fri Mar 29 16:41:23 2013 -0400
  23 @@ -40,7 +40,11 @@
  24
  25  #ifdef __linux__
  26  #include <unistd.h>
  27 +#ifdef __GLIBC__
  28  #include <sys/fcntl.h>
  29 +#else
  30 +#include <fcntl.h>
  31 +#endif
  32  #include <elf.h>
  33
  34  static void __attribute__((constructor))
  35 # HG changeset patch
  36 # Parent 2b29df135cf04fe23c38301f6d0fc5796366aecf
  37 Adding -mmusl as a musl libc specifier, and the necessary hacks for it to know how to find musl's dynamic linker.
  38
  39 diff -r 2b29df135cf0 gcc/config.gcc
  40 --- a/gcc/config.gcc    Fri Mar 29 16:41:11 2013 -0400
  41 +++ b/gcc/config.gcc    Fri Mar 29 16:41:14 2013 -0400
  42 @@ -549,7 +549,7 @@
  43  esac
  44
  45  # Common C libraries.
  46 -tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3"
  47 +tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4"
  48
  49  # Common parts for widely ported systems.
  50  case ${target} in
  51 @@ -652,6 +652,9 @@
  52      *-*-*uclibc*)
  53        tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
  54        ;;
  55 +    *-*-*musl*)
  56 +      tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL"
  57 +      ;;
  58      *)
  59        tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
  60        ;;
  61 diff -r 2b29df135cf0 gcc/config/linux.h
  62 --- a/gcc/config/linux.h        Fri Mar 29 16:41:11 2013 -0400
  63 +++ b/gcc/config/linux.h        Fri Mar 29 16:41:14 2013 -0400
  64 @@ -32,10 +32,12 @@
  65  #define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
  66  #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
  67  #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
  68 +#define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
  69  #else
  70  #define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
  71  #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
  72  #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
  73 +#define OPTION_MUSL   (linux_libc == LIBC_MUSL)
  74  #endif
  75
  76  #define GNU_USER_TARGET_OS_CPP_BUILTINS()                      \
  77 @@ -53,18 +55,21 @@
  78     uClibc or Bionic is the default C library and whether
  79     -muclibc or -mglibc or -mbionic has been passed to change the default.  */
  80
  81 -#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3)     \
  82 -  "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}"
  83 +#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4) \
  84 +  "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}"
  85
  86  #if DEFAULT_LIBC == LIBC_GLIBC
  87 -#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
  88 -  CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B)
  89 +#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
  90 +  CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M)
  91  #elif DEFAULT_LIBC == LIBC_UCLIBC
  92 -#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
  93 -  CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B)
  94 +#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
  95 +  CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M)
  96  #elif DEFAULT_LIBC == LIBC_BIONIC
  97 -#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
  98 -  CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U)
  99 +#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
 100 +  CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M)
 101 +#elif DEFAULT_LIBC == LIBC_MUSL
 102 +#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
 103 +  CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B)
 104  #else
 105  #error "Unsupported DEFAULT_LIBC"
 106  #endif /* DEFAULT_LIBC */
 107 @@ -84,16 +89,16 @@
 108
 109  #define GNU_USER_DYNAMIC_LINKER                                                \
 110    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER,  \
 111 -                        BIONIC_DYNAMIC_LINKER)
 112 +                        BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
 113  #define GNU_USER_DYNAMIC_LINKER32                                      \
 114    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \
 115 -                        BIONIC_DYNAMIC_LINKER32)
 116 +                        BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
 117  #define GNU_USER_DYNAMIC_LINKER64                                      \
 118    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \
 119 -                        BIONIC_DYNAMIC_LINKER64)
 120 +                        BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
 121  #define GNU_USER_DYNAMIC_LINKERX32                                     \
 122    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \
 123 -                        BIONIC_DYNAMIC_LINKERX32)
 124 +                        BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32)
 125
 126  /* Determine whether the entire c99 runtime
 127     is present in the runtime library.  */
 128 diff -r 2b29df135cf0 gcc/config/linux.opt
 129 --- a/gcc/config/linux.opt      Fri Mar 29 16:41:11 2013 -0400
 130 +++ b/gcc/config/linux.opt      Fri Mar 29 16:41:14 2013 -0400
 131 @@ -30,3 +30,7 @@
 132  muclibc
 133  Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
 134  Use uClibc C library
 135 +
 136 +mmusl
 137 +Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc)
 138 +Use musl C library
 139 diff -r 2b29df135cf0 gcc/ginclude/stddef.h
 140 --- a/gcc/ginclude/stddef.h     Fri Mar 29 16:41:11 2013 -0400
 141 +++ b/gcc/ginclude/stddef.h     Fri Mar 29 16:41:14 2013 -0400
 142 @@ -181,6 +181,7 @@
 143  #ifndef _GCC_SIZE_T
 144  #ifndef _SIZET_
 145  #ifndef __size_t
 146 +#ifndef __DEFINED_size_t /* musl */
 147  #define __size_t__     /* BeOS */
 148  #define __SIZE_T__     /* Cray Unicos/Mk */
 149  #define _SIZE_T
 150 @@ -197,6 +198,7 @@
 151  #define ___int_size_t_h
 152  #define _GCC_SIZE_T
 153  #define _SIZET_
 154 +#define __DEFINED_size_t /* musl */
 155  #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
 156    || defined(__FreeBSD_kernel__)
 157  /* __size_t is a typedef on FreeBSD 5, must not trash it. */
 158 @@ -214,6 +216,7 @@
 159  typedef long ssize_t;
 160  #endif /* __BEOS__ */
 161  #endif /* !(defined (__GNUG__) && defined (size_t)) */
 162 +#endif /* __DEFINED_size_t */
 163  #endif /* __size_t */
 164  #endif /* _SIZET_ */
 165  #endif /* _GCC_SIZE_T */
 166 # HG changeset patch
 167 # Parent 2b94537ce2496c88e7e797c617e5b95e8d7e4785
 168 A fix for libgomp to correctly request a POSIX version for time support.
 169
 170 diff -r 2b94537ce249 libgomp/config/posix/time.c
 171 --- a/libgomp/config/posix/time.c       Fri Mar 29 16:41:14 2013 -0400
 172 +++ b/libgomp/config/posix/time.c       Fri Mar 29 16:41:17 2013 -0400
 173 @@ -28,6 +28,8 @@
 174     The following implementation uses the most simple POSIX routines.
 175     If present, POSIX 4 clocks should be used instead.  */
 176
 177 +#define _POSIX_C_SOURCE 199309L /* for clocks */
 178 +
 179  #include "libgomp.h"
 180  #include <unistd.h>
 181  #if TIME_WITH_SYS_TIME
 182 # HG changeset patch
 183 # Parent f50bb54f331f73405131a30b4f353cfda1c70304
 184 Use the generic implementation of libstdc++ primitives when we're on musl, not the glibc one.
 185
 186 diff -r f50bb54f331f libstdc++-v3/configure.host
 187 --- a/libstdc++-v3/configure.host       Fri Mar 29 16:38:52 2013 -0400
 188 +++ b/libstdc++-v3/configure.host       Fri Mar 29 16:41:10 2013 -0400
 189 @@ -264,6 +264,13 @@
 190      os_include_dir="os/bsd/freebsd"
 191      ;;
 192    gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
 193 +    # check for musl by target
 194 +    case "${host_os}" in
 195 +      *-musl*)
 196 +        os_include_dir="os/generic"
 197 +        ;;
 198 +      *)
 199 +
 200      if [ "$uclibc" = "yes" ]; then
 201        os_include_dir="os/uclibc"
 202      elif [ "$bionic" = "yes" ]; then
 203 @@ -272,6 +279,9 @@
 204        os_include_dir="os/gnu-linux"
 205      fi
 206      ;;
 207 +
 208 +    esac
 209 +    ;;
 210    hpux*)
 211      os_include_dir="os/hpux"
 212      ;;
 213 # HG changeset patch
 214 # Parent 62831d7bf931658019ba16092c48375177d014b1
 215 Support for mips-linux-musl.
 216
 217 diff -r 62831d7bf931 gcc/config/mips/linux.h
 218 --- a/gcc/config/mips/linux.h   Fri Mar 29 16:41:23 2013 -0400
 219 +++ b/gcc/config/mips/linux.h   Fri Mar 29 16:41:25 2013 -0400
 220 @@ -18,3 +18,5 @@
 221  <http://www.gnu.org/licenses/>.  */
 222
 223  #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
 224 +
 225 +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips.so.1"
 226 # HG changeset patch
 227 # Parent 2ffe76b215fdb082cbbc262536077627757fa9bf
 228 Support for powerpc-linux-musl.
 229
 230 diff -r 2ffe76b215fd gcc/config.gcc
 231 --- a/gcc/config.gcc    Fri Mar 29 16:41:26 2013 -0400
 232 +++ b/gcc/config.gcc    Fri Mar 29 16:41:28 2013 -0400
 233 @@ -2112,6 +2112,10 @@
 234             powerpc*-*-linux*paired*)
 235                 tm_file="${tm_file} rs6000/750cl.h" ;;
 236         esac
 237 +        case ${target} in
 238 +            *-linux*-musl*)
 239 +                enable_secureplt=yes ;;
 240 +        esac
 241         if test x${enable_secureplt} = xyes; then
 242                 tm_file="rs6000/secureplt.h ${tm_file}"
 243         fi
 244 diff -r 2ffe76b215fd gcc/config/rs6000/linux64.h
 245 --- a/gcc/config/rs6000/linux64.h       Fri Mar 29 16:41:26 2013 -0400
 246 +++ b/gcc/config/rs6000/linux64.h       Fri Mar 29 16:41:28 2013 -0400
 247 @@ -364,17 +364,21 @@
 248  #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
 249  #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
 250  #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
 251 +#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1"
 252 +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1"
 253  #if DEFAULT_LIBC == LIBC_UCLIBC
 254 -#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
 255 +#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
 256  #elif DEFAULT_LIBC == LIBC_GLIBC
 257 -#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
 258 +#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
 259 +#elif DEFAULT_LIBC == LIBC_MUSL
 260 +#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
 261  #else
 262  #error "Unsupported DEFAULT_LIBC"
 263  #endif
 264  #define GNU_USER_DYNAMIC_LINKER32 \
 265 -  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32)
 266 +  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
 267  #define GNU_USER_DYNAMIC_LINKER64 \
 268 -  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
 269 +  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
 270
 271
 272  #define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
 273 diff -r 2ffe76b215fd gcc/config/rs6000/secureplt.h
 274 --- a/gcc/config/rs6000/secureplt.h     Fri Mar 29 16:41:26 2013 -0400
 275 +++ b/gcc/config/rs6000/secureplt.h     Fri Mar 29 16:41:28 2013 -0400
 276 @@ -18,3 +18,4 @@
 277  <http://www.gnu.org/licenses/>.  */
 278
 279  #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
 280 +#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
 281 diff -r 2ffe76b215fd gcc/config/rs6000/sysv4.h
 282 --- a/gcc/config/rs6000/sysv4.h Fri Mar 29 16:41:26 2013 -0400
 283 +++ b/gcc/config/rs6000/sysv4.h Fri Mar 29 16:41:28 2013 -0400
 284 @@ -551,6 +551,9 @@
 285  #ifndef CC1_SECURE_PLT_DEFAULT_SPEC
 286  #define CC1_SECURE_PLT_DEFAULT_SPEC ""
 287  #endif
 288 +#ifndef LINK_SECURE_PLT_DEFAULT_SPEC
 289 +#define LINK_SECURE_PLT_DEFAULT_SPEC ""
 290 +#endif
 291
 292  /* Pass -G xxx to the compiler and set correct endian mode.  */
 293  #define        CC1_SPEC "%{G*} %(cc1_cpu) \
 294 @@ -611,7 +614,8 @@
 295  %{mlittle: --oformat elf32-powerpcle } %{mlittle-endian: --oformat elf32-powerpcle } \
 296  %{!mlittle: %{!mlittle-endian: %{!mbig: %{!mbig-endian: \
 297      %{mcall-i960-old: --oformat elf32-powerpcle} \
 298 -  }}}}"
 299 +  }}}} \
 300 +%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}"
 301
 302  /* Any specific OS flags.  */
 303  #define LINK_OS_SPEC "\
 304 @@ -789,15 +793,18 @@
 305
 306  #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
 307  #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
 308 +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1"
 309  #if DEFAULT_LIBC == LIBC_UCLIBC
 310 -#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
 311 +#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
 312 +#elif DEFAULT_LIBC == LIBC_MUSL
 313 +#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
 314  #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
 315 -#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
 316 +#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
 317  #else
 318  #error "Unsupported DEFAULT_LIBC"
 319  #endif
 320  #define GNU_USER_DYNAMIC_LINKER \
 321 -  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
 322 +  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
 323
 324  #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
 325    %{rdynamic:-export-dynamic} \
 326 @@ -923,6 +930,7 @@
 327    { "cc1_endian_little",       CC1_ENDIAN_LITTLE_SPEC },               \
 328    { "cc1_endian_default",      CC1_ENDIAN_DEFAULT_SPEC },              \
 329    { "cc1_secure_plt_default",  CC1_SECURE_PLT_DEFAULT_SPEC },          \
 330 +  { "link_secure_plt_default", LINK_SECURE_PLT_DEFAULT_SPEC },         \
 331    { "cpp_os_ads",              CPP_OS_ADS_SPEC },                      \
 332    { "cpp_os_yellowknife",      CPP_OS_YELLOWKNIFE_SPEC },              \
 333    { "cpp_os_mvme",             CPP_OS_MVME_SPEC },                     \
 334 diff -r 2ffe76b215fd libgcc/config/rs6000/linux-unwind.h
 335 --- a/libgcc/config/rs6000/linux-unwind.h       Fri Mar 29 16:41:26 2013 -0400
 336 +++ b/libgcc/config/rs6000/linux-unwind.h       Fri Mar 29 16:41:28 2013 -0400
 337 @@ -258,6 +258,7 @@
 338
 339    return _URC_NO_REASON;
 340  }
 341 +#endif
 342
 343  #define MD_FROB_UPDATE_CONTEXT frob_update_context
 344
 345 # HG changeset patch
 346 # Parent 3ea10cd626cb7abdfd56d3fe8d2c9ed58a82797b
 347 Support for i386-linux-musl and x86_64-linux-musl.
 348
 349 diff -r 3ea10cd626cb gcc/config/i386/linux.h
 350 --- a/gcc/config/i386/linux.h   Fri Mar 29 16:41:17 2013 -0400
 351 +++ b/gcc/config/i386/linux.h   Fri Mar 29 16:41:20 2013 -0400
 352 @@ -21,3 +21,4 @@
 353
 354  #define GNU_USER_LINK_EMULATION "elf_i386"
 355  #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
 356 +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
 357 diff -r 3ea10cd626cb gcc/config/i386/linux64.h
 358 --- a/gcc/config/i386/linux64.h Fri Mar 29 16:41:17 2013 -0400
 359 +++ b/gcc/config/i386/linux64.h Fri Mar 29 16:41:20 2013 -0400
 360 @@ -30,3 +30,7 @@
 361  #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
 362  #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
 363  #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
 364 +
 365 +#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
 366 +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
 367 +#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
 368 diff -r 3ea10cd626cb libitm/config/linux/x86/tls.h
 369 --- a/libitm/config/linux/x86/tls.h     Fri Mar 29 16:41:17 2013 -0400
 370 +++ b/libitm/config/linux/x86/tls.h     Fri Mar 29 16:41:20 2013 -0400
 371 @@ -25,16 +25,19 @@
 372  #ifndef LIBITM_X86_TLS_H
 373  #define LIBITM_X86_TLS_H 1
 374
 375 -#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
 376 +#if defined(__GLIBC_PREREQ)
 377 +#if __GLIBC_PREREQ(2, 10)
 378  /* Use slots in the TCB head rather than __thread lookups.
 379     GLIBC has reserved words 10 through 13 for TM.  */
 380  #define HAVE_ARCH_GTM_THREAD 1
 381  #define HAVE_ARCH_GTM_THREAD_DISP 1
 382  #endif
 383 +#endif
 384
 385  #include "config/generic/tls.h"
 386
 387 -#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
 388 +#if defined(__GLIBC_PREREQ)
 389 +#if __GLIBC_PREREQ(2, 10)
 390  namespace GTM HIDDEN {
 391
 392  #ifdef __x86_64__
 393 @@ -101,5 +104,6 @@
 394
 395  } // namespace GTM
 396  #endif /* >= GLIBC 2.10 */
 397 +#endif
 398
 399  #endif // LIBITM_X86_TLS_H