diff options
| author | iains <iains@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-09-01 12:16:07 +0000 |
|---|---|---|
| committer | iains <iains@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-09-01 12:16:07 +0000 |
| commit | 22e8a488828fa5670c13c7277c8c399e6d8076c8 (patch) | |
| tree | a9a3ef71fa2f5a65f269a5dda95fc47d086a57c5 /libsanitizer | |
| parent | d21755bc4ed62a1eaae58dcdfa114fb46a8aa046 (diff) | |
| download | ppe42-gcc-22e8a488828fa5670c13c7277c8c399e6d8076c8.tar.gz ppe42-gcc-22e8a488828fa5670c13c7277c8c399e6d8076c8.zip | |
gcc:
* config/darwin.h (LINK_COMMAND_SPEC_A): Revise sanitizer specs to
include sanitize(undefined).
libsanitizer:
* ubsan/Makefile.am (libubsan_la_LIBADD): Revise to omit
libinterception.la for Darwin.
* ubsan/Makefile.in: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@202144 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libsanitizer')
| -rw-r--r-- | libsanitizer/ChangeLog | 6 | ||||
| -rw-r--r-- | libsanitizer/ubsan/Makefile.am | 6 | ||||
| -rw-r--r-- | libsanitizer/ubsan/Makefile.in | 8 |
3 files changed, 16 insertions, 4 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index ffef18b29d9..f5162c90250 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,9 @@ +2013-09-01 Iain Sandoe <iain@codesourcery.com> + + * ubsan/Makefile.am (libubsan_la_LIBADD): Revise to omit + libinterception.la for Darwin. + * ubsan/Makefile.in: Regenerate. + 2013-08-30 Jakub Jelinek <jakub@redhat.com> * Makefile.am (SUBDIRS): Add ubsan. diff --git a/libsanitizer/ubsan/Makefile.am b/libsanitizer/ubsan/Makefile.am index 0921d95aa17..e98984a757b 100644 --- a/libsanitizer/ubsan/Makefile.am +++ b/libsanitizer/ubsan/Makefile.am @@ -18,7 +18,11 @@ ubsan_files = \ ubsan_value.cc libubsan_la_SOURCES = $(ubsan_files) -libubsan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la $(top_builddir)/interception/libinterception.la $(LIBSTDCXX_RAW_CXX_LDFLAGS) +libubsan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la +if !USING_MAC_INTERPOSE +libubsan_la_LIBADD += $(top_builddir)/interception/libinterception.la +endif +libubsan_la_LIBADD += $(LIBSTDCXX_RAW_CXX_LDFLAGS) libubsan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lpthread -ldl # Work around what appears to be a GNU make bug handling MAKEFLAGS diff --git a/libsanitizer/ubsan/Makefile.in b/libsanitizer/ubsan/Makefile.in index 948c2449bf9..68125387540 100644 --- a/libsanitizer/ubsan/Makefile.in +++ b/libsanitizer/ubsan/Makefile.in @@ -35,6 +35,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ +@USING_MAC_INTERPOSE_FALSE@am__append_1 = $(top_builddir)/interception/libinterception.la subdir = ubsan DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -79,8 +80,7 @@ LTLIBRARIES = $(toolexeclib_LTLIBRARIES) am__DEPENDENCIES_1 = libubsan_la_DEPENDENCIES = \ $(top_builddir)/sanitizer_common/libsanitizer_common.la \ - $(top_builddir)/interception/libinterception.la \ - $(am__DEPENDENCIES_1) + $(am__append_1) $(am__DEPENDENCIES_1) am__objects_1 = ubsan_diag.lo ubsan_handlers.lo ubsan_handlers_cxx.lo \ ubsan_type_hash.lo ubsan_value.lo am_libubsan_la_OBJECTS = $(am__objects_1) @@ -253,7 +253,9 @@ ubsan_files = \ ubsan_value.cc libubsan_la_SOURCES = $(ubsan_files) -libubsan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la $(top_builddir)/interception/libinterception.la $(LIBSTDCXX_RAW_CXX_LDFLAGS) +libubsan_la_LIBADD = \ + $(top_builddir)/sanitizer_common/libsanitizer_common.la \ + $(am__append_1) $(LIBSTDCXX_RAW_CXX_LDFLAGS) libubsan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lpthread -ldl # Work around what appears to be a GNU make bug handling MAKEFLAGS |
