diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm
index 82050d9ac5..d460f3950c 100644
--- a/gnu/packages/gdb.scm
+++ b/gnu/packages/gdb.scm
@@ -146,6 +146,18 @@ (define-public gdb-11
     ;; RPC stubs).
     (supported-systems (fold delete %supported-systems %hurd-systems))))
 
+(define-public gdb-11.2
+  (package
+    (inherit gdb-11)
+    (version "11.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnu/gdb/gdb-"
+                                  version ".tar.xz"))
+              (sha256
+               (base32
+                "xvczsqcbh5y0gx7qrclpna0qzx26sk7lra6y8qzxam1biyzr65qf"))))))
+
 (define-public gdb-12
   (package
     (inherit gdb-11)
@@ -166,6 +178,11 @@ (define-public gdb/pinned
   ;; enough to avoid massive rebuilds.
   gdb-11)
 
+(define-public gdb-11.2/pinned
+  ;; This is the fixed version that packages depend on.  Update it rarely
+  ;; enough to avoid massive rebuilds.
+  gdb-11.2)
+
 (define-public gdb
   ;; The "default" version.
   gdb-12)
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index d07f4ef10c..3cc5a4926b 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -788,7 +788,9 @@ (define-public rust
                     (format #f "prefix = ~s" (assoc-ref outputs "rustfmt"))))
                  (invoke "./x.py" "install" "rustfmt")))))))
       ;; Add test inputs.
-      (native-inputs (cons* `("gdb" ,gdb/pinned)
+      (native-inputs (cons* `("gdb" ,(if (target-x86?)
+                                         gdb/pinned
+                                         gdb-11.2/pinned))
                             `("procps" ,procps)
                             (package-native-inputs base-rust))))))