* options.h (class General_options): Accept

	--no-detect-odr-violations.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 3cf3286..0c14f7c 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,5 +1,10 @@
 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.
 
 2011-01-24  Ian Lance Taylor  <iant@google.com>

diff --git a/gold/options.h b/gold/options.h
index 8f240f0..da12599 100644 (file)
--- 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);