commit 88ff799240874c199fb10f1e30892f4f0b7bb6f2
author Raef Coles <raef.coles@arm.com> Thu Jan 11 10:27:05 2024 +0000
committer Raef Coles <raef.coles@arm.com> Fri Feb 09 13:53:45 2024 +0000
tree 2d56133a4f9982d6d5c0c94db6f1ca0b6a6f166d
parent 6cd80ce3124277cbb6e7e980c70d44e5316e2a47

Build: Allow altering code-sharing filenames

Allows platforms to add intermediate steps between the generation of
shared code and the linking of the code

Change-Id: Id9d033ad25fa29f55624b9828e34ef3f6d5a00b4
Signed-off-by: Raef Coles <raef.coles@arm.com>

toolchain_ARMCLANG.cmake

diff --git a/toolchain_ARMCLANG.cmake b/toolchain_ARMCLANG.cmake
index afd24c6..d43b974 100644
--- a/toolchain_ARMCLANG.cmake
+++ b/toolchain_ARMCLANG.cmake
@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Copyright (c) 2020-2023, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2024, Arm Limited. All rights reserved.
 # Copyright (c) 2022 Cypress Semiconductor Corporation (an Infineon company)
 # or an affiliate of Cypress Semiconductor Corporation. All rights reserved.
 #
@@ -371,7 +371,7 @@
     add_custom_command(TARGET ${target}
         POST_BUILD
         VERBATIM
-        COMMAND python3 -c "from sys import argv; import re; f = open(argv[1], 'rt'); p = [x.replace('*', '.*') for x in argv[2:]]; l = [x for x in f.readlines() if re.search(r'(?=('+'$|'.join(p + ['SYMDEFS']) + r'))', x)]; f.close(); f = open(argv[1], 'wt'); f.writelines(l); f.close();" $<TARGET_FILE_DIR:${target}>/${target}_shared_symbols.txt ${KEEP_SYMBOL_LIST})
+        COMMAND python3 -c "from sys import argv; import re; f = open(argv[1], 'rt'); p = [x.replace('*', '.*') for x in argv[2:]]; l = [x for x in f.readlines() if re.search(r'(?=('+'$|'.join(p + ['SYMDEFS']) + r'))', x)]; f.close(); f = open(argv[1], 'wt'); f.writelines(l); f.close();" $<TARGET_FILE_DIR:${target}>/${target}${CODE_SHARING_OUTPUT_FILE_SUFFIX} ${KEEP_SYMBOL_LIST})
 
     # Force the target to not remove the symbols if they're unused.
     list(TRANSFORM KEEP_SYMBOL_LIST PREPEND --undefined=)
@@ -383,7 +383,7 @@
     # Ask armclang to produce a symdefs file that will
     target_link_options(${target}
         PRIVATE
-            --symdefs=$<TARGET_FILE_DIR:${target}>/${target}_shared_symbols.txt
+            --symdefs=$<TARGET_FILE_DIR:${target}>/${target}${CODE_SHARING_OUTPUT_FILE_SUFFIX}
     )
 endmacro()
 
@@ -410,7 +410,7 @@
         # Set these properties so that cmake will allow us to use a source file
         # that doesn't exist at cmake-time, but we guarantee will exist at
         # compile-time.
-        set_source_files_properties(${SYMBOL_PROVIDER_OUTPUT_DIR}/${symbol_provider}_shared_symbols.txt
+        set_source_files_properties(${SYMBOL_PROVIDER_OUTPUT_DIR}/${symbol_provider}${CODE_SHARING_INPUT_FILE_SUFFIX}
             DIRECTORY ${TARGET_SOURCE_DIR}
             PROPERTIES
                 EXTERNAL_OBJECT true
@@ -418,7 +418,7 @@
         )
         target_sources(${target}
             PRIVATE
-                $<TARGET_FILE_DIR:${symbol_provider}>/${symbol_provider}_shared_symbols.txt
+            $<TARGET_FILE_DIR:${symbol_provider}>/${symbol_provider}${CODE_SHARING_INPUT_FILE_SUFFIX}
         )
     endforeach()
 endmacro()