Add a --linker command-line option, make all tests pass.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@50755 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/utils/TableGen/LLVMCConfigurationEmitter.cpp b/utils/TableGen/LLVMCConfigurationEmitter.cpp
index aaa1099..32b6d38 100644
--- a/utils/TableGen/LLVMCConfigurationEmitter.cpp
+++ b/utils/TableGen/LLVMCConfigurationEmitter.cpp
@@ -175,11 +175,12 @@
if (other.Type != Type)
throw "Conflicting definitions for the option " + Name + "!";
- if (Help.empty() && !other.Help.empty())
+ if (Help == DefaultHelpString)
Help = other.Help;
- else if (!Help.empty() && !other.Help.empty())
- cerr << "Warning: more than one help string defined for option "
+ else if (other.Help != DefaultHelpString) {
+ llvm::cerr << "Warning: more than one help string defined for option "
+ Name + "\n";
+ }
Flags |= other.Flags;
}
@@ -290,8 +291,8 @@
// Default ctor here is needed because StringMap can only store
// DefaultConstructible objects
- ToolProperties() {}
- ToolProperties (const std::string& n) : Name(n) {}
+ ToolProperties() : Flags(0) {}
+ ToolProperties (const std::string& n) : Name(n), Flags(0) {}
};