Fix PR55599/sanitizer by disabling static libasan on darwin

From-SVN: r194257

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 30bb3f96ae16eab1836021a42e4f5437803c224c..7da4e1fc89e5b3f9e332925906c78b2c52f8b180 100644 (file)
--- 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 0eb3474ecdd714b34b4b70b1433cb92584fc9bde..3a996705abefd807388e1cff6c9725d3310a7e08 100644 (file)
--- 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 ff5188f26cfe570868a006fb238b26419af13d90..b2a4b2999a604d1f98c20c0f9dfd1772859db130 100644 (file)
--- 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 1d64feff57b3191443b73715c87b6262534f0135..51bb795213316c9da8b344648142247568a82824 100755 (executable)
--- 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 49f9cd730c3f9e9296a5d7274f01b7707bfe2f18..30614e566a4399a7d050ebcb35a304d9eb7e8e03 100644 (file)
--- 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)