r317877 - Revert "[XRay][darwin] Initial XRay in Darwin Support"
Dean Michael Berris via cfe-commits
cfe-commits at lists.llvm.org
Thu Nov 9 23:00:55 PST 2017
Author: dberris
Date: Thu Nov 9 23:00:55 2017
New Revision: 317877
URL: http://llvm.org/viewvc/llvm-project?rev=317877&view=rev
Log:
Revert "[XRay][darwin] Initial XRay in Darwin Support"
This reverts r317875.
Modified:
cfe/trunk/include/clang/Driver/XRayArgs.h
cfe/trunk/lib/Driver/ToolChains/Darwin.cpp
cfe/trunk/lib/Driver/XRayArgs.cpp
Modified: cfe/trunk/include/clang/Driver/XRayArgs.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/XRayArgs.h?rev=317877&r1=317876&r2=317877&view=diff
==============================================================================
--- cfe/trunk/include/clang/Driver/XRayArgs.h (original)
+++ cfe/trunk/include/clang/Driver/XRayArgs.h Thu Nov 9 23:00:55 2017
@@ -30,7 +30,6 @@ public:
XRayArgs(const ToolChain &TC, const llvm::opt::ArgList &Args);
void addArgs(const ToolChain &TC, const llvm::opt::ArgList &Args,
llvm::opt::ArgStringList &CmdArgs, types::ID InputType) const;
- bool needsXRayRt() const { return XRayInstrument; }
};
} // namespace driver
Modified: cfe/trunk/lib/Driver/ToolChains/Darwin.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Darwin.cpp?rev=317877&r1=317876&r2=317877&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains/Darwin.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains/Darwin.cpp Thu Nov 9 23:00:55 2017
@@ -18,7 +18,6 @@
#include "clang/Driver/DriverDiagnostic.h"
#include "clang/Driver/Options.h"
#include "clang/Driver/SanitizerArgs.h"
-#include "clang/Driver/XRayArgs.h"
#include "llvm/ADT/StringSwitch.h"
#include "llvm/Option/ArgList.h"
#include "llvm/Support/Path.h"
@@ -1099,11 +1098,6 @@ void DarwinClang::AddLinkRuntimeLibArgs(
if (Sanitize.needsEsanRt())
AddLinkSanitizerLibArgs(Args, CmdArgs, "esan");
- const XRayArgs& XRay = getXRayArgs();
- if (XRay.needsXRayRt() && isTargetMacOS()) {
- AddLinkRuntimeLib(Args, CmdArgs, "libclang_rt.xray_osx.a", RLO_AlwaysLink);
- }
-
// Otherwise link libSystem, then the dynamic runtime library, and finally any
// target specific static runtime library.
CmdArgs.push_back("-lSystem");
Modified: cfe/trunk/lib/Driver/XRayArgs.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/XRayArgs.cpp?rev=317877&r1=317876&r2=317877&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/XRayArgs.cpp (original)
+++ cfe/trunk/lib/Driver/XRayArgs.cpp Thu Nov 9 23:00:55 2017
@@ -51,15 +51,6 @@ XRayArgs::XRayArgs(const ToolChain &TC,
D.Diag(diag::err_drv_clang_unsupported)
<< (std::string(XRayInstrumentOption) + " on " + Triple.str());
}
- else if (Triple.getOS() == llvm::Triple::Darwin)
- // Experimental support for macos.
- switch (Triple.getArch()) {
- case llvm::Triple::x86_64:
- break;
- default:
- 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");
More information about the cfe-commits
mailing list