diff options
| author | Mikhail Glushenkov <foldr@codedgers.com> | 2008-11-26 10:55:45 +0000 |
|---|---|---|
| committer | Mikhail Glushenkov <foldr@codedgers.com> | 2008-11-26 10:55:45 +0000 |
| commit | 3ac10202c0cbe44befdffde03ea2e20e8b7823b6 (patch) | |
| tree | 10a1680d71526ab172f070da4e1c4f353315e582 /llvm/utils | |
| parent | 83c70fa3dcfe42290842dfc092d1ce083b2adfd0 (diff) | |
| download | bcm5719-llvm-3ac10202c0cbe44befdffde03ea2e20e8b7823b6.tar.gz bcm5719-llvm-3ac10202c0cbe44befdffde03ea2e20e8b7823b6.zip | |
Small fix: the error message was incorrect in some cases.
llvm-svn: 60099
Diffstat (limited to 'llvm/utils')
| -rw-r--r-- | llvm/utils/TableGen/LLVMCConfigurationEmitter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/utils/TableGen/LLVMCConfigurationEmitter.cpp b/llvm/utils/TableGen/LLVMCConfigurationEmitter.cpp index d43e62bad8f..da4ed78a24c 100644 --- a/llvm/utils/TableGen/LLVMCConfigurationEmitter.cpp +++ b/llvm/utils/TableGen/LLVMCConfigurationEmitter.cpp @@ -228,11 +228,11 @@ struct GlobalOptionDescription : public OptionDescription { if (other.Type != Type) throw "Conflicting definitions for the option " + Name + "!"; - if (Help == DefaultHelpString) + if (Help == other.Help || Help == DefaultHelpString) Help = other.Help; else if (other.Help != DefaultHelpString) { - llvm::cerr << "Warning: more than one help string defined for option " - + Name + "\n"; + llvm::cerr << "Warning: several different help strings" + " defined for option " + Name + "\n"; } Flags |= other.Flags; |
