diff --git a/libc/machine/Kconfig b/libc/machine/Kconfig
index d6bc6febb89..db468f6db16 100644
--- a/libc/machine/Kconfig
+++ b/libc/machine/Kconfig
@@ -66,7 +66,7 @@ config LIBC_ARCHOPT
 	select LIBM_ARCH_RINTF if CONFIG_ARCH_FPU
 	select LIBM_ARCH_ROUNDF if CONFIG_ARCH_FPU
 	select LIBM_ARCH_TRUNCF if CONFIG_ARCH_FPU
-	depends on ARM && LIBM
+	depends on ARCH_ARM && LIBM
 	---help---
 		Enable architecture specific optimizations.  Currently only
 		available for use with ARM and only for the NuttX math library.
diff --git a/libc/machine/arm/lib_ceil.c b/libc/machine/arm/lib_ceil.c
index 25d93a877b2..f78df16494c 100644
--- a/libc/machine/arm/lib_ceil.c
+++ b/libc/machine/arm/lib_ceil.c
@@ -1,6 +1,10 @@
 /****************************************************************************
  * libc/machine/arm/lib_ceil.c
  *
+ *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
+ *
+ * Adapted for NuttX from BSD licensed code provided by ARM:
+ *
  *   Copyright (c) 2011, 2012 ARM Ltd.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/libc/machine/arm/lib_ceilf.c b/libc/machine/arm/lib_ceilf.c
index 3f80b07bff7..6127b46547d 100644
--- a/libc/machine/arm/lib_ceilf.c
+++ b/libc/machine/arm/lib_ceilf.c
@@ -1,6 +1,10 @@
 /****************************************************************************
  * libc/machine/arm/lib_ceilf.c
  *
+ *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
+ *
+ * Adapted for NuttX from BSD licensed code provided by ARM:
+ *
  *   Copyright (c) 2011, 2012 ARM Ltd.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/libc/machine/arm/lib_floor.c b/libc/machine/arm/lib_floor.c
index 8957aeb80c9..9d180d421a1 100644
--- a/libc/machine/arm/lib_floor.c
+++ b/libc/machine/arm/lib_floor.c
@@ -1,6 +1,10 @@
 /****************************************************************************
  * libc/machine/arm/lib_floor.c
  *
+ *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
+ *
+ * Adapted for NuttX from BSD licensed code provided by ARM:
+ *
  *   Copyright (c) 2011, 2012 ARM Ltd.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/libc/machine/arm/lib_floorf.c b/libc/machine/arm/lib_floorf.c
index 4e7112e1488..30890232a92 100644
--- a/libc/machine/arm/lib_floorf.c
+++ b/libc/machine/arm/lib_floorf.c
@@ -1,6 +1,10 @@
 /****************************************************************************
  * libc/machine/arm/lib_floorf.c
  *
+ *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
+ *
+ * Adapted for NuttX from BSD licensed code provided by ARM:
+ *
  *   Copyright (c) 2011, 2012 ARM Ltd.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/libc/machine/arm/lib_nearbyint.c b/libc/machine/arm/lib_nearbyint.c
index 2718ce5f615..16bf2ee3021 100644
--- a/libc/machine/arm/lib_nearbyint.c
+++ b/libc/machine/arm/lib_nearbyint.c
@@ -1,6 +1,10 @@
 /****************************************************************************
  * libc/machine/arm/lib_nearbyint.c
  *
+ *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
+ *
+ * Adapted for NuttX from BSD licensed code provided by ARM:
+ *
  *   Copyright (c) 2011, 2012 ARM Ltd.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/libc/machine/arm/lib_nearbyintf.c b/libc/machine/arm/lib_nearbyintf.c
index 81158dc4c28..d91340e5f45 100644
--- a/libc/machine/arm/lib_nearbyintf.c
+++ b/libc/machine/arm/lib_nearbyintf.c
@@ -1,6 +1,10 @@
 /****************************************************************************
  * libc/machine/arm/lib_nearbyintf.c
  *
+ *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
+ *
+ * Adapted for NuttX from BSD licensed code provided by ARM:
+ *
  *   Copyright (c) 2011, 2012 ARM Ltd.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/libc/machine/arm/lib_rint.c b/libc/machine/arm/lib_rint.c
index d085486cc0e..53c3d3d3fd5 100644
--- a/libc/machine/arm/lib_rint.c
+++ b/libc/machine/arm/lib_rint.c
@@ -1,6 +1,10 @@
 /****************************************************************************
  * libc/machine/arm/lib_rint.c
  *
+ *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
+ *
+ * Adapted for NuttX from BSD licensed code provided by ARM:
+ *
  *   Copyright (c) 2011, 2012 ARM Ltd.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/libc/machine/arm/lib_rintf.c b/libc/machine/arm/lib_rintf.c
index f57cddd5dc4..85b76066301 100644
--- a/libc/machine/arm/lib_rintf.c
+++ b/libc/machine/arm/lib_rintf.c
@@ -1,6 +1,10 @@
 /****************************************************************************
  * libc/machine/arm/lib_rintf.c
  *
+ *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
+ *
+ * Adapted for NuttX from BSD licensed code provided by ARM:
+ *
  *   Copyright (c) 2011, 2012 ARM Ltd.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/libc/machine/arm/lib_round.c b/libc/machine/arm/lib_round.c
index df371770063..b3926392a63 100644
--- a/libc/machine/arm/lib_round.c
+++ b/libc/machine/arm/lib_round.c
@@ -1,6 +1,10 @@
 /****************************************************************************
  * libc/machine/arm/lib_round.c
  *
+ *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
+ *
+ * Adapted for NuttX from BSD licensed code provided by ARM:
+ *
  *   Copyright (c) 2011, 2012 ARM Ltd.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/libc/machine/arm/lib_roundf.c b/libc/machine/arm/lib_roundf.c
index 24db1080579..ea5141935ba 100644
--- a/libc/machine/arm/lib_roundf.c
+++ b/libc/machine/arm/lib_roundf.c
@@ -1,6 +1,10 @@
 /****************************************************************************
  * libc/machine/arm/lib_roundf.c
  *
+ *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
+ *
+ * Adapted for NuttX from BSD licensed code provided by ARM:
+ *
  *   Copyright (c) 2011, 2012 ARM Ltd.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/libc/machine/arm/lib_trunc.c b/libc/machine/arm/lib_trunc.c
index d7c6369adf3..55d0d1e6595 100644
--- a/libc/machine/arm/lib_trunc.c
+++ b/libc/machine/arm/lib_trunc.c
@@ -1,6 +1,10 @@
 /****************************************************************************
  * libc/machine/arm/lib_trunc.c
  *
+ *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
+ *
+ * Adapted for NuttX from BSD licensed code provided by ARM:
+ *
  *   Copyright (c) 2011, 2012 ARM Ltd.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/libc/machine/arm/lib_truncf.c b/libc/machine/arm/lib_truncf.c
index a416bb8f4c6..1e3362dc281 100644
--- a/libc/machine/arm/lib_truncf.c
+++ b/libc/machine/arm/lib_truncf.c
@@ -1,6 +1,10 @@
 /****************************************************************************
  * libc/machine/arm/lib_truncf.c
  *
+ *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
+ *
+ * Adapted for NuttX from BSD licensed code provided by ARM:
+ *
  *   Copyright (c) 2011, 2012 ARM Ltd.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without