464 lines
17 KiB
Diff
464 lines
17 KiB
Diff
# HG changeset patch
|
|
# Parent 05e4cf5f033d266c8f8fe065f8c5752891c5bf7a
|
|
Adding musl to config.sub, so it's recognized as a target platform.
|
|
|
|
|
|
diff -r 05e4cf5f033d -r 04a6a82b8e06 config.sub
|
|
--- config.sub Wed Nov 21 21:16:07 2012 -0500
|
|
+++ config.sub Wed Nov 21 21:16:58 2012 -0500
|
|
@@ -125,6 +125,7 @@
|
|
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
|
|
case $maybe_os in
|
|
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
|
|
+ linux-musl* | \
|
|
linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
|
|
knetbsd*-gnu* | netbsd*-gnu* | \
|
|
kopensolaris*-gnu* | \
|
|
@@ -1346,6 +1347,7 @@
|
|
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
|
| -mingw32* | -linux-gnu* | -linux-android* \
|
|
| -linux-newlib* | -linux-uclibc* \
|
|
+ | -linux-musl* \
|
|
| -uxpv* | -beos* | -mpeix* | -udk* \
|
|
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
|
|
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
|
|
# HG changeset patch
|
|
# Parent 04a6a82b8e06669a42181c96381b4fbc3ffa008c
|
|
Use the generic implementation of libstdc++ primitives when we're on musl, not the glibc one.
|
|
|
|
|
|
diff -r 04a6a82b8e06 -r 193f80e01b02 libstdc++-v3/configure.host
|
|
--- libstdc++-v3/configure.host Wed Nov 21 21:16:58 2012 -0500
|
|
+++ libstdc++-v3/configure.host Wed Nov 21 21:17:38 2012 -0500
|
|
@@ -243,6 +243,13 @@
|
|
os_include_dir="os/bsd/freebsd"
|
|
;;
|
|
gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
|
|
+ # check for musl by target
|
|
+ case "${host_os}" in
|
|
+ *-musl*)
|
|
+ os_include_dir="os/generic"
|
|
+ ;;
|
|
+ *)
|
|
+
|
|
if [ "$uclibc" = "yes" ]; then
|
|
os_include_dir="os/uclibc"
|
|
elif [ "$bionic" = "yes" ]; then
|
|
@@ -251,6 +258,9 @@
|
|
os_include_dir="os/gnu-linux"
|
|
fi
|
|
;;
|
|
+
|
|
+ esac
|
|
+ ;;
|
|
hpux*)
|
|
os_include_dir="os/hpux"
|
|
;;
|
|
# HG changeset patch
|
|
# Parent 193f80e01b026d8de7f53d467f2c59cd0b7927dc
|
|
Adding -mmusl as a musl libc specifier, and the necessary hacks for it to know how to find musl's dynamic linker.
|
|
|
|
|
|
diff -r 193f80e01b02 -r 45cd88d4fb7b gcc/config.gcc
|
|
--- gcc/config.gcc Wed Nov 21 21:17:38 2012 -0500
|
|
+++ gcc/config.gcc Wed Nov 21 21:19:19 2012 -0500
|
|
@@ -522,7 +522,7 @@
|
|
esac
|
|
|
|
# Common C libraries.
|
|
-tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3"
|
|
+tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4"
|
|
|
|
# Common parts for widely ported systems.
|
|
case ${target} in
|
|
@@ -625,6 +625,9 @@
|
|
*-*-*uclibc*)
|
|
tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
|
|
;;
|
|
+ *-*-*musl*)
|
|
+ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL"
|
|
+ ;;
|
|
*)
|
|
tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
|
|
;;
|
|
diff -r 193f80e01b02 -r 45cd88d4fb7b gcc/config/linux.h
|
|
--- gcc/config/linux.h Wed Nov 21 21:17:38 2012 -0500
|
|
+++ gcc/config/linux.h Wed Nov 21 21:19:19 2012 -0500
|
|
@@ -33,10 +33,12 @@
|
|
#define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC)
|
|
#define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
|
|
#define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
|
|
+#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL)
|
|
#else
|
|
#define OPTION_GLIBC (linux_libc == LIBC_GLIBC)
|
|
#define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
|
|
#define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
|
|
+#define OPTION_MUSL (linux_libc == LIBC_MUSL)
|
|
#endif
|
|
|
|
#define GNU_USER_TARGET_OS_CPP_BUILTINS() \
|
|
@@ -54,18 +56,21 @@
|
|
uClibc or Bionic is the default C library and whether
|
|
-muclibc or -mglibc or -mbionic has been passed to change the default. */
|
|
|
|
-#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3) \
|
|
- "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}"
|
|
+#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4) \
|
|
+ "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}"
|
|
|
|
#if DEFAULT_LIBC == LIBC_GLIBC
|
|
-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
|
|
- CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B)
|
|
+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
|
|
+ CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M)
|
|
#elif DEFAULT_LIBC == LIBC_UCLIBC
|
|
-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
|
|
- CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B)
|
|
+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
|
|
+ CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M)
|
|
#elif DEFAULT_LIBC == LIBC_BIONIC
|
|
-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
|
|
- CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U)
|
|
+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
|
|
+ CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M)
|
|
+#elif DEFAULT_LIBC == LIBC_MUSL
|
|
+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
|
|
+ CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B)
|
|
#else
|
|
#error "Unsupported DEFAULT_LIBC"
|
|
#endif /* DEFAULT_LIBC */
|
|
@@ -85,16 +90,16 @@
|
|
|
|
#define GNU_USER_DYNAMIC_LINKER \
|
|
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \
|
|
- BIONIC_DYNAMIC_LINKER)
|
|
+ BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
|
|
#define GNU_USER_DYNAMIC_LINKER32 \
|
|
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \
|
|
- BIONIC_DYNAMIC_LINKER32)
|
|
+ BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
|
|
#define GNU_USER_DYNAMIC_LINKER64 \
|
|
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \
|
|
- BIONIC_DYNAMIC_LINKER64)
|
|
+ BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
|
|
#define GNU_USER_DYNAMIC_LINKERX32 \
|
|
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \
|
|
- BIONIC_DYNAMIC_LINKERX32)
|
|
+ BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32)
|
|
|
|
/* Determine whether the entire c99 runtime
|
|
is present in the runtime library. */
|
|
diff -r 193f80e01b02 -r 45cd88d4fb7b gcc/config/linux.opt
|
|
--- gcc/config/linux.opt Wed Nov 21 21:17:38 2012 -0500
|
|
+++ gcc/config/linux.opt Wed Nov 21 21:19:19 2012 -0500
|
|
@@ -30,3 +30,7 @@
|
|
muclibc
|
|
Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
|
|
Use uClibc C library
|
|
+
|
|
+mmusl
|
|
+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc)
|
|
+Use musl C library
|
|
diff -r 193f80e01b02 -r 45cd88d4fb7b gcc/ginclude/stddef.h
|
|
--- gcc/ginclude/stddef.h Wed Nov 21 21:17:38 2012 -0500
|
|
+++ gcc/ginclude/stddef.h Wed Nov 21 21:19:19 2012 -0500
|
|
@@ -184,6 +184,7 @@
|
|
#ifndef _GCC_SIZE_T
|
|
#ifndef _SIZET_
|
|
#ifndef __size_t
|
|
+#ifndef __DEFINED_size_t /* musl */
|
|
#define __size_t__ /* BeOS */
|
|
#define __SIZE_T__ /* Cray Unicos/Mk */
|
|
#define _SIZE_T
|
|
@@ -200,6 +201,7 @@
|
|
#define ___int_size_t_h
|
|
#define _GCC_SIZE_T
|
|
#define _SIZET_
|
|
+#define __DEFINED_size_t /* musl */
|
|
#if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
|
|
|| defined(__FreeBSD_kernel__)
|
|
/* __size_t is a typedef on FreeBSD 5, must not trash it. */
|
|
@@ -215,6 +217,7 @@
|
|
typedef long ssize_t;
|
|
#endif /* __BEOS__ */
|
|
#endif /* !(defined (__GNUG__) && defined (size_t)) */
|
|
+#endif /* __DEFINED_size_t */
|
|
#endif /* __size_t */
|
|
#endif /* _SIZET_ */
|
|
#endif /* _GCC_SIZE_T */
|
|
# HG changeset patch
|
|
# Parent 45cd88d4fb7b0e813578c296004eaab2c2d0bfb9
|
|
A fix for libgomp to correctly request a POSIX version for time support.
|
|
|
|
|
|
diff -r 45cd88d4fb7b -r 0afd9d82498d libgomp/config/posix/time.c
|
|
--- libgomp/config/posix/time.c Wed Nov 21 21:19:19 2012 -0500
|
|
+++ libgomp/config/posix/time.c Wed Nov 21 21:20:22 2012 -0500
|
|
@@ -28,6 +28,8 @@
|
|
The following implementation uses the most simple POSIX routines.
|
|
If present, POSIX 4 clocks should be used instead. */
|
|
|
|
+#define _POSIX_C_SOURCE 199309L /* for clocks */
|
|
+
|
|
#include "libgomp.h"
|
|
#include <unistd.h>
|
|
#if TIME_WITH_SYS_TIME
|
|
# HG changeset patch
|
|
# Parent 0afd9d82498d2cd30aa78529ff25f211bdc0c3b9
|
|
Support for i386-linux-musl and x86_64-linux-musl.
|
|
|
|
|
|
diff -r 0afd9d82498d -r 53f3e21a7d14 gcc/config/i386/linux.h
|
|
--- gcc/config/i386/linux.h Wed Nov 21 21:20:22 2012 -0500
|
|
+++ gcc/config/i386/linux.h Wed Nov 21 21:21:21 2012 -0500
|
|
@@ -22,3 +22,4 @@
|
|
|
|
#define GNU_USER_LINK_EMULATION "elf_i386"
|
|
#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
|
|
+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
|
|
diff -r 0afd9d82498d -r 53f3e21a7d14 gcc/config/i386/linux64.h
|
|
--- gcc/config/i386/linux64.h Wed Nov 21 21:20:22 2012 -0500
|
|
+++ gcc/config/i386/linux64.h Wed Nov 21 21:21:21 2012 -0500
|
|
@@ -31,3 +31,7 @@
|
|
#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
|
|
#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
|
|
#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
|
|
+
|
|
+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
|
|
+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
|
|
+#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
|
|
diff -r 0afd9d82498d -r 53f3e21a7d14 libitm/config/linux/x86/tls.h
|
|
--- libitm/config/linux/x86/tls.h Wed Nov 21 21:20:22 2012 -0500
|
|
+++ libitm/config/linux/x86/tls.h Wed Nov 21 21:21:21 2012 -0500
|
|
@@ -25,16 +25,19 @@
|
|
#ifndef LIBITM_X86_TLS_H
|
|
#define LIBITM_X86_TLS_H 1
|
|
|
|
-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
|
|
+#if defined(__GLIBC_PREREQ)
|
|
+#if __GLIBC_PREREQ(2, 10)
|
|
/* Use slots in the TCB head rather than __thread lookups.
|
|
GLIBC has reserved words 10 through 13 for TM. */
|
|
#define HAVE_ARCH_GTM_THREAD 1
|
|
#define HAVE_ARCH_GTM_THREAD_DISP 1
|
|
#endif
|
|
+#endif
|
|
|
|
#include "config/generic/tls.h"
|
|
|
|
-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
|
|
+#if defined(__GLIBC_PREREQ)
|
|
+#if __GLIBC_PREREQ(2, 10)
|
|
namespace GTM HIDDEN {
|
|
|
|
#ifdef __x86_64__
|
|
@@ -101,5 +104,6 @@
|
|
|
|
} // namespace GTM
|
|
#endif /* >= GLIBC 2.10 */
|
|
+#endif
|
|
|
|
#endif // LIBITM_X86_TLS_H
|
|
# HG changeset patch
|
|
# Parent 53f3e21a7d14d0514ec7cb9ffb67b24dcf1f9fc9
|
|
Support for arm-linux-musl.
|
|
|
|
|
|
diff -r 53f3e21a7d14 -r 0a4e297edad6 gcc/config/arm/linux-eabi.h
|
|
--- gcc/config/arm/linux-eabi.h Wed Nov 21 21:21:21 2012 -0500
|
|
+++ gcc/config/arm/linux-eabi.h Wed Nov 21 21:21:54 2012 -0500
|
|
@@ -64,6 +64,10 @@
|
|
#undef GLIBC_DYNAMIC_LINKER
|
|
#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3"
|
|
|
|
+/* musl has no "classic" (i.e. broken) mode */
|
|
+#undef MUSL_DYNAMIC_LINKER
|
|
+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-arm.so.1"
|
|
+
|
|
/* At this point, bpabi.h will have clobbered LINK_SPEC. We want to
|
|
use the GNU/Linux version, not the generic BPABI version. */
|
|
#undef LINK_SPEC
|
|
diff -r 53f3e21a7d14 -r 0a4e297edad6 libitm/config/arm/hwcap.cc
|
|
--- libitm/config/arm/hwcap.cc Wed Nov 21 21:21:21 2012 -0500
|
|
+++ libitm/config/arm/hwcap.cc Wed Nov 21 21:21:54 2012 -0500
|
|
@@ -40,7 +40,11 @@
|
|
|
|
#ifdef __linux__
|
|
#include <unistd.h>
|
|
+#ifdef __GLIBC__
|
|
#include <sys/fcntl.h>
|
|
+#else
|
|
+#include <fcntl.h>
|
|
+#endif
|
|
#include <elf.h>
|
|
|
|
static void __attribute__((constructor))
|
|
# HG changeset patch
|
|
# Parent 0a4e297edad6e46f4b66401b93b217aa3194af4e
|
|
Support for mips-linux-musl.
|
|
|
|
|
|
diff -r 0a4e297edad6 -r 78025c74c5c1 gcc/config/mips/linux.h
|
|
--- gcc/config/mips/linux.h Wed Nov 21 21:21:54 2012 -0500
|
|
+++ gcc/config/mips/linux.h Wed Nov 21 21:23:49 2012 -0500
|
|
@@ -19,3 +19,5 @@
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
|
|
+
|
|
+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips.so.1"
|
|
# HG changeset patch
|
|
# Parent 78025c74c5c1705f16ce13f3645ecb86c10cc1c2
|
|
Support for powerpc-linux-musl.
|
|
|
|
diff -r 78025c74c5c1 gcc/config.gcc
|
|
--- gcc/config.gcc Wed Nov 21 21:23:49 2012 -0500
|
|
+++ gcc/config.gcc Wed Nov 21 21:45:58 2012 -0500
|
|
@@ -2078,6 +2078,10 @@
|
|
powerpc*-*-linux*paired*)
|
|
tm_file="${tm_file} rs6000/750cl.h" ;;
|
|
esac
|
|
+ case ${target} in
|
|
+ *-linux*-musl*)
|
|
+ enable_secureplt=yes ;;
|
|
+ esac
|
|
if test x${enable_secureplt} = xyes; then
|
|
tm_file="rs6000/secureplt.h ${tm_file}"
|
|
fi
|
|
diff -r 78025c74c5c1 gcc/config/rs6000/linux64.h
|
|
--- gcc/config/rs6000/linux64.h Wed Nov 21 21:23:49 2012 -0500
|
|
+++ gcc/config/rs6000/linux64.h Wed Nov 21 21:45:58 2012 -0500
|
|
@@ -362,17 +362,21 @@
|
|
#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
|
|
#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
|
|
#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
|
|
+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1"
|
|
+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1"
|
|
#if DEFAULT_LIBC == LIBC_UCLIBC
|
|
-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
|
|
+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
|
|
#elif DEFAULT_LIBC == LIBC_GLIBC
|
|
-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
|
|
+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
|
|
+#elif DEFAULT_LIBC == LIBC_MUSL
|
|
+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
|
|
#else
|
|
#error "Unsupported DEFAULT_LIBC"
|
|
#endif
|
|
#define GNU_USER_DYNAMIC_LINKER32 \
|
|
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32)
|
|
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
|
|
#define GNU_USER_DYNAMIC_LINKER64 \
|
|
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
|
|
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
|
|
|
|
|
|
#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
|
|
diff -r 78025c74c5c1 gcc/config/rs6000/secureplt.h
|
|
--- gcc/config/rs6000/secureplt.h Wed Nov 21 21:23:49 2012 -0500
|
|
+++ gcc/config/rs6000/secureplt.h Wed Nov 21 21:45:58 2012 -0500
|
|
@@ -18,3 +18,4 @@
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
|
|
+#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
|
|
diff -r 78025c74c5c1 gcc/config/rs6000/sysv4.h
|
|
--- gcc/config/rs6000/sysv4.h Wed Nov 21 21:23:49 2012 -0500
|
|
+++ gcc/config/rs6000/sysv4.h Wed Nov 21 21:45:58 2012 -0500
|
|
@@ -566,6 +566,9 @@
|
|
#ifndef CC1_SECURE_PLT_DEFAULT_SPEC
|
|
#define CC1_SECURE_PLT_DEFAULT_SPEC ""
|
|
#endif
|
|
+#ifndef LINK_SECURE_PLT_DEFAULT_SPEC
|
|
+#define LINK_SECURE_PLT_DEFAULT_SPEC ""
|
|
+#endif
|
|
|
|
/* Pass -G xxx to the compiler and set correct endian mode. */
|
|
#define CC1_SPEC "%{G*} %(cc1_cpu) \
|
|
@@ -626,7 +629,8 @@
|
|
%{mlittle: --oformat elf32-powerpcle } %{mlittle-endian: --oformat elf32-powerpcle } \
|
|
%{!mlittle: %{!mlittle-endian: %{!mbig: %{!mbig-endian: \
|
|
%{mcall-i960-old: --oformat elf32-powerpcle} \
|
|
- }}}}"
|
|
+ }}}} \
|
|
+%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}"
|
|
|
|
/* Any specific OS flags. */
|
|
#define LINK_OS_SPEC "\
|
|
@@ -804,15 +808,18 @@
|
|
|
|
#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
|
|
#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
|
|
+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1"
|
|
#if DEFAULT_LIBC == LIBC_UCLIBC
|
|
-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
|
|
+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
|
|
+#elif DEFAULT_LIBC == LIBC_MUSL
|
|
+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
|
|
#elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
|
|
-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
|
|
+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
|
|
#else
|
|
#error "Unsupported DEFAULT_LIBC"
|
|
#endif
|
|
#define GNU_USER_DYNAMIC_LINKER \
|
|
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
|
|
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
|
|
|
|
#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
|
|
%{rdynamic:-export-dynamic} \
|
|
@@ -938,6 +945,7 @@
|
|
{ "cc1_endian_little", CC1_ENDIAN_LITTLE_SPEC }, \
|
|
{ "cc1_endian_default", CC1_ENDIAN_DEFAULT_SPEC }, \
|
|
{ "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \
|
|
+ { "link_secure_plt_default", LINK_SECURE_PLT_DEFAULT_SPEC }, \
|
|
{ "cpp_os_ads", CPP_OS_ADS_SPEC }, \
|
|
{ "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \
|
|
{ "cpp_os_mvme", CPP_OS_MVME_SPEC }, \
|
|
diff -r 78025c74c5c1 libgcc/config/rs6000/linux-unwind.h
|
|
--- libgcc/config/rs6000/linux-unwind.h Wed Nov 21 21:23:49 2012 -0500
|
|
+++ libgcc/config/rs6000/linux-unwind.h Wed Nov 21 21:45:58 2012 -0500
|
|
@@ -176,6 +176,7 @@
|
|
}
|
|
#endif
|
|
|
|
+#ifdef __GLIBC__
|
|
/* Find an entry in the process auxiliary vector. The canonical way to
|
|
test for VMX is to look at AT_HWCAP. */
|
|
|
|
@@ -207,6 +208,7 @@
|
|
return auxp->a_val;
|
|
return 0;
|
|
}
|
|
+#endif
|
|
|
|
/* Do code reading to identify a signal frame, and set the frame
|
|
state data appropriately. See unwind-dw2.c for the structs. */
|
|
@@ -253,7 +255,11 @@
|
|
|
|
if (hwcap == 0)
|
|
{
|
|
+#ifdef __GLIBC__
|
|
hwcap = ppc_linux_aux_vector (16);
|
|
+#else
|
|
+ hwcap = -1;
|
|
+#endif
|
|
/* These will already be set if we found AT_HWCAP. A nonzero
|
|
value stops us looking again if for some reason we couldn't
|
|
find AT_HWCAP. */
|
|
# HG changeset patch
|
|
# Parent de922e533313cc0a2af7e1f69a65ed69263904cd
|
|
Support (partial) for microblaze-linux-musl.
|
|
|
|
|
|
diff -r de922e533313 -r b065d0a4bebb gcc/config.gcc
|
|
--- gcc/config.gcc Wed Nov 21 21:24:08 2012 -0500
|
|
+++ gcc/config.gcc Wed Nov 21 21:31:28 2012 -0500
|
|
@@ -1725,6 +1725,7 @@
|
|
tm_file="${tm_file} dbxelf.h gnu-user.h linux.h microblaze/linux.h"
|
|
c_target_objs="${c_target_objs} microblaze-c.o"
|
|
cxx_target_objs="${cxx_target_objs} microblaze-c.o"
|
|
+ tmake_file="${tmake_file} microblaze/t-microblaze"
|
|
;;
|
|
microblaze*-*-*)
|
|
tm_file="${tm_file} dbxelf.h"
|