Message ID | 20130221150612.GA11761@bromo.med.uc.edu |
---|---|
State | New |
Headers | show |
On Thu, Feb 21, 2013 at 10:06:12AM -0500, Jack Howarth wrote: > 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 > > appears to fix the darwin bootstrap after running automake1.11 in libsanitizer. Patch preapproved with proper ChangeLog entry. Jakub
On Thu, Feb 21, 2013 at 04:11:56PM +0100, Jakub Jelinek wrote: > On Thu, Feb 21, 2013 at 10:06:12AM -0500, Jack Howarth wrote: > > > 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 > > > > appears to fix the darwin bootstrap after running automake1.11 in libsanitizer. > > Patch preapproved with proper ChangeLog entry. > > Jakub No regressions in asan.exp for the resulting build on x86_64-apple-darwin12.
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