diff --git a/patches/gcc-7.3.0/0001-ssp_nonshared.diff b/patches/gcc-7.3.0/0001-ssp_nonshared.diff new file mode 100644 index 0000000..c8d0e48 --- /dev/null +++ b/patches/gcc-7.3.0/0001-ssp_nonshared.diff @@ -0,0 +1,14 @@ +diff --git a/gcc/gcc.c b/gcc/gcc.c +index c48178f1aa3..e2fae4ef055 100644 +--- a/gcc/gcc.c ++++ b/gcc/gcc.c +@@ -863,7 +863,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-7.3.0/0002-posix_memalign.diff b/patches/gcc-7.3.0/0002-posix_memalign.diff new file mode 100644 index 0000000..30bc7b2 --- /dev/null +++ b/patches/gcc-7.3.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 73d9e887b4b..33f998702fa 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-7.3.0/0003-cilkrts.diff b/patches/gcc-7.3.0/0003-cilkrts.diff new file mode 100644 index 0000000..ef2f155 --- /dev/null +++ b/patches/gcc-7.3.0/0003-cilkrts.diff @@ -0,0 +1,46 @@ +diff --git a/libcilkrts/runtime/os-unix.c b/libcilkrts/runtime/os-unix.c +index c419fb68abf..155d8669e91 100644 +--- a/libcilkrts/runtime/os-unix.c ++++ b/libcilkrts/runtime/os-unix.c +@@ -55,6 +55,7 @@ + #if defined __linux__ + # include + # include ++# include + + #elif defined __APPLE__ + # include +@@ -452,28 +453,19 @@ COMMON_SYSDEP void __cilkrts_sleep(void) + + COMMON_SYSDEP void __cilkrts_yield(void) + { +-#if defined(__ANDROID__) || \ +- defined(__APPLE__) || \ +- defined(__CYGWIN__) || \ +- defined(__FreeBSD__) || \ +- defined(__VXWORKS__) || \ +- (defined(__sun__) && defined(__svr4__)) +- // Call sched_yield to yield quantum. I'm not sure why we +- // don't do this on Linux also. +- 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(__linux__) +- // 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 +-# error "Unsupported architecture" ++ // On other platforms call sched_yield to yield a quantum. ++ sched_yield(); + #endif + } + diff --git a/patches/gcc-7.3.0/0004-libatomic-test-fix.diff b/patches/gcc-7.3.0/0004-libatomic-test-fix.diff new file mode 100644 index 0000000..97dd3c2 --- /dev/null +++ b/patches/gcc-7.3.0/0004-libatomic-test-fix.diff @@ -0,0 +1,58 @@ +diff --git a/libatomic/testsuite/Makefile.am b/libatomic/testsuite/Makefile.am +index a9a0144185a..a19101aac54 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 adfc231484a..5400ac3ce11 100644 +--- a/libatomic/testsuite/Makefile.in ++++ b/libatomic/testsuite/Makefile.in +@@ -223,6 +223,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: +@@ -429,6 +430,10 @@ uninstall-am: + uninstall uninstall-am + + ++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 cafab5432b7..dd2e1a4de49 100644 +--- a/libatomic/testsuite/lib/libatomic.exp ++++ b/libatomic/testsuite/lib/libatomic.exp +@@ -74,6 +74,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 +@@ -89,6 +90,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-7.3.0/0005-libgomp-test-fix.diff b/patches/gcc-7.3.0/0005-libgomp-test-fix.diff new file mode 100644 index 0000000..fe99793 --- /dev/null +++ b/patches/gcc-7.3.0/0005-libgomp-test-fix.diff @@ -0,0 +1,60 @@ +diff --git a/libgomp/testsuite/Makefile.am b/libgomp/testsuite/Makefile.am +index e2a3f460eb0..3309f71e02e 100644 +--- a/libgomp/testsuite/Makefile.am ++++ b/libgomp/testsuite/Makefile.am +@@ -12,6 +12,11 @@ _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 $@ + + # Instead of directly in ../testsuite/libgomp-test-support.exp.in, the + # following variables have to be "routed through" this Makefile, for expansion +diff --git a/libgomp/testsuite/Makefile.in b/libgomp/testsuite/Makefile.in +index 6edb7ae7ade..b3eddbc3e62 100644 +--- a/libgomp/testsuite/Makefile.in ++++ b/libgomp/testsuite/Makefile.in +@@ -254,6 +254,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: +@@ -462,6 +463,10 @@ uninstall-am: + ps ps-am uninstall uninstall-am + + ++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 5e47872c5c4..b277c93047d 100644 +--- a/libgomp/testsuite/lib/libgomp.exp ++++ b/libgomp/testsuite/lib/libgomp.exp +@@ -85,6 +85,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 +@@ -107,6 +108,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-7.3.0/0006-libitm-test-fix.diff b/patches/gcc-7.3.0/0006-libitm-test-fix.diff new file mode 100644 index 0000000..5cc1f96 --- /dev/null +++ b/patches/gcc-7.3.0/0006-libitm-test-fix.diff @@ -0,0 +1,58 @@ +diff --git a/libitm/testsuite/Makefile.am b/libitm/testsuite/Makefile.am +index a9a0144185a..a19101aac54 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 eb9e992279d..1250e7f9a5a 100644 +--- a/libitm/testsuite/Makefile.in ++++ b/libitm/testsuite/Makefile.in +@@ -234,6 +234,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: +@@ -440,6 +441,10 @@ uninstall-am: + uninstall uninstall-am + + ++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 041629687f6..748f492c03d 100644 +--- a/libitm/testsuite/lib/libitm.exp ++++ b/libitm/testsuite/lib/libitm.exp +@@ -74,6 +74,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 +@@ -89,6 +90,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-7.3.0/0007-libvtv-test-fix.diff b/patches/gcc-7.3.0/0007-libvtv-test-fix.diff new file mode 100644 index 0000000..294ae45 --- /dev/null +++ b/patches/gcc-7.3.0/0007-libvtv-test-fix.diff @@ -0,0 +1,58 @@ +diff --git a/libvtv/testsuite/Makefile.am b/libvtv/testsuite/Makefile.am +index a9a0144185a..a19101aac54 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 b5dfd29973c..9f672e9ae98 100644 +--- a/libvtv/testsuite/Makefile.in ++++ b/libvtv/testsuite/Makefile.in +@@ -228,6 +228,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: +@@ -434,6 +435,10 @@ uninstall-am: + uninstall uninstall-am + + ++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 edf5fddbad2..a596091573b 100644 +--- a/libvtv/testsuite/lib/libvtv.exp ++++ b/libvtv/testsuite/lib/libvtv.exp +@@ -74,6 +74,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 +@@ -89,6 +90,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-7.3.0/0008-Revert-PR-driver-81523-Make-static-override-pie.diff b/patches/gcc-7.3.0/0008-Revert-PR-driver-81523-Make-static-override-pie.diff new file mode 100644 index 0000000..baceb01 --- /dev/null +++ b/patches/gcc-7.3.0/0008-Revert-PR-driver-81523-Make-static-override-pie.diff @@ -0,0 +1,147 @@ +diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h +index de605b0c466..2787a3d16be 100644 +--- a/gcc/config/gnu-user.h ++++ b/gcc/config/gnu-user.h +@@ -50,28 +50,19 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + + #if defined HAVE_LD_PIE + #define GNU_USER_TARGET_STARTFILE_SPEC \ +- "%{shared:; \ +- pg|p|profile:gcrt1.o%s; \ +- static:crt1.o%s; \ +- " PIE_SPEC ":Scrt1.o%s; \ +- :crt1.o%s} \ +- crti.o%s \ +- %{static:crtbeginT.o%s; \ +- shared|" PIE_SPEC ":crtbeginS.o%s; \ +- :crtbegin.o%s} \ ++ "%{!shared: %{pg|p|profile:gcrt1.o%s;: \ ++ %{" PIE_SPEC ":Scrt1.o%s} %{" NO_PIE_SPEC ":crt1.o%s}}} \ ++ crti.o%s %{static:crtbeginT.o%s;: %{shared:crtbeginS.o%s} \ ++ %{" PIE_SPEC ":crtbeginS.o%s} \ ++ %{" NO_PIE_SPEC ":crtbegin.o%s}} \ + %{fvtable-verify=none:%s; \ + fvtable-verify=preinit:vtv_start_preinit.o%s; \ + fvtable-verify=std:vtv_start.o%s} \ + " CRTOFFLOADBEGIN + #else + #define GNU_USER_TARGET_STARTFILE_SPEC \ +- "%{shared:; \ +- pg|p|profile:gcrt1.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;:crt1.o%s}} \ ++ crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s} \ + %{fvtable-verify=none:%s; \ + fvtable-verify=preinit:vtv_start_preinit.o%s; \ + fvtable-verify=std:vtv_start.o%s} \ +@@ -91,20 +82,15 @@ 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|" PIE_SPEC ":crtendS.o%s; \ +- :crtend.o%s} \ +- crtn.o%s \ ++ %{shared:crtendS.o%s;: %{" PIE_SPEC ":crtendS.o%s} \ ++ %{" NO_PIE_SPEC ":crtend.o%s}} crtn.o%s \ + " CRTOFFLOADEND + #else + #define GNU_USER_TARGET_ENDFILE_SPEC \ + "%{fvtable-verify=none:%s; \ + fvtable-verify=preinit:vtv_end_preinit.o%s; \ + fvtable-verify=std:vtv_end.o%s} \ +- %{static:crtend.o%s; \ +- shared|pie:crtendS.o%s; \ +- :crtend.o%s} \ +- crtn.o%s \ ++ %{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s \ + " CRTOFFLOADEND + #endif + #undef ENDFILE_SPEC +diff --git a/gcc/config/sol2.h b/gcc/config/sol2.h +index d522de03f4a..13b27873719 100644 +--- a/gcc/config/sol2.h ++++ b/gcc/config/sol2.h +@@ -174,9 +174,9 @@ along with GCC; see the file COPYING3. If not see + %{!ansi:values-Xa.o%s}" + + #if defined(HAVE_LD_PIE) && defined(HAVE_SOLARIS_CRTS) +-#define STARTFILE_CRTBEGIN_SPEC "%{static:crtbegin.o%s; \ +- shared|" PIE_SPEC ":crtbeginS.o%s; \ +- :crtbegin.o%s}" ++#define STARTFILE_CRTBEGIN_SPEC "%{shared:crtbeginS.o%s} \ ++ %{" PIE_SPEC ":crtbeginS.o%s} \ ++ %{" NO_PIE_SPEC ":crtbegin.o%s}" + #else + #define STARTFILE_CRTBEGIN_SPEC "crtbegin.o%s" + #endif +@@ -224,9 +224,9 @@ along with GCC; see the file COPYING3. If not see + #endif + + #if defined(HAVE_LD_PIE) && defined(HAVE_SOLARIS_CRTS) +-#define ENDFILE_CRTEND_SPEC "%{static:crtend.o%s; \ +- shared|" PIE_SPEC ":crtendS.o%s; \ +- :crtend.o%s}" ++#define ENDFILE_CRTEND_SPEC "%{shared:crtendS.o%s;: \ ++ %{" PIE_SPEC ":crtendS.o%s} \ ++ %{" NO_PIE_SPEC ":crtend.o%s}}" + #else + #define ENDFILE_CRTEND_SPEC "crtend.o%s" + #endif +diff --git a/gcc/gcc.c b/gcc/gcc.c +index e2fae4ef055..91eb0534722 100644 +--- a/gcc/gcc.c ++++ b/gcc/gcc.c +@@ -873,7 +873,8 @@ proper position among the other output files. */ + #endif + + #ifdef ENABLE_DEFAULT_PIE +-#define PIE_SPEC "!no-pie" ++#define NO_PIE_SPEC "no-pie|static" ++#define PIE_SPEC NO_PIE_SPEC "|r|shared:;" + #define NO_FPIE1_SPEC "fno-pie" + #define FPIE1_SPEC NO_FPIE1_SPEC ":;" + #define NO_FPIE2_SPEC "fno-PIE" +@@ -894,6 +895,7 @@ proper position among the other output files. */ + #define FPIE_OR_FPIC_SPEC NO_FPIE_AND_FPIC_SPEC ":;" + #else + #define PIE_SPEC "pie" ++#define NO_PIE_SPEC PIE_SPEC "|r|shared:;" + #define FPIE1_SPEC "fpie" + #define NO_FPIE1_SPEC FPIE1_SPEC ":;" + #define FPIE2_SPEC "fPIE" +@@ -922,7 +924,7 @@ proper position among the other output files. */ + #else + #define LD_PIE_SPEC "" + #endif +-#define LINK_PIE_SPEC "%{static|shared|r:;" PIE_SPEC ":" LD_PIE_SPEC "} " ++#define LINK_PIE_SPEC "%{no-pie:} " "%{" PIE_SPEC ":" LD_PIE_SPEC "} " + #endif + + #ifndef LINK_BUILDID_SPEC +@@ -1010,10 +1012,8 @@ proper position among the other output files. */ + #endif + + /* -u* was put back because both BSD and SysV seem to support it. */ +-/* %{static|no-pie:} simply prevents an error message: +- 1. If the target machine doesn't handle -static. +- 2. If PIE isn't enabled by default. +- */ ++/* %{static:} simply prevents an error message if the target machine ++ doesn't handle -static. */ + /* We want %{T*} after %{L*} and %D so that it can be used to specify linker + scripts which exist in user specified directories, or in standard + directories. */ +@@ -1030,7 +1030,7 @@ proper position among the other output files. */ + "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \ + "%X %{o*} %{e*} %{N} %{n} %{r}\ + %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!nostartfiles:%S}} \ +- %{static|no-pie:} %{L*} %(mfwrap) %(link_libgcc) " \ ++ %{static:} %{L*} %(mfwrap) %(link_libgcc) " \ + VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o " CHKP_SPEC " \ + %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\ + %:include(libgomp.spec)%(link_gomp)}\ diff --git a/patches/gcc-7.3.0/0009-Revert-RS6000-linux-startfile-endfile.diff b/patches/gcc-7.3.0/0009-Revert-RS6000-linux-startfile-endfile.diff new file mode 100644 index 0000000..c9c5ab0 --- /dev/null +++ b/patches/gcc-7.3.0/0009-Revert-RS6000-linux-startfile-endfile.diff @@ -0,0 +1,57 @@ +diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h +index cbee89140dd..de386291a51 100644 +--- a/gcc/config/rs6000/sysv4.h ++++ b/gcc/config/rs6000/sysv4.h +@@ -757,34 +757,24 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN) + #define CRTOFFLOADEND "" + #endif + +-/* STARTFILE_LINUX_SPEC should be the same as GNU_USER_TARGET_STARTFILE_SPEC +- but with the mnewlib ecrti.o%s selection substituted for crti.o%s. */ +-#define STARTFILE_LINUX_SPEC \ +- "%{shared:; \ +- pg|p|profile:gcrt1.o%s; \ +- static:crt1.o%s; \ +- " PIE_SPEC ":Scrt1.o%s; \ +- :crt1.o%s} \ +- %{mnewlib:ecrti.o%s;:crti.o%s} \ +- %{static:crtbeginT.o%s; \ +- shared|" PIE_SPEC ":crtbeginS.o%s; \ +- :crtbegin.o%s} \ +- %{fvtable-verify=none:%s; \ +- fvtable-verify=preinit:vtv_start_preinit.o%s; \ +- fvtable-verify=std:vtv_start.o%s} \ +- " CRTOFFLOADBEGIN +- +-/* ENDFILE_LINUX_SPEC should be the same as GNU_USER_TARGET_ENDFILE_SPEC +- but with the mnewlib ecrtn.o%s selection substituted for crtn.o%s. */ +-#define ENDFILE_LINUX_SPEC \ +- "%{fvtable-verify=none:%s; \ +- fvtable-verify=preinit:vtv_end_preinit.o%s; \ +- fvtable-verify=std:vtv_end.o%s} \ +- %{static:crtend.o%s; \ +- shared|" PIE_SPEC ":crtendS.o%s; \ +- :crtend.o%s} \ +- %{mnewlib:ecrtn.o%s;:crtn.o%s} \ +- " CRTOFFLOADEND ++#ifdef HAVE_LD_PIE ++#define STARTFILE_LINUX_SPEC "\ ++%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \ ++%{mnewlib:ecrti.o%s;:crti.o%s} \ ++%{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s} \ ++" CRTOFFLOADBEGIN ++#else ++#define STARTFILE_LINUX_SPEC "\ ++%{!shared: %{pg|p|profile:gcrt1.o%s;:crt1.o%s}} \ ++%{mnewlib:ecrti.o%s;:crti.o%s} \ ++%{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s} \ ++" CRTOFFLOADBEGIN ++#endif ++ ++#define ENDFILE_LINUX_SPEC "\ ++%{shared|pie:crtendS.o%s;:crtend.o%s} \ ++%{mnewlib:ecrtn.o%s;:crtn.o%s} \ ++" CRTOFFLOADEND + + #define LINK_START_LINUX_SPEC "" + diff --git a/patches/gcc-7.3.0/0010-static-pie-support.diff b/patches/gcc-7.3.0/0010-static-pie-support.diff new file mode 100644 index 0000000..02ae751 --- /dev/null +++ b/patches/gcc-7.3.0/0010-static-pie-support.diff @@ -0,0 +1,59 @@ +diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h +index 2787a3d16be..ee7b781319e 100644 +--- a/gcc/config/gnu-user.h ++++ b/gcc/config/gnu-user.h +@@ -51,10 +51,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + #if defined HAVE_LD_PIE + #define GNU_USER_TARGET_STARTFILE_SPEC \ + "%{!shared: %{pg|p|profile:gcrt1.o%s;: \ +- %{" PIE_SPEC ":Scrt1.o%s} %{" NO_PIE_SPEC ":crt1.o%s}}} \ +- crti.o%s %{static:crtbeginT.o%s;: %{shared:crtbeginS.o%s} \ ++ %{" PIE_SPEC ":%{static:rcrt1.o%s;:Scrt1.o%s}} %{" NO_PIE_SPEC ":crt1.o%s}}} \ ++ crti.o%s %{shared:crtbeginS.o%s;: \ + %{" PIE_SPEC ":crtbeginS.o%s} \ +- %{" NO_PIE_SPEC ":crtbegin.o%s}} \ ++ %{" NO_PIE_SPEC ":%{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} \ +diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h +index de386291a51..577fddc8a7c 100644 +--- a/gcc/config/rs6000/sysv4.h ++++ b/gcc/config/rs6000/sysv4.h +@@ -759,9 +759,12 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN) + + #ifdef HAVE_LD_PIE + #define STARTFILE_LINUX_SPEC "\ +-%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \ ++%{!shared: %{pg|p|profile:gcrt1.o%s;: \ ++ %{" PIE_SPEC ":%{static:rcrt1.o%s;:Scrt1.o%s}} %{" NO_PIE_SPEC ":crt1.o%s}}} \ + %{mnewlib:ecrti.o%s;:crti.o%s} \ +-%{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s} \ ++%{shared:crtbeginS.o%s;: \ ++ %{" PIE_SPEC ":crtbeginS.o%s} \ ++ %{" NO_PIE_SPEC ":%{static:crtbeginT.o%s;:crtbegin.o%s}}} \ + " CRTOFFLOADBEGIN + #else + #define STARTFILE_LINUX_SPEC "\ +diff --git a/gcc/gcc.c b/gcc/gcc.c +index 91eb0534722..74a390e6005 100644 +--- a/gcc/gcc.c ++++ b/gcc/gcc.c +@@ -873,7 +873,7 @@ proper position among the other output files. */ + #endif + + #ifdef ENABLE_DEFAULT_PIE +-#define NO_PIE_SPEC "no-pie|static" ++#define NO_PIE_SPEC "no-pie" + #define PIE_SPEC NO_PIE_SPEC "|r|shared:;" + #define NO_FPIE1_SPEC "fno-pie" + #define FPIE1_SPEC NO_FPIE1_SPEC ":;" +@@ -919,7 +919,7 @@ 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:--no-dynamic-linker -Bsymbolic}" + #endif + #else + #define LD_PIE_SPEC "" diff --git a/patches/gcc-7.3.0/0011-j2.diff b/patches/gcc-7.3.0/0011-j2.diff new file mode 100644 index 0000000..61b81a9 --- /dev/null +++ b/patches/gcc-7.3.0/0011-j2.diff @@ -0,0 +1,346 @@ +diff --git a/gcc/config.gcc b/gcc/config.gcc +index 6e75bd45fb9..8ab5f15ea8e 100644 +--- a/gcc/config.gcc ++++ b/gcc/config.gcc +@@ -474,7 +474,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" +@@ -2664,18 +2664,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 +@@ -2742,6 +2742,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 +@@ -2763,7 +2764,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 +@@ -2772,9 +2773,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`" +@@ -2789,7 +2790,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}" +@@ -2806,7 +2808,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" +@@ -4380,6 +4382,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 +@@ -4589,7 +4593,7 @@ case ${target} in + tmake_file="rs6000/t-rs6000 ${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 ff79b93adc2..5fe3f3bfe69 100644 +--- a/gcc/config/sh/sh.c ++++ b/gcc/config/sh/sh.c +@@ -662,6 +662,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"; +@@ -669,6 +670,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; +@@ -747,6 +749,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 +@@ -803,6 +808,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 b13d1b3c943..9e24649d189 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 +@@ -1568,7 +1576,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 +@@ -1833,6 +1841,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 c4f0d964d00..792af395b5d 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 b46ac3131a8..72705583f84 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 409554a8c8d..d354c11c8f2 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-7.3.0/0012-s390x-muslldso.diff b/patches/gcc-7.3.0/0012-s390x-muslldso.diff new file mode 100644 index 0000000..b6c8e7e --- /dev/null +++ b/patches/gcc-7.3.0/0012-s390x-muslldso.diff @@ -0,0 +1,14 @@ +diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h +index 739df00f62d..ccd48ee7b84 100644 +--- a/gcc/config/s390/linux.h ++++ b/gcc/config/s390/linux.h +@@ -76,6 +76,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-7.3.0/0013-microblaze-pr65649.diff b/patches/gcc-7.3.0/0013-microblaze-pr65649.diff new file mode 100644 index 0000000..2d64a86 --- /dev/null +++ b/patches/gcc-7.3.0/0013-microblaze-pr65649.diff @@ -0,0 +1,22 @@ +diff --git a/gcc/config/microblaze/microblaze.c b/gcc/config/microblaze/microblaze.c +index d0f86fd4607..dc34ab960bf 100644 +--- a/gcc/config/microblaze/microblaze.c ++++ b/gcc/config/microblaze/microblaze.c +@@ -2375,7 +2375,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 + { +@@ -2434,7 +2434,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-7.3.0/0014-ldbl128-config.diff b/patches/gcc-7.3.0/0014-ldbl128-config.diff new file mode 100644 index 0000000..a1ee4d0 --- /dev/null +++ b/patches/gcc-7.3.0/0014-ldbl128-config.diff @@ -0,0 +1,63 @@ +diff --git a/gcc/configure b/gcc/configure +index 043a62b0de9..cbb10aca436 100755 +--- a/gcc/configure ++++ b/gcc/configure +@@ -29054,6 +29054,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 +@@ -29065,6 +29074,10 @@ else + && gcc_cv_target_ldbl128=yes + + fi ++ ++ ;; ++ esac ++ + fi + + ;; +diff --git a/gcc/configure.ac b/gcc/configure.ac +index 2b52da3bbcc..31154c73858 100644 +--- a/gcc/configure.ac ++++ b/gcc/configure.ac +@@ -5801,13 +5801,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-7.3.0/0015-m68k.diff b/patches/gcc-7.3.0/0015-m68k.diff new file mode 100644 index 0000000..fd5ba39 --- /dev/null +++ b/patches/gcc-7.3.0/0015-m68k.diff @@ -0,0 +1,27 @@ +diff --git a/gcc/config/m68k/linux.h b/gcc/config/m68k/linux.h +index c6e005604d4..868c9cc3265 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 9ea39d454aa..ecab17d3ee7 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