This commit is contained in:
Blaise Tine
2019-11-22 12:30:21 -05:00
parent 4eeab73ce6
commit aa274f2d20
9 changed files with 2 additions and 61 deletions

View File

@@ -34,11 +34,7 @@ PROJECT=saxpy
all: $(PROJECT).dump $(PROJECT).hex
lib$(PROJECT).a: kernel.cl
<<<<<<< HEAD
POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(RISCV_TOOL_PATH)/lib:$(POCL_CC_PATH)/lib $(POCL_CC_PATH)/bin/poclcc -o lib$(PROJECT).a kernel.cl
=======
POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(RISCV_TOOL_PATH)/lib:$(POCL_CC_PATH)/lib $(POCL_CC_PATH)/bin/poclcc -o kernel.pocl kernel.cl
>>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798
$(PROJECT).elf: main.cc lib$(PROJECT).a
$(CXX) $(CXXFLAGS) -I$(POCL_RT_PATH)/include -L$(POCL_RT_PATH)/lib/static -L. $(VX_SRCS) main.cc -Wl,--whole-archive -l$(PROJECT) -Wl,--no-whole-archive $(LIBS) -o $(PROJECT).elf
@@ -53,8 +49,4 @@ run:
$(VX_SIMX_PATH)/Vcache_simX -E -a rv32i --core $(PROJECT).hex -s -b 1> emulator.debug
clean:
<<<<<<< HEAD
rm -rf *.elf *.dump *.hex *.a *.pocl *.o
=======
rm -rf *.elf *.dump *.hex *.a *.pocl
>>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798