From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KXCwy-0007EK-D3 for qemu-devel@nongnu.org; Sun, 24 Aug 2008 06:36:00 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KXCww-0007Cz-RS for qemu-devel@nongnu.org; Sun, 24 Aug 2008 06:35:59 -0400 Received: from [199.232.76.173] (port=57971 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KXCwv-0007C6-HE for qemu-devel@nongnu.org; Sun, 24 Aug 2008 06:35:57 -0400 Received: from savannah.gnu.org ([199.232.41.3]:34523 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KXCwv-0005wl-21 for qemu-devel@nongnu.org; Sun, 24 Aug 2008 06:35:57 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1KXCwu-0001XW-9l for qemu-devel@nongnu.org; Sun, 24 Aug 2008 10:35:56 +0000 Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1KXCwu-0001XS-3V for qemu-devel@nongnu.org; Sun, 24 Aug 2008 10:35:56 +0000 MIME-Version: 1.0 Errors-To: blueswir1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Blue Swirl Message-Id: Date: Sun, 24 Aug 2008 10:35:56 +0000 Subject: [Qemu-devel] [5080] To make syscall.c for 64 bit truly warning-free, we need some more #ifs. Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 5080 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5080 Author: blueswir1 Date: 2008-08-24 10:35:55 +0000 (Sun, 24 Aug 2008) Log Message: ----------- To make syscall.c for 64 bit truly warning-free, we need some more #ifs. Signed-off-by: Jan Kiszka Modified Paths: -------------- trunk/linux-user/syscall.c Modified: trunk/linux-user/syscall.c =================================================================== --- trunk/linux-user/syscall.c 2008-08-24 10:34:20 UTC (rev 5079) +++ trunk/linux-user/syscall.c 2008-08-24 10:35:55 UTC (rev 5080) @@ -195,12 +195,14 @@ _syscall4(int,sys_fchmodat,int,dirfd,const char *,pathname, mode_t,mode,int,flags) #endif -#if defined(TARGET_NR_fchownat) && defined(__NR_fchownat) +#if defined(TARGET_NR_fchownat) && defined(__NR_fchownat) && defined(USE_UID16) _syscall5(int,sys_fchownat,int,dirfd,const char *,pathname, uid_t,owner,gid_t,group,int,flags) #endif _syscall2(int,sys_getcwd1,char *,buf,size_t,size) +#if TARGET_ABI_BITS == 32 _syscall3(int, sys_getdents, uint, fd, struct dirent *, dirp, uint, count); +#endif #if defined(TARGET_NR_getdents64) && defined(__NR_getdents64) _syscall3(int, sys_getdents64, uint, fd, struct dirent64 *, dirp, uint, count); #endif @@ -2548,6 +2550,7 @@ return ret; } +#if defined(TARGET_I386) && defined(TARGET_ABI32) static abi_long do_set_thread_area(CPUX86State *env, abi_ulong ptr) { uint64_t *gdt_table = g2h(env->gdt.base); @@ -2679,6 +2682,7 @@ unlock_user_struct(target_ldt_info, ptr, 1); return 0; } +#endif /* TARGET_I386 && TARGET_ABI32 */ #ifndef TARGET_ABI32 static abi_long do_arch_prctl(CPUX86State *env, int code, abi_ulong addr)