From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 108244 invoked by alias); 6 Sep 2018 10:36:39 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 108135 invoked by uid 89); 6 Sep 2018 10:36:38 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS autolearn=unavailable version=3.3.2 spammy= X-HELO: sessmg22.ericsson.net Received: from sessmg22.ericsson.net (HELO sessmg22.ericsson.net) (193.180.251.58) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 06 Sep 2018 10:36:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; d=ericsson.com; s=mailgw201801; c=relaxed/simple; q=dns/txt; i=@ericsson.com; t=1536230190; h=From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=VpS9hDbAvN1/RhnRjaPRjVlrgRgKUWkkKCGd/22w3GE=; b=afh5q15++3tn/slz7zgd6EhPxoiP2wBX7VhYWTVuJfJVLo8RCyRkw30DfmK46QS+ DYT07IuxumdpI2wJWKCXZAUYXxeok7cDZLFqCXrAPSWBHRd9N4NGsW9X1QrIizRE 75fsK548d4LMor6mSR2XIayqF1OkIgj8CoPtuD3P1+4=; Received: from ESESBMB503.ericsson.se (Unknown_Domain [153.88.183.116]) by sessmg22.ericsson.net (Symantec Mail Security) with SMTP id 5C.13.31332.E23019B5; Thu, 6 Sep 2018 12:36:30 +0200 (CEST) Received: from ESESSMR501.ericsson.se (153.88.183.108) by ESESBMB503.ericsson.se (153.88.183.116) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Thu, 6 Sep 2018 12:36:30 +0200 Received: from ESESBMB504.ericsson.se (153.88.183.171) by ESESSMR501.ericsson.se (153.88.183.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Thu, 6 Sep 2018 12:36:30 +0200 Received: from NAM03-DM3-obe.outbound.protection.outlook.com (153.88.183.157) by ESESBMB504.ericsson.se (153.88.183.171) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3 via Frontend Transport; Thu, 6 Sep 2018 12:36:29 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ericsson.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EB+MZiwwLgMSmwggRB3a1Rvlkf6MNKFh2k/C5jC5nII=; b=SigChE6cEtMseWD6CThdXt6LrB6PNXLvFPXLMqlSYbUgEZC7WkoklKC2uHUimUryVKA3Uhov5zyn81vh+gdddjk5LDPKuZtOmUqMe2KdhIVzpjPK9fVmhxU56K3XN/HEN7EPFMYnRSbo+l3hsDiWbtwhjvztCz9ZR7Quya2Ed0w= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; Received: from [100.94.40.157] (192.176.1.93) by BN7PR15MB2388.namprd15.prod.outlook.com (2603:10b6:406:8c::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.14; Thu, 6 Sep 2018 10:36:26 +0000 Subject: Re: [PATCH] Backport gettext fixes to get rid of warnings on macOS To: , , References: <1533135533-16471-1-git-send-email-simon.marchi@ericsson.com> From: Simon Marchi Message-ID: <2388ae29-d2b9-f7f1-4e8b-44f157ccbcd1@ericsson.com> Date: Thu, 06 Sep 2018 10:36:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <1533135533-16471-1-git-send-email-simon.marchi@ericsson.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Return-Path: simon.marchi@ericsson.com Received-SPF: None (protection.outlook.com: ericsson.com does not designate permitted sender hosts) X-IsSubscribed: yes X-SW-Source: 2018-09/txt/msg00090.txt.bz2 On 2018-08-01 03:58 PM, Simon Marchi wrote: > This patch was tested to build binutils-gdb on GNU/Linux and macOS. It can be > applied to the gcc repo too, after fixing some trivial merge conflicts (someone > else will need to do it, as I don't have push access to gcc). Although I think > it is relatively low-risk, building gcc on macOS was not tested with this > patch, so if somebody that has already a macOS build can do it, it would be > appreciated. > > Two fixes were committed recently to the gettext repo in order to make > gdb build warning-free on macOS. This patch backports them both: > > - Make the format_arg attribute effective also in the case _INTL_REDIRECT_INLINE. > 113893dce80358a4ae0d9463ce73c5670c81cf0c > http://git.savannah.gnu.org/cgit/gettext.git/commit/?id=113893dce80358a4ae0d9463ce73c5670c81cf0c > > - Enable the format_arg attribute also on clang on Mac OS X. > bd6a52241c7c83c90e043ace2082a2508d273f55 > http://git.savannah.gnu.org/cgit/gettext.git/commit/?id=bd6a52241c7c83c90e043ace2082a2508d273f55 > > intl/ChangeLog: > > * libgnuintl.h (_INTL_MAY_RETURN_STRING_ARG, gettext, dgettext, > dcgettext, ngettext, dngettext, dcngettext): Backport changes > from upstream gettext. > --- > intl/libgnuintl.h | 35 +++++++++++++++++++++++------------ > 1 file changed, 23 insertions(+), 12 deletions(-) > > diff --git a/intl/libgnuintl.h b/intl/libgnuintl.h > index acc9093..7616d6f 100644 > --- a/intl/libgnuintl.h > +++ b/intl/libgnuintl.h > @@ -115,7 +115,7 @@ extern "C" { > /* _INTL_MAY_RETURN_STRING_ARG(n) declares that the given function may return > its n-th argument literally. This enables GCC to warn for example about > printf (gettext ("foo %y")). */ > -#if __GNUC__ >= 3 && !(__APPLE_CC__ > 1 && defined __cplusplus) > +#if defined __GNUC__ && __GNUC__ >= 3 && !(defined __APPLE_CC__ && __APPLE_CC__ > 1 && !(defined __clang__ && __clang__ && __clang_major__ >= 3) && defined __cplusplus) > # define _INTL_MAY_RETURN_STRING_ARG(n) __attribute__ ((__format_arg__ (n))) > #else > # define _INTL_MAY_RETURN_STRING_ARG(n) > @@ -127,7 +127,9 @@ extern "C" { > #ifdef _INTL_REDIRECT_INLINE > extern char *libintl_gettext (const char *__msgid) > _INTL_MAY_RETURN_STRING_ARG (1); > -static inline char *gettext (const char *__msgid) > +static inline > +_INTL_MAY_RETURN_STRING_ARG (1) > +char *gettext (const char *__msgid) > { > return libintl_gettext (__msgid); > } > @@ -145,7 +147,9 @@ extern char *gettext _INTL_PARAMS ((const char *__msgid)) > #ifdef _INTL_REDIRECT_INLINE > extern char *libintl_dgettext (const char *__domainname, const char *__msgid) > _INTL_MAY_RETURN_STRING_ARG (2); > -static inline char *dgettext (const char *__domainname, const char *__msgid) > +static inline > +_INTL_MAY_RETURN_STRING_ARG (2) > +char *dgettext (const char *__domainname, const char *__msgid) > { > return libintl_dgettext (__domainname, __msgid); > } > @@ -165,8 +169,9 @@ extern char *dgettext _INTL_PARAMS ((const char *__domainname, > extern char *libintl_dcgettext (const char *__domainname, const char *__msgid, > int __category) > _INTL_MAY_RETURN_STRING_ARG (2); > -static inline char *dcgettext (const char *__domainname, const char *__msgid, > - int __category) > +static inline > +_INTL_MAY_RETURN_STRING_ARG (2) > +char *dcgettext (const char *__domainname, const char *__msgid, int __category) > { > return libintl_dcgettext (__domainname, __msgid, __category); > } > @@ -188,8 +193,10 @@ extern char *dcgettext _INTL_PARAMS ((const char *__domainname, > extern char *libintl_ngettext (const char *__msgid1, const char *__msgid2, > unsigned long int __n) > _INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2); > -static inline char *ngettext (const char *__msgid1, const char *__msgid2, > - unsigned long int __n) > +static inline > +_INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2) > +char *ngettext (const char *__msgid1, const char *__msgid2, > + unsigned long int __n) > { > return libintl_ngettext (__msgid1, __msgid2, __n); > } > @@ -210,8 +217,10 @@ extern char *ngettext _INTL_PARAMS ((const char *__msgid1, > extern char *libintl_dngettext (const char *__domainname, const char *__msgid1, > const char *__msgid2, unsigned long int __n) > _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3); > -static inline char *dngettext (const char *__domainname, const char *__msgid1, > - const char *__msgid2, unsigned long int __n) > +static inline > +_INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3) > +char *dngettext (const char *__domainname, const char *__msgid1, > + const char *__msgid2, unsigned long int __n) > { > return libintl_dngettext (__domainname, __msgid1, __msgid2, __n); > } > @@ -234,9 +243,11 @@ extern char *libintl_dcngettext (const char *__domainname, > const char *__msgid1, const char *__msgid2, > unsigned long int __n, int __category) > _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3); > -static inline char *dcngettext (const char *__domainname, > - const char *__msgid1, const char *__msgid2, > - unsigned long int __n, int __category) > +static inline > +_INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3) > +char *dcngettext (const char *__domainname, > + const char *__msgid1, const char *__msgid2, > + unsigned long int __n, int __category) > { > return libintl_dcngettext (__domainname, __msgid1, __msgid2, __n, __category); > } > Could somebody from gcc take a look at and hopefully merge this? Thanks, Simon