diff --git a/README.md b/README.md
index 6e8c9e54b..4efeb1088 100644
--- a/README.md
+++ b/README.md
@@ -408,7 +408,7 @@ Info : Listening on port 4444 for telnet connections
 Then you will be able to either connect through `telnet` or with `gdb`:
 
 ```
-riscv64-unknown-elf-gdb /path/to/elf
+risc-none-elf-gdb /path/to/elf
 
 (gdb) target remote localhost:3333
 (gdb) load
diff --git a/util/toolchain-builder/config/global.sh b/util/toolchain-builder/config/global.sh
index dab7b0cba..c5af7f6a6 100755
--- a/util/toolchain-builder/config/global.sh
+++ b/util/toolchain-builder/config/global.sh
@@ -60,11 +60,7 @@ BINUTILS_CONFIGURE_OPTS() {
         --target=$1
         --prefix=${INSTALL_DIR}
         --disable-werror
-        --disable-gdb
         --disable-nls
-        --disable-sim
-        --disable-libdecnumber
-        --disable-readline
     )
     echo "${OPTS[@]}"
 }