From patchwork Tue Mar 31 06:04:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 5921 Received: (qmail 5636 invoked by alias); 31 Mar 2015 06:05:01 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 5613 invoked by uid 89); 31 Mar 2015 06:05:00 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL, BAYES_00, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: smtp.gentoo.org Received: from smtp.gentoo.org (HELO smtp.gentoo.org) (140.211.166.183) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Tue, 31 Mar 2015 06:04:59 +0000 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 3DC0B340771; Tue, 31 Mar 2015 06:04:57 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Cc: dj@redhat.com, joel.sherrill@oarcorp.com Subject: [PATCH] common: cgen-mem/cgen-ops: fix extern inline handling Date: Tue, 31 Mar 2015 02:04:54 -0400 Message-Id: <1427781894-11900-1-git-send-email-vapier@gentoo.org> In-Reply-To: <1427659474-4438-1-git-send-email-vapier@gentoo.org> References: <1427659474-4438-1-git-send-email-vapier@gentoo.org> X-IsSubscribed: yes With newer versions of gcc (5.x), the extern inline we're using with the cgen-{mem,ops} modules no longer work. Since this code really wants the gnu inline semantics, use that attribute explicitly. Committed. --- sim/common/ChangeLog | 5 +++++ sim/common/cgen-mem.h | 3 ++- sim/common/cgen-ops.h | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 5336343..f4ca558 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,8 @@ +2015-03-31 Mike Frysinger + + * cgen-mem.h (MEMOPS_INLINE): Change to EXTERN_INLINE. + * cgen-ops.h (SEMOPS_INLINE): Likewise. + 2015-03-29 Mike Frysinger * sim-arange.h (SIM_ARANGE_INLINE): Move above sim_addr_range_hit_p. diff --git a/sim/common/cgen-mem.h b/sim/common/cgen-mem.h index 3245ca9..5e4d464 100644 --- a/sim/common/cgen-mem.h +++ b/sim/common/cgen-mem.h @@ -20,10 +20,11 @@ along with this program. If not, see . */ #ifndef CGEN_MEM_H #define CGEN_MEM_H +/* TODO: This should get moved into sim-inline.h. */ #ifdef MEMOPS_DEFINE_INLINE #define MEMOPS_INLINE #else -#define MEMOPS_INLINE extern inline +#define MEMOPS_INLINE EXTERN_INLINE #endif /* Integer memory read support. diff --git a/sim/common/cgen-ops.h b/sim/common/cgen-ops.h index ef750ef..9f33d70 100644 --- a/sim/common/cgen-ops.h +++ b/sim/common/cgen-ops.h @@ -24,9 +24,10 @@ along with this program. If not, see . #include +/* TODO: This should get moved into sim-inline.h. */ #if defined (__GNUC__) && ! defined (SEMOPS_DEFINE_INLINE) #define SEMOPS_DEFINE_INLINE -#define SEMOPS_INLINE extern inline +#define SEMOPS_INLINE EXTERN_INLINE #else #define SEMOPS_INLINE #endif