Attachment 1192486 Details for Bug 1366881 – patch form makefile

[patch] patch form makefile

makefile.patch (text/plain), 4.84 KB, created by Luya Tshimbalanga on 2016-08-20 18:03:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Luya Tshimbalanga

Created: 2016-08-20 18:03:17 UTC

Size: 4.84 KB

patch

obsolete

>--- Makefile.orig	2016-07-08 04:13:52.000000000 -0700
>+++ Makefile	2016-08-20 09:39:56.601087773 -0700
>@@ -232,7 +232,7 @@
> 
> depend: llvm_check $(CXX_SRC) $(HEADERS)
> 	@echo Updating dependencies
>-	@$(CXX) -MM $(CXXFLAGS) $(CXX_SRC) | sed 's_^$[a-z]$_objs/\1_g' > depend
>+	$(CXX) -MM $(CXXFLAGS) $(CXX_SRC) | sed 's_^$[a-z]$_objs/\1_g' > depend
> 
> -include depend
> 
>@@ -262,7 +262,7 @@
> 
> ispc: print_llvm_src dirs $(OBJS)
> 	@echo Creating ispc executable
>-	@$(CXX) $(OPT) $(LDFLAGS) -o $@ $(OBJS) $(ISPC_LIBS)
>+	$(CXX) $(OPT) $(LDFLAGS) -o $@ $(OBJS) $(ISPC_LIBS)
> 
> # Use clang as a default compiler, instead of gcc
> # This is default now.
>@@ -284,77 +284,77 @@
> 
> objs/%.o: %.cpp
> 	@echo Compiling $<
>-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
>+	$(CXX) $(CXXFLAGS) -o $@ -c $<
> 
> objs/cbackend.o: cbackend.cpp
> 	@echo Compiling $<
>-	@$(CXX) -fno-rtti -fno-exceptions $(CXXFLAGS) -o $@ -c $<
>+	$(CXX) -fno-rtti -fno-exceptions $(CXXFLAGS) -o $@ -c $<
> 
> objs/opt.o: opt.cpp
> 	@echo Compiling $<
>-	@$(CXX) -fno-rtti $(CXXFLAGS) -o $@ -c $<
>+	$(CXX) -fno-rtti $(CXXFLAGS) -o $@ -c $<
> 
> objs/%.o: objs/%.cpp
> 	@echo Compiling $<
>-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
>+	$(CXX) $(CXXFLAGS) -o $@ -c $<
> 
> objs/parse.cc: parse.yy
> 	@echo Running bison on $<
>-	@$(YACC) -o $@ $<
>+	$(YACC) -o $@ $<
> 
> objs/parse.o: objs/parse.cc $(HEADERS)
> 	@echo Compiling $<
>-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
>+	$(CXX) $(CXXFLAGS) -o $@ -c $<
> 
> objs/lex.cpp: lex.ll 
> 	@echo Running flex on $<
>-	@$(LEX) -o $@ $<
>+	$(LEX) -o $@ $<
> 
> objs/lex.o: objs/lex.cpp $(HEADERS) objs/parse.cc
> 	@echo Compiling $<
>-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
>+	$(CXX) $(CXXFLAGS) -o $@ -c $<
> 
> objs/builtins-dispatch.cpp: builtins/dispatch.ll builtins/util.m4 builtins/util-nvptx.m4 builtins/svml.m4 $(wildcard builtins/*common.ll)
> 	@echo Creating C++ source from builtins definition file $<
>-	@m4 -Ibuiltins/ -DLLVM_VERSION=$(LLVM_VERSION) -DBUILD_OS=UNIX $< | python bitcode2cpp.py $< > $@
>+	m4 -Ibuiltins/ -DLLVM_VERSION=$(LLVM_VERSION) -DBUILD_OS=UNIX $< | python bitcode2cpp.py $< > $@
> 
> objs/builtins-%-32bit.cpp: builtins/%.ll builtins/util.m4 builtins/util-nvptx.m4 builtins/svml.m4 $(wildcard builtins/*common.ll)
> 	@echo Creating C++ source from builtins definition file $< $32 bit version$
>-	@m4 -Ibuiltins/ -DLLVM_VERSION=$(LLVM_VERSION) -DBUILD_OS=UNIX -DRUNTIME=32 $< | python bitcode2cpp.py $< 32bit > $@
>+	m4 -Ibuiltins/ -DLLVM_VERSION=$(LLVM_VERSION) -DBUILD_OS=UNIX -DRUNTIME=32 $< | python bitcode2cpp.py $< 32bit > $@
> 
> objs/builtins-%-64bit.cpp: builtins/%.ll builtins/util.m4 builtins/util-nvptx.m4 builtins/svml.m4 $(wildcard builtins/*common.ll)
> 	@echo Creating C++ source from builtins definition file $< $64 bit version$
>-	@m4 -Ibuiltins/ -DLLVM_VERSION=$(LLVM_VERSION) -DBUILD_OS=UNIX -DRUNTIME=64 $< | python bitcode2cpp.py $< 64bit > $@
>+	m4 -Ibuiltins/ -DLLVM_VERSION=$(LLVM_VERSION) -DBUILD_OS=UNIX -DRUNTIME=64 $< | python bitcode2cpp.py $< 64bit > $@
> 
> objs/builtins-c-32.cpp: builtins/builtins.c
> 	@echo Creating C++ source from builtins definition file $<
>-	@$(CLANG) -m32 -emit-llvm -c $< -o - | llvm-dis - | python bitcode2cpp.py c 32 > $@
>+	$(CLANG) -m32 -emit-llvm -c $< -o - | llvm-dis - | python bitcode2cpp.py c 32 > $@
> 
> objs/builtins-c-64.cpp: builtins/builtins.c
> 	@echo Creating C++ source from builtins definition file $<
>-	@$(CLANG) -m64 -emit-llvm -c $< -o - | llvm-dis - | python bitcode2cpp.py c 64 > $@
>+	$(CLANG) -m64 -emit-llvm -c $< -o - | llvm-dis - | python bitcode2cpp.py c 64 > $@
> 
> objs/stdlib_mask1_ispc.cpp: stdlib.ispc
> 	@echo Creating C++ source from $< for mask1
>-	@$(CLANG) -E -x c -DISPC_MASK_BITS=1 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
>+	$(CLANG) -E -x c -DISPC_MASK_BITS=1 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
> 		python stdlib2cpp.py mask1 > $@
> 
> objs/stdlib_mask8_ispc.cpp: stdlib.ispc
> 	@echo Creating C++ source from $< for mask8
>-	@$(CLANG) -E -x c -DISPC_MASK_BITS=8 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
>+	$(CLANG) -E -x c -DISPC_MASK_BITS=8 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
> 		python stdlib2cpp.py mask8 > $@
> 
> objs/stdlib_mask16_ispc.cpp: stdlib.ispc
> 	@echo Creating C++ source from $< for mask16
>-	@$(CLANG) -E -x c -DISPC_MASK_BITS=16 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
>+	$(CLANG) -E -x c -DISPC_MASK_BITS=16 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
> 		python stdlib2cpp.py mask16 > $@
> 
> objs/stdlib_mask32_ispc.cpp: stdlib.ispc
> 	@echo Creating C++ source from $< for mask32
>-	@$(CLANG) -E -x c -DISPC_MASK_BITS=32 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
>+	$(CLANG) -E -x c -DISPC_MASK_BITS=32 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
> 		python stdlib2cpp.py mask32 > $@
> 
> objs/stdlib_mask64_ispc.cpp: stdlib.ispc
> 	@echo Creating C++ source from $< for mask64
>-	@$(CLANG) -E -x c -DISPC_MASK_BITS=64 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
>+	$(CLANG) -E -x c -DISPC_MASK_BITS=64 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
> 		python stdlib2cpp.py mask64 > $@

Actions: View | Diff

Attachments on bug 1366881: 1192486