diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2008-06-20 09:26:44 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2008-06-20 09:26:44 +0000 |
| commit | ff3e6f618d2dd1ec6887d2f3622f20889f876e1e (patch) | |
| tree | 7bd685e3543aea58e3047c5ef60fa7a841ab0e73 /libc/elf | |
| parent | 96b85b5d0e370abaab4bf2d9129b6ad29d69e77a (diff) | |
Merge changes between r6192 and r6403 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@6404 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/elf')
| -rw-r--r-- | libc/elf/Makefile | 12 | ||||
| -rw-r--r-- | libc/elf/soinit.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libc/elf/Makefile b/libc/elf/Makefile index efe8942e6..e4f693f0e 100644 --- a/libc/elf/Makefile +++ b/libc/elf/Makefile @@ -847,10 +847,14 @@ $(objpfx)tst-dlmodcount: $(libdl) $(objpfx)tst-dlmodcount.out: $(test-modules) check-data := $(firstword $(wildcard \ - $(patsubst %,../scripts/data/localplt-%.data,\ - $(addsuffix -$(config-os),\ - $(config-machine) $(base-machine))\ - generic))) + $(foreach D,$(add-ons) scripts/data,\ + $(patsubst %,$(..)$D/localplt-%.data,\ + $(abi-name) \ + $(addsuffix -$(config-os),\ + $(config-machine) \ + $(base-machine)) \ + generic)))) + tests: $(objpfx)check-localplt.out ifeq ($(have-thread-library),yes) diff --git a/libc/elf/soinit.c b/libc/elf/soinit.c index c0a881ef5..6fecbb567 100644 --- a/libc/elf/soinit.c +++ b/libc/elf/soinit.c @@ -20,10 +20,6 @@ run_hooks (void (*const list[]) (void)) (**list) (); } -static const char __EH_FRAME_BEGIN__[] - __attribute__ ((used, section (".eh_frame"))) - = { }; - /* This function will be called from _init in init-first.c. */ void __libc_global_ctors (void) |