ld: relax alignment requirements of compressed .debug_* section checks

This fixes a failure of the gabinormal linking test on some distros
(where e.g. crt1.o has a .debug_aranges section with larger alignment).

Backport from master

	* ld-elf/gabiend.rt: Accept any alignment.
	* ld-elf/gabinormal.rt: Likewise.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 2fa9ad37636d077f197a2a4173e86fdfbeb9a71d..edbf9f2f9ea8bd74da17944b5e53a7fe89dfbb28 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,11 @@
+2016-03-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+       Backport from master
+       2015-12-07  Jan Beulich  <jbeulich@suse.com>
+
+       * ld-elf/gabiend.rt: Accept any alignment.
+       * ld-elf/gabinormal.rt: Likewise.
+
 2016-03-09  H.J. Lu  <hongjiu.lu@intel.com>
 
        Backport from master

diff --git a/ld/testsuite/ld-elf/gabiend.rt b/ld/testsuite/ld-elf/gabiend.rt
index 23bc36c87712a7ff54c4dc329ceb50aaaca829c7..75b5ba721387183c25056f11d9d14b8621e150a1 100644 (file)
--- a/ld/testsuite/ld-elf/gabiend.rt
+++ b/ld/testsuite/ld-elf/gabiend.rt
@@ -1,4 +1,4 @@
 #...
  +\[[0-9a-f]+\]: .*COMPRESSED
- +ZLIB, [0-9a-f]+, 1
+ +ZLIB, [0-9a-f]+, [1-9][0-9]*
 #pass

diff --git a/ld/testsuite/ld-elf/gabinormal.rt b/ld/testsuite/ld-elf/gabinormal.rt
index 23bc36c87712a7ff54c4dc329ceb50aaaca829c7..75b5ba721387183c25056f11d9d14b8621e150a1 100644 (file)
--- a/ld/testsuite/ld-elf/gabinormal.rt
+++ b/ld/testsuite/ld-elf/gabinormal.rt
@@ -1,4 +1,4 @@
 #...
  +\[[0-9a-f]+\]: .*COMPRESSED
- +ZLIB, [0-9a-f]+, 1
+ +ZLIB, [0-9a-f]+, [1-9][0-9]*
 #pass