From: Andreas Schwab Date: Sun, 2 Mar 2014 19:36:40 +0000 (+0000) Subject: linux-user: Don't use UID16 on AArch64 X-Git-Tag: v2.0.0-rc0~28^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd98d390ae009c5c1be5ae9a656e943bb47e14f0;p=thirdparty%2Fqemu.git linux-user: Don't use UID16 on AArch64 The AArch64 kernel defines its __kernel_uid_t type as 32 bits, unlike 32 bit ARM, so don't enable our 16-bit UID wrapper handling. Signed-off-by: Andreas Schwab Signed-off-by: Peter Maydell Signed-off-by: Riku Voipio Reviewed-by: Richard Henderson --- diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index 3c8869e073a..d55f396c9e8 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -53,7 +53,8 @@ #define TARGET_IOC_NRBITS 8 #define TARGET_IOC_TYPEBITS 8 -#if defined(TARGET_I386) || defined(TARGET_ARM) || defined(TARGET_SPARC) \ +#if defined(TARGET_I386) || (defined(TARGET_ARM) && defined(TARGET_ABI32)) \ + || defined(TARGET_SPARC) \ || defined(TARGET_M68K) || defined(TARGET_SH4) || defined(TARGET_CRIS) /* 16 bit uid wrappers emulation */ #define USE_UID16