cross

cross-compilation toolchain using musl libc
git clone git://z3bra.org/cross
Log | Files | Refs | README

commit 54a767643fbaaeb7ca793cf7d1fddcdcd9e499a8
Author: z3bra <willyatmailoodotorg>
Date:   Sat Jan  1 12:51:42 2011

First commit

Diffstat:
 cross-gcc                                  | 224 ++++++++-
 cross-pcc                                  | 210 ++++++++-
 patches/binutils-2.25-ignore-makeinfo.diff |  21 +-
 patches/gcc-4.8.4-musl.diff                | 816 ++++++++++++++++++++++++++++++-
 patches/gcc-5.2.0-musl.diff                | 689 +++++++++++++++++++++++++-
 patches/musl-1.1.10-musl.diff              |  51 ++-
 patches/pcc-1.1.0-deflibdirs.diff          |  30 +-
 patches/pcc-1.1.0-musl.diff                |  22 +-
 patches/pcc-libs-1.1.0-musl.diff           |  22 +-
 9 files changed, 2085 insertions(+), 0 deletions(-)

diff --git a/cross-gcc b/cross-gcc @@ -0,0 +1,224 @@ +#!/bin/sh -ex +# +# Couple of useful links: +# + http://wiki.osdev.org/GCC_Cross-Compiler +# + http://wiki.osdev.org/Cross-Compiler_Successful_Builds +# + https://git.framasoft.org/Ypnose/solyste/blob/master/scripts/create-crossenv +# + http://kegel.com/crosstool/ +# + https://github.com/GregorR/musl-cross/tree/master/patches +# +# 0. download gcc, binutils, gmp, mpc, mpfr +# 1. extract them +# 2. patch everything that require patching +# 3. prepare gcc (move gmp, mpc, mpfr in) +# 4. install linux headers +# 5. build binutils +# 6. build musl +# 7. build gcc +# 8. add pkg-config wrapper + +# cross compiler environment +MARCH=$(uname -m) +TARGET=${TARGET:-${MARCH}-linux-musl} +PREFIX=${PREFIX:-${HOME}/cross/gcc-${MARCH}} +BLDDIR=${BLDDIR:-${HOME}/cross/build} +SRCDIR=${SRCDIR:-${HOME}/cross/source} +PATCHD=${PATCHD:-${HOME}/cross/patches} + +# compilation variables +CFLAGS="-Os -fomit-frame-pointer -pipe" +CXXFLAGS="${CFLAGS}" +CPPFLAGS="${CFLAGS}" +LDFLAGS="-Wl,--as-needed" +MAKEFLAGS="-j4" + +# versions +GCCV=${GCCV:-4.8.5} +BINV=${BINV:-2.25} +GMPV=${GMPV:-5.1.3} +MPCV=${MPCV:-1.0.3} +MPFRV=${MPFRV:-3.1.3} +MUSLV=${MUSLV:-1.1.10} +KERNV=${KERNV:-4.1.4} + + +# random but useful vars +PATH="${PREFIX}/bin:${PATH}" +GNUMIRROR=ftp://ftp.gnu.org/gnu +MUSLMIRROR=http://www.musl-libc.org/releases +LINUXMIRROR=https://www.kernel.org/pub/linux/kernel/v4.x + +# Preparing sources +mkdir -p "${SRCDIR}" "${BLDDIR}" "${PREFIX}" +cd "${SRCDIR}" + +# +# ┏━┓ +# ┃┃┃ +# ┗━┛╹ +# Get all GNU tarballs +grab_sources() { +curl -O -# "${GNUMIRROR}/gcc/gcc-${GCCV}/gcc-${GCCV}.tar.gz" +curl -O -# "${GNUMIRROR}/binutils/binutils-${BINV}.tar.gz" +curl -O -# "${GNUMIRROR}/mpc/mpc-${MPCV}.tar.gz" +curl -O -# "${GNUMIRROR}/gmp/gmp-${GMPV}.tar.gz" +curl -O -# "${GNUMIRROR}/mpfr/mpfr-${MPFRV}.tar.gz" +curl -O -# "${MUSLMIRROR}/musl-${MUSLV}.tar.gz" +curl -O -# "${LINUXMIRROR}/linux-${KERNV}.tar.xz" +} + +# +# ╺┓ +# ┃ +# ╺┻╸╹ +# Extract everything +extract_source() { +tar xz < gcc-${GCCV}.tar.gz +tar xz < binutils-${BINV}.tar.gz +tar xz < mpc-${MPCV}.tar.gz +tar xz < gmp-${GMPV}.tar.gz +tar xz < mpfr-${MPFRV}.tar.gz +tar xz < musl-${MUSLV}.tar.gz +tar xJ < linux-${KERNV}.tar.xz +} + +# +# ┏━┓ +# ┏━┛ +# ┗━╸╹ +# Patch all source trees. +# This will take all patches in $PATCHD matching the programs +# (eg: gcc-4.8.4-*.diff to patch gcc in version 4.8.4) +patch_sources() { +for DIR in $(find "${SRCDIR}" -maxdepth 1 -type d); do + cd "${DIR}" + cat "${PATCHD}/$(basename ${DIR})"-*.diff | patch -Np1 +done +} + +# +# ┏━┓ +# ╺━┫ +# ┗━┛╹ +# Prepare the gcc dir +prepare_gcc() { +mv "${SRCDIR}/gmp-${GMPV}" "${SRCDIR}/gcc-${GCCV}/gmp" +mv "${SRCDIR}/mpc-${MPCV}" "${SRCDIR}/gcc-${GCCV}/mpc" +mv "${SRCDIR}/mpfr-${MPFRV}" "${SRCDIR}/gcc-${GCCV}/mpfr" +} + +# +# ╻ ╻ +# ┗━┫ +# ╹╹ +# Get linux headers +install_headers() { +cd "${SRCDIR}/linux-${KERNV}" +make ARCH=$(uname -m) headers_check +make ARCH=$(uname -m) INSTALL_HDR_PATH=${PREFIX}/${TARGET} headers_install +rm -r "${SRCDIR}/linux-${KERNV}" +} + +# +# ┏━╸ +# ┗━┓ +# ┗━┛╹ +# Build binutils and install them to ${PREFIX} +install_binutils() { +mkdir -p "${BLDDIR}/binutils" +cd "${BLDDIR}/binutils" +${SRCDIR}/binutils-${BINV}/configure --target=${TARGET} \ + --prefix=${PREFIX} \ + --with-sysroot=${PREFIX}/${TARGET} \ + --disable-nls \ + --disable-shared \ + --disable-multilib +make configure-host +make LDFLAGS="${LDFLAGS} -all-static -static" +make install +rm -rf "${BLDDIR}/binutils" +rm -rf "${SRCDIR}/binutils-${BINV}" +} + +# +# ┏━┓ +# ┣━┓ +# ┗━┛╹ +# Build the musl libc +install_musl() { +cd "${SRCDIR}/musl-${MUSLV}" +./configure --prefix=${PREFIX}/${TARGET} \ + --target=${TARGET} \ + --disable-gcc-wrapper \ + --disable-debug \ + --disable-shared \ + --disable-warning +make LDFLAGS="${LDFLAGS}" +make install +rm -rf "${SRCDIR}/musl-${MUSLV}" +} + +# +# ┏━┓ +# ┃ +# ╹╹ +# Build gcc linked against musl +install_gcc() { +mkdir -p "${BLDDIR}/gcc" +cd "${BLDDIR}/gcc" +${SRCDIR}/gcc-${GCCV}/configure --target=${TARGET} \ + --prefix=${PREFIX} \ + --with-sysroot=${PREFIX}/${TARGET} \ + --with-native-system-header-dir=/include \ + --disable-nls \ + --disable-shared \ + --disable-multilib \ + --disable-libmudflap \ + --enable-languages=c +make LDFLAGS="${LDFLAGS} -static" all-gcc all-target-libgcc +make install-gcc install-target-libgcc +rm -rf "${BLDDIR}/gcc" +rm -rf "${SRCDIR}/gcc-${GCCV}" +} + +# +# ┏━┓ +# ┣━┫ +# ┗━┛╹ +# Add pkg-config wrapper +install_pkgconfig() { +cat << EOF > "${PREFIX}/bin/${TARGET}-pkg-config" +#!/bin/sh +export PKG_CONFIG_SYSROOT_DIR=${PREFIX}/${TARGET} +export PKG_CONFIG_LIBDIR=${PREFIX}/${TARGET}/usr/lib/pkgconfig +export PKG_CONFIG_PATH=\$PKG_CONFIG_LIBDIR + +exec pkg-config --static "\$@" +EOF +chmod 755 "${PREFIX}/bin/${TARGET}-pkg-config" +} + +grab_sources +extract_source +patch_sources +prepare_gcc +install_headers +install_binutils +install_musl +install_gcc +install_pkgconfig + +rm -rf "${SRCDIR}" +rm -rf "${BLDDIR}" +rm -rf "${PREFIX}/share" +rm -f "${PREFIX}/lib/libiberty.a" + +cat << EOF | tee ${PREFIX}/README +TRIPLET : $TARGET +PREFIX : $PREFIX + +GCC : $GCCV +BINUTILS: $BINV +MUSL : $MUSLV +KERNEL : $KERNV +EOF diff --git a/cross-pcc b/cross-pcc @@ -0,0 +1,210 @@ +#!/bin/sh -ex +# +# Couple of useful links: +# + http://pcc.ludd.ltu.se/cross-compiler/ +# + http://wiki.osdev.org/Cross-Compiler_Successful_Builds +# + https://git.framasoft.org/Ypnose/solyste/blob/master/scripts/create-crossenv +# + http://kegel.com/crosstool/ +# + https://github.com/GregorR/musl-cross/tree/master/patches +# +# 0. download and extract sources +# 1. patch everything that require patching +# 2. install linux headers +# 3. build binutils +# 4. build musl +# 5. build pcc with gcc +# 6. add pkg-config wrapper + +# cross compiler environment +MARCH=$(uname -m) +TRIPLE=${TRIPLE:-${MARCH}-linux-musl} +PREFIX=${PREFIX:-${HOME}/cross/pcc-${MARCH}} +BLDDIR=${BLDDIR:-${HOME}/cross/build} +SRCDIR=${SRCDIR:-${HOME}/cross/source} +PATCHD=${PATCHD:-${HOME}/cross/patches} + +# compilation variables +PATH="${PREFIX}/bin:${PATH}" +CFLAGS="-Os -fomit-frame-pointer -pipe" +CXXFLAGS="${CFLAGS}" +CPPFLAGS="${CFLAGS}" +LDFLAGS="-Wl,--as-needed" +MAKEFLAGS="-j8" + +# versions +PCCV=${PCCV:-1.1.0} +BINV=${BINV:-2.25} +MUSLV=${MUSLV:-1.1.10} +KERNV=${KERNV:-4.1.4} + + +# source mirrors +PCCMIRROR=ftp://pcc.ludd.ltu.se/pub/pcc-releases +GNUMIRROR=ftp://ftp.gnu.org/gnu +MUSLMIRROR=http://www.musl-libc.org/releases +LINUXMIRROR=https://www.kernel.org/pub/linux/kernel/v4.x + +# Preparing sources +mkdir -p "${SRCDIR}" "${BLDDIR}" "${PREFIX}" +cd "${SRCDIR}" + +# +# ┏━┓ +# ┃┃┃ +# ┗━┛╹ +# Get all GNU tarballs +grab_sources() { +curl -# "${PCCMIRROR}/pcc-${PCCV}.tgz" | tar xz +curl -# "${PCCMIRROR}/pcc-libs-${PCCV}.tgz" | tar xz +curl -# "${GNUMIRROR}/binutils/binutils-${BINV}.tar.gz" | tar xz +curl -# "${MUSLMIRROR}/musl-${MUSLV}.tar.gz" | tar xz +curl -# "${LINUXMIRROR}/linux-${KERNV}.tar.xz" | tar xJ +} + +# +# ╺┓ +# ┃ +# ╺┻╸╹ +# Patch all source trees. +# This will take all patches in $PATCHD matching the programs +patch_sources() { +for DIR in $(find "${SRCDIR}" -maxdepth 1 -type d); do + cd "${DIR}" + cat "${PATCHD}/$(basename ${DIR})"-*.diff | patch -Np1 +done +} + +# +# ┏━┓ +# ┏━┛ +# ┗━╸╹ +# Get linux headers +install_headers() { +cd "${SRCDIR}/linux-${KERNV}" +make ARCH=$(uname -m) headers_check +make ARCH=$(uname -m) INSTALL_HDR_PATH=${PREFIX}/${TRIPLE} headers_install +rm -r "${SRCDIR}/linux-${KERNV}" +} + +# +# ┏━┓ +# ╺━┫ +# ┗━┛╹ +# Build binutils and install them to ${PREFIX} +install_binutils() { +mkdir -p "${BLDDIR}/binutils" +cd "${BLDDIR}/binutils" +${SRCDIR}/binutils-${BINV}/configure --target=${TRIPLE} \ + --prefix=${PREFIX} \ + --with-sysroot=${PREFIX}/${TRIPLE} \ + --disable-nls \ + --disable-shared \ + --disable-multilib +make configure-host +make LDFLAGS="${LDFLAGS} -all-static -static" +make install +rm -rf "${BLDDIR}/binutils" +rm -rf "${SRCDIR}/binutils-${BINV}" +} + +# +# ╻ ╻ +# ┗━┫ +# ╹╹ +# Build the musl libc +install_musl() { +cd "${SRCDIR}/musl-${MUSLV}" +./configure --prefix=${PREFIX}/${TRIPLE} \ + --target=${TRIPLE} \ + --disable-gcc-wrapper \ + --disable-debug \ + --disable-shared \ + --disable-warning +make LDFLAGS="${LDFLAGS}" +make install +rm -rf "${SRCDIR}/musl-${MUSLV}" +} + +# +# ┏━╸ +# ┗━┓ +# ┗━┛╹ +# Build pcc linked against musl +install_pcc() { +mkdir -p "${BLDDIR}/pcc" +mkdir -p "${BLDDIR}/pcc-libs" +cd "${BLDDIR}/pcc" +${SRCDIR}/pcc-${PCCV}/configure --target=${TRIPLE} \ + --with-libdir=${PREFIX}/${TRIPLE}/lib \ + --with-incdir=${PREFIX}/${TRIPLE}/include \ + --prefix=${PREFIX} + +make LDFLAGS="${LDFLAGS} -static" \ + PCCLIBDIR=${PREFIX}/${TRIPLE}/pcc/lib \ + PCCINCDIR=${PREFIX}/${TRIPLE}/pcc/include +make PCCLIBDIR=${PREFIX}/${TRIPLE}/pcc/lib \ + PCCINCDIR=${PREFIX}/${TRIPLE}/pcc/include \ + install +rm -rf "${BLDDIR}/pcc" +rm -rf "${SRCDIR}/pcc-${PCCV}" +} + +# +# ┏━┓ +# ┣━┓ +# ┗━┛╹ +# Build pcc libraries against musl +install_pcc_libs() { +cd "${BLDDIR}/pcc-libs" +${SRCDIR}/pcc-libs-${PCCV}/configure --target=${TRIPLE} \ + --prefix=${PREFIX} + +make PCCLIBDIR=${PREFIX}/${TRIPLE}/pcc/lib \ + PCCINCDIR=${PREFIX}/${TRIPLE}/pcc/include +make PCCLIBDIR=${PREFIX}/${TRIPLE}/pcc/lib \ + PCCINCDIR=${PREFIX}/${TRIPLE}/pcc/include \ + install +rm -rf "${BLDDIR}/pcc-libs" +rm -rf "${SRCDIR}/pcc-libs-${PCCV}" +} + +# +# ┏━┓ +# ┃ +# ╹╹ +# Add pkg-config wrapper +install_pkgconfig() { +cat << EOF > "${PREFIX}/bin/${TRIPLE}-pkg-config" +#!/bin/sh +export PKG_CONFIG_SYSROOT_DIR=${PREFIX}/${TRIPLE} +export PKG_CONFIG_LIBDIR=${PREFIX}/${TRIPLE}/usr/lib/pkgconfig +export PKG_CONFIG_PATH=\$PKG_CONFIG_LIBDIR + +exec pkg-config --static "\$@" +EOF +chmod 755 "${PREFIX}/bin/${TRIPLE}-pkg-config" +} + +grab_sources +patch_sources +install_headers +install_binutils +install_musl +install_pcc +install_pcc_libs +install_pkgconfig + +# clean environment +rm -rf "${SRCDIR}" +rm -rf "${BLDDIR}" +rm -rf "${PREFIX}/share" +rm -f "${PREFIX}/lib/libiberty.a" + +cat << EOF | tee ${PREFIX}/README +TRIPLET : $TRIPLE +PREFIX : $PREFIX +PCC : $PCCV +BINUTILS: $BINV +MUSL : $MUSLV +KERNEL : $KERNV +EOF diff --git a/patches/binutils-2.25-ignore-makeinfo.diff b/patches/binutils-2.25-ignore-makeinfo.diff @@ -0,0 +1,21 @@ +diff -urN a/configure b/configure +--- a/configure 2014-10-14 09:32:02.000000000 +0200 ++++ b/configure 2015-08-08 17:33:20.492421300 +0200 +@@ -8032,7 +8032,7 @@ + + test -n "$MAKEINFO" && break + done +-test -n "$MAKEINFO" || MAKEINFO="$MISSING makeinfo" ++test -n "$MAKEINFO" || MAKEINFO="true" + + case " $build_configdirs " in + *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;; +@@ -8044,7 +8044,7 @@ + | egrep 'texinfo[^0-9]*(4\.([7-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then + : + else +- MAKEINFO="$MISSING makeinfo" ++ MAKEINFO="true" + fi + ;; + diff --git a/patches/gcc-4.8.4-musl.diff b/patches/gcc-4.8.4-musl.diff @@ -0,0 +1,816 @@ +7e0eccba7c48 (gcc-4.8.4) tip +# HG changeset patch +# Parent ec1984833740e9cb3223001a8fa26c03b5dcc93c +Use the generic implementation of libstdc++ primitives when we're on musl, not the glibc one. + +diff -r ec1984833740 libstdc++-v3/configure.host +--- a/libstdc++-v3/configure.host Thu Jan 29 13:38:28 2015 -0500 ++++ b/libstdc++-v3/configure.host Thu Jan 29 13:41:38 2015 -0500 +@@ -263,6 +263,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 +@@ -271,6 +278,9 @@ + os_include_dir="os/gnu-linux" + fi + ;; ++ ++ esac ++ ;; + hpux*) + os_include_dir="os/hpux" + ;; +# HG changeset patch +# Parent 5bf31f896f61f266585ff2c7f6bf0a3b4b1eb05b +Adding -mmusl as a musl libc specifier, and the necessary hacks for it to know how to find musl's dynamic linker. + +diff -r 5bf31f896f61 gcc/config.gcc +--- a/gcc/config.gcc Thu Jan 29 13:41:37 2015 -0500 ++++ b/gcc/config.gcc Thu Jan 29 13:41:40 2015 -0500 +@@ -550,7 +550,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 +@@ -653,6 +653,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 5bf31f896f61 gcc/config/linux.h +--- a/gcc/config/linux.h Thu Jan 29 13:41:37 2015 -0500 ++++ b/gcc/config/linux.h Thu Jan 29 13:41:40 2015 -0500 +@@ -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,21 @@ + + #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. */ + #undef TARGET_C99_FUNCTIONS +-#define TARGET_C99_FUNCTIONS (OPTION_GLIBC) ++#define TARGET_C99_FUNCTIONS (OPTION_GLIBC || OPTION_MUSL) + + /* Whether we have sincos that follows the GNU extension. */ + #undef TARGET_HAS_SINCOS +@@ -107,3 +112,74 @@ + /* 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 +diff -r 5bf31f896f61 gcc/config/linux.opt +--- a/gcc/config/linux.opt Thu Jan 29 13:41:37 2015 -0500 ++++ b/gcc/config/linux.opt Thu Jan 29 13:41:40 2015 -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 5bf31f896f61 gcc/ginclude/stddef.h +--- a/gcc/ginclude/stddef.h Thu Jan 29 13:41:37 2015 -0500 ++++ b/gcc/ginclude/stddef.h Thu Jan 29 13:41:40 2015 -0500 +@@ -181,6 +181,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 +@@ -197,6 +198,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. */ +@@ -214,6 +216,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 4445b9b84fe64451e022a77b1e8ac480210a31da +A fix for libgomp to correctly request a POSIX version for time support. + +diff -r 4445b9b84fe6 libgomp/config/posix/time.c +--- a/libgomp/config/posix/time.c Thu Jan 29 13:41:40 2015 -0500 ++++ b/libgomp/config/posix/time.c Thu Jan 29 13:41:42 2015 -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 +diff -r 96e24a32862b libgcc/unwind-dw2-fde-dip.c +--- a/libgcc/unwind-dw2-fde-dip.c Thu Jan 29 13:41:42 2015 -0500 ++++ b/libgcc/unwind-dw2-fde-dip.c Thu Jan 29 13:41:44 2015 -0500 +@@ -46,33 +46,13 @@ + #include "unwind-compat.h" + #include "gthr.h" + +-#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))) ++#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) \ +- && defined(__BIONIC__) +-# define USE_PT_GNU_EH_FRAME +-#endif +- +-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ +- && defined(__FreeBSD__) && __FreeBSD__ >= 7 +-# define ElfW __ElfN +-# define USE_PT_GNU_EH_FRAME +-#endif +- +-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ +- && defined(__OpenBSD__) +-# define ElfW(type) Elf_##type +-# define USE_PT_GNU_EH_FRAME +-#endif +- +-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ +- && defined(TARGET_DL_ITERATE_PHDR) \ +- && defined(__sun__) && defined(__svr4__) +-# define USE_PT_GNU_EH_FRAME ++# ifdef __OpenBSD__ ++# define ElfW(type) Elf_##type ++# elif defined(__FreeBSD__) && __FreeBSD__ >= 7 ++# define ElfW __ElfN ++# endif + #endif + + #if defined(USE_PT_GNU_EH_FRAME) +diff -r 552906ada59b gcc/configure +--- a/gcc/configure Thu Jan 29 13:41:44 2015 -0500 ++++ b/gcc/configure Thu Jan 29 13:41:46 2015 -0500 +@@ -26852,6 +26852,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. +@@ -26885,6 +26888,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" +@@ -26967,6 +26971,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 -r 552906ada59b gcc/configure.ac +--- a/gcc/configure.ac Thu Jan 29 13:41:44 2015 -0500 ++++ b/gcc/configure.ac Thu Jan 29 13:41:46 2015 -0500 +@@ -4776,6 +4776,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. +@@ -4809,6 +4812,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], +@@ -4874,6 +4878,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 +# HG changeset patch +# Parent 3428eef84c75b837b884abf7344fbd0261d5a646 +Get rid of ever-broken fixincludes on musl. + +diff -r 3428eef84c75 fixincludes/mkfixinc.sh +--- a/fixincludes/mkfixinc.sh Thu Jan 29 13:41:46 2015 -0500 ++++ b/fixincludes/mkfixinc.sh Thu Jan 29 13:41:48 2015 -0500 +@@ -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} +# HG changeset patch +# Parent e2d9d64d6835b26cc5cb052112cfebce6280b00a +Support for i386-linux-musl and x86_64-linux-musl. + +diff -r e2d9d64d6835 gcc/config/i386/linux.h +--- a/gcc/config/i386/linux.h Thu Jan 29 13:41:48 2015 -0500 ++++ b/gcc/config/i386/linux.h Thu Jan 29 13:41:51 2015 -0500 +@@ -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 -r e2d9d64d6835 gcc/config/i386/linux64.h +--- a/gcc/config/i386/linux64.h Thu Jan 29 13:41:48 2015 -0500 ++++ b/gcc/config/i386/linux64.h Thu Jan 29 13:41:51 2015 -0500 +@@ -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 -r e2d9d64d6835 libitm/config/linux/x86/tls.h +--- a/libitm/config/linux/x86/tls.h Thu Jan 29 13:41:48 2015 -0500 ++++ b/libitm/config/linux/x86/tls.h Thu Jan 29 13:41:51 2015 -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 f7c8746386c494e1c21dd4e6ae3697c371fbe661 +Support for arm-linux-musl. + +diff -r f7c8746386c4 gcc/config/arm/linux-eabi.h +--- a/gcc/config/arm/linux-eabi.h Thu Jan 29 13:41:50 2015 -0500 ++++ b/gcc/config/arm/linux-eabi.h Thu Jan 29 13:41:53 2015 -0500 +@@ -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 -r f7c8746386c4 libitm/config/arm/hwcap.cc +--- a/libitm/config/arm/hwcap.cc Thu Jan 29 13:41:50 2015 -0500 ++++ b/libitm/config/arm/hwcap.cc Thu Jan 29 13:41:53 2015 -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 2951aeba3ac9a3f39653cbd56dff41c8f1569b2f +Support for mips-linux-musl. + +diff -r 2951aeba3ac9 gcc/config/mips/linux.h +--- a/gcc/config/mips/linux.h Thu Jan 29 13:41:53 2015 -0500 ++++ b/gcc/config/mips/linux.h Thu Jan 29 13:41:55 2015 -0500 +@@ -18,3 +18,10 @@ + <http://www.gnu.org/licenses/>. */ + + #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++ ++#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 ".so.1" +# HG changeset patch +# Parent 7626e1f2b51fb2ee53358cab627ef4d3206cd75a +Support for powerpc-linux-musl. + +diff -r 7626e1f2b51f gcc/config.gcc +--- a/gcc/config.gcc Thu Jan 29 13:41:55 2015 -0500 ++++ b/gcc/config.gcc Thu Jan 29 13:41:57 2015 -0500 +@@ -2138,6 +2138,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 7626e1f2b51f gcc/config/rs6000/linux64.h +--- a/gcc/config/rs6000/linux64.h Thu Jan 29 13:41:55 2015 -0500 ++++ b/gcc/config/rs6000/linux64.h Thu Jan 29 13:41:57 2015 -0500 +@@ -374,17 +374,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 -r 7626e1f2b51f gcc/config/rs6000/secureplt.h +--- a/gcc/config/rs6000/secureplt.h Thu Jan 29 13:41:55 2015 -0500 ++++ b/gcc/config/rs6000/secureplt.h Thu Jan 29 13:41:57 2015 -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 7626e1f2b51f gcc/config/rs6000/sysv4.h +--- a/gcc/config/rs6000/sysv4.h Thu Jan 29 13:41:55 2015 -0500 ++++ b/gcc/config/rs6000/sysv4.h Thu Jan 29 13:41:57 2015 -0500 +@@ -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. */ + #define CC1_SPEC "%{G*} %(cc1_cpu)" \ +@@ -585,7 +588,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 "\ +@@ -763,15 +767,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} \ +@@ -894,6 +901,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 -r 2fdeb2c3a347 gcc/config/aarch64/aarch64-linux.h +--- a/gcc/config/aarch64/aarch64-linux.h Thu Jan 29 13:41:57 2015 -0500 ++++ b/gcc/config/aarch64/aarch64-linux.h Thu Jan 29 13:41:59 2015 -0500 +@@ -21,7 +21,11 @@ + #ifndef GCC_AARCH64_LINUX_H + #define GCC_AARCH64_LINUX_H + ++/* The AArch64 port currently supports two dynamic linkers: ++ - ld-linux-aarch64.so.1 - GLIBC dynamic linker ++ - ld-musl-aarch64.so.1 - musl libc dynamic linker */ + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64.so.1" ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64.so.1" + + #define CPP_SPEC "%{pthread:-D_REENTRANT}" + +# HG changeset patch +# Parent eb020f66032d779cbaeda8acb97a73d3108189f5 +Microblaze support (again). + +diff -r eb020f66032d gcc/config/microblaze/linux.h +--- a/gcc/config/microblaze/linux.h Thu Jan 29 13:41:59 2015 -0500 ++++ b/gcc/config/microblaze/linux.h Thu Jan 29 13:42:01 2015 -0500 +@@ -25,7 +25,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 } +From 478ee0c03a08e2ef9371fd88d516738936943e78 Mon Sep 17 00:00:00 2001 +From: David Holsgrove <david.holsgrove@xilinx.com> +Date: Fri, 28 Sep 2012 16:32:03 +1000 +Subject: [PATCH 06/11] [Patch, microblaze]: Add SIZE_TYPE and PTRDIFF_TYPE to + microblaze.h + +Fixes warnings like; + +warning: format '%zX' expects argument of type 'size_t', +but argument 3 has type 'unsigned int' [-Wformat] + +Changelog + +2013-03-18 David Holsgrove <david.holsgrove@xilinx.com> + + * gcc/config/microblaze/microblaze.h: Define SIZE_TYPE + and PTRDIFF_TYPE. + +Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com> +--- + gcc/config/microblaze/microblaze.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff -r d9fb78d89e6f gcc/config/microblaze/microblaze.h +--- a/gcc/config/microblaze/microblaze.h Thu Jan 29 13:42:01 2015 -0500 ++++ b/gcc/config/microblaze/microblaze.h Thu Jan 29 13:42:04 2015 -0500 +@@ -219,6 +219,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 -r c7fbc78957f6 gcc/config/sh/linux.h +--- a/gcc/config/sh/linux.h Fri Sep 28 16:32:03 2012 +1000 ++++ b/gcc/config/sh/linux.h Thu Jan 29 13:42:06 2015 -0500 +@@ -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" +Fix for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119 +wrong warning when using the universal zero initializer {0} + +Backported to GCC 4.8.3 + +Subject: 2014-06-05 S. Gilles <sgilles@terpmail.umd.edu> +X-Git-Url: http://repo.or.cz/w/official-gcc.git/commitdiff_plain/95cdf3fdf2d440eb7775def8e35ab970651c33d9?hp=14a3093e9943937cbc63dfbf4d51ca60f8325b29 +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@211289 138bc75d-0d04-0410-961f-82ee72b054a4 + +diff -r be309b9bafc4 gcc/c/c-typeck.c +--- a/gcc/c/c-typeck.c Thu Jan 29 13:42:06 2015 -0500 ++++ b/gcc/c/c-typeck.c Thu Jan 29 13:42:08 2015 -0500 +@@ -62,9 +62,9 @@ + if expr.original_code == SIZEOF_EXPR. */ + tree c_last_sizeof_arg; + +-/* Nonzero if we've already printed a "missing braces around initializer" +- message within this initializer. */ +-static int missing_braces_mentioned; ++/* Nonzero if we might need to print a "missing braces around ++ initializer" message within this initializer. */ ++static int found_missing_braces; + + static int require_constant_value; + static int require_constant_elements; +@@ -6379,6 +6379,9 @@ + /* 1 if this constructor is erroneous so far. */ + static int constructor_erroneous; + ++/* 1 if this constructor is the universal zero initializer { 0 }. */ ++static int constructor_zeroinit; ++ + /* Structure for managing pending initializer elements, organized as an + AVL tree. */ + +@@ -6540,7 +6543,7 @@ + constructor_stack = 0; + constructor_range_stack = 0; + +- missing_braces_mentioned = 0; ++ found_missing_braces = 0; + + spelling_base = 0; + spelling_size = 0; +@@ -6635,6 +6638,7 @@ + constructor_type = type; + constructor_incremental = 1; + constructor_designated = 0; ++ constructor_zeroinit = 1; + designator_depth = 0; + designator_erroneous = 0; + +@@ -6832,11 +6836,8 @@ + set_nonincremental_init (braced_init_obstack); + } + +- if (implicit == 1 && warn_missing_braces && !missing_braces_mentioned) +- { +- missing_braces_mentioned = 1; +- warning_init (OPT_Wmissing_braces, "missing braces around initializer"); +- } ++ if (implicit == 1) ++ found_missing_braces = 1; + + if (TREE_CODE (constructor_type) == RECORD_TYPE + || TREE_CODE (constructor_type) == UNION_TYPE) +@@ -6969,16 +6970,23 @@ + } + } + ++ if (vec_safe_length (constructor_elements) != 1) ++ constructor_zeroinit = 0; ++ ++ /* Warn when some structs are initialized with direct aggregation. */ ++ if (!implicit && found_missing_braces && warn_missing_braces ++ && !constructor_zeroinit) ++ { ++ warning_init (OPT_Wmissing_braces, ++ "missing braces around initializer"); ++ } ++ + /* Warn when some struct elements are implicitly initialized to zero. */ + if (warn_missing_field_initializers + && constructor_type + && TREE_CODE (constructor_type) == RECORD_TYPE + && constructor_unfilled_fields) + { +- bool constructor_zeroinit = +- (vec_safe_length (constructor_elements) == 1 +- && integer_zerop ((*constructor_elements)[0].value)); +- + /* Do not warn for flexible array members or zero-length arrays. */ + while (constructor_unfilled_fields + && (!DECL_SIZE (constructor_unfilled_fields) +@@ -8093,6 +8101,9 @@ + designator_depth = 0; + designator_erroneous = 0; + ++ if (!implicit && value.value && !integer_zerop (value.value)) ++ constructor_zeroinit = 0; ++ + /* Handle superfluous braces around string cst as in + char x[] = {"foo"}; */ + if (string_flag diff --git a/patches/gcc-5.2.0-musl.diff b/patches/gcc-5.2.0-musl.diff @@ -0,0 +1,689 @@ +# HG changeset patch +# Parent 9b5795e98965ab4820a65ceeae0de644d0c5a9bb +Use the generic implementation of libstdc++ primitives when we're on musl, not the glibc one. + +diff -r 9b5795e98965 libstdc++-v3/configure.host +--- a/libstdc++-v3/configure.host Sun Jul 26 15:42:47 2015 -0400 ++++ b/libstdc++-v3/configure.host Sun Jul 26 15:46:09 2015 -0400 +@@ -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" + ;; +# HG changeset patch +# Parent 698e2b270f3f50fc0036f507a7926e4d68d47be0 +Adding -mmusl as a musl libc specifier, and the necessary hacks for it to know how to find musl's dynamic linker. + +diff -r 698e2b270f3f gcc/config.gcc +--- a/gcc/config.gcc Sun Jul 26 15:46:09 2015 -0400 ++++ b/gcc/config.gcc Sun Jul 26 15:46:11 2015 -0400 +@@ -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" + ;; +diff -r 698e2b270f3f gcc/config/linux.h +--- a/gcc/config/linux.h Sun Jul 26 15:46:09 2015 -0400 ++++ b/gcc/config/linux.h Sun Jul 26 15:46:11 2015 -0400 +@@ -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 -r 698e2b270f3f gcc/config/linux.opt +--- a/gcc/config/linux.opt Sun Jul 26 15:46:09 2015 -0400 ++++ b/gcc/config/linux.opt Sun Jul 26 15:46:11 2015 -0400 +@@ -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 698e2b270f3f gcc/ginclude/stddef.h +--- a/gcc/ginclude/stddef.h Sun Jul 26 15:46:09 2015 -0400 ++++ b/gcc/ginclude/stddef.h Sun Jul 26 15:46:11 2015 -0400 +@@ -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 */ +# HG changeset patch +# Parent 8d7ec347907e575fb2ec5231262dc39a226cec85 +A fix for libgomp to correctly request a POSIX version for time support. + +diff -r 8d7ec347907e libgomp/config/posix/time.c +--- a/libgomp/config/posix/time.c Sun Jul 26 15:46:11 2015 -0400 ++++ b/libgomp/config/posix/time.c Sun Jul 26 15:46:13 2015 -0400 +@@ -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 -r 9c90643665ae libgcc/unwind-dw2-fde-dip.c +--- a/libgcc/unwind-dw2-fde-dip.c Sun Jul 26 15:46:13 2015 -0400 ++++ b/libgcc/unwind-dw2-fde-dip.c Sun Jul 26 15:46:15 2015 -0400 +@@ -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 -r 0fe1d86c73d6 gcc/configure +--- a/gcc/configure Sun Jul 26 15:46:15 2015 -0400 ++++ b/gcc/configure Sun Jul 26 15:46:17 2015 -0400 +@@ -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 -r 0fe1d86c73d6 gcc/configure.ac +--- a/gcc/configure.ac Sun Jul 26 15:46:15 2015 -0400 ++++ b/gcc/configure.ac Sun Jul 26 15:46:17 2015 -0400 +@@ -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 -r ec6a0ac94411 gcc/gcc.c +--- a/gcc/gcc.c Sun Jul 26 15:46:17 2015 -0400 ++++ b/gcc/gcc.c Sun Jul 26 15:46:19 2015 -0400 +@@ -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" \ +# HG changeset patch +# Parent e5ca78175ea789ef9eba70ef090abdacd1975224 +Get rid of ever-broken fixincludes on musl. + +diff -r e5ca78175ea7 fixincludes/mkfixinc.sh +--- a/fixincludes/mkfixinc.sh Sun Jul 26 15:46:19 2015 -0400 ++++ b/fixincludes/mkfixinc.sh Sun Jul 26 15:46:21 2015 -0400 +@@ -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} +# HG changeset patch +# Parent 36af6268b2f02afd6e00a03c100dd0a8d9e3dbe6 +Support for i386-linux-musl and x86_64-linux-musl. + +diff -r 36af6268b2f0 gcc/config/i386/linux.h +--- a/gcc/config/i386/linux.h Sun Jul 26 15:46:21 2015 -0400 ++++ b/gcc/config/i386/linux.h Sun Jul 26 15:46:23 2015 -0400 +@@ -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 -r 36af6268b2f0 gcc/config/i386/linux64.h +--- a/gcc/config/i386/linux64.h Sun Jul 26 15:46:21 2015 -0400 ++++ b/gcc/config/i386/linux64.h Sun Jul 26 15:46:23 2015 -0400 +@@ -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 -r 36af6268b2f0 libitm/config/linux/x86/tls.h +--- a/libitm/config/linux/x86/tls.h Sun Jul 26 15:46:21 2015 -0400 ++++ b/libitm/config/linux/x86/tls.h Sun Jul 26 15:46:23 2015 -0400 +@@ -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 214669757bc7960ef2132bcc15302c4a8de0f35a +Support for arm-linux-musl. + +diff -r 214669757bc7 gcc/config/arm/linux-eabi.h +--- a/gcc/config/arm/linux-eabi.h Sun Jul 26 15:46:23 2015 -0400 ++++ b/gcc/config/arm/linux-eabi.h Sun Jul 26 15:46:25 2015 -0400 +@@ -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 -r 214669757bc7 libitm/config/arm/hwcap.cc +--- a/libitm/config/arm/hwcap.cc Sun Jul 26 15:46:23 2015 -0400 ++++ b/libitm/config/arm/hwcap.cc Sun Jul 26 15:46:25 2015 -0400 +@@ -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 dba79de517c5c94376a8ee105b0661cba1484617 +Support for mips-linux-musl. + +diff -r dba79de517c5 gcc/config/mips/linux.h +--- a/gcc/config/mips/linux.h Sun Jul 26 15:46:25 2015 -0400 ++++ b/gcc/config/mips/linux.h Sun Jul 26 15:46:27 2015 -0400 +@@ -31,6 +31,13 @@ + #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}" +# HG changeset patch +# Parent 6becd1fa75bd2bef8af8ca711b089083d6d1192f +Support for powerpc-linux-musl. + +diff -r 6becd1fa75bd gcc/config.gcc +--- a/gcc/config.gcc Sun Jul 26 15:46:27 2015 -0400 ++++ b/gcc/config.gcc Sun Jul 26 15:46:29 2015 -0400 +@@ -2410,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 -r 6becd1fa75bd gcc/config/rs6000/linux64.h +--- a/gcc/config/rs6000/linux64.h Sun Jul 26 15:46:27 2015 -0400 ++++ b/gcc/config/rs6000/linux64.h Sun Jul 26 15:46:29 2015 -0400 +@@ -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 -r 6becd1fa75bd gcc/config/rs6000/secureplt.h +--- a/gcc/config/rs6000/secureplt.h Sun Jul 26 15:46:27 2015 -0400 ++++ b/gcc/config/rs6000/secureplt.h Sun Jul 26 15:46:29 2015 -0400 +@@ -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 6becd1fa75bd gcc/config/rs6000/sysv4.h +--- a/gcc/config/rs6000/sysv4.h Sun Jul 26 15:46:27 2015 -0400 ++++ b/gcc/config/rs6000/sysv4.h Sun Jul 26 15:46:29 2015 -0400 +@@ -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 -r cfc01b6ff516 gcc/config/aarch64/aarch64-linux.h +--- a/gcc/config/aarch64/aarch64-linux.h Sun Jul 26 15:46:29 2015 -0400 ++++ b/gcc/config/aarch64/aarch64-linux.h Sun Jul 26 15:46:32 2015 -0400 +@@ -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*} \ +# HG changeset patch +# Parent 25bb57ef02c8b09bbc585f0ea719b7f128a1ef18 +Microblaze support (again). + +diff -r 25bb57ef02c8 gcc/config/microblaze/linux.h +--- a/gcc/config/microblaze/linux.h Sun Jul 26 15:46:32 2015 -0400 ++++ b/gcc/config/microblaze/linux.h Sun Jul 26 15:46:34 2015 -0400 +@@ -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 } +From 478ee0c03a08e2ef9371fd88d516738936943e78 Mon Sep 17 00:00:00 2001 +From: David Holsgrove <david.holsgrove@xilinx.com> +Date: Fri, 28 Sep 2012 16:32:03 +1000 +Subject: [PATCH 06/11] [Patch, microblaze]: Add SIZE_TYPE and PTRDIFF_TYPE to + microblaze.h + +Fixes warnings like; + +warning: format '%zX' expects argument of type 'size_t', +but argument 3 has type 'unsigned int' [-Wformat] + +Changelog + +2013-03-18 David Holsgrove <david.holsgrove@xilinx.com> + + * gcc/config/microblaze/microblaze.h: Define SIZE_TYPE + and PTRDIFF_TYPE. + +Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com> +--- + gcc/config/microblaze/microblaze.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff -r d2ca267e7e1a gcc/config/microblaze/microblaze.h +--- a/gcc/config/microblaze/microblaze.h Sun Jul 26 15:46:34 2015 -0400 ++++ b/gcc/config/microblaze/microblaze.h Sun Jul 26 15:46:36 2015 -0400 +@@ -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 -r 2318e0db0d53 gcc/config/sh/linux.h +--- a/gcc/config/sh/linux.h Fri Sep 28 16:32:03 2012 +1000 ++++ b/gcc/config/sh/linux.h Sun Jul 26 15:46:38 2015 -0400 +@@ -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 --git a/patches/musl-1.1.10-musl.diff b/patches/musl-1.1.10-musl.diff @@ -0,0 +1,51 @@ +From 63f4b9f18f3674124d8bcb119739fec85e6da005 Mon Sep 17 00:00:00 2001 +From: Timo Teräs <timo.teras@iki.fi> +Date: Fri, 05 Jun 2015 07:39:42 +0000 +Subject: fix uselocale((locale_t)0) not to modify locale + +commit 68630b55c0c7219fe9df70dc28ffbf9efc8021d8 made the new locale to +be assigned unconditonally resulting in crashes later on. +--- +diff --git a/src/locale/uselocale.c b/src/locale/uselocale.c +index b70a0c1..0fc5ecb 100644 +--- a/src/locale/uselocale.c ++++ b/src/locale/uselocale.c +@@ -8,9 +8,7 @@ locale_t __uselocale(locale_t new) + locale_t old = self->locale; + locale_t global = &libc.global_locale; + +- if (new == LC_GLOBAL_LOCALE) new = global; +- +- self->locale = new; ++ if (new) self->locale = new == LC_GLOBAL_LOCALE ? global : new; + + return old == global ? LC_GLOBAL_LOCALE : old; + } +-- +cgit v0.9.0.3-65-g4555 +From e8cbe0bad4284906230a53af4c91ad2b9713d03b Mon Sep 17 00:00:00 2001 +From: Rich Felker <dalias@aerifal.cx> +Date: Wed, 08 Jul 2015 02:46:45 +0000 +Subject: fix negated return value of ns_skiprr, breakage in related functions + +due to a reversed pointer difference computation, ns_skiprr always +returned a negative value, which functions using it would interpret as +an error. + +patch by Yu Lu. +--- +diff --git a/src/network/ns_parse.c b/src/network/ns_parse.c +index 3ff33a8..d01da47 100644 +--- a/src/network/ns_parse.c ++++ b/src/network/ns_parse.c +@@ -95,7 +95,7 @@ int ns_skiprr(const unsigned char *ptr, const unsigned char *eom, ns_sect sectio + p += r; + } + } +- return ptr - p; ++ return p - ptr; + bad: + errno = EMSGSIZE; + return -1; +-- +cgit v0.9.0.3-65-g4555 diff --git a/patches/pcc-1.1.0-deflibdirs.diff b/patches/pcc-1.1.0-deflibdirs.diff @@ -0,0 +1,30 @@ +diff -urN a/cc/cc/cc.c b/cc/cc/cc.c +--- a/cc/cc/cc.c 2015-08-16 16:00:18.867457413 +0200 ++++ b/cc/cc/cc.c 2015-08-16 16:03:28.963466133 +0200 +@@ -207,9 +207,9 @@ + #endif + #ifndef DEFLIBDIRS /* default library search paths */ + #ifdef MULTIARCH_PATH +-#define DEFLIBDIRS { "/usr/lib/", 0 } ++#define DEFLIBDIRS { LIBDIR, 0 } + #else +-#define DEFLIBDIRS { "/usr/lib/", "/usr/lib/" MULTIARCH_PATH "/", 0 } ++#define DEFLIBDIRS { LIBDIR, LIBDIR MULTIARCH_PATH "/", 0 } + #endif + #endif + #ifndef DEFLIBS /* default libraries included */ +diff -urN a/os/linux/ccconfig.h b/os/linux/ccconfig.h +--- a/os/linux/ccconfig.h 2015-08-16 16:00:18.873457413 +0200 ++++ b/os/linux/ccconfig.h 2015-08-16 16:05:23.446471384 +0200 +@@ -48,9 +48,9 @@ + "-D__amd64", "-D__LP64__", "-D_LP64", NULL, } + #define DYNLINKER { "-dynamic-linker", "/lib64/ld-linux-x86-64.so.2", NULL } + #ifndef MULTIARCH_PATH +-#define DEFLIBDIRS { "/usr/lib64/", 0 } ++#define DEFLIBDIRS { LIBDIR, 0 } + #else +-#define DEFLIBDIRS { "/usr/lib64/", "/usr/lib/" MULTIARCH_PATH "/", 0 } ++#define DEFLIBDIRS { LIBDIR, LIBDIR MULTIARCH_PATH "/", 0 } + #endif + #elif defined(mach_mips) + #define CPPMDADD { "-D__mips__", NULL, } diff --git a/patches/pcc-1.1.0-musl.diff b/patches/pcc-1.1.0-musl.diff @@ -0,0 +1,22 @@ +diff -urN a/config.sub b/config.sub +--- a/config.sub 2015-08-11 21:55:34.497619099 +0200 ++++ b/config.sub 2015-08-11 21:56:21.652621262 +0200 +@@ -120,7 +120,7 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ ++ nto-qnx* | linux-gnu* | linux-dietlibc | linux-musl | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os +@@ -1289,6 +1289,9 @@ + -linux-dietlibc) + os=-linux-dietlibc + ;; ++ -linux-musl) ++ os=-linux-musl ++ ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; diff --git a/patches/pcc-libs-1.1.0-musl.diff b/patches/pcc-libs-1.1.0-musl.diff @@ -0,0 +1,22 @@ +diff -urN a/config.sub b/config.sub +--- a/config.sub 2015-08-11 21:55:34.497619099 +0200 ++++ b/config.sub 2015-08-11 21:56:21.652621262 +0200 +@@ -120,7 +120,7 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ ++ nto-qnx* | linux-gnu* | linux-dietlibc | linux-musl | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os +@@ -1289,6 +1289,9 @@ + -linux-dietlibc) + os=-linux-dietlibc + ;; ++ -linux-musl) ++ os=-linux-musl ++ ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;;