Skip to content

build(native): compile x86_64 Linux lib with -mtls-dialect=gnu2 #596

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

Draft
nsavoire wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

build(native): compile x86_64 Linux lib with -mtls-dialect=gnu2 #596

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
27 changes: 20 additions & 7 deletions build-logic/conventions/src/main/kotlin/com/datadoghq/native/config/ConfigurationPresets.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ object ConfigurationPresets {
project.logger.lifecycle("Active configurations: ${activeConfigs.map { it.name }.joinToString(", ")}")
}

private fun commonLinuxCompilerArgs(version: String): List<String> {
private fun commonCompilerArgs(version: String): List<String> {
val args = mutableListOf(
"-fPIC",
"-fno-omit-frame-pointer",
Expand All @@ -78,6 +78,19 @@ object ConfigurationPresets {
return args
}

private fun commonLinuxCompilerArgs(
version: String,
architecture: Architecture = Architecture.X64
): List<String> {
val args = commonCompilerArgs(version).toMutableList()
// Use TLS descriptors (GNU2 dialect) for thread-local storage on x86_64.
// This is required by thread context (https://github.com/open-telemetry/opentelemetry-specification/pull/4947)
if (architecture == Architecture.X64) {
args.add("-mtls-dialect=gnu2")
}
return args
}

private fun commonLinuxLinkerArgs(): List<String> = listOf(
"-ldl",
"-Wl,-z,defs",
Expand All @@ -89,7 +102,7 @@ object ConfigurationPresets {
)

private fun commonMacosCompilerArgs(version: String): List<String> =
commonLinuxCompilerArgs(version) + listOf("-D_XOPEN_SOURCE", "-D_DARWIN_C_SOURCE")
commonCompilerArgs(version) + listOf("-D_XOPEN_SOURCE", "-D_DARWIN_C_SOURCE")

fun configureRelease(
config: BuildConfiguration,
Expand All @@ -104,7 +117,7 @@ object ConfigurationPresets {
when (platform) {
Platform.LINUX -> {
config.compilerArgs.set(
listOf("-O3", "-DNDEBUG", "-g") + commonLinuxCompilerArgs(version)
listOf("-O3", "-DNDEBUG", "-g") + commonLinuxCompilerArgs(version, architecture)
)
config.linkerArgs.set(
commonLinuxLinkerArgs() + listOf(
Expand Down Expand Up @@ -138,7 +151,7 @@ object ConfigurationPresets {
when (platform) {
Platform.LINUX -> {
config.compilerArgs.set(
listOf("-O0", "-g", "-DDEBUG") + commonLinuxCompilerArgs(version)
listOf("-O0", "-g", "-DDEBUG") + commonLinuxCompilerArgs(version, architecture)
)
config.linkerArgs.set(commonLinuxLinkerArgs())
}
Expand Down Expand Up @@ -184,7 +197,7 @@ object ConfigurationPresets {

when (platform) {
Platform.LINUX -> {
config.compilerArgs.set(asanCompilerArgs + commonLinuxCompilerArgs(version))
config.compilerArgs.set(asanCompilerArgs + commonLinuxCompilerArgs(version, architecture))

val libasan = PlatformUtils.locateLibasan(compiler)
// Link against the sanitizer runtime that matches the compiler:
Expand Down Expand Up @@ -247,7 +260,7 @@ object ConfigurationPresets {

when (platform) {
Platform.LINUX -> {
config.compilerArgs.set(tsanCompilerArgs + commonLinuxCompilerArgs(version))
config.compilerArgs.set(tsanCompilerArgs + commonLinuxCompilerArgs(version, architecture))

val libtsan = PlatformUtils.locateLibtsan(compiler)
// Use the library name from the resolved path so that clang's own
Expand Down Expand Up @@ -321,7 +334,7 @@ object ConfigurationPresets {

when (platform) {
Platform.LINUX -> {
config.compilerArgs.set(fuzzerCompilerArgs + commonLinuxCompilerArgs(version))
config.compilerArgs.set(fuzzerCompilerArgs + commonLinuxCompilerArgs(version, architecture))
config.linkerArgs.set(commonLinuxLinkerArgs() + fuzzerLinkerArgs)

config.testEnvironment.apply {
Expand Down
Loading