leg-virt-tianocore: build all targets with GCC 4.9 as well

Change-Id: Ia9a08e488a3318c59188daebe679e8b50d89dfc7
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

1 files changed, 34 insertions, 29 deletions

diff --git a/leg-virt-tiancore-edk2-upstream.yaml b/leg-virt-tiancore-edk2-upstream.yaml
index d155173468..db66e575fa 100644
--- a/leg-virt-tiancore-edk2-upstream.yaml
+++ b/leg-virt-tiancore-edk2-upstream.yaml
@@ -59,8 +59,12 @@
               rm -rf out
             }
 
-            # use the GCC 4.8 toolchain that is already available on the build host
-            export PATH=${HOME}/srv/toolchain/arm64-tc-14.04/bin:${HOME}/srv/toolchain/arm-tc-14.04/bin:${PATH}
+            # use the GCC 4.[89] toolchains that are already available on the build host
+            export GCC48_AARCH64_PREFIX=${HOME}/srv/toolchain/arm64-tc-14.04/bin/aarch64-linux-gnu-
+            export GCC48_ARM_PREFIX=${HOME}/srv/toolchain/arm-tc-14.04/bin/arm-linux-gnueabihf-
+            export GCC49_AARCH64_PREFIX=${HOME}/srv/toolchain/arm64-tc-14.09/bin/aarch64-linux-gnu-
+            export GCC49_ARM_PREFIX=${HOME}/srv/toolchain/arm-tc-14.09/bin/arm-linux-gnueabihf-
+
             export OUTDIR=${WORKSPACE}/out
 
             (
@@ -73,8 +77,6 @@
                 make -C BaseTools
 
                 source edksetup.sh
-                export GCC48_AARCH64_PREFIX=aarch64-linux-gnu-
-                export GCC48_ARM_PREFIX=arm-linux-gnueabihf-
 
                 # retrieve FVP model DTBs from ARM trusted firmware repo
                 wget -O - -q --no-check-certificate https://github.com/ARM-software/arm-trusted-firmware/archive/master.tar.gz | \
@@ -92,32 +94,35 @@
                 ./Install.sh
 
                 cd ${WORKSPACE}
-                for type in DEBUG RELEASE
+                for tc in GCC48 GCC49
                 do
-                    for arch in AARCH64 ARM
+                    for type in DEBUG RELEASE
                     do
-                        mkdir -p ${OUTDIR}/QEMU-${arch}/${type}
-                        build -a ${arch} -t GCC48 -b ${type} -n $NUM_THREADS -p ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc -D INTEL_BDS
-                        cp Build/ArmVirtualizationQemu-${arch}/${type}_GCC48/FV/QEMU_EFI.fd ${OUTDIR}/QEMU-${arch}/${type}
-
-                        mkdir -p ${OUTDIR}/QEMU-${arch}/${type}-ARMBDS
-                        build -a ${arch} -t GCC48 -b ${type} -n $NUM_THREADS -p ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc
-                        cp Build/ArmVirtualizationQemu-${arch}/${type}_GCC48/FV/QEMU_EFI.fd ${OUTDIR}/QEMU-${arch}/${type}-ARMBDS
+                        for arch in AARCH64 ARM
+                        do
+                            mkdir -p ${OUTDIR}/QEMU-${arch}/${type}_${tc}
+                            build -a ${arch} -t ${tc} -b ${type} -n $NUM_THREADS -p ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc -D INTEL_BDS
+                            cp Build/ArmVirtualizationQemu-${arch}/${type}_${tc}/FV/QEMU_EFI.fd ${OUTDIR}/QEMU-${arch}/${type}_${tc}
+
+                            mkdir -p ${OUTDIR}/QEMU-${arch}/${type}_${tc}-ARMBDS
+                            build -a ${arch} -t ${tc} -b ${type} -n $NUM_THREADS -p ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc
+                            cp Build/ArmVirtualizationQemu-${arch}/${type}_${tc}/FV/QEMU_EFI.fd ${OUTDIR}/QEMU-${arch}/${type}_${tc}-ARMBDS
+                        done
+
+                        # below builds are only supported for AArch64
+
+                        mkdir -p ${OUTDIR}/XEN-AARCH64/${type}_${tc}
+                        build -a AARCH64 -t ${tc} -b ${type} -n $NUM_THREADS -p ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationXen.dsc
+                        cp Build/ArmVirtualizationXen-AARCH64/${type}_${tc}/FV/XEN_EFI.fd ${OUTDIR}/XEN-AARCH64/${type}_${tc}
+
+                        mkdir -p ${OUTDIR}/QEMU-AARCH64/${type}_${tc}-SECURE
+                        build -a AARCH64 -t ${tc} -b ${type} -n $NUM_THREADS -p ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc -D INTEL_BDS -D SECURE_BOOT_ENABLE
+                        cp Build/ArmVirtualizationQemu-AARCH64/${type}_${tc}/FV/QEMU_EFI.fd ${OUTDIR}/QEMU-AARCH64/${type}_${tc}-SECURE
+
+                        mkdir -p ${OUTDIR}/FVP-AARCH64/${type}_${tc}
+                        build -a AARCH64 -t ${tc} -b ${type} -n $NUM_THREADS -p ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc -D ARM_FOUNDATION_FVP -D DTB_DIR=${DTBDIR}
+                        cp Build/ArmVExpress-FVP-AArch64/${type}_${tc}/FV/FVP_AARCH64_EFI.fd ${OUTDIR}/FVP-AARCH64/${type}_${tc}
                     done
-
-                    # below builds are only supported for AArch64
-
-                    mkdir -p ${OUTDIR}/XEN-AARCH64/${type}
-                    build -a AARCH64 -t GCC48 -b ${type} -n $NUM_THREADS -p ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationXen.dsc
-                    cp Build/ArmVirtualizationXen-AARCH64/${type}_GCC48/FV/XEN_EFI.fd ${OUTDIR}/XEN-AARCH64/${type}
-
-                    mkdir -p ${OUTDIR}/QEMU-AARCH64/${type}-SECURE
-                    build -a AARCH64 -t GCC48 -b ${type} -n $NUM_THREADS -p ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc -D INTEL_BDS -D SECURE_BOOT_ENABLE
-                    cp Build/ArmVirtualizationQemu-AARCH64/${type}_GCC48/FV/QEMU_EFI.fd ${OUTDIR}/QEMU-AARCH64/${type}-SECURE
-
-                    mkdir -p ${OUTDIR}/FVP-AARCH64/${type}
-                    build -a AARCH64 -t GCC48 -b ${type} -n $NUM_THREADS -p ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc -D ARM_FOUNDATION_FVP -D DTB_DIR=${DTBDIR}
-                    cp Build/ArmVExpress-FVP-AArch64/${type}_GCC48/FV/FVP_AARCH64_EFI.fd ${OUTDIR}/FVP-AARCH64/${type}
                 done
             )
 
