1 From 6fc4c3ebff42687eb20f12f2410ec75daa9a02f7 Mon Sep 17 00:00:00 2001
2 From: Szabolcs Nagy <nsz@port70.net>
3 Date: Sun, 6 Nov 2016 03:11:18 +0000
4 Subject: [PATCH 04/12] libgomp test fix
7 libgomp/testsuite/Makefile.am | 5 +++++
8 libgomp/testsuite/Makefile.in | 5 +++++
9 libgomp/testsuite/lib/libgomp.exp | 3 +++
10 3 files changed, 13 insertions(+)
12 diff --git a/libgomp/testsuite/Makefile.am b/libgomp/testsuite/Makefile.am
13 index e2a3f460eb0..3309f71e02e 100644
14 --- a/libgomp/testsuite/Makefile.am
15 +++ b/libgomp/testsuite/Makefile.am
16 @@ -12,6 +12,11 @@ _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \
17 echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi)
18 RUNTEST = "$(_RUNTEST) $(AM_RUNTESTFLAGS)"
20 +EXTRA_DEJAGNU_SITE_CONFIG = extra.exp
23 + echo 'set BUILD_CC "$(CC)"' > $@.tmp
26 # Instead of directly in ../testsuite/libgomp-test-support.exp.in, the
27 # following variables have to be "routed through" this Makefile, for expansion
28 diff --git a/libgomp/testsuite/Makefile.in b/libgomp/testsuite/Makefile.in
29 index 9310138c32c..4c0cc0a3013 100644
30 --- a/libgomp/testsuite/Makefile.in
31 +++ b/libgomp/testsuite/Makefile.in
32 @@ -254,6 +254,7 @@ _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \
33 echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi)
35 RUNTEST = "$(_RUNTEST) $(AM_RUNTESTFLAGS)"
36 +EXTRA_DEJAGNU_SITE_CONFIG = extra.exp
40 @@ -462,6 +463,10 @@ uninstall-am:
41 ps ps-am uninstall uninstall-am
45 + echo 'set BUILD_CC "$(CC)"' > $@.tmp
48 # Instead of directly in ../testsuite/libgomp-test-support.exp.in, the
49 # following variables have to be "routed through" this Makefile, for expansion
50 # of the several (Makefile) variables used therein.
51 diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp
52 index ea3da2cb383..e7df78916ea 100644
53 --- a/libgomp/testsuite/lib/libgomp.exp
54 +++ b/libgomp/testsuite/lib/libgomp.exp
55 @@ -86,6 +86,7 @@ proc libgomp_init { args } {
58 global TOOL_EXECUTABLE TOOL_OPTIONS
61 global TESTING_IN_BUILD_TREE
63 @@ -108,6 +109,8 @@ proc libgomp_init { args } {
64 if ![info exists GCC_UNDER_TEST] then {
65 if [info exists TOOL_EXECUTABLE] {
66 set GCC_UNDER_TEST $TOOL_EXECUTABLE
67 + } elseif [info exists BUILD_CC] {
68 + set GCC_UNDER_TEST $BUILD_CC
70 set GCC_UNDER_TEST "[find_gcc]"