summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2006-03-07 09:34:24 -0500
committerGabe Black <gblack@eecs.umich.edu>2006-03-07 09:34:24 -0500
commitcd62fed1a7c535befaa00c8775de78f9f29b1274 (patch)
tree2708e17ca969fcb5ee25e61d380812b8cd04b0ff
parent531216e9f385c346433a02a83d60ad5d03ced47f (diff)
downloadgem5-cd62fed1a7c535befaa00c8775de78f9f29b1274.tar.xz
The a.out and ecoff object file formats will only be supported on Alpha for now.
arch/SConscript: aout_machdep.h and ecoff_machdep.h are no longer bridging headers, since support of these formats is limitted to alpha. base/loader/exec_aout.h: Include the alpha specific version of aout_machdep.h, since only the alpha version of aout will be supported for now. base/loader/exec_ecoff.h: Include the alpha specific version of ecoff_machdep.h, since only the alpha version of ecoff will be supported for now. --HG-- extra : convert_revision : 15328aae54538c26d2c10d7476501e0daa3d22d0
-rw-r--r--arch/SConscript2
-rw-r--r--base/loader/exec_aout.h3
-rw-r--r--base/loader/exec_ecoff.h3
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/SConscript b/arch/SConscript
index b4b7a1ddb..380cda307 100644
--- a/arch/SConscript
+++ b/arch/SConscript
@@ -48,8 +48,6 @@ isa_switch_hdrs = Split('''
isa_traits.hh
tlb.hh
process.hh
- aout_machdep.h
- ecoff_machdep.h
arguments.hh
stacktrace.hh
vtophys.hh
diff --git a/base/loader/exec_aout.h b/base/loader/exec_aout.h
index 3863a92fb..eed44baee 100644
--- a/base/loader/exec_aout.h
+++ b/base/loader/exec_aout.h
@@ -55,6 +55,7 @@
(N_GETMAGIC(ex) != NMAGIC && N_GETMAGIC(ex) != OMAGIC && \
N_GETMAGIC(ex) != ZMAGIC)
-#include "arch/aout_machdep.h"
+//Only alpha will be able to load aout for now
+#include "arch/alpha/aout_machdep.h"
#endif /* !_SYS_EXEC_AOUT_H_ */
diff --git a/base/loader/exec_ecoff.h b/base/loader/exec_ecoff.h
index 79cd22a6e..555589806 100644
--- a/base/loader/exec_ecoff.h
+++ b/base/loader/exec_ecoff.h
@@ -37,7 +37,8 @@
#ifndef _SYS_EXEC_ECOFF_H_
#define _SYS_EXEC_ECOFF_H_
-#include "arch/ecoff_machdep.h"
+//Only alpha will be able to load ecoff files for now
+#include "arch/alpha/ecoff_machdep.h"
struct ecoff_filehdr {
coff_ushort f_magic; /* magic number */