This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[Committed][AArch64] Factor out _bfd_aarch64_erratum_835769_stub_name


Factor out stub name creation in the 835769 erratum workaround code. No functional change. Committed.

/Marcus


2015-03-23  Marcus Shawcroft  <marcus.shawcroft@arm.com>



       * elfnn-aarch64.c (erratum_835769_scan): Factor stub name
       construction into...
       (_bfd_aarch64_erratum_835769_stub_name):Define.
diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
index d5a64b5..c9e3a55 100644
--- a/bfd/elfnn-aarch64.c
+++ b/bfd/elfnn-aarch64.c
@@ -3013,6 +3013,15 @@ elf_aarch64_compare_mapping (const void *a, const void *b)
 }
 
 
+static char *
+_bfd_aarch64_erratum_835769_stub_name (unsigned num_fixes)
+{
+  char *stub_name = (char *) bfd_malloc
+    (strlen ("__erratum_835769_veneer_") + 16);
+  sprintf (stub_name,"__erratum_835769_veneer_%d", num_fixes);
+  return stub_name;
+}
+
 /* Scan for cortex-a53 erratum 835769 sequence.
 
    Return TRUE else FALSE on abnormal termination.  */
@@ -3077,13 +3086,8 @@ erratum_835769_scan (bfd *input_bfd,
 
 	      if (aarch64_erratum_sequence (insn_1, insn_2))
 		{
-		  char *stub_name = NULL;
-		  stub_name = (char *) bfd_malloc
-				(strlen ("__erratum_835769_veneer_") + 16);
-		  if (stub_name != NULL)
-		    sprintf
-		      (stub_name,"__erratum_835769_veneer_%d", num_fixes);
-		  else
+		  char *stub_name = _bfd_aarch64_erratum_835769_stub_name (num_fixes);
+		  if (! stub_name)
 		    return FALSE;
 
 		  if (num_fixes == fix_table_size)
-- 
1.9.1

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]