[llvm-commits] [compiler-rt] r162548 - in /compiler-rt/trunk/lib/asan: Makefile.old asan_rtl.cc

[Alexander Potapenko]

Author: glider
Date: Fri Aug 24 04:31:53 2012
New Revision: 162548

URL: http://llvm.org/viewvc/llvm-project?rev=162548&view=rev
Log:
Revert the erroneous changes made to Makefile.old in r162547
Remove a spare newline from asan_rtl.cc

Modified:
    compiler-rt/trunk/lib/asan/Makefile.old
    compiler-rt/trunk/lib/asan/asan_rtl.cc

Modified: compiler-rt/trunk/lib/asan/Makefile.old
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/Makefile.old?rev=162548&r1=162547&r2=162548&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/Makefile.old (original)
+++ compiler-rt/trunk/lib/asan/Makefile.old Fri Aug 24 04:31:53 2012
@@ -60,7 +60,6 @@
 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 @@
 		-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++ \

Modified: compiler-rt/trunk/lib/asan/asan_rtl.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_rtl.cc?rev=162548&r1=162547&r2=162548&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_rtl.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_rtl.cc Fri Aug 24 04:31:53 2012
@@ -307,7 +307,6 @@
   // Re-exec ourselves if we need to set additional env or command line args.
   MaybeReexec();
 
-
   if (flags()->atexit) {
     Atexit(asan_atexit);
   }