AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-23 03:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify dl-vdso.h use of assert.

Browse Source
This commit is contained in:
Roland McGrath 2012-05-22 14:24:54 -07:00
parent cb191f2300
commit a6a056bba7
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 2012-05-22 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/unix/sysv/linux/Makefile: Include * sysdeps/unix/sysv/linux/Makefile: Include

12
sysdeps/unix/sysv/linux/dl-vdso.h
View File

@ -1,5 +1,5 @@
/* ELF symbol resolve functions for VDSO objects. /* 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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -21,13 +21,7 @@
#include <assert.h> #include <assert.h>
#include <ldsodefs.h> #include <ldsodefs.h>
#include <dl-hash.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
/* Create version number record for lookup. */ /* Create version number record for lookup. */
#define PREPARE_VERSION(var, vname, vhash) \ #define PREPARE_VERSION(var, vname, vhash) \
@ -35,7 +29,7 @@
var.name = vname; \ var.name = vname; \
var.hidden = 1; \ var.hidden = 1; \
var.hash = vhash; \ 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. */ \ /* We don't have a specific file where the symbol can be found. */ \
var.filename = NULL var.filename = NULL