From 71213dc2589554dc8f8061e9b04e80c55d098b6a Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 5 Sep 2006 02:02:55 +0000 Subject: * Makerules (shlib.lds): If have-hash-style, put .hash section at the end of the RO segment. 2006-09-04 Ulrich Drepper * elf/do-lookup.h (do_lookup_x): Initialize symidx in case the new style hash table format is used. 2006-09-04 Jakub Jelinek --- ChangeLog | 10 ++++++++++ Makerules | 8 +++++++- elf/do-lookup.h | 2 ++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 644f5ce837..0852a3cf5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2006-09-04 Jakub Jelinek + + * Makerules (shlib.lds): If have-hash-style, put .hash section + at the end of the RO segment. + +2006-09-04 Ulrich Drepper + + * elf/do-lookup.h (do_lookup_x): Initialize symidx in case the new + style hash table format is used. + 2006-09-04 Jakub Jelinek * resolv/res_mkquery.c (res_nmkquery): Set hp->id to statp->id after diff --git a/Makerules b/Makerules index f50f7a4884..b0be86b368 100644 --- a/Makerules +++ b/Makerules @@ -487,7 +487,13 @@ $(common-objpfx)shlib.lds: $(common-objpfx)config.make $(..)Makerules -Wl,--verbose 2>&1 | \ sed > $@T \ -e '/^=========/,/^=========/!d;/^=========/d' \ - -e 's/^.*\.hash[ ]*:.*$$/ .note.ABI-tag : { *(.note.ABI-tag) } &/' \ + $(if $(filter yes,$(have-hash-style)), \ + -e 's/^.*\.gnu\.hash[ ]*:.*$$/ .note.ABI-tag : { *(.note.ABI-tag) } &/' \ + -e '/^[ ]*\.hash[ ]*:.*$$/{h;d;}' \ + -e '/DATA_SEGMENT_ALIGN/{H;g}' \ + , \ + -e 's/^.*\.hash[ ]*:.*$$/ .note.ABI-tag : { *(.note.ABI-tag) } &/' \ + ) \ -e 's/^.*\*(\.dynbss).*$$/& \ PROVIDE(__start___libc_freeres_ptrs = .); \ *(__libc_freeres_ptrs) \ diff --git a/elf/do-lookup.h b/elf/do-lookup.h index f40ab9d8d4..2585d83005 100644 --- a/elf/do-lookup.h +++ b/elf/do-lookup.h @@ -195,6 +195,8 @@ do_lookup_x (const char *undef_name, uint_fast32_t new_hash, while ((*hasharr++ & 1u) == 0); } } + /* No symbol found. */ + symidx = SHN_UNDEF; } else { -- cgit v1.2.3