From: Ian Lance Taylor <ian@airs.com>
Date: Tue, 25 Jan 2011 06:08:47 +0000 (+0000)
Subject: 	* options.h (class General_options): Accept
X-Git-Tag: cgen-snapshot-20110201~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f30f86fa955570721c2c0c95468d975f216bf754;p=thirdparty%2Fbinutils-gdb.git

	* options.h (class General_options): Accept
	--no-detect-odr-violations.
---

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 3cf3286643d..0c14f7c35b9 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-24  Ian Lance Taylor  <iant@google.com>
+
+	* options.h (class General_options): Accept
+	--no-detect-odr-violations.
+
 2011-01-24  Ian Lance Taylor  <iant@google.com>
 
 	* version.cc (version_string): Bump to 1.11.
diff --git a/gold/options.h b/gold/options.h
index 8f240f07d4a..da125994a06 100644
--- a/gold/options.h
+++ b/gold/options.h
@@ -682,8 +682,8 @@ class General_options
 	      NULL);
 
   DEFINE_bool(detect_odr_violations, options::TWO_DASHES, '\0', false,
-              N_("Try to detect violations of the One Definition Rule"),
-              NULL);
+              N_("Look for violations of the C++ One Definition Rule"),
+	      N_("Do not look for violations of the C++ One Definition Rule"));
 
   DEFINE_bool(discard_all, options::TWO_DASHES, 'x', false,
 	      N_("Delete all local symbols"), NULL);