diff options
| author | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-11-08 18:05:37 +0000 |
|---|---|---|
| committer | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-11-08 18:05:37 +0000 |
| commit | d26bc2118e99702eb8c1bb240786bcadd7fa21ac (patch) | |
| tree | 2d3523234b61325aff6bf5eb857a67a5fddaeb97 /linux-user | |
| parent | 5850586c072456e6f007096ea8a489c97118f8f1 (diff) | |
Clean out the N32 macros from target-mips, and introduce MIPS ABI specific
defines for linux-user.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3556 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'linux-user')
| -rw-r--r-- | linux-user/main.c | 2 | ||||
| -rw-r--r-- | linux-user/signal.c | 6 | ||||
| -rw-r--r-- | linux-user/syscall_defs.h | 14 |
3 files changed, 11 insertions, 11 deletions
diff --git a/linux-user/main.c b/linux-user/main.c index b480a9ca28..77667a55e2 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -2225,7 +2225,7 @@ int main(int argc, char **argv) /* Choose and initialise CPU */ if (cpu_model == NULL) -#if defined(TARGET_MIPSN32) || defined(TARGET_MIPS64) +#if defined(TARGET_ABI_MIPSN32) || defined(TARGET_ABI_MIPSN64) cpu_model = "20Kc"; #else cpu_model = "24Kf"; diff --git a/linux-user/signal.c b/linux-user/signal.c index 984c598f26..a0f1511022 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -1939,7 +1939,7 @@ void sparc64_get_context(CPUSPARCState *env) force_sig(SIGSEGV); } #endif -#elif defined(TARGET_MIPS64) +#elif defined(TARGET_ABI_MIPSN64) # warning signal handling not implemented @@ -1968,7 +1968,7 @@ long do_rt_sigreturn(CPUState *env) return -ENOSYS; } -#elif defined(TARGET_MIPSN32) +#elif defined(TARGET_ABI_MIPSN32) # warning signal handling not implemented @@ -1997,7 +1997,7 @@ long do_rt_sigreturn(CPUState *env) return -ENOSYS; } -#elif defined(TARGET_MIPS) +#elif defined(TARGET_ABI_MIPSO32) struct target_sigcontext { uint32_t sc_regmask; /* Unused */ diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index 6c80c91b3e..99b17cb059 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -307,8 +307,8 @@ int do_sigaction(int sig, const struct target_sigaction *act, #define TARGET_SA_NODEFER 0x40000000 #define TARGET_SA_RESTART 0x10000000 #define TARGET_SA_RESETHAND 0x80000000 -#if !defined(TARGET_MIPSN32) && !defined(TARGET_MIPS64) -#define TARGET_SA_RESTORER 0x04000000 /* Only for o32 */ +#if !defined(TARGET_ABI_MIPSN32) && !defined(TARGET_ABI_MIPSN64) +#define TARGET_SA_RESTORER 0x04000000 /* Only for O32 */ #endif #else #define TARGET_SA_NOCLDSTOP 0x00000001 @@ -450,7 +450,7 @@ int do_sigaction(int sig, const struct target_sigaction *act, struct target_sigaction { uint32_t sa_flags; -#if defined(TARGET_MIPSN32) +#if defined(TARGET_ABI_MIPSN32) uint32_t _sa_handler; #else abi_ulong _sa_handler; @@ -1194,7 +1194,7 @@ struct target_stat64 { unsigned long long st_ino; } __attribute__((packed)); -#elif defined(TARGET_MIPS64) +#elif defined(TARGET_ABI_MIPSN64) /* The memory layout is the same as of struct stat64 of the 32-bit kernel. */ struct target_stat { @@ -1233,7 +1233,7 @@ struct target_stat { abi_ulong st_blocks; }; -#elif defined(TARGET_MIPSN32) +#elif defined(TARGET_ABI_MIPSN32) struct target_stat { unsigned st_dev; @@ -1304,7 +1304,7 @@ struct target_stat64 { int st_blocks; }; -#elif defined(TARGET_MIPS) +#elif defined(TARGET_ABI_MIPSO32) struct target_stat { unsigned st_dev; @@ -1486,7 +1486,7 @@ typedef struct { } target_fsid_t; #ifdef TARGET_MIPS -#ifdef TARGET_MIPSN32 +#ifdef TARGET_ABI_MIPSN32 struct target_statfs { int32_t f_type; int32_t f_bsize; |