Rename SYSTEM_LINKER to LINKER as LINKER was no longer used

common/beast.nvcc.host.make.config

@@ -3,10 +3,8 @@ CC = gcc
 CXX = /usr/local/cuda-11.2/bin/nvcc
 NVCC = /usr/local/cuda-11.2/bin/nvcc
 LINKER = /usr/local/cuda-11.2/bin/nvcc
-SYSTEM_LINKER = $(LINKER)
 
 LINKER_FLAGS = -lcudart -lcuda -lm -O3 -lgomp
-SYSTEM_LINKER_FLAGS = -lcudart -lcuda -lm -O3 -lgomp
 CC_FLAGS = -O3 -lgomp
 CXX_FLAGS = -O3 -lgomp
 NVCC_FLAGS = -O3 -lgomp

common/beast.openmp.host.make.config

@@ -3,12 +3,12 @@
 # CXX := g++
 CC = ~/git/Polygeist/mlir-build/bin/clang
 CXX := ~/git/Polygeist/mlir-build/bin/clang++
-SYSTEM_LINKER = $(CXX)
+LINKER = $(CXX)
 
 COMPILER_NAME=openmp.gcc
 
 CC_FLAGS = -O2 -I/home/wmoses/git/Polygeist/mlir-build/projects/openmp/runtime/src/ -fopenmp
 CXX_FLAGS := $(CC_FLAGS)
 LINKER_FLAGS = -ldl -lrt -lpthread -lm -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ -fopenmp 
-SYSTEM_LINKER_FLAGS := $(LINKER_FLAGS)
+LINKER_FLAGS := $(LINKER_FLAGS)
 

common/common.polygeist.host.make.config

@@ -38,13 +38,12 @@ ifeq ($(CONFIG),0)
     CC = $(POLYGEIST_LLVM_DIR)/bin/clang
     CXX = $(POLYGEIST_LLVM_DIR)/bin/clang++
     NVCC = $(POLYGEIST_LLVM_DIR)/bin/clang++
-    SYSTEM_LINKER = clang
+    LINKER = clang
 
     CC_FLAGS = $(OPTLEVEL) -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -resource-dir=$(POLYGEIST_LLVM_DIR)/lib/clang/16.0.0/ -fopenmp -I$(CUDA_PATH)/include/
     CXX_FLAGS := $(CC_FLAGS)
     NVCC_FLAGS := $(CC_FLAGS) --cuda-gpu-arch=$(CUDA_GPU_ARCH) --cuda-path=$(CUDA_PATH)/
     LINKER_FLAGS = $(OPTLEVEL) -ldl -lrt -lpthread -lm -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ -fopenmp -fopenmp=libomp -L/usr/local/cuda/lib64/ -lcudart_static -lcuda
-    SYSTEM_LINKER_FLAGS = $(LINKER_FLAGS)
 
     ifeq ($(CLANG_NO_OPAQUE_POINTERS),1)
         CC_FLAGS += -Xclang -no-opaque-pointers
@@ -151,12 +150,10 @@ else
 
         CXX = $(CC)
         NVCC = $(CC)
-        LINKER = $(CC)
-        SYSTEM_LINKER = $(POLYGEIST_LLVM_DIR)/bin/clang
+        LINKER = $(POLYGEIST_LLVM_DIR)/bin/clang
 
 
-        LINKER_FLAGS = -L$(CPUCUDA_BUILD_DIR)/src/ -lcpucudart -ldl -lrt -lpthread -lm -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ -fopenmp $(OPTLEVEL)
-        SYSTEM_LINKER_FLAGS := $(LINKER_FLAGS) -fopenmp=libomp
+        LINKER_FLAGS = -L$(CPUCUDA_BUILD_DIR)/src/ -lcpucudart -ldl -lrt -lpthread -lm -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ -fopenmp $(OPTLEVEL) -fopenmp=libomp
 
         CC_FLAGS = $(OPTLEVEL) -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -resource-dir=$(POLYGEIST_LLVM_DIR)/lib/clang/16.0.0/ -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -I$(CUDA_PATH)/include/
         CXX_FLAGS := $(CC_FLAGS)
