Updo the last change to binutils and ld/testsuite.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index b7d4ee096c24da923f8e17b34c30bf5cb761ca54..0d027b0fbb8b800d83151bb2ebbb422c5e5fe1da 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * readelf.c (process_program_headers): Undo the last change.
+
 2006-02-02  H.J. Lu  <hongjiu.lu@intel.com>
 
        * readelf.c (process_program_headers): Undo the change made on

diff --git a/binutils/readelf.c b/binutils/readelf.c
index 04f64adca05ef2486975e270539b9bb45a7d26d0..f0385d0f9c82f4a40ba765cec7d3601c812d01b3 100644 (file)
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -3405,10 +3405,6 @@ process_program_headers (FILE *file)
          for (j = 1; j < elf_header.e_shnum; j++, section++)
            {
              if (section->sh_size > 0
-                 /* PT_DYNAMIC segment contains only SHT_DYNAMIC
-                    sections.  */
-                 && (segment->p_type != PT_DYNAMIC
-                     || section->sh_type == SHT_DYNAMIC)
                  /* Compare allocated sections by VMA, unallocated
                     sections by file offset.  */
                  && (section->sh_flags & SHF_ALLOC
@@ -3417,7 +3413,12 @@ process_program_headers (FILE *file)
                         <= segment->p_vaddr + segment->p_memsz)
                      : ((bfd_vma) section->sh_offset >= segment->p_offset
                         && (section->sh_offset + section->sh_size
-                            <= segment->p_offset + segment->p_filesz))))
+                            <= segment->p_offset + segment->p_filesz)))
+                 /* .tbss is special.  It doesn't contribute memory space
+                    to normal segments.  */
+                 && (!((section->sh_flags & SHF_TLS) != 0
+                       && section->sh_type == SHT_NOBITS)
+                     || segment->p_type == PT_TLS))
                printf ("%s ", SECTION_NAME (section));
            }
 

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index cb923d38899fd3869ce84d306f58e2bc146e90c0..210e09eb1feb871401caa97109d0e1f824fa355e 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,27 @@
+2006-02-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * ld-i386/tlsbin.rd: Undo the last change.
+       * ld-i386/tlsbindesc.rd: Likewise.
+       * ld-i386/tlsdesc.rd: Likewise.
+       * ld-i386/tlsnopic.rd: Likewise.
+       * ld-i386/tlspic.rd: Likewise.
+       * ld-powerpc/tlsexe.r: Likewise.
+       * ld-powerpc/tlsexe32.r: Likewise.
+       * ld-powerpc/tlsexetoc.r: Likewise.
+       * ld-powerpc/tlsso.r: Likewise.
+       * ld-powerpc/tlsso32.r: Likewise.
+       * ld-powerpc/tlstocso.r: Likewise.
+       * ld-s390/tlsbin.rd: Likewise.
+       * ld-s390/tlsbin_64.rd: Likewise.
+       * ld-s390/tlspic.rd: Likewise.
+       * ld-s390/tlspic_64.rd: Likewise.
+       * ld-sh/tlsbin-2.d: Likewise.
+       * ld-sh/tlspic-2.d: Likewise.
+       * ld-x86-64/tlsbin.rd: Likewise.
+       * ld-x86-64/tlsbindesc.rd: Likewise.
+       * ld-x86-64/tlsdesc.rd: Likewise.
+       * ld-x86-64/tlspic.rd: Likewise.
+
 2006-02-02  H.J. Lu  <hongjiu.lu@intel.com>
 
        * ld-i386/tlsbin.rd: Update for changed segment map.

diff --git a/ld/testsuite/ld-i386/tlsbin.rd b/ld/testsuite/ld-i386/tlsbin.rd
index 88610e61be7895b589db8c68e717ff3572a53883..b485626084048692fd2ce73d2765ce9574e1ee18 100644 (file)
--- a/ld/testsuite/ld-i386/tlsbin.rd
+++ b/ld/testsuite/ld-i386/tlsbin.rd
@@ -50,7 +50,7 @@ Program Headers:
    00 +
    01 +.interp *
    02 +.interp .hash .dynsym .dynstr .rel.dyn .rel.plt .plt .text *
