diff options
Diffstat (limited to 'linuxthreads/sysdeps')
4 files changed, 11 insertions, 7 deletions
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 |