2014-10-24 Christophe Lyon <christophe.lyon@linaro.org>

	* lib/wrapper.exp ({tool}_maybe_build_wrapper): Clear
	wrap_compile_flags before setting it.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@216638 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4ffc8af8382b6b3bb5fa693d0540a8de5ebd2694..a5d3d3042c0536b04416fd54d51c0b596e8e4692 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-24  Christophe Lyon  <christophe.lyon@linaro.org>
+
+       * lib/wrapper.exp ({tool}_maybe_build_wrapper): Clear
+       wrap_compile_flags before setting it.
+
 2014-10-24  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        * gcc.dg/pr63594-1.c: Apply -mno-mmx to all i?86-*-* and x86_64-*-*

diff --git a/gcc/testsuite/lib/wrapper.exp b/gcc/testsuite/lib/wrapper.exp
index 1291c11309ba9554e438faf6d1b1eaf63fadf11e..6880172b44d1fadd00538aa9e53300c31e68b4ba 100644 (file)
--- a/gcc/testsuite/lib/wrapper.exp
+++ b/gcc/testsuite/lib/wrapper.exp
@@ -34,9 +34,11 @@ proc ${tool}_maybe_build_wrapper { filename args } {
        # became true for dejagnu-1.4.4.  The set of warnings and code
        # that gcc objects on may change, so just make sure -w is always
        # passed to turn off all warnings.
+       unset_currtarget_info wrap_compile_flags
        set_currtarget_info wrap_compile_flags \
            "$saved_wrap_compile_flags -w $flags"
        set result [build_wrapper $filename]
+       unset_currtarget_info wrap_compile_flags
        set_currtarget_info wrap_compile_flags "$saved_wrap_compile_flags"
        if { $result != "" } {
            set gluefile [lindex $result 0]