commit 3178d1cabfcf49959ed196bc599aa13f0a21b3fe Author: Nicolas Morey-Chaisemartin Date: Thu May 18 11:20:20 2017 +0200 Add armv6 and armv7 support Signed-off-by: Nicolas Morey-Chaisemartin diff --git common/compatibility.h common/compatibility.h index c034df383ebe..c17eae907d76 100644 --- common/compatibility.h +++ common/compatibility.h @@ -59,6 +59,8 @@ # define ARCH_ppc64 # elif defined(__PPC__) # define ARCH_ppc +# elif defined(__ARM_ARCH_7A__) +# define ARCH_armv7 # elif defined(__aarch64__) # define ARCH_arm64 # elif defined(__arm__) @@ -98,7 +100,7 @@ #define U16H_FMT "0x%04x" #define U8H_FMT "0x%02x" -#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_arm6l) || defined(ARCH_s390) +#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_arm6l) || defined(ARCH_s390) || defined(__ARM_ARCH_7A__) # if defined(__MINGW32__) || defined(__MINGW64__) # include # define U64D_FMT "0x%" PRId64 diff --git mtcr_ul/packets_common.h mtcr_ul/packets_common.h index 5728fc7fdd6e..213f227d9123 100644 --- mtcr_ul/packets_common.h +++ mtcr_ul/packets_common.h @@ -148,6 +148,8 @@ # define ARCH_ppc64 # elif defined(__PPC__) # define ARCH_ppc +# elif defined(__ARM_ARCH_7A__) +# define ARCH_armv7 # elif defined(__aarch64__) # define ARCH_arm64 # elif defined(__arm__) @@ -178,7 +180,7 @@ # define U8H_FMT "0x%02x" # define U32D_FMT "%u" # define STR_FMT "%s" -#elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(__MINGW32__) || defined(UEFI_BUILD) || defined(ARCH_arm6l) || defined(ARCH_s390) +#elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(__MINGW32__) || defined(UEFI_BUILD) || defined(ARCH_arm6l) || defined(ARCH_s390) || defined(__ARM_ARCH_7A__) # define U64H_FMT "0x%016llx" # define U64D_FMT "%llu" # define U32H_FMT "0x%08x" diff --git tools_layouts/adb_to_c_utils.h tools_layouts/adb_to_c_utils.h index 26adb09bec01..0db09f24c62c 100644 --- tools_layouts/adb_to_c_utils.h +++ tools_layouts/adb_to_c_utils.h @@ -137,6 +137,10 @@ extern "C" { # define ARCH_ppc # elif defined(__aarch64__) # define ARCH_arm64 +# elif defined(__ARM_ARCH_7A__) +# define ARCH_armv7 +# elif defined(__arm__) +# define ARCH_arm6l # elif defined(__s390x__) # define ARCH_s390x # elif defined(__s390__) @@ -177,7 +181,7 @@ extern "C" { # define U64D_FMT "%lu" # define U64H_FMT "0x%016lx" # define U48H_FMT "0x%012lx" -#elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_s390) +#elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_s390) || defined(__ARM_ARCH_7A__) || defined(__arm__) # if defined(__MINGW32__) || defined(__MINGW64__) # include # define U64D_FMT "0x%" PRId64