Fix waf build for the latest changes.

8 files changed, 166 insertions, 156 deletions

diff --git a/c/wscript_sparc b/c/wscript_sparc
index aa7f47d8d8..06fea21b3a 100644
--- a/c/wscript_sparc
+++ b/c/wscript_sparc
@@ -234,7 +234,6 @@ def build(ctx):
 		"src/lib/libbsp/sparc/shared/startup/bspgetworkarea.c",
 		"src/lib/libbsp/sparc/shared/bsppretaskinghook.c",
 		"src/lib/libbsp/sparc/shared/irq_asm.S",
-		"src/lib/libcpu/sparc/cache/cache.c",
 		"src/lib/libcpu/sparc/syscall/syscall.S",
 		"src/lib/libcpu/sparc/reg_win/window.S"
 	]
diff --git a/cpukit/libcsupport/wscript b/cpukit/libcsupport/wscript
index 8fc14668ac..98a751c160 100644
--- a/cpukit/libcsupport/wscript
+++ b/cpukit/libcsupport/wscript
@@ -185,7 +185,6 @@ def build(ctx):
 		"src/lstat.c",
 		"src/pathconf.c",
 		"src/newlibc_reent.c",
-		"src/newlibc_init.c",
 		"src/newlibc_exit.c",
 		"src/kill_noposix.c",
 		"src/utsname.c"
@@ -235,7 +234,6 @@ def build(ctx):
 		"src/sup_fs_location.c",
 		"src/sup_fs_mount_iterate.c",
 		"src/sup_fs_next_token.c",
-		"src/sup_fs_node_type.c",
 		"src/rtems_heap_extend_via_sbrk.c",
 		"src/resource_snapshot.c",
 		"src/rtems_heap_greedy.c",
diff --git a/cpukit/libfs/wscript b/cpukit/libfs/wscript
index 51c12f1f72..89273b34d6 100644
--- a/cpukit/libfs/wscript
+++ b/cpukit/libfs/wscript
@@ -6,7 +6,6 @@ def build(ctx):
 		"src/devfs/devfs_eval.c",
 		"src/devfs/devfs_mknod.c",
 		"src/devfs/devfs_show.c",
-		"src/devfs/devfs_node_type.c",
 		"src/devfs/devopen.c",
 		"src/devfs/devread.c",
 		"src/devfs/devwrite.c",
@@ -37,7 +36,6 @@ def build(ctx):
 		"src/dosfs/msdos_initsupp.c",
 		"src/dosfs/msdos_misc.c",
 		"src/dosfs/msdos_mknod.c",
-		"src/dosfs/msdos_node_type.c",
 		"src/dosfs/msdos_conv.c",
 		"src/dosfs/msdos_format.c",
 		"src/dosfs/msdos_rename.c",
