mirror of
https://github.com/pmmp/musl-cross-make.git
synced 2025-02-24 09:35:00 +00:00
7ea487218f
new patch: 0017-c++-abi-break.diff fixes a C++ ABI break regression. 0010-static-pie-support.diff was removed as it doesn't apply anymore, and forward-porting it requires arcane knowledge of GCC details. the patches 0018 and 0019 have been copied from GCC 7.3.0. the static pie patch from GCC 6.4.0, renumbered 0020, depends on the reversions they make.
59 lines
2.0 KiB
Diff
59 lines
2.0 KiB
Diff
diff --git a/libatomic/testsuite/Makefile.am b/libatomic/testsuite/Makefile.am
|
|
index 561b7e2..2548a1b 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 34f83e0..4af67ad 100644
|
|
--- a/libatomic/testsuite/Makefile.in
|
|
+++ b/libatomic/testsuite/Makefile.in
|
|
@@ -222,6 +222,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:
|
|
@@ -428,6 +429,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 cafab54..dd2e1a4 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]"
|
|
}
|