diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-03-08 13:26:30 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-03-08 13:26:30 -0500 |
| commit | 67732a7b2816929e41a52998c25eb008217041a5 (patch) | |
| tree | e4f51373195cab0f88e7f727d3837255a6909614 /base | |
| parent | 4d44e53736507de176e48cbf99b064ffa0ae5a7a (diff) | |
| parent | 0df85fd8d8b7a8c8d11b1b3da5b6277e4a5e54ec (diff) | |
| download | gem5-67732a7b2816929e41a52998c25eb008217041a5.tar.xz | |
Merge ktlim@zizzer:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5-proxyxc
arch/alpha/ev5.cc:
cpu/o3/cpu.hh:
SCCS merged
--HG--
extra : convert_revision : 38889011ea02005c8fd3a7f3b0be3395223f6166
Diffstat (limited to 'base')
| -rw-r--r-- | base/loader/exec_aout.h | 3 | ||||
| -rw-r--r-- | base/loader/exec_ecoff.h | 3 |
2 files changed, 4 insertions, 2 deletions
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 */ |