am 2039949b: am 967cd1bc: Merge "Fix sigaction(3) for 64-bit."

* commit '2039949b225a3f6414250385b8d814440c24bab5': Fix sigaction(3) for 64-bit.
2013-10-17 11:52:30 -07:00
parent 811b0cdb2d 2039949b22
commit 7efbac17bf
20 changed files with 358 additions and 126 deletions
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -126,7 +126,6 @@ libc_common_src_files := \
 	bionic/sigblock.c \
 	bionic/siginterrupt.c \
 	bionic/siglist.c \
-	bionic/signal.c \
 	bionic/signame.c \
 	bionic/sigsetmask.c \
 	bionic/sleep.c \
@@ -247,6 +246,13 @@ libc_bionic_src_files := \
    bionic/seteuid.cpp \
    bionic/setlocale.cpp \
    bionic/signalfd.cpp \
+    bionic/sigaction.cpp \
+    bionic/sigaddset.cpp \
+    bionic/sigdelset.cpp \
+    bionic/sigemptyset.cpp \
+    bionic/sigfillset.cpp \
+    bionic/sigismember.cpp \
+    bionic/signal.cpp \
    bionic/sigpending.cpp \
    bionic/sigprocmask.cpp \
    bionic/sigsuspend.cpp \