diff options
32 files changed, 1660 insertions, 358 deletions
@@ -1,3 +1,84 @@ +2004-02-13 Steven Munroe <sjmunroe@us.ibm.com> + + * sysdeps/powerpc/powerpc64/__longjmp-common.S: New file. + * sysdeps/powerpc/powerpc64/__longjmp.S [NOT_IN_libc](__longjmp): + Non-versioned __longjmp for rtld-__longjmp. + [!NOT_IN_libc](__vmx__longjmp): Add VMX reg support and define as + default version of __longjmp. + [SHARED && SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_3_4)] + (__novmx__longjmp): Original version of __longjmp. + * sysdeps/powerpc/powerpc64/bsd-_setjmp.S [NOT_IN_libc](_setjmp): + Non-versioned _setjmp for rtld-_setjmp. + [!NOT_IN_libc](__vmx_setjmp): Branch to __vmx__sigsetjmp and define + as default version of _setjmp. + [SHARED && SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_3_4)] + (__novmx_setjmp): Original version of _setjmp. + * sysdeps/powerpc/powerpc64/bsd-setjmp.S (__vmxsetjmp): Branch to + __vmx__sigsetjmp and define as default version of setjmp. + [SHARED && SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_3_4)] + (__novmxsetjmp): Original version of setjmp. + * sysdeps/powerpc/powerpc64/setjmp-common.S: New file. + * sysdeps/powerpc/powerpc64/setjmp.S [NOT_IN_libc](__setjmp): + Non-versioned __sigsetjmp for rtld-setjmp. + [!NOT_IN_libc](__vmx__sigsetjmp): Add VMX reg support and define + as default version of __sigsetjmp. + [SHARED && SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_3_4)] + (__novmx__sigsetjmp): Original version of __sigsetjmp. + + * sysdeps/powerpc/powerpc32/__longjmp-common.S: New File + * sysdeps/powerpc/powerpc32/__longjmp.S [NOT_IN_libc](__longjmp): + Non-versioned __longjmp for rtld-__longjmp. + [!NOT_IN_libc](__vmx__longjmp): Add VMX reg support and define as + default version of __longjmp. + [SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)] + (__novmx__longjmp): Original version of __longjmp. + * sysdeps/powerpc/powerpc32/bsd-_setjmp.S [NOT_IN_libc](_setjmp): + Non-versioned _setjmp for rtld-_setjmp. + [!NOT_IN_libc](__vmx_setjmp): Branch to __vmx__sigsetjmp and define + as default version of _setjmp. + [SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)] + (__novmx_setjmp): Original version of _setjmp. + * sysdeps/powerpc/powerpc32/bsd-setjmp.S (__vmxsetjmp): Branch to + __vmx__sigsetjmp and define as default version of setjmp. + [SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)] + (__novmxsetjmp): Original version of setjmp. + * sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S: New file. + * sysdeps/powerpc/powerpc32/fpu/__longjmp.S [NOT_IN_libc](__longjmp): + Non-versioned __longjmp for rtld-__longjmp. + [!NOT_IN_libc](__vmx__longjmp): Add VMX reg support and define as + default version of __longjmp. + [SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)] + (__novmx__longjmp): Original version of __longjmp. + * sysdeps/powerpc/powerpc32/fpu/setjmp-common.S: New file. + * sysdeps/powerpc/powerpc32/fpu/setjmp.S [NOT_IN_libc](__setjmp): + Non-versioned __sigsetjmp for rtld-setjmp. + [!NOT_IN_libc](__vmx__sigsetjmp): Add VMX reg support and define + as default version of __sigsetjmp. + [SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)] + (__novmx__sigsetjmp): Original version of __sigsetjmp. + * sysdeps/powerpc/powerpc32/setjmp-common.S: New file. + * sysdeps/powerpc/powerpc32/setjmp.S [NOT_IN_libc](__setjmp): + Non-versioned __sigsetjmp for rtld-setjmp. + [!NOT_IN_libc](__vmx__sigsetjmp): Add VMX reg support and define + as default version of __sigsetjmp. + [SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)] + (__novmx__sigsetjmp): Original version of __sigsetjmp. + + * sysdeps/powerpc/Dist: New File. + * sysdeps/powerpc/Makefile (sysdep_routines): Add novmx-longjmp.c + and novmx-sigjmp.c + * sysdeps/powerpc/Versions (libc): To GLIBC_2.3_4 add _longjmp, + __sigsetjmp, _setjmp, longjmp, and setjmp. To GLIBC_PRIVATE add + __novmx__libc_longjmp, __novmx__libc_siglongjmp, __vmx__libc_longjmp, + and __vmx__libc_siglongjmp. + * sysdeps/powerpc/bits/setjmp.h: Define JB_VRSAVE, JB_VRS, and adjust + JB_SIZE to add VMX regs to __jmp_buf. + * sysdeps/powerpc/longjmp.c: New file. + * sysdeps/powerpc/novmxsetjmp.h: New file. + * sysdeps/powerpc/novmx-longjmp.c: New file. + * sysdeps/powerpc/novmx-sigjmp.c: New file. + * sysdeps/powerpc/sigjmp.c: New file. + 2004-02-13 Jakub Jelinek <jakub@redhat.com> * sysdeps/powerpc/powerpc64/fpu/s_llrintf.c (__lrintf, lrintf): diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 827fdd9f97..b783ddc528 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,13 @@ +2004-02-10 Steven Munroe <sjmunroe@us.ibm.com> + + * Makefile (libpthread-routines): Add ptcleanup. + * ptlongjmp.c: Removed. + * ptcleanup.c: Copied __pthread_cleanup_upto to here. New file. + * sysdeps/pthread/ptlongjmp.c: Copied longjmp to here. New file. + * sysdeps/unix/sysv/linux/powerpc/Versions: New file. + Version longjmp, siglongjmp for GLIBC_2.3.4. + * sysdeps/unix/sysv/linux/powerpc/ptlongjmp.c: New File. + 2004-01-22 Andreas Jaeger <aj@suse.de> * spinlock.c (__pthread_lock): Fix contraint to avoid warning. diff --git a/linuxthreads/Makefile b/linuxthreads/Makefile index 7b2e1048da..201440076f 100644 --- a/linuxthreads/Makefile +++ b/linuxthreads/Makefile @@ -49,7 +49,8 @@ libpthread-routines := attr cancel condvar join manager mutex ptfork \ ptw-lseek64 ptw-llseek ptw-msync ptw-nanosleep \ ptw-open ptw-open64 ptw-pause ptw-pread ptw-pread64 \ ptw-pwrite ptw-pwrite64 ptw-tcdrain ptw-wait \ - ptw-waitpid pt-system old_pthread_atfork pthread_atfork + ptw-waitpid pt-system old_pthread_atfork pthread_atfork \ + ptcleanup # Don't generate deps for calls with no sources. See sysdeps/unix/Makefile. omit-deps = $(unix-syscalls:%=ptw-%) diff --git a/linuxthreads/ptlongjmp.c b/linuxthreads/ptcleanup.c index c89d28bccd..9fde2555b1 100644 --- a/linuxthreads/ptlongjmp.c +++ b/linuxthreads/ptcleanup.c @@ -1,6 +1,6 @@ /* Linuxthreads - a simple clone()-based implementation of Posix */ /* threads for Linux. */ -/* Copyright (C) 1998 Xavier Leroy (Xavier.Leroy@inria.fr) */ +/* Copyright (C) 1998, 2004 Xavier Leroy (Xavier.Leroy@inria.fr) */ /* */ /* This program is free software; you can redistribute it and/or */ /* modify it under the terms of the GNU Library General Public License */ @@ -19,14 +19,6 @@ #include "pthread.h" #include "internals.h" -/* These functions are not declared anywhere since they shouldn't be - used at another place but here. */ -extern void __libc_siglongjmp (sigjmp_buf env, int val) - __attribute__ ((noreturn)); -extern void __libc_longjmp (sigjmp_buf env, int val) - __attribute__ ((noreturn)); - - void __pthread_cleanup_upto (__jmp_buf target, char *targetframe) { pthread_descr self = thread_self(); @@ -58,15 +50,3 @@ void __pthread_cleanup_upto (__jmp_buf target, char *targetframe) && _JMPBUF_UNWINDS(target, THREAD_GETMEM(self, p_in_sighandler))) THREAD_SETMEM(self, p_in_sighandler, NULL); } - -#ifdef SHARED -void siglongjmp (sigjmp_buf env, int val) -{ - __libc_siglongjmp (env, val); -} - -void longjmp (jmp_buf env, int val) -{ - __libc_longjmp (env, val); -} -#endif diff --git a/linuxthreads/sysdeps/pthread/ptlongjmp.c b/linuxthreads/sysdeps/pthread/ptlongjmp.c new file mode 100644 index 0000000000..a2a56b8d9c --- /dev/null +++ b/linuxthreads/sysdeps/pthread/ptlongjmp.c @@ -0,0 +1,39 @@ +/* Linuxthreads - a simple clone()-based implementation of Posix */ +/* threads for Linux. */ +/* Copyright (C) 1998 Xavier Leroy (Xavier.Leroy@inria.fr) */ +/* */ +/* This program is free software; you can redistribute it and/or */ +/* modify it under the terms of the GNU Library General Public License */ +/* as published by the Free Software Foundation; either version 2 */ +/* of the License, or (at your option) any later version. */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU Library General Public License for more details. */ + +/* Redefine siglongjmp and longjmp so that they interact correctly + with cleanup handlers */ + +#include <setjmp.h> +#include "pthread.h" +#include "internals.h" + +/* These functions are not declared anywhere since they shouldn't be + used at another place but here. */ +extern void __libc_siglongjmp (sigjmp_buf env, int val) + __attribute__ ((noreturn)); +extern void __libc_longjmp (sigjmp_buf env, int val) + __attribute__ ((noreturn)); + +#ifdef SHARED +void siglongjmp (sigjmp_buf env, int val) +{ + __libc_siglongjmp (env, val); +} + +void longjmp (jmp_buf env, int val) +{ + __libc_longjmp (env, val); +} +#endif diff --git a/linuxthreads/sysdeps/unix/sysv/linux/powerpc/Versions b/linuxthreads/sysdeps/unix/sysv/linux/powerpc/Versions new file mode 100644 index 0000000000..326307c30c --- /dev/null +++ b/linuxthreads/sysdeps/unix/sysv/linux/powerpc/Versions @@ -0,0 +1,5 @@ +libpthread { + GLIBC_2.3.4 { + longjmp; siglongjmp; + } +} diff --git a/linuxthreads/sysdeps/unix/sysv/linux/powerpc/ptlongjmp.c b/linuxthreads/sysdeps/unix/sysv/linux/powerpc/ptlongjmp.c new file mode 100644 index 0000000000..d22be13145 --- /dev/null +++ b/linuxthreads/sysdeps/unix/sysv/linux/powerpc/ptlongjmp.c @@ -0,0 +1,70 @@ +/* Linuxthreads - a simple clone()-based implementation of Posix */ +/* threads for Linux. */ +/* Copyright (C) 1998 Xavier Leroy (Xavier.Leroy@inria.fr) */ +/* */ +/* This program is free software; you can redistribute it and/or */ +/* modify it under the terms of the GNU Library General Public License */ +/* as published by the Free Software Foundation; either version 2 */ +/* of the License, or (at your option) any later version. */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU Library General Public License for more details. */ + +/* Redefine siglongjmp and longjmp so that they interact correctly + with cleanup handlers */ +/* Derived from linuxthreads/ptlongjmp.c & added AltiVec/VMX versioning. */ +#include "pthread.h" +#include <setjmp.h> +#include <bits/wordsize.h> +#include <shlib-compat.h> +#if defined SHARED && SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_3_4) + +/* These functions are not declared anywhere since they shouldn't be + used at another place but here. */ +extern void __novmx__libc_siglongjmp (sigjmp_buf env, int val) + __attribute__ ((noreturn)); +extern void __novmx__libc_longjmp (sigjmp_buf env, int val) + __attribute__ ((noreturn)); + + +void __novmx_siglongjmp (sigjmp_buf env, int val) +{ + __novmx__libc_siglongjmp (env, val); +} + +void __novmx_longjmp (jmp_buf env, int val) +{ + __novmx__libc_longjmp (env, val); +} + +# if __WORDSIZE == 64 +symbol_version (__novmx_longjmp,longjmp,GLIBC_2.3); +symbol_version (__novmx_siglongjmp,siglongjmp,GLIBC_2.3); +# else +symbol_version (__novmx_longjmp,longjmp,GLIBC_2.0); +symbol_version (__novmx_siglongjmp,siglongjmp,GLIBC_2.0); +# endif +#endif /* defined SHARED && SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_3_4) ) */ + +/* These functions are not declared anywhere since they shouldn't be + used at another place but here. */ +extern void __vmx__libc_siglongjmp (sigjmp_buf env, int val) + __attribute__ ((noreturn)); +extern void __vmx__libc_longjmp (sigjmp_buf env, int val) + __attribute__ ((noreturn)); + +#ifdef SHARED +void __vmx_siglongjmp (sigjmp_buf env, int val) +{ + __vmx__libc_siglongjmp (env, val); +} + +void __vmxlongjmp (jmp_buf env, int val) +{ + __vmx__libc_longjmp (env, val); +} +#endif +default_symbol_version (__vmx_longjmp,longjmp,GLIBC_2.3.4); +default_symbol_version (__vmx_siglongjmp,siglongjmp,GLIBC_2.3.4); diff --git a/sysdeps/powerpc/Dist b/sysdeps/powerpc/Dist new file mode 100644 index 0000000000..ba909df26f --- /dev/null +++ b/sysdeps/powerpc/Dist @@ -0,0 +1,2 @@ +novmx-longjmp.c +novmx-sigjmp.c diff --git a/sysdeps/powerpc/Makefile b/sysdeps/powerpc/Makefile index f0b37bbdf9..616458f136 100644 --- a/sysdeps/powerpc/Makefile +++ b/sysdeps/powerpc/Makefile @@ -18,6 +18,12 @@ sysdep_routines += dl-machine sysdep-rtld-routines += dl-machine endif +ifeq ($(subdir),setjmp) +ifeq (yes,$(build-shared)) +sysdep_routines += novmx-longjmp novmx-sigjmp +endif +endif + ifeq ($(subdir),csu) # get offset to rtld_global._dl_hwcap gen-as-const-headers += rtld-global-offsets.sym diff --git a/sysdeps/powerpc/Versions b/sysdeps/powerpc/Versions index b7d5bf904b..47c2c3e6e7 100644 --- a/sysdeps/powerpc/Versions +++ b/sysdeps/powerpc/Versions @@ -4,3 +4,14 @@ libm { __fe_dfl_env; __fe_enabled_env; __fe_nonieee_env; __fe_nomask_env; } } + +libc { + GLIBC_2.3.4 { + _longjmp; __sigsetjmp; _setjmp; + longjmp; setjmp; + } + GLIBC_PRIVATE { + __novmx__libc_longjmp; __novmx__libc_siglongjmp; + __vmx__libc_longjmp; __vmx__libc_siglongjmp; + } +} diff --git a/sysdeps/powerpc/bits/setjmp.h b/sysdeps/powerpc/bits/setjmp.h index f849fe23ff..3134916a51 100644 --- a/sysdeps/powerpc/bits/setjmp.h +++ b/sysdeps/powerpc/bits/setjmp.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998, 2000, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 2000, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -37,22 +37,38 @@ # define JB_LR 2 /* The address we will return to */ # if __WORDSIZE == 64 # define JB_GPRS 3 /* GPRs 14 through 31 are saved, 18*2 words total. */ -# define JB_CR 21 /* Condition code registers. */ +# define JB_CR 21 /* Condition code registers with the VRSAVE at */ + /* offset 172 (low half of the double word. */ # define JB_FPRS 22 /* FPRs 14 through 31 are saved, 18*2 words total. */ -# define JB_SIZE (40*8) +# define JB_SIZE (64 * 8) /* As per PPC64-VMX ABI. */ +# define JB_VRSAVE 21 /* VRSAVE shares a double word with the CR at offset */ + /* 168 (high half of the double word). */ +# define JB_VRS 40 /* VRs 20 through 31 are saved, 12*4 words total. */ # else # define JB_GPRS 3 /* GPRs 14 through 31 are saved, 18 in total. */ # define JB_CR 21 /* Condition code registers. */ # define JB_FPRS 22 /* FPRs 14 through 31 are saved, 18*2 words total. */ -# define JB_SIZE (58*4) +# define JB_SIZE ((64 + (12 * 4)) * 4) +# define JB_VRSAVE 62 +# define JB_VRS 64 # endif #endif + +/* The current powerpc 32-bit Altivec ABI specifies for SVR4 ABI and EABI + the vrsave must be at byte 248 & v20 at byte 256. So we must pad this + correctly on 32 bit. It also insists that vecregs are only gauranteed + 4 byte alignment so we need to use vperm in the setjmp/longjmp routines. + We have to version the code because members like int __mask_was_saved + in the jmp_buf will move as jmp_buf is now larger than 248 bytes. We + cannot keep the altivec jmp_buf backward compatible with the jmp_buf. */ #ifndef _ASM # if __WORDSIZE == 64 -typedef long int __jmp_buf[40]; +typedef long int __jmp_buf[64] __attribute__ ((__aligned__ (16))); # else |