3 files changed, 11 insertions, 5 deletions
diff --git a/libc/bionic/strerror_r.cpp b/libc/bionic/strerror_r.cpp
index 81120ecd3..5f2d36214 100644
--- a/libc/bionic/strerror_r.cpp
+++ b/libc/bionic/strerror_r.cpp
@@ -34,7 +34,7 @@ extern "C" __LIBC_HIDDEN__ const char* __strerror_lookup(int error_number) {
 }
 
 static const Pair _sys_signal_strings[] = {
-#define  __BIONIC_SIGDEF(x,y,z)  { y, z },
+#define  __BIONIC_SIGDEF(signal_number, signal_description)  { signal_number, signal_description },
 #include <sys/_sigdefs.h>
   { 0, NULL }
 };
diff --git a/libc/bionic/siglist.c b/libc/bionic/sys_siglist.c
index f1c337785..3cfddbfc4 100644
--- a/libc/bionic/siglist.c
+++ b/libc/bionic/sys_siglist.c
@@ -25,9 +25,10 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+
 #include <signal.h>
 
-const char * const sys_siglist[NSIG] = {
-#define  __BIONIC_SIGDEF(x,y,z)   [ SIG##x ] = z,
+const char* const sys_siglist[NSIG] = {
+#define __BIONIC_SIGDEF(signal_number, signal_description) [ signal_number ] = signal_description,
 #include <sys/_sigdefs.h>
 };
diff --git a/libc/bionic/signame.c b/libc/bionic/sys_signame.c
index 4611e4448..41d34af83 100644
--- a/libc/bionic/signame.c
+++ b/libc/bionic/sys_signame.c
@@ -25,9 +25,14 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+
 #include <signal.h>
 
-const char * const sys_signame[NSIG] = {
-#define  __BIONIC_SIGDEF(x,y,z)   [ SIG##x ] = #x,
+#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