move the dragora-mouse tool to archive/dragora-tools/ directory
[dragora.git] / patches / gcc / 0003-libatomic-test-fix.patch
blob985016e26c85c6dd8dd4271819a4931cb5f5b1ae
1 From c5ac3ad154c06cd4ae7332051735f0d3ceb82d6b Mon Sep 17 00:00:00 2001
2 From: Szabolcs Nagy <nsz@port70.net>
3 Date: Sat, 7 May 2016 22:39:20 +0000
4 Subject: [PATCH 03/12] libatomic test fix
6 ---
7 libatomic/testsuite/Makefile.am | 6 ++++++
8 libatomic/testsuite/Makefile.in | 5 +++++
9 libatomic/testsuite/lib/libatomic.exp | 3 +++
10 3 files changed, 14 insertions(+)
12 diff --git a/libatomic/testsuite/Makefile.am b/libatomic/testsuite/Makefile.am
13 index a9a0144185a..a19101aac54 100644
14 --- a/libatomic/testsuite/Makefile.am
15 +++ b/libatomic/testsuite/Makefile.am
16 @@ -11,3 +11,9 @@ EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \
17 _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \
18 echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi)
19 RUNTEST = "$(_RUNTEST) $(AM_RUNTESTFLAGS)"
21 +EXTRA_DEJAGNU_SITE_CONFIG = extra.exp
23 +extra.exp:
24 + echo 'set BUILD_CC "$(CC)"' > $@.tmp
25 + mv $@.tmp $@
26 diff --git a/libatomic/testsuite/Makefile.in b/libatomic/testsuite/Makefile.in
27 index 0a7ac4b4dc7..704db219fa3 100644
28 --- a/libatomic/testsuite/Makefile.in
29 +++ b/libatomic/testsuite/Makefile.in
30 @@ -226,6 +226,7 @@ _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \
31 echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi)
33 RUNTEST = "$(_RUNTEST) $(AM_RUNTESTFLAGS)"
34 +EXTRA_DEJAGNU_SITE_CONFIG = extra.exp
35 all: all-am
37 .SUFFIXES:
38 @@ -432,6 +433,10 @@ uninstall-am:
39 uninstall uninstall-am
42 +extra.exp:
43 + echo 'set BUILD_CC "$(CC)"' > $@.tmp
44 + mv $@.tmp $@
46 # Tell versions [3.59,3.63) of GNU make to not export all variables.
47 # Otherwise a system limit (for SysV at least) may be exceeded.
48 .NOEXPORT:
49 diff --git a/libatomic/testsuite/lib/libatomic.exp b/libatomic/testsuite/lib/libatomic.exp
50 index 0a53f9e11f1..51b35919f2d 100644
51 --- a/libatomic/testsuite/lib/libatomic.exp
52 +++ b/libatomic/testsuite/lib/libatomic.exp
53 @@ -75,6 +75,7 @@ proc libatomic_init { args } {
54 global ALWAYS_CFLAGS
55 global CFLAGS
56 global TOOL_EXECUTABLE TOOL_OPTIONS
57 + global BUILD_CC
58 global GCC_UNDER_TEST
59 global TESTING_IN_BUILD_TREE
60 global target_triplet
61 @@ -90,6 +91,8 @@ proc libatomic_init { args } {
62 if ![info exists GCC_UNDER_TEST] then {
63 if [info exists TOOL_EXECUTABLE] {
64 set GCC_UNDER_TEST $TOOL_EXECUTABLE
65 + } elseif [info exists BUILD_CC] {
66 + set GCC_UNDER_TEST $BUILD_CC
67 } else {
68 set GCC_UNDER_TEST "[find_gcc]"
70 --
71 2.17.1