OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sim: common: sim-arange: fix extern inline handling 

With newer versions of gcc (5.x), the extern inline we're using with the
sim-arange module no longer works.  Since this code really wants the gnu
inline semantics, use that attribute explicitly.

Reported-by: DJ Delorie <dj@redhat.com>
Reported-by: Joel Sherrill <joel.sherrill@oarcorp.com>
This commit is contained in:
Mike Frysinger 2015-03-29 15:59:01 -04:00
parent 6dae8a88bf
commit 92fc6153a6
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sim/common/ChangeLog
View File

@ -1,3 +1,9 @@
2015-03-29 Mike Frysinger <vapier@gentoo.org>
* sim-arange.h (SIM_ARANGE_INLINE): Move above sim_addr_range_hit_p.
(sim_addr_range_hit_p): Change INLINE to SIM_ARANGE_INLINE.
* sim-inline.h (INLINE2): Define to gnu_inline when available.
2015-03-24 Mike Frysinger <vapier@gentoo.org>
* sim-profile.c (profile_pc_event): Get pc via sim_pc_get. Delete

22
sim/common/sim-arange.h
View File

@ -60,22 +60,26 @@ extern void sim_addr_range_delete (ADDR_RANGE * /*ar*/,
address_word /*start*/,
address_word /*end*/);
/* Return non-zero if ADDR is in range AR, traversing the entire tree.
If no range is specified, that is defined to mean "everything". */
extern INLINE int
sim_addr_range_hit_p (ADDR_RANGE * /*ar*/, address_word /*addr*/);
#define ADDR_RANGE_HIT_P(ar, addr) \
((ar)->range_tree == NULL || sim_addr_range_hit_p ((ar), (addr)))
/* TODO: This should get moved into sim-inline.h. */
#ifdef HAVE_INLINE
#ifdef SIM_ARANGE_C
#define SIM_ARANGE_INLINE INLINE
#else
#define SIM_ARANGE_INLINE EXTERN_INLINE
#endif
#include "sim-arange.c"
#else
#define SIM_ARANGE_INLINE
#define SIM_ARANGE_INLINE EXTERN
#endif
/* Return non-zero if ADDR is in range AR, traversing the entire tree.
If no range is specified, that is defined to mean "everything". */
SIM_ARANGE_INLINE int
sim_addr_range_hit_p (ADDR_RANGE * /*ar*/, address_word /*addr*/);
#define ADDR_RANGE_HIT_P(ar, addr) \
((ar)->range_tree == NULL || sim_addr_range_hit_p ((ar), (addr)))
#ifdef HAVE_INLINE
#include "sim-arange.c"
#endif
#define SIM_ARANGE_C_INCLUDED

4
sim/common/sim-inline.h
View File

@ -303,7 +303,9 @@
/* ??? Temporary, pending decision to always use extern inline and do a vast
cleanup of inline support. */
#ifndef INLINE2
#if defined (__GNUC__)
#if defined (__GNUC_GNU_INLINE__) || defined (__GNUC_STDC_INLINE__)
#define INLINE2 __inline__ __attribute__ ((__gnu_inline__))
#elif defined (__GNUC__)
#define INLINE2 __inline__
#else
#define INLINE2 /*inline*/