summaryrefslogtreecommitdiffstats
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
commit10a6b304e1d99ba118e91747a81569736f1e5377 (patch)
treee9d9469d8c5651bb9f3feef200095f277839225b
parent1de8348db73eb52477b11dc4764f6b12fd622e1a (diff)
downloadbcm5719-llvm-10a6b304e1d99ba118e91747a81569736f1e5377.tar.gz
bcm5719-llvm-10a6b304e1d99ba118e91747a81569736f1e5377.zip
[asan] build asan-rt with -funwind-tables
llvm-svn: 147341
-rw-r--r--compiler-rt/lib/asan/Makefile.old3
-rw-r--r--compiler-rt/make/config.mk2
2 files changed, 3 insertions, 2 deletions
diff --git a/compiler-rt/lib/asan/Makefile.old b/compiler-rt/lib/asan/Makefile.old
index 1b28239b552..a96ff424fa0 100644
--- a/compiler-rt/lib/asan/Makefile.old
+++ b/compiler-rt/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/compiler-rt/make/config.mk b/compiler-rt/make/config.mk
index df7c1ccfede..a8261738707 100644
--- a/compiler-rt/make/config.mk
+++ b/compiler-rt/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
OpenPOWER on IntegriCloud