build: FIXME build move heap files

4 files changed, 18 insertions, 20 deletions

diff --git a/spec/build/bsps/sparc/leon3/obj.yml b/spec/build/bsps/sparc/leon3/obj.yml
index 16084945c0..f82d0500d7 100644
--- a/spec/build/bsps/sparc/leon3/obj.yml
+++ b/spec/build/bsps/sparc/leon3/obj.yml
@@ -24,6 +24,8 @@ source:
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/dev/serial/console-termios.c
 - bsps/shared/start/sbrk.c
+- bsps/shared/start/mallocinitone.c
+- bsps/shared/start/wkspaceinitone.c
 - bsps/sparc/leon3/btimer/btimer.c
 - bsps/sparc/leon3/btimer/watchdog.c
 - bsps/sparc/leon3/console/console.c
diff --git a/spec/build/bsps/sparc/leon3/objqual.yml b/spec/build/bsps/sparc/leon3/objqual.yml
index 5c7e3063d8..d04fdb766a 100644
--- a/spec/build/bsps/sparc/leon3/objqual.yml
+++ b/spec/build/bsps/sparc/leon3/objqual.yml
@@ -30,8 +30,6 @@ source:
 - bsps/shared/irq/irq-default-handler.c
 - bsps/shared/start/bspreset-empty.c
 - bsps/shared/start/gettargethash-default.c
-- bsps/shared/start/mallocinitone.c
-- bsps/shared/start/wkspaceinitone.c
 - bsps/sparc/leon3/clock/ckinit.c
 - bsps/sparc/leon3/console/printk_support.c
 - bsps/sparc/leon3/start/amba.c
diff --git a/spec/build/cpukit/librtemscpu.yml b/spec/build/cpukit/librtemscpu.yml
index 76a26ad02f..62fea443e1 100644
--- a/spec/build/cpukit/librtemscpu.yml
+++ b/spec/build/cpukit/librtemscpu.yml
@@ -62,7 +62,6 @@ install:
   - cpukit/include/rtems/libcsupport.h
   - cpukit/include/rtems/linkersets.h
   - cpukit/include/rtems/malloc.h
-  - cpukit/include/rtems/mallocinitone.h
   - cpukit/include/rtems/print.h
   - cpukit/include/rtems/printer.h
   - cpukit/include/rtems/scheduler.h
@@ -226,8 +225,6 @@ install:
   - cpukit/include/rtems/score/watchdog.h
   - cpukit/include/rtems/score/watchdogimpl.h
   - cpukit/include/rtems/score/watchdogticks.h
-  - cpukit/include/rtems/score/wkspace.h
-  - cpukit/include/rtems/score/wkspaceinitone.h
   - cpukit/include/rtems/score/wkspacedata.h
 - destination: ${BSP_INCLUDEDIR}/sys
   source:
@@ -260,16 +257,10 @@ links:
 - role: build-dependency
   uid: vckey
 source:
-- cpukit/libcsupport/src/alignedalloc.c
-- cpukit/libcsupport/src/malloc_deferred.c
-- cpukit/libcsupport/src/mallocdirtydefault.c
-- cpukit/libcsupport/src/mallocextenddefault.c
-- cpukit/libcsupport/src/mallocheap.c
 - cpukit/libcsupport/src/printk.c
 - cpukit/libcsupport/src/printk_plugin.c
 - cpukit/libcsupport/src/print_printf.c
 - cpukit/libcsupport/src/rtemscalloc.c
-- cpukit/libcsupport/src/rtems_heap_null_extend.c
 - cpukit/libcsupport/src/rtems_put_char.c
 - cpukit/libcsupport/src/rtems_putc.c
 - cpukit/libcsupport/src/vprintk.c
@@ -389,7 +380,6 @@ source:
 - cpukit/score/src/apimutexunlock.c
 - cpukit/score/src/chain.c
 - cpukit/score/src/chainnodecount.c
-- cpukit/score/src/configstackspacesize.c
 - cpukit/score/src/corebarrier.c
 - cpukit/score/src/corebarrierwait.c
 - cpukit/score/src/coremsg.c
@@ -399,7 +389,6 @@ source:
 - cpukit/score/src/coremsginsert.c
 - cpukit/score/src/coremsgseize.c
 - cpukit/score/src/coremsgsubmit.c
-- cpukit/score/src/coremsgwkspace.c
 - cpukit/score/src/coremutexseize.c
 - cpukit/score/src/coresem.c
 - cpukit/score/src/coretod.c
@@ -407,8 +396,6 @@ source:
 - cpukit/score/src/coretodhookrun.c
 - cpukit/score/src/coretodset.c
 - cpukit/score/src/hash.c
-- cpukit/score/src/heap.c
-- cpukit/score/src/heapallocate.c
 - cpukit/score/src/interr.c
 - cpukit/score/src/iobase64.c
 - cpukit/score/src/ioprintf.c
@@ -424,15 +411,12 @@ source:
 - cpukit/score/src/objectallocatestatic.c
 - cpukit/score/src/objectapimaximumclass.c
 - cpukit/score/src/objectclose.c
-- cpukit/score/src/objectfree.c
 - cpukit/score/src/objectfreestatic.c
 - cpukit/score/src/objectgetinfo.c
 - cpukit/score/src/objectgetinfoid.c
 - cpukit/score/src/objectgetlocal.c
-- cpukit/score/src/objectgetnameasstring.c
 - cpukit/score/src/objectgetnoprotection.c
 - cpukit/score/src/objectinitializeinformation.c
-- cpukit/score/src/objectnamespaceremove.c
 - cpukit/score/src/objectnametoid.c
 - cpukit/score/src/percpu.c
 - cpukit/score/src/processormaskcopy.c
