patches/gcc/0005-libitm-test-fix.patch

   1 From 300560c8d4a63c9bb43a01289269cec707e5ea6d Mon Sep 17 00:00:00 2001
   2 From: Szabolcs Nagy <nsz@port70.net>
   3 Date: Sun, 6 Nov 2016 03:13:26 +0000
   4 Subject: [PATCH 05/13] libitm test fix
   5
   6 ---
   7  libitm/testsuite/Makefile.am    | 6 ++++++
   8  libitm/testsuite/Makefile.in    | 5 +++++
   9  libitm/testsuite/lib/libitm.exp | 3 +++
  10  3 files changed, 14 insertions(+)
  11
  12 diff --git a/libitm/testsuite/Makefile.am b/libitm/testsuite/Makefile.am
  13 index 41cfbc46e4b..16f82bdf691 100644
  14 --- a/libitm/testsuite/Makefile.am
  15 +++ b/libitm/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)
  20 +
  21 +EXTRA_DEJAGNU_SITE_CONFIG = extra.exp
  22 +
  23 +extra.exp:
  24 +       echo 'set BUILD_CC "$(CC)"' > $@.tmp
  25 +       mv $@.tmp $@
  26 diff --git a/libitm/testsuite/Makefile.in b/libitm/testsuite/Makefile.in
  27 index 991f02c0b3b..fa331cabfc4 100644
  28 --- a/libitm/testsuite/Makefile.in
  29 +++ b/libitm/testsuite/Makefile.in
  30 @@ -285,6 +285,7 @@ _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \
  31              echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi)
  32
  33  RUNTEST = $(_RUNTEST) $(AM_RUNTESTFLAGS)
  34 +EXTRA_DEJAGNU_SITE_CONFIG = extra.exp
  35  all: all-am
  36
  37  .SUFFIXES:
  38 @@ -492,6 +493,10 @@ uninstall-am:
  39  .PRECIOUS: Makefile
  40
  41
  42 +extra.exp:
  43 +       echo 'set BUILD_CC "$(CC)"' > $@.tmp
  44 +       mv $@.tmp $@
  45 +
  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/libitm/testsuite/lib/libitm.exp b/libitm/testsuite/lib/libitm.exp
  50 index b3d247b9f98..47c2cd55dac 100644
  51 --- a/libitm/testsuite/lib/libitm.exp
  52 +++ b/libitm/testsuite/lib/libitm.exp
  53 @@ -77,6 +77,7 @@ proc libitm_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 @@ -92,6 +93,8 @@ proc libitm_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]"
  69         }
  70 --
  71 2.21.0
  72