Patchwork libsanitizer merge from upstream r175733

login
register
mail settings
Submitter Jack Howarth
Date Feb. 21, 2013, 3:06 p.m.
Message ID <20130221150612.GA11761@bromo.med.uc.edu>
Download mbox | patch
Permalink /patch/222321/
State New
Headers show

Comments

Jack Howarth - Feb. 21, 2013, 3:06 p.m.
On Thu, Feb 21, 2013 at 03:45:04PM +0100, Jakub Jelinek wrote:
> On Thu, Feb 21, 2013 at 03:29:40PM +0100, Dominique Dhumieres wrote:
> > The failure on x86_64-apple-darwin10 is
> > 
> > ...
> > true "AR_FLAGS=rc" "CC_FOR_BUILD=gcc" "CC_FOR_TARGET=/opt/gcc/build_w/./gcc/xgcc -B/opt/gcc/build_w/./gcc/" "CFLAGS=-g -O2  -m32" "CXXFLAGS=-g -O2  -m32" "CFLAGS_FOR_BUILD=-g -O2" "CFLAGS_FOR_TARGET=-g -O2" "INSTALL=/sw64/bin/ginstall -c" "INSTALL_DATA=/sw64/bin/ginstall -c -m 644" "INSTALL_PROGRAM=/sw64/bin/ginstall -c" "INSTALL_SCRIPT=/sw64/bin/ginstall -c" "LDFLAGS=-m32" "LIBCFLAGS=-g -O2  -m32" "LIBCFLAGS_FOR_TARGET=-g -O2" "MAKE=make" "MAKEINFO=makeinfo --split-size=5000000 --split-size=5000000 --split-size=5000000       " "SHELL=/bin/sh" "RUNTESTFLAGS=" "exec_prefix=/opt/gcc/gcc4.8w" "infodir=/opt/gcc/gcc4.8w/share/info" "libdir=/opt/gcc/gcc4.8w/lib" "includedir=/opt/gcc/gcc4.8w/include" "prefix=/opt/gcc/gcc4.8w" "tooldir=/opt/gcc/gcc4.8w/x86_64-apple-darwin10.8.0" "gxx_include_dir=/opt/gcc/gcc4.8w/include/c++/4.8.0" "AR=ar" "AS=/opt/gcc/build_w/./gcc/as" "LD=/opt/gcc/build_w/./gcc/collect-ld" "RANLIB=ranlib" "NM=/opt/gcc/build_w/./gcc/nm" "NM_FOR_BUILD=" "NM_FOR_TARGET=nm" "DESTDIR=" "WERROR=" DO=all multi-do # make
> > Checking multilib configuration for libsanitizer...
> > Making all in sanitizer_common
> > make[4]: Nothing to be done for `all'.
> > Making all in asan
> > make[4]: *** No rule to make target `dynamic/asan_interceptors_dynamic.cc', needed by `asan_interceptors_dynamic.lo'.  Stop.
> > make[3]: *** [all-recursive] Error 1
> > make[2]: *** [all-stage1-target-libsanitizer] Error 2
> > make[1]: *** [stage1-bubble] Error 2
> > make: *** [all] Error 2
> 
> Removed:                                                                                                                                           
>     trunk/libsanitizer/asan/dynamic/asan_interceptors_dynamic.cc                                                                                   


appears to fix the darwin bootstrap after running automake1.11 in libsanitizer.

