diff --git a/configure b/configure
index 44b7a0241..6a23a0e70 100755
--- a/configure
+++ b/configure
@@ -44,13 +44,11 @@ Supported targets:
   ppc-eabi-diab        (PowerPC, EABI with Diab tools)
   ppc-linux            (PowerPC, Linux)
   arm-eabi             (ARM, EABI, little endian)
-  arm-linux            (ARM, EABI, little endian)
   arm-eabihf           (ARM, EABI using hardware FP registers, little endian)
-  arm-hardfloat        (ARM, EABI using hardware FP registers, little endian)
+  arm-linux            (ARM, EABI using hardware FP registers, little endian)
   armeb-eabi           (ARM, EABI, big endian)
-  armeb-linux          (ARM, EABI, big endian)
   armeb-eabihf         (ARM, EABI using hardware FP registers, big endian)
-  armeb-hardfloat      (ARM, EABI using hardware FP registers, big endian)
+  armeb-linux          (ARM, EABI using hardware FP registers, big endian)
   x86_32-linux         (x86 32 bits, Linux)
   x86_32-bsd           (x86 32 bits, BSD)
   x86_64-linux         (x86 64 bits, Linux)
@@ -243,10 +241,10 @@ responsefile="gnu"
 if test "$arch" = "arm"; then
 
   case "$target" in
-    eabi|linux)
+    eabi)
         abi="eabi"
         ;;
-    eabihf|hf|hardfloat)
+    eabihf|linux|hf|hardfloat)
         abi="hardfloat"
         ;;
     *)
diff --git a/tools/runner.sh b/tools/runner.sh
index 50860dfde..995fc5706 100755
--- a/tools/runner.sh
+++ b/tools/runner.sh
@@ -96,7 +96,7 @@ Configure() {
       ./configure $configopts -toolprefix aarch64-linux-gnu- aarch64-linux
       ;;
     arm,linux)
-      ./configure $configopts -toolprefix arm-linux-gnueabihf- arm-eabihf
+      ./configure $configopts -toolprefix arm-linux-gnueabihf- arm-linux
       ;;
     ppc,linux)
       ./configure $configopts -toolprefix powerpc-linux-gnu- ppc-linux