diff options
| author | Brad Smith <brad@comstyle.com> | 2017-07-17 00:49:31 +0000 |
|---|---|---|
| committer | Brad Smith <brad@comstyle.com> | 2017-07-17 00:49:31 +0000 |
| commit | 733fe193d301d78e2ce2279d042ee2859c8a3f74 (patch) | |
| tree | fd55ad822c1738ee4f135f63c502a3d45e858d7c | |
| parent | a210f1d7bfd8594c69d061396a4c3f1fc6edca2a (diff) | |
| download | bcm5719-llvm-733fe193d301d78e2ce2279d042ee2859c8a3f74.tar.gz bcm5719-llvm-733fe193d301d78e2ce2279d042ee2859c8a3f74.zip | |
Enable TLS support on OpenBSD, but default to the emulatated TLS model.
llvm-svn: 308155
| -rw-r--r-- | clang/lib/Basic/Targets.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Driver/ToolChains/Clang.cpp | 7 | ||||
| -rw-r--r-- | clang/test/Driver/emulated-tls.cpp | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp index 24d285c25a5..cac80b64b4f 100644 --- a/clang/lib/Basic/Targets.cpp +++ b/clang/lib/Basic/Targets.cpp @@ -571,8 +571,6 @@ protected: public: OpenBSDTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts) : OSTargetInfo<Target>(Triple, Opts) { - this->TLSSupported = false; - switch (Triple.getArch()) { case llvm::Triple::x86: case llvm::Triple::x86_64: diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index d0f90d0d83c..b82cc2d4fa5 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -3201,9 +3201,10 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, Args.AddLastArg(CmdArgs, options::OPT_femit_all_decls); Args.AddLastArg(CmdArgs, options::OPT_fheinous_gnu_extensions); 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() || Triple.isWindowsCygwinEnvironment(); + // Emulated TLS is enabled by default on Android and OpenBSD, and can be enabled + // manually with -femulated-tls. + bool EmulatedTLSDefault = Triple.isAndroid() || Triple.isOSOpenBSD() || + Triple.isWindowsCygwinEnvironment(); if (Args.hasFlag(options::OPT_femulated_tls, options::OPT_fno_emulated_tls, EmulatedTLSDefault)) CmdArgs.push_back("-femulated-tls"); diff --git a/clang/test/Driver/emulated-tls.cpp b/clang/test/Driver/emulated-tls.cpp index a18c2e220bf..38edc98ac88 100644 --- a/clang/test/Driver/emulated-tls.cpp +++ b/clang/test/Driver/emulated-tls.cpp @@ -1,5 +1,7 @@ -// Cygwin uses emutls. Clang should pass -femulated-tls to cc1 and cc1 should pass EmulatedTLS to LLVM CodeGen. +// Cygwin and OpenBSD use 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 +// RUN: %clang -### -std=c++11 -target i686-pc-openbsd %s 2>&1 | FileCheck %s // CHECK: "-cc1" {{.*}}"-femulated-tls" |
