From 4834722c293cfc3bd7c2715025576a1748feb9c9 Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Sat, 16 Jan 2016 03:44:52 +0000 Subject: [PATCH] [Cygwin] Use -femulated-tls by default since r257718 introduced the new pass. FIXME: Add more targets to use emutls into clang/test/Driver/emulated-tls.cpp. FIXME: Add cygwin tests into llvm/test/CodeGen/X86. Working in progress. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@257984 91177308-0d34-0410-b5e6-96231b3b80d8 --- docs/ReleaseNotes.rst | 2 ++ lib/Driver/Tools.cpp | 2 +- test/Driver/emulated-tls.cpp | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 test/Driver/emulated-tls.cpp diff --git a/docs/ReleaseNotes.rst b/docs/ReleaseNotes.rst index 5a25e0b063..ea3dcf2835 100644 --- a/docs/ReleaseNotes.rst +++ b/docs/ReleaseNotes.rst @@ -74,6 +74,8 @@ Windows Support Clang's support for building native Windows programs ... +TLS is enabled for Cygwin defaults to -femulated-tls. + C Language Changes in Clang --------------------------- diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 90c25726df..080fef8d9e 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -4597,7 +4597,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, Args.AddLastArg(CmdArgs, options::OPT_fno_operator_names); // Emulated TLS is enabled by default on Android, and can be enabled manually // with -femulated-tls. - bool EmulatedTLSDefault = Triple.isAndroid(); + bool EmulatedTLSDefault = Triple.isAndroid() || Triple.isWindowsCygwinEnvironment(); if (Args.hasFlag(options::OPT_femulated_tls, options::OPT_fno_emulated_tls, EmulatedTLSDefault)) CmdArgs.push_back("-femulated-tls"); diff --git a/test/Driver/emulated-tls.cpp b/test/Driver/emulated-tls.cpp new file mode 100644 index 0000000000..a18c2e220b --- /dev/null +++ b/test/Driver/emulated-tls.cpp @@ -0,0 +1,5 @@ +// Cygwin uses emutls. Clang should pass -femulated-tls to cc1 and cc1 should pass EmulatedTLS to LLVM CodeGen. +// FIXME: Add more targets here to use emutls. +// RUN: %clang -### -std=c++11 -target i686-pc-cygwin %s 2>&1 | FileCheck %s + +// CHECK: "-cc1" {{.*}}"-femulated-tls" -- 2.40.0