[PATCH] D43378: FreeBSD driver / Xray flags moving pthread to compile flags.

[David CARLIER via Phabricator via cfe-commits]

devnexen updated this revision to Diff 134622.
devnexen added a comment.

Reusing generic message/reformating.


https://reviews.llvm.org/D43378

Files:
  lib/Driver/ToolChains/FreeBSD.cpp
  lib/Driver/XRayArgs.cpp


Index: lib/Driver/XRayArgs.cpp
===================================================================
--- lib/Driver/XRayArgs.cpp
+++ lib/Driver/XRayArgs.cpp
@@ -34,7 +34,7 @@
   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 @@
         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_,
Index: lib/Driver/ToolChains/FreeBSD.cpp
===================================================================
--- lib/Driver/ToolChains/FreeBSD.cpp
+++ lib/Driver/ToolChains/FreeBSD.cpp
@@ -136,9 +136,9 @@
 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,



Index: lib/Driver/XRayArgs.cpp
===================================================================
--- lib/Driver/XRayArgs.cpp
+++ lib/Driver/XRayArgs.cpp
@@ -34,7 +34,7 @@
   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 @@
         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_,
Index: lib/Driver/ToolChains/FreeBSD.cpp
===================================================================
--- lib/Driver/ToolChains/FreeBSD.cpp
+++ lib/Driver/ToolChains/FreeBSD.cpp
@@ -136,9 +136,9 @@
 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,

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits