From 62ab84ece44dbf1bcf86957a969635d2e513ae6a Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sat, 5 May 2012 04:51:16 +0000 Subject: PR ld/14052 PR ld/13621 bfd/ * linker.c (_bfd_nearby_section): Revert 2012-02-13 change. ld/testsuite/ * ld-elf/warn2.d: Revert 2012-02-13 change. * ld-elf/zerosize1.d, ld-elf/zerosize1.s: Delete. --- bfd/ChangeLog | 6 ++++++ bfd/linker.c | 5 ----- ld/testsuite/ChangeLog | 7 +++++++ ld/testsuite/ld-elf/warn2.d | 2 +- ld/testsuite/ld-elf/zerosize1.d | 10 ---------- ld/testsuite/ld-elf/zerosize1.s | 3 --- 6 files changed, 14 insertions(+), 19 deletions(-) delete mode 100644 ld/testsuite/ld-elf/zerosize1.d delete mode 100644 ld/testsuite/ld-elf/zerosize1.s diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 876b44b6b7..2705feb167 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2012-05-05 Alan Modra + + PR ld/14052 + PR ld/13621 + * linker.c (_bfd_nearby_section): Revert 2012-02-13 change. + 2012-05-05 Alan Modra * aout-arm.c: Replace all uses of bfd_abs_section, bfd_com_section, diff --git a/bfd/linker.c b/bfd/linker.c index fccca0d2e0..3caec96a8f 100644 --- a/bfd/linker.c +++ b/bfd/linker.c @@ -3198,11 +3198,6 @@ _bfd_nearby_section (bfd *obfd, asection *s, bfd_vma addr) best = prev; } - /* Refuse to choose a section for which we are out of bounds. */ - /* ??? This may make most of the above moot. */ - if (addr < best->vma || addr > best->vma + best->size) - best = bfd_abs_section_ptr; - return best; } diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 46415b8e75..534ed0df19 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2012-05-05 Alan Modra + + PR ld/14052 + PR ld/13621 + * ld-elf/warn2.d: Revert 2012-02-13 change. + * ld-elf/zerosize1.d, ld-elf/zerosize1.s: Delete. + 2012-05-04 H.J. Lu * ld-elf/eh1.d: Skip x86_64-*-linux-gnux32. diff --git a/ld/testsuite/ld-elf/warn2.d b/ld/testsuite/ld-elf/warn2.d index a9c05f9541..95b7ef4999 100644 --- a/ld/testsuite/ld-elf/warn2.d +++ b/ld/testsuite/ld-elf/warn2.d @@ -13,5 +13,5 @@ # construct and that the symbol still appears as expected. #... - +[0-9]+: +[0-9a-f]+ +20 +OBJECT +GLOBAL +DEFAULT +ABS Foo + +[0-9]+: +[0-9a-f]+ +20 +OBJECT +GLOBAL +DEFAULT +[1-9] Foo #pass diff --git a/ld/testsuite/ld-elf/zerosize1.d b/ld/testsuite/ld-elf/zerosize1.d deleted file mode 100644 index 43187f073d..0000000000 --- a/ld/testsuite/ld-elf/zerosize1.d +++ /dev/null @@ -1,10 +0,0 @@ -#source: start.s -#source: zerosize1.s -#ld: -#readelf: -s - -# Check that xyzzy is not placed in the .text section. - -#... - +[0-9]+: +[0-9a-f]+ +0 +(OBJECT|NOTYPE) +GLOBAL +DEFAULT +ABS xyzzy -#pass diff --git a/ld/testsuite/ld-elf/zerosize1.s b/ld/testsuite/ld-elf/zerosize1.s deleted file mode 100644 index 4fc8198c43..0000000000 --- a/ld/testsuite/ld-elf/zerosize1.s +++ /dev/null @@ -1,3 +0,0 @@ - .section "zerosize","aw" - .globl xyzzy -xyzzy: -- cgit v1.2.1