diff --git a/gold/ChangeLog b/gold/ChangeLog
index 26ccad1947..bad0f2989e 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2018-05-10  Stephen Crane  <sjc@immunant.com>
+
+	* aarch64.cc (Target_aarch64::do_finalize_sections): Use size of
+	.got section for the _GLOBAL_OFFSET_TABLE_ symbol computation.
+
 2018-04-24  Cary Coutant  <ccoutant@gmail.com>
 
 	PR gold/20642
diff --git a/gold/aarch64.cc b/gold/aarch64.cc
index 8de9a26765..67f210876d 100644
--- a/gold/aarch64.cc
+++ b/gold/aarch64.cc
@@ -6965,11 +6965,11 @@ Target_aarch64<size, big_endian>::do_finalize_sections(
     }
 
   // Set the size of the _GLOBAL_OFFSET_TABLE_ symbol to the size of
-  // the .got.plt section.
+  // the .got section.
   Symbol* sym = this->global_offset_table_;
   if (sym != NULL)
     {
-      uint64_t data_size = this->got_plt_->current_data_size();
+      uint64_t data_size = this->got_->current_data_size();
       symtab->get_sized_symbol<size>(sym)->set_symsize(data_size);
 
       // If the .got section is more than 0x8000 bytes, we add