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-1015-ga6a056b


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  a6a056bba719828266eda8793e6d2842882042fe (commit)
      from  cb191f2300ad80e722fa6d2b3be8d9c9512ce7e2 (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=a6a056bba719828266eda8793e6d2842882042fe

commit a6a056bba719828266eda8793e6d2842882042fe
Author: Roland McGrath <roland@hack.frob.com>
Date:   Tue May 22 14:24:54 2012 -0700

    Simplify dl-vdso.h use of assert.

diff --git a/ChangeLog b/ChangeLog
index 9212a03..c487caf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-22  Roland McGrath  <roland@hack.frob.com>
+
+	* sysdeps/unix/sysv/linux/dl-vdso.h (CHECK_HASH): Macro removed.
+	(PREPARE_VERSION): Just use assert instead, it will be elided
+	under [NDEBUG] anyway.
+
 2012-05-22  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/unix/sysv/linux/Makefile: Include
diff --git a/sysdeps/unix/sysv/linux/dl-vdso.h b/sysdeps/unix/sysv/linux/dl-vdso.h
index 03f0378..c30671d 100644
--- a/sysdeps/unix/sysv/linux/dl-vdso.h
+++ b/sysdeps/unix/sysv/linux/dl-vdso.h
@@ -1,5 +1,5 @@
 /* ELF symbol resolve functions for VDSO objects.
-   Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2005-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -21,13 +21,7 @@
 
 #include <assert.h>
 #include <ldsodefs.h>
-
-#ifdef NDEBUG
-# define CHECK_HASH(var) do {} while (0)
-#else
-# include <dl-hash.h>
-# define CHECK_HASH(var) assert (var.hash == _dl_elf_hash (var.name))
-#endif
+#include <dl-hash.h>
 
 /* Create version number record for lookup.  */
 #define PREPARE_VERSION(var, vname, vhash) \
@@ -35,7 +29,7 @@
   var.name = vname;							      \
   var.hidden = 1;							      \
   var.hash = vhash;							      \
-  CHECK_HASH (var);							      \
+  assert (var.hash == _dl_elf_hash (var.name));				      \
   /* We don't have a specific file where the symbol can be found.  */	      \
   var.filename = NULL
 

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

Summary of changes:
 ChangeLog                         |    6 ++++++
 sysdeps/unix/sysv/linux/dl-vdso.h |   12 +++---------
 2 files changed, 9 insertions(+), 9 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]