From ecb0b15fd095c6dee0c293f692749d8fbf6ceb71 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Mon, 16 Sep 2019 13:29:47 -0600
Subject: [PATCH] libs/libc/math/Kconfig:  Should select the NuttX float.h file
 automatically if the NuttX math library is selected.

---
 COPYING                | 10 ++++++++++
 libs/libc/math/Kconfig | 31 +++++++++++++++++--------------
 tools/Makefile.win     |  8 ++++----
 3 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/COPYING b/COPYING
index d0be8ba9c8..07779eeb0a 100644
--- a/COPYING
+++ b/COPYING
@@ -125,6 +125,16 @@ has a similar BSD style license:
    Copyright (c) 2001-2003, Adam Dunkels.
    All rights reserved.
 
+Rhombus Math Library
+====================
+
+The math library used in NuttX derives from the Rhombus OS by Nick Johnson
+(with many, many addtions).  The Rhombus OS is/was distributed under the ISC
+license.  The ISC licsense is a permissive license that allows people do
+anything with your code with proper attribution and without warranty.  The
+ISC license is functionally equivalent to the BSD 2-Clause and MIT licenses,
+removing some language that is no longer necessary.
+
 IGMP
 ===
 
diff --git a/libs/libc/math/Kconfig b/libs/libc/math/Kconfig
index c7e5feb991..212e6162da 100644
--- a/libs/libc/math/Kconfig
+++ b/libs/libc/math/Kconfig
@@ -9,23 +9,26 @@ config LIBM
 	bool "Standard Math library"
 	default n
 	depends on !ARCH_MATH_H
+	select ARCH_FLOAT_H
 	---help---
-		By default, no math library will be provided by NuttX.  In this this case, it
-		is assumed that (1) no math library is required, or (2) you will be using the
-		math.h header file and the libm library provided by your toolchain.
+		By default, no math library will be provided by NuttX.  In this this
+		case, it is assumed that (1) no math library is required, or (2) you
+		will be using the math.h and float.h headers file and the libm
+		library provided by your toolchain.
 
-		This is may be a very good choice is possible because your toolchain may have
-		have a highly optimized version of libm.
+		This is may be a very good choice is possible because your toolchain
+		may have have a highly optimized version of libm.
 
-		Another possibility is that you have a custom, architecture-specific math
-		libary and that the corresponding math.h file resides at arch/<architecture>/include/math.h.
-		The option is selected via ARCH_MATH_H.  If ARCH_MATH_H is selected,then the
-		include/nuttx/libmath.h header file will be copied to include/math.h where it can
-		be used by your applications.
+		Another possibility is that you have a custom, architecture-specific
+		math libary and that the corresponding math.h file resides at
+		arch/<architecture>/include/math.h.  The option is selected via
+		CONFIG_ARCH_MATH_H.  If ARCH_MATH_H is selected,then the
+		include/nuttx/libmath.h header file will be copied to include/math.h
+		where it can be used by your applications.
 
-		If ARCH_MATH_H is not defined, then this option can be selected to build a generic,
-		math library built into NuttX.  This math library comes from the Rhombus OS and
-		was written by Nick Johnson.  The Rhombus OS math library port was contributed by
-		Darcy Gong.
+		If ARCH_MATH_H is not defined, then this option can be selected to
+		build a generic, math library built into NuttX.  This math library
+		comes from the Rhombus OS and was written by Nick Johnson.  The
+		Rhombus OS math library port was contributed by Darcy Gong.
 
 #endmenu # Math Library Support
diff --git a/tools/Makefile.win b/tools/Makefile.win
index 1fe2962dc5..8fee692b7e 100644
--- a/tools/Makefile.win
+++ b/tools/Makefile.win
@@ -214,7 +214,7 @@ endif
 
 ifeq ($(NEED_MATH_H),y)
 include\math.h: include\nuttx\math.h
-	$(Q) cp -f include\nuttx\math.h include\math.h
+	$(Q) cp -pf include\nuttx\math.h include\math.h
 else
 include\math.h:
 endif
@@ -227,7 +227,7 @@ endif
 
 ifeq ($(CONFIG_ARCH_FLOAT_H),y)
 include\float.h: include\nuttx\float.h
-	$(Q) cp -f include\nuttx\float.h include\float.h
+	$(Q) cp -pf include\nuttx\float.h include\float.h
 else
 include\float.h:
 endif
@@ -239,7 +239,7 @@ endif
 
 ifeq ($(CONFIG_ARCH_STDARG_H),y)
 include\stdarg.h: include\nuttx\stdarg.h
-	$(Q) cp -f include\nuttx\stdarg.h include\stdarg.h
+	$(Q) cp -pf include\nuttx\stdarg.h include\stdarg.h
 else
 include\stdarg.h:
 endif
@@ -251,7 +251,7 @@ endif
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
 include\setjmp.h: include\nuttx\setjmp.h
-	$(Q) cp -f include\nuttx\setjmp.h include\setjmp.h
+	$(Q) cp -pf include\nuttx\setjmp.h include\setjmp.h
 else
 include\setjmp.h:
 endif