From 6f50cb0027e20134991525fa43a9b95e7640c9ed Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 21 Feb 2003 19:25:36 +0000 Subject: [PATCH] Update. * sysdeps/x86_64/dl-machine.h (elf_machine_rela) : Check for signed overflow, not unsigned. 2003-02-21 Jakub Jelinek --- ChangeLog | 5 +++++ linuxthreads/ChangeLog | 10 ++++++++++ linuxthreads/sysdeps/unix/sysv/linux/sparc/Makefile | 3 ++- .../unix/sysv/linux/sparc/sparc64/sysdep-cancel.h | 2 +- .../sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S | 11 +++++++---- linuxthreads/sysdeps/unix/sysv/linux/x86_64/Makefile | 2 +- sysdeps/x86_64/dl-machine.h | 4 ++-- 7 files changed, 28 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 93d05ab233..1e41ffbb46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-02-21 Jakub Jelinek + + * sysdeps/x86_64/dl-machine.h (elf_machine_rela) : + Check for signed overflow, not unsigned. + 2003-02-21 Jakub Jelinek * sysdeps/sparc/sparc64/elf/configure.in: New file. diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 26c0c27687..bcd5ea1b00 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,13 @@ +2003-02-21 Jakub Jelinek + + * sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S (__vfork): Call + __fork instead of branching to it if BROKEN_SPARC_WDISP22. + * sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h (PSEUDO): + Fix typo. + * sysdeps/unix/sysv/linux/sparc/Makefile (specs): Add ./ prefix + to crti.o and crtn.o. + * sysdeps/unix/sysv/linux/x86_64/Makefile (specs): Likewise. + 2003-02-21 Roland McGrath * Makefile (install-lib-ldscripts): New variable. diff --git a/linuxthreads/sysdeps/unix/sysv/linux/sparc/Makefile b/linuxthreads/sysdeps/unix/sysv/linux/sparc/Makefile index 22b3ee6c72..febed8c20e 100644 --- a/linuxthreads/sysdeps/unix/sysv/linux/sparc/Makefile +++ b/linuxthreads/sysdeps/unix/sysv/linux/sparc/Makefile @@ -6,5 +6,6 @@ before-compile += $(objpfx)specs generated += specs $(objpfx)specs: $(CC) $(CFLAGS) $(CPPFLAGS) -dumpspecs \ - | sed 's,/usr/lib\(\|64\)/\(crt[in]\.o\),\2,g' > $@ + | sed 's,\(/usr/lib\(\|64\)/\|^\|\([^/a-z]\)\)\(crt[in]\.o\),\3./\4,g' > $@.new + mv -f $@.new $@ endif diff --git a/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h index dff728a81a..5a96e7e241 100644 --- a/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h +++ b/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h @@ -30,7 +30,7 @@ .text; \ ENTRY(name) \ ld [%g7 + MULTIPLE_THREADS_OFFSET], %g1; \ - brz,pn %g1, 1f; \ + brnz,pn %g1, 1f; \ mov SYS_ify(syscall_name), %g1; \ ta 0x6d; \ bcs,pn %xcc, __syscall_error_handler; \ diff --git a/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S b/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S index f7edf44678..8a6d2771e8 100644 --- a/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S +++ b/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S @@ -34,13 +34,16 @@ ENTRY(__vfork) mov %o1, %o7 or %o2, %lo(__libc_pthread_functions), %o2 ldx [%o0 + %o2], %o2 - ldx [%o2], %o2 - cmp %o2, 0 - bne HIDDEN_JUMPTARGET(__fork) + ldx [%o2], %o0 #else .weak pthread_create sethi %hi(pthread_create), %o0 or %o0, %lo(pthread_create), %o0 +#endif +#if defined SHARED && !defined BROKEN_SPARC_WDISP22 + cmp %o0, 0 + bne HIDDEN_JUMPTARGET(__fork) +#else brnz,pn %o0, 1f #endif mov __NR_vfork, %g1 @@ -50,7 +53,7 @@ ENTRY(__vfork) sub %o1, 1, %o1 retl and %o0, %o1, %o0 -#ifndef SHARED +#if !defined SHARED || defined BROKEN_SPARC_WDISP22 1: mov %o7, %g1 call HIDDEN_JUMPTARGET(__fork) mov %g1, %o7 diff --git a/linuxthreads/sysdeps/unix/sysv/linux/x86_64/Makefile b/linuxthreads/sysdeps/unix/sysv/linux/x86_64/Makefile index f5ad5084c4..28d2e22cd3 100644 --- a/linuxthreads/sysdeps/unix/sysv/linux/x86_64/Makefile +++ b/linuxthreads/sysdeps/unix/sysv/linux/x86_64/Makefile @@ -7,6 +7,6 @@ before-compile += $(objpfx)specs generated += specs $(objpfx)specs: $(CC) $(CFLAGS) $(CPPFLAGS) -dumpspecs \ - | sed 's,/usr/lib64/\(crt[in]\.o\),\1,g' > $@.new + | sed 's,\(/usr/lib\(\|64\)/\|^\|\([^/a-z]\)\)\(crt[in]\.o\),\3./\4,g' > $@.new mv -f $@.new $@ endif diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h index afae50ac80..94eb028c81 100644 --- a/sysdeps/x86_64/dl-machine.h +++ b/sysdeps/x86_64/dl-machine.h @@ -1,5 +1,5 @@ /* Machine-dependent ELF dynamic relocation inline functions. x86-64 version. - Copyright (C) 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Andreas Jaeger . @@ -463,7 +463,7 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc, *(unsigned int *) reloc_addr = value + reloc->r_addend - (Elf64_Addr) reloc_addr; if (value + reloc->r_addend - (Elf64_Addr) reloc_addr - != (unsigned int)(value + reloc->r_addend - (Elf64_Addr) reloc_addr)) + != (int)(value + reloc->r_addend - (Elf64_Addr) reloc_addr)) { const char *strtab;