maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "[XRay][Driver] Do not link in XRay runtime in shared libs" 

Reverts r314177.

llvm-svn: 314178
This commit is contained in:
Dean Michael Berris 2017-09-26 00:41:08 +00:00
parent b013dc4b05
commit 54f6893279
2 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/lib/Driver/ToolChains/Gnu.cpp
View File

@ -206,10 +206,6 @@ void tools::gcc::Linker::RenderExtraToolArgs(const JobAction &JA,
static bool addXRayRuntime(const ToolChain &TC, const ArgList &Args,
ArgStringList &CmdArgs) {
// Do not add the XRay runtime to shared libraries.
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");
@ -217,7 +213,6 @@ static bool addXRayRuntime(const ToolChain &TC, const ArgList &Args,
CmdArgs.push_back("-no-whole-archive");
return true;
}
return false;
}

14
clang/test/Driver/XRay/xray-shared-noxray.cpp
View File

@ -1,14 +0,0 @@
// RUN: %clangxx -shared -fPIC -o /dev/null -v -fxray-instrument %s 2>&1 | \
// RUN: FileCheck %s --check-prefix=SHARED
// RUN: %clangxx -static -o /dev/null -v -fxray-instrument %s 2>&1 -DMAIN | \
// RUN: FileCheck %s --check-prefix=STATIC
// RUN: %clangxx -static -fPIE -o /dev/null -v -fxray-instrument %s 2>&1 \
// RUN: -DMAIN | FileCheck %s --check-prefix=STATIC
//
// SHARED-NOT: {{clang_rt\.xray-}}
// STATIC: {{clang_rt\.xray-}}
int foo() { return 42; }
#ifdef MAIN
int main() { return foo(); }
#endif