From 7516c26f867b8c235f28a4d449efb9990125e0a1 Mon Sep 17 00:00:00 2001 From: "Pavel I. Kryukov" Date: Wed, 16 Jan 2019 16:04:34 -0500 Subject: [PATCH] Do not expand macros to 'defined' Expanding a macro which contains 'defined' PP keyword is UB. It causes a compilation failure when -Wexpansion-to-defined is used. sim/common/Changelog: 2019-01-16 Pavel I. Kryukov * sim-arange.c: eliminate DEFINE_NON_INLINE_P --- sim/common/ChangeLog | 4 ++++ sim/common/sim-arange.c | 8 +++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index a95735a4793..1fddb4e7e3c 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,7 @@ +2019-01-16 Pavel I. Kryukov + + * sim-arange.c: eliminate DEFINE_NON_INLINE_P + 2019-01-15 Simon Marchi * sim-arange.h (SIM_ARANGE_INLINE): Change EXTERN to extern. diff --git a/sim/common/sim-arange.c b/sim/common/sim-arange.c index 6373b742ce8..0f0c8a1ce28 100644 --- a/sim/common/sim-arange.c +++ b/sim/common/sim-arange.c @@ -35,7 +35,7 @@ along with this program. If not, see . */ #define DEFINE_INLINE_P (! defined (SIM_ARANGE_C_INCLUDED)) #define DEFINE_NON_INLINE_P defined (SIM_ARANGE_C_INCLUDED) -#if DEFINE_NON_INLINE_P +#ifdef SIM_ARANGE_C_INCLUDED /* Insert a range. */ @@ -280,9 +280,7 @@ sim_addr_range_delete (ADDR_RANGE *ar, address_word start, address_word end) build_search_tree (ar); } -#endif /* DEFINE_NON_INLINE_P */ - -#if DEFINE_INLINE_P +#else /* SIM_ARANGE_C_INCLUDED */ SIM_ARANGE_INLINE int sim_addr_range_hit_p (ADDR_RANGE *ar, address_word addr) @@ -301,4 +299,4 @@ sim_addr_range_hit_p (ADDR_RANGE *ar, address_word addr) return 0; } -#endif /* DEFINE_INLINE_P */ +#endif /* SIM_ARANGE_C_INCLUDED */ -- 2.30.2