From patchwork Thu Dec 8 15:53:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Botcazou X-Patchwork-Id: 87288 Delivered-To: patch@linaro.org Received: by 10.182.112.6 with SMTP id im6csp940073obb; Thu, 8 Dec 2016 07:53:41 -0800 (PST) X-Received: by 10.98.150.88 with SMTP id c85mr74770842pfe.68.1481212421714; Thu, 08 Dec 2016 07:53:41 -0800 (PST) Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id 1si29377730pll.139.2016.12.08.07.53.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Dec 2016 07:53:41 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-return-443794-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org; spf=pass (google.com: domain of gcc-patches-return-443794-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=gcc-patches-return-443794-patch=linaro.org@gcc.gnu.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:date:message-id:mime-version:content-type :content-transfer-encoding; q=dns; s=default; b=XOtrAufrYunuSqvM 7oZ0VqVs/tmrtg1nBhYkp7qIdZQi6uslGDzIUqYmU5euQFwZOA+eciHLJNOo6YkO d/KfAGwl6JgPON89JtqkDsHqn1EZIB80KozBRr55LCcVmJY0JOtYRBvclhk9LEIf QI5t03UrrjqtQ2m519me5DpwlHs= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=default; bh=05vpmPxbcZ2P4yrZ0covLK 5H8WA=; b=AsuaWId10j+a4oQrThWkFNESxPqelny8Rw0QS/Jjy/7q57HVQOYWb0 Ey06sXC7RoFkbSiBkcm0GTz4p41d0XVSj7AgNW+JAezFVBY7WJEQCGfMy67urDHs jCdJ6yuPVfssLMayZYR4OQO0zVln66q7gDY2SpvihHlSFboQVxXJY= Received: (qmail 89940 invoked by alias); 8 Dec 2016 15:53:29 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 89909 invoked by uid 89); 8 Dec 2016 15:53:28 -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, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy= X-Spam-User: qpsmtpd, 2 recipients X-HELO: smtp.eu.adacore.com Received: from mel.act-europe.fr (HELO smtp.eu.adacore.com) (194.98.77.210) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 08 Dec 2016 15:53:18 +0000 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 78CB2814DC; Thu, 8 Dec 2016 16:53:15 +0100 (CET) Received: from smtp.eu.adacore.com ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sQ7DOL0oXlvJ; Thu, 8 Dec 2016 16:53:15 +0100 (CET) Received: from polaris.localnet (bon31-6-88-161-99-133.fbx.proxad.net [88.161.99.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.eu.adacore.com (Postfix) with ESMTPSA id 555C5814CA; Thu, 8 Dec 2016 16:53:15 +0100 (CET) From: Eric Botcazou To: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Subject: Fix PR libstdc++/78264 Date: Thu, 08 Dec 2016 16:53:03 +0100 Message-ID: <5811326.yNvE5WotYC@polaris> User-Agent: KMail/4.14.10 (Linux/3.16.7-48-desktop; KDE/4.14.9; x86_64; ; ) MIME-Version: 1.0 As documented a few lines below in the same file (but I presume that the BADNAMES file is long gone), using _N wreaks havoc on Solaris: // This marks string literals in header files to be extracted for eventual // translation. It is primarily used for messages in thrown exceptions; see // src/functexcept.cc. We use __N because the more traditional _N is used // for something else under certain OSes (see BADNAMES). #define __N(msgid) (msgid) Tested on x86-64/Linux and SPARC/Solaris, applied on mainline as obvious. 2016-12-08 Eric Botcazou PR libstdc++/78264 * include/bits/c++config (_GLIBCXX_NOEXCEPT_PARM): Turn _N into _NE. (_GLIBCXX_NOEXCEPT_QUAL): Likewise. -- Eric Botcazou Index: include/bits/c++config =================================================================== --- include/bits/c++config (revision 243333) +++ include/bits/c++config (working copy) @@ -147,8 +147,8 @@ #endif #if __cpp_noexcept_function_type -#define _GLIBCXX_NOEXCEPT_PARM , bool _N -#define _GLIBCXX_NOEXCEPT_QUAL noexcept (_N) +#define _GLIBCXX_NOEXCEPT_PARM , bool _NE +#define _GLIBCXX_NOEXCEPT_QUAL noexcept (_NE) #else #define _GLIBCXX_NOEXCEPT_PARM #define _GLIBCXX_NOEXCEPT_QUAL