@@ -126,7 +131,7 @@
 
         - shell: |
             DEVICE_TYPE=mustang
-            XEN_EFI_URL=https://snapshots.linaro.org/components/kernel/${JOB_NAME}/${BUILD_NUMBER}/XEN-AARCH64/RELEASE/XEN_EFI.fd
+            XEN_EFI_URL=https://snapshots.linaro.org/components/kernel/${JOB_NAME}/${BUILD_NUMBER}/XEN-AARCH64/RELEASE_GCC49/XEN_EFI.fd
             TEMPLATE=https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/leg-virt-tiancore-edk2-upstream/lava-job-definitions/${DEVICE_TYPE}/template.json
 
             wget -O - -q --no-check-certificate $TEMPLATE | \
@@ -150,7 +155,7 @@
         - shell: |
             KERNEL_BUILD_NUM=$(wget -q --no-check-certificate -O - https://ci.linaro.org/job/linux-mainline/ARCH=arm64,defconfig=defconfig,label=build/lastSuccessfulBuild/buildNumber)
             DEVICE_TYPE=kvm-aarch64
-            QEMU_EFI_URL=https://snapshots.linaro.org/components/kernel/${JOB_NAME}/${BUILD_NUMBER}/QEMU-AARCH64/RELEASE-SECURE/QEMU_EFI.img.gz
+            QEMU_EFI_URL=https://snapshots.linaro.org/components/kernel/${JOB_NAME}/${BUILD_NUMBER}/QEMU-AARCH64/RELEASE_GCC49-SECURE/QEMU_EFI.img.gz
             TEMPLATE=https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/leg-virt-tiancore-edk2-upstream/lava-job-definitions/${DEVICE_TYPE}/template.json
 
             wget -O - -q --no-check-certificate $TEMPLATE | \