diff options
| author | Alexey Samsonov <samsonov@google.com> | 2013-12-05 10:40:11 +0000 |
|---|---|---|
| committer | Alexey Samsonov <samsonov@google.com> | 2013-12-05 10:40:11 +0000 |
| commit | 58e44a344715bfb9f6f38dedafc595a869496e4d (patch) | |
| tree | 7ec6b80d41b419c5e212a16d3076c7f8544e6935 | |
| parent | d4af5c241d2f46aa8e788350dc0ae9345de0d0b8 (diff) | |
| download | bcm5719-llvm-58e44a344715bfb9f6f38dedafc595a869496e4d.tar.gz bcm5719-llvm-58e44a344715bfb9f6f38dedafc595a869496e4d.zip | |
Revert r196490 and fix include paths in makefile-based build
llvm-svn: 196492
| -rw-r--r-- | compiler-rt/Makefile | 4 | ||||
| -rw-r--r-- | compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S | 2 | ||||
| -rw-r--r-- | compiler-rt/make/config.mk | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/compiler-rt/Makefile b/compiler-rt/Makefile index 6747ea4d431..ac3daac5fce 100644 --- a/compiler-rt/Makefile +++ b/compiler-rt/Makefile @@ -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 $$@ $$< diff --git a/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S b/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S index 7d18a471d7e..11c19a79f22 100644 --- a/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S +++ b/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S @@ -1,4 +1,4 @@ -#include "../../sanitizer_common/sanitizer_asm.h" +#include "sanitizer_common/sanitizer_asm.h" .section .text .hidden __tsan_trace_switch diff --git a/compiler-rt/make/config.mk b/compiler-rt/make/config.mk index 6398d058de7..2838b607928 100644 --- a/compiler-rt/make/config.mk +++ b/compiler-rt/make/config.mk @@ -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) |
