diff mbox series

[v2,10/23] linux: Use generic __syscall_error for hppa

Message ID 20201113165837.121629-11-adhemerval.zanella@linaro.org
State New
Headers show
Series Simplify internal Linux syscall | expand

Commit Message

Adhemerval Zanella Nov. 13, 2020, 4:58 p.m. UTC
HPPA issues inline error handling for auto-generated syscall,
the __syscall_error is used solely on clone implementation and
it differs from generic implementation by passing positive errno
numbers.

Also, inline error handling does not really produce the most
compat code.

--- sizes-hppa-linux-gnu.outline
+++ sizes-hppa-linux-gnu.inline
    text           data     bss     dec     hex filename
-1576515          22028    9424 1607967  18891f libc.so
- 174755          15524     448  190727   2e907 elf/ld.so
- 132799           1296    8364  142459   22c7b nptl/libpthread.so
-  30993            788     236   32017    7d11 rt/librt.so
+1579367          22028    9424 1610819  189443 libc.so
+ 174835          15524     448  190807   2e957 elf/ld.so
+ 133055           1296    8364  142715   22d7b nptl/libpthread.so
+  31297            788     236   32321    7e41 rt/librt.so

Checked on hppa-linux-gnu.
---
 sysdeps/unix/sysv/linux/hppa/clone.S          |  6 ++++--
 .../linux/hppa/{sysdep.c => syscall_error.h}  | 20 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)
 rename sysdeps/unix/sysv/linux/hppa/{sysdep.c => syscall_error.h} (68%)
diff mbox series

Patch

diff --git a/sysdeps/unix/sysv/linux/hppa/clone.S b/sysdeps/unix/sysv/linux/hppa/clone.S
index 4eda812dd0..fcfafe1d2b 100644
--- a/sysdeps/unix/sysv/linux/hppa/clone.S
+++ b/sysdeps/unix/sysv/linux/hppa/clone.S
@@ -124,7 +124,8 @@  ENTRY(__clone)
 .LerrorRest:
 	/* Something bad happened -- no child created */
 	bl	__syscall_error, %rp
-	sub     %r0, %ret0, %arg0
+	 copy    %ret0, %arg0
+
 	ldw	-84(%sp), %rp
 	/* Return after setting errno, ret0 is set to -1 by __syscall_error. */
 	bv	%r0(%rp)
@@ -133,7 +134,8 @@  ENTRY(__clone)
 .LerrorSanity:
 	/* Sanity checks failed, return -1, and set errno to EINVAL. */
 	bl	__syscall_error, %rp
-	ldi     EINVAL, %arg0
+	 ldi     -EINVAL, %arg0
+
 	ldw	-84(%sp), %rp
 	bv	%r0(%rp)
 	ldwm	-64(%sp), %r4
diff --git a/sysdeps/unix/sysv/linux/hppa/sysdep.c b/sysdeps/unix/sysv/linux/hppa/syscall_error.h
similarity index 68%
rename from sysdeps/unix/sysv/linux/hppa/sysdep.c
rename to sysdeps/unix/sysv/linux/hppa/syscall_error.h
index 8c06b6fc80..f5947ccd7c 100644
--- a/sysdeps/unix/sysv/linux/hppa/sysdep.c
+++ b/sysdeps/unix/sysv/linux/hppa/syscall_error.h
@@ -1,4 +1,5 @@ 
-/* Copyright (C) 1997-2020 Free Software Foundation, Inc.
+/* Linux wrappers for setting errno.  HPPA version.
+   Copyright (C) 2020 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
@@ -12,16 +13,13 @@ 
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library.  If not, see
+   License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
-#include <errno.h>
+#ifndef _SYSCALL_ERROR_H
+#define _SYSCALL_ERROR_H
 
-/* This routine is jumped to by all the syscall handlers, to stash
-   an error number into errno.  */
-int
-__syscall_error (int err_no)
-{
-  __set_errno (err_no);
-  return -1;
-}
+#define SYSCALL_ERROR_FUNC        1
+#define SYSCALL_ERROR_FUNC_ATTR
+
+#endif