diff options
| author | Alexander Potapenko <glider@google.com> | 2012-08-24 09:31:53 +0000 |
|---|---|---|
| committer | Alexander Potapenko <glider@google.com> | 2012-08-24 09:31:53 +0000 |
| commit | 00492cab3e1b4cdb5a61991d03bd09e58b90747c (patch) | |
| tree | e749369bc4c804eb770d57f032566b37b3d23f59 | |
| parent | fefc1e989c68a995b866fc090a2fde7df9818694 (diff) | |
| download | bcm5719-llvm-00492cab3e1b4cdb5a61991d03bd09e58b90747c.tar.gz bcm5719-llvm-00492cab3e1b4cdb5a61991d03bd09e58b90747c.zip | |
Revert the erroneous changes made to Makefile.old in r162547
Remove a spare newline from asan_rtl.cc
llvm-svn: 162548
| -rw-r--r-- | compiler-rt/lib/asan/Makefile.old | 5 | ||||
| -rw-r--r-- | compiler-rt/lib/asan/asan_rtl.cc | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/compiler-rt/lib/asan/Makefile.old b/compiler-rt/lib/asan/Makefile.old index a6f496d1b7d..4ab80e20bcb 100644 --- a/compiler-rt/lib/asan/Makefile.old +++ b/compiler-rt/lib/asan/Makefile.old @@ -60,7 +60,6 @@ endif CLANG_FLAGS= CLANG_VERSION=3.2 CLANG_BUILD=$(ROOT)/../../../../build/Release+Asserts -CLANG_BUILD=/Users/glider/src/asan/llvm/llvm_cmake_build CLANG_CC=$(CLANG_BUILD)/bin/clang $(CLANG_FLAGS) CLANG_CXX=$(CLANG_BUILD)/bin/clang++ $(CLANG_FLAGS) FILE_CHECK=$(CLANG_BUILD)/bin/FileCheck @@ -147,9 +146,7 @@ CLANG_ASAN_CXX=$(CLANG_CXX) \ -mllvm -asan-use-after-return=$(ASAN_UAR) \ $(COMMON_ASAN_DEFINES) -#CLANG_ASAN_LD=$(CLANG_CXX) -faddress-sanitizer -#CLANG_ASAN_LD=$(CLANG_CXX) -L/Users/glider/src/asan/llvm/llvm_cmake_build/projects/compiler-rt/lib/asan/lib -lclang_rt.asan_osx_dynamic #-faddress-sanitizer -CLANG_ASAN_LD=$(CLANG_CXX) -faddress-sanitizer -faddress-sanitizer-dynamic-runtime +CLANG_ASAN_LD=$(CLANG_CXX) -faddress-sanitizer GCC_ASAN_PATH=SET_FROM_COMMAND_LINE GCC_ASAN_CXX=$(GCC_ASAN_PATH)/g++ \ diff --git a/compiler-rt/lib/asan/asan_rtl.cc b/compiler-rt/lib/asan/asan_rtl.cc index 70b180143b0..e00cc5f4384 100644 --- a/compiler-rt/lib/asan/asan_rtl.cc +++ b/compiler-rt/lib/asan/asan_rtl.cc @@ -307,7 +307,6 @@ void __asan_init() { // Re-exec ourselves if we need to set additional env or command line args. MaybeReexec(); - if (flags()->atexit) { Atexit(asan_atexit); } |
