diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index 892b7bffe6..382ee1a937 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -53,7 +53,7 @@ MPC_VERSION=1.1.0
 GCC_VERSION=8.1.0
 GCC_AUTOCONF_VERSION=2.69
 BINUTILS_VERSION=2.30
-GDB_VERSION=8.0
+GDB_VERSION=8.2.1
 IASL_VERSION=20181213
 PYTHON_VERSION=3.7.0
 EXPAT_VERSION=2.2.6
diff --git a/util/crossgcc/patches/gdb-8.0_amd64.patch b/util/crossgcc/patches/gdb-8.0_amd64.patch
deleted file mode 100644
index 3a00330543..0000000000
--- a/util/crossgcc/patches/gdb-8.0_amd64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN gdb-8.0.orig/gdb/configure.tgt gdb-8.0/gdb/configure.tgt
---- gdb-8.0.orig/gdb/configure.tgt	2016-02-09 19:19:39.000000000 -0800
-+++ gdb-8.0/gdb/configure.tgt	2016-04-21 17:42:32.628433139 -0700
-@@ -681,6 +681,11 @@
- 			i387-tdep.o i386bsd-tdep.o i386obsd-tdep.o \
- 			obsd-tdep.o bsd-uthread.o solib-svr4.o"
- 	;;
-+x86_64-*-*)
-+	# Target: amd64
-+	gdb_target_obs="amd64-tdep.o i386-tdep.o i387-tdep.o"
-+	;;
-+
- xtensa*-*-linux*)	gdb_target=linux
- 	# Target: GNU/Linux Xtensa
- 	gdb_target_obs="xtensa-tdep.o xtensa-config.o xtensa-linux-tdep.o \
diff --git a/util/crossgcc/patches/gdb-8.2.1_amd64.patch b/util/crossgcc/patches/gdb-8.2.1_amd64.patch
new file mode 100644
index 0000000000..978fa26f6a
--- /dev/null
+++ b/util/crossgcc/patches/gdb-8.2.1_amd64.patch
@@ -0,0 +1,14 @@
+diff -urN gdb-8.2.1.orig/gdb/configure.tgt gdb-8.2.1/gdb/configure.tgt
+--- gdb-8.2.1.orig/gdb/configure.tgt	2019-01-04 12:34:10.301072023 +0100
++++ gdb-8.2.1/gdb/configure.tgt	2019-01-04 12:35:21.948388220 +0100
+@@ -732,6 +732,10 @@
+ x86_64-*-rtems*)
+ 	gdb_target_obs="${amd64_tobjs} ${i386_tobjs} i386-bsd-tdep.o"
+ 	;;
++x86_64-*-*)
++	# Target: amd64
++	gdb_target_obs="amd64-tdep.o i386-tdep.o i387-tdep.o"
++	;;
+ xtensa*-*-linux*)
+ 	# Target: GNU/Linux Xtensa
+ 	gdb_target_obs="xtensa-linux-tdep.o symfile-mem.o linux-tdep.o"
diff --git a/util/crossgcc/patches/gdb-8.0_no-doc.patch b/util/crossgcc/patches/gdb-8.2.1_no-doc.patch
similarity index 64%
rename from util/crossgcc/patches/gdb-8.0_no-doc.patch
rename to util/crossgcc/patches/gdb-8.2.1_no-doc.patch
index 926ba3068c..80dd349bc4 100644
--- a/util/crossgcc/patches/gdb-8.0_no-doc.patch
+++ b/util/crossgcc/patches/gdb-8.2.1_no-doc.patch
@@ -1,7 +1,7 @@
 diff -urN gdb-8.0.orig/gdb/Makefile.in gdb-8.0/gdb/Makefile.in
---- gdb-8.0.orig/gdb/Makefile.in	2016-02-24 01:55:15.000000000 -0800
-+++ gdb-8.0/gdb/Makefile.in	2016-04-21 17:44:32.721472633 -0700
-@@ -1092,7 +1092,7 @@
+--- gdb-8.2.1.orig/gdb/Makefile.in	2019-01-04 12:58:10.227572419 +0100
++++ gdb-8.2.1/gdb/Makefile.in	2019-01-04 12:59:00.539134274 +0100
+@@ -1568,7 +1568,7 @@
  
  TSOBS = inflow.o
  
diff --git a/util/crossgcc/patches/gdb-8.0_pythonhome.patch b/util/crossgcc/patches/gdb-8.2.1_pythonhome.patch
similarity index 64%
rename from util/crossgcc/patches/gdb-8.0_pythonhome.patch
rename to util/crossgcc/patches/gdb-8.2.1_pythonhome.patch
index d0c1427e77..51f74dbe2a 100644
--- a/util/crossgcc/patches/gdb-8.0_pythonhome.patch
+++ b/util/crossgcc/patches/gdb-8.2.1_pythonhome.patch
@@ -1,7 +1,7 @@
-diff -urN gdb-8.0.orig/gdb/python/python.c gdb-8.0/gdb/python/python.c
---- gdb-8.0.orig/gdb/python/python.c	2016-02-09 19:19:39.000000000 -0800
-+++ gdb-8.0/gdb/python/python.c	2016-04-21 17:45:39.119833428 -0700
-@@ -1748,6 +1748,15 @@
+diff -urN gdb-8.2.1.orig/gdb/python/python.c gdb-8.2.1/gdb/python/python.c
+--- gdb-8.2.1.org/gdb/python/python.c	2019-01-04 12:48:32.440687758 +0100
++++ gdb-8.2.1/gdb/python/python.c	2019-01-04 12:54:09.917677688 +0100
+@@ -1727,6 +1727,15 @@
  #endif
  #endif
  
diff --git a/util/crossgcc/sum/gdb-8.0.tar.xz.cksum b/util/crossgcc/sum/gdb-8.0.tar.xz.cksum
deleted file mode 100644
index fb42fe2e77..0000000000
--- a/util/crossgcc/sum/gdb-8.0.tar.xz.cksum
+++ /dev/null
@@ -1 +0,0 @@
-148c8e783ebf9b281241d0566db59961191ec64d  tarballs/gdb-8.0.tar.xz
diff --git a/util/crossgcc/sum/gdb-8.2.1.tar.xz.cksum b/util/crossgcc/sum/gdb-8.2.1.tar.xz.cksum
new file mode 100644
index 0000000000..a976106ede
--- /dev/null
+++ b/util/crossgcc/sum/gdb-8.2.1.tar.xz.cksum
@@ -0,0 +1 @@
+023556a6d6effa1ffaadf0007cc4458cbe8dde3d  tarballs/gdb-8.2.1.tar.xz