From 7613ca5e3885b8e79d9096a53f3e5492a5c06cd7 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 24 Jul 2019 10:51:56 +0930 Subject: [PATCH] Define ELF_OSABI for visium and update expected results for gas mbind tests. bfd/ * elf32-visium.c (visium_elf_post_process_headers): Don't set EI_OSABI header byte here. (ELF_OSABI): Define. gas/ * testsuite/gas/elf/section12a.d: xfail visium and cloudabi. * testsuite/gas/elf/section12b.d: Likewise. * testsuite/gas/elf/section13.d: Likewise. --- bfd/ChangeLog | 6 ++++++ bfd/elf32-visium.c | 2 +- gas/ChangeLog | 6 ++++++ gas/testsuite/gas/elf/section12a.d | 5 +++-- gas/testsuite/gas/elf/section12b.d | 7 +++++-- gas/testsuite/gas/elf/section13.d | 3 ++- 6 files changed, 23 insertions(+), 6 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 0b6dff6..a309957 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2019-07-24 Alan Modra + + * elf32-visium.c (visium_elf_post_process_headers): Don't set + EI_OSABI header byte here. + (ELF_OSABI): Define. + 2019-07-23 Alan Modra * elf-bfd.h (enum elf_gnu_osabi): Add elf_gnu_osabi_mbind. diff --git a/bfd/elf32-visium.c b/bfd/elf32-visium.c index de81fdc..76271ce 100644 --- a/bfd/elf32-visium.c +++ b/bfd/elf32-visium.c @@ -727,7 +727,6 @@ visium_elf_post_process_headers (bfd *abfd, struct bfd_link_info *info ATTRIBUTE_UNUSED) { Elf_Internal_Ehdr *i_ehdrp = elf_elfheader (abfd); - i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_STANDALONE; i_ehdrp->e_ident[EI_ABIVERSION] = 1; } @@ -852,6 +851,7 @@ visium_elf_print_private_bfd_data (bfd *abfd, void *ptr) #define ELF_ARCH bfd_arch_visium #define ELF_MACHINE_CODE EM_VISIUM +#define ELF_OSABI ELFOSABI_STANDALONE #define ELF_MAXPAGESIZE 1 #define TARGET_BIG_SYM visium_elf32_vec diff --git a/gas/ChangeLog b/gas/ChangeLog index 3c363cc..fcde8b0 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2019-07-24 Alan Modra + + * testsuite/gas/elf/section12a.d: xfail visium and cloudabi. + * testsuite/gas/elf/section12b.d: Likewise. + * testsuite/gas/elf/section13.d: Likewise. + 2019-07-23 Kyrylo Tkachov * testsuite/gas/aarch64/sysreg-4.s: Test gmid_el1 read. diff --git a/gas/testsuite/gas/elf/section12a.d b/gas/testsuite/gas/elf/section12a.d index 2b6aa3e..5b764af 100644 --- a/gas/testsuite/gas/elf/section12a.d +++ b/gas/testsuite/gas/elf/section12a.d @@ -2,8 +2,9 @@ #as: --no-pad-sections #readelf: -Sg --wide #name: mbind sections -# msp430 and hpux do not support SHF_GNU_MBIND -#xfail: msp430-*-* *-*-hpux* +# A number of targets do not support SHF_GNU_MBIND +#xfail: msp430-*-* visium-*-* +#xfail: *-*-hpux* *-*-cloudabi #... \[[ 0-9]+\] \.mbind\.data[ ]+PROGBITS[ ]+0+0 0+[0-9a-f]+ 0+1 00 WAD 0 0 1 diff --git a/gas/testsuite/gas/elf/section12b.d b/gas/testsuite/gas/elf/section12b.d index fcbb697..a8406c3 100644 --- a/gas/testsuite/gas/elf/section12b.d +++ b/gas/testsuite/gas/elf/section12b.d @@ -3,8 +3,11 @@ #objdump: -s #name: mbind section contents # RX annoyingly reorders the sections so that they do not match the sequence -# expected below. msp430 and hpux do not support SHF_GNU_MBIND -#xfail: rx-*-* msp430-*-* *-*-hpux* +# expected below. +#xfail: rx-*-* +# A number of targets do not support SHF_GNU_MBIND +#xfail: msp430-*-* visium-*-* +#xfail: *-*-hpux* *-*-cloudabi #... Contents of section .mbind.data: diff --git a/gas/testsuite/gas/elf/section13.d b/gas/testsuite/gas/elf/section13.d index 9f4fe36..39bc2a3 100644 --- a/gas/testsuite/gas/elf/section13.d +++ b/gas/testsuite/gas/elf/section13.d @@ -1,3 +1,4 @@ #name: mbind sections without SHF_ALLOC #error_output: section13.l -#xfail: msp430-*-* *-*-hpux* +#xfail: msp430-*-* visium-*-* +#xfail: *-*-hpux* *-*-cloudabi -- 2.7.4