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

diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index 36e10deee4d35a1420fbb9753280c725d30cef7a..5a6cf6e66bd40be36f08e5bc73ebe74798c71a43 100644 (file)
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,10 @@
+2014-03-07  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * 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  <wschmidt@linux.vnet.ibm.com>
 
        * configure.tgt: Unsupported for little endian PowerPC for now.

diff --git a/libsanitizer/libbacktrace/Makefile.am b/libsanitizer/libbacktrace/Makefile.am
index 39c91aa62b8bfc2c08e8442dbdc40cc544d9bb5c..fd9eb65f7eb70fcf60d9479d862cad00fdcc83d8 100644 (file)
--- 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 3dca45b6e832b7290564f145c63936882b7a5387..0dfb53d2c9349867b95967a6a1adb64ccfaaa684 100644 (file)
--- 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 af8f36bd2d39a909a506f30484224ded324a348d..159512f0b5515abfe036853038fbfdcfd34e4f4a 100644 (file)
--- 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