diff --git a/gold/ChangeLog b/gold/ChangeLog
index e039ab1d09..06608eb5ec 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,10 @@
+2015-12-13  Cary Coutant  <ccoutant@gmail.com>
+
+	* object.h (Object::get_output_view): remove const from return type.
+	(Object::do_get_output_view): Likewise.
+	(Sized_relobj_file::do_get_output_view): Likewise.
+	* reloc.cc (Sized_relobj_file::do_get_output_view): Likewise.
+
 2015-12-11  Cary Coutant  <ccoutant@gmail.com>
 
 	* target.h (Target::calls_non_split): Add prelocs, reloc_count
diff --git a/gold/object.h b/gold/object.h
index 6cb82c7633..a15509a147 100644
--- a/gold/object.h
+++ b/gold/object.h
@@ -845,7 +845,7 @@ class Object
   { return this->do_get_incremental_reloc_count(symndx); }
 
   // Return the output view for section SHNDX.
-  const unsigned char*
+  unsigned char*
   get_output_view(unsigned int shndx, section_size_type* plen) const
   { return this->do_get_output_view(shndx, plen); }
 
@@ -1035,7 +1035,7 @@ class Object
   { gold_unreachable(); }
 
   // Return the output view for a section.
-  virtual const unsigned char*
+  virtual unsigned char*
   do_get_output_view(unsigned int, section_size_type*) const
   { gold_unreachable(); }
 
@@ -2574,7 +2574,7 @@ class Sized_relobj_file : public Sized_relobj<size, big_endian>
   { this->output_local_symbol_count_ = value; }
 
   // Return the output view for a section.
-  const unsigned char*
+  unsigned char*
   do_get_output_view(unsigned int, section_size_type*) const;
 
  private:
diff --git a/gold/reloc.cc b/gold/reloc.cc
index c0c06c5ce6..0b4551483e 100644
--- a/gold/reloc.cc
+++ b/gold/reloc.cc
@@ -1061,7 +1061,7 @@ Sized_relobj_file<size, big_endian>::do_relocate_sections(
 // Return the output view for section SHNDX.
 
 template<int size, bool big_endian>
-const unsigned char*
+unsigned char*
 Sized_relobj_file<size, big_endian>::do_get_output_view(
     unsigned int shndx,
     section_size_type* plen) const
@@ -1775,7 +1775,7 @@ Sized_relobj_file<32, false>::do_relocate_sections(
     Views* pviews);
 
 template
-const unsigned char*
+unsigned char*
 Sized_relobj_file<32, false>::do_get_output_view(
     unsigned int shndx,
     section_size_type* plen) const;
@@ -1792,7 +1792,7 @@ Sized_relobj_file<32, true>::do_relocate_sections(
     Views* pviews);
 
 template
-const unsigned char*
+unsigned char*
 Sized_relobj_file<32, true>::do_get_output_view(
     unsigned int shndx,
     section_size_type* plen) const;
@@ -1809,7 +1809,7 @@ Sized_relobj_file<64, false>::do_relocate_sections(
     Views* pviews);
 
 template
-const unsigned char*
+unsigned char*
 Sized_relobj_file<64, false>::do_get_output_view(
     unsigned int shndx,
     section_size_type* plen) const;
@@ -1826,7 +1826,7 @@ Sized_relobj_file<64, true>::do_relocate_sections(
     Views* pviews);
 
 template
-const unsigned char*
+unsigned char*
 Sized_relobj_file<64, true>::do_get_output_view(
     unsigned int shndx,
     section_size_type* plen) const;