* [PATCH] Fix sparc* sysdep-cancel.h
@ 2004-02-20 18:46 Jakub Jelinek
2004-02-20 20:25 ` Ulrich Drepper
0 siblings, 1 reply; 2+ messages in thread
From: Jakub Jelinek @ 2004-02-20 18:46 UTC (permalink / raw)
To: Ulrich Drepper; +Cc: Glibc hackers
Hi!
Quite bad omission, CDISABLE was not called if cancellable syscall returned
error.
2004-02-20 Jakub Jelinek <jakub@redhat.com>
nptl/
* sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
(__syscall_error_handler2): Call CDISABLE.
* sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
(__syscall_error_handler2): Call CDISABLE.
linuxthreads/
* sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
(__syscall_error_handler2): Call CDISABLE.
* sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
(__syscall_error_handler2): Call CDISABLE.
--- libc/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h.jj 2003-09-03 04:51:39.000000000 +0200
+++ libc/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h 2004-02-20 20:25:20.066823880 +0100
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 2002.
@@ -67,7 +67,9 @@ __##syscall_name##_nocancel:
SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler2) \
.global __errno_location; \
.type __errno_location,@function; \
- call __errno_location; \
+ CDISABLE; \
+ mov %l0, %o0; \
+ call __errno_location; \
nop; \
st %l1, [%o0]; \
jmpl %i7 + 8, %g0; \
--- libc/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h.jj 2003-09-03 04:51:39.000000000 +0200
+++ libc/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h 2004-02-20 20:26:18.562931120 +0100
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 2002.
@@ -61,7 +61,9 @@ __##syscall_name##_nocancel:
SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler2) \
.global __errno_location; \
.type __errno_location,@function; \
- call __errno_location; \
+ CDISABLE; \
+ mov %l0, %o0; \
+ call __errno_location; \
nop; \
st %l1, [%o0]; \
jmpl %i7 + 8, %g0; \
--- libc/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h.jj 2003-07-15 17:04:36.000000000 +0200
+++ libc/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h 2004-02-20 20:24:22.973503384 +0100
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 2002.
@@ -58,7 +58,9 @@ ENTRY(name) \
SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler2) \
.global __errno_location; \
.type __errno_location,@function; \
- call __errno_location; \
+ CDISABLE; \
+ mov %l0, %o0; \
+ call __errno_location; \
nop; \
st %l1, [%o0]; \
jmpl %i7 + 8, %g0; \
--- libc/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h.jj 2003-06-18 00:22:57.000000000 +0200
+++ libc/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h 2004-02-20 20:24:09.401566632 +0100
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 2002.
@@ -57,7 +57,9 @@ ENTRY(name) \
SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler2) \
.global __errno_location; \
.type __errno_location,@function; \
- call __errno_location; \
+ CDISABLE; \
+ mov %l0, %o0; \
+ call __errno_location; \
nop; \
st %l1, [%o0]; \
jmpl %i7 + 8, %g0; \
Jakub
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Fix sparc* sysdep-cancel.h
2004-02-20 18:46 [PATCH] Fix sparc* sysdep-cancel.h Jakub Jelinek
@ 2004-02-20 20:25 ` Ulrich Drepper
0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Drepper @ 2004-02-20 20:25 UTC (permalink / raw)
To: Jakub Jelinek; +Cc: Glibc hackers
Applied.
--
➧ Ulrich Drepper ➧ Red Hat, Inc. ➧ 444 Castro St ➧ Mountain View, CA â–
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-02-20 20:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-02-20 18:46 [PATCH] Fix sparc* sysdep-cancel.h Jakub Jelinek
2004-02-20 20:25 ` Ulrich Drepper
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).