diff options
author | Enji Cooper <ngie@FreeBSD.org> | 2017-01-14 08:47:00 +0000 |
---|---|---|
committer | Enji Cooper <ngie@FreeBSD.org> | 2017-01-14 08:47:00 +0000 |
commit | 7bb9bc9cc2a4eb528c72b92d42f015ddcd3ce54b (patch) | |
tree | 4e61d3f68c9641967cb3f8466f09f256f5110443 /contrib | |
parent | 0e6a2253dcf5619d1a0e56dfda50e73d7b7594f0 (diff) | |
download | src-7bb9bc9cc2a4eb528c72b92d42f015ddcd3ce54b.tar.gz src-7bb9bc9cc2a4eb528c72b92d42f015ddcd3ce54b.zip |
Try to consolidate the #ifdef soup into FreeBSD vs non-FreeBSD blocks better
Notes
Notes:
svn path=/projects/netbsd-tests-upstream-01-2017/; revision=312145
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/netbsd-tests/lib/libc/sys/t_getcontext.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c b/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c index 9f21b3e344c0..beb6516e0938 100644 --- a/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c +++ b/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c @@ -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); |