diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-08-20 19:50:45 +0200 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-08-20 19:50:45 +0200 |
commit | 4dd9e35bfd35d3138bc44169baba098005bad51e (patch) | |
tree | a4939c43a9c3fe00eb27f023e14acc5e1fe8808c /dlfcn/dlmopen.c | |
parent | bd42a4599d1b6f77bcfe1e4f67b7cbd9e1cb2dfd (diff) | |
parent | f76453c31593957fec1a99b986bfa5506618b79c (diff) |
Merge commit 'refs/top-bases/t/bigmem' into t/bigmem
Diffstat (limited to 'dlfcn/dlmopen.c')
-rw-r--r-- | dlfcn/dlmopen.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dlfcn/dlmopen.c b/dlfcn/dlmopen.c index 1e2cbcfdb4..38dca7abc8 100644 --- a/dlfcn/dlmopen.c +++ b/dlfcn/dlmopen.c @@ -1,5 +1,5 @@ /* Load a shared object at run time. - Copyright (C) 1995-2014 Free Software Foundation, Inc. + Copyright (C) 1995-2015 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 @@ -23,7 +23,7 @@ #include <unistd.h> #include <ldsodefs.h> -#if !defined SHARED && defined IS_IN_libdl +#if !defined SHARED && IS_IN (libdl) void * dlmopen (Lmid_t nsid, const char *file, int mode) @@ -64,7 +64,7 @@ dlmopen_doit (void *a) /* It makes no sense to use RTLD_GLOBAL when loading a DSO into a namespace other than the base namespace. */ - if (__builtin_expect (args->mode & RTLD_GLOBAL, 0)) + if (__glibc_unlikely (args->mode & RTLD_GLOBAL)) GLRO(dl_signal_error) (EINVAL, NULL, NULL, N_("invalid mode")); } @@ -79,7 +79,7 @@ void * __dlmopen (Lmid_t nsid, const char *file, int mode DL_CALLER_DECL) { # ifdef SHARED - if (__builtin_expect (_dlfcn_hook != NULL, 0)) + if (__glibc_unlikely (_dlfcn_hook != NULL)) return _dlfcn_hook->dlmopen (nsid, file, mode, RETURN_ADDRESS (0)); # endif |