@@ -227,13 +224,11 @@ else
 
         CXX = $(CC)
         NVCC = $(CC)
-        LINKER = $(CC)
-        SYSTEM_LINKER = $(POLYGEIST_LLVM_DIR)/bin/clang
+        LINKER = $(POLYGEIST_LLVM_DIR)/bin/clang
 
         POLYGEIST_LLVM_ABI = #--memref-abi=0
 
-        LINKER_FLAGS = -L/usr/local/cuda/lib64/ -lcudart_static -lcuda -ldl -lrt -lpthread -lm -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ $(OPTLEVEL) -fopenmp
-        SYSTEM_LINKER_FLAGS := $(LINKER_FLAGS) -fopenmp=libomp
+        LINKER_FLAGS = -L/usr/local/cuda/lib64/ -lcudart_static -lcuda -ldl -lrt -lpthread -lm -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ $(OPTLEVEL) -fopenmp -fopenmp=libomp
 
         CC_FLAGS = $(OPTLEVEL) -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -resource-dir=$(POLYGEIST_LLVM_DIR)/lib/clang/16.0.0/ -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -I$(CUDA_PATH)/include/
         CXX_FLAGS := $(CC_FLAGS)
@@ -246,13 +241,11 @@ else
 
         CXX = $(CC)
         NVCC = $(CC)
-        LINKER = $(CC)
-        SYSTEM_LINKER = $(POLYGEIST_LLVM_DIR)/bin/clang
+        LINKER = $(POLYGEIST_LLVM_DIR)/bin/clang
 
         POLYGEIST_LLVM_ABI = #--memref-abi=0
 
-        LINKER_FLAGS = -L/opt/rocm/lib/ -lamdhip64 -ldl -lrt -lpthread -lm -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ $(OPTLEVEL) -fopenmp
-        SYSTEM_LINKER_FLAGS := $(LINKER_FLAGS) -fopenmp=libomp
+        LINKER_FLAGS = -L/opt/rocm/lib/ -lamdhip64 -ldl -lrt -lpthread -lm -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ $(OPTLEVEL) -fopenmp -fopenmp=libomp
 
         CC_FLAGS = $(OPTLEVEL) -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -resource-dir=$(POLYGEIST_LLVM_DIR)/lib/clang/16.0.0/ -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -I$(CUDA_PATH)/include/
         CXX_FLAGS := $(CC_FLAGS)
@@ -265,15 +258,13 @@ else
         CC += -S
         CXX += -S
         NVCC += -S
-        SYSTEM_LINKER = bash -c 'for obj in $$(find . -name \*.o); do echo $$obj; mv $$obj $$obj.conf$(CONFIG).mlir; done'; true
         LINKER = bash -c 'for obj in $$(find . -name \*.o); do echo $$obj; mv $$obj $$obj.conf$(CONFIG).mlir; done'; true
     endif
 
     ifeq ($(OUTPUT_MLIR_LLVM_DIALECT),1)
         CC += -S --emit-llvm-dialect
         CXX += -S --emit-llvm-dialect
         NVCC += -S --emit-llvm-dialect
-        SYSTEM_LINKER = bash -c 'for obj in $$(find . -name \*.o); do echo $$obj; mv $$obj $$obj.conf$(CONFIG).llvmir.mlir; done'; true
         LINKER = bash -c 'for obj in $$(find . -name \*.o); do echo $$obj; mv $$obj $$obj.conf$(CONFIG).llvmir.mlir; done'; true
     endif
 
@@ -293,7 +284,5 @@ ifeq ($(OUTPUT_LLVMIR),1)
     CC += -S -emit-llvm
     CXX += -S -emit-llvm
     NVCC += -S -emit-llvm
