summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorMatthias Braun <matze@braunis.de>2011-09-09 19:30:25 +0200
committerRiku Voipio <riku.voipio@linaro.org>2011-10-27 14:42:16 +0300
commit6cafd027be3a6cad710d99bde4a2b3b662869e5d (patch)
treec9edf3e503842be1249f200391700dd5162bb4c3
parent26b746db49ab0dcaaf5a700d0fc055e5188dcc70 (diff)
downloadfocaccia-qemu-6cafd027be3a6cad710d99bde4a2b3b662869e5d.tar.gz
focaccia-qemu-6cafd027be3a6cad710d99bde4a2b3b662869e5d.zip
linux-user: fix rlimit syscalls on sparc(64)
Signed-off-by: Matthias Braun <matze@braunis.de>
Signed-off-by: Riku Voipio <riku.voipio@iki.fi>
-rw-r--r--linux-user/syscall_defs.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 1bc54c7480..5fd4c9ce45 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -687,7 +687,7 @@ struct target_rlimit {
 
 #if defined(TARGET_ALPHA)
 #define TARGET_RLIM_INFINITY	0x7fffffffffffffffull
-#elif defined(TARGET_MIPS) || defined(TARGET_SPARC)
+#elif defined(TARGET_MIPS) || (defined(TARGET_SPARC) && TARGET_ABI_BITS == 32)
 #define TARGET_RLIM_INFINITY	0x7fffffffUL
 #else
 #define TARGET_RLIM_INFINITY	((abi_ulong)-1)
@@ -716,8 +716,13 @@ struct target_rlimit {
 #define TARGET_RLIMIT_STACK		3
 #define TARGET_RLIMIT_CORE		4
 #define TARGET_RLIMIT_RSS		5
+#if defined(TARGET_SPARC)
+#define TARGET_RLIMIT_NOFILE		6
+#define TARGET_RLIMIT_NPROC		7
+#else
 #define TARGET_RLIMIT_NPROC		6
 #define TARGET_RLIMIT_NOFILE		7
+#endif
 #define TARGET_RLIMIT_MEMLOCK		8
 #define TARGET_RLIMIT_AS		9
 #define TARGET_RLIMIT_LOCKS		10