> 
> Thus I guess perhaps you should try removing
> libasan_la_SOURCES += dynamic/asan_interceptors_dynamic.cc
> line from libsanitizer/asan/Makefile.am
> and run automake to regenerate Makefile.in.
> 
> > On linux it is
> > 
> > /bin/sh ../libtool --tag=CXX   --mode=link /export/gnu/import/git/gcc-test-ia32corei7/bld/./gcc/xgcc -shared-libgcc -B/export/gnu/import/git/gcc-test-ia32corei7/bld/./gcc -nostdinc++ -L/export/gnu/import/git/gcc-test-ia32corei7/bld/i686-linux/libstdc++-v3/src -L/export/gnu/import/git/gcc-test-ia32corei7/bld/i686-linux/libstdc++-v3/src/.libs -B/usr/local/i686-linux/bin/ -B/usr/local/i686-linux/lib/ -isystem /usr/local/i686-linux/include -isystem /usr/local/i686-linux/sys-include    -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros -I../../libstdc++-v3/include     -I../../libstdc++-v3/include/i686-linux     -I../../../../src-trunk/libsanitizer/../libstdc++-v3/libsupc++ -g -O2 -D_GNU_SOURCE -version-info `grep -v '^#' ../../../../src-trunk/libsanitizer/asan/libtool-version` -lpthread -ldl  -o libasan.la -rpath /usr/local/lib 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 asan_thread_registry.lo asan_fake_stack.lo asan_globals.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  ../sanitizer_common/libsanitizer_common.la ../interception/libinterception.la ../../libstdc++-v3/src/libstdc++.la 
> > libtool: link:  /export/gnu/import/git/gcc-test-ia32corei7/bld/./gcc/xgcc -shared-libgcc -B/export/gnu/import/git/gcc-test-ia32corei7/bld/./gcc -nostdinc++ -L/export/gnu/import/git/gcc-test-ia32corei7/bld/i686-linux/libstdc++-v3/src -L/export/gnu/import/git/gcc-test-ia32corei7/bld/i686-linux/libstdc++-v3/src/.libs -B/usr/local/i686-linux/bin/ -B/usr/local/i686-linux/lib/ -isystem /usr/local/i686-linux/include -isystem /usr/local/i686-linux/sys-include    -shared -nostdlib /lib/crti.o /export/gnu/import/git/gcc-test-ia32corei7/bld/./gcc/crtbeginS.o  .libs/asan_allocator.o .libs/asan_allocator2.o .libs/asan_interceptors.o .libs/asan_mac.o .libs/asan_malloc_mac.o .libs/asan_new_delete.o .libs/asan_posix.o .libs/asan_rtl.o .libs/asan_stats.o .libs/asan_thread_registry.o .libs/asan_fake_stack.o .libs/asan_globals.o .libs/asan_linux.o .libs/asan_malloc_linux.o .libs/asan_malloc_win.o .libs/asan_poisoning.o .libs/asan_report.o .libs/asan_stack.o .libs/asan_thread.o .libs/asan_win.o  -Wl,--whole-archive ../sanitizer_common/.libs/libsanitizer_common.a ../interception/.libs/libinterception.a -Wl,--no-whole-archive  -Wl,-rpath -Wl,/export/gnu/import/git/gcc-test-ia32corei7/bld/i686-linux/libstdc++-v3/src/.libs -Wl,-rpath -Wl,/usr/local/lib -L/export/gnu/import/git/gcc-test-ia32corei7/bld/i686-linux/libstdc++-v3/src/.libs -L/export/gnu/import/git/gcc-test-ia32corei7/bld/i686-linux/libstdc++-v3/src -lpthread -ldl ../../libstdc++-v3/src/.libs/libstdc++.so -lm -L/export/gnu/import/git/gcc-test-ia32corei7/bld/./gcc -lc -lgcc_s /export/gnu/import/git/gcc-test-ia32corei7/bld/./gcc/crtendS.o /lib/crtn.o    -Wl,-soname -Wl,libasan.so.0 -o .libs/libasan.so.0.0.0
> > /usr/local32/bin/ld: .libs/asan_rtl.o: .preinit_array section is not allowed in DSO
> > /usr/local32/bin/ld: failed to set dynamic section sizes: Nonrepresentable section on output
> 
> That should be fixed already in r196205.
> 
> 	Jakub
Jakub Jelinek - Feb. 21, 2013, 3:11 p.m.
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
Jack Howarth - Feb. 21, 2013, 3:41 p.m.
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.

Patch

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