diff options
| author | Rich Felker <dalias@aerifal.cx> | 2015-04-21 13:07:06 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2015-04-21 13:07:06 -0400 |
| commit | 97b72d22ad53e8f1306bf8e943571b698058f49d (patch) | |
| tree | d4bd860a6f19a339fda566bca0f04dd523a55b72 /src/ldso | |
| parent | 4bf10ebf66e0c675c549032fc72915beb92d1312 (diff) | |
| download | musl-97b72d22ad53e8f1306bf8e943571b698058f49d.tar.gz musl-97b72d22ad53e8f1306bf8e943571b698058f49d.tar.bz2 musl-97b72d22ad53e8f1306bf8e943571b698058f49d.tar.xz musl-97b72d22ad53e8f1306bf8e943571b698058f49d.zip | |
remove redundant code in do_dlsym function
commit 637dd2d383cc1f63bf02a732f03786857b22c7bd introduced the checks
for RTLD_DEFAULT and RTLD_NEXT here, claiming they fixed a regression,
but the above conditional block clearly already covered these cases,
and removing the checks produces no difference in the generated code.
Diffstat (limited to 'src/ldso')
| -rw-r--r-- | src/ldso/dynlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c index 62bfed8e..efb00496 100644 --- a/src/ldso/dynlink.c +++ b/src/ldso/dynlink.c @@ -1500,7 +1500,7 @@ static void *do_dlsym(struct dso *p, const char *s, void *ra) return __tls_get_addr((size_t []){def.dso->tls_id, def.sym->st_value}); return def.dso->base + def.sym->st_value; } - if (p != RTLD_DEFAULT && p != RTLD_NEXT && invalid_dso_handle(p)) + if (invalid_dso_handle(p)) return 0; if (p->ghashtab) { gh = gnu_hash(s); |