From edb1439d8f18ac79f8bd0ce6b92ff909bf8dc013 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 23 Nov 2015 12:44:59 -0600 Subject: [PATCH] Last change introduced warnings when CONFIG_SIM_M32=y; This fixes those warnings too --- arch/sim/include/types.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/sim/include/types.h b/arch/sim/include/types.h index d8f734e3fcc..8edba08e931 100644 --- a/arch/sim/include/types.h +++ b/arch/sim/include/types.h @@ -76,14 +76,14 @@ typedef signed long long _int64_t; typedef unsigned long long _uint64_t; #define __INT64_DEFINED -#ifdef CONFIG_HOST_X86_64 -/* 32-bit build on 64-bit machine: A pointer is 8 bytes */ +#if defined(CONFIG_HOST_X86_64) && !defined(CONFIG_SIM_M32) +/* 63-bit build on 64-bit machine: A pointer is 8 bytes */ typedef signed long long _intptr_t; typedef unsigned long long _uintptr_t; #else -/* 32-bit build on 32-bit machine: A pointer is 4 bytes */ +/* 32-bit build on 32- or 64-bit machine: A pointer is 4 bytes */ typedef signed int _intptr_t; typedef unsigned int _uintptr_t;