[PATCH] Fix darwin bootstrap and merge.sh

[Jack Howarth]

  The attached patch fixes the broken bootstrap on darwin in libsanitizer due to the
deprecation of the dynamic/asan_interceptors_dynamic.cc file. The patch also eliminates
the merge of the deprecated subdirectory in merge.sh. Bootstrap and asan.exp regression
tested on x86_64-apple-darwin12. Okay for gcc trunk?
        Jack
-------------- next part --------------
libsanitizer/

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.

Index: libsanitizer/asan/Makefile.am
===================================================================
--- libsanitizer/asan/Makefile.am	(revision 196205)
+++ libsanitizer/asan/Makefile.am	(working copy)
@@ -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
Index: libsanitizer/merge.sh
===================================================================
--- libsanitizer/merge.sh	(revision 196205)
+++ libsanitizer/merge.sh	(working copy)
@@ -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