commit cda62094ef6ab44d3804954fff75be1246725c36
author Elliott Hughes <enh@google.com> Fri Mar 22 13:50:44 2013 -0700
committer Elliott Hughes <enh@google.com> Fri Mar 22 13:53:43 2013 -0700
tree b0f9d9a146741e5961cafedaccbc2843e545de2c
parent c37dd599561ac07a895bc435d818f000054a498d

Use the correct names for the __ARM_NR_* syscalls.

This lets us move all the ARM syscall stubs over to the kernel <asm/unistd.h>.
Our generated <sys/linux-syscalls.h> is now unused, but I'll remove that in a
later change.

Change-Id: Ie5ff2cc4abce1938576af7cbaef615a79c7f310d

libc/include/sys/linux-syscalls.h

diff --git a/libc/include/sys/linux-syscalls.h b/libc/include/sys/linux-syscalls.h
index 2e6421f..a11a9a3 100644
--- a/libc/include/sys/linux-syscalls.h
+++ b/libc/include/sys/linux-syscalls.h
@@ -3,9 +3,7 @@
 #define _BIONIC_LINUX_SYSCALLS_H_
 
 #if !defined __ASM_ARM_UNISTD_H && !defined __ASM_I386_UNISTD_H && !defined __ASM_MIPS_UNISTD_H
-#if defined __arm__ && !defined __ARM_EABI__ && !defined __thumb__
-  #  define __NR_SYSCALL_BASE 0x900000
-#elif defined(__mips__)
+#if defined(__mips__)
   #  define __NR_SYSCALL_BASE 4000
 #else
   #  define __NR_SYSCALL_BASE 0
@@ -212,8 +210,8 @@
 #define __NR_inotify_rm_watch             (__NR_SYSCALL_BASE + 318)
 #define __NR_poll                         (__NR_SYSCALL_BASE + 168)
 #define __NR_eventfd2                     (__NR_SYSCALL_BASE + 356)
-#define __NR_ARM_set_tls                  (__NR_SYSCALL_BASE + 983045)
-#define __NR_ARM_cacheflush               (__NR_SYSCALL_BASE + 983042)
+#define __ARM_NR_set_tls                  (__NR_SYSCALL_BASE + 983045)
+#define __ARM_NR_cacheflush               (__NR_SYSCALL_BASE + 983042)
 #endif
 
 #ifdef __i386__