commit 5ca18a17b1f186cd6e7e2660c064e0854976a741
author Mikhail Glushenkov <foldr@codedgers.com> Wed Nov 26 10:55:45 2008 +0000
committer Mikhail Glushenkov <foldr@codedgers.com> Wed Nov 26 10:55:45 2008 +0000
tree f837064260d9beed238f3c7319107f7346107955
parent ecfffdb2d51ebf142b4a3b149f71b9d2fc9d57ba

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

utils/TableGen/LLVMCConfigurationEmitter.cpp

diff --git a/utils/TableGen/LLVMCConfigurationEmitter.cpp b/utils/TableGen/LLVMCConfigurationEmitter.cpp
index d43e62b..da4ed78 100644
--- a/utils/TableGen/LLVMCConfigurationEmitter.cpp
+++ b/utils/TableGen/LLVMCConfigurationEmitter.cpp
@@ -228,11 +228,11 @@
     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;