From f2185d109930fb5db31a5c228a3f46178072f270 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 30 Sep 2020 11:31:58 +0200 Subject: Decouple the C Program Heap initialization Before this patch RTEMS_Malloc_Initialize() had a fixed dependency on _Workspace_Area. Introduce _Workspace_Malloc_initializer to have this dependency only if CONFIGURE_UNIFIED_WORK_AREAS is defined by the application configuration. --- cpukit/Makefile.am | 3 +++ 1 file changed, 3 insertions(+) (limited to 'cpukit/Makefile.am') diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index 2c35354e66..1f9124e175 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -176,6 +176,7 @@ 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/mallocheap.c librtemscpu_a_SOURCES += libcsupport/src/mallocinfo.c librtemscpu_a_SOURCES += libcsupport/src/malloc_initialize.c librtemscpu_a_SOURCES += libcsupport/src/_malloc_r.c @@ -1025,6 +1026,8 @@ librtemscpu_a_SOURCES += score/src/interr.c librtemscpu_a_SOURCES += score/src/isr.c librtemscpu_a_SOURCES += score/src/wkspace.c librtemscpu_a_SOURCES += score/src/wkspaceisunifieddefault.c +librtemscpu_a_SOURCES += score/src/wkspacemallocinitdefault.c +librtemscpu_a_SOURCES += score/src/wkspacemallocinitunified.c librtemscpu_a_SOURCES += score/src/wkstringduplicate.c librtemscpu_a_SOURCES += score/src/iobase64.c librtemscpu_a_SOURCES += score/src/ioprintf.c -- cgit v1.2.3