config: Add <rtems/confdefs/malloc.h>

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

Move the default configuration to library files so that application
configurations do not include the definitions for the default case.

Update #3053.
Update #3875.

6 files changed, 145 insertions, 39 deletions

diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index 189f525b7d..85b427848a 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -171,6 +171,8 @@ librtemscpu_a_SOURCES += libcsupport/src/lstat.c
 librtemscpu_a_SOURCES += libcsupport/src/malloc.c
 librtemscpu_a_SOURCES += libcsupport/src/malloc_deferred.c
 librtemscpu_a_SOURCES += libcsupport/src/malloc_dirtier.c
+librtemscpu_a_SOURCES += libcsupport/src/mallocdirtydefault.c
+librtemscpu_a_SOURCES += libcsupport/src/mallocextenddefault.c
 librtemscpu_a_SOURCES += libcsupport/src/mallocfreespace.c
 librtemscpu_a_SOURCES += libcsupport/src/mallocgetheapptr.c
 librtemscpu_a_SOURCES += libcsupport/src/mallocinfo.c
diff --git a/cpukit/headers.am b/cpukit/headers.am
index 10014ee489..84e9523718 100644
--- a/cpukit/headers.am
+++ b/cpukit/headers.am
@@ -187,6 +187,7 @@ include_rtems_confdefs_HEADERS += include/rtems/confdefs/bdbuf.h
 include_rtems_confdefs_HEADERS += include/rtems/confdefs/bsp.h
 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/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 15e921629b..4f1ba45de8 100644
--- a/cpukit/include/rtems/confdefs.h
+++ b/cpukit/include/rtems/confdefs.h
@@ -53,6 +53,7 @@
 #include <rtems/confdefs/bdbuf.h>
 #include <rtems/confdefs/libio.h>
 #include <rtems/confdefs/libpci.h>
+#include <rtems/confdefs/malloc.h>
 #include <rtems/confdefs/percpu.h>
 #include <rtems/confdefs/scheduler.h>
 
@@ -104,45 +105,6 @@ extern "C" {
 #endif
 
 /**
- * @defgroup ConfigurationMalloc RTEMS Malloc configuration
- *
- * This module contains parameters related to configuration of the RTEMS
- * Malloc implementation.
- */
-/**@{*/
-#include <rtems/malloc.h>
-
-#ifdef CONFIGURE_INIT
-  /**
-   * This configures the sbrk() support for the malloc family.
-   * By default it is assumed that the BSP provides all available
-   * RAM to the malloc family implementation so sbrk()'ing to get
-   * more memory would always fail anyway.
-   */
-  const rtems_heap_extend_handler rtems_malloc_extend_handler =
-    #ifdef CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK
-      rtems_heap_extend_via_sbrk;
-    #else
-      rtems_heap_null_extend;
-    #endif
-#endif
-
-#ifdef CONFIGURE_INIT
-  /**
-   * This configures the malloc family plugin which dirties memory
-   * allocated.  This is helpful for finding unitialized data structure
-   * problems.
-   */
-  rtems_malloc_dirtier_t rtems_malloc_dirty_helper =
-    #if defined(CONFIGURE_MALLOC_DIRTY)
-      rtems_malloc_dirty_memory;
-    #else
-      NULL;
-    #endif
-#endif
-/**@}*/  /* end of Malloc Configuration */
-
-/**
  * @defgroup ConfigurationHelpers Configuration Helpers
  *
  * @ingroup Configuration
diff --git a/cpukit/include/rtems/confdefs/malloc.h b/cpukit/include/rtems/confdefs/malloc.h
new file mode 100644
index 0000000000..4cd804023f
--- /dev/null
+++ b/cpukit/include/rtems/confdefs/malloc.h
@@ -0,0 +1,72 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
+/**
+ * @file
+ *
+ * @ingroup RTEMSApplicationConfiguration
+ *
+ * @brief Evaluate C Program Heap Configuration Options
+ */
+
+/*
+ * 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.
+ */
+
+#ifndef _RTEMS_CONFDEFS_MALLOC_H
+#define _RTEMS_CONFDEFS_MALLOC_H
+
+#ifndef __CONFIGURATION_TEMPLATE_h
+#error "Do not include this file directly, use <rtems/confdefs.h> instead"
+#endif
+
+#ifdef CONFIGURE_INIT
+
+#include <rtems/confdefs/bsp.h>
+
+#if defined(CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK) \
+  || defined(CONFIGURE_MALLOC_DIRTY)
+#include <rtems/malloc.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK
+const rtems_heap_extend_handler rtems_malloc_extend_handler =
+  rtems_heap_extend_via_sbrk;
+#endif
+
+#ifdef CONFIGURE_MALLOC_DIRTY
+rtems_malloc_dirtier_t rtems_malloc_dirty_helper =
+  rtems_malloc_dirty_memory;
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CONFIGURE_INIT */
+
+#endif /* _RTEMS_CONFDEFS_MALLOC_H */
diff --git a/cpukit/libcsupport/src/mallocdirtydefault.c b/cpukit/libcsupport/src/mallocdirtydefault.c
new file mode 100644
index 0000000000..aea2a93edd
--- /dev/null
+++ b/cpukit/libcsupport/src/mallocdirtydefault.c
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <rtems/malloc.h>
+
+rtems_malloc_dirtier_t rtems_malloc_dirty_helper = NULL;
diff --git a/cpukit/libcsupport/src/mallocextenddefault.c b/cpukit/libcsupport/src/mallocextenddefault.c
new file mode 100644
index 0000000000..a6741d834d
--- /dev/null
+++ b/cpukit/libcsupport/src/mallocextenddefault.c
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <rtems/malloc.h>
+
+const rtems_heap_extend_handler rtems_malloc_extend_handler =
+  rtems_heap_null_extend;