config.gcc (--with-cpu on ARM): Preserve the canonical cpu name for use in configargs.h.

[gcc.git] / gcc / config.gcc

diff --git a/gcc/config.gcc b/gcc/config.gcc
index aee83254a59b95b7bd77f014634adefd5a067f7a..dd07eea8d0bd200352db571141ef4035d16d39e9 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2274,7 +2274,7 @@ fi
                                ${srcdir}/config/arm/arm-cores.def | \
                                sed -e 's/^[^,]*,[      ]*//' | \
                                sed -e 's/,.*$//'`
-                         eval "with_$which=$new_val"
+                         eval "target_${which}_cname=$new_val"
                        echo "For $val real value is $new_val"
                          true
                        else
@@ -2557,16 +2557,12 @@ fi
                ;;
 
        arm*-*-*)
-               case "x$with_cpu" in
-               x)
-                       # The most generic
-                       target_cpu_default2="TARGET_CPU_generic"
-                       ;;
-
-               *)
-                       target_cpu_default2="TARGET_CPU_$with_cpu"
-                       ;;
-               esac
+               if test x$target_cpu_cname = x
+               then
+                       target_cpu_default2=TARGET_CPU_generic
+               else
+                       target_cpu_default2=TARGET_CPU_$target_cpu_cname
+               fi
                ;;
 
        m68k*-linux*)