From aec25e57eb659880bfd3589462cbe7b38f36ee59 Mon Sep 17 00:00:00 2001 From: rofl0r Date: Thu, 26 Nov 2020 22:49:44 +0000 Subject: [PATCH] add GCC 9.4.0 0017-pr93402.diff was dropped, as it was merged upstream. --- hashes/gcc-9.4.0.tar.xz.sha1 | 1 + patches/gcc-9.4.0/0001-ssp_nonshared.diff | 14 + patches/gcc-9.4.0/0002-posix_memalign.diff | 30 ++ .../gcc-9.4.0/0003-libatomic-test-fix.diff | 58 +++ patches/gcc-9.4.0/0004-libgomp-test-fix.diff | 61 +++ patches/gcc-9.4.0/0005-libitm-test-fix.diff | 58 +++ patches/gcc-9.4.0/0006-libvtv-test-fix.diff | 58 +++ patches/gcc-9.4.0/0007-j2.diff | 346 ++++++++++++++++++ patches/gcc-9.4.0/0008-s390x-muslldso.diff | 14 + .../gcc-9.4.0/0009-microblaze-pr65649.diff | 22 ++ patches/gcc-9.4.0/0010-ldbl128-config.diff | 63 ++++ patches/gcc-9.4.0/0011-m68k.diff | 27 ++ patches/gcc-9.4.0/0012-static-pie.diff | 86 +++++ patches/gcc-9.4.0/0013-invalid-tls-model.diff | 28 ++ .../0014-fix-gthr-weak-refs-for-libgcc.patch | 51 +++ .../gcc-9.4.0/0015-riscv-tls-copy-relocs.diff | 16 + .../0016-libstdc++-futex-time64.diff | 18 + patches/gcc-9.4.0/0018-m68k-sqrt.diff | 18 + 18 files changed, 969 insertions(+) create mode 100644 hashes/gcc-9.4.0.tar.xz.sha1 create mode 100644 patches/gcc-9.4.0/0001-ssp_nonshared.diff create mode 100644 patches/gcc-9.4.0/0002-posix_memalign.diff create mode 100644 patches/gcc-9.4.0/0003-libatomic-test-fix.diff create mode 100644 patches/gcc-9.4.0/0004-libgomp-test-fix.diff create mode 100644 patches/gcc-9.4.0/0005-libitm-test-fix.diff create mode 100644 patches/gcc-9.4.0/0006-libvtv-test-fix.diff create mode 100644 patches/gcc-9.4.0/0007-j2.diff create mode 100644 patches/gcc-9.4.0/0008-s390x-muslldso.diff create mode 100644 patches/gcc-9.4.0/0009-microblaze-pr65649.diff create mode 100644 patches/gcc-9.4.0/0010-ldbl128-config.diff create mode 100644 patches/gcc-9.4.0/0011-m68k.diff create mode 100644 patches/gcc-9.4.0/0012-static-pie.diff create mode 100644 patches/gcc-9.4.0/0013-invalid-tls-model.diff create mode 100644 patches/gcc-9.4.0/0014-fix-gthr-weak-refs-for-libgcc.patch create mode 100644 patches/gcc-9.4.0/0015-riscv-tls-copy-relocs.diff create mode 100644 patches/gcc-9.4.0/0016-libstdc++-futex-time64.diff create mode 100644 patches/gcc-9.4.0/0018-m68k-sqrt.diff diff --git a/hashes/gcc-9.4.0.tar.xz.sha1 b/hashes/gcc-9.4.0.tar.xz.sha1 new file mode 100644 index 0000000..7a70629 --- /dev/null +++ b/hashes/gcc-9.4.0.tar.xz.sha1 @@ -0,0 +1 @@ +bf6d6480fb32e5a28dac849449f533a84d4e6547 gcc-9.4.0.tar.xz diff --git a/patches/gcc-9.4.0/0001-ssp_nonshared.diff b/patches/gcc-9.4.0/0001-ssp_nonshared.diff new file mode 100644 index 0000000..b00ca70 --- /dev/null +++ b/patches/gcc-9.4.0/0001-ssp_nonshared.diff @@ -0,0 +1,14 @@ +diff --git a/gcc/gcc.c b/gcc/gcc.c +index 4f57765b012..d185c01b257 100644 +--- a/gcc/gcc.c ++++ b/gcc/gcc.c +@@ -878,7 +878,8 @@ proper position among the other output files. */ + #ifndef LINK_SSP_SPEC + #ifdef TARGET_LIBC_PROVIDES_SSP + #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ +- "|fstack-protector-strong|fstack-protector-explicit:}" ++ "|fstack-protector-strong|fstack-protector-explicit" \ ++ ":-lssp_nonshared}" + #else + #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ + "|fstack-protector-strong|fstack-protector-explicit" \ diff --git a/patches/gcc-9.4.0/0002-posix_memalign.diff b/patches/gcc-9.4.0/0002-posix_memalign.diff new file mode 100644 index 0000000..7f67f3d --- /dev/null +++ b/patches/gcc-9.4.0/0002-posix_memalign.diff @@ -0,0 +1,30 @@ +diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h +index 09a4d1447cb..fecd9afdb2e 100644 +--- a/gcc/config/i386/pmm_malloc.h ++++ b/gcc/config/i386/pmm_malloc.h +@@ -27,12 +27,13 @@ + #include + + /* We can't depend on since the prototype of posix_memalign +- may not be visible. */ ++ may not be visible and we can't pollute the namespace either. */ + #ifndef __cplusplus +-extern int posix_memalign (void **, size_t, size_t); ++extern int _mm_posix_memalign (void **, size_t, size_t) + #else +-extern "C" int posix_memalign (void **, size_t, size_t) throw (); ++extern "C" int _mm_posix_memalign (void **, size_t, size_t) throw () + #endif ++__asm__("posix_memalign"); + + static __inline void * + _mm_malloc (size_t __size, size_t __alignment) +@@ -42,7 +43,7 @@ _mm_malloc (size_t __size, size_t __alignment) + return malloc (__size); + if (__alignment == 2 || (sizeof (void *) == 8 && __alignment == 4)) + __alignment = sizeof (void *); +- if (posix_memalign (&__ptr, __alignment, __size) == 0) ++ if (_mm_posix_memalign (&__ptr, __alignment, __size) == 0) + return __ptr; + else + return NULL; diff --git a/patches/gcc-9.4.0/0003-libatomic-test-fix.diff b/patches/gcc-9.4.0/0003-libatomic-test-fix.diff new file mode 100644 index 0000000..71a19e8 --- /dev/null +++ b/patches/gcc-9.4.0/0003-libatomic-test-fix.diff @@ -0,0 +1,58 @@ +diff --git a/libatomic/testsuite/Makefile.am b/libatomic/testsuite/Makefile.am +index 41cfbc46e4b..16f82bdf691 100644 +--- a/libatomic/testsuite/Makefile.am ++++ b/libatomic/testsuite/Makefile.am +@@ -11,3 +11,9 @@ EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \ + _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \ + echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi) + RUNTEST = $(_RUNTEST) $(AM_RUNTESTFLAGS) ++ ++EXTRA_DEJAGNU_SITE_CONFIG = extra.exp ++ ++extra.exp: ++ echo 'set BUILD_CC "$(CC)"' > $@.tmp ++ mv $@.tmp $@ +diff --git a/libatomic/testsuite/Makefile.in b/libatomic/testsuite/Makefile.in +index 73b9d521225..2dccc4c5d21 100644 +--- a/libatomic/testsuite/Makefile.in ++++ b/libatomic/testsuite/Makefile.in +@@ -277,6 +277,7 @@ _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \ + echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi) + + RUNTEST = $(_RUNTEST) $(AM_RUNTESTFLAGS) ++EXTRA_DEJAGNU_SITE_CONFIG = extra.exp + all: all-am + + .SUFFIXES: +@@ -484,6 +485,10 @@ uninstall-am: + .PRECIOUS: Makefile + + ++extra.exp: ++ echo 'set BUILD_CC "$(CC)"' > $@.tmp ++ mv $@.tmp $@ ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff --git a/libatomic/testsuite/lib/libatomic.exp b/libatomic/testsuite/lib/libatomic.exp +index 38f3e5673e2..02ec2e8b48a 100644 +--- a/libatomic/testsuite/lib/libatomic.exp ++++ b/libatomic/testsuite/lib/libatomic.exp +@@ -77,6 +77,7 @@ proc libatomic_init { args } { + global ALWAYS_CFLAGS + global CFLAGS + global TOOL_EXECUTABLE TOOL_OPTIONS ++ global BUILD_CC + global GCC_UNDER_TEST + global TESTING_IN_BUILD_TREE + global target_triplet +@@ -92,6 +93,8 @@ proc libatomic_init { args } { + if ![info exists GCC_UNDER_TEST] then { + if [info exists TOOL_EXECUTABLE] { + set GCC_UNDER_TEST $TOOL_EXECUTABLE ++ } elseif [info exists BUILD_CC] { ++ set GCC_UNDER_TEST $BUILD_CC + } else { + set GCC_UNDER_TEST "[find_gcc]" + } diff --git a/patches/gcc-9.4.0/0004-libgomp-test-fix.diff b/patches/gcc-9.4.0/0004-libgomp-test-fix.diff new file mode 100644 index 0000000..a560f7b --- /dev/null +++ b/patches/gcc-9.4.0/0004-libgomp-test-fix.diff @@ -0,0 +1,61 @@ +diff --git a/libgomp/testsuite/Makefile.am b/libgomp/testsuite/Makefile.am +index 2100f49e53b..fa25b3a0604 100644 +--- a/libgomp/testsuite/Makefile.am ++++ b/libgomp/testsuite/Makefile.am +@@ -12,6 +12,12 @@ _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \ + echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi) + RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir + ++EXTRA_DEJAGNU_SITE_CONFIG = extra.exp ++ ++extra.exp: ++ echo 'set BUILD_CC "$(CC)"' > $@.tmp ++ mv $@.tmp $@ ++ + # Instead of directly in ../testsuite/libgomp-test-support.exp.in, the + # following variables have to be "routed through" this Makefile, for expansion + # of the several (Makefile) variables used therein. +diff --git a/libgomp/testsuite/Makefile.in b/libgomp/testsuite/Makefile.in +index 80315b15a7d..cdbf35695f7 100644 +--- a/libgomp/testsuite/Makefile.in ++++ b/libgomp/testsuite/Makefile.in +@@ -303,6 +303,7 @@ _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \ + echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi) + + RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir ++EXTRA_DEJAGNU_SITE_CONFIG = extra.exp + all: all-am + + .SUFFIXES: +@@ -464,6 +465,10 @@ uninstall-am: + .PRECIOUS: Makefile + + ++extra.exp: ++ echo 'set BUILD_CC "$(CC)"' > $@.tmp ++ mv $@.tmp $@ ++ + # Instead of directly in ../testsuite/libgomp-test-support.exp.in, the + # following variables have to be "routed through" this Makefile, for expansion + # of the several (Makefile) variables used therein. +diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp +index 14d9b5f1305..186b0ba0b57 100644 +--- a/libgomp/testsuite/lib/libgomp.exp ++++ b/libgomp/testsuite/lib/libgomp.exp +@@ -68,6 +68,7 @@ proc libgomp_init { args } { + global ALWAYS_CFLAGS + global CFLAGS + global TOOL_EXECUTABLE TOOL_OPTIONS ++ global BUILD_CC + global GCC_UNDER_TEST + global TESTING_IN_BUILD_TREE + global target_triplet +@@ -90,6 +91,8 @@ proc libgomp_init { args } { + if ![info exists GCC_UNDER_TEST] then { + if [info exists TOOL_EXECUTABLE] { + set GCC_UNDER_TEST $TOOL_EXECUTABLE ++ } elseif [info exists BUILD_CC] { ++ set GCC_UNDER_TEST $BUILD_CC + } else { + set GCC_UNDER_TEST "[find_gcc]" + } diff --git a/patches/gcc-9.4.0/0005-libitm-test-fix.diff b/patches/gcc-9.4.0/0005-libitm-test-fix.diff new file mode 100644 index 0000000..3abddbc --- /dev/null +++ b/patches/gcc-9.4.0/0005-libitm-test-fix.diff @@ -0,0 +1,58 @@ +diff --git a/libitm/testsuite/Makefile.am b/libitm/testsuite/Makefile.am +index 41cfbc46e4b..16f82bdf691 100644 +--- a/libitm/testsuite/Makefile.am ++++ b/libitm/testsuite/Makefile.am +@@ -11,3 +11,9 @@ EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \ + _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \ + echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi) + RUNTEST = $(_RUNTEST) $(AM_RUNTESTFLAGS) ++ ++EXTRA_DEJAGNU_SITE_CONFIG = extra.exp ++ ++extra.exp: ++ echo 'set BUILD_CC "$(CC)"' > $@.tmp ++ mv $@.tmp $@ +diff --git a/libitm/testsuite/Makefile.in b/libitm/testsuite/Makefile.in +index 991f02c0b3b..fa331cabfc4 100644 +--- a/libitm/testsuite/Makefile.in ++++ b/libitm/testsuite/Makefile.in +@@ -285,6 +285,7 @@ _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \ + echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi) + + RUNTEST = $(_RUNTEST) $(AM_RUNTESTFLAGS) ++EXTRA_DEJAGNU_SITE_CONFIG = extra.exp + all: all-am + + .SUFFIXES: +@@ -492,6 +493,10 @@ uninstall-am: + .PRECIOUS: Makefile + + ++extra.exp: ++ echo 'set BUILD_CC "$(CC)"' > $@.tmp ++ mv $@.tmp $@ ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff --git a/libitm/testsuite/lib/libitm.exp b/libitm/testsuite/lib/libitm.exp +index b3d247b9f98..47c2cd55dac 100644 +--- a/libitm/testsuite/lib/libitm.exp ++++ b/libitm/testsuite/lib/libitm.exp +@@ -77,6 +77,7 @@ proc libitm_init { args } { + global ALWAYS_CFLAGS + global CFLAGS + global TOOL_EXECUTABLE TOOL_OPTIONS ++ global BUILD_CC + global GCC_UNDER_TEST + global TESTING_IN_BUILD_TREE + global target_triplet +@@ -92,6 +93,8 @@ proc libitm_init { args } { + if ![info exists GCC_UNDER_TEST] then { + if [info exists TOOL_EXECUTABLE] { + set GCC_UNDER_TEST $TOOL_EXECUTABLE ++ } elseif [info exists BUILD_CC] { ++ set GCC_UNDER_TEST $BUILD_CC + } else { + set GCC_UNDER_TEST "[find_gcc]" + } diff --git a/patches/gcc-9.4.0/0006-libvtv-test-fix.diff b/patches/gcc-9.4.0/0006-libvtv-test-fix.diff new file mode 100644 index 0000000..060cc58 --- /dev/null +++ b/patches/gcc-9.4.0/0006-libvtv-test-fix.diff @@ -0,0 +1,58 @@ +diff --git a/libvtv/testsuite/Makefile.am b/libvtv/testsuite/Makefile.am +index 41cfbc46e4b..16f82bdf691 100644 +--- a/libvtv/testsuite/Makefile.am ++++ b/libvtv/testsuite/Makefile.am +@@ -11,3 +11,9 @@ EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \ + _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \ + echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi) + RUNTEST = $(_RUNTEST) $(AM_RUNTESTFLAGS) ++ ++EXTRA_DEJAGNU_SITE_CONFIG = extra.exp ++ ++extra.exp: ++ echo 'set BUILD_CC "$(CC)"' > $@.tmp ++ mv $@.tmp $@ +diff --git a/libvtv/testsuite/Makefile.in b/libvtv/testsuite/Makefile.in +index e104f62c035..d7401b110ff 100644 +--- a/libvtv/testsuite/Makefile.in ++++ b/libvtv/testsuite/Makefile.in +@@ -280,6 +280,7 @@ _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \ + echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi) + + RUNTEST = $(_RUNTEST) $(AM_RUNTESTFLAGS) ++EXTRA_DEJAGNU_SITE_CONFIG = extra.exp + all: all-am + + .SUFFIXES: +@@ -487,6 +488,10 @@ uninstall-am: + .PRECIOUS: Makefile + + ++extra.exp: ++ echo 'set BUILD_CC "$(CC)"' > $@.tmp ++ mv $@.tmp $@ ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff --git a/libvtv/testsuite/lib/libvtv.exp b/libvtv/testsuite/lib/libvtv.exp +index 4b71c9ce7bc..ef06e4a3199 100644 +--- a/libvtv/testsuite/lib/libvtv.exp ++++ b/libvtv/testsuite/lib/libvtv.exp +@@ -76,6 +76,7 @@ proc libvtv_init { args } { + global ALWAYS_CFLAGS + global CFLAGS + global TOOL_EXECUTABLE TOOL_OPTIONS ++ global BUILD_CC + global GCC_UNDER_TEST + global TESTING_IN_BUILD_TREE + global target_triplet +@@ -91,6 +92,8 @@ proc libvtv_init { args } { + if ![info exists GCC_UNDER_TEST] then { + if [info exists TOOL_EXECUTABLE] { + set GCC_UNDER_TEST $TOOL_EXECUTABLE ++ } elseif [info exists BUILD_CC] { ++ set GCC_UNDER_TEST $BUILD_CC + } else { + set GCC_UNDER_TEST "[find_gcc]" + } diff --git a/patches/gcc-9.4.0/0007-j2.diff b/patches/gcc-9.4.0/0007-j2.diff new file mode 100644 index 0000000..71c4bac --- /dev/null +++ b/patches/gcc-9.4.0/0007-j2.diff @@ -0,0 +1,346 @@ +diff --git a/gcc/config.gcc b/gcc/config.gcc +index 09fb9ecd2cd..79ac206d10e 100644 +--- a/gcc/config.gcc ++++ b/gcc/config.gcc +@@ -536,7 +536,7 @@ s390*-*-*) + extra_headers="s390intrin.h htmintrin.h htmxlintrin.h vecintrin.h" + ;; + # Note the 'l'; we need to be able to match e.g. "shle" or "shl". +-sh[123456789lbe]*-*-* | sh-*-*) ++sh[123456789lbej]*-*-* | sh-*-*) + cpu_type=sh + extra_options="${extra_options} fused-madd.opt" + extra_objs="${extra_objs} sh_treg_combine.o sh-mem.o sh_optimize_sett_clrt.o" +@@ -2834,18 +2834,18 @@ s390x-ibm-tpf*) + extra_options="${extra_options} s390/tpf.opt" + tmake_file="${tmake_file} s390/t-s390" + ;; +-sh-*-elf* | sh[12346l]*-*-elf* | \ +- sh-*-linux* | sh[2346lbe]*-*-linux* | \ ++sh-*-elf* | sh[12346lj]*-*-elf* | \ ++ sh-*-linux* | sh[2346lbej]*-*-linux* | \ + sh-*-netbsdelf* | shl*-*-netbsdelf*) + tmake_file="${tmake_file} sh/t-sh sh/t-elf" + if test x${with_endian} = x; then + case ${target} in +- sh[1234]*be-*-* | sh[1234]*eb-*-*) with_endian=big ;; ++ sh[j1234]*be-*-* | sh[j1234]*eb-*-*) with_endian=big ;; + shbe-*-* | sheb-*-*) with_endian=big,little ;; + sh[1234]l* | sh[34]*-*-linux*) with_endian=little ;; + shl* | sh*-*-linux* | \ + sh-superh-elf) with_endian=little,big ;; +- sh[1234]*-*-*) with_endian=big ;; ++ sh[j1234]*-*-*) with_endian=big ;; + *) with_endian=big,little ;; + esac + fi +@@ -2912,6 +2912,7 @@ sh-*-elf* | sh[12346l]*-*-elf* | \ + sh2a_nofpu*) sh_cpu_target=sh2a-nofpu ;; + sh2a*) sh_cpu_target=sh2a ;; + sh2e*) sh_cpu_target=sh2e ;; ++ shj2*) sh_cpu_target=shj2;; + sh2*) sh_cpu_target=sh2 ;; + *) sh_cpu_target=sh1 ;; + esac +@@ -2933,7 +2934,7 @@ sh-*-elf* | sh[12346l]*-*-elf* | \ + 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 +@@ -2942,9 +2943,9 @@ sh-*-elf* | sh[12346l]*-*-elf* | \ + case ${target} in + sh[1234]*) sh_multilibs=${sh_cpu_target} ;; + sh-superh-*) sh_multilibs=m4,m4-single,m4-single-only,m4-nofpu ;; +- sh*-*-linux*) sh_multilibs=m1,m2,m2a,m3e,m4 ;; ++ sh*-*-linux*) sh_multilibs=m1,m2,m2a,m3e,m4,mj2 ;; + sh*-*-netbsd*) sh_multilibs=m3,m3e,m4 ;; +- *) sh_multilibs=m1,m2,m2e,m4,m4-single,m4-single-only,m2a,m2a-single ;; ++ *) sh_multilibs=m1,m2,m2e,m4,m4-single,m4-single-only,m2a,m2a-single,mj2 ;; + esac + if test x$with_fp = xno; then + 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`" +@@ -2959,7 +2960,8 @@ sh-*-elf* | sh[12346l]*-*-elf* | \ + m1 | m2 | m2e | m3 | m3e | \ + m4 | m4-single | m4-single-only | m4-nofpu | m4-300 |\ + m4a | m4a-single | m4a-single-only | m4a-nofpu | m4al | \ +- m2a | m2a-single | m2a-single-only | m2a-nofpu) ++ m2a | m2a-single | m2a-single-only | m2a-nofpu | \ ++ mj2) + # TM_MULTILIB_CONFIG is used by t-sh for the non-endian multilib definition + # It is passed to MULTIILIB_OPTIONS verbatim. + TM_MULTILIB_CONFIG="${TM_MULTILIB_CONFIG}/${sh_multilib}" +@@ -2976,7 +2978,7 @@ sh-*-elf* | sh[12346l]*-*-elf* | \ + done + TM_MULTILIB_CONFIG=`echo $TM_MULTILIB_CONFIG | sed 's:^/::'` + if test x${enable_incomplete_targets} = xyes ; then +- tm_defines="$tm_defines SUPPORT_SH1=1 SUPPORT_SH2E=1 SUPPORT_SH4=1 SUPPORT_SH4_SINGLE=1 SUPPORT_SH2A=1 SUPPORT_SH2A_SINGLE=1" ++ tm_defines="$tm_defines SUPPORT_SH1=1 SUPPORT_SH2E=1 SUPPORT_SH4=1 SUPPORT_SH4_SINGLE=1 SUPPORT_SH2A=1 SUPPORT_SH2A_SINGLE=1 SUPPORT_SHJ2=1" + fi + tm_file="$tm_file ./sysroot-suffix.h" + tmake_file="$tmake_file t-sysroot-suffix" +@@ -4760,6 +4762,8 @@ case "${target}" in + ;; + 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 +@@ -4984,7 +4988,7 @@ case ${target} in + tmake_file="${cpu_type}/t-${cpu_type} ${tmake_file}" + ;; + +- sh[123456ble]*-*-* | sh-*-*) ++ sh[123456blej]*-*-* | sh-*-*) + c_target_objs="${c_target_objs} sh-c.o" + cxx_target_objs="${cxx_target_objs} sh-c.o" + ;; +diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c +index 8dc79a764df..36683614277 100644 +--- a/gcc/config/sh/sh.c ++++ b/gcc/config/sh/sh.c +@@ -686,6 +686,7 @@ parse_validate_atomic_model_option (const char* str) + model_names[sh_atomic_model::hard_llcs] = "hard-llcs"; + model_names[sh_atomic_model::soft_tcb] = "soft-tcb"; + model_names[sh_atomic_model::soft_imask] = "soft-imask"; ++ model_names[sh_atomic_model::hard_cas] = "hard-cas"; + + const char* model_cdef_names[sh_atomic_model::num_models]; + model_cdef_names[sh_atomic_model::none] = "NONE"; +@@ -693,6 +694,7 @@ parse_validate_atomic_model_option (const char* str) + model_cdef_names[sh_atomic_model::hard_llcs] = "HARD_LLCS"; + model_cdef_names[sh_atomic_model::soft_tcb] = "SOFT_TCB"; + model_cdef_names[sh_atomic_model::soft_imask] = "SOFT_IMASK"; ++ model_cdef_names[sh_atomic_model::hard_cas] = "HARD_CAS"; + + sh_atomic_model ret; + ret.type = sh_atomic_model::none; +@@ -771,6 +773,9 @@ got_mode_name:; + if (ret.type == sh_atomic_model::soft_imask && TARGET_USERMODE) + err_ret ("cannot use atomic model %s in user mode", ret.name); + ++ if (ret.type == sh_atomic_model::hard_cas && !TARGET_SHJ2) ++ err_ret ("atomic model %s is only available J2 targets", ret.name); ++ + return ret; + + #undef err_ret +@@ -827,6 +832,8 @@ sh_option_override (void) + sh_cpu = PROCESSOR_SH2E; + if (TARGET_SH2A) + sh_cpu = PROCESSOR_SH2A; ++ if (TARGET_SHJ2) ++ sh_cpu = PROCESSOR_SHJ2; + if (TARGET_SH3) + sh_cpu = PROCESSOR_SH3; + if (TARGET_SH3E) +diff --git a/gcc/config/sh/sh.h b/gcc/config/sh/sh.h +index 0204872eae7..30416a34e30 100644 +--- a/gcc/config/sh/sh.h ++++ b/gcc/config/sh/sh.h +@@ -83,6 +83,7 @@ extern int code_for_indirect_jump_scratch; + #define SUPPORT_SH4_SINGLE 1 + #define SUPPORT_SH2A 1 + #define SUPPORT_SH2A_SINGLE 1 ++#define SUPPORT_SHJ2 1 + #endif + + #define TARGET_DIVIDE_CALL_DIV1 (sh_div_strategy == SH_DIV_CALL_DIV1) +@@ -115,6 +116,7 @@ extern int code_for_indirect_jump_scratch; + #define SELECT_SH4A_SINGLE_ONLY (MASK_SH4A | SELECT_SH4_SINGLE_ONLY) + #define SELECT_SH4A (MASK_SH4A | SELECT_SH4) + #define SELECT_SH4A_SINGLE (MASK_SH4A | SELECT_SH4_SINGLE) ++#define SELECT_SHJ2 (MASK_SHJ2 | SELECT_SH2) + + #if SUPPORT_SH1 + #define SUPPORT_SH2 1 +@@ -122,6 +124,7 @@ extern int code_for_indirect_jump_scratch; + #if SUPPORT_SH2 + #define SUPPORT_SH3 1 + #define SUPPORT_SH2A_NOFPU 1 ++#define SUPPORT_SHJ2 1 + #endif + #if SUPPORT_SH3 + #define SUPPORT_SH4_NOFPU 1 +@@ -154,7 +157,7 @@ extern int code_for_indirect_jump_scratch; + #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_FPU_SINGLE_ONLY) ++ | MASK_FPU_SINGLE_ONLY | MASK_SHJ2) + + /* This defaults us to big-endian. */ + #ifndef TARGET_ENDIAN_DEFAULT +@@ -229,7 +232,8 @@ extern int code_for_indirect_jump_scratch; + %{m2a-single:--isa=sh2a} \ + %{m2a-single-only:--isa=sh2a} \ + %{m2a-nofpu:--isa=sh2a-nofpu} \ +-%{m4al:-dsp}" ++%{m4al:-dsp} \ ++%{mj2:-isa=j2}" + + #define ASM_SPEC SH_ASM_SPEC + +@@ -345,6 +349,7 @@ struct sh_atomic_model + hard_llcs, + soft_tcb, + soft_imask, ++ hard_cas, + + num_models + }; +@@ -388,6 +393,9 @@ extern const sh_atomic_model& selected_atomic_model (void); + #define TARGET_ATOMIC_SOFT_IMASK \ + (selected_atomic_model ().type == sh_atomic_model::soft_imask) + ++#define TARGET_ATOMIC_HARD_CAS \ ++ (selected_atomic_model ().type == sh_atomic_model::hard_cas) ++ + #endif // __cplusplus + + #define SUBTARGET_OVERRIDE_OPTIONS (void) 0 +@@ -1521,7 +1529,7 @@ extern bool current_function_interrupt; + + /* 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_SHJ2) + + /* 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 +@@ -1784,6 +1792,7 @@ enum processor_type { + PROCESSOR_SH2, + PROCESSOR_SH2E, + PROCESSOR_SH2A, ++ PROCESSOR_SHJ2, + PROCESSOR_SH3, + PROCESSOR_SH3E, + PROCESSOR_SH4, +diff --git a/gcc/config/sh/sh.opt b/gcc/config/sh/sh.opt +index 8eb1a4e121a..9c28ed6b5c0 100644 +--- a/gcc/config/sh/sh.opt ++++ b/gcc/config/sh/sh.opt +@@ -65,6 +65,10 @@ m2e + Target RejectNegative Condition(SUPPORT_SH2E) + Generate SH2e code. + ++mj2 ++Target RejectNegative Mask(SHJ2) Condition(SUPPORT_SHJ2) ++Generate J2 code. ++ + m3 + Target RejectNegative Mask(SH3) Condition(SUPPORT_SH3) + Generate SH3 code. +diff --git a/gcc/config/sh/sync.md b/gcc/config/sh/sync.md +index 691d9287101..3ffb099195d 100644 +--- a/gcc/config/sh/sync.md ++++ b/gcc/config/sh/sync.md +@@ -240,6 +240,9 @@ + || (TARGET_SH4A && mode == SImode && !TARGET_ATOMIC_STRICT)) + atomic_insn = gen_atomic_compare_and_swap_hard (old_val, mem, + exp_val, new_val); ++ else if (TARGET_ATOMIC_HARD_CAS && mode == SImode) ++ atomic_insn = gen_atomic_compare_and_swap_cas (old_val, mem, ++ exp_val, new_val); + else if (TARGET_ATOMIC_SOFT_GUSA) + atomic_insn = gen_atomic_compare_and_swap_soft_gusa (old_val, mem, + exp_val, new_val); +@@ -306,6 +309,57 @@ + } + [(set_attr "length" "14")]) + ++(define_expand "atomic_compare_and_swapsi_cas" ++ [(set (match_operand:SI 0 "register_operand" "=r") ++ (unspec_volatile:SI ++ [(match_operand:SI 1 "atomic_mem_operand_0" "=Sra") ++ (match_operand:SI 2 "register_operand" "r") ++ (match_operand:SI 3 "register_operand" "r")] ++ UNSPECV_CMPXCHG_1))] ++ "TARGET_ATOMIC_HARD_CAS" ++{ ++ rtx mem = gen_rtx_REG (SImode, 0); ++ emit_move_insn (mem, force_reg (SImode, XEXP (operands[1], 0))); ++ emit_insn (gen_shj2_cas (operands[0], mem, operands[2], operands[3])); ++ DONE; ++}) ++ ++(define_insn "shj2_cas" ++ [(set (match_operand:SI 0 "register_operand" "=&r") ++ (unspec_volatile:SI ++ [(match_operand:SI 1 "register_operand" "=r") ++ (match_operand:SI 2 "register_operand" "r") ++ (match_operand:SI 3 "register_operand" "0")] ++ UNSPECV_CMPXCHG_1)) ++ (set (reg:SI T_REG) ++ (unspec_volatile:SI [(const_int 0)] UNSPECV_CMPXCHG_3))] ++ "TARGET_ATOMIC_HARD_CAS" ++ "cas.l %2,%0,@%1" ++ [(set_attr "length" "2")] ++) ++ ++(define_expand "atomic_compare_and_swapqi_cas" ++ [(set (match_operand:SI 0 "arith_reg_dest" "=&r") ++ (unspec_volatile:SI ++ [(match_operand:SI 1 "atomic_mem_operand_0" "=Sra") ++ (match_operand:SI 2 "arith_operand" "rI08") ++ (match_operand:SI 3 "arith_operand" "rI08")] ++ UNSPECV_CMPXCHG_1))] ++ "TARGET_ATOMIC_HARD_CAS" ++{FAIL;} ++) ++ ++(define_expand "atomic_compare_and_swaphi_cas" ++ [(set (match_operand:SI 0 "arith_reg_dest" "=&r") ++ (unspec_volatile:SI ++ [(match_operand:SI 1 "atomic_mem_operand_0" "=Sra") ++ (match_operand:SI 2 "arith_operand" "rI08") ++ (match_operand:SI 3 "arith_operand" "rI08")] ++ UNSPECV_CMPXCHG_1))] ++ "TARGET_ATOMIC_HARD_CAS" ++{FAIL;} ++) ++ + ;; The QIHImode llcs patterns modify the address register of the memory + ;; operand. In order to express that, we have to open code the memory + ;; operand. Initially the insn is expanded like every other atomic insn +diff --git a/gcc/config/sh/t-sh b/gcc/config/sh/t-sh +index e1a398319d5..19a6f3f7ea8 100644 +--- a/gcc/config/sh/t-sh ++++ b/gcc/config/sh/t-sh +@@ -50,7 +50,8 @@ MULTILIB_MATCHES = $(shell \ + m2e,m3e,m4-single-only,m4-100-single-only,m4-200-single-only,m4-300-single-only,m4a-single-only \ + m2a-single,m2a-single-only \ + m4-single,m4-100-single,m4-200-single,m4-300-single,m4a-single \ +- m4,m4-100,m4-200,m4-300,m4a; do \ ++ m4,m4-100,m4-200,m4-300,m4a \ ++ mj2; do \ + subst= ; \ + for lib in `echo $$abi|tr , ' '` ; do \ + if test "`echo $$multilibs|sed s/$$lib//`" != "$$multilibs"; then \ +@@ -63,9 +64,9 @@ MULTILIB_MATCHES = $(shell \ + + # SH1 and SH2A support big endian only. + ifeq ($(DEFAULT_ENDIAN),ml) +-MULTILIB_EXCEPTIONS = m1 ml/m1 m2a* ml/m2a* $(TM_MULTILIB_EXCEPTIONS_CONFIG) ++MULTILIB_EXCEPTIONS = m1 ml/m1 m2a* ml/m2a* ml/mj2 $(TM_MULTILIB_EXCEPTIONS_CONFIG) + else +-MULTILIB_EXCEPTIONS = ml/m1 ml/m2a* $(TM_MULTILIB_EXCEPTIONS_CONFIG) ++MULTILIB_EXCEPTIONS = ml/m1 ml/m2a* ml/mj2 $(TM_MULTILIB_EXCEPTIONS_CONFIG) + endif + + MULTILIB_OSDIRNAMES = \ +@@ -87,7 +88,8 @@ MULTILIB_OSDIRNAMES = \ + m4a-single-only=!m4a-single-only $(OTHER_ENDIAN)/m4a-single-only=!$(OTHER_ENDIAN)/m4a-single-only \ + m4a-single=!m4a-single $(OTHER_ENDIAN)/m4a-single=!$(OTHER_ENDIAN)/m4a-single \ + m4a=!m4a $(OTHER_ENDIAN)/m4a=!$(OTHER_ENDIAN)/m4a \ +- m4al=!m4al $(OTHER_ENDIAN)/m4al=!$(OTHER_ENDIAN)/m4al ++ m4al=!m4al $(OTHER_ENDIAN)/m4al=!$(OTHER_ENDIAN)/m4al \ ++ mj2=!j2 + + $(out_object_file): gt-sh.h + gt-sh.h : s-gtype ; @true diff --git a/patches/gcc-9.4.0/0008-s390x-muslldso.diff b/patches/gcc-9.4.0/0008-s390x-muslldso.diff new file mode 100644 index 0000000..d385f25 --- /dev/null +++ b/patches/gcc-9.4.0/0008-s390x-muslldso.diff @@ -0,0 +1,14 @@ +diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h +index f76986acdab..5f6b7041f0f 100644 +--- a/gcc/config/s390/linux.h ++++ b/gcc/config/s390/linux.h +@@ -75,6 +75,9 @@ along with GCC; see the file COPYING3. If not see + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" + #define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" + ++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-s390.so.1" ++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-s390x.so.1" ++ + #undef LINK_SPEC + #define LINK_SPEC \ + "%{m31:-m elf_s390}%{m64:-m elf64_s390} \ diff --git a/patches/gcc-9.4.0/0009-microblaze-pr65649.diff b/patches/gcc-9.4.0/0009-microblaze-pr65649.diff new file mode 100644 index 0000000..e733b5c --- /dev/null +++ b/patches/gcc-9.4.0/0009-microblaze-pr65649.diff @@ -0,0 +1,22 @@ +diff --git a/gcc/config/microblaze/microblaze.c b/gcc/config/microblaze/microblaze.c +index 55c1becf975..45395ab86f1 100644 +--- a/gcc/config/microblaze/microblaze.c ++++ b/gcc/config/microblaze/microblaze.c +@@ -2476,7 +2476,7 @@ print_operand (FILE * file, rtx op, int letter) + unsigned long value_long; + REAL_VALUE_TO_TARGET_SINGLE (*CONST_DOUBLE_REAL_VALUE (op), + value_long); +- fprintf (file, HOST_WIDE_INT_PRINT_HEX, value_long); ++ fprintf (file, "0x%lx", value_long); + } + else + { +@@ -2535,7 +2535,7 @@ print_operand (FILE * file, rtx op, int letter) + print_operand_address (file, XEXP (op, 0)); + } + else if (letter == 'm') +- fprintf (file, HOST_WIDE_INT_PRINT_DEC, (1L << INTVAL (op))); ++ fprintf (file, "%ld", (1L << INTVAL (op))); + else + output_addr_const (file, op); + } diff --git a/patches/gcc-9.4.0/0010-ldbl128-config.diff b/patches/gcc-9.4.0/0010-ldbl128-config.diff new file mode 100644 index 0000000..04b88a0 --- /dev/null +++ b/patches/gcc-9.4.0/0010-ldbl128-config.diff @@ -0,0 +1,63 @@ +diff --git a/gcc/configure b/gcc/configure +index 3dcf7752b7f..78aaa36dce6 100755 +--- a/gcc/configure ++++ b/gcc/configure +@@ -29356,6 +29356,15 @@ if test "${with_long_double_128+set}" = set; then : + withval=$with_long_double_128; gcc_cv_target_ldbl128="$with_long_double_128" + else + ++ case "$target" in ++ s390*-*-linux-musl*) ++ gcc_cv_target_ldbl128=yes ++ ;; ++ powerpc*-*-linux-musl*) ++ gcc_cv_target_ldbl128=no ++ ;; ++ *) ++ + if test $glibc_version_major -gt 2 \ + || ( test $glibc_version_major -eq 2 && test $glibc_version_minor -ge 4 ); then : + gcc_cv_target_ldbl128=yes +@@ -29367,6 +29376,10 @@ else + && gcc_cv_target_ldbl128=yes + + fi ++ ++ ;; ++ esac ++ + fi + + ;; +diff --git a/gcc/configure.ac b/gcc/configure.ac +index 51f520c1508..a6498239698 100644 +--- a/gcc/configure.ac ++++ b/gcc/configure.ac +@@ -6020,13 +6020,25 @@ case "$target" in + AC_ARG_WITH(long-double-128, + [AS_HELP_STRING([--with-long-double-128], + [use 128-bit long double by default])], +- gcc_cv_target_ldbl128="$with_long_double_128", ++ gcc_cv_target_ldbl128="$with_long_double_128", [ ++ case "$target" in ++ s390*-*-linux-musl*) ++ gcc_cv_target_ldbl128=yes ++ ;; ++ powerpc*-*-linux-musl*) ++ gcc_cv_target_ldbl128=no ++ ;; ++ *)] + [GCC_GLIBC_VERSION_GTE_IFELSE([2], [4], [gcc_cv_target_ldbl128=yes], [ + [gcc_cv_target_ldbl128=no + grep '^[ ]*#[ ]*define[ ][ ]*__LONG_DOUBLE_MATH_OPTIONAL' \ + $target_header_dir/bits/wordsize.h > /dev/null 2>&1 \ + && gcc_cv_target_ldbl128=yes +- ]])]) ++ ]])] ++ [ ++ ;; ++ esac ++ ]) + ;; + esac + if test x$gcc_cv_target_ldbl128 = xyes; then diff --git a/patches/gcc-9.4.0/0011-m68k.diff b/patches/gcc-9.4.0/0011-m68k.diff new file mode 100644 index 0000000..79a15d1 --- /dev/null +++ b/patches/gcc-9.4.0/0011-m68k.diff @@ -0,0 +1,27 @@ +diff --git a/gcc/config/m68k/linux.h b/gcc/config/m68k/linux.h +index ebdf0281071..beef554b31c 100644 +--- a/gcc/config/m68k/linux.h ++++ b/gcc/config/m68k/linux.h +@@ -73,6 +73,9 @@ along with GCC; see the file COPYING3. If not see + + #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" + ++#undef MUSL_DYNAMIC_LINKER ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-m68k.so.1" ++ + #undef LINK_SPEC + #define LINK_SPEC "-m m68kelf %{shared} \ + %{!shared: \ +diff --git a/libgcc/config/m68k/linux-unwind.h b/libgcc/config/m68k/linux-unwind.h +index fbe0d4748ba..57c354ee9b4 100644 +--- a/libgcc/config/m68k/linux-unwind.h ++++ b/libgcc/config/m68k/linux-unwind.h +@@ -37,7 +37,7 @@ struct uw_ucontext { + stack_t uc_stack; + mcontext_t uc_mcontext; + unsigned long uc_filler[80]; +- __sigset_t uc_sigmask; ++ sigset_t uc_sigmask; + }; + + #define MD_FALLBACK_FRAME_STATE_FOR m68k_fallback_frame_state diff --git a/patches/gcc-9.4.0/0012-static-pie.diff b/patches/gcc-9.4.0/0012-static-pie.diff new file mode 100644 index 0000000..400d7a1 --- /dev/null +++ b/patches/gcc-9.4.0/0012-static-pie.diff @@ -0,0 +1,86 @@ +diff --git a/gcc/common.opt b/gcc/common.opt +index d342c4f3749..2aae4a3cefb 100644 +--- a/gcc/common.opt ++++ b/gcc/common.opt +@@ -3287,11 +3287,11 @@ Driver + + no-pie + Driver RejectNegative Negative(shared) +-Don't create a dynamically linked position independent executable. ++Don't create a position independent executable. + + pie + Driver RejectNegative Negative(no-pie) +-Create a dynamically linked position independent executable. ++Create a position independent executable. + + static-pie + Driver RejectNegative Negative(pie) +diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h +index 055a4f0afec..7a671c6a49c 100644 +--- a/gcc/config/gnu-user.h ++++ b/gcc/config/gnu-user.h +@@ -51,13 +51,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + #define GNU_USER_TARGET_STARTFILE_SPEC \ + "%{shared:; \ + pg|p|profile:%{static-pie:grcrt1.o%s;:gcrt1.o%s}; \ +- static:crt1.o%s; \ +- static-pie:rcrt1.o%s; \ ++ static|static-pie:%{" PIE_SPEC ":rcrt1.o%s;:crt1.o%s}; \ + " PIE_SPEC ":Scrt1.o%s; \ + :crt1.o%s} " \ + GNU_USER_TARGET_CRTI " \ +- %{static:crtbeginT.o%s; \ +- shared|static-pie|" PIE_SPEC ":crtbeginS.o%s; \ ++ %{shared|" PIE_SPEC ":crtbeginS.o%s; \ ++ static:crtbeginT.o%s; \ + :crtbegin.o%s} \ + %{fvtable-verify=none:%s; \ + fvtable-verify=preinit:vtv_start_preinit.o%s; \ +@@ -76,8 +75,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + "%{fvtable-verify=none:%s; \ + fvtable-verify=preinit:vtv_end_preinit.o%s; \ + fvtable-verify=std:vtv_end.o%s} \ +- %{static:crtend.o%s; \ +- shared|static-pie|" PIE_SPEC ":crtendS.o%s; \ ++ %{shared|" PIE_SPEC ":crtendS.o%s; \ + :crtend.o%s} " \ + GNU_USER_TARGET_CRTN " " \ + CRTOFFLOADEND +@@ -106,7 +104,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + #define LIB_SPEC GNU_USER_TARGET_LIB_SPEC + + #if defined(HAVE_LD_EH_FRAME_HDR) +-#define LINK_EH_SPEC "%{!static|static-pie:--eh-frame-hdr} " ++#define LINK_EH_SPEC "%{!static|" PIE_SPEC ":--eh-frame-hdr} " + #endif + + #define GNU_USER_TARGET_LINK_GCC_C_SEQUENCE_SPEC \ +diff --git a/gcc/gcc.c b/gcc/gcc.c +index d185c01b257..5d3f81c5fc5 100644 +--- a/gcc/gcc.c ++++ b/gcc/gcc.c +@@ -908,7 +908,7 @@ proper position among the other output files. */ + #define NO_FPIE_AND_FPIC_SPEC NO_FPIE_SPEC "|" NO_FPIC_SPEC + #define FPIE_OR_FPIC_SPEC NO_FPIE_AND_FPIC_SPEC ":;" + #else +-#define PIE_SPEC "pie" ++#define PIE_SPEC "pie|static-pie" + #define FPIE1_SPEC "fpie" + #define NO_FPIE1_SPEC FPIE1_SPEC ":;" + #define FPIE2_SPEC "fPIE" +@@ -932,12 +932,12 @@ proper position among the other output files. */ + #ifndef LINK_PIE_SPEC + #ifdef HAVE_LD_PIE + #ifndef LD_PIE_SPEC +-#define LD_PIE_SPEC "-pie" ++#define LD_PIE_SPEC "-pie %{static-pie:-static} %{static|static-pie:--no-dynamic-linker -z text -Bsymbolic}" + #endif + #else + #define LD_PIE_SPEC "" + #endif +-#define LINK_PIE_SPEC "%{static|shared|r:;" PIE_SPEC ":" LD_PIE_SPEC "} " ++#define LINK_PIE_SPEC "%{shared|r:;" PIE_SPEC ":" LD_PIE_SPEC "} " + #endif + + #ifndef LINK_BUILDID_SPEC diff --git a/patches/gcc-9.4.0/0013-invalid-tls-model.diff b/patches/gcc-9.4.0/0013-invalid-tls-model.diff new file mode 100644 index 0000000..ac2d56b --- /dev/null +++ b/patches/gcc-9.4.0/0013-invalid-tls-model.diff @@ -0,0 +1,28 @@ +diff --git a/libgomp/configure.tgt b/libgomp/configure.tgt +index b88bf72fe3d..747d0485bf8 100644 +--- a/libgomp/configure.tgt ++++ b/libgomp/configure.tgt +@@ -17,6 +17,9 @@ if test $gcc_cv_have_tls = yes ; then + *-*-k*bsd*-gnu*) + ;; + ++ *-*-musl*) ++ ;; ++ + *-*-linux* | *-*-gnu*) + XCFLAGS="${XCFLAGS} -ftls-model=initial-exec -DUSING_INITIAL_EXEC_TLS" + ;; +diff --git a/libitm/configure.tgt b/libitm/configure.tgt +index 4c0b602034b..65e1c83550a 100644 +--- a/libitm/configure.tgt ++++ b/libitm/configure.tgt +@@ -31,6 +31,9 @@ + if test "$gcc_cv_have_tls" = yes ; then + case "${target}" in + ++ *-*-musl*) ++ ;; ++ + # For x86, we use slots in the TCB head for most of our TLS. + # The setup of those slots in beginTransaction can afford to + # use the global-dynamic model. diff --git a/patches/gcc-9.4.0/0014-fix-gthr-weak-refs-for-libgcc.patch b/patches/gcc-9.4.0/0014-fix-gthr-weak-refs-for-libgcc.patch new file mode 100644 index 0000000..56291a2 --- /dev/null +++ b/patches/gcc-9.4.0/0014-fix-gthr-weak-refs-for-libgcc.patch @@ -0,0 +1,51 @@ +From 51a354a0fb54165d505bfed9819c0440027312d9 Mon Sep 17 00:00:00 2001 +From: Szabolcs Nagy +Date: Sun, 22 Sep 2019 23:04:48 +0000 +Subject: [PATCH] fix gthr weak refs for libgcc + +ideally gthr-posix.h should be fixed not to use weak refs for +single thread detection by default since that's unsafe. + +currently we have to opt out explicitly from the unsafe behaviour +in the configure machinery of each target lib that uses gthr and +musl missed libgcc previously. + +related bugs and discussions +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78017 +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87189 +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91737 +https://sourceware.org/bugzilla/show_bug.cgi?id=5784 +https://sourceware.org/ml/libc-alpha/2012-09/msg00192.html +https://sourceware.org/ml/libc-alpha/2019-08/msg00438.html +--- + libgcc/config.host | 7 +++++++ + libgcc/config/t-gthr-noweak | 2 ++ + 2 files changed, 9 insertions(+) + create mode 100644 libgcc/config/t-gthr-noweak + +diff --git a/libgcc/config.host b/libgcc/config.host +index 122113fc519..fe1b9ab93d5 100644 +--- a/libgcc/config.host ++++ b/libgcc/config.host +@@ -1500,3 +1500,10 @@ aarch64*-*-*) + tm_file="${tm_file} aarch64/value-unwind.h" + ;; + esac ++ ++case ${host} in ++*-*-musl*) ++ # The gthr weak references are unsafe with static linking ++ tmake_file="$tmake_file t-gthr-noweak" ++ ;; ++esac +diff --git a/libgcc/config/t-gthr-noweak b/libgcc/config/t-gthr-noweak +new file mode 100644 +index 00000000000..45a21e9361d +--- /dev/null ++++ b/libgcc/config/t-gthr-noweak +@@ -0,0 +1,2 @@ ++# Don't use weak references for single-thread detection ++HOST_LIBGCC2_CFLAGS += -DGTHREAD_USE_WEAK=0 +-- +2.17.1 + diff --git a/patches/gcc-9.4.0/0015-riscv-tls-copy-relocs.diff b/patches/gcc-9.4.0/0015-riscv-tls-copy-relocs.diff new file mode 100644 index 0000000..566be71 --- /dev/null +++ b/patches/gcc-9.4.0/0015-riscv-tls-copy-relocs.diff @@ -0,0 +1,16 @@ +diff --git a/gcc/config/riscv/riscv.c b/gcc/config/riscv/riscv.c +index 677728e77ed..444d01e87ec 100644 +--- a/gcc/config/riscv/riscv.c ++++ b/gcc/config/riscv/riscv.c +@@ -1209,9 +1209,11 @@ riscv_legitimize_tls_address (rtx loc) + rtx dest, tp, tmp; + enum tls_model model = SYMBOL_REF_TLS_MODEL (loc); + ++#if 0 + /* Since we support TLS copy relocs, non-PIC TLS accesses may all use LE. */ + if (!flag_pic) + model = TLS_MODEL_LOCAL_EXEC; ++#endif + + switch (model) + { diff --git a/patches/gcc-9.4.0/0016-libstdc++-futex-time64.diff b/patches/gcc-9.4.0/0016-libstdc++-futex-time64.diff new file mode 100644 index 0000000..08f6261 --- /dev/null +++ b/patches/gcc-9.4.0/0016-libstdc++-futex-time64.diff @@ -0,0 +1,18 @@ +--- gcc-9.2.0/libstdc++-v3/src/c++11/futex.cc.orig 2020-01-20 14:55:05.507548334 -0500 ++++ gcc-9.2.0/libstdc++-v3/src/c++11/futex.cc 2020-01-20 14:56:52.458268068 -0500 +@@ -61,7 +61,15 @@ + struct timeval tv; + gettimeofday (&tv, NULL); + // Convert the absolute timeout value to a relative timeout ++#if defined(SYS_futex_time64) && SYS_futex_time64 != SYS_futex ++ struct ++ { ++ long tv_sec; ++ long tv_nsec; ++ } rt; ++#else + struct timespec rt; ++#endif + rt.tv_sec = __s.count() - tv.tv_sec; + rt.tv_nsec = __ns.count() - tv.tv_usec * 1000; + if (rt.tv_nsec < 0) diff --git a/patches/gcc-9.4.0/0018-m68k-sqrt.diff b/patches/gcc-9.4.0/0018-m68k-sqrt.diff new file mode 100644 index 0000000..5d46272 --- /dev/null +++ b/patches/gcc-9.4.0/0018-m68k-sqrt.diff @@ -0,0 +1,18 @@ +--- gcc-9.2.0.orig/gcc/config/m68k/m68k.md 2019-01-01 07:31:55.000000000 -0500 ++++ gcc-9.2.0/gcc/config/m68k/m68k.md 2020-07-01 15:57:20.528408009 -0400 +@@ -4126,13 +4126,13 @@ + (define_expand "sqrt2" + [(set (match_operand:FP 0 "nonimmediate_operand" "") + (sqrt:FP (match_operand:FP 1 "general_operand" "")))] +- "TARGET_HARD_FLOAT" ++ "(TARGET_68881 && TARGET_68040) || TARGET_COLDFIRE_FPU" + "") + + (define_insn "sqrt2_68881" + [(set (match_operand:FP 0 "nonimmediate_operand" "=f") + (sqrt:FP (match_operand:FP 1 "general_operand" "fm")))] +- "TARGET_68881" ++ "TARGET_68881 && TARGET_68040" + { + if (FP_REG_P (operands[1])) + return "fsqrt%.x %1,%0";