-   03 +.tdata .tbss .dynamic .got .got.plt *
+   03 +.tdata .dynamic .got .got.plt *
    04 +.dynamic *
    05 +.tdata .tbss *
 

diff --git a/ld/testsuite/ld-i386/tlsbindesc.rd b/ld/testsuite/ld-i386/tlsbindesc.rd
index 0fc7b2e4d45b64d94fe005b944196bed2f6eeecb..27d0670c993409c2ff3e2d9c60ed420a8ed0ea1e 100644 (file)
--- a/ld/testsuite/ld-i386/tlsbindesc.rd
+++ b/ld/testsuite/ld-i386/tlsbindesc.rd
@@ -48,7 +48,7 @@ Program Headers:
    00 +
    01 +.interp *
    02 +.interp .hash .dynsym .dynstr .rel.dyn .text *
-   03 +.tdata .tbss .dynamic .got .got.plt *
+   03 +.tdata .dynamic .got .got.plt *
    04 +.dynamic *
    05 +.tdata .tbss *
 

diff --git a/ld/testsuite/ld-i386/tlsdesc.rd b/ld/testsuite/ld-i386/tlsdesc.rd
index 4a56937ef4c5ca67c0f6dc71514043a6071449c3..12fd5d4236bdc577b3ead0fe6dd493faa3b26d20 100644 (file)
--- a/ld/testsuite/ld-i386/tlsdesc.rd
+++ b/ld/testsuite/ld-i386/tlsdesc.rd
@@ -43,7 +43,7 @@ Program Headers:
  Section to Segment mapping:
   Segment Sections...
    00 +.hash .dynsym .dynstr .rel.dyn .rel.plt .text *
-   01 +.tdata .tbss .dynamic .got .got.plt *
+   01 +.tdata .dynamic .got .got.plt *
    02 +.dynamic *
    03 +.tdata .tbss *
 

diff --git a/ld/testsuite/ld-i386/tlsnopic.rd b/ld/testsuite/ld-i386/tlsnopic.rd
index 3784a8b058750291f0ec0d31e16c466b4bb52503..d8dcc66357fb037f1d69f5ba93e308ef7d890b6f 100644 (file)
--- a/ld/testsuite/ld-i386/tlsnopic.rd
+++ b/ld/testsuite/ld-i386/tlsnopic.rd
@@ -41,7 +41,7 @@ Program Headers:
  Section to Segment mapping:
   Segment Sections...
    00 +.hash .dynsym .dynstr .rel.dyn .text *
-   01 +.tbss .dynamic .got .got.plt *
+   01 +.dynamic .got .got.plt *
    02 +.dynamic *
    03 +.tbss *
 

diff --git a/ld/testsuite/ld-i386/tlspic.rd b/ld/testsuite/ld-i386/tlspic.rd
index b1706aead05c9fba996bce45e2e61772a25272c0..890a4938efe032a97acf6916ce3e4f2d27df7e76 100644 (file)
--- a/ld/testsuite/ld-i386/tlspic.rd
+++ b/ld/testsuite/ld-i386/tlspic.rd
@@ -44,7 +44,7 @@ Program Headers:
  Section to Segment mapping:
   Segment Sections...
    00 +.hash .dynsym .dynstr .rel.dyn .rel.plt .plt .text *
-   01 +.tdata .tbss .dynamic .got .got.plt *
+   01 +.tdata .dynamic .got .got.plt *
    02 +.dynamic *
    03 +.tdata .tbss *
 

diff --git a/ld/testsuite/ld-powerpc/tlsexe.r b/ld/testsuite/ld-powerpc/tlsexe.r
index 64c47dd22c2b8c0e19debb8ea685efa657993eac..2e4fab64e63a0bbb6618312d65b58b57f3ddd5c6 100644 (file)
--- a/ld/testsuite/ld-powerpc/tlsexe.r
+++ b/ld/testsuite/ld-powerpc/tlsexe.r
@@ -47,7 +47,7 @@ Program Headers:
  +0+ +
  +01 +\.interp 
  +02 +\.interp \.hash \.dynsym \.dynstr \.rela\.dyn \.rela\.plt \.text 
- +03 +\.tdata \.tbss \.dynamic \.got \.plt 
+ +03 +\.tdata \.dynamic \.got \.plt 
  +04 +\.dynamic 
  +05 +\.tdata \.tbss 
 

