[llvm-commits] CVS: llvm/tools/gccld/gccld.cpp
Reid Spencer
reid at x10sys.com
Sun Dec 5 11:15:28 PST 2004
Changes in directory llvm/tools/gccld:
gccld.cpp updated: 1.82 -> 1.83
---
Log message:
Fix PR139: http://llvm.cs.uiuc.edu/PR139 :\
When not linking as a library, use LinkItems to retain command line order of \
linking, otherwise use LinkFiles
---
Diffs of the changes: (+19 -20)
Index: llvm/tools/gccld/gccld.cpp
diff -u llvm/tools/gccld/gccld.cpp:1.82 llvm/tools/gccld/gccld.cpp:1.83
--- llvm/tools/gccld/gccld.cpp:1.82 Thu Dec 2 15:26:10 2004
+++ llvm/tools/gccld/gccld.cpp Sun Dec 5 13:15:17 2004
@@ -168,31 +168,30 @@
int exitCode = 0;
try {
- std::string ModuleID("gccld-output");
- std::auto_ptr<Module> Composite(new Module(ModuleID));
-
- // We always look first in the current directory when searching for
- // libraries.
- LibPaths.insert(LibPaths.begin(), ".");
-
- // If the user specified an extra search path in their environment, respect
- // it.
- if (char *SearchPath = getenv("LLVM_LIB_SEARCH_PATH"))
- LibPaths.push_back(SearchPath);
-
// Remove any consecutive duplicates of the same library...
Libraries.erase(std::unique(Libraries.begin(), Libraries.end()),
Libraries.end());
- // Link in all of the files
- if (LinkFiles(argv[0], Composite.get(), InputFilenames, Verbose))
- return 1; // Error already printed
-
- if (!LinkAsLibrary)
- LinkLibraries(argv[0], Composite.get(), Libraries, LibPaths,
- Verbose, Native);
+ // Set up the Composite module.
+ std::auto_ptr<Module> Composite(0);
- // Link in all of the libraries next...
+ if (LinkAsLibrary) {
+ // Link in only the files, we ignore libraries in this case.
+ Composite.reset( new Module(argv[0]) );
+ if (LinkFiles(argv[0], Composite.get(), InputFilenames, Verbose))
+ return 1; // Error already printed
+ } else {
+ // Build a list of the items from our command line
+ LinkItemList Items;
+ BuildLinkItems(Items, InputFilenames, Libraries);
+
+ // Link all the items together
+ Composite.reset( LinkItems(argv[0], Items, LibPaths, Verbose, Native) );
+
+ // Check for an error during linker
+ if (!Composite.get())
+ return 1; // Error already printed
+ }
// Create the output file.
std::string RealBytecodeOutput = OutputFilename;
More information about the llvm-commits
mailing list