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. --- ld/emulparams/elf64_s390.sh | 1 - ld/emulparams/elf_s390.sh | 1 - 2 files changed, 2 deletions(-) (limited to 'ld/emulparams') diff --git a/ld/emulparams/elf64_s390.sh b/ld/emulparams/elf64_s390.sh index e0239be..8d02042 100644 --- a/ld/emulparams/elf64_s390.sh +++ b/ld/emulparams/elf64_s390.sh @@ -14,7 +14,6 @@ GENERATE_PIE_SCRIPT=yes GENERATE_RELRO_SCRIPT=yes NO_SMALL_DATA=yes EXTRA_EM_FILE=s390 -SEPARATE_GOTPLT=24 IREL_IN_PLT= SEPARATE_GOTPLT=0 test -z "$RELRO" && unset SEPARATE_GOTPLT diff --git a/ld/emulparams/elf_s390.sh b/ld/emulparams/elf_s390.sh index 39c746c..f2286ec 100644 --- a/ld/emulparams/elf_s390.sh +++ b/ld/emulparams/elf_s390.sh @@ -11,5 +11,4 @@ TEMPLATE_NAME=elf32 GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes NO_SMALL_DATA=yes -SEPARATE_GOTPLT=12 IREL_IN_PLT= -- cgit v1.1