mirror of
https://github.com/RPCS3/llvm.git
synced 2024-12-05 02:07:16 +00:00
LinkModules is now in the Linker class
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18863 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
1b6b99bffc
commit
e4874029c3
@ -105,7 +105,7 @@ bool BugDriver::addSources(const std::vector<std::string> &Filenames) {
|
|||||||
|
|
||||||
std::cout << "Linking in input file: '" << Filenames[i] << "'\n";
|
std::cout << "Linking in input file: '" << Filenames[i] << "'\n";
|
||||||
std::string ErrorMessage;
|
std::string ErrorMessage;
|
||||||
if (LinkModules(Program, M.get(), &ErrorMessage)) {
|
if (Linker::LinkModules(Program, M.get(), &ErrorMessage)) {
|
||||||
std::cerr << ToolName << ": error linking in '" << Filenames[i] << "': "
|
std::cerr << ToolName << ": error linking in '" << Filenames[i] << "': "
|
||||||
<< ErrorMessage << '\n';
|
<< ErrorMessage << '\n';
|
||||||
return true;
|
return true;
|
||||||
|
@ -175,7 +175,7 @@ static bool TestMergedProgram(BugDriver &BD, Module *M1, Module *M2,
|
|||||||
M1 = CloneModule(M1);
|
M1 = CloneModule(M1);
|
||||||
M2 = CloneModule(M2);
|
M2 = CloneModule(M2);
|
||||||
}
|
}
|
||||||
if (LinkModules(M1, M2, &ErrorMsg)) {
|
if (Linker::LinkModules(M1, M2, &ErrorMsg)) {
|
||||||
std::cerr << BD.getToolName() << ": Error linking modules together:"
|
std::cerr << BD.getToolName() << ": Error linking modules together:"
|
||||||
<< ErrorMsg << '\n';
|
<< ErrorMsg << '\n';
|
||||||
exit(1);
|
exit(1);
|
||||||
@ -304,7 +304,7 @@ static bool ExtractLoops(BugDriver &BD,
|
|||||||
// Replace the current program with the loop extracted version, and try to
|
// Replace the current program with the loop extracted version, and try to
|
||||||
// extract another loop.
|
// extract another loop.
|
||||||
std::string ErrorMsg;
|
std::string ErrorMsg;
|
||||||
if (LinkModules(ToNotOptimize, ToOptimizeLoopExtracted, &ErrorMsg)) {
|
if (Linker::LinkModules(ToNotOptimize, ToOptimizeLoopExtracted, &ErrorMsg)){
|
||||||
std::cerr << BD.getToolName() << ": Error linking modules together:"
|
std::cerr << BD.getToolName() << ": Error linking modules together:"
|
||||||
<< ErrorMsg << '\n';
|
<< ErrorMsg << '\n';
|
||||||
exit(1);
|
exit(1);
|
||||||
@ -438,7 +438,7 @@ static bool ExtractBlocks(BugDriver &BD,
|
|||||||
I->getFunctionType()));
|
I->getFunctionType()));
|
||||||
|
|
||||||
std::string ErrorMsg;
|
std::string ErrorMsg;
|
||||||
if (LinkModules(ProgClone, Extracted, &ErrorMsg)) {
|
if (Linker::LinkModules(ProgClone, Extracted, &ErrorMsg)) {
|
||||||
std::cerr << BD.getToolName() << ": Error linking modules together:"
|
std::cerr << BD.getToolName() << ": Error linking modules together:"
|
||||||
<< ErrorMsg << '\n';
|
<< ErrorMsg << '\n';
|
||||||
exit(1);
|
exit(1);
|
||||||
|
@ -99,7 +99,7 @@ int main(int argc, char **argv) {
|
|||||||
|
|
||||||
if (Verbose) std::cerr << "Linking in '" << InputFilenames[i] << "'\n";
|
if (Verbose) std::cerr << "Linking in '" << InputFilenames[i] << "'\n";
|
||||||
|
|
||||||
if (LinkModules(Composite.get(), M.get(), &ErrorMessage)) {
|
if (Linker::LinkModules(Composite.get(), M.get(), &ErrorMessage)) {
|
||||||
std::cerr << argv[0] << ": link error in '" << InputFilenames[i]
|
std::cerr << argv[0] << ": link error in '" << InputFilenames[i]
|
||||||
<< "': " << ErrorMessage << "\n";
|
<< "': " << ErrorMessage << "\n";
|
||||||
return 1;
|
return 1;
|
||||||
|
Loading…
Reference in New Issue
Block a user