-    SYSTEM_LINKER = bash -c 'for obj in $$(find . -name \*.o); do echo $$obj; mv $$obj $$obj.conf$(CONFIG).ll; done'; true
     LINKER = bash -c 'for obj in $$(find . -name \*.o); do echo $$obj; mv $$obj $$obj.conf$(CONFIG).ll; done'; true
 endif
-

common/docker.polygeist-clang.openmp.host.make.config

@@ -3,7 +3,7 @@ POLYGEIST_LLVM_DIR=/root/Polygeist/mlir-build/
 
 CC = $(POLYGEIST_LLVM_DIR)/bin/clang
 CXX = $(POLYGEIST_LLVM_DIR)/bin/clang++
-SYSTEM_LINKER = clang
+LINKER = clang
 
 COMPILER_NAME=openmp.polygeist-clang
 
@@ -12,5 +12,5 @@ COMPILER_NAME=openmp.polygeist-clang
 CC_FLAGS = -O2 -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -resource-dir=$(POLYGEIST_LLVM_DIR)/lib/clang/15.0.0/ -fopenmp
 CXX_FLAGS := $(CC_FLAGS)
 LINKER_FLAGS = -O2 -ldl -lrt -lpthread -lm -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ -fopenmp -fopenmp=libomp
-SYSTEM_LINKER_FLAGS = -O2 -ldl -lrt -lpthread -lm -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ -fopenmp=libomp
+LINKER_FLAGS = -O2 -ldl -lrt -lpthread -lm -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ -fopenmp=libomp
 

common/docker.polygeist.host.make.config

@@ -57,13 +57,11 @@ CC += -fopenmp -O2
 
 CXX = $(CC)
 NVCC = $(CC)
-LINKER = $(CC)
-SYSTEM_LINKER = $(POLYGEIST_LLVM_DIR)/bin/clang
+LINKER = $(POLYGEIST_LLVM_DIR)/bin/clang
 
 POLYGEIST_LLVM_ABI = --memref-abi=0
 
-LINKER_FLAGS = -lcudart_static -ldl -lrt -lpthread -lm -L$(CUDA_PATH)/lib64/ -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ -fopenmp -O2
-SYSTEM_LINKER_FLAGS := $(LINKER_FLAGS) -fopenmp=libomp
+LINKER_FLAGS = -lcudart_static -ldl -lrt -lpthread -lm -L$(CUDA_PATH)/lib64/ -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ -fopenmp -O2 -fopenmp=libomp
 
 CC_FLAGS = -O2 -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -resource-dir=$(POLYGEIST_LLVM_DIR)/lib/clang/15.0.0/ -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -I$(CUDA_PATH)/include/
 CXX_FLAGS := $(CC_FLAGS)

common/epyc02.cpucuda.host.make.config

@@ -2,13 +2,11 @@ CC = /scr0/ivan/src/llvm-project/build-clang/bin/clang
 CXX = /scr0/ivan/src/llvm-project/build-clang/bin/clang++
 NVCC = /scr0/ivan/src/llvm-project/build-clang/bin/clang++
 LINKER = /scr0/ivan/src/llvm-project/build-clang/bin/clang++
-SYSTEM_LINKER = clang
 
 CC_FLAGS = --cuda-path=/opt/cuda-10.2/ --cuda-gpu-arch=sm_80 --cuda-host-only -I/scr0/ivan/src/llvm-project/build-clang/projects/openmp/runtime/src/ -resource-dir=/scr0/ivan/src/llvm-project/build-clang/lib/clang/14.0.0/ -fopenmp=libomp -O3 -lcpucudart -L/scr0/ivan/src/cpucuda_runtime/build/src -lm
 CXX_FLAGS := $(CC_FLAGS)
 NVCC_FLAGS := $(CC_FLAGS)
 LINKER_FLAGS = -lcpucudart -L/scr0/ivan/src/cpucuda_runtime/build/src -lm -fopenmp=libomp
