gwj / at91sam9263 · Commits

Commit 4583f5897ba4d263081606e7ee41ebb328c799b7

Authored by blueswir1
1 parent 9892fbfb

To make syscall.c for 64 bit truly warning-free, we need some more #ifs. 

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5080 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 5 additions and 1 deletions
linux-user/syscall.c
  View file @4583f58
... ... @@ -195,12 +195,14 @@ _syscall4(int,sys_faccessat,int,dirfd,const char *,pathname,int,mode,int,flags)
195 195 _syscall4(int,sys_fchmodat,int,dirfd,const char *,pathname,
196 196 mode_t,mode,int,flags)
197 197 #endif
198   -#if defined(TARGET_NR_fchownat) && defined(__NR_fchownat)
  198 +#if defined(TARGET_NR_fchownat) && defined(__NR_fchownat) && defined(USE_UID16)
199 199 _syscall5(int,sys_fchownat,int,dirfd,const char *,pathname,
200 200 uid_t,owner,gid_t,group,int,flags)
201 201 #endif
202 202 _syscall2(int,sys_getcwd1,char *,buf,size_t,size)
  203 +#if TARGET_ABI_BITS == 32
203 204 _syscall3(int, sys_getdents, uint, fd, struct dirent *, dirp, uint, count);
  205 +#endif
204 206 #if defined(TARGET_NR_getdents64) && defined(__NR_getdents64)
205 207 _syscall3(int, sys_getdents64, uint, fd, struct dirent64 *, dirp, uint, count);
206 208 #endif
... ... @@ -2548,6 +2550,7 @@ static abi_long do_modify_ldt(CPUX86State *env, int func, abi_ulong ptr,
2548 2550 return ret;
2549 2551 }
2550 2552  
  2553 +#if defined(TARGET_I386) && defined(TARGET_ABI32)
2551 2554 static abi_long do_set_thread_area(CPUX86State *env, abi_ulong ptr)
2552 2555 {
2553 2556 uint64_t *gdt_table = g2h(env->gdt.base);
... ... @@ -2679,6 +2682,7 @@ static abi_long do_get_thread_area(CPUX86State *env, abi_ulong ptr)
2679 2682 unlock_user_struct(target_ldt_info, ptr, 1);
2680 2683 return 0;
2681 2684 }
  2685 +#endif /* TARGET_I386 && TARGET_ABI32 */
2682 2686  
2683 2687 #ifndef TARGET_ABI32
2684 2688 static abi_long do_arch_prctl(CPUX86State *env, int code, abi_ulong addr)
... ...