Index: head/lib/libc/sys/ptrace.2
===================================================================
--- head/lib/libc/sys/ptrace.2
+++ head/lib/libc/sys/ptrace.2
@@ -2,7 +2,7 @@
 .\"	$NetBSD: ptrace.2,v 1.2 1995/02/27 12:35:37 cgd Exp $
 .\"
 .\" This file is in the public domain.
-.Dd June 11, 2017
+.Dd September 14, 2017
 .Dt PTRACE 2
 .Os
 .Sh NAME
@@ -762,6 +762,28 @@
 .Fa data
 argument is ignored.
 .El
+.Sh ARM MACHINE-SPECIFIC REQUESTS
+.Bl -tag -width "Dv PT_SETVFPREGS"
+.It Dv PT_GETVFPREGS
+Return the thread's
+.Dv VFP
+machine state in the buffer pointed to by
+.Fa addr .
+.Pp
+The
+.Fa data
+argument is ignored.
+.It Dv PT_SETVFPREGS
+Set the thread's
+.Dv VFP
+machine state from the buffer pointed to by
+.Fa addr .
+.Pp
+The
+.Fa data
+argument is ignored.
+.El
+.Pp
 .Sh x86 MACHINE-SPECIFIC REQUESTS
 .Bl -tag -width "Dv PT_GETXSTATE_INFO"
 .It Dv PT_GETXMMREGS
Index: head/sys/arm/arm/ptrace_machdep.c
===================================================================
--- head/sys/arm/arm/ptrace_machdep.c
+++ head/sys/arm/arm/ptrace_machdep.c
@@ -0,0 +1,63 @@
+/*-
+ * Copyright (c) 2017 John Baldwin <jhb@FreeBSD.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+#include <sys/proc.h>
+#include <sys/ptrace.h>
+#ifdef VFP
+#include <machine/vfp.h>
+#endif
+
+int
+cpu_ptrace(struct thread *td, int req, void *addr, int data)
+{
+#ifdef VFP
+	mcontext_vfp_t vfp;
+#endif
+	int error;
+
+	switch (req) {
+#ifdef VFP
+	case PT_GETVFPREGS:
+		get_vfpcontext(td, &vfp);
+		error = copyout(&vfp, addr, sizeof(vfp));
+		break;
+	case PT_SETVFPREGS:
+		error = copyin(addr, &vfp, sizeof(vfp));
+		if (error == 0)
+			set_vfpcontext(td, &vfp);
+		break;
+#endif
+	default:
+		error = EINVAL;
+	}
+
+	return (error);
+}
Index: head/sys/arm/include/ptrace.h
===================================================================
--- head/sys/arm/include/ptrace.h
+++ head/sys/arm/include/ptrace.h
@@ -4,5 +4,20 @@
 #ifndef _MACHINE_PTRACE_H_
 #define _MACHINE_PTRACE_H_
 
+#define	__HAVE_PTRACE_MACHDEP
+
+/*
+ * Must match mcontext_vfp_t.  Note that mcontext_vfp_t does not
+ * include explicit padding.
+ */
+struct vfpreg {
+	__uint64_t	vfp_reg[32];
+	__uint32_t	vfp_scr;
+	__uint32_t	vfp_pad0;
+};
+
+#define	PT_GETVFPREGS	(PT_FIRSTMACH + 0)
+#define	PT_SETVFPREGS	(PT_FIRSTMACH + 1)
+
 #endif /* !_MACHINE_PTRACE_H */
 
Index: head/sys/conf/files.arm
===================================================================
--- head/sys/conf/files.arm
+++ head/sys/conf/files.arm
@@ -88,6 +88,7 @@
 arm/arm/pmap-v4.c		optional	!armv6
 arm/arm/pmap-v6.c		optional	armv6
 arm/arm/pmu.c			optional	pmu | fdt hwpmc
+arm/arm/ptrace_machdep.c	standard
 arm/arm/sc_machdep.c		optional	sc
 arm/arm/setcpsr.S		standard
 arm/arm/setstack.s		standard