Xray, OpenBSD support

[devnexen]

Summary

Enabling Xray in OpenBSD

[dberris]

LGTM -- at some point, it would be good to refactor all these flag settings to a single place. Maybe file a bug so that we can track that issue on XRay? If you can't do it now, I'd be happy to do it later on.

[devnexen]

In D45126#1055266, @dberris wrote:

LGTM -- at some point, it would be good to refactor all these flag settings to a single place. Maybe file a bug so that we can track that issue on XRay? If you can't do it now, I'd be happy to do it later on.

I do not have access to the bug tracker (yet) you can if you wish (I guess it s adding it in the "Common" driver ?

[dberris]

In D45126#1055451, @devnexen wrote:

In D45126#1055266, @dberris wrote:

LGTM -- at some point, it would be good to refactor all these flag settings to a single place. Maybe file a bug so that we can track that issue on XRay? If you can't do it now, I'd be happy to do it later on.

I do not have access to the bug tracker (yet) you can if you wish (I guess it s adding it in the "Common" driver ?

Fixed: http://llvm.org/PR36985

[dberris]

lib/Driver/XRayArgs.cpp

53

I just noticed this, you probably want to format this part with clang-format (or just move the T of the second line one space, to align with the T on the previous line.

[devnexen]

Fixed: http://llvm.org/PR36985

Nice ! The NetBSD version will benefit it as well (not sure it s really done in the frontend side).

[dberris]

LGTM -- I'll defer to @brad on confirming and landing.

[devnexen]

Just realised he s not active since February, hopes it will make it somehow :-)

[dberris]

Do you need to have someone land this for you, or can you land it yourself? If @brad isn't able to get to it anytime soon, then I'm happy for this to land either way.

[devnexen]

Yes I can t land anything myself :-) thanks !

lib/Driver/ToolChains/OpenBSD.cpp

 #include "llvm/Option/ArgList.h"
 
 using namespace clang::driver;
 using namespace clang::driver::tools;
 using namespace clang::driver::toolchains;
 using namespace clang;
 using namespace llvm::opt;
 
+static bool addXRayRuntime(const ToolChain &TC, const ArgList &Args,
+                           ArgStringList &CmdArgs) {
+  if (Args.hasArg(options::OPT_shared))
+    return false;
+
+  if (Args.hasFlag(options::OPT_fxray_instrument,
+                   options::OPT_fnoxray_instrument, false)) {
+    CmdArgs.push_back("-whole-archive");
+    CmdArgs.push_back(TC.getCompilerRTArgString(Args, "xray", false));
+    CmdArgs.push_back("-no-whole-archive");
+    return true;
+  }
+
+  return false;
+}
+
+static void linkXRayRuntimeDeps(const ToolChain &TC, const ArgList &Args,
+                                ArgStringList &CmdArgs) {
+  CmdArgs.push_back("--no-as-needed");
+  CmdArgs.push_back("-lm");
+  CmdArgs.push_back("-lpthread");
+}
+
 void openbsd::Assembler::ConstructJob(Compilation &C, const JobAction &JA,
                                       const InputInfo &Output,
                                       const InputInfoList &Inputs,
                                       const ArgList &Args,
                                       const char *LinkingOutput) const {
   claimNoWarnArgs(Args);
   ArgStringList CmdArgs;
 
CmdArgs.push_back(
       Args.MakeArgString("-L/usr/lib/gcc-lib/" + Triple + "/4.2.1"));
   CmdArgs.push_back(Args.MakeArgString("-L/usr/lib"));
 
   Args.AddAllArgs(CmdArgs, {options::OPT_L, options::OPT_T_Group,
                             options::OPT_e, options::OPT_s, options::OPT_t,
                             options::OPT_Z_Flag, options::OPT_r});
 
   bool NeedsSanitizerDeps = addSanitizerRuntimes(ToolChain, Args, CmdArgs);
+  bool NeedsXRayDeps = addXRayRuntime(ToolChain, Args, CmdArgs);
   AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs, JA);
 
   if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
     if (D.CCCIsCXX()) {
       if (getToolChain().ShouldLinkCXXStdlib(Args))
         getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs);
       if (Args.hasArg(options::OPT_pg))
         CmdArgs.push_back("-lm_p");
       else
         CmdArgs.push_back("-lm");
     }
     if (NeedsSanitizerDeps) {
       CmdArgs.push_back(ToolChain.getCompilerRTArgString(Args, "builtins", false));
       linkSanitizerRuntimeDeps(ToolChain, CmdArgs);
     }
+    if (NeedsXRayDeps) {
+      CmdArgs.push_back(ToolChain.getCompilerRTArgString(Args, "builtins", false));
+      linkXRayRuntimeDeps(ToolChain, Args, CmdArgs);
+    }
     // FIXME: For some reason GCC passes -lgcc before adding
     // the default system libraries. Just mimic this for now.
     CmdArgs.push_back("-lgcc");
 
     if (Args.hasArg(options::OPT_pthread)) {
       if (!Args.hasArg(options::OPT_shared) && Args.hasArg(options::OPT_pg))
         CmdArgs.push_back("-lpthread_p");
       else

lib/Driver/XRayArgs.cpp

if (Triple.getOS() == llvm::Triple::Linux) {
       case llvm::Triple::mipsel:
       case llvm::Triple::mips64:
       case llvm::Triple::mips64el:
         break;
       default:
         D.Diag(diag::err_drv_clang_unsupported)
             << (std::string(XRayInstrumentOption) + " on " + Triple.str());
       }
-    } else if (Triple.getOS() == llvm::Triple::FreeBSD) {
+    } else if (Triple.getOS() == llvm::Triple::FreeBSD ||
+               Triple.getOS() == llvm::Triple::OpenBSD) {
         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-supported target OS");
     }