-SYSTEM_LINKER_FLAGS := $(LINKER_FLAGS)
 
 CUDA_SAMPLES_PATH = /opt/cuda-10.2/samples/
 

common/epyc02.polygeist.fugaku.host.make.config

@@ -7,10 +7,8 @@ CC = $(POLYGEIST_DIR)/bin/mlir-clang --function=* --cuda-lower --cpuify="distrib
 CXX = $(CC)
 NVCC = $(CC)
 LINKER = /home/ivan/opt/llvm-v13.0.0/login_node/bin/clang++
-SYSTEM_LINKER = $(LINKER)
 
 LINKER_FLAGS = -ldl -lrt -lpthread -lm -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ -fuse-ld=lld -target aarch64-unknown-linux-gnu -mcpu=a64fx -lcpucudart -L/home/ivan/src/cpucuda_runtime.aarch64/build/src /home/ivan/opt/llvm-v13.0.0/compute_node/lib/libomp.so
-SYSTEM_LINKER_FLAGS := $(LINKER_FLAGS)
 
 CC_FLAGS = -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -resource-dir=$(POLYGEIST_LLVM_DIR)/lib/clang/14.0.0/ -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -target aarch64-unknown-linux-gnu -mcpu=a64fx --sysroot ~/opt/fugaku-compute-node-sysroot/ -I/scr0/ivan/src/Polygeist/mlir-build/bin/../include/c++/v1
 CXX_FLAGS := $(CC_FLAGS)

common/gcc.openmp.host.make.config

@@ -1,12 +1,12 @@
 
 CC = gcc
 CXX := g++
-SYSTEM_LINKER = g++
+LINKER = g++
 
 COMPILER_NAME=openmp.gcc
 
 CC_FLAGS = -O3
 CXX_FLAGS := $(CC_FLAGS)
 LINKER_FLAGS = -ldl -lrt -lpthread -lm -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ -fopenmp -lgomp
-SYSTEM_LINKER_FLAGS := $(LINKER_FLAGS)
+LINKER_FLAGS := $(LINKER_FLAGS)
 

common/kiev0.nvcc.host.make.config

@@ -3,10 +3,8 @@ CC = gcc
 CXX = g++
 NVCC = nvcc
 LINKER = nvcc
-SYSTEM_LINKER = nvcc
 
 LINKER_FLAGS = -lcudart -lcuda -lm -O3 -lgomp
-SYSTEM_LINKER_FLAGS = -lcudart -lcuda -lm -O3 -lgomp
 CC_FLAGS = -O3 -lgomp
 CXX_FLAGS = -O3 -lgomp
 NVCC_FLAGS = -O3 -lgomp

common/memkf02.nvcc.host.make.config

@@ -3,10 +3,8 @@ CC = /usr/local/cuda/bin/nvcc
 CXX = /usr/local/cuda/bin/nvcc
 NVCC = /usr/local/cuda/bin/nvcc
 LINKER = /usr/local/cuda/bin/nvcc
-SYSTEM_LINKER = /usr/local/cuda/bin/nvcc
 
 LINKER_FLAGS = -lcudart -lcuda -lm -O3 -lgomp
-SYSTEM_LINKER_FLAGS = -lcudart -lcuda -lm -O3 -lgomp
 CC_FLAGS = -O3 -lgomp
 CXX_FLAGS = -O3 -lgomp
 NVCC_FLAGS = -O3 -lgomp

common/memkf02.polygeist-clang.openmp.host.make.config

@@ -5,7 +5,7 @@ POLYGEIST_LLVM_DIR=/scr/ivan/src/Polygeist/mlir-build.release/
 
 CC = $(POLYGEIST_LLVM_DIR)/bin/clang
 CXX = $(POLYGEIST_LLVM_DIR)/bin/clang++
