[AArch64] Partial backport from mainline.

	* config.gcc (aarch64*-*-*): Use ISA flags from aarch64-arches.def.
	Do not define target_cpu_default2 to generic.

From-SVN: r210112

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e9c0b4f57d2b9f0a75666a7b5e28b6ed81099c3e..aa37820e9c871022c152cc7ab8ba95abfa4eb6c4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-06  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+       * config.gcc (aarch64*-*-*): Use ISA flags from aarch64-arches.def.
+       Do not define target_cpu_default2 to generic.
+
 2014-05-06  Richard Biener  <rguenther@suse.de>
 
        Backport from mainline

diff --git a/gcc/config.gcc b/gcc/config.gcc
index a4fb77db7461aad3d0641df95a389e596ef14c6d..2b54dd9a9d94005baef11b8fab37abde96fb13dd 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -3150,6 +3150,11 @@ case "${target}" in
                                  ${srcdir}/config/aarch64/$def | \
                                  sed -e 's/^[^,]*,[    ]*//' | \
                                  sed -e 's/,.*$//'`
+                               # Extract the architecture flags from aarch64-arches.def
+                               ext_mask=`grep "^$pattern(\"$base_val\"," \
+                                  ${srcdir}/config/aarch64/$def | \
+                                  sed -e 's/)$//' | \
+                                  sed -e 's/^.*,//'`
                          else
                                base_id=`grep "^$pattern(\"$base_val\"," \
                                  ${srcdir}/config/aarch64/$def | \
@@ -3699,10 +3704,8 @@ esac
 target_cpu_default2=
 case ${target} in
        aarch64*-*-*)
-               if test x$target_cpu_cname = x
+               if test x"$target_cpu_cname" != x
                then
-                       target_cpu_default2=TARGET_CPU_generic
-               else
                        target_cpu_default2=$target_cpu_cname
                fi
                ;;