commit 1afb375d30cadf5dfcb5dfe352527e2a1147c79f
author Elliott Hughes <enh@google.com> Thu Dec 19 19:36:03 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 19 19:36:04 2013 +0000
tree 1cbbe1243fc00c391930b517b8eb2ee84cadfa73
parent eb15a6c9cd35fa2a91d277c48390827a78435ab4
parent da9775509b74f1c54d9bdce3323702836315ef2b

Merge "Fix aarch64 custom assembler now non-uapi is gone."

libc/arch-aarch64/bionic/futex_aarch64.S

diff --git a/libc/arch-aarch64/bionic/futex_aarch64.S b/libc/arch-aarch64/bionic/futex_aarch64.S
index c25d2dd..bf7959b 100644
--- a/libc/arch-aarch64/bionic/futex_aarch64.S
+++ b/libc/arch-aarch64/bionic/futex_aarch64.S
@@ -26,9 +26,7 @@
  * SUCH DAMAGE.
  */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 #define FUTEX_WAIT 0
 #define FUTEX_WAKE 1

libc/arch-aarch64/bionic/syscall.S

diff --git a/libc/arch-aarch64/bionic/syscall.S b/libc/arch-aarch64/bionic/syscall.S
index f7ce010..863e369 100644
--- a/libc/arch-aarch64/bionic/syscall.S
+++ b/libc/arch-aarch64/bionic/syscall.S
@@ -26,8 +26,7 @@
  * SUCH DAMAGE.
  */
 
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(syscall)
     /* create AAPCS frame pointer */

libc/arch-aarch64/bionic/vfork.S

diff --git a/libc/arch-aarch64/bionic/vfork.S b/libc/arch-aarch64/bionic/vfork.S
index 964f38d..7235283 100644
--- a/libc/arch-aarch64/bionic/vfork.S
+++ b/libc/arch-aarch64/bionic/vfork.S
@@ -26,9 +26,7 @@
  * SUCH DAMAGE.
  */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(vfork)
     mov     x0, #0x4111     /* CLONE_VM | CLONE_VFORK | SIGCHLD */