diff options
| author | Gunther Nikl <gnikl@justmail.de> | 2020-05-04 16:07:26 +0100 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2020-05-04 16:07:26 +0100 |
| commit | 7242fa8aa7596b4e154ca96ddf5ce49353bf2e5d (patch) | |
| tree | 64094a7b7e94bd4116523e4572dc69ec08b820e6 | |
| parent | cff69cf4cf97e1eb4c2cca8e985e403b1a97c059 (diff) | |
| download | binutils-gdb-7242fa8aa7596b4e154ca96ddf5ce49353bf2e5d.tar.gz | |
[PATCH] bfd: tweak SET_ARCH_MACH of aout-cris.c
* aout-cris.c (DEFAULT_ARCH): Delete define.
(MY_set_arch_mach): Likewise.
(SET_ARCH_MACH): Use bfd_set_arch_mach with an explicit architecture
of bfd_arch_cris.
(swap_ext_reloc_in): Add casts to r_index extraction. Mask valid bits
of r_type before the shift.
| -rw-r--r-- | bfd/ChangeLog | 11 | ||||
| -rw-r--r-- | bfd/aout-cris.c | 18 |
2 files changed, 18 insertions, 11 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index be1c985615c..19ecf892924 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,4 +1,13 @@ -2020-05-01 Wilco Dijkstra <wdijkstr@arm.com> +2020-05-04 Gunther Nikl <gnikl@justmail.de> + + * aout-cris.c (DEFAULT_ARCH): Delete define. + (MY_set_arch_mach): Likewise. + (SET_ARCH_MACH): Use bfd_set_arch_mach with an explicit architecture + of bfd_arch_cris. + (swap_ext_reloc_in): Add casts to r_index extraction. Mask valid bits + of r_type before the shift. + +2020-05-04 Wilco Dijkstra <wdijkstr@arm.com> PR ld/25665 * elfnn-aarch64.c (group_sections): Copy implementation from diff --git a/bfd/aout-cris.c b/bfd/aout-cris.c index 30ab2b5f494..d6221d17e76 100644 --- a/bfd/aout-cris.c +++ b/bfd/aout-cris.c @@ -56,9 +56,6 @@ #define TARGET_PAGE_SIZE SEGMENT_SIZE #define TARGETNAME "a.out-cris" -/* The definition here seems not used; just provided as a convention. */ -#define DEFAULT_ARCH bfd_arch_cris - /* Do not "beautify" the CONCAT* macro args. Traditional C will not remove whitespace added here, and thus will fail to concatenate the tokens. */ @@ -92,9 +89,8 @@ static bfd_boolean MY (set_sizes) (bfd *); through SET_ARCH_MACH. The default bfd_default_set_arch_mach will not call set_sizes. */ -#define MY_set_arch_mach NAME (aout, set_arch_mach) #define SET_ARCH_MACH(BFD, EXECP) \ - MY_set_arch_mach (BFD, DEFAULT_ARCH, N_MACHTYPE (EXECP)) + bfd_set_arch_mach (BFD, bfd_arch_cris, N_MACHTYPE (EXECP)) /* These macros describe the binary layout of the reloc information we use in a file. */ @@ -231,12 +227,14 @@ MY (swap_ext_reloc_in) (bfd *abfd, cache_ptr->address = (GET_SWORD (abfd, bytes->r_address)); /* Now the fun stuff. */ - r_index = (bytes->r_index[2] << 16) - | (bytes->r_index[1] << 8) - | bytes->r_index[0]; + r_index = (((unsigned int) bytes->r_index[2] << 16) + | ((unsigned int) bytes->r_index[1] << 8) + | bytes->r_index[0]); + r_extern = (0 != (bytes->r_type[0] & RELOC_EXT_BITS_EXTERN_LITTLE)); - r_type = ((bytes->r_type[0]) >> RELOC_EXT_BITS_TYPE_SH_LITTLE) - & RELOC_EXT_BITS_TYPE_LITTLE; + + r_type = ((bytes->r_type[0] & RELOC_EXT_BITS_TYPE_LITTLE) + >> RELOC_EXT_BITS_TYPE_SH_LITTLE); if (r_type > 2) { |