Flip sense of erratum_835769_scan.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e191ccadfbf89312c9098fd2ac9df16b2d623e78..4e31021df6d65bfb8ce871840caf3e050bc85e4a 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,11 @@
 2015-03-04  Marcus Shawcroft  <marcus.shawcroft@arm.com>
 
+       * elfnn-aarch64.c (erratum_835769_scan) Add comment.  Reverse
+       sense of boolean return.
+       (elfNN_aarch64_size_stubs): Adjust for above.
+
+2015-03-23  Marcus Shawcroft  <marcus.shawcroft@arm.com>
+
        * elfnn-aarch64.c (elf_aarch64_create_or_find_stub_sec):
        Remove unused parameter.
        (elfNN_aarch64_size_stubs): Adjust for above.

diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
index a84207c5b80dbf443355a665d984cdca39d5458e..0e47f272c9db69918c65b4766253748c38293b75 100644 (file)
--- a/bfd/elfnn-aarch64.c
+++ b/bfd/elfnn-aarch64.c
@@ -2954,6 +2954,11 @@ elf_aarch64_compare_mapping (const void *a, const void *b)
     return 0;
 }
 
+
+/* Scan for cortex-a53 erratum 835769 sequence.
+
+   Return TRUE else FALSE on abnormal termination.  */
+
 static bfd_boolean
 erratum_835769_scan (bfd *input_bfd,
                     struct bfd_link_info *info,
@@ -2968,7 +2973,7 @@ erratum_835769_scan (bfd *input_bfd,
   unsigned int fix_table_size = *fix_table_size_p;
 
   if (htab == NULL)
-    return FALSE;
+    return TRUE;
 
   for (section = input_bfd->sections;
        section != NULL;
@@ -2988,7 +2993,7 @@ erratum_835769_scan (bfd *input_bfd,
       if (elf_section_data (section)->this_hdr.contents != NULL)
        contents = elf_section_data (section)->this_hdr.contents;
       else if (! bfd_malloc_and_get_section (input_bfd, section, &contents))
-       return TRUE;
+       return FALSE;
 
       sec_data = elf_aarch64_section_data (section);
 
@@ -3021,7 +3026,7 @@ erratum_835769_scan (bfd *input_bfd,
                    sprintf
                      (stub_name,"__erratum_835769_veneer_%d", num_fixes);
                  else
-                   return TRUE;
+                   return FALSE;
 
                  if (num_fixes == fix_table_size)
                    {
@@ -3032,7 +3037,7 @@ erratum_835769_scan (bfd *input_bfd,
                                       sizeof (struct aarch64_erratum_835769_fix)
                                         * fix_table_size);
                      if (fixes == NULL)
-                       return TRUE;
+                       return FALSE;
                    }
 
                  fixes[num_fixes].input_bfd = input_bfd;
@@ -3052,7 +3057,7 @@ erratum_835769_scan (bfd *input_bfd,
   *fixes_p = fixes;
   *num_fixes_p = num_fixes;
   *fix_table_size_p = fix_table_size;
-  return FALSE;
+  return TRUE;
 }
 
 /* Find or create a stub section.  */
@@ -3419,9 +3424,9 @@ elfNN_aarch64_size_stubs (bfd *output_bfd,
          if (htab->fix_erratum_835769)
            {
              /* Scan for sequences which might trigger erratum 835769.  */
-             if (erratum_835769_scan (input_bfd, info, &erratum_835769_fixes,
-                                      &num_erratum_835769_fixes,
-                                      &erratum_835769_fix_table_size)  != 0)
+             if (!erratum_835769_scan (input_bfd, info, &erratum_835769_fixes,
+                                       &num_erratum_835769_fixes,
+                                       &erratum_835769_fix_table_size))
                goto error_ret_free_local;
            }
        }