Merge "Fix pattern to account for '_' prefix in syscalls"

This commit is contained in:
Dimitry Ivanov 2017-08-10 15:04:58 +00:00 committed by Gerrit Code Review
commit cf764c05e4
2 changed files with 10 additions and 1 deletions

View File

@ -1,6 +1,15 @@
/* Generated by gensyscalls.py. Do not edit. */ /* Generated by gensyscalls.py. Do not edit. */
#ifndef _BIONIC_BITS_GLIBC_SYSCALLS_H_ #ifndef _BIONIC_BITS_GLIBC_SYSCALLS_H_
#define _BIONIC_BITS_GLIBC_SYSCALLS_H_ #define _BIONIC_BITS_GLIBC_SYSCALLS_H_
#if defined(__NR__llseek)
#define SYS__llseek __NR__llseek
#endif
#if defined(__NR__newselect)
#define SYS__newselect __NR__newselect
#endif
#if defined(__NR__sysctl)
#define SYS__sysctl __NR__sysctl
#endif
#if defined(__NR_accept) #if defined(__NR_accept)
#define SYS_accept __NR_accept #define SYS_accept __NR_accept
#endif #endif

View File

@ -568,7 +568,7 @@ class State:
# Collect the set of all syscalls for all architectures. # Collect the set of all syscalls for all architectures.
syscalls = set() syscalls = set()
pattern = re.compile(r'^\s*#\s*define\s*__NR_([a-z]\S+)') pattern = re.compile(r'^\s*#\s*define\s*__NR_([a-z_]\S+)')
for unistd_h in ["kernel/uapi/asm-generic/unistd.h", for unistd_h in ["kernel/uapi/asm-generic/unistd.h",
"kernel/uapi/asm-arm/asm/unistd.h", "kernel/uapi/asm-arm/asm/unistd.h",
"kernel/uapi/asm-arm/asm/unistd-common.h", "kernel/uapi/asm-arm/asm/unistd-common.h",