From 98fff4499296e82744b9c9fcd44ef1e8297fe232 Mon Sep 17 00:00:00 2001 From: Stephen Crane Date: Thu, 3 Oct 2024 17:49:01 -0700 Subject: [PATCH] Fix propagation of partition-alloc link options The partition-alloc module exported public linker options, but this was not propagated through the padded version of the library. This change propagates PUBLIC LINK_OPTIONS from partition-alloc to its consumers. --- cmake/ia2.cmake | 1 + tests/CMakeLists.txt | 2 +- tests/lit.cfg.py | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/ia2.cmake b/cmake/ia2.cmake index 0cc5404ab..2c843496c 100644 --- a/cmake/ia2.cmake +++ b/cmake/ia2.cmake @@ -119,6 +119,7 @@ function(pad_tls_library INPUT OUTPUT) LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/unpadded" OUTPUT_NAME "${OUTPUT}" ) + target_link_options(${OUTPUT} INTERFACE $) endfunction() # Create a fake target that builds the given sources diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 22a52fd02..69667c2cd 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -68,7 +68,7 @@ if (NOT LIBIA2_AARCH64) add_subdirectory(two_keys_minimal) add_subdirectory(two_shared_ranges) # TODO(#413): Fix these tests - # add_subdirectory(heap_two_keys) + add_subdirectory(heap_two_keys) # add_subdirectory(three_keys_minimal) # strange bug with indirect calls diff --git a/tests/lit.cfg.py b/tests/lit.cfg.py index 6ce04be15..e0db9b906 100644 --- a/tests/lit.cfg.py +++ b/tests/lit.cfg.py @@ -22,8 +22,7 @@ config.excludes = [entry.name for entry in os.scandir(os.path.dirname(os.path.abspath(__file__))) if entry.name not in [ 'global_fn_ptr', 'header_includes', -# TODO(#413) -# 'heap_two_keys', + 'heap_two_keys', 'macro_attr', 'minimal', 'mmap_loop',