From patchwork Thu Mar 5 22:27:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Baldwin X-Patchwork-Id: 38443 Received: (qmail 10937 invoked by alias); 5 Mar 2020 22:28:37 -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 10888 invoked by uid 89); 5 Mar 2020 22:28:37 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-16.5 required=5.0 tests=AWL, BAYES_00, FORGED_SPF_HELO, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KHOP_HELO_FCRDNS, SPF_HELO_PASS, SPF_SOFTFAIL autolearn=ham version=3.3.1 spammy=D*FreeBSD.org, HContent-Transfer-Encoding:8bit X-HELO: mail.baldwin.cx Received: from bigwig.baldwin.cx (HELO mail.baldwin.cx) (96.47.65.170) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 05 Mar 2020 22:28:34 +0000 Received: from ralph.com (ralph.baldwin.cx [66.234.199.215]) by mail.baldwin.cx (Postfix) with ESMTPSA id 3CFFA10B78A; Thu, 5 Mar 2020 17:28:32 -0500 (EST) From: John Baldwin To: gdb-patches@sourceware.org, binutils@sourceware.org Subject: [PATCH] libctf: Mark bswap_identity_64 inline function as static. Date: Thu, 5 Mar 2020 14:27:08 -0800 Message-Id: <20200305222708.13332-1-jhb@FreeBSD.org> MIME-Version: 1.0 X-IsSubscribed: yes This is similar to cbbbc402e059ee345cb781d3ceb757ae1cc679ee and fixes a link error with duplicately defined symbols on FreeBSD. libctf/ChangeLog: * swap.h (bswap_identity_64): Make static. --- libctf/ChangeLog | 4 ++++ libctf/swap.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libctf/ChangeLog b/libctf/ChangeLog index 9da5827c26..6fe5394bab 100644 --- a/libctf/ChangeLog +++ b/libctf/ChangeLog @@ -1,3 +1,7 @@ +2020-03-05 John Baldwin + + * swap.h (bswap_identity_64): Make static. + 2020-01-18 Nick Clifton Binutils 2.34 branch created. diff --git a/libctf/swap.h b/libctf/swap.h index f8cc822db2..d526f7e267 100644 --- a/libctf/swap.h +++ b/libctf/swap.h @@ -43,7 +43,7 @@ bswap_32 (uint32_t v) | ((v & 0x000000ff) << 24)); } -inline uint64_t +static inline uint64_t bswap_identity_64 (uint64_t v) { return v;