summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKostya Serebryany <kcc@google.com>2011-12-29 17:29:20 +0000
committerKostya Serebryany <kcc@google.com>2011-12-29 17:29:20 +0000
commit89a4a18118c2a123d1a89aa711fad518e6da857b (patch)
treed59ced7e19afaab87432b7610faefff3080e8d2a
parent4558168b361d59be9cc5510b72bb0de9ca795c3a (diff)
downloadcompiler-rt-89a4a18118c2a123d1a89aa711fad518e6da857b.tar.gz
compiler-rt-89a4a18118c2a123d1a89aa711fad518e6da857b.tar.bz2
compiler-rt-89a4a18118c2a123d1a89aa711fad518e6da857b.tar.xz
[asan] build asan-rt with -funwind-tables
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@147341 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/asan/Makefile.old3
-rw-r--r--make/config.mk2
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/asan/Makefile.old b/lib/asan/Makefile.old
index 1b28239b..a96ff424 100644
--- a/lib/asan/Makefile.old
+++ b/lib/asan/Makefile.old
@@ -262,7 +262,8 @@ $(BIN)/%_test$(SUFF).o: tests/%_test.mm $(RTL_HDR) $(MAKEFILE)
$(ASAN_CXX) $(GTEST_INCLUDE) -I. -g -c $< -O2 -o $@ -ObjC $(PIE) $(CFLAGS)
$(BIN)/%$(SUFF).o: %.cc $(RTL_HDR) $(MAKEFILE)
- $(CXX) $(PIE) $(CFLAGS) -fPIC -c -O2 -fno-exceptions -o $@ -g $< -Ithird_party \
+ $(CXX) $(PIE) $(CFLAGS) -fPIC -c -O2 -fno-exceptions -funwind-tables \
+ -o $@ -g $< -Ithird_party \
-DASAN_USE_SYSINFO=1 \
-DASAN_NEEDS_SEGV=$(ASAN_NEEDS_SEGV) \
-DASAN_HAS_EXCEPTIONS=$(ASAN_HAS_EXCEPTIONS) \
diff --git a/make/config.mk b/make/config.mk
index df7c1ccf..a8261738 100644
--- a/make/config.mk
+++ b/make/config.mk
@@ -42,5 +42,5 @@ endif
###
# Common compiler options
-COMMON_CXXFLAGS=-fno-exceptions -fPIC
+COMMON_CXXFLAGS=-fno-exceptions -fPIC -funwind-tables
COMMON_CFLAGS=-fPIC