From: Jakub Jelinek <jakub@redhat.com>
To: Ulrich Drepper <drepper@redhat.com>
Cc: Glibc hackers <libc-hacker@sources.redhat.com>
Subject: [PATCH] Fix sparc* sysdep-cancel.h
Date: Fri, 20 Feb 2004 18:46:00 -0000 [thread overview]
Message-ID: <20040220163737.GB4581@sunsite.ms.mff.cuni.cz> (raw)
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
next reply other threads:[~2004-02-20 18:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-02-20 18:46 Jakub Jelinek [this message]
2004-02-20 20:25 ` Ulrich Drepper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20040220163737.GB4581@sunsite.ms.mff.cuni.cz \
--to=jakub@redhat.com \
--cc=drepper@redhat.com \
--cc=libc-hacker@sources.redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).