diff options
author | Kamil Rytarowski <n54@gmx.com> | 2018-02-22 06:31:40 +0000 |
---|---|---|
committer | Kamil Rytarowski <n54@gmx.com> | 2018-02-22 06:31:40 +0000 |
commit | 3e4e74cbe5cb0a15dcb018b556caa1a344a3f4ea (patch) | |
tree | 78dbb14b97d70a25b8a8252bf9f82b0b909e1c61 /clang/lib/Driver | |
parent | 80843a0acc781190632bfdd99bd2283977103ae8 (diff) | |
download | bcm5719-llvm-3e4e74cbe5cb0a15dcb018b556caa1a344a3f4ea.tar.gz bcm5719-llvm-3e4e74cbe5cb0a15dcb018b556caa1a344a3f4ea.zip |
FreeBSD driver / Xray flags moving pthread to compile flags.
Summary:
- Using -lpthread instead, with -pthread the linkage does not work.
-Warning about the -fxray-instrument usage outside of the working cases.
Patch by: David CARLIER
Reviewers: krytarowski, vitalybuka, dberris, emaste
Reviewed By: krytarowski, emaste
Subscribers: srhines, emaste, cfe-commits
Differential Revision: https://reviews.llvm.org/D43378
llvm-svn: 325746
Diffstat (limited to 'clang/lib/Driver')
-rw-r--r-- | clang/lib/Driver/ToolChains/FreeBSD.cpp | 2 | ||||
-rw-r--r-- | clang/lib/Driver/XRayArgs.cpp | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/clang/lib/Driver/ToolChains/FreeBSD.cpp b/clang/lib/Driver/ToolChains/FreeBSD.cpp index 5c705ac95cf..da2b661dda5 100644 --- a/clang/lib/Driver/ToolChains/FreeBSD.cpp +++ b/clang/lib/Driver/ToolChains/FreeBSD.cpp @@ -136,9 +136,9 @@ static bool addXRayRuntime(const ToolChain &TC, const ArgList &Args, static void linkXRayRuntimeDeps(const ToolChain &TC, const ArgList &Args, ArgStringList &CmdArgs) { CmdArgs.push_back("--no-as-needed"); - CmdArgs.push_back("-pthread"); CmdArgs.push_back("-lrt"); CmdArgs.push_back("-lm"); + CmdArgs.push_back("-lpthread"); } void freebsd::Linker::ConstructJob(Compilation &C, const JobAction &JA, diff --git a/clang/lib/Driver/XRayArgs.cpp b/clang/lib/Driver/XRayArgs.cpp index 232bacd5f09..c85d89cfd96 100644 --- a/clang/lib/Driver/XRayArgs.cpp +++ b/clang/lib/Driver/XRayArgs.cpp @@ -34,7 +34,7 @@ XRayArgs::XRayArgs(const ToolChain &TC, const ArgList &Args) { const llvm::Triple &Triple = TC.getTriple(); if (Args.hasFlag(options::OPT_fxray_instrument, options::OPT_fnoxray_instrument, false)) { - if (Triple.getOS() == llvm::Triple::Linux) + if (Triple.getOS() == llvm::Triple::Linux) { switch (Triple.getArch()) { case llvm::Triple::x86_64: case llvm::Triple::arm: @@ -49,9 +49,15 @@ XRayArgs::XRayArgs(const ToolChain &TC, const ArgList &Args) { D.Diag(diag::err_drv_clang_unsupported) << (std::string(XRayInstrumentOption) + " on " + Triple.str()); } - else + } else if (Triple.getOS() == llvm::Triple::FreeBSD) { + if (Triple.getArch() != llvm::Triple::x86_64) { + D.Diag(diag::err_drv_clang_unsupported) + << (std::string(XRayInstrumentOption) + " on " + Triple.str()); + } + } else { D.Diag(diag::err_drv_clang_unsupported) - << (std::string(XRayInstrumentOption) + " on non-Linux target OS"); + << (std::string(XRayInstrumentOption) + " on non-supported target OS"); + } XRayInstrument = true; if (const Arg *A = Args.getLastArg(options::OPT_fxray_instruction_threshold_, |