syscalls/rt_sigsuspend01: ignore reserved signals

index c8c228a47..edc913b44 100644
@@ -87,19 +87,22 @@ int main(int ac, char **av)
 			SIGSETSIZE));
 		TEST(alarm(0));
 		if (result == -1 && TEST_ERRNO != EINTR) {
+			int i;
 			TEST(ltp_syscall(__NR_rt_sigprocmask, SIG_UNBLOCK, 0,
 				&set2, SIGSETSIZE));
-			if (TEST_RETURN == -1) {
+			if (TEST_RETURN == -1)
 				tst_brkm(TFAIL | TTERRNO, cleanup,
 					 "rt_sigprocmask failed");
-			} else if (memcmp(&set1, &set2,
-				   sizeof(unsigned long))) {
-				tst_brkm(TFAIL | TTERRNO, cleanup,
+			for (i = 1; i < SIGRTMAX; i++) {
+				if (i >= __SIGRTMIN && i < SIGRTMIN)
+					continue;
+				if (sigismember(&set1, i) !=
+				    sigismember(&set2, i))
+					tst_brkm(TFAIL | TTERRNO, cleanup,
 					 "rt_sigsuspend failed to "
 					 "preserve signal mask");
-			} else {
-				tst_resm(TPASS, "rt_sigsuspend PASSED");
 			}
+			tst_resm(TPASS, "rt_sigsuspend PASSED");
 		} else {
 			tst_resm(TFAIL | TTERRNO, "rt_sigsuspend failed");
 		}

index fdd0e736d..d1d4b0b06 100644
@@ -55,16 +55,6 @@
 # define NSIG _NSIG
 #endif
 
-/* Needed for NPTL */
-#define SIGCANCEL 32
-#define SIGTIMER 33
-
-/* Reserved in Android's bionic libc */
-#ifdef __ANDROID__
-# define SIGLIBCORE 34
-# define SIGDEBUGGERD 35
-#endif
-
 /* ensure NUMSIGS is defined */
 #ifndef NUMSIGS
 # define NUMSIGS NSIG

@@ -83,17 +73,14 @@ static int sigs_map[NUMSIGS];
 
 static int skip_sig(int sig)
 {
+	if (sig >= __SIGRTMIN && sig < SIGRTMIN)
+		return 1;
+
 	switch (sig) {
 	case SIGCHLD:
 	case SIGKILL:
 	case SIGALRM:
 	case SIGSTOP:
-	case SIGCANCEL:
-	case SIGTIMER:
-#ifdef __ANDROID__
-	case SIGLIBCORE:
-	case SIGDEBUGGERD:
-#endif
 		return 1;
 	default:
 		return 0;