diff options
| -rw-r--r-- | ChangeLog | 27 | ||||
| -rw-r--r-- | elf/Makefile | 17 | ||||
| -rw-r--r-- | elf/dl-close.c | 30 | ||||
| -rw-r--r-- | elf/tst-global1.c | 36 | ||||
| -rw-r--r-- | elf/unload3.c | 41 | ||||
| -rw-r--r-- | elf/unload3mod1.c | 1 | ||||
| -rw-r--r-- | elf/unload3mod2.c | 1 | ||||
| -rw-r--r-- | elf/unload3mod3.c | 8 | ||||
| -rw-r--r-- | elf/unload3mod4.c | 11 | ||||
| -rw-r--r-- | fedora/branch.mk | 4 | ||||
| -rw-r--r-- | iconv/iconvconfig.c | 13 | ||||
| -rw-r--r-- | include/features.h | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/sys/procfs.h | 11 |
13 files changed, 154 insertions, 48 deletions
diff --git a/ChangeLog b/ChangeLog index 4f384b53c3..680ade5a60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,30 @@ +2005-03-01 H.J. Lu <hongjiu.lu@intel.com> + + [BZ #776] + * iconv/iconvconfig.c: Fix comment for the output file. + (write_output): Clear padding in header. + +2005-03-03 Ulrich Drepper <drepper@redhat.com> + + * elf/dl-close.c (_dl_close): Don't try to set up new searchpath if the + loader is closed. Fixes unload3. + * elf/tst-global1.c: New file. + * elf/Makefile (tests): Add tst-global1. + +2005-03-03 Jakub Jelinek <jakub@redhat.com> + + * elf/Makefile: Add rules to build and run unload3 test. + * elf/unload3.c: New test. + * elf/unload3mod1.c: New file. + * elf/unload3mod2.c: New file. + * elf/unload3mod3.c: New file. + * elf/unload3mod4.c: New file. + +2005-02-21 Alan Modra <amodra@bigpond.net.au> + + * sysdeps/unix/sysv/linux/powerpc/sys/procfs.h (elf_vrreg_t): Don't + use __uint128_t. + 2005-03-01 Jakub Jelinek <jakub@redhat.com> * posix/bits/unistd.h (read, pread, pread64): Use __bos0 instead diff --git a/elf/Makefile b/elf/Makefile index 8a8bb3a239..6822d1f02c 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -84,6 +84,7 @@ distribute := rtld-Rules \ tst-execstack-mod.c tst-dlmodcount.c \ check-textrel.c dl-sysdep.h test-dlopenrpathmod.c \ tst-deep1mod1.c tst-deep1mod2.c tst-deep1mod3.c \ + unload3mod1.c unload3mod2.c unload3mod3.c unload3mod4.c \ tst-auditmod1.c CFLAGS-dl-runtime.c = -fexceptions -fasynchronous-unwind-tables @@ -159,7 +160,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \ tst-tls10 tst-tls11 tst-tls12 tst-tls13 tst-tls14 tst-align \ tst-align2 $(tests-execstack-$(have-z-execstack)) tst-dlmodcount \ tst-dlopenrpath tst-deep1 tst-dlmopen1 tst-dlmopen2 tst-dlmopen3 \ - tst-audit1 + unload3 tst-audit1 tst-global1 # reldep9 test-srcs = tst-pathopt tests-vis-yes = vismain @@ -194,7 +195,8 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ tst-alignmod tst-alignmod2 \ $(modules-execstack-$(have-z-execstack)) \ tst-dlopenrpathmod tst-deep1mod1 tst-deep1mod2 tst-deep1mod3 \ - tst-dlmopen1mod tst-auditmod1 + tst-dlmopen1mod tst-auditmod1 \ + unload3mod1 unload3mod2 unload3mod3 unload3mod4 ifeq (yes,$(have-initfini-array)) modules-names += tst-array2dep endif @@ -426,6 +428,9 @@ $(objpfx)reldep8mod3.so: $(objpfx)reldep8mod1.so $(objpfx)reldep8mod2.so $(objpfx)nodel2mod3.so: $(objpfx)nodel2mod1.so $(objpfx)nodel2mod2.so $(objpfx)reldep9mod2.so: $(objpfx)reldep9mod1.so $(objpfx)reldep9mod3.so: $(objpfx)reldep9mod1.so $(objpfx)reldep9mod2.so +$(objpfx)unload3mod1.so: $(objpfx)unload3mod3.so +$(objpfx)unload3mod2.so: $(objpfx)unload3mod3.so +$(objpfx)unload3mod3.so: $(objpfx)unload3mod4.so LDFLAGS-tst-tlsmod5.so = -nostdlib LDFLAGS-tst-tlsmod6.so = -nostdlib @@ -465,6 +470,7 @@ circlemod3.so-no-z-defs = yes circlemod3a.so-no-z-defs = yes reldep8mod2.so-no-z-defs = yes reldep9mod1.so-no-z-defs = yes +unload3mod4.so-no-z-defs = yes # filtmod1.so has a special rule $(filter-out $(objpfx)filtmod1.so, $(test-modules)): $(objpfx)%.so: $(objpfx)%.os @@ -681,6 +687,10 @@ $(objpfx)tst-align: $(libdl) $(objpfx)tst-align.out: $(objpfx)tst-alignmod.so $(objpfx)tst-align2: $(objpfx)tst-alignmod2.so +$(objpfx)unload3: $(libdl) +$(objpfx)unload3.out: $(objpfx)unload3mod1.so $(objpfx)unload3mod2.so \ + $(objpfx)unload3mod3.so $(objpfx)unload3mod4.so + ifdef libdl $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so @@ -791,3 +801,6 @@ $(objpfx)tst-dlmopen3.out: $(objpfx)tst-dlmopen1mod.so $(objpfx)tst-audit1.out: $(objpfx)tst-auditmod1.so tst-audit1-ENV = LD_AUDIT=$(objpfx)tst-auditmod1.so + +$(objpfx)tst-global1: $(libdl) +$(objpfx)tst-global1.out: $(objpfx)testobj6.so $(objpfx)testobj2.so diff --git a/elf/dl-close.c b/elf/dl-close.c index eb5e805dd4..7ad486a5a2 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -351,36 +351,6 @@ _dl_close (void *_map) } assert (found); } - else if (new_opencount[i] != 0 && imap->l_type == lt_loaded - && imap->l_searchlist.r_list == NULL - && imap->l_initfini != NULL) - { - /* The object is still used. But the object we are - unloading right now is responsible for loading it. If - the current object does not have it's own scope yet we - have to create one. This has to be done before running - the finalizers. - - To do this count the number of dependencies. */ - unsigned int cnt; - for (cnt = 1; imap->l_initfini[cnt] != NULL; ++cnt) - if (imap->l_initfini[cnt]->l_idx >= i - && imap->l_initfini[cnt]->l_idx < nopencount) - ++new_opencount[imap->l_initfini[cnt]->l_idx]; - else - ++imap->l_initfini[cnt]->l_opencount; - - /* We simply reuse the l_initfini list. */ - imap->l_searchlist.r_list = &imap->l_initfini[cnt + 1]; - imap->l_searchlist.r_nlist = cnt; - - for (cnt = 0; imap->l_scope[cnt] != NULL; ++cnt) - if (imap->l_scope[cnt] == &map->l_searchlist) - { - imap->l_scope[cnt] = &imap->l_searchlist; - break; - } - } /* Store the new l_opencount value. */ imap->l_opencount = new_opencount[i]; diff --git a/elf/tst-global1.c b/elf/tst-global1.c new file mode 100644 index 0000000000..1611b51b67 --- /dev/null +++ b/elf/tst-global1.c @@ -0,0 +1,36 @@ +#include <dlfcn.h> +#include <stdio.h> + +int +main (void) +{ + void *h1 = dlopen ("$ORIGIN/testobj6.so", RTLD_GLOBAL|RTLD_LAZY); + if (h1 == NULL) + { + puts ("cannot open testobj6"); + return 1; + } + + void *h2 = dlopen ("$ORIGIN/testobj2.so", + RTLD_GLOBAL|RTLD_DEEPBIND|RTLD_LAZY); + if (h2 == NULL) + { + puts ("cannot open testobj2"); + return 1; + } + + dlclose (h1); + + void (*f) (void) = dlsym (h2, "p"); + if (f == NULL) + { + puts ("cannot find p"); + return 1; + } + + f (); + + dlclose (h2); + + return 0; +} diff --git a/elf/unload3.c b/elf/unload3.c new file mode 100644 index 0000000000..6f1af707e6 --- /dev/null +++ b/elf/unload3.c @@ -0,0 +1,41 @@ +#include <dlfcn.h> +#include <stdio.h> + +int +main (void) +{ + void *g = dlopen ("unload3mod1.so", RTLD_GLOBAL | RTLD_NOW); + void *h = dlopen ("unload3mod2.so", RTLD_GLOBAL | RTLD_NOW); + if (g == NULL || h == NULL) + { + printf ("dlopen unload3mod{1,2}.so failed: %p %p\n", g, h); + return 1; + } + dlclose (h); + dlclose (g); + + g = dlopen ("unload3mod3.so", RTLD_GLOBAL | RTLD_NOW); + h = dlopen ("unload3mod4.so", RTLD_GLOBAL | RTLD_NOW); + if (g == NULL || h == NULL) + { + printf ("dlopen unload3mod{3,4}.so failed: %p %p\n", g, h); + return 1; + } + + int (*fn) (int); + fn = dlsym (h, "bar"); + if (fn == NULL) + { + puts ("dlsym failed"); + return 1; + } + + int val = fn (16); + if (val != 24) + { + printf ("bar returned %d != 24\n", val); + return 1; + } + + return 0; +} diff --git a/elf/unload3mod1.c b/elf/unload3mod1.c new file mode 100644 index 0000000000..e886b11c18 --- /dev/null +++ b/elf/unload3mod1.c @@ -0,0 +1 @@ +int dummy1; diff --git a/elf/unload3mod2.c b/elf/unload3mod2.c new file mode 100644 index 0000000000..03252a523b --- /dev/null +++ b/elf/unload3mod2.c @@ -0,0 +1 @@ +int dummy2; diff --git a/elf/unload3mod3.c b/elf/unload3mod3.c new file mode 100644 index 0000000000..046022c55d --- /dev/null +++ b/elf/unload3mod3.c @@ -0,0 +1,8 @@ +#include <stdio.h> + +int +foo (int x) +{ + puts ("foo"); + return x * 2; +} diff --git a/elf/unload3mod4.c b/elf/unload3mod4.c new file mode 100644 index 0000000000..4586ff7383 --- /dev/null +++ b/elf/unload3mod4.c @@ -0,0 +1,11 @@ +#include <stdio.h> + +int +bar (int x) +{ + puts ("bar"); + fflush (stdout); + x = foo (x - 4); + puts ("bar after foo"); + return x; +} diff --git a/fedora/branch.mk b/fedora/branch.mk index f528e06674..5b377a492e 100644 --- a/fedora/branch.mk +++ b/fedora/branch.mk @@ -1,5 +1,5 @@ # This file is updated automatically by Makefile. glibc-branch := fedora glibc-base := HEAD -fedora-sync-date := 2005-03-02 18:20 UTC -fedora-sync-tag := fedora-glibc-20050302T1820 +fedora-sync-date := 2005-03-03 13:35 UTC +fedora-sync-tag := fedora-glibc-20050303T1335 diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c index 8c56d29bb0..df66f11f08 100644 --- a/iconv/iconvconfig.c +++ b/iconv/iconvconfig.c @@ -985,11 +985,11 @@ next_prime (uint32_t seed) Offset Length Description 0000 4 Magic header bytes - 0004 4 Offset of string table (stoff) - 0008 4 Offset of name hashing table (hoff) - 000C 4 Hashing table size (hsize) - 0010 4 Offset of module table (moff) - 0014 4 Offset of other conversion module table (ooff) + 0004 2 Offset of string table (stoff) + 0006 2 Offset of name hashing table (hoff) + 0008 2 Hashing table size (hsize) + 000A 2 Offset of module table (moff) + 000C 2 Offset of other conversion module table (ooff) stoff ??? String table @@ -1179,6 +1179,9 @@ write_output (void) } } + /* Clear padding. */ + memset (&header, 0, sizeof (struct gconvcache_header)); + header.magic = GCONVCACHE_MAGIC; iov[0].iov_base = &header; diff --git a/include/features.h b/include/features.h index cb0844ddda..a191d803b6 100644 --- a/include/features.h +++ b/include/features.h @@ -295,7 +295,7 @@ /* Major and minor version number of the GNU C library package. Use these macros to test for features in specific releases. */ #define __GLIBC__ 2 -#define __GLIBC_MINOR__ 4 +#define __GLIBC_MINOR__ 3 #define __GLIBC_PREREQ(maj, min) \ ((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min)) diff --git a/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h b/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h index 8e694c2ad3..bb9a08b3f6 100644 --- a/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h +++ b/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h @@ -46,15 +46,10 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG]; typedef double elf_fpreg_t; typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG]; -/* gcc 3.1 and newer support __uint128_t. */ -#if !__GNUC_PREREQ(3,1) -typedef struct { - unsigned long u[4]; -} __attribute((aligned(16))) __uint128_t; -#endif - /* Altivec registers */ -typedef __uint128_t elf_vrreg_t; +typedef struct { + unsigned int u[4]; +} __attribute__ ((aligned (16))) elf_vrreg_t; typedef elf_vrreg_t elf_vrregset_t[ELF_NVRREG]; #endif |