Module Name: src
Committed By: christos
Date: Sat Mar 7 14:53:14 UTC 2020
Modified Files:
src/tests/lib/libc/sys: t_ptrace_wait.c t_ptrace_wait.h
Log Message:
Try to fix the build. This is why all those inlines should really be in a
separate file as regular function. The code is too large and hard to manage
this way, and only increases in complexity as time goes by.
To generate a diff of this commit:
cvs rdiff -u -r1.168 -r1.169 src/tests/lib/libc/sys/t_ptrace_wait.c
cvs rdiff -u -r1.24 -r1.25 src/tests/lib/libc/sys/t_ptrace_wait.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/sys/t_ptrace_wait.c
diff -u src/tests/lib/libc/sys/t_ptrace_wait.c:1.168 src/tests/lib/libc/sys/t_ptrace_wait.c:1.169
--- src/tests/lib/libc/sys/t_ptrace_wait.c:1.168 Fri Mar 6 09:06:56 2020
+++ src/tests/lib/libc/sys/t_ptrace_wait.c Sat Mar 7 09:53:14 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.168 2020/03/06 14:06:56 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.169 2020/03/07 14:53:14 christos Exp $ */
/*-
* Copyright (c) 2016, 2017, 2018, 2019 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.168 2020/03/06 14:06:56 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.169 2020/03/07 14:53:14 christos Exp $");
#define __LEGACY_PT_LWPINFO
@@ -60,11 +60,6 @@ __RCSID("$NetBSD: t_ptrace_wait.c,v 1.16
#include <time.h>
#include <unistd.h>
-#include <fenv.h>
-#if (__arm__ && !__SOFTFP__) || __aarch64__
-#include <ieeefp.h> /* only need for ARM Cortex/Neon hack */
-#endif
-
#if defined(__i386__) || defined(__x86_64__)
#include <cpuid.h>
#include <x86/cpu_extended_state.h>
Index: src/tests/lib/libc/sys/t_ptrace_wait.h
diff -u src/tests/lib/libc/sys/t_ptrace_wait.h:1.24 src/tests/lib/libc/sys/t_ptrace_wait.h:1.25
--- src/tests/lib/libc/sys/t_ptrace_wait.h:1.24 Fri Mar 6 12:03:35 2020
+++ src/tests/lib/libc/sys/t_ptrace_wait.h Sat Mar 7 09:53:14 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.h,v 1.24 2020/03/06 17:03:35 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.h,v 1.25 2020/03/07 14:53:14 christos Exp $ */
/*-
* Copyright (c) 2016, 2017, 2018, 2019 The NetBSD Foundation, Inc.
@@ -654,10 +654,14 @@ trigger_ill(void)
#endif
}
+#include <fenv.h>
+
+#if (__arm__ && !__SOFTFP__) || __aarch64__
+#include <ieeefp.h> /* only need for ARM Cortex/Neon hack */
+
static bool __used
are_fpu_exceptions_supported(void)
{
-#if (__arm__ && !__SOFTFP__) || __aarch64__
/*
* Some NEON fpus do not trap on IEEE 754 FP exceptions.
* Skip these tests if running on them and compiled for
@@ -665,9 +669,11 @@ are_fpu_exceptions_supported(void)
*/
if (0 == fpsetmask(fpsetmask(FP_X_INV)))
return false;
-#endif
return true;
}
+#else
+#define are_fpu_exceptions_supporter() 1
+#endif
static void __used
trigger_fpe(void)
