svn commit: r312145 - projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys

[Ngie Cooper]

Author: ngie
Date: Sat Jan 14 08:47:00 2017
New Revision: 312145
URL: https://svnweb.freebsd.org/changeset/base/312145

Log:
  Try to consolidate the #ifdef soup into FreeBSD vs non-FreeBSD blocks better

Modified:
  projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c

Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c
==============================================================================
--- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c	Sat Jan 14 08:39:53 2017	(r312144)
+++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c	Sat Jan 14 08:47:00 2017	(r312145)
@@ -51,12 +51,14 @@ run(int n, ...)
 	ATF_REQUIRE_EQ(n, DEPTH - calls - 1);
 
 	va_start(va, n);
-#if defined(__FreeBSD__) && defined(__amd64__)
+#ifdef __FreeBSD__
+#if defined(__amd64__)
 	for (i = 0; i < 5; i++) {
-#elif defined(__FreeBSD__) && defined(__aarch64__)
+#elif defined(__aarch64__)
 	for (i = 0; i < 7; i++) {
-#elif defined(__FreeBSD__) && defined(__mips__)
+#elif defined(__mips__)
 	for (i = 0; i < 5; i++) {
+#endif
 #else
 	for (i = 0; i < 9; i++) {
 #endif
@@ -116,18 +118,20 @@ ATF_TC_BODY(setcontext_link, tc)
 		uc[i].uc_stack.ss_size = STACKSZ;
 		uc[i].uc_link = (i > 0) ? &uc[i - 1] : &save;
 
-#if defined(__FreeBSD__) && defined(__amd64__)
+#ifdef __FreeBSD__
+#if defined(__amd64__)
 		/* FreeBSD/amd64 only permits up to 6 arguments. */
 		makecontext(&uc[i], (void *)run, 6, i,
 			0, 1, 2, 3, 4);
-#elif defined(__FreeBSD__) && defined(__aarch64__)
+#elif defined(__aarch64__)
 		/* FreeBSD/arm64 only permits up to 8 arguments. */
 		makecontext(&uc[i], (void *)run, 8, i,
 			0, 1, 2, 3, 4, 5, 6);
-#elif defined(__FreeBSD__) && defined(__mips__)
+#elif defined(__mips__)
 		/* FreeBSD/mips only permits up to 6 arguments. */
 		makecontext(&uc[i], (void *)run, 6, i,
 			0, 1, 2, 3, 4);
+#endif
 #else
 		makecontext(&uc[i], (void *)run, 10, i,
 			0, 1, 2, 3, 4, 5, 6, 7, 8);