blob: c3c5784186c97762889724a8b9fd02feca8a6184 [file] [log] [blame]
Brad Bishop316dfdd2018-06-25 12:45:53 -04001From 564f800e3e24647c095f7a321bf3ebdccfbf762d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 2 Sep 2017 12:02:04 -0700
4Subject: [PATCH] Disable libunwind on aarch64
Brad Bishopd7bf8c12018-02-25 22:55:05 -05005
6Fixes hangs when using libtcmalloc.so
7
8Upstream-Status: Pending
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10
Brad Bishop316dfdd2018-06-25 12:45:53 -040011---
12 configure.ac | 5 +++++
13 1 file changed, 5 insertions(+)
14
15diff --git a/configure.ac b/configure.ac
16index 8154c5c..063b260 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -69,6 +69,11 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(, [return __PPC64__])],
Brad Bishopd7bf8c12018-02-25 22:55:05 -050020 [default_enable_libunwind=yes
21 default_tcmalloc_pagesize=8])
22
23+# Disable libunwind linking on aarch64 by default.
24+AC_COMPILE_IFELSE([AC_LANG_PROGRAM(, [return __aarch64__])],
25+ [default_enable_libunwind=no],
26+ [default_enable_libunwind=yes])
27+
28 AC_ARG_ENABLE([cpu-profiler],
29 [AS_HELP_STRING([--disable-cpu-profiler],
30 [do not build the cpu profiler])],