gcc/testsuite/

2014-12-04  Yvan Roux  <yvan.roux@linaro.org>

	Backport from trunk r216638.
	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/branches/linaro/gcc-4_9-branch@218386 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/testsuite/ChangeLog.linaro b/gcc/testsuite/ChangeLog.linaro
index c0bab03..8231115 100644 (file)
--- a/gcc/testsuite/ChangeLog.linaro
+++ b/gcc/testsuite/ChangeLog.linaro
@@ -1,5 +1,13 @@
 2014-12-04  Yvan Roux  <yvan.roux@linaro.org>
 
+       Backport from trunk r216638.
+       2014-10-24  Christophe Lyon  <christophe.lyon@linaro.org>
+
+       * lib/wrapper.exp ({tool}_maybe_build_wrapper): Clear
+       wrap_compile_flags before setting it.
+
+2014-12-04  Yvan Roux  <yvan.roux@linaro.org>
+
        Backport from trunk r216544.
        2014-10-22  Jiong Wang  <jiong.wang@arm.com>
 

diff --git a/gcc/testsuite/lib/wrapper.exp b/gcc/testsuite/lib/wrapper.exp
index 1291c11..6880172 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]