Skip to content

Update some aarch64 baremetal variants to use initial-exec TLS model #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jonathon Penix (jonathonpenix) merged 1 commit into from
Mar 6, 2026
Merged

Update some aarch64 baremetal variants to use initial-exec TLS model #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions qualcomm-software/embedded-multilib/json/multilib.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"libs": [
{
"variant": "aarch64a",
"json": "aarch64a.json",
"variant": "aarch64a_tlsie",
"json": "aarch64a_tlsie.json",
"flags": "--target=aarch64-unknown-none-elf"
},
{
Expand All @@ -16,13 +16,13 @@
"flags": "--target=aarch64-unknown-none-elf -march=armv8.5-a -mbranch-protection=pac-ret+leaf+bti"
},
{
"variant": "aarch64a_pacret_bkey_bti",
"json": "aarch64a_pacret_bkey_bti.json",
"variant": "aarch64a_pacret_bkey_bti_tlsie",
"json": "aarch64a_pacret_bkey_bti_tlsie.json",
"flags": "--target=aarch64-unknown-none-elf -march=armv8.5-a -mbranch-protection=pac-ret+leaf+b-key+bti"
},
{
"variant": "aarch64a_soft_nofp",
"json": "aarch64a_soft_nofp.json",
"variant": "aarch64a_soft_nofp_tlsie",
"json": "aarch64a_soft_nofp_tlsie.json",
"flags": "--target=aarch64-unknown-none-elf -march=armvX+nofp -march=armvX+nosimd -mabi=aapcs-soft"
},
{
Expand Down
5 changes: 3 additions & 2 deletions ...on/variants/aarch64a_pacret_bkey_bti.json → ...iants/aarch64a_pacret_bkey_bti_tlsie.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"args": {
"common": {
"TARGET_ARCH": "aarch64a",
"VARIANT": "aarch64a_pacret_bkey_bti",
"VARIANT": "aarch64a_pacret_bkey_bti_tlsie",
"COMPILE_FLAGS": "-march=armv8.5a -mbranch-protection=pac-ret+leaf+b-key+bti -fPIC",
"ENABLE_EXCEPTIONS": "OFF",
"ENABLE_RTTI": "OFF",
Expand All @@ -19,7 +19,8 @@
"ENABLE_CXX_LIBS": "ON",
"ENABLE_LIBC_TESTS": "OFF",
"ENABLE_COMPILER_RT_TESTS": "OFF",
"ENABLE_LIBCXX_TESTS": "OFF"
"ENABLE_LIBCXX_TESTS": "OFF",
"TLS_MODEL": "initial-exec"
},
"musl-embedded": {
"ENABLE_CXX_LIBS": "ON",
Expand Down
5 changes: 3 additions & 2 deletions ...lib/json/variants/aarch64a_soft_nofp.json → ...on/variants/aarch64a_soft_nofp_tlsie.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"args": {
"common": {
"TARGET_ARCH": "aarch64a",
"VARIANT": "aarch64a_soft_nofp",
"VARIANT": "aarch64a_soft_nofp_tlsie",
"COMPILE_FLAGS": "-march=armv8-a+nofp+nosimd -mabi=aapcs-soft -fPIC",
"ENABLE_EXCEPTIONS": "OFF",
"ENABLE_RTTI": "OFF",
Expand All @@ -19,7 +19,8 @@
"ENABLE_CXX_LIBS": "OFF",
"ENABLE_LIBC_TESTS": "ON",
"ENABLE_COMPILER_RT_TESTS": "OFF",
"ENABLE_LIBCXX_TESTS": "OFF"
"ENABLE_LIBCXX_TESTS": "OFF",
"TLS_MODEL": "initial-exec"
},
"musl-embedded": {
"ENABLE_CXX_LIBS": "OFF",
Expand Down
5 changes: 3 additions & 2 deletions ...dded-multilib/json/variants/aarch64a.json → ...ultilib/json/variants/aarch64a_tlsie.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"args": {
"common": {
"TARGET_ARCH": "aarch64a",
"VARIANT": "aarch64a",
"VARIANT": "aarch64a_tlsie",
"COMPILE_FLAGS": "-march=armv8-a -fPIC",
"ENABLE_EXCEPTIONS": "OFF",
"ENABLE_RTTI": "OFF",
Expand All @@ -19,7 +19,8 @@
"ENABLE_CXX_LIBS": "ON",
"ENABLE_LIBC_TESTS": "ON",
"ENABLE_COMPILER_RT_TESTS": "OFF",
"ENABLE_LIBCXX_TESTS": "OFF"
"ENABLE_LIBCXX_TESTS": "OFF",
"TLS_MODEL": "initial-exec"
},
"musl-embedded": {
"ENABLE_CXX_LIBS": "ON",
Expand Down
10 changes: 10 additions & 0 deletions qualcomm-software/embedded-runtimes/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,15 @@ set(ENABLE_LIBC_TESTS ${ENABLE_LIBC_TESTS_def} CACHE BOOL "Enable libc tests (pi
set(ENABLE_COMPILER_RT_TESTS ${ENABLE_COMPILER_RT_TESTS_def} CACHE BOOL "Enable compiler-rt tests.")
set(ENABLE_LIBCXX_TESTS ${ENABLE_LIBCXX_TESTS_def} CACHE BOOL "Enable libcxx tests.")
set(DISABLE_THREADS ${DISABLE_THREADS_def} CACHE BOOL "Disable threads/atomic/TLS (picolibc only).")
set(SUPPORTED_TLS_MODELS local-exec initial-exec local-dynamic global-dynamic)
if(NOT DEFINED TLS_MODEL_def)
set(TLS_MODEL_def local-exec)
elseif(NOT TLS_MODEL_def IN_LIST SUPPORTED_TLS_MODELS)
string(REPLACE ";" ", " SUPPORTED_TLS_MODELS_STR "${SUPPORTED_TLS_MODELS}")
message(FATAL_ERROR "Unsupported TLS_MODEL value. Supported values are ${SUPPORTED_TLS_MODELS_STR}")
endif()
set(TLS_MODEL ${TLS_MODEL_def} CACHE STRING "TLS model to use. Currently only used by picolibc, other projects use the project/toolchain defaults.")
set_property(CACHE TLS_MODEL PROPERTY STRINGS ${SUPPORTED_TLS_MODELS})
set(LLVM_BINARY_DIR "" CACHE PATH "Path to LLVM toolchain root to build libraries with")

# Set up a few arbitrary pass-through flags for musl-embedded. This probably
Expand Down Expand Up @@ -494,6 +503,7 @@ if(C_LIBRARY STREQUAL picolibc)
--buildtype=${LIBRARY_MESON_BUILD_TYPE}
-Dsingle-thread=${single_thread}
-Dthread-local-storage=${thread_local_storage}
-Dtls-model=${TLS_MODEL}
-Datomic-ungetc=${atomic_ungetc}
<SOURCE_DIR>
BUILD_COMMAND ${MESON_EXECUTABLE} compile
Expand Down
6 changes: 3 additions & 3 deletions qualcomm-software/test/multilib/aarch64.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# RUN: %clang -print-multi-directory --target=aarch64-none-elf | FileCheck %s --check-prefix=CHECK-AARCH64
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -mcpu=cortex-a53 | FileCheck %s --check-prefix=CHECK-AARCH64
# CHECK-AARCH64: aarch64-none-elf/aarch64a{{$}}
# CHECK-AARCH64: aarch64-none-elf/aarch64a_tlsie{{$}}
# CHECK-AARCH64-EMPTY:

# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv8.3a -mbranch-protection=pac-ret+leaf | FileCheck %s --check-prefix=CHECK-PACRET
Expand All @@ -20,13 +20,13 @@

# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv8.5a -mbranch-protection=pac-ret+leaf+b-key+bti | FileCheck %s --check-prefix=CHECK-PACRET-BKEY-BTI
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -mcpu=cortex-a53 -march=armv8.5a -mbranch-protection=pac-ret+leaf+b-key+bti | FileCheck %s --check-prefix=CHECK-PACRET-BKEY-BTI
# CHECK-PACRET-BKEY-BTI: aarch64-none-elf/aarch64a_pacret_bkey_bti{{$}}
# CHECK-PACRET-BKEY-BTI: aarch64-none-elf/aarch64a_pacret_bkey_bti_tlsie{{$}}
# CHECK-PACRET-BKEY-BTI-EMPTY:

# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv8+nofp+nosimd -mabi=aapcs-soft | FileCheck %s --check-prefix=CHECK-NOFP
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -mcpu=cortex-a53+nofp+nosimd -mabi=aapcs-soft | FileCheck %s --check-prefix=CHECK-NOFP
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -mgeneral-regs-only -mllvm -aarch64-enable-simd-scalar=false -mabi=aapcs-soft | FileCheck %s --check-prefix=CHECK-NOFP
# CHECK-NOFP: aarch64-none-elf/aarch64a_soft_nofp{{$}}
# CHECK-NOFP: aarch64-none-elf/aarch64a_soft_nofp_tlsie{{$}}
# CHECK-NOFP-EMPTY:

# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv8.5a+nofp+nosimd -mbranch-protection=pac-ret+leaf+bti -mabi=aapcs-soft | FileCheck %s --check-prefix=CHECK-NOFP-PACRET-BTI
Expand Down
Loading