From 8030a0112bc9cdd5e0f419b79f83f6dd8e22c52d Mon Sep 17 00:00:00 2001 From: Ioannis Glaropoulos Date: Thu, 16 May 2019 12:28:09 +0200 Subject: [PATCH] arch: arm: remove redundant definitions of typeof The typeof definitions in tz.h and cmse.h are not required any more, as the ARM GCC toolchain intrinsics have been modified to use __typeof__ directly. Signed-off-by: Ioannis Glaropoulos --- arch/arm/include/cortex_m/cmse.h | 5 ----- arch/arm/include/cortex_m/tz.h | 3 --- 2 files changed, 8 deletions(-) diff --git a/arch/arm/include/cortex_m/cmse.h b/arch/arm/include/cortex_m/cmse.h index b4d010bafec4..6327df77f690 100644 --- a/arch/arm/include/cortex_m/cmse.h +++ b/arch/arm/include/cortex_m/cmse.h @@ -136,11 +136,6 @@ int arm_cmse_addr_range_read_ok(u32_t addr, u32_t size, int force_npriv); */ int arm_cmse_addr_range_readwrite_ok(u32_t addr, u32_t size, int force_npriv); -/* Required for C99 compilation */ -#ifndef typeof -#define typeof __typeof__ -#endif - /** * @brief Read accessibility of an object * diff --git a/arch/arm/include/cortex_m/tz.h b/arch/arm/include/cortex_m/tz.h index 14240e14c21f..e84a33bb6936 100644 --- a/arch/arm/include/cortex_m/tz.h +++ b/arch/arm/include/cortex_m/tz.h @@ -283,9 +283,6 @@ int tz_sau_region_configure(tz_sau_conf_t *p_sau_conf); */ typedef void __attribute__((cmse_nonsecure_call)) (*tz_ns_func_ptr_t) (void); -/* Required for C99 compilation */ -#define typeof __typeof__ - #if defined(CONFIG_ARM_FIRMWARE_HAS_SECURE_ENTRY_FUNCS) /** * @brief Non-Secure entry function attribute.