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>

diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 1bc54c7480a20985e7e3c7284d1b2f13458fa4fa..5fd4c9ce45b7650761910f0f73faad3c32817841 100644 (file)
--- 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