Skip debug sections when estimating distances

Skip debug sections when estimating distances between output sections
since compressed_size is used to compress debug sections and debug
sections aren't excluded from distances between output sections.

bfd/

	PR ld/20006
	* elf64-x86-64.c (elf_x86_64_convert_load): Skip debug sections
	when estimating distances between output sections.

ld/

	PR ld/20006
	* testsuite/ld-elfvsb/elfvsb.exp (COMPRESS_LDFLAG): New.
	(visibility_run): Pass COMPRESS_LDFLAG to visibility_test on
	ELF targets.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f67db84c21238fd89351e45ec2dd7d761e3abfe8..b63811b4754562f887bd31ab641d5f6eb0bb0bd2 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2016-04-27  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR ld/20006
+       * elf64-x86-64.c (elf_x86_64_convert_load): Skip debug sections
+       when estimating distances between output sections.
+
 2016-04-27  Alan Modra  <amodra@gmail.com>
 
        * elflink.c (_bfd_elf_is_start_stop): New function.

diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 4899f9858a6c5e184b0476f55b861be7aced0d5a..02fcb220b9119be1d75f62b58676ca6be6ade3c5 100644 (file)
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -3205,17 +3205,20 @@ elf_x86_64_convert_load (bfd *abfd, asection *sec,
              for (asect = link_info->output_bfd->sections;
                   asect != NULL;
                   asect = asect->next)
-               {
-                 asection *i;
-                 for (i = asect->map_head.s;
-                      i != NULL;
-                      i = i->map_head.s)
-                   {
-                     size = align_power (size, i->alignment_power);
-                     size += i->size;
-                   }
-                 asect->compressed_size = size;
-               }
+               /* Skip debug sections since compressed_size is used to
+                  compress debug sections.  */
+               if ((asect->flags & SEC_DEBUGGING) == 0)
+                 {
+                   asection *i;
+                   for (i = asect->map_head.s;
+                        i != NULL;
+                        i = i->map_head.s)
+                     {
+                       size = align_power (size, i->alignment_power);
+                       size += i->size;
+                     }
+                   asect->compressed_size = size;
+                 }
            }
 
          /* Don't convert GOTPCREL relocations if TSEC isn't placed

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 62db17087d384e6f1fa42e1db417bb115fba20ea..379a2148dff14a6bb8e0ea56cf9c90bef00fa019 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,8 +1,15 @@
 2016-04-27  H.J. Lu  <hongjiu.lu@intel.com>
 
-       * ld-elf/compressed1b.d: Pass --compress-debug-sections=none
-       to ld.
-       * ld-elf/compressed1c.d: Likewise.
+       PR ld/20006
+       * testsuite/ld-elfvsb/elfvsb.exp (COMPRESS_LDFLAG): New.
+       (visibility_run): Pass COMPRESS_LDFLAG to visibility_test on
+       ELF targets.
+
+2016-04-27  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * testsuite/ld-elf/compressed1b.d: Pass
+       --compress-debug-sections=none to ld.
+       * testsuite/ld-elf/compressed1c.d: Likewise.
 
 2016-04-27  Alan Modra  <amodra@gmail.com>
 

diff --git a/ld/testsuite/ld-elfvsb/elfvsb.exp b/ld/testsuite/ld-elfvsb/elfvsb.exp
index d9d26d6785d39d5f6f7d17df007da8122bb4b70e..e20cd766a6121e9629ee86fe340e61fbe07587d3 100644 (file)
--- a/ld/testsuite/ld-elfvsb/elfvsb.exp
+++ b/ld/testsuite/ld-elfvsb/elfvsb.exp
@@ -62,6 +62,7 @@ if ![isnative] then {return}
 set tmpdir tmpdir
 set SHCFLAG ""
 set shared_needs_pic "no"
+set COMPRESS_LDFLAG "-Wl,--compress-debug-sections=zlib-gabi"
 
 if { [istarget rs6000*-*-aix*] || [istarget powerpc*-*-aix*] } {
 
@@ -228,6 +229,7 @@ proc visibility_run {visibility} {
     global support_protected
     global shared_needs_pic
     global PLT_CFLAGS
+    global COMPRESS_LDFLAG
 
     if [ string match $visibility "hidden" ] {
        set VSBCFLAG "-DHIDDEN_TEST"
@@ -384,7 +386,7 @@ proc visibility_run {visibility} {
            } else { if { [istarget rs6000*-*-aix*] || [istarget powerpc*-*-aix*] } {
                visibility_test $visibility vp "visibility ($visibility)" mainnp.o sh1p.o sh2p.o xcoff
            } else {
-               visibility_test $visibility vp "visibility ($visibility)" mainnp.o sh1p.o sh2p.o elfvsb
+               visibility_test $visibility vp "visibility ($visibility)" mainnp.o sh1p.o sh2p.o elfvsb $COMPRESS_LDFLAG
            } }
        }
     }}