[PATCH v2 33/44] config: Add <rtems/confdefs/newlib.h>

[Sebastian Huber]

Remove all comments and copyrightable content from the moved content.
Use BSD-2-Clause license for new file.

Update #3053.
Update #3875.
---
 cpukit/headers.am                      |  1 +
 cpukit/include/rtems/confdefs.h        | 24 +-----------
 cpukit/include/rtems/confdefs/newlib.h | 72 ++++++++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 22 deletions(-)
 create mode 100644 cpukit/include/rtems/confdefs/newlib.h

diff --git a/cpukit/headers.am b/cpukit/headers.am
index 60a3687db8..1a23ce5608 100644
--- a/cpukit/headers.am
+++ b/cpukit/headers.am
@@ -190,6 +190,7 @@ include_rtems_confdefs_HEADERS += include/rtems/confdefs/libio.h
 include_rtems_confdefs_HEADERS += include/rtems/confdefs/libpci.h
 include_rtems_confdefs_HEADERS += include/rtems/confdefs/malloc.h
 include_rtems_confdefs_HEADERS += include/rtems/confdefs/mpci.h
+include_rtems_confdefs_HEADERS += include/rtems/confdefs/newlib.h
 include_rtems_confdefs_HEADERS += include/rtems/confdefs/obsolete.h
 include_rtems_confdefs_HEADERS += include/rtems/confdefs/percpu.h
 include_rtems_confdefs_HEADERS += include/rtems/confdefs/scheduler.h
diff --git a/cpukit/include/rtems/confdefs.h b/cpukit/include/rtems/confdefs.h
index f4cbe43908..0e5038cf92 100644
--- a/cpukit/include/rtems/confdefs.h
+++ b/cpukit/include/rtems/confdefs.h
@@ -56,15 +56,12 @@
 #include <rtems/confdefs/libpci.h>
 #include <rtems/confdefs/malloc.h>
 #include <rtems/confdefs/mpci.h>
+#include <rtems/confdefs/newlib.h>
 #include <rtems/confdefs/percpu.h>
 #include <rtems/confdefs/scheduler.h>
 
 #include <limits.h>
 
-#ifdef RTEMS_NEWLIB
-  #include <sys/reent.h>
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -98,14 +95,6 @@ extern "C" {
  *        used remarkably reliably by most applications.
  */
 
-/**
- * This macro determines whether the RTEMS reentrancy support for
- * the Newlib C Library is enabled.
- */
-#ifdef RTEMS_SCHEDSIM
-  #undef RTEMS_NEWLIB
-#endif
-
 /**
  * @defgroup ConfigurationHelpers Configuration Helpers
  *
@@ -645,13 +634,6 @@ extern "C" {
   );
 #endif
 
-#if defined(RTEMS_NEWLIB) && !defined(CONFIGURE_DISABLE_NEWLIB_REENTRANCY)
-struct _reent *__getreent(void)
-{
-  return _Thread_Get_executing()->libc_reent;
-}
-#endif
-
 #endif
 
 /**
@@ -1005,9 +987,7 @@ struct _reent *__getreent(void)
     #if CONFIGURE_MAXIMUM_THREAD_NAME_SIZE > 1
       char name[ CONFIGURE_MAXIMUM_THREAD_NAME_SIZE ];
     #endif
-    #if !defined(RTEMS_SCHEDSIM) \
-      && defined(RTEMS_NEWLIB) \
-      && !defined(CONFIGURE_DISABLE_NEWLIB_REENTRANCY)
+    #ifdef _CONFIGURE_ENABLE_NEWLIB_REENTRANCY
       struct _reent Newlib;
     #else
       struct { /* Empty */ } Newlib;
diff --git a/cpukit/include/rtems/confdefs/newlib.h b/cpukit/include/rtems/confdefs/newlib.h
new file mode 100644
index 0000000000..5951eb83fb
--- /dev/null
+++ b/cpukit/include/rtems/confdefs/newlib.h
@@ -0,0 +1,72 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
+ *
+ * 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
+ */
+
+/**
+ * @file
+ *
+ * @ingroup RTEMSApplicationConfiguration
+ *
+ * @brief Evaluate Newlib Configuration Options
+ *
+ * This header file defines _CONFIGURE_ENABLE_NEWLIB_REENTRANCY for use by other
+ * configuration header files.
+ */
+
+#ifndef _RTEMS_CONFDEFS_NEWLIB_H
+#define _RTEMS_CONFDEFS_NEWLIB_H
+
+#ifndef __CONFIGURATION_TEMPLATE_h
+#error "Do not include this file directly, use <rtems/confdefs.h> instead"
+#endif
+
+#ifdef CONFIGURE_INIT
+
+#if defined(RTEMS_NEWLIB) && !defined(CONFIGURE_DISABLE_NEWLIB_REENTRANCY)
+  #include <rtems/score/percpu.h>
+  #include <rtems/score/thread.h>
+  #include <sys/reent.h>
+  #define _CONFIGURE_ENABLE_NEWLIB_REENTRANCY
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef _CONFIGURE_ENABLE_NEWLIB_REENTRANCY
+  struct _reent *__getreent( void )
+  {
+    return _Thread_Get_executing()->libc_reent;
+  }
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CONFIGURE_INIT */
+
+#endif /* _RTEMS_CONFDEFS_NEWLIB_H */
-- 
2.16.4