diff options
author | Andreas Schwab <schwab@redhat.com> | 2010-07-02 11:21:44 +0200 |
---|---|---|
committer | Andreas Schwab <schwab@redhat.com> | 2010-07-02 11:25:12 +0200 |
commit | ce7d1719493b21690826ed0f64ab70b513f145b5 (patch) | |
tree | 267a62315efc29d8fca3d539d42674dbd5aa345b /elf | |
parent | 70d0a630700f602a457832383161d261fe222db5 (diff) | |
parent | 48b42dde17d79a0effc9ba85110aef2172e3e641 (diff) |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'elf')
-rw-r--r-- | elf/Makefile | 20 | ||||
-rw-r--r-- | elf/dl-close.c | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/elf/Makefile b/elf/Makefile index 65b6deb22e..4fbe9b5259 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -28,7 +28,7 @@ routines = $(dl-routines) dl-support dl-iteratephdr \ # The core dynamic linking functions are in libc for the static and # profiled libraries. dl-routines = $(addprefix dl-,load cache lookup object reloc deps \ - runtime error init fini debug misc \ + runtime error init fini debug misc \ version profile conflict tls origin scope \ execstack caller open close trampoline) all-dl-routines = $(dl-routines) $(sysdep-dl-routines) @@ -226,7 +226,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ neededobj5 neededobj6 firstobj globalmod1 \ unload2mod unload2dep ltglobmod1 ltglobmod2 pathoptobj \ dblloadmod1 dblloadmod2 dblloadmod3 reldepmod5 reldepmod6 \ - reldep6mod0 reldep6mod1 reldep6mod2 reldep6mod3 reldep6mod4 \ + reldep6mod0 reldep6mod1 reldep6mod2 reldep6mod3 reldep6mod4 \ reldep7mod1 reldep7mod2 \ tst-tlsmod1 tst-tlsmod2 tst-tlsmod3 tst-tlsmod4 \ tst-tlsmod5 tst-tlsmod6 tst-tlsmod7 tst-tlsmod8 \ @@ -934,11 +934,11 @@ $(objpfx)tst-dlmodcount: $(libdl) $(objpfx)tst-dlmodcount.out: $(test-modules) check-data := $(firstword $(wildcard \ - $(foreach D,$(add-ons) scripts,\ - $(patsubst %,$(..)$D/data/localplt-%.data,\ - $(abi-name) \ - $(addsuffix -$(config-os),\ - $(config-machine) \ + $(foreach D,$(add-ons) scripts,\ + $(patsubst %,$(..)$D/data/localplt-%.data,\ + $(abi-name) \ + $(addsuffix -$(config-os),\ + $(config-machine) \ $(base-machine)) \ generic)))) @@ -950,9 +950,9 @@ endif $(objpfx)check-localplt.out: $(objpfx)check-localplt \ $(common-objpfx)libc.so \ - $(common-objpfx)math/libm.so $(thread-dso) \ - $(common-objpfx)rt/librt.so \ - $(common-objpfx)dlfcn/libdl.so \ + $(common-objpfx)math/libm.so $(thread-dso) \ + $(common-objpfx)rt/librt.so \ + $(common-objpfx)dlfcn/libdl.so \ $(common-objpfx)resolv/libresolv.so \ $(common-objpfx)crypt/libcrypt.so \ $(check-data) diff --git a/elf/dl-close.c b/elf/dl-close.c index f47d5f81c5..5b54e9f2f6 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -1,5 +1,5 @@ /* Close a shared object opened by `_dl_open'. - Copyright (C) 1996-2007, 2009 Free Software Foundation, Inc. + Copyright (C) 1996-2007, 2009, 2010 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 @@ -274,7 +274,7 @@ _dl_close_worker (struct link_map *map) } #ifdef SHARED - /* Auditing checkpoint: we have a new object. */ + /* Auditing checkpoint: we remove an object. */ if (__builtin_expect (do_audit, 0)) { struct audit_ifaces *afct = GLRO(dl_audit); |