From: Jack Howarth <howarth@bromo.med.uc.edu>
Date: Thu, 6 Dec 2012 14:49:44 +0000 (+0000)
Subject: Fix PR55599/sanitizer by disabling static libasan on darwin
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3157880f5368588bfadae12c4ba1b52c4fdee75a;p=gcc.git

Fix PR55599/sanitizer by disabling static libasan on darwin

From-SVN: r194257
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 30bb3f96ae1..7da4e1fc89e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-06  Jack Howarth <howarth@bromo.med.uc.edu>
+
+	PR 55599/sanitizer
+        * config/darwin.h (LINK_COMMAND_SPEC_A): Remove static libasan support.
+
 2012-12-06  Jakub Jelinek  <jakub@redhat.com>
 
 	PR middle-end/43631
diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
index 0eb3474ecdd..3a996705abe 100644
--- a/gcc/config/darwin.h
+++ b/gcc/config/darwin.h
@@ -180,9 +180,7 @@ extern GTY(()) int darwin_ms_struct;
     %{L*} %(link_libgcc) %o %{fprofile-arcs|fprofile-generate*|coverage:-lgcov} \
     %{fopenmp|ftree-parallelize-loops=*: \
       %{static|static-libgcc|static-libstdc++|static-libgfortran: libgomp.a%s; : -lgomp } } \
-    %{fsanitize=address: \
-      %{static|static-libasan|static-libgcc|static-libgfortran: -framework CoreFoundation -lstdc++ libasan.a%s; \
-      static-libstdc++: -framework CoreFoundation libstdc++.a%s libasan.a%s; : -framework CoreFoundation -lasan } } \
+    %{fsanitize=address: -framework CoreFoundation -lasan } \
     %{fgnu-tm: \
       %{static|static-libgcc|static-libstdc++|static-libgfortran: libitm.a%s; : -litm } } \
     %{!nostdlib:%{!nodefaultlibs:\
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index ff5188f26cf..b2a4b2999a6 100644
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-06  Jack Howarth <howarth@bromo.med.uc.edu>
+
+	PR 55599/sanitizer
+        * configure.ac: Set enable_static=no on darwin.
+        * configure: Regenerated.
+
 2012-12-06  Kostya Serebryany  <kcc@google.com>
 
 	* All files: Merge from upstream r169392.
diff --git a/libsanitizer/configure b/libsanitizer/configure
index 1d64feff57b..51bb7952133 100755
--- a/libsanitizer/configure
+++ b/libsanitizer/configure
@@ -14497,7 +14497,7 @@ fi
 
 
 case "$host" in
-  *-*-darwin*) MAC_INTERPOSE=true ;;
+  *-*-darwin*) MAC_INTERPOSE=true ; enable_static=no ;;
   *) MAC_INTERPOSE=false ;;
 esac
  if $MAC_INTERPOSE; then
diff --git a/libsanitizer/configure.ac b/libsanitizer/configure.ac
index 49f9cd730c3..30614e566a4 100644
--- a/libsanitizer/configure.ac
+++ b/libsanitizer/configure.ac
@@ -81,7 +81,7 @@ unset TSAN_SUPPORTED
 AM_CONDITIONAL(TSAN_SUPPORTED, [test "x$TSAN_SUPPORTED" = "xyes"])
 
 case "$host" in
-  *-*-darwin*) MAC_INTERPOSE=true ;;
+  *-*-darwin*) MAC_INTERPOSE=true ; enable_static=no ;;
   *) MAC_INTERPOSE=false ;;
 esac
 AM_CONDITIONAL(USING_MAC_INTERPOSE, $MAC_INTERPOSE)