[compiler-rt] r196492 - Revert r196490 and fix include paths in makefile-based build

[Alexey Samsonov]

Author: samsonov
Date: Thu Dec  5 04:40:11 2013
New Revision: 196492

URL: http://llvm.org/viewvc/llvm-project?rev=196492&view=rev
Log:
Revert r196490 and fix include paths in makefile-based build

Modified:
    compiler-rt/trunk/Makefile
    compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_amd64.S
    compiler-rt/trunk/make/config.mk

Modified: compiler-rt/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/Makefile?rev=196492&r1=196491&r2=196492&view=diff
==============================================================================
--- compiler-rt/trunk/Makefile (original)
+++ compiler-rt/trunk/Makefile Thu Dec  5 04:40:11 2013
@@ -249,10 +249,10 @@ $(call Set,Tmp.CFLAGS,$(strip \
 
 $(Tmp.ObjPath)/%.o: $(Tmp.SrcPath)/%.s $(Tmp.Dependencies) $(Tmp.ObjPath)/.dir
 	$(Summary) "  ASSEMBLE:  $(Tmp.Name)/$(Tmp.Config)/$(Tmp.Arch): $$<"
-	$(Verb) $(Tmp.CC) $(Tmp.CFLAGS)  -c -o $$@ $$<
+	$(Verb) $(Tmp.CC) $(COMMON_ASMFLAGS) $(Tmp.CFLAGS)  -c -o $$@ $$<
 $(Tmp.ObjPath)/%.o: $(Tmp.SrcPath)/%.S $(Tmp.Dependencies) $(Tmp.ObjPath)/.dir
 	$(Summary) "  ASSEMBLE:  $(Tmp.Name)/$(Tmp.Config)/$(Tmp.Arch): $$<"
-	$(Verb) $(Tmp.CC) $(Tmp.CFLAGS) -c -o $$@ $$<
+	$(Verb) $(Tmp.CC) $(COMMON_ASMFLAGS) $(Tmp.CFLAGS) -c -o $$@ $$<
 $(Tmp.ObjPath)/%.o: $(Tmp.SrcPath)/%.c $(Tmp.Dependencies) $(Tmp.ObjPath)/.dir
 	$(Summary) "  COMPILE:   $(Tmp.Name)/$(Tmp.Config)/$(Tmp.Arch): $$<"
 	$(Verb) $(Tmp.CC) $(COMMON_CFLAGS) $(Tmp.CFLAGS) -c -o $$@ $$<

Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_amd64.S
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_amd64.S?rev=196492&r1=196491&r2=196492&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_amd64.S (original)
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_amd64.S Thu Dec  5 04:40:11 2013
@@ -1,4 +1,4 @@
-#include "../../sanitizer_common/sanitizer_asm.h"
+#include "sanitizer_common/sanitizer_asm.h"
 .section .text
 
 .hidden __tsan_trace_switch

Modified: compiler-rt/trunk/make/config.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/make/config.mk?rev=196492&r1=196491&r2=196492&view=diff
==============================================================================
--- compiler-rt/trunk/make/config.mk (original)
+++ compiler-rt/trunk/make/config.mk Thu Dec  5 04:40:11 2013
@@ -43,5 +43,7 @@ endif
 
 ###
 # Common compiler options
-COMMON_CXXFLAGS=-fno-exceptions -fPIC -funwind-tables -I${ProjSrcRoot}/lib -I${ProjSrcRoot}/include
-COMMON_CFLAGS=-fPIC
+COMMON_INCLUDES=-I${ProjSrcRoot}/lib -I${ProjSrcRoot}/include
+COMMON_CXXFLAGS=-fno-exceptions -fPIC -funwind-tables $(COMMON_INCLUDES)
+COMMON_CFLAGS=-fPIC $(COMMON_INCLUDES)
+COMMON_ASMFLAGS=$(COMMON_INCLUDES)