On Mon, Oct 02, 2017 at 01:32:01PM +0200, Jakub Jelinek wrote:
> On Mon, Oct 02, 2017 at 01:12:24PM +0200, Martin Liška wrote:
> > Hi.
> >
> > Currently I see with --with-build-config=bootstrap-ubsan:
> >
> > /home/marxin/BIG/buildbot/slave/gcc-master-bootstrap-ubsan/build/builddir/prev-x86_64-pc-linux-gnu/libsanitizer/ubsan/.libs/libubsan.a(elf.o):
> > In function `backtrace_uncompress_zdebug':
> > /home/marxin/BIG/buildbot/slave/gcc-master-bootstrap-ubsan/build/builddir/x86_64-pc-linux-gnu/libsanitizer/libbacktrace/../../.././../libsanitizer/libbacktrace/../../libbacktrace/elf.c:2489:
> > multiple definition of `backtrace_uncompress_zdebug'
> > ../libbacktrace/.libs/libbacktrace.a(elf.o):/home/marxin/BIG/buildbot/slave/gcc-master-bootstrap-ubsan/build/builddir/libbacktrace/.././../libbacktrace/elf.c:2489:
> > first defined here
> > collect2: error: ld returned 1 exit status
> > make[3]: *** [Makefile:2904: gcov] Error 1
> > make[3]: *** Waiting for unfinished jobs....
>
> I think this should fix it, I'm going to bootstrap/regtest this now (though
> not --with-build-config=bootstrap-ubsan).
>
> 2017-10-02 Jakub Jelinek <ja...@redhat.com>
>
> * libbacktrace/backtrace-rename.h (backtrace_uncompress_zdebug):
> Define.
Committed as obvious after bootstrap/regtest on x86_64-linux and i686-linux.
>
> --- libsanitizer/libbacktrace/backtrace-rename.h.jj 2014-09-25
> 15:01:25.000000000 +0200
> +++ libsanitizer/libbacktrace/backtrace-rename.h 2017-10-02
> 13:30:23.096271411 +0200
> @@ -11,6 +11,7 @@
> #define backtrace_qsort __asan_backtrace_qsort
> #define backtrace_release_view __asan_backtrace_release_view
> #define backtrace_syminfo __asan_backtrace_syminfo
> +#define backtrace_uncompress_zdebug __asan_backtrace_uncompress_zdebug
> #define backtrace_vector_finish __asan_backtrace_vector_finish
> #define backtrace_vector_grow __asan_backtrace_vector_grow
> #define backtrace_vector_release __asan_backtrace_vector_release
Jakub
