diff options
| author | Tommi Rantala <tt.rantala@gmail.com> | 2012-09-17 14:47:30 +0300 |
|---|---|---|
| committer | Tommi Rantala <tt.rantala@gmail.com> | 2012-09-28 14:50:03 +0300 |
| commit | 58354c94d7472f479cd282c4a8a3a8fb536f5b05 (patch) | |
| tree | faf6ecba3ee6a4b1c076fafc11217c61de532e65 | |
| parent | 848ad53a47e8fbef24a6bf1b624d4ad9fb352fb8 (diff) | |
| download | libunwind-58354c94d7472f479cd282c4a8a3a8fb536f5b05.tar.gz | |
Nuke HAVE_BACKTRACE
We do not really need to care if the system provides `backtrace()',
since we will want to test the one provided in libunwind, not the one
that is provided by the system. The `backtrace()' calls should already
be aliased to `unw_backtrace()', but if that is not working for whatever
reason, we can call `unw_backtrace()' explicitly.
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | tests/Gperf-trace.c | 3 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index f3adafb5..a5e0537d 100644 --- a/configure.ac +++ b/configure.ac @@ -311,7 +311,6 @@ PKG_MAINTAINER=pkg_maintainer old_LIBS="$LIBS" LIBS="" AC_SEARCH_LIBS(backtrace, execinfo) -AM_CONDITIONAL(HAVE_BACKTRACE, test "x$ac_cv_search_backtrace" != xno) LIBS="$old_LIBS" AC_SUBST(build_arch) diff --git a/tests/Gperf-trace.c b/tests/Gperf-trace.c index 87dd5b29..7baf466d 100644 --- a/tests/Gperf-trace.c +++ b/tests/Gperf-trace.c @@ -21,7 +21,6 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include <execinfo.h> #include <memory.h> #include <stdio.h> #include <stdlib.h> @@ -62,7 +61,7 @@ measure_unwind (int maxlevel, double *step) void *buffer[128]; start = gettime (); - level = backtrace(buffer, 128); + level = unw_backtrace(buffer, 128); stop = gettime (); if (level <= maxlevel) diff --git a/tests/Makefile.am b/tests/Makefile.am index 4bbba40e..a367eedc 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -50,9 +50,7 @@ endif #!ARCH_IA64 noinst_PROGRAMS_cdep = forker crasher mapper test-ptrace-misc \ Gperf-simple Lperf-simple -if HAVE_BACKTRACE noinst_PROGRAMS_cdep += Gperf-trace Lperf-trace -endif if SUPPORT_CXX_EXCEPTIONS check_PROGRAMS_cdep += Ltest-cxx-exceptions |