[llvm-commits] [llvm] r60099 - /llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp

[Mikhail Glushenkov]

Author: foldr
Date: Wed Nov 26 04:55:45 2008
New Revision: 60099

URL: http://llvm.org/viewvc/llvm-project?rev=60099&view=rev
Log:
Small fix: the error message was incorrect in some cases.

Modified:
    llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp

Modified: llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp?rev=60099&r1=60098&r2=60099&view=diff

==============================================================================
--- llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp Wed Nov 26 04:55:45 2008
@@ -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;