From 24801b157631434446c2fc5a40994a5555a1db38 Mon Sep 17 00:00:00 2001 From: Andreas Krebbel Date: Fri, 1 Mar 2019 15:23:42 +0100 Subject: Revert "Add support to GNU ld to separate got related plt entries" bfd/ChangeLog: 2019-03-01 Andreas Krebbel This reverts commit 5a12586d44fa8d5dfc74cbca4f2f36a273a16335. 2019-01-14 Maamoun Tarsha PR 20113 * elf32-s390.c (allocate_dynrelocs): Update comment. ld/ChangeLog: 2019-03-01 Andreas Krebbel This reverts commit 5a12586d44fa8d5dfc74cbca4f2f36a273a16335. 2019-01-14 Maamoun Tarsha PR 20113 * emulparams/elf64_s390.sh (SEPARATE_GOTPLT): Define. * emulparams/elf_s390.sh (SEPARATE_GOTPLT): Define. * testsuite/ld-s390/gotreloc_31-1.dd: Update expected output. * testsuite/ld-s390/tlsbin.dd: Likewise. * testsuite/ld-s390/tlsbin.rd: Likewise. * testsuite/ld-s390/tlsbin.sd: Likewise. * testsuite/ld-s390/tlsbin_64.dd: Likewise. * testsuite/ld-s390/tlsbin_64.rd: Likewise. * testsuite/ld-s390/tlsbin_64.sd: Likewise. * testsuite/ld-s390/tlspic.dd: Likewise. * testsuite/ld-s390/tlspic.rd: Likewise. * testsuite/ld-s390/tlspic.sd: Likewise. * testsuite/ld-s390/tlspic_64.dd: Likewise. * testsuite/ld-s390/tlspic_64.rd: Likewise. * testsuite/ld-s390/tlspic_64.sd: Likewise. * testsuite/ld-s390/s390.exp: Skip s390 tests for tpf targets. --- bfd/ChangeLog | 8 ++++++++ bfd/elf32-s390.c | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'bfd') diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 68004ea..73de8b8 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2019-03-01 Andreas Krebbel + + This reverts commit 5a12586d44fa8d5dfc74cbca4f2f36a273a16335. + 2019-01-14 Maamoun Tarsha + + PR 20113 + * elf32-s390.c (allocate_dynrelocs): Update comment. + 2019-02-28 Tamar Christina * elf-eh-frame.c (_bfd_elf_write_section_eh_frame): Correct CIE parse. diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c index 1bf8cc2..49a301f 100644 --- a/bfd/elf32-s390.c +++ b/bfd/elf32-s390.c @@ -1666,7 +1666,8 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf) /* Make room for this entry. */ s->size += PLT_ENTRY_SIZE; - /* We also need to make an entry in the .got.plt section. */ + /* We also need to make an entry in the .got.plt section, which + will be placed in the .got section by the linker script. */ htab->elf.sgotplt->size += GOT_ENTRY_SIZE; /* We also need to make an entry in the .rela.plt section. */ -- cgit v1.1