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.17-599-g60bfd54


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  60bfd54cbb0c51ab95c52a7438509373b848c957 (commit)
      from  83e7640f6bf68708ecf0b09d83c670203167271e (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=60bfd54cbb0c51ab95c52a7438509373b848c957

commit 60bfd54cbb0c51ab95c52a7438509373b848c957
Author: Roland McGrath <roland@hack.frob.com>
Date:   Fri May 3 15:09:48 2013 -0700

    Fix NEED_DL_SYSINFO{,_DSO} conditionalization in _dl_sysdep_start.

diff --git a/ChangeLog b/ChangeLog
index 8bfb552..9d0eeb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-05-03  Roland McGrath  <roland@hack.frob.com>
+
+	* elf/dl-sysdep.c (_dl_sysdep_start) [NEED_DL_SYSINFO]:
+	Separately conditionalize setting of GLRO(dl_sysinfo) so
+	that the GLRO(dl_sysinfo_dso) test is under [NEED_DL_SYSINFO_DSO]
+	as well, but the actual setting is only under [NEED_DL_SYSINFO].
+
 2013-04-30  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
 	* sysdeps/unix/sysv/linux/powerpc/Versions: Add __vdso_time symbol.
diff --git a/elf/dl-sysdep.c b/elf/dl-sysdep.c
index d8f3dd2..52de23f 100644
--- a/elf/dl-sysdep.c
+++ b/elf/dl-sysdep.c
@@ -205,10 +205,15 @@ _dl_sysdep_start (void **start_argptr,
     GLRO(dl_pagesize) = __getpagesize ();
 #endif
 
-#if defined NEED_DL_SYSINFO
-  /* Only set the sysinfo value if we also have the vsyscall DSO.  */
-  if (GLRO(dl_sysinfo_dso) != 0 && new_sysinfo)
-    GLRO(dl_sysinfo) = new_sysinfo;
+#ifdef NEED_DL_SYSINFO
+  if (new_sysinfo != 0)
+    {
+# ifdef NEED_DL_SYSINFO_DSO
+      /* Only set the sysinfo value if we also have the vsyscall DSO.  */
+      if (GLRO(dl_sysinfo_dso) != 0)
+# endif
+        GLRO(dl_sysinfo) = new_sysinfo;
+    }
 #endif
 
 #ifdef DL_SYSDEP_INIT

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

Summary of changes:
 ChangeLog       |    7 +++++++
 elf/dl-sysdep.c |   13 +++++++++----
 2 files changed, 16 insertions(+), 4 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]