diff --git a/gdb/bin/x86_64/amd-gdb b/gdb/bin/x86_64/amd-gdb
index 257d33d..4078828 100755
Binary files a/gdb/bin/x86_64/amd-gdb and b/gdb/bin/x86_64/amd-gdb differ
diff --git a/gpudebugsdk/samples/MatrixMultiplication/Makefile b/gpudebugsdk/samples/MatrixMultiplication/Makefile
new file mode 100644
index 0000000..3e35309
--- /dev/null
+++ b/gpudebugsdk/samples/MatrixMultiplication/Makefile
@@ -0,0 +1,42 @@
+# Copyright (c) 2015 Advanced Micro Devices, Inc. All rights reserved.
+
+makefile: all
+all: MatrixMul
+
+SDKINC=../../include/
+
+HSADIR=/opt/rocm/hsa/
+HSAINC=$(HSADIR)include/hsa
+HSALIB=$(HSADIR)lib/
+
+LIBLINE=-L$(HSALIB) -l:libhsa-runtime64.so.1
+
+CC=g++
+
+TESTCOMMON=../Common
+CFLAGS= -g -D_DEBUG -std=c++11 -m64 -Werror -I$(HSAINC) -I$(TESTCOMMON) -I$(SDKINC)
+LDFLAGS= -g -m64 -Werror -Wl,--unresolved-symbols=ignore-in-shared-libs
+
+OBJFLAGS = -c $(CFLAGS)
+
+SOURCES=\
+	$(TESTCOMMON)/HSAResourceManager.cpp\
+	$(TESTCOMMON)/HSAExtensionFinalizer.cpp\
+	MatrixMul.cpp
+
+OBJECTS=$(SOURCES:.cpp=.o)
+
+DEPS := $(OBJECTS:.o=.d)
+
+MatrixMul : $(OBJECTS)
+	$(CC) $(LDFLAGS) $(OBJECTS)  $(LIBLINE) -o MatrixMul
+
+.cpp.o:
+	$(CC) -c -MMD $(CFLAGS) $< -o $@
+
+clean:
+	rm -f $(TESTCOMMON)/*.o $(TESTCOMMON)/*.d
+	rm -f *.o *.d
+	rm -f MatrixMul
+
+-include $(DEPS)