From: Sriraman Tallam <tmsriram@google.com>
Date: Tue, 22 Dec 2009 01:33:43 +0000 (+0000)
Subject: 2009-12-21  Sriraman Tallam  <tmsriram@google.com>
X-Git-Tag: sid-snapshot-20100101~99
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=329ca2b10fdb7a8a2fb4d7aae88263648444e521;p=external%2Fbinutils.git

2009-12-21  Sriraman Tallam  <tmsriram@google.com>

	* options.cc (General_options::parse_version): Make -v continue and do
	the link like GNU ld does.
---

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 14cce02..6ae7610 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-21  Sriraman Tallam  <tmsriram@google.com>
+
+	* options.cc (General_options::parse_version): Make -v continue and do
+	the link like GNU ld does.
+
 2009-12-17  Rafael Avila de Espindola  <espindola@google.com>
 
 	* Makefile.am (CCFILES): Add timer.cc.
diff --git a/gold/options.cc b/gold/options.cc
index 299a748..c83f602 100644
--- a/gold/options.cc
+++ b/gold/options.cc
@@ -288,8 +288,10 @@ General_options::parse_help(const char*, const char*, Command_line*)
 void
 General_options::parse_version(const char* opt, const char*, Command_line*)
 {
-  gold::print_version(opt[0] == '-' && opt[1] == 'v');
-  ::exit(EXIT_SUCCESS);
+  bool print_short = (opt[0] == '-' && opt[1] == 'v');
+  gold::print_version(print_short);
+  if (!print_short)
+    ::exit(EXIT_SUCCESS);
 }
 
 void