From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28647 invoked by alias); 20 Feb 2004 18:46:11 -0000 Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sources.redhat.com Received: (qmail 28617 invoked from network); 20 Feb 2004 18:46:10 -0000 Received: from unknown (HELO sunsite.ms.mff.cuni.cz) (195.113.19.66) by sources.redhat.com with SMTP; 20 Feb 2004 18:46:10 -0000 Received: from sunsite.ms.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1]) by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8) with ESMTP id i1KGbcvf010030; Fri, 20 Feb 2004 17:37:38 +0100 Received: (from jakub@localhost) by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8/Submit) id i1KGbbI3010028; Fri, 20 Feb 2004 17:37:37 +0100 Date: Fri, 20 Feb 2004 18:46:00 -0000 From: Jakub Jelinek To: Ulrich Drepper Cc: Glibc hackers Subject: [PATCH] Fix sparc* sysdep-cancel.h Message-ID: <20040220163737.GB4581@sunsite.ms.mff.cuni.cz> Reply-To: Jakub Jelinek Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4i X-SW-Source: 2004-02/txt/msg00032.txt.bz2 Hi! Quite bad omission, CDISABLE was not called if cancellable syscall returned error. 2004-02-20 Jakub Jelinek 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 , 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 , 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 , 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 , 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