-SYSTEM_LINKER = clang
+LINKER = clang
 
 COMPILER_NAME=openmp.polygeist-clang
 
@@ -14,5 +14,5 @@ COMPILER_NAME=openmp.polygeist-clang
 CC_FLAGS = -O2 -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -resource-dir=$(POLYGEIST_LLVM_DIR)/lib/clang/16.0.0/ -fopenmp
 CXX_FLAGS := $(CC_FLAGS)
 LINKER_FLAGS = -O2 -ldl -lrt -lpthread -lm -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ -fopenmp -fopenmp=libomp
-SYSTEM_LINKER_FLAGS = -O2 -ldl -lrt -lpthread -lm -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ -fopenmp=libomp
+LINKER_FLAGS = -O2 -ldl -lrt -lpthread -lm -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ -fopenmp=libomp
 

common/memkf02.polygeist.openmp.host.make.config

@@ -16,7 +16,7 @@ COMPILER_NAME=openmp.polygeist
 #COMPILER_NAME=openmp.polygeist.openmp-opt=0
 
 CXX := $(CC)
-SYSTEM_LINKER = clang
+LINKER = clang
 
 POLYGEIST_LLVM_ABI = --memref-abi=0
 
@@ -25,5 +25,5 @@ CC_FLAGS = -O2 -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -resource-di
 
 CXX_FLAGS := $(CC_FLAGS)
 LINKER_FLAGS = -O2 -ldl -lrt -lpthread -lm -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ -fopenmp
-SYSTEM_LINKER_FLAGS = -O2 -ldl -lrt -lpthread -lm -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ -fopenmp=libomp
+LINKER_FLAGS = -O2 -ldl -lrt -lpthread -lm -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ -fopenmp=libomp
 

common/memkf02.polygeist.openmp.openmp-opt=0.host.make.config

@@ -16,13 +16,13 @@ COMPILER_NAME=openmp.polygeist.openmp-opt=0
 #COMPILER_NAME=openmp.polygeist.openmp-opt=0
 
 CXX := $(CC)
-SYSTEM_LINKER = clang
+LINKER = clang
 
 POLYGEIST_LLVM_ABI = --memref-abi=0
 
 
 CC_FLAGS = -O2 -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -resource-dir=$(POLYGEIST_LLVM_DIR)/lib/clang/15.0.0/ -fopenmp
 CXX_FLAGS := $(CC_FLAGS)
 LINKER_FLAGS = -O2 -ldl -lrt -lpthread -lm -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ -fopenmp
-SYSTEM_LINKER_FLAGS = -O2 -ldl -lrt -lpthread -lm -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ -fopenmp=libomp
+LINKER_FLAGS = -O2 -ldl -lrt -lpthread -lm -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ -fopenmp=libomp
 

common/supercomp01a.nvcc.host.make.config

@@ -3,10 +3,8 @@ CC = /usr/local/cuda/bin/nvcc
 CXX = /usr/local/cuda/bin/nvcc
 NVCC = /usr/local/cuda/bin/nvcc
 LINKER = /usr/local/cuda/bin/nvcc
-SYSTEM_LINKER = /usr/local/cuda/bin/nvcc
 
 LINKER_FLAGS = -lcudart -lcuda -lm -O3 -lgomp
-SYSTEM_LINKER_FLAGS = -lcudart -lcuda -lm -O3 -lgomp
 CC_FLAGS = -O3 -lgomp
 CXX_FLAGS = -O3 -lgomp
 NVCC_FLAGS = -O3 -lgomp

common/ubuntu.polygeist-clang.openmp.host.make.config

@@ -3,7 +3,7 @@ POLYGEIST_LLVM_DIR=/home/ubuntu/Polygeist/mlir-build.release/
 
 CC = $(POLYGEIST_LLVM_DIR)/bin/clang
 CXX = $(POLYGEIST_LLVM_DIR)/bin/clang++
