diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2005-02-08 22:32:37 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2005-02-08 22:32:37 +0000 |
| commit | 0bac9ce531431289734ffc3609ad6aa7a3e89039 (patch) | |
| tree | 01cf1edaadfae9da25981fb9bedcd0a4b8aceed1 | |
| parent | d585b66fa4d11059948f466c9080a6826932358d (diff) | |
| download | glibc-0bac9ce531431289734ffc3609ad6aa7a3e89039.tar.gz glibc-0bac9ce531431289734ffc3609ad6aa7a3e89039.tar.xz glibc-0bac9ce531431289734ffc3609ad6aa7a3e89039.zip | |
Updated to fedora-glibc-20050208T2213 cvs/fedora-glibc-2_3_4-7
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | elf/dl-load.c | 2 | ||||
| -rw-r--r-- | fedora/branch.mk | 4 | ||||
| -rw-r--r-- | fedora/glibc.spec.in | 8 | ||||
| -rw-r--r-- | sysdeps/m68k/dl-machine.h | 7 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/dl-lookupcfg.h | 0 |
6 files changed, 18 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog index ba9d876327..a79fdbe8a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-02-08 Jakub Jelinek <jakub@redhat.com> + + * elf/dl-load.c (_dl_map_object_from_fd): Fix a typo. + +2005-02-08 Andreas Schwab <schwab@suse.de> + + * sysdeps/m68k/dl-machine.h (elf_machine_rela): Remove use of + RESOLVE. + 2005-02-07 Richard Henderson <rth@redhat.com> * iconvdata/jis0208.h (struct jisx0208_ucs_idx): Move before use. diff --git a/elf/dl-load.c b/elf/dl-load.c index f307dada2e..088b2224e2 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1084,7 +1084,7 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp, } # ifdef SHARED - if (l->l_prev == NULL || (mode && __RTLD_AUDIT) != 0) + if (l->l_prev == NULL || (mode & __RTLD_AUDIT) != 0) /* We are loading the executable itself when the dynamic linker was executed directly. The setup will happen later. */ break; diff --git a/fedora/branch.mk b/fedora/branch.mk index 96a37d0f31..10a2e2b6a4 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-02-08 09:48 UTC -fedora-sync-tag := fedora-glibc-20050208T0948 +fedora-sync-date := 2005-02-08 22:13 UTC +fedora-sync-tag := fedora-glibc-20050208T2213 diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in index f508a0dae2..e00d5c6bc1 100644 --- a/fedora/glibc.spec.in +++ b/fedora/glibc.spec.in @@ -1,4 +1,4 @@ -%define glibcrelease 6 +%define glibcrelease 7 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64 @@ -10,7 +10,7 @@ Summary: The GNU libc libraries. Name: glibc Version: %{glibcversion} Release: %{glibcrelease} -Copyright: LGPL +License: LGPL Group: System Environment/Libraries %define glibcsrcdir %{name}-%{glibcdate} Source0: %{glibcsrcdir}.tar.bz2 @@ -1270,6 +1270,10 @@ rm -f *.filelist* %endif %changelog +* Tue Feb 8 2005 Jakub Jelinek <jakub@redhat.com> 2.3.4-7 +- update from CVS + - fix TLS handling in linuxthreads + * Tue Feb 8 2005 Jakub Jelinek <jakub@redhat.com> 2.3.4-6 - update from CVS - ld.so auditing diff --git a/sysdeps/m68k/dl-machine.h b/sysdeps/m68k/dl-machine.h index 89d7106365..f31b68772d 100644 --- a/sysdeps/m68k/dl-machine.h +++ b/sysdeps/m68k/dl-machine.h @@ -211,15 +211,8 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, else { const Elf32_Sym *const refsym = sym; -#ifndef RTLD_BOOTSTRAP struct link_map *sym_map = RESOLVE_MAP (&sym, version, r_type); Elf32_Addr value = sym == NULL ? 0 : sym_map->l_addr + sym->st_value; -#else - Elf32_Addr value = RESOLVE (&sym, version, r_type); - - if (sym) - value += sym->st_value; -#endif /* !RTLD_BOOTSTRAP */ switch (r_type) { diff --git a/sysdeps/powerpc/powerpc64/dl-lookupcfg.h b/sysdeps/powerpc/powerpc64/dl-lookupcfg.h deleted file mode 100644 index e69de29bb2..0000000000 --- a/sysdeps/powerpc/powerpc64/dl-lookupcfg.h +++ /dev/null |