Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 18 additions & 0 deletions doc/configuration.qbk
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,24 @@ The user can request the version 4 by defining `BOOST_THREAD_VERSION` to 4. In t

[endsect]

[section:arm64x Windows ARM64X images]

An ARM64X image (DLL or EXE linked with `/MACHINE:ARM64X`) contains both native ARM64 code and ARM64EC code,
and can be loaded by both ARM64 and x64 processes. Its TLS callbacks are taken from the native ARM64 objects,
so unless configured as described below, x64 processes that load an ARM64X image linked with the static
Boost.Thread library call the native ARM64 TLS callback of the library, which does not work.

`BOOST_THREAD_ARM64X` is a user-definable macro that is not defined by default. Users who link Boost.Thread
into ARM64X images must define it when compiling both the ARM64 and the ARM64EC variants of the static
library. Boost.Thread then registers its TLS callback so that the linker dispatches to the ARM64EC callback in
x64 processes. As a consequence, the ARM64EC variant references the ARM64 one: it must be linked together with
the ARM64 variant (for example, both variants merged into an ARM64X library with `lib /machine:arm64x`), also
when linking ARM64EC-only images.

The macro has no effect on other targets.

[endsect]

Comment thread
Lastique marked this conversation as resolved.
Resolved
[endsect]

[section:limitations Limitations]
Expand Down
25 changes: 24 additions & 1 deletion src/win32/tss_pe.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,29 @@ extern BOOL (WINAPI * const _pDefaultRawDllMainOrig)(HINSTANCE, DWORD, LPVOID) =
static void NTAPI on_tls_callback(HINSTANCE, DWORD, PVOID);
}

#if defined(BOOST_THREAD_ARM64X) && (defined(_M_ARM64) || defined(_M_ARM64EC))
// An ARM64X image has a single TLS directory, shared by its native ARM64 and its
// ARM64EC code; the linker builds the callback array from the native .CRT$XL*
// entries. A callback registered there must therefore resolve to the native
// function in the native view and to the ARM64EC function in the x64/ARM64EC view,
// otherwise x64 processes loading the image call native ARM64 code. Like the CRT
// does for __dyn_tls_init, /ARM64XSAMEADDRESS makes the linker emit a thunk that
// dispatches to the right function in each view. It needs a function with external
// linkage that is defined by both the ARM64 and the ARM64EC object files, so the
// ARM64EC library must be linked together with the ARM64 one (as an ARM64X library
// containing both, like the MSVC CRT libraries).
extern "C" void NTAPI boost_thread_arm64x_on_tls_callback(HINSTANCE h, DWORD dwReason, PVOID pv)
{
on_tls_callback(h, dwReason, pv);
}
#if defined(_M_ARM64EC)
#pragma comment(linker, "/arm64xsameaddress:boost_thread_arm64x_on_tls_callback")
#endif
#define BOOST_THREAD_DETAIL_TLS_CALLBACK boost_thread_arm64x_on_tls_callback
#else
#define BOOST_THREAD_DETAIL_TLS_CALLBACK on_tls_callback
#endif

namespace boost
{
//The .CRT$Xxx information is taken from Codeguru:
Expand All @@ -167,7 +190,7 @@ extern BOOL (WINAPI * const _pDefaultRawDllMainOrig)(HINSTANCE, DWORD, LPVOID) =
#pragma section(".CRT$XCU",long,read)
#pragma section(".CRT$XTU",long,read)
#pragma section(".CRT$XLC",long,read)
extern const __declspec(allocate(".CRT$XLC")) _TLSCB p_tls_callback = on_tls_callback;
extern const __declspec(allocate(".CRT$XLC")) _TLSCB p_tls_callback = BOOST_THREAD_DETAIL_TLS_CALLBACK;
extern const __declspec(allocate(".CRT$XIU")) _PIFV_ p_tls_prepare = on_tls_prepare;
extern const __declspec(allocate(".CRT$XCU")) _PVFV_ p_process_init = on_process_init;
extern const __declspec(allocate(".CRT$XTU")) _PVFV_ p_process_term = on_process_term;
Expand Down