about summary refs log tree commit diff
path: root/sysdeps/unix
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2012-05-22 14:24:54 -0700
committerRoland McGrath <roland@hack.frob.com>2012-05-22 14:24:54 -0700
commita6a056bba719828266eda8793e6d2842882042fe (patch)
tree7c237f2dc18012b3d5191e031c24bd2476f34866 /sysdeps/unix
parentcb191f2300ad80e722fa6d2b3be8d9c9512ce7e2 (diff)
downloadglibc-a6a056bba719828266eda8793e6d2842882042fe.tar.gz
glibc-a6a056bba719828266eda8793e6d2842882042fe.tar.xz
glibc-a6a056bba719828266eda8793e6d2842882042fe.zip
Simplify dl-vdso.h use of assert.
Diffstat (limited to 'sysdeps/unix')
-rw-r--r--sysdeps/unix/sysv/linux/dl-vdso.h12
1 files changed, 3 insertions, 9 deletions
diff --git a/sysdeps/unix/sysv/linux/dl-vdso.h b/sysdeps/unix/sysv/linux/dl-vdso.h
index 03f03788b5..c30671de72 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