-SYSTEM_LINKER = $(POLYGEIST_LLVM_DIR)/bin/clang
+LINKER = $(POLYGEIST_LLVM_DIR)/bin/clang
 
 COMPILER_NAME=openmp.polygeist-clang
 
@@ -12,5 +12,5 @@ COMPILER_NAME=openmp.polygeist-clang
 CC_FLAGS = -O2 -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -resource-dir=$(POLYGEIST_LLVM_DIR)/lib/clang/15.0.0/ -fopenmp
 CXX_FLAGS := $(CC_FLAGS) -fopenmp
 LINKER_FLAGS = -O2 -ldl -lrt -lpthread -lm -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ -fopenmp -fopenmp=libomp
-SYSTEM_LINKER_FLAGS = -O2 -ldl -lrt -lpthread -lm -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ -fopenmp=libomp
+LINKER_FLAGS = -O2 -ldl -lrt -lpthread -lm -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ -fopenmp=libomp
 

cuda/b+tree/Makefile

@@ -93,14 +93,14 @@ b+tree.out:	./main.o \
 		./util/timer/timer.o \
 		./util/num/num.o \
 		./util/cuda/cuda.o
-	$(SYSTEM_LINKER)	./main.o \
+	$(LINKER)	./main.o \
 			./kernel/kernel_gpu_cuda_wrapper.o \
 			./kernel/kernel_gpu_cuda_wrapper_2.o \
 			./util/timer/timer.o \
 			./util/num/num.o \
 			./util/cuda/cuda.o \
 			-lm \
-			$(SYSTEM_LINKER_FLAGS)\
+			$(LINKER_FLAGS)\
                        -o b+tree.out
 
 

cuda/backprop/Makefile

@@ -22,7 +22,7 @@ include ../../common/make.config
 
 
 backprop: backprop.o facetrain.o imagenet.o backprop_cuda.o
-	$(SYSTEM_LINKER) backprop.o facetrain.o imagenet.o backprop_cuda.o -o backprop $(SYSTEM_LINKER_FLAGS)
+	$(LINKER) backprop.o facetrain.o imagenet.o backprop_cuda.o -o backprop $(LINKER_FLAGS)
 
 %.o: %.[ch]
 	$(CC) $(CC_FLAGS) $< -c -o $@

cuda/bfs/Makefile

@@ -10,7 +10,7 @@ OBJ = bfs.o
 EXE = bfs.out
 
 $(EXE): $(OBJ)
-	$(SYSTEM_LINKER) $(OBJ) -o $(EXE) $(SYSTEM_LINKER_FLAGS)
+	$(LINKER) $(OBJ) -o $(EXE) $(LINKER_FLAGS)
 
 $(OBJ): $(SRC)
 	$(NVCC) $(NVCC_FLAGS) -c $< -o $@ -I../util

cuda/cfd/Makefile

@@ -18,7 +18,7 @@ CUDA_SDK_PATH = $(CUDA_SAMPLES_PATH)
 all: euler3d # euler3d_double  pre_euler3d  pre_euler3d_double 
 
 euler3d: euler3d.o
-	$(SYSTEM_LINKER) euler3d.o -o euler3d $(SYSTEM_LINKER_FLAGS)
+	$(LINKER) euler3d.o -o euler3d $(LINKER_FLAGS)
 
 
 euler3d.o: euler3d.cu

cuda/dwt2d/Makefile

@@ -108,7 +108,7 @@ OUTPUT = -DOUTPUT
 	$(CXX) $(OUTPUT) $(CXXFLAGS) -c $< -o $@
 
 $(EXECUTABLE): $(COBJS) $(CXXOBJS) $(CUOBJS)
-	$(SYSTEM_LINKER) -o $(EXECUTABLE) $(COBJS) $(CXXOBJS) $(CUOBJS) $(SYSTEM_LINKER_FLAGS)
+	$(LINKER) -o $(EXECUTABLE) $(COBJS) $(CXXOBJS) $(CUOBJS) $(LINKER_FLAGS)
 
 clean:
 	rm -f $(COBJS) $(CXXOBJS) $(CUOBJS) $(EXECUTABLE)

