diff mbox series

[v2,18/23] linux: Use generic __syscall_error for csky

Message ID 20201113165837.121629-19-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
Although the auto-generated syscall issue __syscall_error, using
an inline function generates slight more compact code:

--- sizes-csky-linux-gnuabiv2-soft.outline
+++ sizes-csky-linux-gnuabiv2-soft.inline
    text           data     bss     dec     hex filename
-1210010          10408    9212 1229630  12c33e libc.so
- 121439           3876     184  125499   1ea3b elf/ld.so
-  93074            920    8348  102342   18fc6 nptl/libpthread.so
-  24971            648     156   25775    64af rt/librt.so
+1209202          10408    9212 1228822  12c016 libc.so
+ 121171           3876     184  125231   1e92f elf/ld.so
+  93630            920    8348  102898   191f2 nptl/libpthread.so
+  24967            648     156   25771    64ab rt/librt.so

Checked with a cross make check for csky-linux-gnuabiv2-soft.
---
 sysdeps/unix/sysv/linux/csky/abiv2/sysdep.S  | 65 --------------------
 sysdeps/unix/sysv/linux/csky/syscall_error.h | 25 ++++++++
 2 files changed, 25 insertions(+), 65 deletions(-)
 delete mode 100644 sysdeps/unix/sysv/linux/csky/abiv2/sysdep.S
 create mode 100644 sysdeps/unix/sysv/linux/csky/syscall_error.h
diff mbox series

Patch

diff --git a/sysdeps/unix/sysv/linux/csky/abiv2/sysdep.S b/sysdeps/unix/sysv/linux/csky/abiv2/sysdep.S
deleted file mode 100644
index fe6b600bdc..0000000000
--- a/sysdeps/unix/sysv/linux/csky/abiv2/sysdep.S
+++ /dev/null
@@ -1,65 +0,0 @@ 
-/* syscall error handlers.  C-SKY ABIV2 version.
-   Copyright (C) 2018-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
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   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
-   <https://www.gnu.org/licenses/>.  */
-
-#include <sysdep.h>
-
-/* The syscall stubs jump here when they detect an error.
-   The code for Linux is almost identical to the canonical Unix
-   code, except that the error number in R0 is negated.  */
-
-#undef CALL_MCOUNT
-#define CALL_MCOUNT /* Don't insert the profiling call, it clobbers R0.  */
-
-	.text
-ENTRY (__syscall_error)
-	movi	a1, 0
-	rsub	a0, a0, a1
-
-#if !IS_IN (rtld)
-	mov	a1, a0
-	mov	a0, tls
-
-	grs	t1, .Lgetpc1
-.Lgetpc1:
-	lrw	t0, errno@gottpoff
-	add	t1, t1, t0
-	ldw	t1, (t1)
-	add	t1, a0
-	stw	a1, (t1)
-	bmaski	a0, 0
-	rts
-#elif RTLD_PRIVATE_ERRNO /* !IS_IN (rtld) */
-# ifdef  __PIC__
-	grs	t1, .Lgetpc2
-.Lgetpc2:
-	lrw	t0, .Lgetpc2@GOTPC
-	addu	t1, t1, t0
-	lrw	t0, rtld_errno@PLT
-	ldr.w	t0, (t1, t0 << 0)
-# else
-	lrw	t0, rtld_errno
-# endif /* __PIC__ */
-	stw	a0, (t0)
-	bmaski	a0, 0
-	rts
-#else
-# error "Unsupported non-TLS case"
-#endif /* RTLD_PRIVATE_ERRNO */
-
-#undef __syscall_error
-END (__syscall_error)
diff --git a/sysdeps/unix/sysv/linux/csky/syscall_error.h b/sysdeps/unix/sysv/linux/csky/syscall_error.h
new file mode 100644
index 0000000000..dbdd6ab44f
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/csky/syscall_error.h
@@ -0,0 +1,25 @@ 
+/* Linux wrappers for setting errno.  CSKY 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
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   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
+   <https://www.gnu.org/licenses/>.  */
+
+#ifndef _SYSCALL_ERROR_H
+#define _SYSCALL_ERROR_H
+
+#define SYSCALL_ERROR_FUNC        1
+#define SYSCALL_ERROR_FUNC_ATTR
+
+#endif