From 38a8aecfb882072900434499696b5c32a2274515 Mon Sep 17 00:00:00 2001 From: Rong Xu Date: Mon, 21 Jul 2014 16:47:22 -0700 Subject: [4.9] Switch gcc-4.9 to use google/gcc-4_9 branch. This source drop uses svn version r212828 of google/gcc-4.9 branch. We also cherry-picked r213062, r213063 and r213064 to fix windows build issues. All gcc-4.9 patches before July 3rd are ported to google/gcc-4.9. The following prior commits has not been merged to google branch yet. (They are included in this commit). e7af147f979e657fe2df00808e5b4319b0e088c6, baf87df3cb2683649ba7e9872362a7e721117c23, and c231900e5dcc14d8296bd9f62b45997a49d4d5e7. Change-Id: I4bea3ea470387ff751c2be4cb0d4a12059b9299b --- gcc-4.9/gcc/testsuite/lib/ubsan-dg.exp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gcc-4.9/gcc/testsuite/lib/ubsan-dg.exp') diff --git a/gcc-4.9/gcc/testsuite/lib/ubsan-dg.exp b/gcc-4.9/gcc/testsuite/lib/ubsan-dg.exp index fecce7bf0..a8eb4f7aa 100644 --- a/gcc-4.9/gcc/testsuite/lib/ubsan-dg.exp +++ b/gcc-4.9/gcc/testsuite/lib/ubsan-dg.exp @@ -75,12 +75,12 @@ proc ubsan_init { args } { set ubsan_saved_TEST_ALWAYS_FLAGS $TEST_ALWAYS_FLAGS } if [info exists ALWAYS_CXXFLAGS] { - set ALWAYS_CXXFLAGS [concat "{ldflags=$link_flags}" $ALWAYS_CXXFLAGS] + set ALWAYS_CXXFLAGS [concat "{ldflags=$link_flags -static-libubsan}" $ALWAYS_CXXFLAGS] } else { if [info exists TEST_ALWAYS_FLAGS] { - set TEST_ALWAYS_FLAGS "$link_flags $TEST_ALWAYS_FLAGS" + set TEST_ALWAYS_FLAGS "$link_flags -static-libubsan $TEST_ALWAYS_FLAGS" } else { - set TEST_ALWAYS_FLAGS "$link_flags" + set TEST_ALWAYS_FLAGS "$link_flags -static-libubsan" } } if { $link_flags != "" } { -- cgit v1.2.3