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.20-453-g7062bd4


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  7062bd4230a9b94adff4101af9ae6c6a0d53c6e6 (commit)
      from  07256e183efe00ed833d1f744f7eef1e103afd74 (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7062bd4230a9b94adff4101af9ae6c6a0d53c6e6

commit 7062bd4230a9b94adff4101af9ae6c6a0d53c6e6
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Tue Dec 30 14:30:37 2014 -0800

    Don't check PI_STATIC_AND_HIDDEN in i386 dl-machine.h
    
    PI_STATIC_AND_HIDDEN is always defined for i386.  There is no need to
    check PI_STATIC_AND_HIDDEN in sysdeps/i386/dl-machine.h.
    
    	[BZ #17775]
    	* sysdeps/i386/dl-machine.h (PI_STATIC_AND_HIDDEN): Removed.
    	(elf_machine_dynamic) [!PI_STATIC_AND_HIDDEN]: Likewise.
    	(elf_machine_load_address) [!PI_STATIC_AND_HIDDEN]: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 5937975..70f8675 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-12-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	[BZ #17775]
+	* sysdeps/i386/dl-machine.h (PI_STATIC_AND_HIDDEN): Removed.
+	(elf_machine_dynamic) [!PI_STATIC_AND_HIDDEN]: Likewise.
+	(elf_machine_load_address) [!PI_STATIC_AND_HIDDEN]: Likewise.
+
 2014-12-30  Andrew Senkevich  <andrew.senkevich@intel.com>
 
 	* sysdeps/i386/tls-macros.h: Include <features.h>.
diff --git a/NEWS b/NEWS
index 4a869bb..df27204 100644
--- a/NEWS
+++ b/NEWS
@@ -15,7 +15,8 @@ Version 2.21
   17522, 17555, 17570, 17571, 17572, 17573, 17574, 17581, 17582, 17583,
   17584, 17585, 17589, 17594, 17601, 17608, 17616, 17625, 17630, 17633,
   17634, 17647, 17653, 17657, 17664, 17665, 17668, 17682, 17717, 17719,
-  17722, 17723, 17724, 17725, 17732, 17733, 17744, 17745, 17746, 17747.
+  17722, 17723, 17724, 17725, 17732, 17733, 17744, 17745, 17746, 17747,
+  17775
 
 * i386 memcpy functions optimized with SSE2 unaligned load/store.
 
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
index 94a6d38..e38fae6 100644
--- a/sysdeps/i386/dl-machine.h
+++ b/sysdeps/i386/dl-machine.h
@@ -34,8 +34,6 @@ elf_machine_matches_host (const Elf32_Ehdr *ehdr)
 }
 
 
-#ifdef PI_STATIC_AND_HIDDEN
-
 /* Return the link-time address of _DYNAMIC.  Conveniently, this is the
    first element of the GOT, a special entry that is never relocated.  */
 static inline Elf32_Addr __attribute__ ((unused, const))
@@ -59,37 +57,6 @@ elf_machine_load_address (void)
   return (Elf32_Addr) &bygotoff - elf_machine_dynamic ();
 }
 
-#else  /* Without .hidden support, we can't compile the code above.  */
-
-/* Return the link-time address of _DYNAMIC.  Conveniently, this is the
-   first element of the GOT.  This must be inlined in a function which
-   uses global data.  */
-static inline Elf32_Addr __attribute__ ((unused))
-elf_machine_dynamic (void)
-{
-  register Elf32_Addr *got asm ("%ebx");
-  return *got;
-}
-
-
-/* Return the run-time load address of the shared object.  */
-static inline Elf32_Addr __attribute__ ((unused))
-elf_machine_load_address (void)
-{
-  /* It doesn't matter what variable this is, the reference never makes
-     it to assembly.  We need a dummy reference to some global variable
-     via the GOT to make sure the compiler initialized %ebx in time.  */
-  extern int _dl_argc;
-  Elf32_Addr addr;
-  asm ("leal _dl_start@GOTOFF(%%ebx), %0\n"
-       "subl _dl_start@GOT(%%ebx), %0"
-       : "=r" (addr) : "m" (_dl_argc) : "cc");
-  return addr;
-}
-
-#endif
-
-
 /* Set up the loaded object described by L so its unrelocated PLT
    entries will jump to the on-demand fixup code in dl-runtime.c.  */
 

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

Summary of changes:
 ChangeLog                 |    7 +++++++
 NEWS                      |    3 ++-
 sysdeps/i386/dl-machine.h |   33 ---------------------------------
 3 files changed, 9 insertions(+), 34 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]