@@ -54,37 +52,34 @@ def build(ctx):
 
 	source_imfs = [
 		"src/imfs/deviceio.c",
-		"src/imfs/fifoimfs_init.c",
 		"src/imfs/imfs_chown.c",
 		"src/imfs/imfs_config.c",
 		"src/imfs/imfs_creat.c",
-		"src/imfs/imfs_debug.c",
-		"src/imfs/imfs_directory.c",
+		"src/imfs/imfs_dir.c",
+		"src/imfs/imfs_dir_default.c",
+		"src/imfs/imfs_dir_minimal.c",
 		"src/imfs/imfs_eval.c",
 		"src/imfs/imfs_fchmod.c",
 		"src/imfs/imfs_fifo.c",
 		"src/imfs/imfs_fsunmount.c",
 		"src/imfs/imfs_handlers_device.c",
-		"src/imfs/imfs_handlers_directory.c",
-		"src/imfs/imfs_handlers_link.c",
-		"src/imfs/imfs_handlers_memfile.c",
 		"src/imfs/imfs_init.c",
 		"src/imfs/imfs_initsupp.c",
+		"src/imfs/imfs_linfile.c",
 		"src/imfs/imfs_link.c",
 		"src/imfs/imfs_load_tar.c",
+		"src/imfs/imfs_make_generic_node.c",
+		"src/imfs/imfs_memfile.c",
 		"src/imfs/imfs_mknod.c",
 		"src/imfs/imfs_mount.c",
-		"src/imfs/imfs_ntype.c",
-		"src/imfs/imfs_readlink.c",
 		"src/imfs/imfs_rename.c",
 		"src/imfs/imfs_rmnod.c",
 		"src/imfs/imfs_stat.c",
+		"src/imfs/imfs_stat_file.c",
 		"src/imfs/imfs_symlink.c",
 		"src/imfs/imfs_unmount.c",
 		"src/imfs/imfs_utime.c",
 		"src/imfs/ioman.c",
-		"src/imfs/memfile.c",
-		"src/imfs/miniimfs_init.c"
 	]
 
 	ctx.cpu.source(
@@ -151,46 +146,44 @@ def build(ctx):
 	)
 
 	source += [
+		"src/defaults/default_are_nodes_equal.c",
+		"src/defaults/default_chown.c",
+		"src/defaults/default_clone.c",
+		"src/defaults/default_close.c",
+		"src/defaults/default_eval_path.c",
 		"src/defaults/default_fchmod.c",
+		"src/defaults/default_fcntl.c",
 		"src/defaults/default_freenode.c",
+		"src/defaults/default_fstat.c",
+		"src/defaults/default_fsunmount.c",
 		"src/defaults/default_fsync.c",
-		"src/defaults/default_link.c",
-		"src/defaults/default_read.c",
-		"src/defaults/default_rmnod.c",
-		"src/defaults/default_chown.c",
-		"src/defaults/default_fcntl.c",
-		"src/defaults/default_fsmount.c",
+		"src/defaults/default_fsync_success.c",
 		"src/defaults/default_ftruncate.c",
+		"src/defaults/default_ftruncate_directory.c",
+		"src/defaults/default_handlers.c",
+		"src/defaults/default_ioctl.c",
+		"src/defaults/default_kqfilter.c",
+		"src/defaults/default_link.c",
 		"src/defaults/default_lock_and_unlock.c",
 		"src/defaults/default_lseek.c",
-		"src/defaults/default_readlink.c",
-		"src/defaults/default_statvfs.c",
-		"src/defaults/default_utime.c",
-		"src/defaults/default_fstat.c",
-		"src/defaults/default_ioctl.c",
+		"src/defaults/default_lseek_directory.c",
+		"src/defaults/default_lseek_file.c",
+		"src/defaults/default_mknod.c",
 		"src/defaults/default_mount.c",
-		"src/defaults/default_rename.c",
-		"src/defaults/default_symlink.c",
-		"src/defaults/default_write.c",
-		"src/defaults/default_unmount.c",
 		"src/defaults/default_open.c",
-		"src/defaults/default_close.c",
-		"src/defaults/default_fsunmount.c",
-		"src/defaults/default_mknod.c",
-		"src/defaults/default_node_type.c",
-		"src/defaults/default_handlers.c",
 		"src/defaults/default_ops.c",
-		"src/defaults/default_eval_path.c",
-		"src/defaults/default_are_nodes_equal.c",
-		"src/defaults/default_clone.c",
-		"src/defaults/default_lseek_file.c",
-		"src/defaults/default_fsync_success.c",
-		"src/defaults/default_lseek_directory.c",
-		"src/defaults/default_ftruncate_directory.c",
 		"src/defaults/default_poll.c",
-		"src/defaults/default_kqfilter.c",
+		"src/defaults/default_read.c",
+		"src/defaults/default_readlink.c",
 		"src/defaults/default_readv.c",
-		"src/defaults/default_writev.c"
+		"src/defaults/default_rename.c",
+		"src/defaults/default_rmnod.c",
+		"src/defaults/default_statvfs.c",
+		"src/defaults/default_symlink.c",
+		"src/defaults/default_unmount.c",
+		"src/defaults/default_utime.c",
+		"src/defaults/default_write.c",
+		"src/defaults/default_writev.c",
 	]
 
 	ctx.cpu.source(
diff --git a/cpukit/libmisc/wscript b/cpukit/libmisc/wscript
index 2e6a4705f9..9fb2f9b11b 100644
--- a/cpukit/libmisc/wscript
+++ b/cpukit/libmisc/wscript
@@ -211,7 +211,11 @@ def build(ctx):
 		"stringto/stringtounsignedint.c",
 		"stringto/stringtounsignedlong.c",
 		"stringto/stringtounsignedlonglong.c",
-		"untar/untar.c"
+		"untar/untar.c",
+		"testsupport/testbeginend.c",
+		"testsupport/testextension.c",
+		"testsupport/testparallel.c"
+
 	]
 	ctx.cpu.source(
 		source,
diff --git a/cpukit/posix/wscript b/cpukit/posix/wscript
index 3c95d60dba..bf6bef2a5d 100644
--- a/cpukit/posix/wscript
+++ b/cpukit/posix/wscript
@@ -1,3 +1,4 @@
+
 def build(ctx):
 	source = []
 
@@ -20,6 +21,8 @@ def build(ctx):
 		"src/cancel.c",
 		"src/canceleval.c",
 		"src/cancelrun.c",
+		"src/cleanuppop.c",
+		"src/cleanuppush.c",
 		"src/clockgetcpuclockid.c",
 		"src/clockgetenableattr.c",
 		"src/clocksetenableattr.c",
@@ -56,6 +59,7 @@ def build(ctx):
 		"src/kill_r.c",
 		"src/killinfo.c",
 		"src/lio_listio.c",
+		"src/mmap.c",
 		"src/mprotect.c",
 		"src/mqueue.c",
 		"src/mqueueclose.c",
@@ -73,6 +77,7 @@ def build(ctx):
 		"src/mqueuetimedsend.c",
 		"src/mqueuetranslatereturncode.c",
 		"src/mqueueunlink.c",
+		"src/munmap.c",
 		"src/mutex.c",
 		"src/mutexattrdestroy.c",
 		"src/mutexattrgetprioceiling.c",
@@ -101,7 +106,6 @@ def build(ctx):
 		"src/pbarrierinit.c",
 		"src/pbarriertranslatereturncode.c",
 		"src/pbarrierwait.c",
-		"src/posixtimespecabsolutetimeout.c",
 		"src/prwlock.c",
 		"src/prwlockdestroy.c",
 		"src/prwlockinit.c",
@@ -129,7 +133,9 @@ def build(ctx):
 		"src/psxpriorityisvalid.c",
 		"src/psxtransschedparam.c",
 		"src/pthread.c",
+		"src/pthreadattrcompare.c",
 		"src/pthreadattrdestroy.c",
+		"src/pthreadattrgetaffinitynp.c",
 		"src/pthreadattrgetdetachstate.c",
 		"src/pthreadattrgetguardsize.c",
 		"src/pthreadattrgetinheritsched.c",
@@ -140,6 +146,7 @@ def build(ctx):
 		"src/pthreadattrgetstackaddr.c",
 		"src/pthreadattrgetstacksize.c",
 		"src/pthreadattrinit.c",
+		"src/pthreadattrsetaffinitynp.c",
 		"src/pthreadattrsetdetachstate.c",
 		"src/pthreadattrsetguardsize.c",
 		"src/pthreadattrsetinheritsched.c",
@@ -153,6 +160,8 @@ def build(ctx):
 		"src/pthreaddetach.c",
 		"src/pthreadequal.c",
 		"src/pthreadexit.c",
+		"src/pthreadgetaffinitynp.c",
+		"src/pthreadgetattrnp.c",
 		"src/pthreadgetcpuclockid.c",
 		"src/pthreadgetschedparam.c",
 		"src/pthreadinitthreads.c",
@@ -160,6 +169,7 @@ def build(ctx):
 		"src/pthreadkill.c",
 		"src/pthreadonce.c",
 		"src/pthreadself.c",
+		"src/pthreadsetaffinitynp.c",
 		"src/pthreadsetschedparam.c",
 		"src/pthreadsigmask.c",
 		"src/ptimer.c",
@@ -210,8 +220,6 @@ def build(ctx):
 		"src/timersettime.c",
 		"src/timertsr.c",
 		"src/ualarm.c",
-		"src/cleanuppush.c",
-		"src/cleanuppop.c"
 	]
 	ctx.cpu.pthreads(
 		source_pthreads,
diff --git a/cpukit/rtems/wscript b/cpukit/rtems/wscript
index a5f8b04a36..5d25745006 100644
--- a/cpukit/rtems/wscript
+++ b/cpukit/rtems/wscript
@@ -18,7 +18,6 @@ def build(ctx):
 
 
 	source += [
-		"src/barrier.c",
 		"src/barriercreate.c",
 		"src/barrierdata.c",
 		"src/barrierdelete.c",
@@ -29,12 +28,12 @@ def build(ctx):
 		"src/clockget.c",
 		"src/clockgetsecondssinceepoch.c",
 		"src/clockgettickspersecond.c",
-#		"src/clockgettickssinceboot.c",
 		"src/clockgettod.c",
 		"src/clockgettodtimeval.c",
 		"src/clockgetuptime.c",
+		"src/clockgetuptimenanoseconds.c",
+		"src/clockgetuptimetimeval.c",
 		"src/clockset.c",
-		"src/clocksetnsecshandler.c",
 		"src/clocktick.c",
 		"src/clocktodtoseconds.c",
 		"src/clocktodvalidate.c",
@@ -46,17 +45,17 @@ def build(ctx):
 		"src/dpmemident.c",
 		"src/dpmeminternal2external.c",
 		"src/event.c",
-		"src/eventdata.c",
 		"src/eventreceive.c",
 		"src/eventseize.c",
 		"src/eventsend.c",
 		"src/eventsurrender.c",
-		"src/eventtimeout.c",
+		"src/getcurrentprocessor.c",
+		"src/getprocessorcount.c",
 		"src/intrbody.c",
 		"src/intrcatch.c",
+		"src/modes.c",
 		"src/msg.c",
 		"src/msgdata.c",
-#		"src/msgqallocate.c",
 		"src/msgqbroadcast.c",
 		"src/msgqcreate.c",
 		"src/msgqdelete.c",
@@ -100,6 +99,7 @@ def build(ctx):
 		"src/regionprocessqueue.c",
 		"src/regionresizesegment.c",
 		"src/regionreturnsegment.c",
+		"src/rtclock.c",
 		"src/rtemsbuildid.c",
 		"src/rtemsbuildname.c",
 		"src/rtemsobjectapimaximumclass.c",
@@ -118,6 +118,8 @@ def build(ctx):
 		"src/rtemsobjectsetname.c",
 		"src/rtemstimer.c",
 		"src/rtemstimerdata.c",
+		"src/schedulergetprocessorset.c",
+		"src/schedulerident.c",
 		"src/sem.c",
 		"src/semcreate.c",
 		"src/semdata.c",
@@ -126,15 +128,21 @@ def build(ctx):
 		"src/semident.c",
 		"src/semobtain.c",
 		"src/semrelease.c",
+		"src/semsetpriority.c",
 		"src/semtranslatereturncode.c",
-		"src/systemeventsend.c",
 		"src/signal.c",
 		"src/signalcatch.c",
 		"src/signalsend.c",
+		"src/status.c",
+		"src/statustext.c",
+		"src/systemeventreceive.c",
+		"src/systemeventsend.c",
 		"src/taskcreate.c",
 		"src/taskdata.c",
 		"src/taskdelete.c",
+		"src/taskgetaffinity.c",
 		"src/taskgetnote.c",
+		"src/taskgetscheduler.c",
 		"src/taskident.c",
 		"src/taskinitusers.c",
 		"src/taskissuspended.c",
@@ -143,14 +151,16 @@ def build(ctx):
 		"src/taskresume.c",
 		"src/tasks.c",
 		"src/taskself.c",
+		"src/tasksetaffinity.c",
 		"src/tasksetnote.c",
 		"src/tasksetpriority.c",
+		"src/tasksetscheduler.c",
 		"src/taskstart.c",
 		"src/tasksuspend.c",
+		"src/taskvariable_invoke_dtor.c",
 		"src/taskvariableadd.c",
 		"src/taskvariabledelete.c",
 		"src/taskvariableget.c",
-		"src/taskvariable_invoke_dtor.c",
 		"src/taskwakeafter.c",
 		"src/taskwakewhen.c",
 		"src/timercancel.c",
@@ -165,15 +175,8 @@ def build(ctx):
 		"src/timerserverfireafter.c",
 		"src/timerserverfirewhen.c",
 		"src/workspace.c",
-		"src/status.c",
-		"src/systemeventreceive.c",
 		"src/workspacegreedy.c",
-		"src/clockgetuptimetimeval.c",
-		"src/clockgetuptimeseconds.c",
-		"src/modes.c",
-		"src/statustext.c",
-		"src/clockgetuptimenanoseconds.c",
-		"src/getprocessorcount.c"
+		"src/barrier.c"
 	]
 
 	ctx.cpu.source(
diff --git a/cpukit/score/wscript b/cpukit/score/wscript
index 787ccd3fab..0c8ce033b1 100644
--- a/cpukit/score/wscript
+++ b/cpukit/score/wscript
@@ -5,6 +5,12 @@ def build(ctx):
 		"src/mpci.c",
 		"src/objectmp.c",
 		"src/threadmp.c",
+		"src/schedulerpriorityaffinitysmp.c",
+		"src/percpustatewait.c",
+		"src/schedulerchangeroot.c",
+		"src/smpmulticastaction.c",
+		"src/schedulersmpstartidle.c",
+		"src/schedulersimplesmp.c",
 	]
 	ctx.cpu.mp(
 		source_mp,
@@ -35,7 +41,6 @@ def build(ctx):
 		"src/corerwlockobtainread.c",
 		"src/corerwlockobtainwrite.c",
 		"src/corerwlockrelease.c",
-		"src/corerwlocktimeout.c",
 		"src/corespinlock.c",
 		"src/corespinlockrelease.c",
 		"src/corespinlockwait.c"
@@ -48,9 +53,8 @@ def build(ctx):
 	)
 
 	source += [
-		"src/apiext.c",
 		"src/apimutex.c",
-#		"src/apimutexallocate.c",
+		"src/apimutexisowner.c",
 		"src/apimutexlock.c",
 		"src/apimutexunlock.c",
 		"src/chain.c",
@@ -60,7 +64,9 @@ def build(ctx):
 		"src/chainget.c",
 		"src/chaingetempty.c",
 		"src/chaininsert.c",
+		"src/chainnodecount.c",
 		"src/chainprependempty.c",
+		"src/condition.c",
 		"src/corebarrier.c",
 		"src/corebarrierrelease.c",
 		"src/corebarrierwait.c",
@@ -68,7 +74,6 @@ def build(ctx):
 		"src/coremsgbroadcast.c",
 		"src/coremsgclose.c",
 		"src/coremsgflush.c",
-		"src/coremsgflushsupp.c",
 		"src/coremsgflushwait.c",
 		"src/coremsginsert.c",
 		"src/coremsgseize.c",
@@ -79,29 +84,38 @@ def build(ctx):
 		"src/coremutexseizeintr.c",
 		"src/coremutexsurrender.c",
 		"src/coresem.c",
-		"src/coresemflush.c",
-		"src/coresemseize.c",
-		"src/coresemsurrender.c",
 		"src/coretod.c",
-		"src/coretodget.c",
-		"src/coretodgetuptimetimespec.c",
-#		"src/coretodmsecstoticks.c",
+		"src/coretodabsolutetimeout.c",
+		"src/coretodadjust.c",
 		"src/coretodset.c",
 		"src/coretodtickle.c",
 		"src/coretodtickspersec.c",
-#		"src/coretodusectoticks.c",
+		"src/cpuset.c",
+		"src/cpusetprintsupport.c",
+		"src/debugisownerofallocator.c",
+		"src/debugisthreaddispatchingallowed.c",
+		"src/freechain.c",
+		"src/futex.c",
 		"src/heap.c",
 		"src/heapallocate.c",
 		"src/heapextend.c",
 		"src/heapfree.c",
 		"src/heapgetfreeinfo.c",
 		"src/heapgetinfo.c",
+		"src/heapgreedy.c",
+		"src/heapiterate.c",
+		"src/heapnoextend.c",
 		"src/heapresizeblock.c",
 		"src/heapsizeofuserarea.c",
 		"src/heapwalk.c",
 		"src/interr.c",
 		"src/isr.c",
+		"src/isrisinprogress.c",
 		"src/iterateoverthreads.c",
+		"src/kern_tc.c",
+		"src/log2table.c",
+		"src/mutex.c",
+		"src/objectactivecount.c",
 		"src/objectallocate.c",
 		"src/objectapimaximumclass.c",
 		"src/objectclose.c",
@@ -121,7 +135,9 @@ def build(ctx):
 		"src/objectnametoidstring.c",
 		"src/objectsetname.c",
 		"src/objectshrinkinformation.c",
+		"src/once.c",
 		"src/percpu.c",
+		"src/percpuasm.c",
 		"src/pheapallocate.c",
 		"src/pheapextend.c",
 		"src/pheapfree.c",
@@ -130,138 +146,124 @@ def build(ctx):
 		"src/pheapgetinfo.c",
 		"src/pheapgetsize.c",
 		"src/pheapinit.c",
+		"src/pheapiterate.c",
 		"src/pheapresizeblock.c",
 		"src/pheapwalk.c",
-		"src/rbtree.c",
+		"src/profilingisrentryexit.c",
+		"src/profilingsmplock.c",
 		"src/rbtreeextract.c",
 		"src/rbtreefind.c",
-#		"src/rbtreefindheader.c",
-#		"src/rbtreeget.c",
 		"src/rbtreeinsert.c",
+		"src/rbtreeiterate.c",
+		"src/rbtreenext.c",
+		"src/rbtreereplace.c",
+		"src/resourceiterate.c",
+		"src/sched.c",
 		"src/scheduler.c",
+		"src/schedulercbs.c",
+		"src/schedulercbsattachthread.c",
+		"src/schedulercbscleanup.c",
+		"src/schedulercbscreateserver.c",
+		"src/schedulercbsdestroyserver.c",
+		"src/schedulercbsdetachthread.c",
+		"src/schedulercbsgetapprovedbudget.c",
+		"src/schedulercbsgetexecutiontime.c",
+		"src/schedulercbsgetparameters.c",
+		"src/schedulercbsgetremainingbudget.c",
+		"src/schedulercbsgetserverid.c",
+		"src/schedulercbsnodeinit.c",
+		"src/schedulercbsreleasejob.c",
+		"src/schedulercbssetparameters.c",
+		"src/schedulercbsunblock.c",
+		"src/schedulerdefaultaskforhelp.c",
+		"src/schedulerdefaultgetaffinity.c",
+		"src/schedulerdefaultnodedestroy.c",
+		"src/schedulerdefaultnodeinit.c",
+		"src/schedulerdefaultreleasejob.c",
+		"src/schedulerdefaultschedule.c",
+		"src/schedulerdefaultsetaffinity.c",
+		"src/schedulerdefaultstartidle.c",
+		"src/schedulerdefaulttick.c",
+		"src/schedulerdefaultupdate.c",
+		"src/scheduleredf.c",
+		"src/scheduleredfblock.c",
+		"src/scheduleredfchangepriority.c",
+		"src/scheduleredfnodeinit.c",
+		"src/scheduleredfprioritycompare.c",
+		"src/scheduleredfreleasejob.c",
+		"src/scheduleredfschedule.c",
+		"src/scheduleredfunblock.c",
+		"src/scheduleredfupdate.c",
+		"src/scheduleredfyield.c",
+		"src/schedulergetaffinity.c",
 		"src/schedulerpriority.c",
-#		"src/schedulerpriorityallocate.c",
 		"src/schedulerpriorityblock.c",
-#		"src/schedulerpriorityenqueue.c",
-#		"src/schedulerpriorityenqueuefirst.c",
-#		"src/schedulerpriorityextract.c",
-#		"src/schedulerpriorityfree.c",
+		"src/schedulerprioritychangepriority.c",
 		"src/schedulerpriorityprioritycompare.c",
-#		"src/schedulerpriorityreleasejob.c",
 		"src/schedulerpriorityschedule.c",
-#		"src/schedulerprioritytick.c",
+#		"src/schedulerprioritysmp.c",
 		"src/schedulerpriorityunblock.c",
 		"src/schedulerpriorityupdate.c",
 		"src/schedulerpriorityyield.c",
+		"src/schedulersetaffinity.c",
 		"src/schedulersimple.c",
 		"src/schedulersimpleblock.c",
-#		"src/schedulersimpleenqueue.c",
-#		"src/schedulersimpleenqueuefirst.c",
-#		"src/schedulersimpleextract.c",
-#		"src/schedulersimplereadyqueueenqueue.c",
-#		"src/schedulersimplereadyqueueenqueuefirst.c",
+		"src/schedulersimplechangepriority.c",
 		"src/schedulersimpleschedule.c",
 		"src/schedulersimpleunblock.c",
 		"src/schedulersimpleyield.c",
+		"src/schedulersmpdebug.c",
+		"src/semaphore.c",
+		"src/smpbarrierwait.c",
 		"src/thread.c",
-		"src/threadblockingoperationcancel.c",
 		"src/threadchangepriority.c",
 		"src/threadclearstate.c",
-#		"src/threadclose.c",
 		"src/threadcreateidle.c",
-		"src/threaddelayended.c",
 		"src/threaddisabledispatch.c",
 		"src/threaddispatch.c",
 		"src/threadenabledispatch.c",
 		"src/threadget.c",
+		"src/threadglobalconstruction.c",
 		"src/threadhandler.c",
 		"src/threadinitialize.c",
 		"src/threadloadenv.c",
 		"src/threadq.c",
-		"src/threadqdequeue.c",
-#		"src/threadqdequeuefifo.c",
-#		"src/threadqdequeuepriority.c",
 		"src/threadqenqueue.c",
-#		"src/threadqenqueuefifo.c",
-#		"src/threadqenqueuepriority.c",
-		"src/threadqextract.c",
-#		"src/threadqextractfifo.c",
-#		"src/threadqextractpriority.c",
 		"src/threadqextractwithproxy.c",
 		"src/threadqfirst.c",
-#		"src/threadqfirstfifo.c",
-#		"src/threadqfirstpriority.c",
 		"src/threadqflush.c",
-		"src/threadqprocesstimeout.c",
-		"src/threadqrequeue.c",
-		"src/threadqtimeout.c",
-		"src/threadready.c",
-#		"src/threadreset.c",
+		"src/threadqops.c",
 		"src/threadrestart.c",
 		"src/threadsetpriority.c",
 		"src/threadsetstate.c",
-#		"src/threadsettransient.c",
 		"src/threadstackallocate.c",
 		"src/threadstackfree.c",
 		"src/threadstart.c",
 		"src/threadstartmultitasking.c",
+		"src/threadtimeout.c",
+		"src/threadyield.c",
 		"src/timespecaddto.c",
 		"src/timespecdivide.c",
 		"src/timespecdividebyinteger.c",
 		"src/timespecfromticks.c",
+		"src/timespecgetasnanoseconds.c",
 		"src/timespecisvalid.c",
 		"src/timespeclessthan.c",
 		"src/timespecsubtract.c",
 		"src/timespectoticks.c",
-		"src/ts64addto.c",
-		"src/ts64divide.c",
-		"src/ts64dividebyinteger.c",
-		"src/ts64equalto.c",
-		"src/ts64getnanoseconds.c",
-		"src/ts64getseconds.c",
-		"src/ts64lessthan.c",
-		"src/ts64set.c",
-		"src/ts64settozero.c",
-		"src/ts64subtract.c",
-		"src/ts64toticks.c",
-		"src/ts64totimespec.c",
 		"src/userext.c",
 		"src/userextaddset.c",
 		"src/userextiterate.c",
 		"src/userextremoveset.c",
 		"src/watchdog.c",
 		"src/watchdogadjust.c",
-		"src/watchdogadjusttochain.c",
 		"src/watchdoginsert.c",
-#		"src/watchdognanoseconds.c",
 		"src/watchdogremove.c",
-#		"src/watchdogreport.c",
-#		"src/watchdogreportchain.c",
-		"src/watchdogtickle.c",
+		"src/watchdogtick.c",
+		"src/watchdogtickssinceboot.c",
 		"src/wkspace.c",
-		"src/objectactivecount.c",
-		"src/heapgreedy.c",
-		"src/heapiterate.c",
-		"src/chainnodecount.c",
 		"src/wkstringduplicate.c",
-		"src/rbtreenext.c",
-		"src/log2table.c",
-		"src/schedulerprioritychangepriority.c",
-		"src/schedulerdefaultnodeinit.c",
-		"src/schedulerdefaultnodedestroy.c",
-		"src/schedulerdefaultreleasejob.c",
-		"src/schedulerdefaulttick.c",
-		"src/schedulerdefaultstartidle.c",
-		"src/threadyield.c",
-		"src/threadglobalconstruction.c",
-		"src/freechain.c",
-		"src/rbtreeiterate.c",
-		"src/once.c",
-		"src/coretodsecondssinceepoch.c",
-		"src/coretodadjust.c",
-		"src/schedulersimplechangepriority.c",
-		"src/schedulerdefaultupdate.c",
-		"src/timespecgetasnanoseconds.c"
+		"src/apiext.c"
 	]
 
 	if ctx.env.RTEMS_ARCH == "arm":
diff --git a/cpukit/wscript b/cpukit/wscript
index 0bc2b75ba5..ca77f33055 100644
--- a/cpukit/wscript
+++ b/cpukit/wscript
@@ -99,7 +99,10 @@ def build(ctx):
 		"sapi/src/chaingetnotify.c",
 		"sapi/src/chaingetwait.c",
 		"sapi/src/chainprependnotify.c",
-		"sapi/src/debug.c",
+		"sapi/src/chainsmp.c",
+		"sapi/src/cpucounterconverter.c",
+		"sapi/src/delaynano.c",
+		"sapi/src/delayticks.c",
 		"sapi/src/exinit.c",
 		"sapi/src/exshutdown.c",
 		"sapi/src/extension.c",
@@ -109,7 +112,9 @@ def build(ctx):
 		"sapi/src/extensionident.c",
 		"sapi/src/fatal.c",
 		"sapi/src/fatal2.c",
+		"sapi/src/fatalsrctext.c",
 		"sapi/src/getversionstring.c",
+		"sapi/src/interrtext.c",
 		"sapi/src/io.c",
 		"sapi/src/ioclose.c",
 		"sapi/src/iocontrol.c",
@@ -121,14 +126,12 @@ def build(ctx):
 		"sapi/src/iounregisterdriver.c",
 		"sapi/src/iowrite.c",
 		"sapi/src/posixapi.c",
+		"sapi/src/profilingiterate.c",
+		"sapi/src/profilingreportxml.c",
+		"sapi/src/rbheap.c",
+		"sapi/src/rbtree.c",
 		"sapi/src/rtemsapi.c",
-#		"sapi/src/interrdesc.c",
-#		"sapi/src/fatalsrcdesc.c",
-		"sapi/src/testbeginend.c",
-		"sapi/src/testextension.c",
-		"sapi/src/cpucounterconverter.c",
-		"sapi/src/fatalsrctext.c",
-		"sapi/src/interrtext.c"
+		"sapi/src/tcsimpleinstall.c",
 	]
 	ctx.cpu.source(
 		source_sapi,