From 0c17ca5d5d77a68ad5eeed6c3eabc14d84f2631f Mon Sep 17 00:00:00 2001 From: Steven Bellock Date: Wed, 28 Feb 2024 10:23:37 -0800 Subject: [PATCH] Add TOOLCHAIN==GCC to test_size_of_spdm_ Fix #2596. Signed-off-by: Steven Bellock --- unit_test/test_size/test_size_of_spdm_requester/CMakeLists.txt | 2 +- unit_test/test_size/test_size_of_spdm_responder/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/unit_test/test_size/test_size_of_spdm_requester/CMakeLists.txt b/unit_test/test_size/test_size_of_spdm_requester/CMakeLists.txt index e3f28e4a966..3ced07790fd 100644 --- a/unit_test/test_size/test_size_of_spdm_requester/CMakeLists.txt +++ b/unit_test/test_size/test_size_of_spdm_requester/CMakeLists.txt @@ -11,7 +11,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux") SET(CMAKE_EXE_LINKER_FLAGS "--target=aarch64-arm-none-eabi -nostdlib -flto -Wl,--entry,ModuleEntryPoint,--undefined=__udivti3,--undefined=memcpy") elseif(TOOLCHAIN STREQUAL "ARM_GNU" OR TOOLCHAIN STREQUAL "ARM_GNU_BARE_METAL") SET(CMAKE_EXE_LINKER_FLAGS "-nostdlib -flto -Wl,--entry,ModuleEntryPoint,--undefined=__udivti3,--undefined=memcpy") - elseif(TOOLCHAIN STREQUAL "AARCH64_GCC") + elseif(TOOLCHAIN STREQUAL "AARCH64_GCC" OR TOOLCHAIN STREQUAL "GCC") SET(CMAKE_EXE_LINKER_FLAGS "-nostdlib -flto -Wl,--entry,ModuleEntryPoint,--undefined=__stack_chk_fail,--undefined=__stack_chk_guard,--undefined=memcpy") endif() elseif(TOOLCHAIN STREQUAL "RISCV_XPACK") diff --git a/unit_test/test_size/test_size_of_spdm_responder/CMakeLists.txt b/unit_test/test_size/test_size_of_spdm_responder/CMakeLists.txt index ac9af484bb6..8a228237664 100644 --- a/unit_test/test_size/test_size_of_spdm_responder/CMakeLists.txt +++ b/unit_test/test_size/test_size_of_spdm_responder/CMakeLists.txt @@ -11,7 +11,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux") SET(CMAKE_EXE_LINKER_FLAGS "--target=aarch64-arm-none-eabi -nostdlib -flto -Wl,--entry,ModuleEntryPoint,--undefined=__udivti3,--undefined=memcpy") elseif(TOOLCHAIN STREQUAL "ARM_GNU" OR TOOLCHAIN STREQUAL "ARM_GNU_BARE_METAL") SET(CMAKE_EXE_LINKER_FLAGS "-nostdlib -flto -Wl,--entry,ModuleEntryPoint,--undefined=__udivti3,--undefined=memcpy") - elseif(TOOLCHAIN STREQUAL "AARCH64_GCC") + elseif(TOOLCHAIN STREQUAL "AARCH64_GCC" OR TOOLCHAIN STREQUAL "GCC") SET(CMAKE_EXE_LINKER_FLAGS "-nostdlib -flto -Wl,--entry,ModuleEntryPoint,--undefined=__stack_chk_fail,--undefined=__stack_chk_guard,--undefined=memcpy") endif() elseif(TOOLCHAIN STREQUAL "RISCV_XPACK")