initial check-in
This commit is contained in:
Rich Felker
commit
596e008012
|
|
@ -0,0 +1,121 @@
|
||||||
|
|
||||||
|
OUTPUT = $(PWD)/output
|
||||||
|
TARGET = sh2eb-linux-musl
|
||||||
|
|
||||||
|
BINUTILS_VER = 2.25.1
|
||||||
|
GCC_VER = 5.2.0
|
||||||
|
|
||||||
|
COMMON_CONFIG = --disable-werror \
|
||||||
|
--target=$(TARGET) --prefix=$(OUTPUT) \
|
||||||
|
--with-sysroot=$(OUTPUT)/$(TARGET)
|
||||||
|
|
||||||
|
BINUTILS_CONFIG = $(COMMON_CONFIG)
|
||||||
|
GCC_CONFIG = $(COMMON_CONFIG) \
|
||||||
|
--disable-libmudflap --disable-libsanitizer \
|
||||||
|
--disable-libquadmath --disable-decimal-float
|
||||||
|
|
||||||
|
GCC0_CONFIG = $(GCC_CONFIG) \
|
||||||
|
--without-headers --disable-libssp --disable-threads \
|
||||||
|
--disable-shared --disable-libgomp --disable-libatomic \
|
||||||
|
--disable-libquadmath --disable-decimal-float --disable-nls \
|
||||||
|
--enable-languages=c \
|
||||||
|
CFLAGS="-O0 -g0" CXXFLAGS="-O0 -g0"
|
||||||
|
|
||||||
|
MUSL_CONFIG = CC=$(OUTPUT)/bin/$(TARGET)-gcc --prefix=/usr
|
||||||
|
|
||||||
|
-include config.mak
|
||||||
|
|
||||||
|
|
||||||
|
all: steps/install_binutils steps/install_musl steps/install_gcc
|
||||||
|
|
||||||
|
|
||||||
|
steps/configure_gcc0: steps/install_binutils
|
||||||
|
steps/configure_gcc: steps/install_musl
|
||||||
|
|
||||||
|
|
||||||
|
sources/config.sub:
|
||||||
|
wget -O $@ 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD'
|
||||||
|
|
||||||
|
sources/binutils-%:
|
||||||
|
wget -c -O $@.part http://ftp.gnu.org/pub/gnu/binutils/$(notdir $@)
|
||||||
|
mv $@.part $@
|
||||||
|
|
||||||
|
sources/gcc-%:
|
||||||
|
wget -c -O $@.part http://ftp.gnu.org/pub/gnu/gcc/$(basename $(basename $(notdir $@)))/$(notdir $@)
|
||||||
|
mv $@.part $@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
steps/extract_binutils: sources/binutils-$(BINUTILS_VER).tar.bz2 sources/config.sub
|
||||||
|
tar jxvf $<
|
||||||
|
cat patches/binutils-$(BINUTILS_VER)/* | ( cd binutils-$(BINUTILS_VER) && patch -p1 )
|
||||||
|
cp sources/config.sub binutils-$(BINUTILS_VER)
|
||||||
|
touch $@
|
||||||
|
|
||||||
|
steps/configure_binutils: steps/extract_binutils
|
||||||
|
test -e binutils-$(BINUTILS_VER)/config.status || ( cd binutils-$(BINUTILS_VER) && ./configure $(BINUTILS_CONFIG) )
|
||||||
|
touch $@
|
||||||
|
|
||||||
|
steps/build_binutils: steps/configure_binutils
|
||||||
|
cd binutils-$(BINUTILS_VER) && $(MAKE)
|
||||||
|
touch $@
|
||||||
|
|
||||||
|
steps/install_binutils: steps/build_binutils
|
||||||
|
cd binutils-$(BINUTILS_VER) && $(MAKE) install
|
||||||
|
touch $@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
steps/extract_gcc: sources/gcc-$(GCC_VER).tar.bz2 sources/config.sub
|
||||||
|
tar jxvf $<
|
||||||
|
cat patches/gcc-$(GCC_VER)/* | ( cd gcc-$(GCC_VER) && patch -p1 )
|
||||||
|
cp sources/config.sub gcc-$(GCC_VER)
|
||||||
|
touch $@
|
||||||
|
|
||||||
|
steps/configure_gcc0: steps/extract_gcc
|
||||||
|
mkdir -p gcc-$(GCC_VER)/build0
|
||||||
|
test -e gcc-$(GCC_VER)/build0/config.status || ( cd gcc-$(GCC_VER)/build0 && ../configure $(GCC0_CONFIG) )
|
||||||
|
touch $@
|
||||||
|
|
||||||
|
steps/build_gcc0: steps/configure_gcc0
|
||||||
|
cd gcc-$(GCC_VER)/build0 && $(MAKE)
|
||||||
|
touch $@
|
||||||
|
|
||||||
|
steps/install_gcc0: steps/build_gcc0
|
||||||
|
cd gcc-$(GCC_VER)/build0 && $(MAKE) install
|
||||||
|
touch $@
|
||||||
|
|
||||||
|
steps/configure_gcc: steps/extract_gcc
|
||||||
|
mkdir -p gcc-$(GCC_VER)/build
|
||||||
|
test -e gcc-$(GCC_VER)/build/config.status || ( cd gcc-$(GCC_VER)/build && ../configure $(GCC_CONFIG) )
|
||||||
|
touch $@
|
||||||
|
|
||||||
|
steps/build_gcc: steps/configure_gcc
|
||||||
|
cd gcc-$(GCC_VER)/build && $(MAKE)
|
||||||
|
touch $@
|
||||||
|
|
||||||
|
steps/install_gcc: steps/build_gcc
|
||||||
|
cd gcc-$(GCC_VER)/build && $(MAKE) install
|
||||||
|
touch $@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
steps/clone_musl:
|
||||||
|
test -d musl || git clone git://git.musl-libc.org/musl musl
|
||||||
|
touch $@
|
||||||
|
|
||||||
|
steps/configure_musl: steps/clone_musl steps/install_gcc0
|
||||||
|
cd musl && ./configure $(MUSL_CONFIG)
|
||||||
|
cat patches/musl-complex-hack >> musl/config.mak
|
||||||
|
touch $@
|
||||||
|
|
||||||
|
steps/build_musl: steps/configure_musl
|
||||||
|
cd musl && $(MAKE)
|
||||||
|
touch $@
|
||||||
|
|
||||||
|
steps/install_musl: steps/build_musl
|
||||||
|
cd musl && $(MAKE) install DESTDIR=$(OUTPUT)/$(TARGET)
|
||||||
|
touch $@
|
||||||
|
|
@ -0,0 +1,10 @@
|
||||||
|
OUTPUT = $(PWD)/output
|
||||||
|
TARGET = sh2eb-linux-musl
|
||||||
|
|
||||||
|
BINUTILS_VER = 2.25.1
|
||||||
|
GCC_VER = 5.2.0
|
||||||
|
|
||||||
|
# COMMON_CONFIG += --disable-nls
|
||||||
|
# GCC_CONFIG += --enable-languages=c,c++,lto
|
||||||
|
# GCC_CONFIG += --disable-multilib
|
||||||
|
# GCC_CONFIG += --with-cpu=mj2
|
||||||
|
|
@ -0,0 +1,78 @@
|
||||||
|
--- binutils-2.25.1.orig/bfd/elf32-sh.c
|
||||||
|
+++ binutils-2.25.1/bfd/elf32-sh.c
|
||||||
|
@@ -3344,7 +3344,7 @@
|
||||||
|
if (htab->root.dynamic_sections_created)
|
||||||
|
{
|
||||||
|
/* Set the contents of the .interp section to the interpreter. */
|
||||||
|
- if (info->executable)
|
||||||
|
+ if (info->executable && !info->nointerp)
|
||||||
|
{
|
||||||
|
s = bfd_get_linker_section (dynobj, ".interp");
|
||||||
|
BFD_ASSERT (s != NULL);
|
||||||
|
--- binutils-2.25.1.orig/bfd/elflink.c
|
||||||
|
+++ binutils-2.25.1/bfd/elflink.c
|
||||||
|
@@ -206,7 +206,7 @@
|
||||||
|
|
||||||
|
/* A dynamically linked executable has a .interp section, but a
|
||||||
|
shared library does not. */
|
||||||
|
- if (info->executable)
|
||||||
|
+ if (info->executable && !info->nointerp)
|
||||||
|
{
|
||||||
|
s = bfd_make_section_anyway_with_flags (abfd, ".interp",
|
||||||
|
flags | SEC_READONLY);
|
||||||
|
@@ -5620,7 +5620,7 @@
|
||||||
|
bfd_boolean all_defined;
|
||||||
|
|
||||||
|
*sinterpptr = bfd_get_linker_section (dynobj, ".interp");
|
||||||
|
- BFD_ASSERT (*sinterpptr != NULL || !info->executable);
|
||||||
|
+ BFD_ASSERT (*sinterpptr != NULL || !info->executable || info->nointerp);
|
||||||
|
|
||||||
|
if (soname != NULL)
|
||||||
|
{
|
||||||
|
--- binutils-2.25.1.orig/include/bfdlink.h
|
||||||
|
+++ binutils-2.25.1/include/bfdlink.h
|
||||||
|
@@ -426,6 +426,9 @@
|
||||||
|
/* TRUE if BND prefix in PLT entries is always generated. */
|
||||||
|
unsigned int bndplt: 1;
|
||||||
|
|
||||||
|
+ /* TRUE if generation of .interp/PT_INTERP should be suppressed. */
|
||||||
|
+ unsigned int nointerp: 1;
|
||||||
|
+
|
||||||
|
/* Char that may appear as the first char of a symbol, but should be
|
||||||
|
skipped (like symbol_leading_char) when looking up symbols in
|
||||||
|
wrap_hash. Used by PowerPC Linux for 'dot' symbols. */
|
||||||
|
--- binutils-2.25.1.orig/ld/ldlex.h
|
||||||
|
+++ binutils-2.25.1/ld/ldlex.h
|
||||||
|
@@ -33,6 +33,7 @@
|
||||||
|
OPTION_DEFSYM,
|
||||||
|
OPTION_DEMANGLE,
|
||||||
|
OPTION_DYNAMIC_LINKER,
|
||||||
|
+ OPTION_NO_DYNAMIC_LINKER,
|
||||||
|
OPTION_SYSROOT,
|
||||||
|
OPTION_EB,
|
||||||
|
OPTION_EL,
|
||||||
|
--- binutils-2.25.1.orig/ld/lexsup.c
|
||||||
|
+++ binutils-2.25.1/ld/lexsup.c
|
||||||
|
@@ -138,6 +138,9 @@
|
||||||
|
{ {"dynamic-linker", required_argument, NULL, OPTION_DYNAMIC_LINKER},
|
||||||
|
'I', N_("PROGRAM"), N_("Set PROGRAM as the dynamic linker to use"),
|
||||||
|
TWO_DASHES },
|
||||||
|
+ { {"no-dynamic-linker", no_argument, NULL, OPTION_NO_DYNAMIC_LINKER},
|
||||||
|
+ '\0', NULL, N_("Produce an executable with no program interpreter header"),
|
||||||
|
+ TWO_DASHES },
|
||||||
|
{ {"library", required_argument, NULL, 'l'},
|
||||||
|
'l', N_("LIBNAME"), N_("Search for library LIBNAME"), TWO_DASHES },
|
||||||
|
{ {"library-path", required_argument, NULL, 'L'},
|
||||||
|
@@ -747,6 +750,11 @@
|
||||||
|
case 'I': /* Used on Solaris. */
|
||||||
|
case OPTION_DYNAMIC_LINKER:
|
||||||
|
command_line.interpreter = optarg;
|
||||||
|
+ link_info.nointerp = 0;
|
||||||
|
+ break;
|
||||||
|
+ case OPTION_NO_DYNAMIC_LINKER:
|
||||||
|
+ command_line.interpreter = NULL;
|
||||||
|
+ link_info.nointerp = 1;
|
||||||
|
break;
|
||||||
|
case OPTION_SYSROOT:
|
||||||
|
/* Already handled in ldmain.c. */
|
||||||
|
|
||||||
|
|
@ -0,0 +1,45 @@
|
||||||
|
--- binutils-2.25.1.orig/gas/config/tc-sh.c
|
||||||
|
+++ binutils-2.25.1/gas/config/tc-sh.c
|
||||||
|
@@ -1730,6 +1730,11 @@
|
||||||
|
goto fail;
|
||||||
|
break;
|
||||||
|
|
||||||
|
+ case A_IND_0:
|
||||||
|
+ if (user->type != A_IND_N || user->reg != 0)
|
||||||
|
+ goto fail;
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
case A_REG_N:
|
||||||
|
case A_INC_N:
|
||||||
|
case A_DEC_N:
|
||||||
|
--- binutils-2.25.1.orig/opcodes/sh-dis.c
|
||||||
|
+++ binutils-2.25.1/opcodes/sh-dis.c
|
||||||
|
@@ -703,6 +703,9 @@
|
||||||
|
case AS_DEC_N:
|
||||||
|
fprintf_fn (stream, "@-r%d", rn);
|
||||||
|
break;
|
||||||
|
+ case A_IND_0:
|
||||||
|
+ fprintf_fn (stream, "@r0");
|
||||||
|
+ break;
|
||||||
|
case A_IND_N:
|
||||||
|
case AS_IND_N:
|
||||||
|
fprintf_fn (stream, "@r%d", rn);
|
||||||
|
--- binutils-2.25.1.orig/opcodes/sh-opc.h
|
||||||
|
+++ binutils-2.25.1/opcodes/sh-opc.h
|
||||||
|
@@ -112,6 +112,7 @@
|
||||||
|
A_IMM,
|
||||||
|
A_INC_M,
|
||||||
|
A_INC_N,
|
||||||
|
+ A_IND_0,
|
||||||
|
A_IND_M,
|
||||||
|
A_IND_N,
|
||||||
|
A_IND_R0_REG_M,
|
||||||
|
@@ -410,6 +411,8 @@
|
||||||
|
/* 10001111i8p1.... bf.s <bdisp8> */{"bf.s",{A_BDISP8},{HEX_8,HEX_F,BRANCH_8}, arch_sh2_up},
|
||||||
|
|
||||||
|
/* 10001111i8p1.... bf/s <bdisp8> */{"bf/s",{A_BDISP8},{HEX_8,HEX_F,BRANCH_8}, arch_sh2_up},
|
||||||
|
+
|
||||||
|
+/* 0011nnnnmmmm0001 cas.l <REG_M>,<REG_N>,@R0*/{"cas.l",{A_REG_M,A_REG_N,A_IND_0},{HEX_3,REG_N,REG_M,HEX_1}, arch_sh2_up},
|
||||||
|
|
||||||
|
/* 0000000010001000 clrdmxy */{"clrdmxy",{0},{HEX_0,HEX_0,HEX_8,HEX_8}, arch_sh4al_dsp_up},
|
||||||
|
|
||||||
|
|
@ -0,0 +1,891 @@
|
||||||
|
diff --git a/fixincludes/mkfixinc.sh b/fixincludes/mkfixinc.sh
|
||||||
|
index 6653fed..0d96c8c 100755
|
||||||
|
--- a/fixincludes/mkfixinc.sh
|
||||||
|
+++ b/fixincludes/mkfixinc.sh
|
||||||
|
@@ -19,7 +19,8 @@ case $machine in
|
||||||
|
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 --git a/gcc/config.gcc b/gcc/config.gcc
|
||||||
|
index 3ede69b..d9eb8cf 100644
|
||||||
|
--- a/gcc/config.gcc
|
||||||
|
+++ b/gcc/config.gcc
|
||||||
|
@@ -575,7 +575,7 @@ case ${target} in
|
||||||
|
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 @@ case ${target} in
|
||||||
|
*-*-*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 --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
|
||||||
|
index ba7fc3b..1600a32 100644
|
||||||
|
--- a/gcc/config/aarch64/aarch64-linux.h
|
||||||
|
+++ b/gcc/config/aarch64/aarch64-linux.h
|
||||||
|
@@ -23,6 +23,9 @@
|
||||||
|
|
||||||
|
#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
|
||||||
|
|
||||||
|
+#undef MUSL_DYNAMIC_LINKER
|
||||||
|
+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
|
||||||
|
+
|
||||||
|
#undef ASAN_CC1_SPEC
|
||||||
|
#define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}"
|
||||||
|
|
||||||
|
diff --git a/gcc/config/alpha/linux.h b/gcc/config/alpha/linux.h
|
||||||
|
index c567f43..475ea06 100644
|
||||||
|
--- a/gcc/config/alpha/linux.h
|
||||||
|
+++ b/gcc/config/alpha/linux.h
|
||||||
|
@@ -61,10 +61,14 @@ along with GCC; see the file COPYING3. If not see
|
||||||
|
#define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC)
|
||||||
|
#define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
|
||||||
|
#define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
|
||||||
|
+#undef OPTION_MUSL
|
||||||
|
+#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)
|
||||||
|
+#undef OPTION_MUSL
|
||||||
|
+#define OPTION_MUSL (linux_libc == LIBC_MUSL)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Determine what functions are present at the runtime;
|
||||||
|
diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h
|
||||||
|
index e9d65dc..f12e6bd 100644
|
||||||
|
--- a/gcc/config/arm/linux-eabi.h
|
||||||
|
+++ b/gcc/config/arm/linux-eabi.h
|
||||||
|
@@ -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 --git a/gcc/config/glibc-stdint.h b/gcc/config/glibc-stdint.h
|
||||||
|
index 3fc67dc..98f4f04 100644
|
||||||
|
--- a/gcc/config/glibc-stdint.h
|
||||||
|
+++ b/gcc/config/glibc-stdint.h
|
||||||
|
@@ -22,6 +22,12 @@ a copy of the GCC Runtime Library Exception along with this program;
|
||||||
|
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||||
|
<http://www.gnu.org/licenses/>. */
|
||||||
|
|
||||||
|
+/* Systems using musl libc should use this header and make sure
|
||||||
|
+ OPTION_MUSL is defined correctly before using the TYPE macros. */
|
||||||
|
+#ifndef OPTION_MUSL
|
||||||
|
+#define OPTION_MUSL 0
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#define SIG_ATOMIC_TYPE "int"
|
||||||
|
|
||||||
|
#define INT8_TYPE "signed char"
|
||||||
|
@@ -43,12 +49,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||||
|
#define UINT_LEAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int")
|
||||||
|
|
||||||
|
#define INT_FAST8_TYPE "signed char"
|
||||||
|
-#define INT_FAST16_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int")
|
||||||
|
-#define INT_FAST32_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int")
|
||||||
|
+#define INT_FAST16_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long int" : "int")
|
||||||
|
+#define INT_FAST32_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long int" : "int")
|
||||||
|
#define INT_FAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "long long int")
|
||||||
|
#define UINT_FAST8_TYPE "unsigned char"
|
||||||
|
-#define UINT_FAST16_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "unsigned int")
|
||||||
|
-#define UINT_FAST32_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "unsigned int")
|
||||||
|
+#define UINT_FAST16_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long unsigned int" : "unsigned int")
|
||||||
|
+#define UINT_FAST32_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long unsigned int" : "unsigned int")
|
||||||
|
#define UINT_FAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int")
|
||||||
|
|
||||||
|
#define INTPTR_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int")
|
||||||
|
diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h
|
||||||
|
index a100963..385aefd 100644
|
||||||
|
--- a/gcc/config/i386/linux.h
|
||||||
|
+++ b/gcc/config/i386/linux.h
|
||||||
|
@@ -21,3 +21,6 @@ along with GCC; see the file COPYING3. If not see
|
||||||
|
|
||||||
|
#define GNU_USER_LINK_EMULATION "elf_i386"
|
||||||
|
#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
|
||||||
|
+
|
||||||
|
+#undef MUSL_DYNAMIC_LINKER
|
||||||
|
+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
|
||||||
|
diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h
|
||||||
|
index a27d3be..e300480 100644
|
||||||
|
--- a/gcc/config/i386/linux64.h
|
||||||
|
+++ b/gcc/config/i386/linux64.h
|
||||||
|
@@ -30,3 +30,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||||
|
#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"
|
||||||
|
+
|
||||||
|
+#undef MUSL_DYNAMIC_LINKER32
|
||||||
|
+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
|
||||||
|
+#undef MUSL_DYNAMIC_LINKER64
|
||||||
|
+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
|
||||||
|
+#undef MUSL_DYNAMIC_LINKERX32
|
||||||
|
+#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
|
||||||
|
diff --git a/gcc/config/linux.h b/gcc/config/linux.h
|
||||||
|
index 857389a..7bc87ab 100644
|
||||||
|
--- a/gcc/config/linux.h
|
||||||
|
+++ b/gcc/config/linux.h
|
||||||
|
@@ -32,10 +32,14 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||||
|
#define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC)
|
||||||
|
#define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
|
||||||
|
#define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
|
||||||
|
+#undef OPTION_MUSL
|
||||||
|
+#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)
|
||||||
|
+#undef OPTION_MUSL
|
||||||
|
+#define OPTION_MUSL (linux_libc == LIBC_MUSL)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define GNU_USER_TARGET_OS_CPP_BUILTINS() \
|
||||||
|
@@ -50,21 +54,25 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
/* Determine which dynamic linker to use depending on whether GLIBC or
|
||||||
|
- uClibc or Bionic is the default C library and whether
|
||||||
|
- -muclibc or -mglibc or -mbionic has been passed to change the default. */
|
||||||
|
+ uClibc or Bionic or musl is the default C library and whether
|
||||||
|
+ -muclibc or -mglibc or -mbionic or -mmusl 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 */
|
||||||
|
@@ -81,24 +89,100 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||||
|
#define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker"
|
||||||
|
#define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64"
|
||||||
|
#define BIONIC_DYNAMIC_LINKERX32 "/system/bin/linkerx32"
|
||||||
|
+/* Should be redefined for each target that supports musl. */
|
||||||
|
+#define MUSL_DYNAMIC_LINKER "/dev/null"
|
||||||
|
+#define MUSL_DYNAMIC_LINKER32 "/dev/null"
|
||||||
|
+#define MUSL_DYNAMIC_LINKER64 "/dev/null"
|
||||||
|
+#define MUSL_DYNAMIC_LINKERX32 "/dev/null"
|
||||||
|
|
||||||
|
#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 --git a/gcc/config/linux.opt b/gcc/config/linux.opt
|
||||||
|
index c054338..ef055a7 100644
|
||||||
|
--- a/gcc/config/linux.opt
|
||||||
|
+++ b/gcc/config/linux.opt
|
||||||
|
@@ -28,5 +28,9 @@ Target Report RejectNegative Var(linux_libc,LIBC_GLIBC) Negative(muclibc)
|
||||||
|
Use GNU C library
|
||||||
|
|
||||||
|
muclibc
|
||||||
|
-Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
|
||||||
|
+Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mmusl)
|
||||||
|
Use uClibc C library
|
||||||
|
+
|
||||||
|
+mmusl
|
||||||
|
+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mbionic)
|
||||||
|
+Use musl C library
|
||||||
|
diff --git a/gcc/config/microblaze/linux.h b/gcc/config/microblaze/linux.h
|
||||||
|
index 655a70f..a8a3f3e 100644
|
||||||
|
--- a/gcc/config/microblaze/linux.h
|
||||||
|
+++ b/gcc/config/microblaze/linux.h
|
||||||
|
@@ -28,10 +28,20 @@
|
||||||
|
#undef TLS_NEEDS_GOT
|
||||||
|
#define TLS_NEEDS_GOT 1
|
||||||
|
|
||||||
|
-#define DYNAMIC_LINKER "/lib/ld.so.1"
|
||||||
|
+#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
|
||||||
|
+
|
||||||
|
+#if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */
|
||||||
|
+#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:;:el}"
|
||||||
|
+#else
|
||||||
|
+#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:el}"
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+#undef MUSL_DYNAMIC_LINKER
|
||||||
|
+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1"
|
||||||
|
+
|
||||||
|
#undef SUBTARGET_EXTRA_SPECS
|
||||||
|
#define SUBTARGET_EXTRA_SPECS \
|
||||||
|
- { "dynamic_linker", DYNAMIC_LINKER }
|
||||||
|
+ { "dynamic_linker", GNU_USER_DYNAMIC_LINKER }
|
||||||
|
|
||||||
|
#undef LINK_SPEC
|
||||||
|
#define LINK_SPEC "%{shared:-shared} \
|
||||||
|
diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h
|
||||||
|
index 91df261..fb358e2 100644
|
||||||
|
--- a/gcc/config/mips/linux.h
|
||||||
|
+++ b/gcc/config/mips/linux.h
|
||||||
|
@@ -37,7 +37,13 @@ along with GCC; see the file COPYING3. If not see
|
||||||
|
#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 --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h
|
||||||
|
index fe0ebd6..a68ff69 100644
|
||||||
|
--- a/gcc/config/rs6000/linux.h
|
||||||
|
+++ b/gcc/config/rs6000/linux.h
|
||||||
|
@@ -30,10 +30,14 @@
|
||||||
|
#define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC)
|
||||||
|
#define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
|
||||||
|
#define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
|
||||||
|
+#undef OPTION_MUSL
|
||||||
|
+#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)
|
||||||
|
+#undef OPTION_MUSL
|
||||||
|
+#define OPTION_MUSL (linux_libc == LIBC_MUSL)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Determine what functions are present at the runtime;
|
||||||
|
diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
|
||||||
|
index 0879e7e..6a7d435 100644
|
||||||
|
--- a/gcc/config/rs6000/linux64.h
|
||||||
|
+++ b/gcc/config/rs6000/linux64.h
|
||||||
|
@@ -299,10 +299,14 @@ extern int dot_symbols;
|
||||||
|
#define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC)
|
||||||
|
#define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
|
||||||
|
#define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
|
||||||
|
+#undef OPTION_MUSL
|
||||||
|
+#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)
|
||||||
|
+#undef OPTION_MUSL
|
||||||
|
+#define OPTION_MUSL (linux_libc == LIBC_MUSL)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Determine what functions are present at the runtime;
|
||||||
|
@@ -365,17 +369,23 @@ extern int dot_symbols;
|
||||||
|
#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" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
|
||||||
|
+#define MUSL_DYNAMIC_LINKER64 \
|
||||||
|
+ "/lib/ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.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 --git a/gcc/config/rs6000/secureplt.h b/gcc/config/rs6000/secureplt.h
|
||||||
|
index b463463..77edf2a 100644
|
||||||
|
--- a/gcc/config/rs6000/secureplt.h
|
||||||
|
+++ b/gcc/config/rs6000/secureplt.h
|
||||||
|
@@ -18,3 +18,4 @@ along with GCC; see the file COPYING3. If not see
|
||||||
|
<http://www.gnu.org/licenses/>. */
|
||||||
|
|
||||||
|
#define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
|
||||||
|
+#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
|
||||||
|
diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
|
||||||
|
index 9917c2f..68365de 100644
|
||||||
|
--- a/gcc/config/rs6000/sysv4.h
|
||||||
|
+++ b/gcc/config/rs6000/sysv4.h
|
||||||
|
@@ -537,6 +537,9 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
|
||||||
|
#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 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
|
||||||
|
|
||||||
|
/* 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 "\
|
||||||
|
@@ -762,17 +766,23 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
|
||||||
|
|
||||||
|
#define LINK_START_LINUX_SPEC ""
|
||||||
|
|
||||||
|
+#define MUSL_DYNAMIC_LINKER_E ENDIAN_SELECT("","le","")
|
||||||
|
+
|
||||||
|
#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" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.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 +905,7 @@ ncrtn.o%s"
|
||||||
|
{ "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 }, \
|
||||||
|
@@ -949,3 +960,72 @@ ncrtn.o%s"
|
||||||
|
/* This target uses the sysv4.opt file. */
|
||||||
|
#define TARGET_USES_SYSV4_OPT 1
|
||||||
|
|
||||||
|
+/* Include order changes for musl, same as in generic linux.h. */
|
||||||
|
+#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 --git a/gcc/config/rs6000/sysv4le.h b/gcc/config/rs6000/sysv4le.h
|
||||||
|
index 7b1d6a1..064323c 100644
|
||||||
|
--- a/gcc/config/rs6000/sysv4le.h
|
||||||
|
+++ b/gcc/config/rs6000/sysv4le.h
|
||||||
|
@@ -35,3 +35,5 @@
|
||||||
|
/* Little-endian PowerPC64 Linux uses the ELF v2 ABI by default. */
|
||||||
|
#define LINUX64_DEFAULT_ABI_ELFv2
|
||||||
|
|
||||||
|
+#undef MUSL_DYNAMIC_LINKER_E
|
||||||
|
+#define MUSL_DYNAMIC_LINKER_E ENDIAN_SELECT("","le","le")
|
||||||
|
diff --git a/gcc/config/sh/linux.h b/gcc/config/sh/linux.h
|
||||||
|
index 0f5d614..4c167c6 100644
|
||||||
|
--- a/gcc/config/sh/linux.h
|
||||||
|
+++ b/gcc/config/sh/linux.h
|
||||||
|
@@ -43,6 +43,28 @@ along with GCC; see the file COPYING3. If not see
|
||||||
|
|
||||||
|
#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
|
||||||
|
|
||||||
|
+#if TARGET_ENDIAN_DEFAULT == MASK_LITTLE_ENDIAN
|
||||||
|
+#define MUSL_DYNAMIC_LINKER_E "%{mb:eb}"
|
||||||
|
+#else
|
||||||
|
+#define MUSL_DYNAMIC_LINKER_E "%{!ml:eb}"
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+#if TARGET_CPU_DEFAULT & ( MASK_HARD_SH2A_DOUBLE | MASK_SH4 )
|
||||||
|
+/* "-nofpu" if any nofpu option is specified */
|
||||||
|
+#define MUSL_DYNAMIC_LINKER_FP \
|
||||||
|
+ "%{m1|m2|m2a-nofpu|m3|m4-nofpu|m4-100-nofpu|m4-200-nofpu|m4-300-nofpu|" \
|
||||||
|
+ "m4-340|m4-400|m4-500|m4al|m5-32media-nofpu|m5-64media-nofpu|" \
|
||||||
|
+ "m5-compact-nofpu:-nofpu}"
|
||||||
|
+#else
|
||||||
|
+/* "-nofpu" if none of the hard fpu options are specified */
|
||||||
|
+#define MUSL_DYNAMIC_LINKER_FP \
|
||||||
|
+ "%{m2a|m4|m4-100|m4-200|m4-300|m4a|m5-32media|m5-64media|m5-compact:;:-nofpu}"
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+#undef MUSL_DYNAMIC_LINKER
|
||||||
|
+#define MUSL_DYNAMIC_LINKER \
|
||||||
|
+ "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E MUSL_DYNAMIC_LINKER_FP ".so.1"
|
||||||
|
+
|
||||||
|
#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
|
||||||
|
|
||||||
|
#undef SUBTARGET_LINK_EMUL_SUFFIX
|
||||||
|
diff --git a/gcc/configure b/gcc/configure
|
||||||
|
index 0037240..66aab9f 100755
|
||||||
|
--- a/gcc/configure
|
||||||
|
+++ b/gcc/configure
|
||||||
|
@@ -27742,6 +27742,9 @@ if test "${gcc_cv_libc_provides_ssp+set}" = set; then :
|
||||||
|
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 @@ fi
|
||||||
|
# <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 @@ case "$target" in
|
||||||
|
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 --git a/gcc/configure.ac b/gcc/configure.ac
|
||||||
|
index 6f38ba1..b81960c 100644
|
||||||
|
--- a/gcc/configure.ac
|
||||||
|
+++ b/gcc/configure.ac
|
||||||
|
@@ -5229,6 +5229,9 @@ AC_CACHE_CHECK(__stack_chk_fail in target C library,
|
||||||
|
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 @@ AC_CACHE_CHECK(__stack_chk_fail in target C library,
|
||||||
|
# <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 @@ case "$target" in
|
||||||
|
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 --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
|
||||||
|
index f84a199..ee9765b 100644
|
||||||
|
--- a/gcc/doc/invoke.texi
|
||||||
|
+++ b/gcc/doc/invoke.texi
|
||||||
|
@@ -667,7 +667,7 @@ Objective-C and Objective-C++ Dialects}.
|
||||||
|
-mcpu=@var{cpu}}
|
||||||
|
|
||||||
|
@emph{GNU/Linux Options}
|
||||||
|
-@gccoptlist{-mglibc -muclibc -mbionic -mandroid @gol
|
||||||
|
+@gccoptlist{-mglibc -muclibc -mmusl -mbionic -mandroid @gol
|
||||||
|
-tno-android-cc -tno-android-ld}
|
||||||
|
|
||||||
|
@emph{H8/300 Options}
|
||||||
|
@@ -15324,13 +15324,19 @@ These @samp{-m} options are defined for GNU/Linux targets:
|
||||||
|
@item -mglibc
|
||||||
|
@opindex mglibc
|
||||||
|
Use the GNU C library. This is the default except
|
||||||
|
-on @samp{*-*-linux-*uclibc*} and @samp{*-*-linux-*android*} targets.
|
||||||
|
+on @samp{*-*-linux-*uclibc*}, @samp{*-*-linux-*musl*} and
|
||||||
|
+@samp{*-*-linux-*android*} targets.
|
||||||
|
|
||||||
|
@item -muclibc
|
||||||
|
@opindex muclibc
|
||||||
|
Use uClibc C library. This is the default on
|
||||||
|
@samp{*-*-linux-*uclibc*} targets.
|
||||||
|
|
||||||
|
+@item -mmusl
|
||||||
|
+@opindex mmusl
|
||||||
|
+Use the musl C library. This is the default on
|
||||||
|
+@samp{*-*-linux-*musl*} targets.
|
||||||
|
+
|
||||||
|
@item -mbionic
|
||||||
|
@opindex mbionic
|
||||||
|
Use Bionic C library. This is the default on
|
||||||
|
diff --git a/libcilkrts/runtime/os-unix.c b/libcilkrts/runtime/os-unix.c
|
||||||
|
index cb582dd..e43d7d5 100644
|
||||||
|
--- a/libcilkrts/runtime/os-unix.c
|
||||||
|
+++ b/libcilkrts/runtime/os-unix.c
|
||||||
|
@@ -51,6 +51,7 @@
|
||||||
|
#if defined __linux__
|
||||||
|
# include <sys/sysinfo.h>
|
||||||
|
# include <sys/syscall.h>
|
||||||
|
+# include <sched.h>
|
||||||
|
#elif defined __APPLE__
|
||||||
|
# include <sys/sysctl.h>
|
||||||
|
// Uses sysconf(_SC_NPROCESSORS_ONLN) in verbose output
|
||||||
|
@@ -400,28 +401,19 @@ COMMON_SYSDEP void __cilkrts_sleep(void)
|
||||||
|
|
||||||
|
COMMON_SYSDEP void __cilkrts_yield(void)
|
||||||
|
{
|
||||||
|
-#if __APPLE__ || __FreeBSD__ || __VXWORKS__
|
||||||
|
- // On MacOS, call sched_yield to yield quantum. I'm not sure why we
|
||||||
|
- // don't do this on Linux also.
|
||||||
|
- sched_yield();
|
||||||
|
-#elif defined(__DragonFly__)
|
||||||
|
- // On DragonFly BSD, call sched_yield to yield quantum.
|
||||||
|
- sched_yield();
|
||||||
|
-#elif defined(__MIC__)
|
||||||
|
+#if defined(__MIC__)
|
||||||
|
// On MIC, pthread_yield() really trashes things. Arch's measurements
|
||||||
|
// showed that calling _mm_delay_32() (or doing nothing) was a better
|
||||||
|
// option. Delaying 1024 clock cycles is a reasonable compromise between
|
||||||
|
// giving up the processor and latency starting up when work becomes
|
||||||
|
// available
|
||||||
|
_mm_delay_32(1024);
|
||||||
|
-#elif defined(__ANDROID__) || (defined(__sun__) && defined(__svr4__))
|
||||||
|
- // On Android and Solaris, call sched_yield to yield quantum. I'm not
|
||||||
|
- // sure why we don't do this on Linux also.
|
||||||
|
- sched_yield();
|
||||||
|
-#else
|
||||||
|
- // On Linux, call pthread_yield (which in turn will call sched_yield)
|
||||||
|
- // to yield quantum.
|
||||||
|
+#elif defined(__sun__) && !defined(__svr4__)
|
||||||
|
+ // On old SunOS call pthread_yield to yield a quantum.
|
||||||
|
pthread_yield();
|
||||||
|
+#else
|
||||||
|
+ // On other platforms call sched_yield to yield a quantum.
|
||||||
|
+ sched_yield();
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/libgcc/unwind-dw2-fde-dip.c b/libgcc/unwind-dw2-fde-dip.c
|
||||||
|
index e1e566b..137dced 100644
|
||||||
|
--- a/libgcc/unwind-dw2-fde-dip.c
|
||||||
|
+++ b/libgcc/unwind-dw2-fde-dip.c
|
||||||
|
@@ -59,6 +59,12 @@
|
||||||
|
|
||||||
|
#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
|
||||||
|
&& defined(TARGET_DL_ITERATE_PHDR) \
|
||||||
|
+ && defined(__linux__)
|
||||||
|
+# define USE_PT_GNU_EH_FRAME
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
|
||||||
|
+ && defined(TARGET_DL_ITERATE_PHDR) \
|
||||||
|
&& (defined(__DragonFly__) || defined(__FreeBSD__))
|
||||||
|
# define ElfW __ElfN
|
||||||
|
# define USE_PT_GNU_EH_FRAME
|
||||||
|
diff --git a/libgfortran/acinclude.m4 b/libgfortran/acinclude.m4
|
||||||
|
index ba890f9..30b8b1a6 100644
|
||||||
|
--- a/libgfortran/acinclude.m4
|
||||||
|
+++ b/libgfortran/acinclude.m4
|
||||||
|
@@ -100,7 +100,7 @@ void foo (void);
|
||||||
|
[Define to 1 if the target supports #pragma weak])
|
||||||
|
fi
|
||||||
|
case "$host" in
|
||||||
|
- *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* )
|
||||||
|
+ *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* | *-*-musl* )
|
||||||
|
AC_DEFINE(GTHREAD_USE_WEAK, 0,
|
||||||
|
[Define to 0 if the target shouldn't use #pragma weak])
|
||||||
|
;;
|
||||||
|
diff --git a/libgfortran/configure b/libgfortran/configure
|
||||||
|
index e1592f7..07542e1 100755
|
||||||
|
--- a/libgfortran/configure
|
||||||
|
+++ b/libgfortran/configure
|
||||||
|
@@ -26447,7 +26447,7 @@ $as_echo "#define SUPPORTS_WEAK 1" >>confdefs.h
|
||||||
|
|
||||||
|
fi
|
||||||
|
case "$host" in
|
||||||
|
- *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* )
|
||||||
|
+ *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* | *-*-musl* )
|
||||||
|
|
||||||
|
$as_echo "#define GTHREAD_USE_WEAK 0" >>confdefs.h
|
||||||
|
|
||||||
|
diff --git a/libitm/config/arm/hwcap.cc b/libitm/config/arm/hwcap.cc
|
||||||
|
index a1c2cfd..ea8f023 100644
|
||||||
|
--- a/libitm/config/arm/hwcap.cc
|
||||||
|
+++ b/libitm/config/arm/hwcap.cc
|
||||||
|
@@ -40,7 +40,7 @@ int GTM_hwcap HIDDEN = 0
|
||||||
|
|
||||||
|
#ifdef __linux__
|
||||||
|
#include <unistd.h>
|
||||||
|
-#include <sys/fcntl.h>
|
||||||
|
+#include <fcntl.h>
|
||||||
|
#include <elf.h>
|
||||||
|
|
||||||
|
static void __attribute__((constructor))
|
||||||
|
diff --git a/libitm/config/linux/x86/tls.h b/libitm/config/linux/x86/tls.h
|
||||||
|
index e731ab7..54ad8b6 100644
|
||||||
|
--- a/libitm/config/linux/x86/tls.h
|
||||||
|
+++ b/libitm/config/linux/x86/tls.h
|
||||||
|
@@ -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 @@ static inline void set_abi_disp(struct abi_dispatch *x)
|
||||||
|
|
||||||
|
} // namespace GTM
|
||||||
|
#endif /* >= GLIBC 2.10 */
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#endif // LIBITM_X86_TLS_H
|
||||||
|
diff --git a/libstdc++-v3/config/os/generic/os_defines.h b/libstdc++-v3/config/os/generic/os_defines.h
|
||||||
|
index 45bf52a..103ec0e 100644
|
||||||
|
--- a/libstdc++-v3/config/os/generic/os_defines.h
|
||||||
|
+++ b/libstdc++-v3/config/os/generic/os_defines.h
|
||||||
|
@@ -33,4 +33,9 @@
|
||||||
|
// System-specific #define, typedefs, corrections, etc, go here. This
|
||||||
|
// file will come before all others.
|
||||||
|
|
||||||
|
+// Disable the weak reference logic in gthr.h for os/generic because it
|
||||||
|
+// is broken on every platform unless there is implementation specific
|
||||||
|
+// workaround in gthr-posix.h and at link-time for static linking.
|
||||||
|
+#define _GLIBCXX_GTHREAD_USE_WEAK 0
|
||||||
|
+
|
||||||
|
#endif
|
||||||
|
diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
|
||||||
|
index 640199c..106134e 100644
|
||||||
|
--- a/libstdc++-v3/configure.host
|
||||||
|
+++ b/libstdc++-v3/configure.host
|
||||||
|
@@ -273,6 +273,9 @@ case "${host_os}" in
|
||||||
|
freebsd*)
|
||||||
|
os_include_dir="os/bsd/freebsd"
|
||||||
|
;;
|
||||||
|
+ linux-musl*)
|
||||||
|
+ os_include_dir="os/generic"
|
||||||
|
+ ;;
|
||||||
|
gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
|
||||||
|
if [ "$uclibc" = "yes" ]; then
|
||||||
|
os_include_dir="os/uclibc"
|
||||||
|
|
@ -0,0 +1,138 @@
|
||||||
|
--- a/gcc/config/sh/sh-protos.h
|
||||||
|
+++ a/gcc/config/sh/sh-protos.h
|
||||||
|
@@ -159,6 +159,7 @@ extern int sh_eval_treg_value (rtx op);
|
||||||
|
extern HOST_WIDE_INT sh_disp_addr_displacement (rtx mem_op);
|
||||||
|
extern int sh_max_mov_insn_displacement (machine_mode mode, bool consider_sh2a);
|
||||||
|
extern bool sh_movsf_ie_ra_split_p (rtx, rtx, rtx);
|
||||||
|
+extern void sh_expand_sym_label2reg (rtx, rtx, rtx, bool);
|
||||||
|
|
||||||
|
/* Result value of sh_find_set_of_reg. */
|
||||||
|
struct set_of_reg
|
||||||
|
--- a/gcc/config/sh/sh.c
|
||||||
|
+++ a/gcc/config/sh/sh.c
|
||||||
|
@@ -1604,6 +1604,10 @@ sh_asm_output_addr_const_extra (FILE *file, rtx x)
|
||||||
|
output_addr_const (file, XVECEXP (x, 0, 0));
|
||||||
|
fputs ("@GOTPLT", file);
|
||||||
|
break;
|
||||||
|
+ case UNSPEC_PCREL:
|
||||||
|
+ output_addr_const (file, XVECEXP (x, 0, 0));
|
||||||
|
+ fputs ("@PCREL", file);
|
||||||
|
+ break;
|
||||||
|
case UNSPEC_DTPOFF:
|
||||||
|
output_addr_const (file, XVECEXP (x, 0, 0));
|
||||||
|
fputs ("@DTPOFF", file);
|
||||||
|
@@ -10441,6 +10445,7 @@ nonpic_symbol_mentioned_p (rtx x)
|
||||||
|
|| XINT (x, 1) == UNSPEC_DTPOFF
|
||||||
|
|| XINT (x, 1) == UNSPEC_TPOFF
|
||||||
|
|| XINT (x, 1) == UNSPEC_PLT
|
||||||
|
+ || XINT (x, 1) == UNSPEC_PCREL
|
||||||
|
|| XINT (x, 1) == UNSPEC_SYMOFF
|
||||||
|
|| XINT (x, 1) == UNSPEC_PCREL_SYMOFF))
|
||||||
|
return false;
|
||||||
|
@@ -10714,7 +10719,8 @@ sh_delegitimize_address (rtx orig_x)
|
||||||
|
rtx symplt = XEXP (XVECEXP (y, 0, 0), 0);
|
||||||
|
|
||||||
|
if (GET_CODE (symplt) == UNSPEC
|
||||||
|
- && XINT (symplt, 1) == UNSPEC_PLT)
|
||||||
|
+ && (XINT (symplt, 1) == UNSPEC_PLT
|
||||||
|
+ || XINT (symplt, 1) == UNSPEC_PCREL))
|
||||||
|
return XVECEXP (symplt, 0, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -11702,9 +11708,24 @@ sh_function_ok_for_sibcall (tree decl, tree exp ATTRIBUTE_UNUSED)
|
||||||
|
|| crtl->args.info.stack_regs == 0)
|
||||||
|
&& ! sh_cfun_interrupt_handler_p ()
|
||||||
|
&& (! flag_pic
|
||||||
|
- || (decl && ! TREE_PUBLIC (decl))
|
||||||
|
+ || (decl && ! (TREE_PUBLIC (decl) || DECL_WEAK (decl)))
|
||||||
|
|| (decl && DECL_VISIBILITY (decl) != VISIBILITY_DEFAULT)));
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+/* Expand to appropriate sym*_label2reg for SYM and SIBCALL_P. */
|
||||||
|
+void
|
||||||
|
+sh_expand_sym_label2reg (rtx reg, rtx sym, rtx lab, bool sibcall_p)
|
||||||
|
+{
|
||||||
|
+ const_tree decl = SYMBOL_REF_DECL (sym);
|
||||||
|
+ bool is_weak = (decl && DECL_P (decl) && DECL_WEAK (decl));
|
||||||
|
+
|
||||||
|
+ if (!is_weak && SYMBOL_REF_LOCAL_P (sym))
|
||||||
|
+ emit_insn (gen_sym_label2reg (reg, sym, lab));
|
||||||
|
+ else if (sibcall_p)
|
||||||
|
+ emit_insn (gen_symPCREL_label2reg (reg, sym, lab));
|
||||||
|
+ else
|
||||||
|
+ emit_insn (gen_symPLT_label2reg (reg, sym, lab));
|
||||||
|
+}
|
||||||
|
|
||||||
|
/* Machine specific built-in functions. */
|
||||||
|
|
||||||
|
--- a/gcc/config/sh/sh.md
|
||||||
|
+++ a/gcc/config/sh/sh.md
|
||||||
|
@@ -135,6 +135,7 @@
|
||||||
|
UNSPEC_PLT
|
||||||
|
UNSPEC_CALLER
|
||||||
|
UNSPEC_GOTPLT
|
||||||
|
+ UNSPEC_PCREL
|
||||||
|
UNSPEC_ICACHE
|
||||||
|
UNSPEC_INIT_TRAMP
|
||||||
|
UNSPEC_FCOSA
|
||||||
|
@@ -9470,11 +9471,8 @@ label:
|
||||||
|
[(const_int 0)]
|
||||||
|
{
|
||||||
|
rtx lab = PATTERN (gen_call_site ());
|
||||||
|
-
|
||||||
|
- if (SYMBOL_REF_LOCAL_P (operands[0]))
|
||||||
|
- emit_insn (gen_sym_label2reg (operands[2], operands[0], lab));
|
||||||
|
- else
|
||||||
|
- emit_insn (gen_symPLT_label2reg (operands[2], operands[0], lab));
|
||||||
|
+
|
||||||
|
+ sh_expand_sym_label2reg (operands[2], operands[0], lab, false);
|
||||||
|
emit_call_insn (gen_calli_pcrel (operands[2], operands[1], copy_rtx (lab)));
|
||||||
|
DONE;
|
||||||
|
}
|
||||||
|
@@ -9605,10 +9603,7 @@ label:
|
||||||
|
{
|
||||||
|
rtx lab = PATTERN (gen_call_site ());
|
||||||
|
|
||||||
|
- if (SYMBOL_REF_LOCAL_P (operands[1]))
|
||||||
|
- emit_insn (gen_sym_label2reg (operands[3], operands[1], lab));
|
||||||
|
- else
|
||||||
|
- emit_insn (gen_symPLT_label2reg (operands[3], operands[1], lab));
|
||||||
|
+ sh_expand_sym_label2reg (operands[3], operands[1], lab, false);
|
||||||
|
emit_call_insn (gen_call_valuei_pcrel (operands[0], operands[3],
|
||||||
|
operands[2], copy_rtx (lab)));
|
||||||
|
DONE;
|
||||||
|
@@ -10008,7 +10003,7 @@ label:
|
||||||
|
rtx lab = PATTERN (gen_call_site ());
|
||||||
|
rtx call_insn;
|
||||||
|
|
||||||
|
- emit_insn (gen_sym_label2reg (operands[2], operands[0], lab));
|
||||||
|
+ sh_expand_sym_label2reg (operands[2], operands[0], lab, true);
|
||||||
|
call_insn = emit_call_insn (gen_sibcalli_pcrel (operands[2], operands[1],
|
||||||
|
copy_rtx (lab)));
|
||||||
|
SIBLING_CALL_P (call_insn) = 1;
|
||||||
|
@@ -10200,7 +10195,7 @@ label:
|
||||||
|
rtx lab = PATTERN (gen_call_site ());
|
||||||
|
rtx call_insn;
|
||||||
|
|
||||||
|
- emit_insn (gen_sym_label2reg (operands[3], operands[1], lab));
|
||||||
|
+ sh_expand_sym_label2reg (operands[3], operands[1], lab, true);
|
||||||
|
call_insn = emit_call_insn (gen_sibcall_valuei_pcrel (operands[0],
|
||||||
|
operands[3],
|
||||||
|
operands[2],
|
||||||
|
@@ -10748,6 +10743,16 @@ label:
|
||||||
|
UNSPEC_SYMOFF)))]
|
||||||
|
"TARGET_SH1" "")
|
||||||
|
|
||||||
|
+(define_expand "symPCREL_label2reg"
|
||||||
|
+ [(set (match_operand:SI 0 "" "")
|
||||||
|
+ (const:SI
|
||||||
|
+ (unspec:SI
|
||||||
|
+ [(const:SI (unspec:SI [(match_operand:SI 1 "" "")] UNSPEC_PCREL))
|
||||||
|
+ (const:SI (plus:SI (match_operand:SI 2 "" "")
|
||||||
|
+ (const_int 2)))] UNSPEC_PCREL_SYMOFF)))]
|
||||||
|
+ "TARGET_SH1"
|
||||||
|
+ "")
|
||||||
|
+
|
||||||
|
(define_expand "symGOT_load"
|
||||||
|
[(set (match_dup 2) (match_operand 1 "" ""))
|
||||||
|
(set (match_dup 3) (plus (match_dup 2) (reg PIC_REG)))
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- gcc-5.2.0.orig/gcc/config.gcc
|
||||||
|
+++ gcc-5.2.0/gcc/config.gcc
|
||||||
|
@@ -4096,7 +4099,7 @@
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
|
||||||
|
- sh[123456ble]-*-* | sh-*-*)
|
||||||
|
+ sh[123456ble]*-*-* | sh-*-*)
|
||||||
|
supported_defaults="cpu"
|
||||||
|
case "`echo $with_cpu | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ_ abcdefghijklmnopqrstuvwxyz- | sed s/sh/m/`" in
|
||||||
|
"" | m1 | m2 | m2e | m3 | m3e | m4 | m4-single | m4-single-only | m4-nofpu )
|
||||||
|
|
@ -0,0 +1,91 @@
|
||||||
|
--- gcc-5.2.0.orig/gcc/config.gcc
|
||||||
|
+++ gcc-5.2.0/gcc/config.gcc
|
||||||
|
@@ -2668,7 +2671,7 @@
|
||||||
|
sh2a-single-only | sh2a-single | sh2a-nofpu | sh2a | \
|
||||||
|
sh4a-single-only | sh4a-single | sh4a-nofpu | sh4a | sh4al | \
|
||||||
|
sh4-single-only | sh4-single | sh4-nofpu | sh4 | sh4-300 | \
|
||||||
|
- sh3e | sh3 | sh2e | sh2 | sh1) ;;
|
||||||
|
+ sh3e | sh3 | sh2e | sh2 | sh1 | shj2 ) ;;
|
||||||
|
"") sh_cpu_default=${sh_cpu_target} ;;
|
||||||
|
*) echo "with_cpu=$with_cpu not supported"; exit 1 ;;
|
||||||
|
esac
|
||||||
|
@@ -2687,9 +2690,9 @@
|
||||||
|
sh_multilibs="`echo $sh_multilibs|sed -e s/m4/sh4-nofpu/ -e s/,m4-[^,]*//g -e s/,m[23]e// -e s/m2a,m2a-single/m2a-nofpu/ -e s/m5-..m....,//g`"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
- target_cpu_default=SELECT_`echo ${sh_cpu_default}|tr abcdefghijklmnopqrstuvwxyz- ABCDEFGHIJKLMNOPQRSTUVWXYZ_`
|
||||||
|
+ target_cpu_default=SELECT_`echo ${sh_cpu_default}|sed 's/^shj/j/'|tr abcdefghijklmnopqrstuvwxyz- ABCDEFGHIJKLMNOPQRSTUVWXYZ_`
|
||||||
|
tm_defines=${tm_defines}' SH_MULTILIB_CPU_DEFAULT=\"'`echo $sh_cpu_default|sed s/sh/m/`'\"'
|
||||||
|
- tm_defines="$tm_defines SUPPORT_`echo $sh_cpu_default | sed 's/^m/sh/' | tr abcdefghijklmnopqrstuvwxyz- ABCDEFGHIJKLMNOPQRSTUVWXYZ_`=1"
|
||||||
|
+ tm_defines="$tm_defines SUPPORT_`echo $sh_cpu_default | sed -e 's/^m/sh/' -e 's/^shj/j/' | tr abcdefghijklmnopqrstuvwxyz- ABCDEFGHIJKLMNOPQRSTUVWXYZ_`=1"
|
||||||
|
sh_multilibs=`echo $sh_multilibs | sed -e 's/,/ /g' -e 's/^[Ss][Hh]/m/' -e 's/ [Ss][Hh]/ m/g' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ_ abcdefghijklmnopqrstuvwxyz-`
|
||||||
|
for sh_multilib in ${sh_multilibs}; do
|
||||||
|
case ${sh_multilib} in
|
||||||
|
@@ -4106,6 +4109,8 @@
|
||||||
|
;;
|
||||||
|
m4a | m4a-single | m4a-single-only | m4a-nofpu | m4al)
|
||||||
|
;;
|
||||||
|
+ mj2)
|
||||||
|
+ ;;
|
||||||
|
*)
|
||||||
|
echo "Unknown CPU used in --with-cpu=$with_cpu, known values:" 1>&2
|
||||||
|
echo "m1 m2 m2e m3 m3e m4 m4-single m4-single-only m4-nofpu" 1>&2
|
||||||
|
--- gcc-5.2.0.orig/gcc/config/sh/sh.h
|
||||||
|
+++ gcc-5.2.0/gcc/config/sh/sh.h
|
||||||
|
@@ -139,6 +139,7 @@
|
||||||
|
#define SELECT_SH2A_SINGLE (MASK_SH_E | MASK_HARD_SH2A \
|
||||||
|
| MASK_FPU_SINGLE | MASK_HARD_SH2A_DOUBLE \
|
||||||
|
| MASK_SH2 | MASK_SH1)
|
||||||
|
+#define SELECT_J2 (MASK_SH2 | MASK_J2 | SELECT_SH1)
|
||||||
|
#define SELECT_SH3 (MASK_SH3 | SELECT_SH2)
|
||||||
|
#define SELECT_SH3E (MASK_SH_E | MASK_FPU_SINGLE | SELECT_SH3)
|
||||||
|
#define SELECT_SH4_NOFPU (MASK_HARD_SH4 | SELECT_SH3)
|
||||||
|
@@ -162,6 +163,9 @@
|
||||||
|
#define SUPPORT_SH2 1
|
||||||
|
#endif
|
||||||
|
#if SUPPORT_SH2
|
||||||
|
+#define SUPPORT_J2 1
|
||||||
|
+#endif
|
||||||
|
+#ifdef SUPPORT_J2
|
||||||
|
#define SUPPORT_SH3 1
|
||||||
|
#define SUPPORT_SH2A_NOFPU 1
|
||||||
|
#endif
|
||||||
|
@@ -211,7 +215,7 @@
|
||||||
|
#define MASK_ARCH (MASK_SH1 | MASK_SH2 | MASK_SH3 | MASK_SH_E | MASK_SH4 \
|
||||||
|
| MASK_HARD_SH2A | MASK_HARD_SH2A_DOUBLE | MASK_SH4A \
|
||||||
|
| MASK_HARD_SH4 | MASK_FPU_SINGLE | MASK_SH5 \
|
||||||
|
- | MASK_FPU_SINGLE_ONLY)
|
||||||
|
+ | MASK_FPU_SINGLE_ONLY | MASK_J2)
|
||||||
|
|
||||||
|
/* This defaults us to big-endian. */
|
||||||
|
#ifndef TARGET_ENDIAN_DEFAULT
|
||||||
|
@@ -271,6 +275,7 @@
|
||||||
|
%(subtarget_asm_isa_spec) %(subtarget_asm_spec) \
|
||||||
|
%{m1:--isa=sh} \
|
||||||
|
%{m2:--isa=sh2} \
|
||||||
|
+%{mj2:--isa=any} \
|
||||||
|
%{m2e:--isa=sh2e} \
|
||||||
|
%{m3:--isa=sh3} \
|
||||||
|
%{m3e:--isa=sh3e} \
|
||||||
|
@@ -1834,7 +1839,7 @@
|
||||||
|
|
||||||
|
/* Nonzero if the target supports dynamic shift instructions
|
||||||
|
like shad and shld. */
|
||||||
|
-#define TARGET_DYNSHIFT (TARGET_SH3 || TARGET_SH2A)
|
||||||
|
+#define TARGET_DYNSHIFT (TARGET_SH3 || TARGET_SH2A || TARGET_J2)
|
||||||
|
|
||||||
|
/* The cost of using the dynamic shift insns (shad, shld) are the same
|
||||||
|
if they are available. If they are not available a library function will
|
||||||
|
--- gcc-5.2.0.orig/gcc/config/sh/sh.opt
|
||||||
|
+++ gcc-5.2.0/gcc/config/sh/sh.opt
|
||||||
|
@@ -71,6 +71,10 @@
|
||||||
|
Target RejectNegative Condition(SUPPORT_SH2E)
|
||||||
|
Generate SH2e code
|
||||||
|
|
||||||
|
+mj2
|
||||||
|
+Target RejectNegative Mask(J2) Condition(SUPPORT_J2)
|
||||||
|
+Generate J2 code
|
||||||
|
+
|
||||||
|
m3
|
||||||
|
Target RejectNegative Mask(SH3) Condition(SUPPORT_SH3)
|
||||||
|
Generate SH3 code
|
||||||
|
|
@ -0,0 +1,24 @@
|
||||||
|
--- gcc-5.2.0.orig/gcc/config/gnu-user.h 2015-01-05 12:33:28.000000000 +0000
|
||||||
|
+++ gcc-5.2.0/gcc/config/gnu-user.h 2015-08-25 08:15:18.354957759 +0000
|
||||||
|
@@ -42,8 +42,8 @@
|
||||||
|
|
||||||
|
#if defined HAVE_LD_PIE
|
||||||
|
#define GNU_USER_TARGET_STARTFILE_SPEC \
|
||||||
|
- "%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \
|
||||||
|
- crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s} \
|
||||||
|
+ "%{!shared: %{pg|p|profile:gcrt1.o%s;pie:%{static:rcrt1.o%s;:Scrt1.o%s};:crt1.o%s}} \
|
||||||
|
+ crti.o%s %{shared|pie:crtbeginS.o%s;static:crtbeginT.o%s;:crtbegin.o%s} \
|
||||||
|
%{fvtable-verify=none:%s; \
|
||||||
|
fvtable-verify=preinit:vtv_start_preinit.o%s; \
|
||||||
|
fvtable-verify=std:vtv_start.o%s}"
|
||||||
|
--- gcc-5.2.0.orig/gcc/config/sh/linux.h 2015-01-05 12:33:28.000000000 +0000
|
||||||
|
+++ gcc-5.2.0/gcc/config/sh/linux.h 2015-08-25 07:57:14.161690536 +0000
|
||||||
|
@@ -53,7 +75,7 @@
|
||||||
|
%{!static: \
|
||||||
|
%{rdynamic:-export-dynamic} \
|
||||||
|
-dynamic-linker " GNU_USER_DYNAMIC_LINKER "} \
|
||||||
|
- %{static:-static}"
|
||||||
|
+ %{static:-static -E --no-dynamic-linker}"
|
||||||
|
|
||||||
|
/* Output assembler code to STREAM to call the profiler. */
|
||||||
|
#undef FUNCTION_PROFILER
|
||||||
|
|
@ -0,0 +1,19 @@
|
||||||
|
--- gcc-5.2.0.orig/gcc/gcc.c 2015-03-10 09:37:41.000000000 +0000
|
||||||
|
+++ gcc-5.2.0/gcc/gcc.c 2015-08-25 07:47:12.895060530 +0000
|
||||||
|
@@ -1012,10 +1012,15 @@
|
||||||
|
#define CILK_SELF_SPECS "%{fcilkplus: -pthread}"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+/* Default to PIE */
|
||||||
|
+#ifndef PIE_SELF_SPECS
|
||||||
|
+#define PIE_SELF_SPECS "%{shared|pie|r|nostdlib|nopie:;:-pie} %{fpic|fPIC|fpie|fPIE|fno-pic|fno-PIC|fno-pie|fno-PIE|D__KERNEL__:;:-fPIE}"
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
static const char *const driver_self_specs[] = {
|
||||||
|
"%{fdump-final-insns:-fdump-final-insns=.} %<fdump-final-insns",
|
||||||
|
DRIVER_SELF_SPECS, CONFIGURE_SPECS, GOMP_SELF_SPECS, GTM_SELF_SPECS,
|
||||||
|
- CILK_SELF_SPECS
|
||||||
|
+ CILK_SELF_SPECS, PIE_SELF_SPECS
|
||||||
|
};
|
||||||
|
|
||||||
|
#ifndef OPTION_DEFAULT_SPECS
|
||||||
|
|
@ -0,0 +1,2 @@
|
||||||
|
$(patsubst %.c,%.o,$(wildcard src/complex/*.c)): CFLAGS += -fno-optimize-sibling-calls
|
||||||
|
$(patsubst %.c,%.lo,$(wildcard src/complex/*.c)): CFLAGS += -fno-optimize-sibling-calls
|
||||||
Loading…
Reference in New Issue