changeset 3dd9fd1a6fed in /z/repo/m5 details: http://repo.m5sim.org/m5?cmd=changeset;node=3dd9fd1a6fed summary: SCons: Fix more SCons version issues
changeset 4065e07a979e in /z/repo/m5 details: http://repo.m5sim.org/m5?cmd=changeset;node=4065e07a979e summary: X86: Fix building on *BSD hosts diffstat: 2 files changed, 7 insertions(+) src/arch/x86/SConscript | 5 +++++ src/kern/SConscript | 2 ++ diffs (47 lines): diff -r 16456ab9148f -r 4065e07a979e src/arch/x86/SConscript --- a/src/arch/x86/SConscript Tue May 20 16:06:56 2008 -0400 +++ b/src/arch/x86/SConscript Thu Jun 05 21:14:42 2008 -0400 @@ -353,3 +353,17 @@ if env['TARGET_ISA'] == 'x86': # Only non-header files need to be compiled. if not f.path.endswith('.hh'): Source(f) + + # Workaround for bug in SCons version > 0.97d20071212 + # Scons bug id: 2006 M5 Bug id: 308 + from os.path import dirname, join as joinpath + + Dir('isa') + Dir('isa/microops') + Dir('isa/decoder') + Dir('isa/formats') + Dir('isa/insts') + isa_dirs = set(map(lambda x:dirname(x), python_files)) + for d in isa_dirs: + Dir(joinpath('isa/insts', d)) + diff -r 16456ab9148f -r 4065e07a979e src/arch/x86/linux/linux.hh --- a/src/arch/x86/linux/linux.hh Tue May 20 16:06:56 2008 -0400 +++ b/src/arch/x86/linux/linux.hh Thu Jun 05 21:14:42 2008 -0400 @@ -112,7 +112,7 @@ class X86Linux64 : public Linux uint64_t st_mtime_nsec; uint64_t st_ctimeX; uint64_t st_ctime_nsec; - int64_t __unused[3]; + int64_t unused0[3]; } tgt_stat64; static OpenFlagTransTable openFlagTable[]; diff -r 16456ab9148f -r 4065e07a979e src/kern/SConscript --- a/src/kern/SConscript Tue May 20 16:06:56 2008 -0400 +++ b/src/kern/SConscript Thu Jun 05 21:14:42 2008 -0400 @@ -40,6 +40,10 @@ if env['FULL_SYSTEM']: Source('linux/events.cc') Source('linux/linux_syscalls.cc') Source('linux/printk.cc') + + # Workaround for bug in SCons version > 0.97d20071212 + # Scons bug id: 2006 M5 Bug id: 308 + Dir('tru64') if env['TARGET_ISA'] == 'alpha': Source('tru64/dump_mbuf.cc') _______________________________________________ m5-dev mailing list m5-dev@m5sim.org http://m5sim.org/mailman/listinfo/m5-dev
