diff -r 9d0b37f08a10 -r 069f43a215cc config/target.in
--- a/config/target.in	Sun Jan 20 12:58:22 2013 +0000
+++ b/config/target.in	Wed Jun 25 23:33:01 2014 +0200
@@ -296,6 +296,15 @@
     prompt "Floating point:"
     depends on ARCH_SUPPORTS_WITH_FLOAT
 
+config ARCH_FLOAT_AUTO
+    bool
+    prompt "auto (let gcc decide)"
+    help
+      Instead of explicitly passing a float option, don't
+      pass any float options and let gcc figure it out.
+
+      For multilib configurations, this may help.
+
 config ARCH_FLOAT_HW
     bool
     prompt "hardware (FPU)"
@@ -364,6 +373,7 @@
 config ARCH_FLOAT
     string
     default ""       if ! ARCH_SUPPORTS_WITH_FLOAT
+    default "auto"   if ARCH_FLOAT_AUTO
     default "hard"   if ARCH_FLOAT_HW
     default "soft"   if ARCH_FLOAT_SW
     default "softfp" if ARCH_FLOAT_SOFTFP