diff --git a/package/devel/gdb/Makefile b/package/devel/gdb/Makefile
index 9e20644b04fb..24569634a9c1 100644
--- a/package/devel/gdb/Makefile
+++ b/package/devel/gdb/Makefile
@@ -26,14 +26,14 @@ include $(INCLUDE_DIR)/nls.mk
 define Package/gdb/Default
   SECTION:=devel
   CATEGORY:=Development
-  DEPENDS:=+!USE_MUSL:libthread-db $(ICONV_DEPENDS) $(INTL_DEPENDS) +libgmp
+  DEPENDS:=+!USE_MUSL:libthread-db $(ICONV_DEPENDS) $(INTL_DEPENDS)
   URL:=https://www.gnu.org/software/gdb/
 endef

 define Package/gdb
 $(call Package/gdb/Default)
   TITLE:=GNU Debugger
-  DEPENDS+=+libreadline +libncurses +zlib
+  DEPENDS+=+libreadline +libncurses +zlib +libgmp
 endef

 define Package/gdb/description
@@ -62,7 +62,11 @@ CONFIGURE_ARGS+= \
 	--disable-ubsan \
 	--disable-sim \
 	--disable-werror \
-	--disable-source-highlight
+	--disable-source-highlight \
+	--without-mpc \
+	--without-mpfr \
+	--without-isl \
+	--with-libgmp-prefix=$(STAGING_DIR)/usr

 CONFIGURE_VARS+= \
 	ac_cv_search_tgetent="$(TARGET_LDFLAGS) -lncurses -lreadline"
diff --git a/target/linux/pistachio/Makefile b/target/linux/pistachio/Makefile
index 09bdf4d6b6ef..9b245ab95c4a 100644
--- a/target/linux/pistachio/Makefile
+++ b/target/linux/pistachio/Makefile
@@ -9,7 +9,7 @@ BOARD:=pistachio
 BOARDNAME:=MIPS pistachio
 FEATURES:=fpu usb usbgadget squashfs targz nand
 CPU_TYPE:=24kc
-CPU_SUBTYPE:=24kf
+#CPU_SUBTYPE:=24kf

 KERNEL_PATCHVER:=5.4
 KERNEL_TESTING_PATCHVER:=5.10