This is my Driver refactoring patch.
The major changes are:
1) LinkerOptions has been merged into TargetInfo
2) LinkerInvocation has been merged into Driver
3) Drivers no longer convert arguments into an intermediate (core) argument
list, but instead create a TargetInfo object and call setter methods on
it. This is only how in-process linking would work. That is, you can
programmatically set up a TargetInfo object which controls the linking.
4) Lots of tweaks to test suite to work with driver changes
5) Add the DarwinDriver
6) I heavily doxygen commented TargetInfo.h
Things to do after this patch is committed:
a) Consider renaming TargetInfo, given its new roll.
b) Consider pulling the list of input files out of TargetInfo. This will
enable in-process clients to create one TargetInfo the re-use it with
different input file lists.
c) Work out a way for Drivers to format the warnings and error done in
core linking.
llvm-svn: 178776
diff --git a/lld/lib/Core/TargetInfo.cpp b/lld/lib/Core/TargetInfo.cpp
index da834fb..05d7ffa 100644
--- a/lld/lib/Core/TargetInfo.cpp
+++ b/lld/lib/Core/TargetInfo.cpp
@@ -8,28 +8,49 @@
//===----------------------------------------------------------------------===//
#include "lld/Core/TargetInfo.h"
-
-#include "lld/Core/LinkerOptions.h"
+#include "lld/ReaderWriter/Writer.h"
#include "llvm/ADT/Triple.h"
namespace lld {
+
+TargetInfo::TargetInfo()
+ : Reader(*this)
+ , _deadStrip(false)
+ , _globalsAreDeadStripRoots(false)
+ , _searchArchivesToOverrideTentativeDefinitions(false)
+ , _searchSharedLibrariesToOverrideTentativeDefinitions(false)
+ , _warnIfCoalesableAtomsHaveDifferentCanBeNull(false)
+ , _warnIfCoalesableAtomsHaveDifferentLoadName(false)
+ , _forceLoadAllArchives(false)
+ , _printRemainingUndefines(true)
+ , _allowRemainingUndefines(false)
+{
+}
+
TargetInfo::~TargetInfo() {}
-llvm::Triple TargetInfo::getTriple() const {
- return llvm::Triple(llvm::Triple::normalize(_options._target));
+
+error_code TargetInfo::readFile(StringRef path,
+ std::vector<std::unique_ptr<File>> &result) const {
+ OwningPtr<llvm::MemoryBuffer> opmb;
+ if (error_code ec = llvm::MemoryBuffer::getFileOrSTDIN(path, opmb))
+ return ec;
+
+ std::unique_ptr<MemoryBuffer> mb(opmb.take());
+ return this->parseFile(mb, result);
}
-bool TargetInfo::is64Bits() const {
- return getTriple().isArch64Bit();
+error_code TargetInfo::writeFile(const File &linkedFile) const {
+ return this->writer().writeFile(linkedFile, _outputPath);
}
-bool TargetInfo::isLittleEndian() const {
- // TODO: Do this properly. It is not defined purely by arch.
- return true;
+void TargetInfo::addImplicitFiles(InputFiles& inputs) const {
+ this->writer().addFiles(inputs);
}
-StringRef TargetInfo::getEntry() const {
- return _options._entrySymbol;
+void TargetInfo::addPasses(PassManager &pm) const {
}
+
+
} // end namespace lld