1 files changed, 12 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 2b615b5..4aa6c3a 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ LITMUS_KERNEL ?= ../litmus-rt
 # Internal configuration.
 
 # compiler flags
-flags-debug    = -O2 -Wall -Werror -g -Wdeclaration-after-statement
+flags-debug    = -O2 -Wall -Wno-error -g -Wdeclaration-after-statement
 flags-api      = -D_XOPEN_SOURCE=600 -D_GNU_SOURCE
 
 # architecture-specific flags
@@ -37,6 +37,7 @@ include-${ARCH} ?= ${ARCH}
 
 # by default we use the local version
 LIBLITMUS ?= .
+CUDA ?= /usr/local/cuda/lib64
 
 # where to find header files
 headers =  -I${LIBLITMUS}/include -I${LIBLITMUS}/arch/${include-${ARCH}}/include
@@ -50,6 +51,7 @@ LDFLAGS  = ${flags-${ARCH}}
 
 # how to link against liblitmus
 liblitmus-flags = -L${LIBLITMUS} -llitmus
+cuda-flags = -L${CUDA} -lcudart
 
 # Force gcc instead of cc, but let the user specify a more specific version if
 # desired.
@@ -65,7 +67,7 @@ AR  := ${CROSS_COMPILE}${AR}
 # ##############################################################################
 # Targets
 
-all     = lib ${rt-apps}
+all     = lib gpu-rtspin ${rt-apps}
 rt-apps = cycles base_task rt_launch rtspin release_ts measure_syscall \
           base_mt_task uncache runtests resctl
 
@@ -115,6 +117,7 @@ doc:
 
 clean:
         rm -f ${rt-apps}
+        rm -f gpu-rtspin
         rm -f *.o *.d *.a test_catalog.inc
         rm -f ${imported-headers}
         rm -f inc/config.makefile
@@ -218,6 +221,8 @@ obj-rt_launch = rt_launch.o common.o
 obj-rtspin = rtspin.o common.o
 lib-rtspin = -lrt
 
+obj-gpu-rtspin = gpu-rtspin.o common.o cuda_loop.o
+
 obj-uncache = uncache.o
 lib-uncache = -lrt
 
@@ -228,6 +233,8 @@ lib-measure_syscall = -lm
 
 obj-resctl = resctl.o
 
+cuda_loop.o: bin/cuda_loop.cu
+        nvcc -c bin/cuda_loop.cu
 
 # ##############################################################################
 # Build everything that depends on liblitmus.
@@ -236,6 +243,9 @@ obj-resctl = resctl.o
 ${rt-apps}: $${obj-$$@} liblitmus.a
         $(CC) -o $@ $(LDFLAGS) ${ldf-$@} $(filter-out liblitmus.a,$+) $(LOADLIBS) $(LDLIBS) ${liblitmus-flags} ${lib-$@}
 
+gpu-rtspin: ${obj-gpu-rtspin} liblitmus.a
+        g++ -o gpu-rtspin $(LDFLAGS) ${ldf-gpu-rtspin} $(filter-out liblitmus.a,$+) $(LOADLIBS) $(LDLIBS) ${liblitmus-flags} ${lib-gpu-rtspin} ${cuda-flags}
+
 # ##############################################################################
 # Dependency resolution.