@@ -458,10 +442,8 @@ source:
 - cpukit/score/src/schedulerpriorityyield.c
 - cpukit/score/src/schedulersetaffinity.c
 - cpukit/score/src/smpbarrierwait.c
-- cpukit/score/src/stackallocator.c
 - cpukit/score/src/stackallocatorfreenothing.c
 - cpukit/score/src/thread.c
-- cpukit/score/src/threadallocateunlimited.c
 - cpukit/score/src/threadchangepriority.c
 - cpukit/score/src/threadclearstate.c
 - cpukit/score/src/threadcreateidle.c
diff --git a/spec/build/cpukit/objrtemscpunoqual.yml b/spec/build/cpukit/objrtemscpunoqual.yml
index 1c2a20b63e..f543a2aa33 100644
--- a/spec/build/cpukit/objrtemscpunoqual.yml
+++ b/spec/build/cpukit/objrtemscpunoqual.yml
@@ -100,6 +100,7 @@ install:
   - cpukit/include/rtems/libi2c.h
   - cpukit/include/rtems/libio_.h
   - cpukit/include/rtems/libio.h
+  - cpukit/include/rtems/mallocinitone.h
   - cpukit/include/rtems/media.h
   - cpukit/include/rtems/monitor.h
   - cpukit/include/rtems/mouse_parser.h
@@ -226,6 +227,8 @@ install:
   - cpukit/include/rtems/score/schedulersimplesmp.h
   - cpukit/include/rtems/score/schedulerstrongapa.h
   - cpukit/include/rtems/score/threadmp.h
+  - cpukit/include/rtems/score/wkspace.h
+  - cpukit/include/rtems/score/wkspaceinitone.h
 - destination: ${BSP_INCLUDEDIR}/rtems/trace
   source:
   - cpukit/include/rtems/trace/rtems-trace-buffer-vars.h
@@ -351,6 +354,7 @@ source:
 - cpukit/libcrypt/crypt-sha256.c
 - cpukit/libcrypt/crypt-sha512.c
 - cpukit/libcrypt/misc.c
+- cpukit/libcsupport/src/alignedalloc.c
 - cpukit/libcsupport/src/access.c
 - cpukit/libcsupport/src/arc4random_getentropy_fail.c
 - cpukit/libcsupport/src/__assert.c
@@ -444,9 +448,13 @@ source:
 - cpukit/libcsupport/src/lseek.c
 - cpukit/libcsupport/src/lstat.c
 - cpukit/libcsupport/src/malloc.c
+- cpukit/libcsupport/src/malloc_deferred.c
 - cpukit/libcsupport/src/malloc_dirtier.c
+- cpukit/libcsupport/src/mallocdirtydefault.c
+- cpukit/libcsupport/src/mallocextenddefault.c
 - cpukit/libcsupport/src/mallocfreespace.c
 - cpukit/libcsupport/src/mallocgetheapptr.c
+- cpukit/libcsupport/src/mallocheap.c
 - cpukit/libcsupport/src/mallocinfo.c
 - cpukit/libcsupport/src/_malloc_r.c
 - cpukit/libcsupport/src/mallocsetheapptr.c
@@ -483,6 +491,7 @@ source:
 - cpukit/libcsupport/src/rtems_heap_extend.c
 - cpukit/libcsupport/src/rtems_heap_extend_via_sbrk.c
 - cpukit/libcsupport/src/rtems_heap_greedy.c
+- cpukit/libcsupport/src/rtems_heap_null_extend.c
 - cpukit/libcsupport/src/rtems_heap_sbrk_greedy.c
 - cpukit/libcsupport/src/rtems_memalign.c
 - cpukit/libcsupport/src/rtems_mkdir.c
@@ -1019,7 +1028,9 @@ source:
 - cpukit/sapi/src/sysinitverbose.c
 - cpukit/sapi/src/tcsimpleinstall.c
 - cpukit/score/src/condition.c
+- cpukit/score/src/configstackspacesize.c
 - cpukit/score/src/coremsgflushwait.c
+- cpukit/score/src/coremsgwkspace.c
 - cpukit/score/src/corerwlock.c
 - cpukit/score/src/corerwlockobtainread.c
 - cpukit/score/src/corerwlockobtainwrite.c
@@ -1031,6 +1042,8 @@ source:
 - cpukit/score/src/debugisthreaddispatchingallowed.c
 - cpukit/score/src/freechain.c
 - cpukit/score/src/futex.c
+- cpukit/score/src/heap.c
+- cpukit/score/src/heapallocate.c
 - cpukit/score/src/heapextend.c
 - cpukit/score/src/heapfree.c
 - cpukit/score/src/heapgetfreeinfo.c
@@ -1053,6 +1066,8 @@ source:
 - cpukit/score/src/objectallocateunlimited.c
 - cpukit/score/src/objectclose.c
 - cpukit/score/src/objectextendinformation.c
+- cpukit/score/src/objectfree.c
+- cpukit/score/src/objectgetnameasstring.c
 - cpukit/score/src/objectgetnext.c
 - cpukit/score/src/objectidtoname.c
 - cpukit/score/src/objectnamespaceremove.c
@@ -1105,6 +1120,7 @@ source:
 - cpukit/score/src/schedulersimpleunblock.c
 - cpukit/score/src/schedulersimpleyield.c
 - cpukit/score/src/semaphore.c
+- cpukit/score/src/stackallocator.c
 - cpukit/score/src/stackallocatorinit.c
 - cpukit/score/src/stackallocatorfree.c
 - cpukit/score/src/threadallocateunlimited.c