summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHan Shen <shenhan@google.com>2015-04-27 22:01:44 (GMT)
committerAndrew Hsieh <andrewhsieh@google.com>2015-04-28 03:18:57 (GMT)
commit29e2f8467cd188e949e7271fd79e659a72ba8630 (patch)
treef45734caf52301bd715ec715a9ffcad72ce48be5
parentf2bbcbc890d9f973b7e94e923c06aa0b3b448314 (diff)
downloadtoolchain_binutils-29e2f8467cd188e949e7271fd79e659a72ba8630.zip
toolchain_binutils-29e2f8467cd188e949e7271fd79e659a72ba8630.tar.gz
toolchain_binutils-29e2f8467cd188e949e7271fd79e659a72ba8630.tar.bz2
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. Change-Id: I8941fb38ef34fa5eb297e83725d87fdee994fc3a
-rw-r--r--binutils-2.25/gold/ChangeLog7
-rw-r--r--binutils-2.25/gold/aarch64.cc4
-rw-r--r--binutils-2.25/gold/options.h10
3 files changed, 13 insertions, 8 deletions
diff --git a/binutils-2.25/gold/ChangeLog b/binutils-2.25/gold/ChangeLog
index f786261..4e9aec0 100644
--- a/binutils-2.25/gold/ChangeLog
+++ b/binutils-2.25/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/16 Han Shen <shenhan@google.com>
* aarch64.cc (AArch64_insn_utilities): New utility class.
diff --git a/binutils-2.25/gold/aarch64.cc b/binutils-2.25/gold/aarch64.cc
index d31f0cc..7498273 100644
--- a/binutils-2.25/gold/aarch64.cc
+++ b/binutils-2.25/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/binutils-2.25/gold/options.h b/binutils-2.25/gold/options.h
index d00da71..3402a28 100644
--- a/binutils-2.25/gold/options.h
+++ b/binutils-2.25/gold/options.h
@@ -809,9 +809,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."),
@@ -1334,9 +1335,6 @@ class General_options
DEFINE_bool(fix_cortex_a53_835769, options::TWO_DASHES, '\0', false,
N_("Ignored for now"), NULL);
- DEFINE_bool(fix_cortex_a53_843419, options::TWO_DASHES, '\0', false,
- N_("Ignored for now"), NULL);
-
public:
typedef options::Dir_list Dir_list;