From a6c9ab4e1953420f0e8a2d60d3bdccd153a2434a Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Fri, 7 Mar 2014 13:55:54 +0000 Subject: [PATCH] Handle backtrace_qsort * libbacktrace/Makefile.am (libsanitizer_libbacktrace_la_SOURCES): Add ../../libbacktrace/sort.c. * libbacktrace/Makefile.in: Regenerate. * libbacktrace/backtrace-rename.h (backtrace_qsort): Define. From-SVN: r208401 --- libsanitizer/ChangeLog | 7 +++++++ libsanitizer/libbacktrace/Makefile.am | 1 + libsanitizer/libbacktrace/Makefile.in | 11 ++++++++++- libsanitizer/libbacktrace/backtrace-rename.h | 1 + 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 36e10deee4d3..5a6cf6e66bd4 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,10 @@ +2014-03-07 Rainer Orth + + * libbacktrace/Makefile.am (libsanitizer_libbacktrace_la_SOURCES): + Add ../../libbacktrace/sort.c. + * libbacktrace/Makefile.in: Regenerate. + * libbacktrace/backtrace-rename.h (backtrace_qsort): Define. + 2014-03-03 Bill Schmidt * configure.tgt: Unsupported for little endian PowerPC for now. diff --git a/libsanitizer/libbacktrace/Makefile.am b/libsanitizer/libbacktrace/Makefile.am index 39c91aa62b8b..fd9eb65f7eb7 100644 --- a/libsanitizer/libbacktrace/Makefile.am +++ b/libsanitizer/libbacktrace/Makefile.am @@ -50,6 +50,7 @@ libsanitizer_libbacktrace_la_SOURCES = \ ../../libbacktrace/fileline.c \ ../../libbacktrace/internal.h \ ../../libbacktrace/posix.c \ + ../../libbacktrace/sort.c \ ../../libbacktrace/state.c \ ../../libiberty/cp-demangle.c \ bridge.cc diff --git a/libsanitizer/libbacktrace/Makefile.in b/libsanitizer/libbacktrace/Makefile.in index 3dca45b6e832..0dfb53d2c934 100644 --- a/libsanitizer/libbacktrace/Makefile.in +++ b/libsanitizer/libbacktrace/Makefile.in @@ -90,7 +90,7 @@ CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) am__DEPENDENCIES_1 = am_libsanitizer_libbacktrace_la_OBJECTS = atomic.lo dwarf.lo \ - fileline.lo posix.lo state.lo cp-demangle.lo bridge.lo + fileline.lo posix.lo sort.lo state.lo cp-demangle.lo bridge.lo libsanitizer_libbacktrace_la_OBJECTS = \ $(am_libsanitizer_libbacktrace_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) @@ -279,6 +279,7 @@ libsanitizer_libbacktrace_la_SOURCES = \ ../../libbacktrace/fileline.c \ ../../libbacktrace/internal.h \ ../../libbacktrace/posix.c \ + ../../libbacktrace/sort.c \ ../../libbacktrace/state.c \ ../../libiberty/cp-demangle.c \ bridge.cc @@ -371,6 +372,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mmapio.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/posix.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sort.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/state.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unknown.Plo@am__quote@ @@ -423,6 +425,13 @@ posix.lo: ../../libbacktrace/posix.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o posix.lo `test -f '../../libbacktrace/posix.c' || echo '$(srcdir)/'`../../libbacktrace/posix.c +sort.lo: ../../libbacktrace/sort.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sort.lo -MD -MP -MF $(DEPDIR)/sort.Tpo -c -o sort.lo `test -f '../../libbacktrace/sort.c' || echo '$(srcdir)/'`../../libbacktrace/sort.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/sort.Tpo $(DEPDIR)/sort.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../../libbacktrace/sort.c' object='sort.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sort.lo `test -f '../../libbacktrace/sort.c' || echo '$(srcdir)/'`../../libbacktrace/sort.c + state.lo: ../../libbacktrace/state.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT state.lo -MD -MP -MF $(DEPDIR)/state.Tpo -c -o state.lo `test -f '../../libbacktrace/state.c' || echo '$(srcdir)/'`../../libbacktrace/state.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/state.Tpo $(DEPDIR)/state.Plo diff --git a/libsanitizer/libbacktrace/backtrace-rename.h b/libsanitizer/libbacktrace/backtrace-rename.h index af8f36bd2d39..159512f0b551 100644 --- a/libsanitizer/libbacktrace/backtrace-rename.h +++ b/libsanitizer/libbacktrace/backtrace-rename.h @@ -8,6 +8,7 @@ #define backtrace_initialize __asan_backtrace_initialize #define backtrace_open __asan_backtrace_open #define backtrace_pcinfo __asan_backtrace_pcinfo +#define backtrace_qsort __asan_backtrace_qsort #define backtrace_release_view __asan_backtrace_release_view #define backtrace_syminfo __asan_backtrace_syminfo #define backtrace_vector_finish __asan_backtrace_vector_finish -- 2.39.2