From c8883262cf1375616743ba9d1f259b4fcda20d72 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Thu, 19 Sep 2013 10:57:58 +0200 Subject: buildgcc: Downgrade to gcc 4.7.3, handle armv7-a gcc 4.8.x has issues with using ebp, which broke some builds, so downgrade. The problem also manifested elsewhere, so it's not necessarily our fault. While at it, gcc complained about "armv7a" where it seems to expect "armv7-a". Change-Id: I6f0c35f49709cb41022475bb47116c12ab1c7ee3 Signed-off-by: Patrick Georgi Reviewed-on: http://review.coreboot.org/3930 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich --- util/abuild/abuild | 2 +- util/crossgcc/buildgcc | 9 ++++----- util/xcompile/xcompile | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/util/abuild/abuild b/util/abuild/abuild index d419e876bf..6148757d1e 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -366,7 +366,7 @@ function build_target done fi if [ "$found_crosscompiler" == "false" -a "$TARCH" == ARMV7 ];then - for prefix in armv7a-eabi- armv7a-cros-linux-gnueabi-; do + for prefix in armv7a-eabi- armv7-a-eabi- armv7a-cros-linux-gnueabi-; do if ${prefix}gcc --version > /dev/null 2> /dev/null ; then found_crosscompiler=true CROSS_COMPILE=$prefix diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index b8b90e7e0b..3754837005 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -20,8 +20,8 @@ # Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA # -CROSSGCC_DATE="July 9th, 2013" -CROSSGCC_VERSION="1.22" +CROSSGCC_DATE="September 20th, 2013" +CROSSGCC_VERSION="1.23" # default settings TARGETDIR=`pwd`/xgcc @@ -33,7 +33,7 @@ GMP_VERSION=5.1.2 MPFR_VERSION=3.1.2 MPC_VERSION=1.0.1 LIBELF_VERSION=0.8.13 -GCC_VERSION=4.8.1 +GCC_VERSION=4.7.3 GCC_AUTOCONF_VERSION=2.69 BINUTILS_VERSION=2.23.2 GDB_VERSION=7.6 @@ -224,11 +224,10 @@ while true ; do done case "$TARGETARCH" in - armv7a-eabi) ;; i386-elf) ;; i386-mingw32) ;; i386*) TARGETARCH=i386-elf;; - arm*) TARGETARCH=armv7a-eabi;; + arm*) TARGETARCH=armv7-a-eabi;; aarch64*) TARGETARCH=aarch64-elf;; *) printf "${red}WARNING: Unsupported architecture $TARGETARCH.${NC}\n\n"; ;; esac diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile index ff12217007..de6084d8fa 100644 --- a/util/xcompile/xcompile +++ b/util/xcompile/xcompile @@ -140,7 +140,7 @@ SUPPORTED_ARCHITECTURE="x86 armv7" # ARM Architecture TARCH_armv7="armv7" TBFDARCH_armv7="littlearm" -TCLIST_armv7="armv7a" +TCLIST_armv7="armv7a armv7-a" TWIDTH_armv7="32" # X86 Architecture -- cgit v1.2.3