123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643 |
- From: https://bitbucket.org/GregorR/musl-cross
- diff -Nur gcc-5.2.0.orig/fixincludes/mkfixinc.sh gcc-5.2.0/fixincludes/mkfixinc.sh
- --- gcc-5.2.0.orig/fixincludes/mkfixinc.sh 2012-10-28 22:42:48.000000000 +0100
- +++ gcc-5.2.0/fixincludes/mkfixinc.sh 2015-10-29 22:25:16.000000000 +0100
- @@ -19,7 +19,8 @@
- powerpc-*-eabi* | \
- powerpc-*-rtems* | \
- powerpcle-*-eabisim* | \
- - powerpcle-*-eabi* )
- + powerpcle-*-eabi* | \
- + *-musl* )
- # IF there is no include fixing,
- # THEN create a no-op fixer and exit
- (echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
- diff -Nur gcc-5.2.0.orig/gcc/config/aarch64/aarch64-linux.h gcc-5.2.0/gcc/config/aarch64/aarch64-linux.h
- --- gcc-5.2.0.orig/gcc/config/aarch64/aarch64-linux.h 2015-05-12 10:49:59.000000000 +0200
- +++ gcc-5.2.0/gcc/config/aarch64/aarch64-linux.h 2015-10-29 22:25:16.000000000 +0100
- @@ -29,6 +29,8 @@
- #undef CC1_SPEC
- #define CC1_SPEC GNU_USER_TARGET_CC1_SPEC ASAN_CC1_SPEC
-
- +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64.so.1"
- +
- #define CPP_SPEC "%{pthread:-D_REENTRANT}"
-
- #define LINUX_TARGET_LINK_SPEC "%{h*} \
- diff -Nur gcc-5.2.0.orig/gcc/config/arm/linux-eabi.h gcc-5.2.0/gcc/config/arm/linux-eabi.h
- --- gcc-5.2.0.orig/gcc/config/arm/linux-eabi.h 2015-01-05 13:33:28.000000000 +0100
- +++ gcc-5.2.0/gcc/config/arm/linux-eabi.h 2015-10-29 22:25:16.000000000 +0100
- @@ -77,6 +77,23 @@
- %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \
- %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}"
-
- +/* For ARM musl currently supports four dynamic linkers:
- + - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI
- + - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI
- + - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB
- + - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB
- + musl does not support the legacy OABI mode.
- + All the dynamic linkers live in /lib.
- + We default to soft-float, EL. */
- +#undef MUSL_DYNAMIC_LINKER
- +#if TARGET_BIG_ENDIAN_DEFAULT
- +#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}"
- +#else
- +#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}"
- +#endif
- +#define MUSL_DYNAMIC_LINKER \
- + "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.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 -Nur gcc-5.2.0.orig/gcc/config/i386/linux64.h gcc-5.2.0/gcc/config/i386/linux64.h
- --- gcc-5.2.0.orig/gcc/config/i386/linux64.h 2015-01-05 13:33:28.000000000 +0100
- +++ gcc-5.2.0/gcc/config/i386/linux64.h 2015-10-29 22:25:16.000000000 +0100
- @@ -30,3 +30,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 -Nur gcc-5.2.0.orig/gcc/config/i386/linux.h gcc-5.2.0/gcc/config/i386/linux.h
- --- gcc-5.2.0.orig/gcc/config/i386/linux.h 2015-01-05 13:33:28.000000000 +0100
- +++ gcc-5.2.0/gcc/config/i386/linux.h 2015-10-29 22:25:16.000000000 +0100
- @@ -21,3 +21,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 -Nur gcc-5.2.0.orig/gcc/config/linux.h gcc-5.2.0/gcc/config/linux.h
- --- gcc-5.2.0.orig/gcc/config/linux.h 2015-01-05 13:33:28.000000000 +0100
- +++ gcc-5.2.0/gcc/config/linux.h 2015-10-29 22:25:16.000000000 +0100
- @@ -32,10 +32,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() \
- @@ -53,18 +55,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 */
- @@ -84,21 +89,92 @@
-
- #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)
-
- /* Whether we have Bionic libc runtime */
- #undef TARGET_HAS_BIONIC
- #define TARGET_HAS_BIONIC (OPTION_BIONIC)
-
- +/* musl avoids problematic includes by rearranging the include directories.
- + * Unfortunately, this is mostly duplicated from cppdefault.c */
- +#if DEFAULT_LIBC == LIBC_MUSL
- +#define INCLUDE_DEFAULTS_MUSL_GPP \
- + { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, \
- + GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, \
- + { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, \
- + GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, \
- + { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, \
- + GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
- +
- +#ifdef LOCAL_INCLUDE_DIR
- +#define INCLUDE_DEFAULTS_MUSL_LOCAL \
- + { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, \
- + { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
- +#else
- +#define INCLUDE_DEFAULTS_MUSL_LOCAL
- +#endif
- +
- +#ifdef PREFIX_INCLUDE_DIR
- +#define INCLUDE_DEFAULTS_MUSL_PREFIX \
- + { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0},
- +#else
- +#define INCLUDE_DEFAULTS_MUSL_PREFIX
- +#endif
- +
- +#ifdef CROSS_INCLUDE_DIR
- +#define INCLUDE_DEFAULTS_MUSL_CROSS \
- + { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0},
- +#else
- +#define INCLUDE_DEFAULTS_MUSL_CROSS
- +#endif
- +
- +#ifdef TOOL_INCLUDE_DIR
- +#define INCLUDE_DEFAULTS_MUSL_TOOL \
- + { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0},
- +#else
- +#define INCLUDE_DEFAULTS_MUSL_TOOL
- +#endif
- +
- +#ifdef NATIVE_SYSTEM_HEADER_DIR
- +#define INCLUDE_DEFAULTS_MUSL_NATIVE \
- + { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \
- + { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
- +#else
- +#define INCLUDE_DEFAULTS_MUSL_NATIVE
- +#endif
- +
- +#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT)
- +# undef INCLUDE_DEFAULTS_MUSL_LOCAL
- +# define INCLUDE_DEFAULTS_MUSL_LOCAL
- +# undef INCLUDE_DEFAULTS_MUSL_NATIVE
- +# define INCLUDE_DEFAULTS_MUSL_NATIVE
- +#else
- +# undef INCLUDE_DEFAULTS_MUSL_CROSS
- +# define INCLUDE_DEFAULTS_MUSL_CROSS
- +#endif
- +
- +#undef INCLUDE_DEFAULTS
- +#define INCLUDE_DEFAULTS \
- + { \
- + INCLUDE_DEFAULTS_MUSL_GPP \
- + INCLUDE_DEFAULTS_MUSL_PREFIX \
- + INCLUDE_DEFAULTS_MUSL_CROSS \
- + INCLUDE_DEFAULTS_MUSL_TOOL \
- + INCLUDE_DEFAULTS_MUSL_NATIVE \
- + { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \
- + { 0, 0, 0, 0, 0, 0 } \
- + }
- +#endif
- +
- #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */
- /* This is a *uclinux* target. We don't define below macros to normal linux
- versions, because doing so would require *uclinux* targets to include
- diff -Nur gcc-5.2.0.orig/gcc/config/linux.opt gcc-5.2.0/gcc/config/linux.opt
- --- gcc-5.2.0.orig/gcc/config/linux.opt 2015-01-05 13:33:28.000000000 +0100
- +++ gcc-5.2.0/gcc/config/linux.opt 2015-10-29 22:25:16.000000000 +0100
- @@ -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 -Nur gcc-5.2.0.orig/gcc/config/microblaze/linux.h gcc-5.2.0/gcc/config/microblaze/linux.h
- --- gcc-5.2.0.orig/gcc/config/microblaze/linux.h 2015-05-28 16:08:19.000000000 +0200
- +++ gcc-5.2.0/gcc/config/microblaze/linux.h 2015-10-29 22:25:16.000000000 +0100
- @@ -28,7 +28,22 @@
- #undef TLS_NEEDS_GOT
- #define TLS_NEEDS_GOT 1
-
- -#define DYNAMIC_LINKER "/lib/ld.so.1"
- +#if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */
- +#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}"
- +#else
- +#define MUSL_DYNAMIC_LINKER_E "%{EL:el}"
- +#endif
- +
- +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1"
- +#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
- +
- +#if DEFAULT_LIBC == LIBC_MUSL
- +#define DYNAMIC_LINKER MUSL_DYNAMIC_LINKER
- +#else
- +#define DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER
- +#endif
- +
- +
- #undef SUBTARGET_EXTRA_SPECS
- #define SUBTARGET_EXTRA_SPECS \
- { "dynamic_linker", DYNAMIC_LINKER }
- diff -Nur gcc-5.2.0.orig/gcc/config/microblaze/microblaze.h gcc-5.2.0/gcc/config/microblaze/microblaze.h
- --- gcc-5.2.0.orig/gcc/config/microblaze/microblaze.h 2015-01-05 13:33:28.000000000 +0100
- +++ gcc-5.2.0/gcc/config/microblaze/microblaze.h 2015-10-29 22:25:16.000000000 +0100
- @@ -218,6 +218,12 @@
- #undef PTRDIFF_TYPE
- #define PTRDIFF_TYPE "int"
-
- +#undef SIZE_TYPE
- +#define SIZE_TYPE "unsigned int"
- +
- +#undef PTRDIFF_TYPE
- +#define PTRDIFF_TYPE "int"
- +
- #define CONSTANT_ALIGNMENT(EXP, ALIGN) \
- ((TREE_CODE (EXP) == STRING_CST || TREE_CODE (EXP) == CONSTRUCTOR) \
- && (ALIGN) < BITS_PER_WORD \
- diff -Nur gcc-5.2.0.orig/gcc/config/mips/linux.h gcc-5.2.0/gcc/config/mips/linux.h
- --- gcc-5.2.0.orig/gcc/config/mips/linux.h 2015-01-05 13:33:28.000000000 +0100
- +++ gcc-5.2.0/gcc/config/mips/linux.h 2015-10-30 06:22:30.000000000 +0100
- @@ -31,13 +31,26 @@
- #undef UCLIBC_DYNAMIC_LINKER32
- #define UCLIBC_DYNAMIC_LINKER32 \
- "%{mnan=2008:/lib/ld-uClibc-mipsn8.so.0;:/lib/ld-uClibc.so.0}"
- +
- +#if TARGET_ENDIAN_DEFAULT == 0 /* LE */
- +#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}"
- +#else
- +#define MUSL_DYNAMIC_LINKER_E "%{EL:el}"
- +#endif
- +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
- #undef UCLIBC_DYNAMIC_LINKER64
- #define UCLIBC_DYNAMIC_LINKER64 \
- "%{mnan=2008:/lib/ld64-uClibc-mipsn8.so.0;:/lib/ld64-uClibc.so.0}"
- #define UCLIBC_DYNAMIC_LINKERN32 \
- "%{mnan=2008:/lib32/ld-uClibc-mipsn8.so.0;:/lib32/ld-uClibc.so.0}"
-
- +#undef MUSL_DYNAMIC_LINKER32
- +#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips%{EL:el}%{msoft-float:-sf}.so.1"
- +#undef MUSL_DYNAMIC_LINKER64
- +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips64%{EL:el}%{msoft-float:-sf}.so.1"
- +#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mipsn32%{EL:el}%{msoft-float:-sf}.so.1"
- +
- #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
- #define GNU_USER_DYNAMIC_LINKERN32 \
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
- - BIONIC_DYNAMIC_LINKERN32)
- + BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32)
- diff -Nur gcc-5.2.0.orig/gcc/config/rs6000/linux64.h gcc-5.2.0/gcc/config/rs6000/linux64.h
- --- gcc-5.2.0.orig/gcc/config/rs6000/linux64.h 2015-03-10 00:18:57.000000000 +0100
- +++ gcc-5.2.0/gcc/config/rs6000/linux64.h 2015-10-29 22:25:16.000000000 +0100
- @@ -365,17 +365,21 @@
- #endif
- #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)
-
- #undef DEFAULT_ASM_ENDIAN
- #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN)
- diff -Nur gcc-5.2.0.orig/gcc/config/rs6000/secureplt.h gcc-5.2.0/gcc/config/rs6000/secureplt.h
- --- gcc-5.2.0.orig/gcc/config/rs6000/secureplt.h 2015-01-05 13:33:28.000000000 +0100
- +++ gcc-5.2.0/gcc/config/rs6000/secureplt.h 2015-10-29 22:25:16.000000000 +0100
- @@ -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 -Nur gcc-5.2.0.orig/gcc/config/rs6000/sysv4.h gcc-5.2.0/gcc/config/rs6000/sysv4.h
- --- gcc-5.2.0.orig/gcc/config/rs6000/sysv4.h 2015-01-05 13:33:28.000000000 +0100
- +++ gcc-5.2.0/gcc/config/rs6000/sysv4.h 2015-10-29 22:25:16.000000000 +0100
- @@ -537,6 +537,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. */
- #undef CC1_SPEC
- @@ -586,7 +589,8 @@
-
- /* Override the default target of the linker. */
- #define LINK_TARGET_SPEC \
- - ENDIAN_SELECT("", " --oformat elf32-powerpcle", "")
- + ENDIAN_SELECT("", " --oformat elf32-powerpcle", "") \
- + "%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}"
-
- /* Any specific OS flags. */
- #define LINK_OS_SPEC "\
- @@ -764,15 +768,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} \
- @@ -895,6 +902,7 @@
- { "link_os_openbsd", LINK_OS_OPENBSD_SPEC }, \
- { "link_os_default", LINK_OS_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 -Nur gcc-5.2.0.orig/gcc/config/sh/linux.h gcc-5.2.0/gcc/config/sh/linux.h
- --- gcc-5.2.0.orig/gcc/config/sh/linux.h 2015-01-05 13:33:28.000000000 +0100
- +++ gcc-5.2.0/gcc/config/sh/linux.h 2015-10-29 22:25:16.000000000 +0100
- @@ -43,7 +43,14 @@
-
- #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
-
- +#if TARGET_BIG_ENDIAN_DEFAULT /* BE */
- +#define MUSL_DYNAMIC_LINKER_E "eb"
- +#else
- +#define MUSL_DYNAMIC_LINKER_E
- +#endif
- +
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E ".so.1"
-
- #undef SUBTARGET_LINK_EMUL_SUFFIX
- #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
- diff -Nur gcc-5.2.0.orig/gcc/config.gcc gcc-5.2.0/gcc/config.gcc
- --- gcc-5.2.0.orig/gcc/config.gcc 2015-07-02 17:53:33.000000000 +0200
- +++ gcc-5.2.0/gcc/config.gcc 2015-10-29 22:25:16.000000000 +0100
- @@ -575,7 +575,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"
-
- # 32-bit x86 processors supported by --with-arch=. Each processor
- # MUST be separated by exactly one space.
- @@ -720,6 +720,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"
- ;;
- @@ -2407,6 +2410,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 -Nur gcc-5.2.0.orig/gcc/configure gcc-5.2.0/gcc/configure
- --- gcc-5.2.0.orig/gcc/configure 2015-07-03 19:00:49.000000000 +0200
- +++ gcc-5.2.0/gcc/configure 2015-10-29 22:25:16.000000000 +0100
- @@ -27742,6 +27742,9 @@
- else
- gcc_cv_libc_provides_ssp=no
- case "$target" in
- + *-*-musl*)
- + # All versions of musl provide stack protector
- + gcc_cv_libc_provides_ssp=yes;;
- *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
- # glibc 2.4 and later provides __stack_chk_fail and
- # either __stack_chk_guard, or TLS access to stack guard canary.
- @@ -27774,6 +27777,7 @@
- # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now
- # simply assert that glibc does provide this, which is true for all
- # realistically usable GNU/Hurd configurations.
- + # All supported versions of musl provide it as well
- gcc_cv_libc_provides_ssp=yes;;
- *-*-darwin* | *-*-freebsd*)
- ac_fn_c_check_func "$LINENO" "__stack_chk_fail" "ac_cv_func___stack_chk_fail"
- @@ -27870,6 +27874,9 @@
- gcc_cv_target_dl_iterate_phdr=no
- fi
- ;;
- + *-linux-musl*)
- + gcc_cv_target_dl_iterate_phdr=yes
- + ;;
- esac
-
- if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
- diff -Nur gcc-5.2.0.orig/gcc/configure.ac gcc-5.2.0/gcc/configure.ac
- --- gcc-5.2.0.orig/gcc/configure.ac 2015-07-03 19:00:49.000000000 +0200
- +++ gcc-5.2.0/gcc/configure.ac 2015-10-29 22:25:16.000000000 +0100
- @@ -5229,6 +5229,9 @@
- gcc_cv_libc_provides_ssp,
- [gcc_cv_libc_provides_ssp=no
- case "$target" in
- + *-*-musl*)
- + # All versions of musl provide stack protector
- + gcc_cv_libc_provides_ssp=yes;;
- *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
- # glibc 2.4 and later provides __stack_chk_fail and
- # either __stack_chk_guard, or TLS access to stack guard canary.
- @@ -5255,6 +5258,7 @@
- # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now
- # simply assert that glibc does provide this, which is true for all
- # realistically usable GNU/Hurd configurations.
- + # All supported versions of musl provide it as well
- gcc_cv_libc_provides_ssp=yes;;
- *-*-darwin* | *-*-freebsd*)
- AC_CHECK_FUNC(__stack_chk_fail,[gcc_cv_libc_provides_ssp=yes],
- @@ -5328,6 +5332,9 @@
- gcc_cv_target_dl_iterate_phdr=no
- fi
- ;;
- + *-linux-musl*)
- + gcc_cv_target_dl_iterate_phdr=yes
- + ;;
- esac
- GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR])
- if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
- diff -Nur gcc-5.2.0.orig/gcc/gcc.c gcc-5.2.0/gcc/gcc.c
- --- gcc-5.2.0.orig/gcc/gcc.c 2015-03-10 10:37:41.000000000 +0100
- +++ gcc-5.2.0/gcc/gcc.c 2015-10-29 22:25:16.000000000 +0100
- @@ -729,7 +729,7 @@
- #ifndef LINK_SSP_SPEC
- #ifdef TARGET_LIBC_PROVIDES_SSP
- #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
- - "|fstack-protector-strong|fstack-protector-explicit:}"
- + "|fstack-protector-strong|fstack-protector-explicit:-lssp_nonshared}"
- #else
- #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
- "|fstack-protector-strong|fstack-protector-explicit" \
- diff -Nur gcc-5.2.0.orig/gcc/ginclude/stddef.h gcc-5.2.0/gcc/ginclude/stddef.h
- --- gcc-5.2.0.orig/gcc/ginclude/stddef.h 2015-01-05 13:33:28.000000000 +0100
- +++ gcc-5.2.0/gcc/ginclude/stddef.h 2015-10-29 22:25:16.000000000 +0100
- @@ -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(__DragonFly__) \
- || defined(__FreeBSD_kernel__)
- @@ -218,6 +220,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 */
- diff -Nur gcc-5.2.0.orig/libgcc/unwind-dw2-fde-dip.c gcc-5.2.0/libgcc/unwind-dw2-fde-dip.c
- --- gcc-5.2.0.orig/libgcc/unwind-dw2-fde-dip.c 2015-01-27 11:02:26.000000000 +0100
- +++ gcc-5.2.0/libgcc/unwind-dw2-fde-dip.c 2015-10-29 22:25:16.000000000 +0100
- @@ -46,6 +46,10 @@
- #include "unwind-compat.h"
- #include "gthr.h"
-
- +#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR)
- +# define USE_PT_GNU_EH_FRAME
- +#endif
- +
- #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
- diff -Nur gcc-5.2.0.orig/libgomp/config/posix/time.c gcc-5.2.0/libgomp/config/posix/time.c
- --- gcc-5.2.0.orig/libgomp/config/posix/time.c 2015-01-10 20:10:37.000000000 +0100
- +++ gcc-5.2.0/libgomp/config/posix/time.c 2015-10-29 22:25:16.000000000 +0100
- @@ -29,6 +29,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
- diff -Nur gcc-5.2.0.orig/libitm/config/arm/hwcap.cc gcc-5.2.0/libitm/config/arm/hwcap.cc
- --- gcc-5.2.0.orig/libitm/config/arm/hwcap.cc 2015-01-05 13:33:28.000000000 +0100
- +++ gcc-5.2.0/libitm/config/arm/hwcap.cc 2015-10-29 22:25:16.000000000 +0100
- @@ -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))
- diff -Nur gcc-5.2.0.orig/libitm/config/linux/x86/tls.h gcc-5.2.0/libitm/config/linux/x86/tls.h
- --- gcc-5.2.0.orig/libitm/config/linux/x86/tls.h 2015-01-05 13:33:28.000000000 +0100
- +++ gcc-5.2.0/libitm/config/linux/x86/tls.h 2015-10-29 22:25:16.000000000 +0100
- @@ -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
- diff -Nur gcc-5.2.0.orig/libstdc++-v3/configure.host gcc-5.2.0/libstdc++-v3/configure.host
- --- gcc-5.2.0.orig/libstdc++-v3/configure.host 2015-06-24 11:59:28.000000000 +0200
- +++ gcc-5.2.0/libstdc++-v3/configure.host 2015-10-29 22:25:16.000000000 +0100
- @@ -274,6 +274,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
- @@ -282,6 +289,9 @@
- os_include_dir="os/gnu-linux"
- fi
- ;;
- +
- + esac
- + ;;
- hpux*)
- os_include_dir="os/hpux"
- ;;
|