For PR1302:
Rename LinkItems as NativeLinkItems since it is filled out by the Linker
library to contain only those items deemed to be native.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@35654 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/llvm-ld/llvm-ld.cpp b/tools/llvm-ld/llvm-ld.cpp
index 207f0cb..fd0d9f2 100644
--- a/tools/llvm-ld/llvm-ld.cpp
+++ b/tools/llvm-ld/llvm-ld.cpp
@@ -268,12 +268,12 @@
/// specified bytecode file.
///
/// Inputs:
-/// InputFilename - The name of the input bytecode file.
-/// OutputFilename - The name of the file to generate.
-/// LinkItems - The native libraries, files, code with which to link
-/// LibPaths - The list of directories in which to find libraries.
-/// gcc - The pathname to use for GGC.
-/// envp - A copy of the process's current environment.
+/// InputFilename - The name of the input bytecode file.
+/// OutputFilename - The name of the file to generate.
+/// NativeLinkItems - The native libraries, files, code with which to link
+/// LibPaths - The list of directories in which to find libraries.
+/// gcc - The pathname to use for GGC.
+/// envp - A copy of the process's current environment.
///
/// Outputs:
/// None.
@@ -446,8 +446,9 @@
// Construct a Linker (now that Verbose is set)
Linker TheLinker(progname, OutputFilename, Verbose);
- // Keep track of the native link items (vice the bytecode items)
- Linker::ItemList LinkItems;
+
+ // Keep track of the native link items (versus the bytecode items)
+ Linker::ItemList NativeLinkItems;
// Add library paths to the linker
TheLinker.addPaths(LibPaths);
@@ -476,7 +477,7 @@
BuildLinkItems(Items, InputFilenames, Libraries);
// Link all the items together
- if (TheLinker.LinkInItems(Items,LinkItems) )
+ if (TheLinker.LinkInItems(Items, NativeLinkItems) )
return 1; // Error already printed
}
@@ -563,7 +564,7 @@
if (Verbose)
cout << "Generating Native Code\n";
if (0 != GenerateNative(OutputFilename, AssemblyFile.toString(),
- LinkItems,gcc,envp,ErrMsg))
+ NativeLinkItems, gcc, envp, ErrMsg))
PrintAndExit(ErrMsg);
// Remove the assembly language file.
@@ -595,8 +596,8 @@
if (Verbose)
cout << "Generating Native Code\n";
- if (0 != GenerateNative(OutputFilename, CFile.toString(), LinkItems,
- gcc, envp, ErrMsg))
+ if (0 != GenerateNative(OutputFilename, CFile.toString(),
+ NativeLinkItems, gcc, envp, ErrMsg))
PrintAndExit(ErrMsg);
// Remove the assembly language file.