33c33
< from os.path import isdir
---
> from os.path import isfile, join as joinpath
149,187d148
< # Old FullCPU sources
< full_cpu_sources = Split('''
< encumbered/cpu/full/bpred.cc
< encumbered/cpu/full/commit.cc
< encumbered/cpu/full/cpu.cc
< encumbered/cpu/full/create_vector.cc
< encumbered/cpu/full/cv_spec_state.cc
< encumbered/cpu/full/dd_queue.cc
< encumbered/cpu/full/dep_link.cc
< encumbered/cpu/full/dispatch.cc
< encumbered/cpu/full/dyn_inst.cc
< encumbered/cpu/full/execute.cc
< encumbered/cpu/full/fetch.cc
< encumbered/cpu/full/floss_reasons.cc
< encumbered/cpu/full/fu_pool.cc
< encumbered/cpu/full/inst_fifo.cc
< encumbered/cpu/full/instpipe.cc
< encumbered/cpu/full/issue.cc
< encumbered/cpu/full/ls_queue.cc
< encumbered/cpu/full/machine_queue.cc
< encumbered/cpu/full/pipetrace.cc
< encumbered/cpu/full/readyq.cc
< encumbered/cpu/full/reg_info.cc
< encumbered/cpu/full/rob_station.cc
< encumbered/cpu/full/spec_memory.cc
< encumbered/cpu/full/spec_state.cc
< encumbered/cpu/full/storebuffer.cc
< encumbered/cpu/full/writeback.cc
< encumbered/cpu/full/iq/iq_station.cc
< encumbered/cpu/full/iq/iqueue.cc
< encumbered/cpu/full/iq/segmented/chain_info.cc
< encumbered/cpu/full/iq/segmented/chain_wire.cc
< encumbered/cpu/full/iq/segmented/iq_seg.cc
< encumbered/cpu/full/iq/segmented/iq_segmented.cc
< encumbered/cpu/full/iq/segmented/seg_chain.cc
< encumbered/cpu/full/iq/seznec/iq_seznec.cc
< encumbered/cpu/full/iq/standard/iq_standard.cc
< ''')
<
232,251d192
< # turbolaser encumbered sources
< turbolaser_sources = Split('''
< encumbered/dev/dma.cc
< encumbered/dev/etherdev.cc
< encumbered/dev/scsi.cc
< encumbered/dev/scsi_ctrl.cc
< encumbered/dev/scsi_disk.cc
< encumbered/dev/scsi_none.cc
< encumbered/dev/tlaser_clock.cc
< encumbered/dev/tlaser_ipi.cc
< encumbered/dev/tlaser_mbox.cc
< encumbered/dev/tlaser_mc146818.cc
< encumbered/dev/tlaser_node.cc
< encumbered/dev/tlaser_pcia.cc
< encumbered/dev/tlaser_pcidev.cc
< encumbered/dev/tlaser_serial.cc
< encumbered/dev/turbolaser.cc
< encumbered/dev/uart8530.cc
< ''')
<
265,273d205
< alpha_eio_sources = Split('''
< encumbered/eio/exolex.cc
< encumbered/eio/libexo.cc
< encumbered/eio/eio.cc
< ''')
<
< if env['TARGET_ISA'] == 'alpha':
< syscall_emulation_sources += alpha_eio_sources
<
292c224,225
< dev_sources = SConscript(os.path.join('dev', 'SConscript'), exports = 'env')
---
> dev_sources = SConscript(os.path.join('dev', 'SConscript'),
> exports = 'env')
295c228,229
< kern_sources = SConscript(os.path.join('kern', 'SConscript'), exports = 'env')
---
> kern_sources = SConscript(os.path.join('kern', 'SConscript'),
> exports = 'env')
298,302d231
< # This is outside of cpu/SConscript since the source directory isn't
< # underneath 'cpu'.
< if 'FullCPU' in env['CPU_MODELS']:
< cpu_sources += full_cpu_sources
<
305a235,239
> # encumbered should be last because we're adding to some of the other groups
> if isfile(joinpath(env['SRCDIR'], 'encumbered/SConscript')):
> sources += SConscript('encumbered/SConscript', exports = 'env')
>
>
308,309d241
< if env['ALPHA_TLASER']:
< sources += turbolaser_sources