Clean up syscall stub/seccomp filter generation.
Test: treehugger
Change-Id: Iceb1c22d82b4d402166c3712b5b8b48a30937c6d
diff --git a/libc/SECCOMP_WHITELIST_APP.TXT b/libc/SECCOMP_WHITELIST_APP.TXT
index faa2d63..dc48715 100644
--- a/libc/SECCOMP_WHITELIST_APP.TXT
+++ b/libc/SECCOMP_WHITELIST_APP.TXT
@@ -1,80 +1,58 @@
# This file is used to populate seccomp's whitelist policy in combination with SYSCALLS.TXT.
# Note that the resultant policy is applied only to zygote spawned processes.
#
-# Each non-blank, non-comment line has the following format:
-#
-# return_type func_name[|alias_list][:syscall_name[:socketcall_id]]([parameter_list]) arch_list
-#
-# where:
-# arch_list ::= "all" | arch+
-# arch ::= "arm" | "arm64" | "mips" | "mips64" | "x86" | "x86_64"
-#
-# Note:
-# - syscall_name corresponds to the name of the syscall, which may differ from
-# the exported function name (example: the exit syscall is implemented by the _exit()
-# function, which is not the same as the standard C exit() function which calls it)
-
-# - alias_list is optional comma separated list of function aliases
-#
-# - The call_id parameter, given that func_name and syscall_name have
-# been provided, allows the user to specify dispatch style syscalls.
-# For example, socket() syscall on i386 actually becomes:
-# socketcall(__NR_socket, 1, *(rest of args on stack)).
-#
-# - Each parameter type is assumed to be stored in 32 bits.
-#
# This file is processed by a python script named genseccomp.py.
# Needed for debugging 32-bit Chrome
-int pipe:pipe(int pipefd[2]) arm,x86,mips
+int pipe:pipe(int pipefd[2]) lp32
# b/34651972
-int access:access(const char *pathname, int mode) arm,x86,mips
-int stat64:stat64(const char*, struct stat64*) arm,x86,mips
+int access:access(const char *pathname, int mode) lp32
+int stat64:stat64(const char*, struct stat64*) lp32
# b/34813887
-int open:open(const char *path, int oflag, ... ) arm,x86,x86_64,mips
-int getdents:getdents(unsigned int fd, struct linux_dirent *dirp, unsigned int count) arm,x86,x86_64,mips
+int open:open(const char *path, int oflag, ... ) lp32,x86_64
+int getdents:getdents(unsigned int fd, struct linux_dirent *dirp, unsigned int count) lp32,x86_64
# b/34719286
-int eventfd:eventfd(unsigned int initval, int flags) arm,x86,mips
+int eventfd:eventfd(unsigned int initval, int flags) lp32
# b/34817266
-int epoll_wait:epoll_wait(int epfd, struct epoll_event *events, int maxevents, int timeout) arm,x86,mips
+int epoll_wait:epoll_wait(int epfd, struct epoll_event *events, int maxevents, int timeout) lp32
# b/34908783
-int epoll_create:epoll_create(int size) arm,x86,mips
+int epoll_create:epoll_create(int size) lp32
# b/34979910
-int creat:creat(const char *pathname, mode_t mode) arm,x86,mips
-int unlink:unlink(const char *pathname) arm,x86,mips
+int creat:creat(const char *pathname, mode_t mode) lp32
+int unlink:unlink(const char *pathname) lp32
# b/35059702
-int lstat64:lstat64(const char*, struct stat64*) arm,x86,mips
+int lstat64:lstat64(const char*, struct stat64*) lp32
# b/35217603
-int fcntl:fcntl(int fd, int cmd, ... /* arg */ ) arm,x86,mips
-pid_t fork:fork() arm,x86,mips
-int poll:poll(struct pollfd *fds, nfds_t nfds, int timeout) arm,x86,mips
+int fcntl:fcntl(int fd, int cmd, ... /* arg */ ) lp32
+pid_t fork:fork() lp32
+int poll:poll(struct pollfd *fds, nfds_t nfds, int timeout) lp32
-# b/35906875. Note mips already has getuid from SYSCALLS.TXT
-int inotify_init() arm,x86,mips
-uid_t getuid() arm,x86
+# b/35906875
+int inotify_init() lp32
+uid_t getuid() lp32
# b/36435222
-int remap_file_pages(void *addr, size_t size, int prot, size_t pgoff, int flags) arm,x86,mips
+int remap_file_pages(void *addr, size_t size, int prot, size_t pgoff, int flags) lp32
# b/36449658
-int rename(const char *oldpath, const char *newpath) arm,x86,mips
+int rename(const char *oldpath, const char *newpath) lp32
# b/36726183. Note arm does not support mmap
-void* mmap(void *addr, size_t length, int prot, int flags, int fd, off_t offset) x86,mips
+void* mmap(void *addr, size_t length, int prot, int flags, int fd, off_t offset) x86
# b/37769298
-int dup2(int oldfd, int newfd) arm,x86,mips
+int dup2(int oldfd, int newfd) lp32
# b/62779795
-int compat_select:_newselect(int n, unsigned long* inp, unsigned long* outp, unsigned long* exp, struct timeval* timeout) arm,x86,mips
+int compat_select:_newselect(int n, unsigned long* inp, unsigned long* outp, unsigned long* exp, struct timeval* timeout) lp32
# b/62090571
-int mkdir(const char *pathname, mode_t mode) arm,x86,mips
+int mkdir(const char *pathname, mode_t mode) lp32