diff --git a/gold/ChangeLog b/gold/ChangeLog
index 4e396485dc..f2ef711469 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-29  Sriraman Tallam  <tmsriram@google.com>
+
+	* options.cc (General_options::parse_version): Allow -v to exit
+	without an error if there is nothing to link.
+
 2009-12-29  Ian Lance Taylor  <iant@google.com>
 
 	* configure.ac: Set the MCMODEL_MEDIUM conditional to false if
diff --git a/gold/options.cc b/gold/options.cc
index c83f6027ca..73da963b1a 100644
--- a/gold/options.cc
+++ b/gold/options.cc
@@ -290,6 +290,7 @@ General_options::parse_version(const char* opt, const char*, Command_line*)
 {
   bool print_short = (opt[0] == '-' && opt[1] == 'v');
   gold::print_version(print_short);
+  this->printed_version_ = true;
   if (!print_short)
     ::exit(EXIT_SUCCESS);
 }