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.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 876b44b6b7881582e295d4307683ee6aa6d099f2..2705feb167336c5b9a25a2857677ebfd42d6e957 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-05  Alan Modra  <amodra@gmail.com>
+
+       PR ld/14052
+       PR ld/13621
+       * linker.c (_bfd_nearby_section): Revert 2012-02-13 change.
+
 2012-05-05  Alan Modra  <amodra@gmail.com>
 
        * aout-arm.c: Replace all uses of bfd_abs_section, bfd_com_section,

diff --git a/bfd/linker.c b/bfd/linker.c
index fccca0d2e0b9b398834684379106ec70b93b4079..3caec96a8f038ac64e0df3e794484023c4370327 100644 (file)
--- 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 46415b8e75c90158228903c5072bd76bf24d0fb7..534ed0df19703909684b103166a04cadca25c217 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-05  Alan Modra  <amodra@gmail.com>
+
+       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  <hongjiu.lu@intel.com>
 
        * 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 a9c05f954115dc865e7def6e32cb0731846d3f61..95b7ef499981cd53f3102d206f3cb1276e2c7346 100644 (file)
--- 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 (file)
index 43187f0..0000000
--- 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 (file)
index 4fc8198..0000000
--- a/ld/testsuite/ld-elf/zerosize1.s
+++ /dev/null
@@ -1,3 +0,0 @@
-       .section "zerosize","aw"
-       .globl  xyzzy
-xyzzy: