diff options
| author | Elliott Hughes <enh@google.com> | 2014-02-12 19:04:27 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-02-12 19:04:27 -0800 |
| commit | 671e236d5fd2cae169c2a31d0a35e66c4fcc5556 (patch) | |
| tree | 55c1a2a77c279f671d77e23ff1ee89946fd6efde | |
| parent | fc48e8cf28b80ce0f95e288eeee459b4cb932afa (diff) | |
| download | android_bionic-671e236d5fd2cae169c2a31d0a35e66c4fcc5556.tar.gz android_bionic-671e236d5fd2cae169c2a31d0a35e66c4fcc5556.tar.bz2 android_bionic-671e236d5fd2cae169c2a31d0a35e66c4fcc5556.zip | |
Restore sys_signame for LP64.
mksh is using this, and we probably build as much BSD source as glibc source.
Change-Id: I400d255a67f9614ca9e57090e3a2e49d2b10cba4
| -rw-r--r-- | libc/bionic/sys_signame.c | 4 | ||||
| -rw-r--r-- | libc/include/signal.h | 4 | ||||
| -rw-r--r-- | tests/signal_test.cpp | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/libc/bionic/sys_signame.c b/libc/bionic/sys_signame.c index 41d34af83..e1286f2d2 100644 --- a/libc/bionic/sys_signame.c +++ b/libc/bionic/sys_signame.c @@ -28,11 +28,7 @@ #include <signal.h> -#if !defined(__LP64__) - const char* const sys_signame[NSIG] = { #define __BIONIC_SIGDEF(signal_number, unused) [ signal_number ] = #signal_number + 3, #include <sys/_sigdefs.h> }; - -#endif diff --git a/libc/include/signal.h b/libc/include/signal.h index 58288a103..29bef573c 100644 --- a/libc/include/signal.h +++ b/libc/include/signal.h @@ -61,9 +61,7 @@ typedef int sig_atomic_t; #define NSIG _NSIG extern const char* const sys_siglist[]; -#if !defined(__LP64__) -extern const char* const sys_signame[]; -#endif +extern const char* const sys_signame[]; /* BSD compatibility. */ typedef __sighandler_t sig_t; /* BSD compatibility. */ typedef __sighandler_t sighandler_t; /* glibc compatibility. */ diff --git a/tests/signal_test.cpp b/tests/signal_test.cpp index ea3096a5d..6d55bef24 100644 --- a/tests/signal_test.cpp +++ b/tests/signal_test.cpp @@ -240,7 +240,7 @@ TEST(signal, sigaction) { } TEST(signal, sys_signame) { -#if defined(__BIONIC__) && !defined(__LP64__) +#if defined(__BIONIC__) ASSERT_TRUE(sys_signame[0] == NULL); ASSERT_STREQ("HUP", sys_signame[SIGHUP]); #else |