diff --git a/src/riscv_gpgpu/Makefile b/src/riscv_gpgpu/Makefile
new file mode 100644
index 00000000..9af1542d
--- /dev/null
+++ b/src/riscv_gpgpu/Makefile
@@ -0,0 +1,18 @@
+
+COMP   = /opt/riscv/bin/riscv32-unknown-elf-gcc
+CC_FLAGS = -march=rv32i -mabi=ilp32 -O0 -Wl,-Bstatic,-T,linker.ld -ffreestanding -nostdlib
+
+DMP  = /opt/riscv/bin/riscv32-unknown-elf-objdump
+CPY  = /opt/riscv/bin/riscv32-unknown-elf-objcopy
+
+
+all: HEX DUMP ELF
+
+DUMP: ELF
+	$(DMP) -D gpgpu_test.elf > gpgpu_test.dump
+
+HEX: ELF
+	$(CPY) -O ihex gpgpu_test.elf gpgpu_test.hex
+
+ELF: 
+	$(COMP) $(CC_FLAGS) ./lib/lib.s gpgpu_test.c ./lib/queue.s ./lib/lib.c -o gpgpu_test.elf
diff --git a/src/riscv_gpgpu/gpgpu_test.elf b/src/riscv_gpgpu/gpgpu_test.elf
index bd41d3a6..f8794ed4 100755
Binary files a/src/riscv_gpgpu/gpgpu_test.elf and b/src/riscv_gpgpu/gpgpu_test.elf differ
diff --git a/src/riscv_gpgpu/hi.sh b/src/riscv_gpgpu/hi.sh
index 7f836145..d44ef33e 100755
--- a/src/riscv_gpgpu/hi.sh
+++ b/src/riscv_gpgpu/hi.sh
@@ -1,3 +1,3 @@
- /opt/riscv/bin/riscv32-unknown-linux-gnu-gcc -march=rv32i -mabi=ilp32 -O0 -Wl,-Bstatic,-T,linker.ld -ffreestanding -nostdlib ./lib/lib.s gpgpu_test.c ./lib/queue.s ./lib/lib.c -o gpgpu_test.elf
- /opt/riscv/bin/riscv32-unknown-linux-gnu-objdump -D gpgpu_test.elf > gpgpu_test.dump
- /opt/riscv/bin/riscv32-unknown-linux-gnu-objcopy -O ihex gpgpu_test.elf gpgpu_test.hex
\ No newline at end of file
+ /opt/riscv/bin/riscv32-unknown-elf-gcc -march=rv32i -mabi=ilp32 -O0 -Wl,-Bstatic,-T,linker.ld -ffreestanding -nostdlib ./lib/lib.s gpgpu_test.c ./lib/queue.s ./lib/lib.c -o gpgpu_test.elf
+ /opt/riscv/bin/riscv32-unknown-elf-objdump -D gpgpu_test.elf > gpgpu_test.dump
+ /opt/riscv/bin/riscv32-unknown-elf-objcopy -O ihex gpgpu_test.elf gpgpu_test.hex
diff --git a/src/riscv_gpgpu/lib/hi.sh b/src/riscv_gpgpu/lib/hi.sh
index e2aa26b1..dbc82e19 100755
--- a/src/riscv_gpgpu/lib/hi.sh
+++ b/src/riscv_gpgpu/lib/hi.sh
@@ -1,3 +1,3 @@
- /opt/riscv-nommu/bin/riscv32-unknown-linux-gnu-gcc -march=rv32i -mabi=ilp32 -O0 -Wl,-Bstatic,-T,linker.ld -ffreestanding -nostdlib queue.c -o queue.elf
- /opt/riscv-nommu/bin/riscv32-unknown-linux-gnu-objdump -D queue.elf > queue.dump
- /opt/riscv-nommu/bin/riscv32-unknown-linux-gnu-objcopy -O ihex queue.elf queue.hex
\ No newline at end of file
+/opt/riscv/bin/riscv32-unknown-elf-gcc -march=rv32i -mabi=ilp32 -O0 -Wl,-Bstatic,-T,linker.ld -ffreestanding -nostdlib queue.c -o queue.elf
+/opt/riscv/bin/riscv32-unknown-elf-objdump -D queue.elf > queue.dump
+/opt/riscv/bin/riscv32-unknown-elf-objcopy -O ihex queue.elf queue.hex
\ No newline at end of file