diff --git a/ld/testsuite/ld-powerpc/tlsexe32.r b/ld/testsuite/ld-powerpc/tlsexe32.r
index 8342494cf7561469bf50bd200ba1f9a954050fee..aff95b7246c6a102ec3486614e6beea4a108e7bb 100644 (file)
--- a/ld/testsuite/ld-powerpc/tlsexe32.r
+++ b/ld/testsuite/ld-powerpc/tlsexe32.r
@@ -46,7 +46,7 @@ Program Headers:
  +00 +
  +01 +\.interp 
  +02 +\.interp \.hash \.dynsym \.dynstr \.rela\.dyn \.rela\.plt \.text 
- +03 +\.tdata \.tbss \.dynamic \.got \.plt 
+ +03 +\.tdata \.dynamic \.got \.plt 
  +04 +\.dynamic 
  +05 +\.tdata \.tbss 
 

diff --git a/ld/testsuite/ld-powerpc/tlsexetoc.r b/ld/testsuite/ld-powerpc/tlsexetoc.r
index a43486e26cc5117f117e03121c5eb64019491263..d6664cdd19ac1c1c500ec85f604ecf795da4c0eb 100644 (file)
--- a/ld/testsuite/ld-powerpc/tlsexetoc.r
+++ b/ld/testsuite/ld-powerpc/tlsexetoc.r
@@ -47,7 +47,7 @@ Program Headers:
  +0+ +
  +01 +\.interp 
  +02 +\.interp \.hash \.dynsym \.dynstr \.rela\.dyn \.rela\.plt \.text 
- +03 +\.tdata \.tbss \.dynamic \.got \.plt 
+ +03 +\.tdata \.dynamic \.got \.plt 
  +04 +\.dynamic 
  +05 +\.tdata \.tbss 
 

diff --git a/ld/testsuite/ld-powerpc/tlsso.r b/ld/testsuite/ld-powerpc/tlsso.r
index c88a5f9a20e8caf0f9f37b66ebe846d5d95c1fd3..8501c6fe9c4ba4efa0b138fdf0c850744d024c46 100644 (file)
--- a/ld/testsuite/ld-powerpc/tlsso.r
+++ b/ld/testsuite/ld-powerpc/tlsso.r
@@ -40,7 +40,7 @@ Program Headers:
  Section to Segment mapping:
  +Segment Sections\.\.\.
  +0+ +\.hash \.dynsym \.dynstr \.rela\.dyn \.rela\.plt \.text 
- +01 +\.tdata \.tbss \.dynamic \.got \.plt 
+ +01 +\.tdata \.dynamic \.got \.plt 
  +02 +\.dynamic 
  +03 +\.tdata \.tbss 
 

diff --git a/ld/testsuite/ld-powerpc/tlsso32.r b/ld/testsuite/ld-powerpc/tlsso32.r
index 049cb855673162b66d97f2a70672ef1271111a94..c0c120c635be34fbaf13b6df5340dca440cdb0c8 100644 (file)
--- a/ld/testsuite/ld-powerpc/tlsso32.r
+++ b/ld/testsuite/ld-powerpc/tlsso32.r
@@ -39,7 +39,7 @@ Program Headers:
  Section to Segment mapping:
  +Segment Sections\.\.\.
  +0+ +\.hash \.dynsym \.dynstr \.rela\.dyn \.rela\.plt \.text 
- +01 +\.tdata \.tbss \.dynamic \.got \.plt 
+ +01 +\.tdata \.dynamic \.got \.plt 
  +02 +\.dynamic 
  +03 +\.tdata \.tbss 
 

diff --git a/ld/testsuite/ld-powerpc/tlstocso.r b/ld/testsuite/ld-powerpc/tlstocso.r
index af2afc87db86262b3acfcc9170e524c1d4a8d92c..d63136fa42534cba3bdcdedee34a17f74f7aff13 100644 (file)
--- a/ld/testsuite/ld-powerpc/tlstocso.r
+++ b/ld/testsuite/ld-powerpc/tlstocso.r
@@ -40,7 +40,7 @@ Program Headers:
  Section to Segment mapping:
  +Segment Sections\.\.\.
  +0+ +\.hash \.dynsym \.dynstr \.rela\.dyn \.rela\.plt \.text 
