From 1e7220481e9d72092099e9364f410376c69cd572 Mon Sep 17 00:00:00 2001
From: Rob Savoye <rob.savoye@linaro.org>
Date: Thu, 21 May 2015 13:11:52 -0600
Subject: make new errata configure options only used for aarch64

Change-Id: I373928e3cc18db38769bbf4c43a9c8662d733b38
---
 config/gcc.conf | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'config')

diff --git a/config/gcc.conf b/config/gcc.conf
index 1ed6cb07..e929df7b 100644
--- a/config/gcc.conf
+++ b/config/gcc.conf
@@ -15,7 +15,7 @@ latest="gcc.git~linaro-4.9-branch"
 static_link="no"
 
 # This is a list of default flags always supplied to configure
-default_configure_flags="--with-bugurl=https://bugs.linaro.org --with-mpc=${local_builds}/destdir/${host} --with-mpfr=${local_builds}/destdir/${host} --with-gmp=${local_builds}/destdir/${host} --with-gnu-as --with-gnu-ld --disable-libstdcxx-pch --disable-libmudflap${override_arch:+ --with-arch=${override_arch}}${override_cpu:+ --with-cpu=${override_cpu}}${override_tune:+ --with-tune=${override_tune}} --enable-fix-cortex-a53-835769 --enable-fix-cortex-a53-843419"
+default_configure_flags="--with-bugurl=https://bugs.linaro.org --with-mpc=${local_builds}/destdir/${host} --with-mpfr=${local_builds}/destdir/${host} --with-gmp=${local_builds}/destdir/${host} --with-gnu-as --with-gnu-ld --disable-libstdcxx-pch --disable-libmudflap${override_arch:+ --with-arch=${override_arch}}${override_cpu:+ --with-cpu=${override_cpu}}${override_tune:+ --with-tune=${override_tune}}"
 
 # --with-pkgversion=${USER} 
 # --with-as=${local_builds}/bin/${target}-as --with-ld=${local_builds}/bin/${target}-ld 
@@ -53,6 +53,8 @@ if test `echo ${target} | grep -c aarch64` -eq 1 -a `echo ${gcc_version} | grep
    exit 1
 fi
 
+aarch64_errata="--enable-fix-cortex-a53-835769 --enable-fix-cortex-a53-843419"
+
 # Default set of languages to build. If building binary tarballs, we don't build all the
 # front ends.
 if test x"${tarbin}" != xyes; then
@@ -122,7 +124,7 @@ if test x"${build}" != x"${target}"; then
 	    ;;
 	aarch64*-*elf)
 	    if test x"${override_arch}" = x -a x"${override_cpu}" = x; then
-	        default_configure_flags="${default_configure_flags} --with-arch=armv8-a"
+	        default_configure_flags="${default_configure_flags} --with-arch=armv8-a ${aarch64_errata}"
 	    fi
 	    # LDFLAGS_FOR_TARGET=-static
 	    # Gfortran doesn't cross configure, just native
@@ -130,7 +132,7 @@ if test x"${build}" != x"${target}"; then
 	    ;;
 	aarch64*-linux-gnu)
 	    if test x"${override_arch}" = x -a x"${override_cpu}" = x; then
-	        default_configure_flags="${default_configure_flags} --with-arch=armv8-a"
+	        default_configure_flags="${default_configure_flags} --with-arch=armv8-a ${aarch64_errata}"
 	    fi
 	    # LDFLAGS_FOR_TARGET=-static
 	    ;;
@@ -224,7 +226,7 @@ else
 	    #default_configure_flags="${default_configure_flags}"
 	    ;;
 	aarch64*-linux-gnu)
-	    #default_configure_flags="${default_configure_flags}"
+	    default_configure_flags="${default_configure_flags} ${aarch64_errata}"
 	    ;;
 	x86-pc-linux-gnu)
            default_configure_flags="${default_configure_flags} --enable-linker-build-id --without-included-gettext --enable-threads=posix --enable-nls --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --enable-gnu-unique-object --enable-objc-gc --enable-multiarch --disable-sjlj-exceptions"
-- 
cgit v1.2.3