Clean up sys_signame and sys_siglist a little.
We don't need quite so much duplication because we already have a way
to get the signal number from its name, and that already copes with the
fact that the mips/mips64 numbers are different from everyone else's.
Also remove sys_signame from LP64. glibc doesn't have this BSD-ism.
Change-Id: I6dc411a3d73589383c85d3b07d9d648311492a10
diff --git a/libc/Android.mk b/libc/Android.mk
index 79acce8..3aced4e 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -37,67 +37,6 @@
# Define the common source files for all the libc instances
# =========================================================
libc_common_src_files := \
- unistd/alarm.c \
- unistd/exec.c \
- unistd/fnmatch.c \
- unistd/syslog.c \
- unistd/system.c \
- unistd/time.c \
- stdio/asprintf.c \
- stdio/fflush.c \
- stdio/fgetc.c \
- stdio/findfp.c \
- stdio/fprintf.c \
- stdio/fputc.c \
- stdio/fread.c \
- stdio/freopen.c \
- stdio/fscanf.c \
- stdio/fseek.c \
- stdio/ftell.c \
- stdio/fvwrite.c \
- stdio/gets.c \
- stdio/printf.c \
- stdio/refill.c \
- stdio/rewind.c \
- stdio/scanf.c \
- stdio/snprintf.c\
- stdio/sprintf.c \
- stdio/sscanf.c \
- stdio/stdio.c \
- stdio/ungetc.c \
- stdio/vasprintf.c \
- stdio/vfprintf.c \
- stdio/vfscanf.c \
- stdio/vprintf.c \
- stdio/vsnprintf.c \
- stdio/vsprintf.c \
- stdio/vscanf.c \
- stdio/vsscanf.c \
- stdio/wbuf.c \
- stdlib/atexit.c \
- stdlib/ctype_.c \
- stdlib/getenv.c \
- stdlib/putenv.c \
- stdlib/setenv.c \
- stdlib/strtod.c \
- stdlib/strtoimax.c \
- stdlib/strtol.c \
- stdlib/strtoll.c \
- stdlib/strtoul.c \
- stdlib/strtoull.c \
- stdlib/strtoumax.c \
- stdlib/tolower_.c \
- stdlib/toupper_.c \
- string/strcasecmp.c \
- string/strcspn.c \
- string/strdup.c \
- string/strpbrk.c \
- string/strsep.c \
- string/strspn.c \
- string/strstr.c \
- string/strtok.c \
- wchar/wcswidth.c \
- wchar/wcsxfrm.c \
bionic/arc4random.c \
bionic/atoi.c \
bionic/atol.c \
@@ -143,8 +82,6 @@
bionic/setpgrp.c \
bionic/sigblock.c \
bionic/siginterrupt.c \
- bionic/siglist.c \
- bionic/signame.c \
bionic/sigsetmask.c \
bionic/strndup.c \
bionic/strntoimax.c \
@@ -159,6 +96,67 @@
bionic/unlockpt.c \
bionic/utmp.c \
bionic/wcscoll.c \
+ stdio/asprintf.c \
+ stdio/fflush.c \
+ stdio/fgetc.c \
+ stdio/findfp.c \
+ stdio/fprintf.c \
+ stdio/fputc.c \
+ stdio/fread.c \
+ stdio/freopen.c \
+ stdio/fscanf.c \
+ stdio/fseek.c \
+ stdio/ftell.c \
+ stdio/fvwrite.c \
+ stdio/gets.c \
+ stdio/printf.c \
+ stdio/refill.c \
+ stdio/rewind.c \
+ stdio/scanf.c \
+ stdio/snprintf.c\
+ stdio/sprintf.c \
+ stdio/sscanf.c \
+ stdio/stdio.c \
+ stdio/ungetc.c \
+ stdio/vasprintf.c \
+ stdio/vfprintf.c \
+ stdio/vfscanf.c \
+ stdio/vprintf.c \
+ stdio/vscanf.c \
+ stdio/vsnprintf.c \
+ stdio/vsprintf.c \
+ stdio/vsscanf.c \
+ stdio/wbuf.c \
+ stdlib/atexit.c \
+ stdlib/ctype_.c \
+ stdlib/getenv.c \
+ stdlib/putenv.c \
+ stdlib/setenv.c \
+ stdlib/strtod.c \
+ stdlib/strtoimax.c \
+ stdlib/strtol.c \
+ stdlib/strtoll.c \
+ stdlib/strtoul.c \
+ stdlib/strtoull.c \
+ stdlib/strtoumax.c \
+ stdlib/tolower_.c \
+ stdlib/toupper_.c \
+ string/strcasecmp.c \
+ string/strcspn.c \
+ string/strdup.c \
+ string/strpbrk.c \
+ string/strsep.c \
+ string/strspn.c \
+ string/strstr.c \
+ string/strtok.c \
+ unistd/alarm.c \
+ unistd/exec.c \
+ unistd/fnmatch.c \
+ unistd/syslog.c \
+ unistd/system.c \
+ unistd/time.c \
+ wchar/wcswidth.c \
+ wchar/wcsxfrm.c \
libc_dns_src_files += \
@@ -222,8 +220,8 @@
bionic/dirent.cpp \
bionic/dup2.cpp \
bionic/epoll_create.cpp \
- bionic/epoll_wait.cpp \
bionic/epoll_pwait.cpp \
+ bionic/epoll_wait.cpp \
bionic/__errno.cpp \
bionic/eventfd_read.cpp \
bionic/eventfd_write.cpp \
@@ -280,7 +278,6 @@
bionic/__set_errno.cpp \
bionic/seteuid.cpp \
bionic/setlocale.cpp \
- bionic/signalfd.cpp \
bionic/sigaction.cpp \
bionic/sigaddset.cpp \
bionic/sigdelset.cpp \
@@ -288,6 +285,7 @@
bionic/sigfillset.cpp \
bionic/sigismember.cpp \
bionic/signal.cpp \
+ bionic/signalfd.cpp \
bionic/sigpending.cpp \
bionic/sigprocmask.cpp \
bionic/sigsuspend.cpp \
@@ -300,8 +298,10 @@
bionic/stubs.cpp \
bionic/symlink.cpp \
bionic/sysconf.cpp \
- bionic/thread_atexit.cpp \
+ bionic/sys_siglist.c \
+ bionic/sys_signame.c \
bionic/tdestroy.cpp \
+ bionic/thread_atexit.cpp \
bionic/timer.cpp \
bionic/tmpfile.cpp \
bionic/unlink.cpp \