1 files changed, 40 insertions, 27 deletions

diff --git a/SConscript b/SConscript
index ae77cbbc6..5244ad1e6 100644
--- a/SConscript
+++ b/SConscript
@@ -88,11 +88,12 @@ base_sources = Split('''
 	cpu/static_inst.cc
         cpu/sampler/sampler.cc
 
+        mem/request.cc
+        mem/connector.cc
         mem/mem_object.cc
-        mem/page_table.cc
         mem/physical.cc
         mem/port.cc
-        mem/translating_port.cc
+        mem/bus.cc
 
         python/pyconfig.cc
         python/embedded_py.cc
@@ -183,31 +184,11 @@ full_system_sources = Split('''
         cpu/profile.cc
 
 	dev/alpha_console.cc
-	dev/baddev.cc
-        dev/simconsole.cc
 	dev/disk_image.cc
-	dev/etherbus.cc
-	dev/etherdump.cc
-	dev/etherint.cc
-	dev/etherlink.cc
-	dev/etherpkt.cc
-	dev/ethertap.cc
-	dev/ide_ctrl.cc
-	dev/ide_disk.cc
 	dev/io_device.cc
-	dev/ns_gige.cc
-	dev/pciconfigall.cc
-	dev/pcidev.cc
-	dev/pcifake.cc
-	dev/pktfifo.cc
 	dev/platform.cc
-	dev/sinic.cc
+        dev/simconsole.cc
 	dev/simple_disk.cc
-	dev/tsunami.cc
-	dev/tsunami_cchip.cc
-	dev/isa_fake.cc
-	dev/tsunami_io.cc
-	dev/tsunami_pchip.cc
 	dev/uart.cc
 	dev/uart8250.cc
 
@@ -217,13 +198,39 @@ full_system_sources = Split('''
 	kern/linux/events.cc
 	kern/linux/linux_syscalls.cc
 	kern/linux/printk.cc
+
+        mem/vport.cc
+
+	sim/pseudo_inst.cc
+        ''')
+
+#	dev/baddev.cc
+#	dev/etherbus.cc
+#	dev/etherdump.cc
+#	dev/etherint.cc
+#	dev/etherlink.cc
+#	dev/etherpkt.cc
+#	dev/ethertap.cc
+#	dev/ide_ctrl.cc
+#	dev/ide_disk.cc
+#	dev/ns_gige.cc
+#	dev/pciconfigall.cc
+#	dev/pcidev.cc
+#	dev/pcifake.cc
+#	dev/pktfifo.cc
+#	dev/sinic.cc
+#	dev/tsunami.cc
+#	dev/tsunami_cchip.cc
+#	dev/isa_fake.cc
+#	dev/tsunami_io.cc
+#	dev/tsunami_pchip.cc
+
+if env['TARGET_ISA'] == 'alpha':
+    full_system_sources += Split('''
 	kern/tru64/dump_mbuf.cc
 	kern/tru64/printf.cc
 	kern/tru64/tru64_events.cc
 	kern/tru64/tru64_syscalls.cc
-
-	mem/functional/memory_control.cc
-	sim/pseudo_inst.cc
         ''')
 
 # turbolaser encumbered sources
@@ -249,11 +256,17 @@ turbolaser_sources = Split('''
 # Syscall emulation (non-full-system) sources
 syscall_emulation_sources = Split('''
         kern/linux/linux.cc
-        kern/tru64/tru64.cc
+        mem/translating_port.cc
+        mem/page_table.cc
 	sim/process.cc
 	sim/syscall_emul.cc
         ''')
 
+if env['TARGET_ISA'] == 'alpha':
+    syscall_emulation_sources += Split('''
+        kern/tru64/tru64.cc
+        ''')
+
 alpha_eio_sources = Split('''
 	encumbered/eio/exolex.cc
 	encumbered/eio/libexo.cc