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

diff --git a/arch/SConscript b/arch/SConscript
index b4b7a1ddb085c5faabb8d2b7fc667b57c90fba63..380cda30724f0d9a85618164e8c904d80d7ef6f2 100644 (file)
--- 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 3863a92fbdff522fe053f5802ca4e00e1770513f..eed44baee914067fdb6cec643b43a743d44d81a0 100644 (file)
--- 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 79cd22a6ee6815343864e86bce9efd996e325813..555589806c4c428176951e30f167f2e799bd358a 100644 (file)
--- 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 */