- +01 +\.tdata \.tbss \.dynamic \.got \.plt 
+ +01 +\.tdata \.dynamic \.got \.plt 
  +02 +\.dynamic 
  +03 +\.tdata \.tbss 
 

diff --git a/ld/testsuite/ld-s390/tlsbin.rd b/ld/testsuite/ld-s390/tlsbin.rd
index 27b4eeae15a892349d3890bcbfcd99a59cde48fb..1fa3469c7634a21aab302de473bb719892c9003f 100644 (file)
--- a/ld/testsuite/ld-s390/tlsbin.rd
+++ b/ld/testsuite/ld-s390/tlsbin.rd
@@ -49,7 +49,7 @@ Program Headers:
    00 *
    01 +.interp *
    02 +.interp .hash .dynsym .dynstr .rela.dyn .rela.plt .plt .text *
-   03 +.tdata .tbss .dynamic .got *
+   03 +.tdata .dynamic .got *
    04 +.dynamic *
    05 +.tdata .tbss *
 

diff --git a/ld/testsuite/ld-s390/tlsbin_64.rd b/ld/testsuite/ld-s390/tlsbin_64.rd
index 3d28a498bab8a522ef31a93e4119697d4e4f94a6..34e96495e4a574e202326d61bf62dd65b91b39b1 100644 (file)
--- a/ld/testsuite/ld-s390/tlsbin_64.rd
+++ b/ld/testsuite/ld-s390/tlsbin_64.rd
@@ -49,7 +49,7 @@ Program Headers:
    00 *
    01 +.interp *
    02 +.interp .hash .dynsym .dynstr .rela.dyn .rela.plt .plt .text *
-   03 +.tdata .tbss .dynamic .got *
+   03 +.tdata .dynamic .got *
    04 +.dynamic *
    05 +.tdata .tbss *
 

diff --git a/ld/testsuite/ld-s390/tlspic.rd b/ld/testsuite/ld-s390/tlspic.rd
index a292790237caab255cff1af1804fcd96af1e5216..c8ddd911acee3d00a0fb46f767080b986355d12a 100644 (file)
--- a/ld/testsuite/ld-s390/tlspic.rd
+++ b/ld/testsuite/ld-s390/tlspic.rd
@@ -43,7 +43,7 @@ Program Headers:
  Section to Segment mapping:
   Segment Sections...
  +00 +.hash .dynsym .dynstr .rela.dyn .rela.plt .plt .text 
- +01 +.tdata .tbss .dynamic .got 
+ +01 +.tdata .dynamic .got 
  +02 +.dynamic 
  +03 +.tdata .tbss 
 

diff --git a/ld/testsuite/ld-s390/tlspic_64.rd b/ld/testsuite/ld-s390/tlspic_64.rd
index 125f7b932456b38133a076ddd16d339b2a7d6e9e..ec6b5a3288f7c0fdf611446e3198b0f052c5ce44 100644 (file)
--- a/ld/testsuite/ld-s390/tlspic_64.rd
+++ b/ld/testsuite/ld-s390/tlspic_64.rd
@@ -43,7 +43,7 @@ Program Headers:
  Section to Segment mapping:
   Segment Sections...
    00 +.hash .dynsym .dynstr .rela.dyn .rela.plt .plt .text *
-   01 +.tdata .tbss .dynamic .got *
+   01 +.tdata .dynamic .got *
    02 +.dynamic *
    03 +.tdata .tbss *
 

diff --git a/ld/testsuite/ld-sh/tlsbin-2.d b/ld/testsuite/ld-sh/tlsbin-2.d
index 779d8f6e510c4e6ed631cf312a97f1650c67dd85..6118071e87614ecdcdf7f75bac260c74bdced0fe 100644 (file)
--- a/ld/testsuite/ld-sh/tlsbin-2.d
+++ b/ld/testsuite/ld-sh/tlsbin-2.d
@@ -50,7 +50,7 @@ Program Headers:
    00 +
    01 +\.interp *
    02 +\.interp \.hash \.dynsym \.dynstr \.rela\.dyn \.rela\.plt \.plt \.text *
-   03 +\.tdata \.tbss \.dynamic \.got *
+   03 +\.tdata \.dynamic \.got *
    04 +\.dynamic *
    05 +\.tdata \.tbss *
 

