mirror of
https://github.com/richfelker/musl-cross-make.git
synced 2025-04-19 23:44:58 +02:00
0e455cd5ba
Rebased the patches for GCC 8.3.0 onto 9.1.0. Not all applied
cleanly, particularly the PIE patch so I had to get a little
creative. Could definitely use an extra pair of eyes on these
patches.
Independent verification of the SHA1 is always appreciated.
Verified compile with the following config.mak:
BINUTILS_VER = 2.32
GCC_VER = 9.1.0
GMP_VER = 6.1.2
MPC_VER = 1.1.0
MPFR_VER = 4.0.2
ISL_VER = 0.21
LINUX_VER = 3.0.35
COMMON_CONFIG += --disable-nls
GCC_CONFIG += --enable-languages=c,c++
GCC_CONFIG += --disable-libquadmath --disable-decimal-float
GCC_CONFIG += --disable-multilib
59 lines
2.0 KiB
Diff
59 lines
2.0 KiB
Diff
diff --git a/libitm/testsuite/Makefile.am b/libitm/testsuite/Makefile.am
|
|
index 41cfbc46e..16f82bdf6 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 991f02c0b..fa331cabf 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 b3d247b9f..47c2cd55d 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]"
|
|
}
|