cuda/gaussian/Makefile

@@ -8,7 +8,7 @@ SRC = gaussian.cu
 EXE = gaussian
 
 $(EXE): gaussian.o
-	$(SYSTEM_LINKER) gaussian.o -o $(EXE) $(SYSTEM_LINKER_FLAGS)
+	$(LINKER) gaussian.o -o $(EXE) $(LINKER_FLAGS)
 
 gaussian.o: $(SRC)
 	$(NVCC) $(KERNEL_DIM) -c $(SRC) -o gaussian.o $(NVCC_FLAGS)

cuda/hotspot/Makefile

@@ -9,7 +9,7 @@ OBJ = hotspot.o
 EXE = hotspot
 
 $(EXE): $(OBJ)
-	$(SYSTEM_LINKER) $(OBJ) -o $(EXE) $(SYSTEM_LINKER_FLAGS)
+	$(LINKER) $(OBJ) -o $(EXE) $(LINKER_FLAGS)
 
 $(OBJ): $(SRC)
 	$(NVCC) $(NVCC_FLAGS) -c $< -o $@ -I../util

cuda/hotspot3D/Makefile

@@ -11,7 +11,7 @@ EXE = 3D
 OUTPUT = *.out
 
 $(EXE): $(OBJ)
-	$(SYSTEM_LINKER) $(OBJ) -o $(EXE) $(SYSTEM_LINKER_FLAGS)
+	$(LINKER) $(OBJ) -o $(EXE) $(LINKER_FLAGS)
 
 $(OBJ): $(SRC)
 	$(NVCC) $(NVCC_FLAGS) -c $< -o $@ -I../util

cuda/huffman/Makefile

@@ -19,7 +19,7 @@ override TESTING = -DCACHECWLUT
 endif
 
 pavle: $(OBJ)  main_test_cu.o cpuencode.o
-	$(SYSTEM_LINKER) $(TESTING) $(CACHECWLUT) cpuencode.o main_test_cu.o $(OBJ) -o $(EXE) $(SYSTEM_LINKER_FLAGS)
+	$(LINKER) $(TESTING) $(CACHECWLUT) cpuencode.o main_test_cu.o $(OBJ) -o $(EXE) $(LINKER_FLAGS)
 
 vlc_kernel_sm64huff.o: vlc_kernel_sm64huff.cu 
 	$(NVCC) $(TESTING) $(NVCC_FLAGS) -c vlc_kernel_sm64huff.cu -o $@

cuda/lavaMD/makefile

@@ -27,12 +27,12 @@ lavaMD:		main.o \
 			./util/num/num.o \
 			./util/timer/timer.o \
 			./util/device/device.o
-	$(SYSTEM_LINKER)	$(KERNEL_DIM) main.o \
+	$(LINKER)	$(KERNEL_DIM) main.o \
 			./util/num/num.o \
 			./util/timer/timer.o \
 			./util/device/device.o \
 			-lm \
-			$(SYSTEM_LINKER_FLAGS) \
+			$(LINKER_FLAGS) \
 			-o lavaMD 
 
 # compile function files into objects (binaries)

cuda/lud/cuda/Makefile

@@ -44,7 +44,7 @@ clang: $(SRC)
 		-L/usr/local/cuda/lib64 -lcudart_static -ldl -lrt -pthread -DTIMING
 
 $(EXECUTABLE) : $(OBJS)
-	$(SYSTEM_LINKER) -o $@  $? $(SYSTEM_LINKER_FLAGS) 
+	$(LINKER) -o $@  $? $(LINKER_FLAGS) 
 
 clean:
 	rm -f $(EXECUTABLE) $(OBJS) *.linkinfo