mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-02-05 12:40:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
2000-11-07  Kazumoto Kojima  <kkojima@rr.iij4u.or.jp>

	* sysdeps/sh/bits/setjmp.h: Move to...
	* sysdeps/sh/sh4/bits/setjmp.h: ...here.
	* sysdeps/sh/sh3/bits/setjmp.h: New file.
This commit is contained in:
Ulrich Drepper 2000-11-07 16:49:35 +00:00
parent 632b6761c3
commit ece70a1400
4 changed files with 55 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2000-11-07 Kazumoto Kojima <kkojima@rr.iij4u.or.jp>
* sysdeps/sh/bits/setjmp.h: Move to...
* sysdeps/sh/sh4/bits/setjmp.h: ...here.
* sysdeps/sh/sh3/bits/setjmp.h: New file.
2000-11-06 Ulrich Drepper <drepper@redhat.com> 2000-11-06 Ulrich Drepper <drepper@redhat.com>
* iconvdata/big5.c: Regenerated after BIG5 charmap change. * iconvdata/big5.c: Regenerated after BIG5 charmap change.

8
linuxthreads/cancel.c
View File

@ -55,6 +55,7 @@ int pthread_cancel(pthread_t thread)
int dorestart = 0; int dorestart = 0;
pthread_descr th; pthread_descr th;
pthread_extricate_if *pextricate; pthread_extricate_if *pextricate;
int already_canceled;
__pthread_lock(&handle->h_lock, NULL); __pthread_lock(&handle->h_lock, NULL);
if (invalid_handle(handle, thread)) { if (invalid_handle(handle, thread)) {
@ -64,14 +65,15 @@ int pthread_cancel(pthread_t thread)
th = handle->h_descr; th = handle->h_descr;
if (th->p_cancelstate == PTHREAD_CANCEL_DISABLE || th->p_canceled) { already_canceled = th->p_canceled;
th->p_canceled = 1; th->p_canceled = 1;
if (th->p_cancelstate == PTHREAD_CANCEL_DISABLE || already_canceled) {
__pthread_unlock(&handle->h_lock); __pthread_unlock(&handle->h_lock);
return 0; return 0;
} }
pextricate = th->p_extricate; pextricate = th->p_extricate;
th->p_canceled = 1;
pid = th->p_pid; pid = th->p_pid;
/* If the thread has registered an extrication interface, then /* If the thread has registered an extrication interface, then

44
sysdeps/sh/sh3/bits/setjmp.h Normal file
View File

@ -0,0 +1,44 @@
/* Copyright (C) 1999, 2000 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
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.
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
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with the GNU C Library; see the file COPYING.LIB. If not,
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
/* Define the machine-dependent type `jmp_buf'. SH version. */
#ifndef _SETJMP_H
# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
#endif
#ifndef _ASM
typedef struct
{
/* Callee-saved registers r8 through r15. */
int __regs[8];
/* Program counter. */
void * __pc;
/* The global pointer. */
void * __gbr;
} __jmp_buf[1];
#endif
#define JB_SIZE (4 * 10)
/* Test if longjmp to JMPBUF would unwind the frame
containing a local variable at ADDRESS. */
#define _JMPBUF_UNWINDS(jmpbuf, address) \
((void *) (address) < &(jmpbuf)[0].__regs[7])

0
sysdeps/sh/bits/setjmp.h → sysdeps/sh/sh4/bits/setjmp.h
View File