diff --git a/lib/libc/arm/arith.h b/lib/libc/arm/arith.h
index 86121bf9a80c..418f83f64ccb 100644
--- a/lib/libc/arm/arith.h
+++ b/lib/libc/arm/arith.h
@@ -1,16 +1,15 @@
 /*
  * MD header for contrib/gdtoa
  *
- * $FreeBSD$
- */
-
-/*
  * NOTE: The definitions in this file must be correct or strtod(3) and
  * floating point formats in printf(3) will break!  The file can be
  * generated by running contrib/gdtoa/arithchk.c on the target
  * architecture.  See contrib/gdtoa/gdtoaimp.h for details.
+ *
+ * Generated on CA15, verified on CA9, CA7(with VFP lite) and on 32-bit ARMv9.
+ *
  */
 
 #define IEEE_8087
 #define Arith_Kind_ASL 1
-#define Sudden_Underflow
+#define Double_Align
diff --git a/lib/libc/arm/gd_qnan.h b/lib/libc/arm/gd_qnan.h
index 8fa9edd83415..acf13d0b7852 100644
--- a/lib/libc/arm/gd_qnan.h
+++ b/lib/libc/arm/gd_qnan.h
@@ -1,23 +1,22 @@
 /*
  * MD header for contrib/gdtoa
  *
  * This file can be generated by compiling and running contrib/gdtoa/qnan.c
  * on the target architecture after arith.h has been generated.
  *
- * XXX I don't have ARM hardware, so I just guessed.  --das
+ * Generated on CA15, verified on CA9, CA7(with VFP lite) and on 32-bit ARMv9.
  *
- * $FreeBSD$
  */
 
 #define f_QNAN 0x7fc00000
 #define d_QNAN0 0x0
 #define d_QNAN1 0x7ff80000
 #define ld_QNAN0 0x0
-#define ld_QNAN1 0xc0000000
-#define ld_QNAN2 0x7fff
+#define ld_QNAN1 0x7ff80000
+#define ld_QNAN2 0x0
 #define ld_QNAN3 0x0
 #define ldus_QNAN0 0x0
 #define ldus_QNAN1 0x0
 #define ldus_QNAN2 0x0
-#define ldus_QNAN3 0xc000
-#define ldus_QNAN4 0x7fff
+#define ldus_QNAN3 0x7ff8
+#define ldus_QNAN4 0x0