6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-09-12 01:25:10 +00:00
Code Issues Projects Releases Wiki Activity

Add support for the 's' operation to llvm-ar.

Browse Source 
If no other operation is specified, 's' becomes an operation instead of an
modifier. The s operation just creates a symbol table. It is the same as
running ranlib.

We assume the archive was created by a sane ar (like llvm-ar or gnu ar) and
if the symbol table is present, then it is current. We use that to optimize
the most common case: a broken build system that thinks it has to run ranlib.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@187353 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2013-07-29 12:40:31 +00:00
parent c63dce3c59
commit cf48cf23de
5 changed files with 69 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tools/llvm-ar/llvm-ar.cpp
View File

@@ -112,7 +112,8 @@ enum ArchiveOperation {
QuickAppend, ///< Quickly append to end of archive
ReplaceOrInsert, ///< Replace or Insert members
DisplayTable, ///< Display the table of contents
Extract ///< Extract files back to file system
Extract, ///< Extract files back to file system
CreateSymTab ///< Create a symbol table in an existing archive
};
// Modifiers to follow operation to vary behavior
@@ -186,6 +187,8 @@ static ArchiveOperation parseCommandLine() {
// Keep track of which operation was requested
ArchiveOperation Operation;
bool MaybeJustCreateSymTab = false;
for(unsigned i=0; i<Options.size(); ++i) {
switch(Options[i]) {
case 'd': ++NumOperations; Operation = Delete; break;
@@ -200,6 +203,7 @@ static ArchiveOperation parseCommandLine() {
case 'o': OriginalDates = true; break;
case 's':
Symtab = true;
MaybeJustCreateSymTab = true;
break;
case 'S':
Symtab = false;
@@ -233,6 +237,13 @@ static ArchiveOperation parseCommandLine() {
// Everything on the command line at this point is a member.
getMembers();
if (NumOperations == 0 && MaybeJustCreateSymTab) {
NumOperations = 1;
Operation = CreateSymTab;
if (!Members.empty())
show_help("The s operation takes only an archive as argument");
}
// Perform various checks on the operation/modifier specification
// to make sure we are dealing with a legal request.
if (NumOperations == 0)
@@ -340,6 +351,7 @@ static bool shouldCreateArchive(ArchiveOperation Op) {
case Move:
case DisplayTable:
case Extract:
case CreateSymTab:
return false;
case QuickAppend:
@@ -810,6 +822,19 @@ static void performWriteOperation(ArchiveOperation Operation,
TemporaryOutput = NULL;
}
static void createSymbolTable(object::Archive *OldArchive) {
// When an archive is created or modified, if the s option is given, the
// resulting archive will have a current symbol table. If the S option
// is given, it will have no symbol table.
// In summary, we only need to update the symbol table if we have none.
// This is actually very common because of broken build systems that think
// they have to run ranlib.
if (OldArchive->hasSymbolTable())
return;
performWriteOperation(CreateSymTab, OldArchive);
}
static void performOperation(ArchiveOperation Operation,
object::Archive *OldArchive) {
switch (Operation) {
@@ -825,6 +850,9 @@ static void performOperation(ArchiveOperation Operation,
case ReplaceOrInsert:
performWriteOperation(Operation, OldArchive);
return;
case CreateSymTab:
createSymbolTable(OldArchive);
return;
}
llvm_unreachable("Unknown operation.");
}