aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Harkin <ryan.harkin@linaro.org>2016-11-25 14:14:03 +0000
committerRyan Harkin <ryan.harkin@linaro.org>2017-02-23 17:36:25 +0000
commitcfc242ee210de5927bcb411aa18cee0b0d3f2d17 (patch)
treec891864829eb42aaef24e75227950863790c6db0
parent111b5a6e093b14e89832c147e72a2282e89ed09f (diff)
use GCC5
Linaro GCC 4.9 2015.05 has been archived and it's time to move to a more recent GCC. GCC5 is the most recent GCC supported by OP-TEE OS and ARM-TF, so move up to Linaro GCC 5.3 2016.05. Also set CROSS_COMPILE_64 for uefi-build.sh. If CROSS_COMPILE_64 is not set, uefi-build.sh will use the pre-installed compiler. Change-Id: Ie67751d94867e0e52ffa4936aa6af61208afba21 Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org> Conflicts: platforms/common/common.base
-rw-r--r--platforms/common/common.base8
1 files changed, 4 insertions, 4 deletions
diff --git a/platforms/common/common.base b/platforms/common/common.base
index c868158..9f0618e 100644
--- a/platforms/common/common.base
+++ b/platforms/common/common.base
@@ -27,9 +27,9 @@
# POSSIBILITY OF SUCH DAMAGE.
#Set the default toolchain
-export CROSS_COMPILE=${TOP_DIR}/tools/gcc/gcc-linaro-4.9-2015.05-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-
-export CROSS_COMPILE_64=$CROSS_COMPILE
-export CROSS_COMPILE_32=${TOP_DIR}/tools/gcc/gcc-linaro-4.9-2015.05-x86_64_arm-linux-gnueabihf/bin/arm-linux-gnueabihf-
+export CROSS_COMPILE_64=${TOP_DIR}/tools/gcc/gcc-linaro-5.3.1-2016.05-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-
+export CROSS_COMPILE=$CROSS_COMPILE_64
+export CROSS_COMPILE_32=${TOP_DIR}/tools/gcc/gcc-linaro-5.3.1-2016.05-x86_64_arm-linux-gnueabihf/bin/arm-linux-gnueabihf-
#BUILD_SCRIPTS - A list of scripts to be run, relative to this repository
# root. This variable is added to throughout this file.
@@ -143,7 +143,7 @@ UEFI_BUILD_ENABLED=1
BUILD_SCRIPTS=$BUILD_SCRIPTS"build-uefi.sh "
UEFI_PATH=uefi/edk2
UEFI_BUILD_MODE=DEBUG
-UEFI_TOOLCHAIN=GCC49
+UEFI_TOOLCHAIN=GCC5
UEFI_TOOLS_PATH=tools/uefi-tools
UEFI_ACPICA_PATH=tools/acpica/generate/unix