diff options
| -rw-r--r-- | libsanitizer/ChangeLog | 7 | ||||
| -rw-r--r-- | libsanitizer/asan/Makefile.am | 1 | ||||
| -rw-r--r-- | libsanitizer/asan/Makefile.in | 24 | ||||
| -rwxr-xr-x | libsanitizer/merge.sh | 1 |
4 files changed, 10 insertions, 23 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index ece68cbab53..7f8f6ad7758 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,10 @@ +2013-02-21 Jack Howarth <howarth@bromo.med.uc.edu> + + * asan/Makefile.am (libasan_la_SOURCES): Remove deprecated + dynamic/asan_interceptors_dynamic.cc. + * asan/Makefile.in: Regenerated. + * merge.sh: Remove merge of deprecated lib/asan/dynamic. + 2013-02-21 Jakub Jelinek <jakub@redhat.com> * asan/asan_rtl.cc (__asan_preinit): Don't add if PIC macro is diff --git a/libsanitizer/asan/Makefile.am b/libsanitizer/asan/Makefile.am index bfd9e2e5524..b3ca3df31e1 100644 --- a/libsanitizer/asan/Makefile.am +++ b/libsanitizer/asan/Makefile.am @@ -37,7 +37,6 @@ asan_files = \ libasan_la_SOURCES = $(asan_files) if USING_MAC_INTERPOSE -libasan_la_SOURCES += dynamic/asan_interceptors_dynamic.cc libasan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la else libasan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la $(top_builddir)/interception/libinterception.la diff --git a/libsanitizer/asan/Makefile.in b/libsanitizer/asan/Makefile.in index 672fbbf2348..d5688be6ba2 100644 --- a/libsanitizer/asan/Makefile.in +++ b/libsanitizer/asan/Makefile.in @@ -36,7 +36,6 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ @USING_MAC_INTERPOSE_TRUE@am__append_1 = -DMAC_INTERPOSE_FUNCTIONS -DMISSING_BLOCKS_SUPPORT -@USING_MAC_INTERPOSE_TRUE@am__append_2 = dynamic/asan_interceptors_dynamic.cc subdir = asan DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -84,13 +83,6 @@ am__DEPENDENCIES_1 = @USING_MAC_INTERPOSE_FALSE@ $(am__DEPENDENCIES_1) @USING_MAC_INTERPOSE_TRUE@libasan_la_DEPENDENCIES = $(top_builddir)/sanitizer_common/libsanitizer_common.la \ @USING_MAC_INTERPOSE_TRUE@ $(am__DEPENDENCIES_1) -am__libasan_la_SOURCES_DIST = asan_allocator.cc asan_allocator2.cc \ - asan_interceptors.cc asan_mac.cc asan_malloc_mac.cc \ - asan_new_delete.cc asan_posix.cc asan_rtl.cc asan_stats.cc \ - asan_thread_registry.cc asan_fake_stack.cc asan_globals.cc \ - asan_linux.cc asan_malloc_linux.cc asan_malloc_win.cc \ - asan_poisoning.cc asan_report.cc asan_stack.cc asan_thread.cc \ - asan_win.cc dynamic/asan_interceptors_dynamic.cc am__objects_1 = asan_allocator.lo asan_allocator2.lo \ asan_interceptors.lo asan_mac.lo asan_malloc_mac.lo \ asan_new_delete.lo asan_posix.lo asan_rtl.lo asan_stats.lo \ @@ -98,9 +90,7 @@ am__objects_1 = asan_allocator.lo asan_allocator2.lo \ asan_linux.lo asan_malloc_linux.lo asan_malloc_win.lo \ asan_poisoning.lo asan_report.lo asan_stack.lo asan_thread.lo \ asan_win.lo -@USING_MAC_INTERPOSE_TRUE@am__objects_2 = \ -@USING_MAC_INTERPOSE_TRUE@ asan_interceptors_dynamic.lo -am_libasan_la_OBJECTS = $(am__objects_1) $(am__objects_2) +am_libasan_la_OBJECTS = $(am__objects_1) libasan_la_OBJECTS = $(am_libasan_la_OBJECTS) libasan_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ @@ -119,7 +109,7 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(libasan_la_SOURCES) -DIST_SOURCES = $(am__libasan_la_SOURCES_DIST) +DIST_SOURCES = $(libasan_la_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -289,7 +279,7 @@ asan_files = \ asan_thread.cc \ asan_win.cc -libasan_la_SOURCES = $(asan_files) $(am__append_2) +libasan_la_SOURCES = $(asan_files) @USING_MAC_INTERPOSE_FALSE@libasan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la \ @USING_MAC_INTERPOSE_FALSE@ $(top_builddir)/interception/libinterception.la \ @USING_MAC_INTERPOSE_FALSE@ $(LIBSTDCXX_RAW_CXX_LDFLAGS) @@ -415,7 +405,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asan_fake_stack.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asan_globals.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asan_interceptors.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asan_interceptors_dynamic.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asan_linux.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asan_mac.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asan_malloc_linux.Plo@am__quote@ @@ -453,13 +442,6 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -asan_interceptors_dynamic.lo: dynamic/asan_interceptors_dynamic.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT asan_interceptors_dynamic.lo -MD -MP -MF $(DEPDIR)/asan_interceptors_dynamic.Tpo -c -o asan_interceptors_dynamic.lo `test -f 'dynamic/asan_interceptors_dynamic.cc' || echo '$(srcdir)/'`dynamic/asan_interceptors_dynamic.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/asan_interceptors_dynamic.Tpo $(DEPDIR)/asan_interceptors_dynamic.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='dynamic/asan_interceptors_dynamic.cc' object='asan_interceptors_dynamic.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o asan_interceptors_dynamic.lo `test -f 'dynamic/asan_interceptors_dynamic.cc' || echo '$(srcdir)/'`dynamic/asan_interceptors_dynamic.cc - mostlyclean-libtool: -rm -f *.lo diff --git a/libsanitizer/merge.sh b/libsanitizer/merge.sh index d2e622aeb1a..9c29b319829 100755 --- a/libsanitizer/merge.sh +++ b/libsanitizer/merge.sh @@ -66,7 +66,6 @@ CUR_REV=$(get_current_rev) echo Current upstream revision: $CUR_REV merge include/sanitizer include/sanitizer merge lib/asan asan -merge lib/asan/dynamic asan/dynamic merge lib/tsan/rtl tsan merge lib/sanitizer_common sanitizer_common merge lib/interception interception |