From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 3 Dec 2013 16:01:13 +0000 (+0000)
Subject: 	PR sanitizer/59063
X-Git-Tag: upstream/4.9.2~2486
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=95e3a3f64313b10cc2af67beb87b346392f715a0;p=platform%2Fupstream%2Flinaro-gcc.git

	PR sanitizer/59063
	* lib/asan-dg.exp: Don't add anything to flags if libsanitizer
	has not been found.
	* lib/ubsan-dg.exp: Likewise.  Append to flags also
	-B${gccpath}/libsanitizer/.


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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 876fb6e..a8ea26c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2013-12-03  Yury Gribov  <y.gribov@samsung.com>
+
+	PR sanitizer/59063
+	* lib/asan-dg.exp: Don't add anything to flags if libsanitizer
+	has not been found.
+	* lib/ubsan-dg.exp: Likewise.  Append to flags also
+	-B${gccpath}/libsanitizer/.
+
 2013-12-03  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
 
 	* gcc.dg/vect/costmodel/ppc/costmodel-slp-34.c: Skip for little
diff --git a/gcc/testsuite/lib/asan-dg.exp b/gcc/testsuite/lib/asan-dg.exp
index 1e6c7dd..8990677 100644
--- a/gcc/testsuite/lib/asan-dg.exp
+++ b/gcc/testsuite/lib/asan-dg.exp
@@ -39,9 +39,9 @@ proc asan_link_flags { paths } {
     set shlib_ext [get_shlib_extension]
 
     if { $gccpath != "" } {
-      append flags " -B${gccpath}/libsanitizer/ "
       if { [file exists "${gccpath}/libsanitizer/asan/.libs/libasan.a"]
 	   || [file exists "${gccpath}/libsanitizer/asan/.libs/libasan.${shlib_ext}"] } {
+	  append flags " -B${gccpath}/libsanitizer/ "
 	  append flags " -B${gccpath}/libsanitizer/asan/ "
 	  append flags " -L${gccpath}/libsanitizer/asan/.libs "
 	  append ld_library_path ":${gccpath}/libsanitizer/asan/.libs"
diff --git a/gcc/testsuite/lib/ubsan-dg.exp b/gcc/testsuite/lib/ubsan-dg.exp
index 2e6b272..aa01988 100644
--- a/gcc/testsuite/lib/ubsan-dg.exp
+++ b/gcc/testsuite/lib/ubsan-dg.exp
@@ -30,9 +30,10 @@ proc ubsan_link_flags { paths } {
     set shlib_ext [get_shlib_extension]
 
     if { $gccpath != "" } {
-      append flags " -B${gccpath}/libsanitizer/ubsan/ "
       if { [file exists "${gccpath}/libsanitizer/ubsan/.libs/libubsan.a"]
 	   || [file exists "${gccpath}/libsanitizer/ubsan/.libs/libubsan.${shlib_ext}"] } {
+	  append flags " -B${gccpath}/libsanitizer/ "
+	  append flags " -B${gccpath}/libsanitizer/ubsan/ "
 	  append flags " -L${gccpath}/libsanitizer/ubsan/.libs"
 	  append ld_library_path ":${gccpath}/libsanitizer/ubsan/.libs"
       }