73 lines
2.3 KiB
Diff
73 lines
2.3 KiB
Diff
|
From 0198bee3c490b2beec24a411b7060be273924e1f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Said Musaev <cpu808694@gmail.com>
|
||
|
|
Date: Thu, 1 Oct 2020 14:34:55 +0200
|
||
|
|
Subject: [PATCH 03/14] libitm-test-fix
|
||
|
|
|
||
|
|
---
|
||
|
|
libitm/testsuite/Makefile.am | 6 ++++++
|
||
|
|
libitm/testsuite/Makefile.in | 5 +++++
|
||
|
|
libitm/testsuite/lib/libitm.exp | 3 +++
|
||
|
|
3 files changed, 14 insertions(+)
|
||
|
|
|
||
|
|
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 120696d1c25..18633fd748a 100644
|
||
|
|
--- a/libitm/testsuite/Makefile.in
|
||
|
|
+++ b/libitm/testsuite/Makefile.in
|
||
|
|
@@ -286,6 +286,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:
|
||
|
|
@@ -493,6 +494,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]"
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.28.0
|
||
|
|
|