From a66366ba348cc992a82b295a2fd826dcaa73cc6f Mon Sep 17 00:00:00 2001
From: Chetan Singh <chetan.singh2@arm.com>
Date: Fri, 30 Jan 2026 18:38:15 +0530
Subject: [PATCH] Add support to build SCT with 14.3 arm toolchain

 * also fixed build errors flagged with 14.3 toolchain
---
 common/config/bbr_source.cfg                           |  2 +-
 common/scripts/get_source.sh                           |  4 ++--
 .../BlackBoxTest/SbbrBootServicesBBTestFunction.c      | 10 +++++-----
 .../BlackBoxTest/SysEnvConfigBBTestFunction.c          |  1 +
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/common/config/bbr_source.cfg b/common/config/bbr_source.cfg
index f505e3a..4b4229f 100644
--- a/common/config/bbr_source.cfg
+++ b/common/config/bbr_source.cfg
@@ -28,7 +28,7 @@
 
 
 #Cross compiler tools from https://releases.linaro.org/components/toolchain/binaries
-GCC_TOOLS_VERSION=13.2.rel1
+GCC_TOOLS_VERSION=14.3.rel1
 
 CROSS_COMPILER_URL=https://developer.arm.com/-/media/Files/downloads/gnu/${GCC_TOOLS_VERSION}/binrel/arm-gnu-toolchain-${GCC_TOOLS_VERSION}-x86_64-aarch64-none-linux-gnu.tar.xz
 
diff --git a/common/scripts/get_source.sh b/common/scripts/get_source.sh
index 0df035d..fc7c3b4 100755
--- a/common/scripts/get_source.sh
+++ b/common/scripts/get_source.sh
@@ -34,8 +34,8 @@ get_cross_compiler()
         pushd $TOP_DIR/tools
         wget $CROSS_COMPILER_URL --no-check-certificate
         tar -xf arm-gnu-toolchain-${GCC_TOOLS_VERSION}-x86_64-${TAG}.tar.xz
-        mv arm-gnu-toolchain-13.2.Rel1-x86_64-aarch64-none-linux-gnu arm-gnu-toolchain-13.2.rel1-x86_64-aarch64-none-linux-gnu
-        rm arm-gnu-toolchain-${GCC_TOOLS_VERSION}-x86_64-${TAG}.tar.xz
+      #  mv arm-gnu-toolchain-13.2.Rel1-x86_64-aarch64-none-linux-gnu arm-gnu-toolchain-13.2.rel1-x86_64-aarch64-none-linux-gnu
+      #  rm arm-gnu-toolchain-${GCC_TOOLS_VERSION}-x86_64-${TAG}.tar.xz
         popd
     fi
 }
diff --git a/common/sct-tests/sbbr-tests/SbbrBootServices/BlackBoxTest/SbbrBootServicesBBTestFunction.c b/common/sct-tests/sbbr-tests/SbbrBootServices/BlackBoxTest/SbbrBootServicesBBTestFunction.c
index 376571a..b1f1527 100755
--- a/common/sct-tests/sbbr-tests/SbbrBootServices/BlackBoxTest/SbbrBootServicesBBTestFunction.c
+++ b/common/sct-tests/sbbr-tests/SbbrBootServices/BlackBoxTest/SbbrBootServicesBBTestFunction.c
@@ -137,7 +137,7 @@ BBTestMemoryMapTest (
   Status = gtBS->HandleProtocol (
               SupportHandle,
               &gEfiStandardTestLibraryGuid,
-              &StandardLib
+              (VOID **) &StandardLib
               );
   if (EFI_ERROR (Status)) {
     return Status;
@@ -310,7 +310,7 @@ BBTestAcpiTableTest (
   Status = gtBS->HandleProtocol (
               SupportHandle,
               &gEfiStandardTestLibraryGuid,
-              &StandardLib
+              (VOID **)&StandardLib
               );
   if (EFI_ERROR (Status)) {
     return Status;
@@ -321,7 +321,7 @@ BBTestAcpiTableTest (
   //
   Status = SctGetSystemConfigurationTable (
               &gEfiAcpi20TableGuid,
-              &AcpiTable
+              (VOID **)&AcpiTable
               );
   if (EFI_ERROR (Status)){
     StandardLib->RecordAssertion (
@@ -465,7 +465,7 @@ BBTestSmbiosTableTest (
   Status = gtBS->HandleProtocol (
               SupportHandle,
               &gEfiStandardTestLibraryGuid,
-              &StandardLib
+              (VOID **)&StandardLib
               );
   if (EFI_ERROR (Status)) {
     return Status;
@@ -476,7 +476,7 @@ BBTestSmbiosTableTest (
   //
   Status = SctGetSystemConfigurationTable (
               &gEfiSmbios3TableGuid,
-              &SmbiosTable
+              (VOID **)&SmbiosTable
               );
   if (EFI_ERROR(Status)) {
     StandardLib->RecordAssertion (
diff --git a/common/sct-tests/sbbr-tests/SbbrSysEnvConfig/BlackBoxTest/SysEnvConfigBBTestFunction.c b/common/sct-tests/sbbr-tests/SbbrSysEnvConfig/BlackBoxTest/SysEnvConfigBBTestFunction.c
index 826df0c..75a6217 100755
--- a/common/sct-tests/sbbr-tests/SbbrSysEnvConfig/BlackBoxTest/SysEnvConfigBBTestFunction.c
+++ b/common/sct-tests/sbbr-tests/SbbrSysEnvConfig/BlackBoxTest/SysEnvConfigBBTestFunction.c
@@ -58,6 +58,7 @@ Module Name:
 #include <AArch64/AArch64.h>
 #include "Guid.h"
 #include <Library/ArmLib.h>
+#include <Library/BaseMemoryLib.h>
 #include "SctLib.h"
 #include "SysEnvConfigBBTestFunction.h"
 #include "SysEnvConfigBBTestMain.h"