6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-13 20:32:21 +00:00
Code Issues Projects Releases Wiki Activity

Adjust the constructor to the Linker class to take an argument that names

Browse Source 
the module being constructed. This is used to correctly name the module.
Previously the name of the linker tool was used which produces confusing
output when the module identifier is used in an error message.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@24699 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer 2005-12-13 20:00:37 +00:00
parent 2f1890792c
commit 328ead9fce
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/llvm/Linker.h
View File

@ -62,7 +62,11 @@ class Linker {
/// Construct the Linker with an empty module which will be given the
/// name \p progname. \p progname will also be used for error messages.
/// @brief Construct with empty module
Linker(const std::string& progname, unsigned Flags = 0 );
Linker(
const std::string& progname, ///< name of tool running linker
const std::string& modulename, ///< name of linker's end-result module
unsigned Flags = 0 ///< ControlFlags (one or more |'d together)
);
/// Construct the Linker with a previously defined module, \p aModule. Use
/// \p progname for the name of the program in error messages.

4
lib/Linker/Linker.cpp
View File

@ -19,14 +19,14 @@
using namespace llvm;
Linker::Linker(const std::string& progname, unsigned flags)
Linker::Linker(const std::string& progname, const std::string& modname, unsigned flags)
: Composite(0)
, LibPaths()
, Flags(flags)
, Error()
, ProgramName(progname)
{
Composite = new Module(progname);
Composite = new Module(modname);
}
Linker::Linker(const std::string& progname, Module* aModule, unsigned flags)

6
tools/gccld/gccld.cpp
View File

@ -107,6 +107,10 @@ namespace {
CO5("eh-frame-hdr", cl::Hidden, cl::desc("Compatibility option: ignored"));
cl::opt<std::string>
CO6("h", cl::Hidden, cl::desc("Compatibility option: ignored"));
cl::opt<bool>
CO7("start-group", cl::Hidden, cl::desc("Compatibility option: ignored"));
cl::opt<bool>
CO8("end-group", cl::Hidden, cl::desc("Compatibility option: ignored"));
cl::alias A0("s", cl::desc("Alias for --strip-all"),
cl::aliasopt(Strip));
@ -211,7 +215,7 @@ int main(int argc, char **argv, char **envp ) {
int exitCode = 0;
std::string ProgName = sys::Path(argv[0]).getBasename();
Linker TheLinker(ProgName, Verbose);
Linker TheLinker(ProgName, OutputFilename, Verbose);
try {
// Remove any consecutive duplicates of the same library...

2
tools/llvm-ld/llvm-ld.cpp
View File

@ -400,7 +400,7 @@ int main(int argc, char **argv, char **envp) {
try {
// Initial global variable above for convenience printing of program name.
progname = sys::Path(argv[0]).getBasename();
Linker TheLinker(progname, Verbose);
Linker TheLinker(progname, OutputFilename, Verbose);
// Set up the library paths for the Linker
TheLinker.addPaths(LibPaths);