diff --git a/toolchain/gdb/Makefile b/toolchain/gdb/Makefile
index 97d88d65a6..8d41ee9781 100644
--- a/toolchain/gdb/Makefile
+++ b/toolchain/gdb/Makefile
@@ -15,6 +15,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/foss-for-synopsys-dwc-arc-processors/binutils-gdb/archive/arc-2016.03-gdb
 PKG_MD5SUM:=775caaf6385c16f20b6f53c0a2b95f79
 GDB_DIR:=binutils-$(PKG_NAME)-$(PKG_VERSION)
+PATCH_DIR:=./patches-arc
 else
 PKG_VERSION:=7.11
 
@@ -24,8 +25,6 @@ PKG_MD5SUM:=b5c784685e1cde65ba135feea86b6d75
 GDB_DIR:=$(PKG_NAME)-$(PKG_VERSION)
 endif
 
-PATCH_DIR:=./patches/$(PKG_VERSION)
-
 HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(GDB_DIR)
 
 HOST_BUILD_PARALLEL:=1
diff --git a/toolchain/gdb/patches/7.11/100-no_extern_inline.patch b/toolchain/gdb/patches-arc/100-no_extern_inline.patch
similarity index 100%
rename from toolchain/gdb/patches/7.11/100-no_extern_inline.patch
rename to toolchain/gdb/patches-arc/100-no_extern_inline.patch
diff --git a/toolchain/gdb/patches/arc-2016.03-gdb/110-no_testsuite.patch b/toolchain/gdb/patches-arc/110-no_testsuite.patch
similarity index 100%
rename from toolchain/gdb/patches/arc-2016.03-gdb/110-no_testsuite.patch
rename to toolchain/gdb/patches-arc/110-no_testsuite.patch
diff --git a/toolchain/gdb/patches/arc-2016.03-gdb/120-fix-compile-flag-mismatch.patch b/toolchain/gdb/patches-arc/120-fix-compile-flag-mismatch.patch
similarity index 100%
rename from toolchain/gdb/patches/arc-2016.03-gdb/120-fix-compile-flag-mismatch.patch
rename to toolchain/gdb/patches-arc/120-fix-compile-flag-mismatch.patch
diff --git a/toolchain/gdb/patches/arc-2016.03-gdb/100-no_extern_inline.patch b/toolchain/gdb/patches/100-no_extern_inline.patch
similarity index 100%
rename from toolchain/gdb/patches/arc-2016.03-gdb/100-no_extern_inline.patch
rename to toolchain/gdb/patches/100-no_extern_inline.patch
diff --git a/toolchain/gdb/patches/7.11/110-no_testsuite.patch b/toolchain/gdb/patches/110-no_testsuite.patch
similarity index 100%
rename from toolchain/gdb/patches/7.11/110-no_testsuite.patch
rename to toolchain/gdb/patches/110-no_testsuite.patch
diff --git a/toolchain/gdb/patches/7.11/120-fix-compile-flag-mismatch.patch b/toolchain/gdb/patches/120-fix-compile-flag-mismatch.patch
similarity index 100%
rename from toolchain/gdb/patches/7.11/120-fix-compile-flag-mismatch.patch
rename to toolchain/gdb/patches/120-fix-compile-flag-mismatch.patch