qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

2004-01-29  Steven Munroe  <sjmunroe@us.ibm.com>

	* Makefile (libpthread-routines): Add pt-cleanup.
	* pt-longjmp.c: Removed.
	* pt-cleanup.c: Copied __pthread_cleanup_upto to here. New file.
	* sysdeps/generic/pt-longjmp.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/pt-longjmp.c: New File.
This commit is contained in:
Ulrich Drepper 2004-02-14 05:22:43 +00:00
parent 40b334afb4
commit e2982bf018
6 changed files with 113 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nptl/ChangeLog
View File

@ -1,3 +1,13 @@
2004-01-29 Steven Munroe <sjmunroe@us.ibm.com>
* Makefile (libpthread-routines): Add pt-cleanup.
* pt-longjmp.c: Removed.
* pt-cleanup.c: Copied __pthread_cleanup_upto to here. New file.
* sysdeps/generic/pt-longjmp.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/pt-longjmp.c: New File.
2004-02-13 Ulrich Drepper <drepper@redhat.com> 2004-02-13 Ulrich Drepper <drepper@redhat.com>
* sysdeps/pthread/pthread_cond_timedwait.c * sysdeps/pthread/pthread_cond_timedwait.c

2
nptl/Makefile
View File

@ -99,7 +99,7 @@ libpthread-routines = init events version \
sem_wait sem_trywait sem_timedwait sem_post \ sem_wait sem_trywait sem_timedwait sem_post \
cleanup cleanup_defer cleanup_compat \ cleanup cleanup_defer cleanup_compat \
cleanup_defer_compat unwind \ cleanup_defer_compat unwind \
pt-longjmp \ pt-longjmp pt-cleanup\
cancellation \ cancellation \
lowlevellock \ lowlevellock \
pt-vfork \ pt-vfork \

7
nptl/pt-longjmp.c → nptl/pt-cleanup.c
View File

@ -62,10 +62,3 @@ __pthread_cleanup_upto (__jmp_buf target, char *targetframe)
} }
hidden_def (__pthread_cleanup_upto) hidden_def (__pthread_cleanup_upto)
void
longjmp (jmp_buf env, int val)
{
__libc_longjmp (env, val);
}
weak_alias (longjmp, siglongjmp)

29
nptl/sysdeps/generic/pt-longjmp.c Normal file
View File

@ -0,0 +1,29 @@
/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <setjmp.h>
#include <stdlib.h>
#include "pthreadP.h"
void
longjmp (jmp_buf env, int val)
{
__libc_longjmp (env, val);
}
weak_alias (longjmp, siglongjmp)

5
nptl/sysdeps/unix/sysv/linux/powerpc/Versions Normal file
View File

@ -0,0 +1,5 @@
libpthread {
GLIBC_2.3.4 {
longjmp; siglongjmp;
}
}

68
nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c Normal file
View File

@ -0,0 +1,68 @@
/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <setjmp.h>
#include <stdlib.h>
#include <bits/wordsize.h>
#include "pthreadP.h"
#include <shlib-compat.h>
#if defined SHARED && SHLIB_COMPAT (libc, 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 __novmxsiglongjmp (sigjmp_buf env, int val)
{
__novmx__libc_siglongjmp (env, val);
}
void __novmxlongjmp (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 (libc, GLIBC_2_0, GLIBC_2_3_4)) */
void
__vmx_longjmp (jmp_buf env, int val)
{
__libc_longjmp (env, val);
}
void
__vmx_siglongjmp (jmp_buf env, int val)
{
__libc_siglongjmp (env, val);
}
versioned_symbol (libc, __vmx_longjmp, longjmp, GLIBC_2_3_4);
versioned_symbol (libc, __vmx_siglongjmp, siglongjmp, GLIBC_2_3_4);