diff options
| author | Jack Howarth <howarth@bromo.med.uc.edu> | 2012-12-06 14:49:44 +0000 |
|---|---|---|
| committer | Kostya Serebryany <kcc@gcc.gnu.org> | 2012-12-06 14:49:44 +0000 |
| commit | 3157880f5368588bfadae12c4ba1b52c4fdee75a (patch) | |
| tree | e0909cffc6a0662e5db1d547a7e862206ec46366 | |
| parent | 9e04d8a2a0619f682eb318cd132ef9d62d142815 (diff) | |
| download | gcc-3157880f5368588bfadae12c4ba1b52c4fdee75a.zip gcc-3157880f5368588bfadae12c4ba1b52c4fdee75a.tar.gz gcc-3157880f5368588bfadae12c4ba1b52c4fdee75a.tar.bz2 | |
Fix PR55599/sanitizer by disabling static libasan on darwin
From-SVN: r194257
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/config/darwin.h | 4 | ||||
| -rw-r--r-- | libsanitizer/ChangeLog | 6 | ||||
| -rwxr-xr-x | libsanitizer/configure | 2 | ||||
| -rw-r--r-- | libsanitizer/configure.ac | 2 |
5 files changed, 14 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 30bb3f9..7da4e1f 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 0eb3474..3a99670 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 ff5188f..b2a4b29 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 1d64fef..51bb795 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 49f9cd7..30614e5 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) |