Module Name: src
Committed By: rjs
Date: Tue Aug 27 19:23:23 UTC 2019
Modified Files:
src/external/gpl3/binutils/dist/bfd: ChangeLog elf32-arm.c
src/external/gpl3/binutils/dist/include: ChangeLog
src/external/gpl3/binutils/dist/include/elf: arm.h
Log Message:
Fix to PR port-arm/54159.
From:
<http://mail-index.netbsd.org/tech-toolchain/2019/08/26/msg003596.html>
Pullup -9
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/binutils/dist/bfd/ChangeLog
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/binutils/dist/bfd/elf32-arm.c
cvs rdiff -u -r1.1.1.8 -r1.2 \
src/external/gpl3/binutils/dist/include/ChangeLog
cvs rdiff -u -r1.1.1.7 -r1.2 \
src/external/gpl3/binutils/dist/include/elf/arm.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/dist/bfd/ChangeLog
diff -u src/external/gpl3/binutils/dist/bfd/ChangeLog:1.11 src/external/gpl3/binutils/dist/bfd/ChangeLog:1.12
--- src/external/gpl3/binutils/dist/bfd/ChangeLog:1.11 Wed Nov 7 01:13:51 2018
+++ src/external/gpl3/binutils/dist/bfd/ChangeLog Tue Aug 27 19:23:22 2019
@@ -1,3 +1,11 @@
+2019-08-22 Alan Modra <amo...@gmail.com>
+
+ * elf32-arm.c (cmse_scan): Don't use ARM_GET_SYM_CMSE_SPCL,
+ instead recognize CMSE_PREFIX in symbol name.
+ (elf32_arm_gc_mark_extra_sections): Likewise.
+ (elf32_arm_filter_cmse_symbols): Don't test ARM_GET_SYM_CMSE_SPCL.
+ (elf32_arm_swap_symbol_in): Don't invoke ARM_SET_SYM_CMSE_SPCL.
+
2018-07-18 Nick Clifton <ni...@redhat.com>
2.31.1 Release point.
Index: src/external/gpl3/binutils/dist/bfd/elf32-arm.c
diff -u src/external/gpl3/binutils/dist/bfd/elf32-arm.c:1.14 src/external/gpl3/binutils/dist/bfd/elf32-arm.c:1.15
--- src/external/gpl3/binutils/dist/bfd/elf32-arm.c:1.14 Sun May 5 21:49:53 2019
+++ src/external/gpl3/binutils/dist/bfd/elf32-arm.c Tue Aug 27 19:23:22 2019
@@ -5930,12 +5930,12 @@ cmse_scan (bfd *input_bfd, struct elf32_
if (i < ext_start)
{
cmse_sym = &local_syms[i];
- /* Not a special symbol. */
- if (!ARM_GET_SYM_CMSE_SPCL (cmse_sym->st_target_internal))
- continue;
sym_name = bfd_elf_string_from_elf_section (input_bfd,
symtab_hdr->sh_link,
cmse_sym->st_name);
+ if (!sym_name || !CONST_STRNEQ (sym_name, CMSE_PREFIX))
+ continue;
+
/* Special symbol with local binding. */
cmse_invalid = TRUE;
}
@@ -5943,9 +5943,7 @@ cmse_scan (bfd *input_bfd, struct elf32_
{
cmse_hash = elf32_arm_hash_entry (sym_hashes[i - ext_start]);
sym_name = (char *) cmse_hash->root.root.root.string;
-
- /* Not a special symbol. */
- if (!ARM_GET_SYM_CMSE_SPCL (cmse_hash->root.target_internal))
+ if (!CONST_STRNEQ (sym_name, CMSE_PREFIX))
continue;
/* Special symbol has incorrect binding or type. */
@@ -15713,7 +15711,8 @@ elf32_arm_gc_mark_extra_sections (struct
/* Assume it is a special symbol. If not, cmse_scan will
warn about it and user can do something about it. */
- if (ARM_GET_SYM_CMSE_SPCL (cmse_hash->root.target_internal))
+ if (CONST_STRNEQ (cmse_hash->root.root.root.string,
+ CMSE_PREFIX))
{
cmse_sec = cmse_hash->root.root.u.def.section;
if (!cmse_sec->gc_mark
@@ -18303,9 +18302,6 @@ elf32_arm_filter_cmse_symbols (bfd *abfd
|| cmse_hash->root.type != STT_FUNC)
continue;
- if (!ARM_GET_SYM_CMSE_SPCL (cmse_hash->root.target_internal))
- continue;
-
syms[dst_count++] = sym;
}
free (cmse_name);
@@ -19628,9 +19624,6 @@ elf32_arm_swap_symbol_in (bfd * abfd,
const void *pshn,
Elf_Internal_Sym *dst)
{
- Elf_Internal_Shdr *symtab_hdr;
- const char *name = NULL;
-
if (!bfd_elf32_swap_symbol_in (abfd, psrc, pshn, dst))
return FALSE;
dst->st_target_internal = 0;
@@ -19659,13 +19652,6 @@ elf32_arm_swap_symbol_in (bfd * abfd,
else
ARM_SET_SYM_BRANCH_TYPE (dst->st_target_internal, ST_BRANCH_UNKNOWN);
- /* Mark CMSE special symbols. */
- symtab_hdr = & elf_symtab_hdr (abfd);
- if (symtab_hdr->sh_size && dst->st_size != 0)
- name = bfd_elf_sym_name (abfd, symtab_hdr, dst, NULL);
- if (name && CONST_STRNEQ (name, CMSE_PREFIX))
- ARM_SET_SYM_CMSE_SPCL (dst->st_target_internal);
-
return TRUE;
}
Index: src/external/gpl3/binutils/dist/include/ChangeLog
diff -u src/external/gpl3/binutils/dist/include/ChangeLog:1.1.1.8 src/external/gpl3/binutils/dist/include/ChangeLog:1.2
--- src/external/gpl3/binutils/dist/include/ChangeLog:1.1.1.8 Tue Nov 6 21:18:33 2018
+++ src/external/gpl3/binutils/dist/include/ChangeLog Tue Aug 27 19:23:22 2019
@@ -1,3 +1,7 @@
+2019-08-22 Alan Modra <amo...@gmail.com>
+
+ * elf/arm.h (ARM_GET_SYM_CMSE_SPCL, ARM_SET_SYM_CMSE_SPCL): Delete.
+
2018-07-18 Nick Clifton <ni...@redhat.com>
2.31.1 Release point.
Index: src/external/gpl3/binutils/dist/include/elf/arm.h
diff -u src/external/gpl3/binutils/dist/include/elf/arm.h:1.1.1.7 src/external/gpl3/binutils/dist/include/elf/arm.h:1.2
--- src/external/gpl3/binutils/dist/include/elf/arm.h:1.1.1.7 Tue Nov 6 21:18:34 2018
+++ src/external/gpl3/binutils/dist/include/elf/arm.h Tue Aug 27 19:23:22 2019
@@ -392,11 +392,4 @@ enum arm_st_branch_type {
| ((TYPE) & ENUM_ARM_ST_BRANCH_TYPE_BITMASK))
#endif
-/* Get or set whether a symbol is a special symbol of an entry function of CMSE
- secure code. */
-#define ARM_GET_SYM_CMSE_SPCL(SYM_TARGET_INTERNAL) \
- (((SYM_TARGET_INTERNAL) >> 2) & 1)
-#define ARM_SET_SYM_CMSE_SPCL(SYM_TARGET_INTERNAL) \
- (SYM_TARGET_INTERNAL) |= 4
-
#endif /* _ELF_ARM_H */
