From: Han Shen <shenhan@google.com>
Date: Mon, 27 Apr 2015 22:01:44 +0000 (-0700)
Subject: [gold] Rename '--fix-cortex-a53' to '--fix-cortex-a53-843419'.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7a2a1c793578a8468604e661dda025ecb8d0bd20;p=binutils-gdb.git

[gold] Rename '--fix-cortex-a53' to '--fix-cortex-a53-843419'.

Keep gold consistent with bfd erratum-fixing option names, so as to
ease life in Makefile/scripts.

gold/

	* options.h (--fix-cortex-a53-843419): Rename option.
	* aarch64.cc (AArch64_relobj::do_count_local_symbols): Use renamed
	option.
	(AArch64_relobj::scan_sections_for_stubs): Use renamed option.
---

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 6b627d4eb92..5c6b2af43fe 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,10 @@
+2015-04-27  Han Shen  <shenhan@google.com>
+
+	* options.h (--fix-cortex-a53-843419): Rename option.
+	* aarch64.cc (AArch64_relobj::do_count_local_symbols): Use renamed
+	option.
+	(AArch64_relobj::scan_sections_for_stubs): Use renamed option.
+
 2015-04-27  Rafael Ávila de Espíndola <rafael.espindola@gmail.com>
 
 	PR gold/18327
@@ -33,7 +40,7 @@
 	(Target_powerpc::do_gc_mark_symbol): Use push_back.
 	* symtab.cc (Symbol_table::gc_mark_symbol): Use push_back.
 
-2015-04/16  Han Shen  <shenhan@google.com>
+2015-04-16  Han Shen  <shenhan@google.com>
 
     * aarch64.cc (AArch64_insn_utilities): New utility class.
     (AArch64_relobj::Mapping_symbol_position): New struct.
diff --git a/gold/aarch64.cc b/gold/aarch64.cc
index 19c3aa01cb1..27457760a15 100644
--- a/gold/aarch64.cc
+++ b/gold/aarch64.cc
@@ -1282,7 +1282,7 @@ AArch64_relobj<size, big_endian>::do_count_local_symbols(
 
   // Only erratum-fixing work needs mapping symbols, so skip this time consuming
   // processing if not fixing erratum.
-  if (!parameters->options().fix_cortex_a53())
+  if (!parameters->options().fix_cortex_a53_843419())
     return;
 
   const unsigned int loccount = this->local_symbol_count();
@@ -1590,7 +1590,7 @@ AArch64_relobj<size, big_endian>::scan_sections_for_stubs(
   for (unsigned int i = 1; i < shnum; ++i, p += shdr_size)
     {
       const elfcpp::Shdr<size, big_endian> shdr(p);
-      if (parameters->options().fix_cortex_a53())
+      if (parameters->options().fix_cortex_a53_843419())
 	scan_erratum_843419(i, shdr, out_sections[i], symtab, target);
       if (this->section_needs_reloc_stub_scanning(shdr, out_sections, symtab,
 						  pshdrs))
diff --git a/gold/options.h b/gold/options.h
index bb3bee6b10a..67eb1b2ed47 100644
--- a/gold/options.h
+++ b/gold/options.h
@@ -802,9 +802,10 @@ class General_options
 	      N_("(ARM only) Fix binaries for Cortex-A8 erratum."),
 	      N_("(ARM only) Do not fix binaries for Cortex-A8 erratum."));
 
-  DEFINE_bool(fix_cortex_a53, options::TWO_DASHES, '\0', false,
-	      N_("(AArch64 only) Scan and fix binaries for Cortex-A53 errata."),
-	      N_("(AArch64 only) Do not scan for Cortex-A53 errata."));
+  DEFINE_bool(fix_cortex_a53_843419, options::TWO_DASHES, '\0', false,
+	      N_("(AArch64 only) Scan binaries for Cortex-A53 errata 843419."),
+	      N_("(AArch64 only) Do not scan binaries for Cortex-A53 "
+		 "errata 843419."));
 
   DEFINE_bool(fix_arm1176, options::TWO_DASHES, '\0', true,
 	      N_("(ARM only) Fix binaries for ARM1176 erratum."),