From: Richard Henderson <rth@redhat.com>
Date: Thu, 29 May 2014 15:57:39 +0000 (-0400)
Subject: aarch64: Fix error return from __ioctl
X-Git-Tag: upstream/2.30~7402
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=74f31c18593111725478a991b395ae45661985a3;p=external%2Fglibc.git

aarch64: Fix error return from __ioctl

Forgotten in ca3cfa40c16ef34c74951a07a57cfcbcd58898b1
where the error branch was moved from PSEUDO_RET.
---

diff --git a/ChangeLog b/ChangeLog
index 243271f..1d85abe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-30  Richard Henderson  <rth@twiddle.net>
+
+	* sysdeps/unix/sysv/linux/aarch64/ioctl.S (__ioctl): Remove the
+	use of PSEUDO_RET; perform the error check directly.
+
 2014-05-30 Marko Myllynen  <myllynen@redhat.com>
 
 	* sysdeps/x86_64/link-defines.sym (BND_SIZE): Replace __int128
diff --git a/sysdeps/unix/sysv/linux/aarch64/ioctl.S b/sysdeps/unix/sysv/linux/aarch64/ioctl.S
index 4443f5a..8920a20 100644
--- a/sysdeps/unix/sysv/linux/aarch64/ioctl.S
+++ b/sysdeps/unix/sysv/linux/aarch64/ioctl.S
@@ -20,11 +20,12 @@
 
 	.text
 ENTRY(__ioctl)
-	movz	x8, #__NR_ioctl
-        sxtw	x0, w0
-        svc	#0x0
-	cmn	x0, #0x1, lsl #12
-	PSEUDO_RET
-	PSEUDO_END (__ioctl)
+	mov	x8, #__NR_ioctl
+	sxtw	x0, w0
+	svc	#0x0
+	cmn	x0, #4095
+	b.cs	.Lsyscall_error
+	ret
+PSEUDO_END (__ioctl)
 
 weak_alias (__ioctl, ioctl)