From 84a34193c2d20b71673cef216b94d27ca7525a95 Mon Sep 17 00:00:00 2001 From: Christophe Lyon Date: Fri, 24 Oct 2014 11:32:05 +0000 Subject: [PATCH] wrapper.exp ({tool}_maybe_build_wrapper): Clear wrap_compile_flags before setting it. 2014-10-24 Christophe Lyon * lib/wrapper.exp ({tool}_maybe_build_wrapper): Clear wrap_compile_flags before setting it. From-SVN: r216638 --- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/lib/wrapper.exp | 2 ++ 2 files changed, 7 insertions(+) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4ffc8af8382..a5d3d3042c0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-10-24 Christophe Lyon + + * lib/wrapper.exp ({tool}_maybe_build_wrapper): Clear + wrap_compile_flags before setting it. + 2014-10-24 Rainer Orth * 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 1291c11309b..6880172b44d 100644 --- 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] -- 2.30.2