From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Bertalan Date: Thu, 14 Apr 2022 10:12:54 +0200 Subject: [PATCH] [Driver] Default to -ftls-model=initial-exec on SerenityOS This is a hack to make Clang use the initial-exec TLS model instead of the default local-exec when building code for Serenity. This patch should be removed when we implement proper TLS support. --- clang/lib/Driver/ToolChains/Clang.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index 77554aa2c..84eebee36 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -6100,7 +6100,13 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, Args.AddLastArg(CmdArgs, options::OPT_fvisibility_inlines_hidden_static_local_var, options::OPT_fno_visibility_inlines_hidden_static_local_var); Args.AddLastArg(CmdArgs, options::OPT_fvisibility_global_new_delete_hidden); - Args.AddLastArg(CmdArgs, options::OPT_ftlsmodel_EQ); + if (Triple.isOSSerenity()) { + StringRef tls_model = + Args.getLastArgValue(options::OPT_ftlsmodel_EQ, "initial-exec"); + CmdArgs.push_back(Args.MakeArgString("-ftls-model=" + tls_model)); + } else { + Args.AddLastArg(CmdArgs, options::OPT_ftlsmodel_EQ); + } if (Args.hasFlag(options::OPT_fnew_infallible, options::OPT_fno_new_infallible, false))