This is the mail archive of the libc-hacker@sources.redhat.com mailing list for the glibc project.

Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] Fix sparc* sysdep-cancel.h


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


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]