+# fix up the SConscript to deal with files we've removed
+#remove_sources(r'.*split.*\.cc', 'src/mem/cache/tags')
+#remove_sources(r'.*(ghb|stride)_prefetcher\.cc', 'src/mem/cache/prefetch')
+remove_sources(r'.*nativetrace.*', 'src/cpu')
+
+remove_lines(r'.*X86.*', None, 'src/arch/isa_specific.hh')
+#remove_lines(r'.*X86.*', None, 'src/base/traceflags.py')
+remove_lines(r'.*X86.*', None, 'AUTHORS')
+remove_lines(r'.*X86.*', None, 'src/base/loader/object_file.hh')
+remove_lines(r'.*_X86_.*', '.*else.*', 'src/base/loader/elf_object.cc')
+remove_lines(r'.*X86_ISA.*', r'^.el.*','src/sim/process.cc')
+remove_lines(r".*'x86' and build.*", None, 'src/cpu/BaseCPU.py')
+remove_lines(r".*walker.port.*", None, 'src/cpu/BaseCPU.py')
+remove_lines(r'.*x86.*', r'.*mips.*','src/cpu/BaseCPU.py')
+remove_lines(r'.*X86_ISA.*', r'^.*elif.*','src/cpu/o3/dyn_inst.hh')
+remove_lines(r'.*X86_ISA.*', r'.*stay.*','src/cpu/simple/base.cc')
+remove_lines(r'.*x86.*', r'^if.*','src/cpu/SConscript')
+
+remove_lines(r'.*makeX86System.*', r'.*makeDualRoot.*','configs/common/FSConfig.py')
+remove_lines(r'.*X86.*', None, 'configs/example/fs.py')
+remove_lines(r'.*x86.*', None, 'configs/example/fs.py')
+remove_lines(r'.*x86.*', r'.*makeDualRoot.*', 'configs/common/FSConfig.py')
+
+replace_line(r'.*X86_SE.*', 'util/regress', " 'SPARC_SE,SPARC_FS',")