This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch, master, updated. glibc-2.15-565-g96154cd


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  96154cd892c614f13f32996ce75df1442641fb5b (commit)
      from  f8887d0a5feda97244613135822b0439addc2b1f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=96154cd892c614f13f32996ce75df1442641fb5b

commit 96154cd892c614f13f32996ce75df1442641fb5b
Author: Carlos O'Donell <carlos_odonell@mentor.com>
Date:   Sat Apr 7 09:34:45 2012 -0400

    Simplify _ELF_DYNAMIC_DO_RELOC after combining the old two defs.
    
    	* elf/dynamic-link.h (_ELF_DYNAMIC_DO_RELOC): Simplify
    	conditions and remove no longer applicable assertion.

diff --git a/ChangeLog b/ChangeLog
index 91e8361..0544a89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-07  Carlos O'Donell  <carlos_odonell@mentor.com>
+
+	* elf/dynamic-link.h (_ELF_DYNAMIC_DO_RELOC): Simplify
+	conditions and remove no longer applicable assertion.
+
 2012-04-06  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* bits/byteswap.h (__bswap_16): Removed.
diff --git a/elf/dynamic-link.h b/elf/dynamic-link.h
index 310ad5e..ef01c61 100644
--- a/elf/dynamic-link.h
+++ b/elf/dynamic-link.h
@@ -278,13 +278,7 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp)
 									      \
 	if (__builtin_expect (ranges[0].size, 1))			      \
 	  ranges[0].size = (start - ranges[0].start);			      \
-	if (! ELF_DURING_STARTUP					      \
-	    && ((do_lazy)						      \
-		/* This test does not only detect whether the relocation      \
-		   sections are in the right order, it also checks whether    \
-		   there is a DT_REL/DT_RELA section.  */		      \
-		|| __builtin_expect (ranges[0].start + ranges[0].size	      \
-				     != start, 0)))			      \
+	if (! ELF_DURING_STARTUP && ((do_lazy) || ranges[0].size == 0))	      \
 	  {								      \
 	    ranges[1].start = start;					      \
 	    ranges[1].size = (map)->l_info[DT_PLTRELSZ]->d_un.d_val;	      \
@@ -293,7 +287,6 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp)
 	else								      \
 	  {								      \
 	    /* Combine processing the sections.  */			      \
-	    assert (ranges[0].start + ranges[0].size == start);		      \
 	    ranges[0].size += (map)->l_info[DT_PLTRELSZ]->d_un.d_val;	      \
 	  }								      \
       }									      \

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog          |    5 +++++
 elf/dynamic-link.h |    9 +--------
 2 files changed, 6 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]