From patchwork Thu Oct 27 12:02:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [02/10] linux-user: fix rlimit syscalls on sparc(64) Date: Thu, 27 Oct 2011 02:02:48 -0000 From: riku.voipio@linaro.org X-Patchwork-Id: 122123 Message-Id: <6cafd027be3a6cad710d99bde4a2b3b662869e5d.1319716562.git.riku.voipio@linaro.org> To: qemu-devel@nongnu.org Cc: Matthias Braun From: Matthias Braun Signed-off-by: Matthias Braun Signed-off-by: Riku Voipio --- linux-user/syscall_defs.h | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index 1bc54c7..5fd4c9c 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