devnexen updated this revision to Diff 134628.
devnexen added a comment.
Herald added a subscriber: srhines.
Enabling one test for FreeBSD
https://reviews.llvm.org/D43378
Files:
lib/Driver/ToolChains/FreeBSD.cpp
lib/Driver/XRayArgs.cpp
test/Driver/XRay/lit.local.cfg
test/Driver/XRay/xray-shared-noxray.cpp
Index: test/Driver/XRay/xray-shared-noxray.cpp
===================================================================
--- test/Driver/XRay/xray-shared-noxray.cpp
+++ test/Driver/XRay/xray-shared-noxray.cpp
@@ -8,7 +8,7 @@
// SHARED-NOT: {{clang_rt\.xray-}}
// STATIC: {{clang_rt\.xray-}}
//
-// REQUIRES: linux, enable_shared
+// REQUIRES: enable_shared
int foo() { return 42; }
#ifdef MAIN
Index: test/Driver/XRay/lit.local.cfg
===================================================================
--- test/Driver/XRay/lit.local.cfg
+++ test/Driver/XRay/lit.local.cfg
@@ -1,23 +1,24 @@
+import platform
target_triple_components = config.target_triple.split('-')
config.available_features.update(target_triple_components)
# Only run the tests in platforms where XRay instrumentation is supported.
supported_targets = [
'x86_64', 'x86_64h', 'arm', 'aarch64', 'arm64', 'powerpc64le', 'mips',
- 'mipsel', 'mips64', 'mips64el'
+ 'mipsel', 'mips64', 'mips64el', 'amd64'
]
# Only on platforms we support.
supported_oses = [
- 'linux'
+ 'Linux', 'FreeBSD'
]
triple_set = set(target_triple_components)
if len(triple_set.intersection(supported_targets)) == 0:
config.unsupported = True
# Do not run for 'android' despite being linux.
-if len(triple_set.intersection(supported_oses)) == 0 or 'android' in
triple_set:
+if platform.system() not in supported_oses or 'android' in triple_set:
config.unsupported = True
if config.enable_shared:
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: test/Driver/XRay/xray-shared-noxray.cpp
===================================================================
--- test/Driver/XRay/xray-shared-noxray.cpp
+++ test/Driver/XRay/xray-shared-noxray.cpp
@@ -8,7 +8,7 @@
// SHARED-NOT: {{clang_rt\.xray-}}
// STATIC: {{clang_rt\.xray-}}
//
-// REQUIRES: linux, enable_shared
+// REQUIRES: enable_shared
int foo() { return 42; }
#ifdef MAIN
Index: test/Driver/XRay/lit.local.cfg
===================================================================
--- test/Driver/XRay/lit.local.cfg
+++ test/Driver/XRay/lit.local.cfg
@@ -1,23 +1,24 @@
+import platform
target_triple_components = config.target_triple.split('-')
config.available_features.update(target_triple_components)
# Only run the tests in platforms where XRay instrumentation is supported.
supported_targets = [
'x86_64', 'x86_64h', 'arm', 'aarch64', 'arm64', 'powerpc64le', 'mips',
- 'mipsel', 'mips64', 'mips64el'
+ 'mipsel', 'mips64', 'mips64el', 'amd64'
]
# Only on platforms we support.
supported_oses = [
- 'linux'
+ 'Linux', 'FreeBSD'
]
triple_set = set(target_triple_components)
if len(triple_set.intersection(supported_targets)) == 0:
config.unsupported = True
# Do not run for 'android' despite being linux.
-if len(triple_set.intersection(supported_oses)) == 0 or 'android' in triple_set:
+if platform.system() not in supported_oses or 'android' in triple_set:
config.unsupported = True
if config.enable_shared:
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
