summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorMikhail Glushenkov <foldr@codedgers.com>2008-11-26 10:55:45 +0000
committerMikhail Glushenkov <foldr@codedgers.com>2008-11-26 10:55:45 +0000
commit3acc921b26f0858ebddbc897763738ff81ca34c6 (patch)
treef837064260d9beed238f3c7319107f7346107955 /utils
parent8f78fa827ec4732b3c39cfd4b73c36829616b105 (diff)
downloadllvm-3acc921b26f0858ebddbc897763738ff81ca34c6.tar.gz
llvm-3acc921b26f0858ebddbc897763738ff81ca34c6.tar.bz2
llvm-3acc921b26f0858ebddbc897763738ff81ca34c6.tar.xz
Small fix: the error message was incorrect in some cases.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@60099 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils')
-rw-r--r--utils/TableGen/LLVMCConfigurationEmitter.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/utils/TableGen/LLVMCConfigurationEmitter.cpp b/utils/TableGen/LLVMCConfigurationEmitter.cpp
index d43e62bad8..da4ed78a24 100644
--- a/utils/TableGen/LLVMCConfigurationEmitter.cpp
+++ b/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;