diff --git a/ld/testsuite/ld-sh/tlspic-2.d b/ld/testsuite/ld-sh/tlspic-2.d
index 459a67a64415f8cf3582bd32fab0bd4c238fe843..70d65dac41ef96b971330448ddfca17aa3bf66b5 100644 (file)
--- a/ld/testsuite/ld-sh/tlspic-2.d
+++ b/ld/testsuite/ld-sh/tlspic-2.d
@@ -44,7 +44,7 @@ Program Headers:
  Section to Segment mapping:
   Segment Sections\.\.\.
    00 +\.hash \.dynsym \.dynstr \.rela\.dyn \.rela\.plt \.plt \.text *
-   01 +\.tdata \.tbss .dynamic \.got *
+   01 +\.tdata \.dynamic \.got *
    02 +\.dynamic *
    03 +\.tdata \.tbss *
 

diff --git a/ld/testsuite/ld-x86-64/tlsbin.rd b/ld/testsuite/ld-x86-64/tlsbin.rd
index 910c9e2d15e3fcfbfa04f9d63692cb285f11d8a8..dc3ef22b389bca26d0ead1ec4e00c91e6786178a 100644 (file)
--- a/ld/testsuite/ld-x86-64/tlsbin.rd
+++ b/ld/testsuite/ld-x86-64/tlsbin.rd
@@ -50,7 +50,7 @@ Program Headers:
    00 *
    01 +.interp *
    02 +.interp .hash .dynsym .dynstr .rela.dyn .rela.plt .plt .text *
-   03 +.tdata .tbss .dynamic .got .got.plt *
+   03 +.tdata .dynamic .got .got.plt *
    04 +.dynamic *
    05 +.tdata .tbss *
 

diff --git a/ld/testsuite/ld-x86-64/tlsbindesc.rd b/ld/testsuite/ld-x86-64/tlsbindesc.rd
index 6f5ab542c0db2532ef59c3c2ab8788bdea798709..787002d18995064fcb5931e84680f79dd846c05e 100644 (file)
--- a/ld/testsuite/ld-x86-64/tlsbindesc.rd
+++ b/ld/testsuite/ld-x86-64/tlsbindesc.rd
@@ -48,7 +48,7 @@ Program Headers:
    00 *
    01 +.interp *
    02 +.interp .hash .dynsym .dynstr .rela.dyn .text *
-   03 +.tdata .tbss .dynamic .got .got.plt *
+   03 +.tdata .dynamic .got .got.plt *
    04 +.dynamic *
    05 +.tdata .tbss *
 

diff --git a/ld/testsuite/ld-x86-64/tlsdesc.rd b/ld/testsuite/ld-x86-64/tlsdesc.rd
index 88bb0ce4d0447c2853b22e4383a3c488e9c8cf4f..e7e21ed1d75d28a2caa16f746734572f29ad5261 100644 (file)
--- a/ld/testsuite/ld-x86-64/tlsdesc.rd
+++ b/ld/testsuite/ld-x86-64/tlsdesc.rd
@@ -44,7 +44,7 @@ Program Headers:
  Section to Segment mapping:
   Segment Sections...
    00 +.hash .dynsym .dynstr .rela.dyn .rela.plt .plt .text *
-   01 +.tdata .tbss .dynamic .got .got.plt *
+   01 +.tdata .dynamic .got .got.plt *
    02 +.dynamic *
    03 +.tdata .tbss *
 

diff --git a/ld/testsuite/ld-x86-64/tlspic.rd b/ld/testsuite/ld-x86-64/tlspic.rd
index 2e680d26c732a5bf19063de3af6a7be08e39e488..286fbf2cd868df3b5b2655e62d10d87a4e122b40 100644 (file)
--- a/ld/testsuite/ld-x86-64/tlspic.rd
+++ b/ld/testsuite/ld-x86-64/tlspic.rd
@@ -44,7 +44,7 @@ Program Headers:
  Section to Segment mapping:
   Segment Sections...
    00 +.hash .dynsym .dynstr .rela.dyn .rela.plt .plt .text *
-   01 +.tdata .tbss .dynamic .got .got.plt *
+   01 +.tdata .dynamic .got .got.plt *
    02 +.dynamic *
    03 +.tdata .tbss *