Message ID | yddv8k0xxqx.fsf@CeBiTec.Uni-Bielefeld.DE |
---|---|
State | Unresolved |
Headers |
Return-Path: <gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp866593wrn; Fri, 17 Feb 2023 04:50:14 -0800 (PST) X-Google-Smtp-Source: AK7set+Vc9AxSzrvQoN12ns8hGhK5sUmLz3nsS63NqKSpqRDpB6OqnZcS57R1B52EvFxSe8zy5v8 X-Received: by 2002:a17:906:9452:b0:8af:2b57:b80f with SMTP id z18-20020a170906945200b008af2b57b80fmr15213ejx.55.1676638213924; Fri, 17 Feb 2023 04:50:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676638213; cv=none; d=google.com; s=arc-20160816; b=Xjef6Fc1rsBt38ITaLDVEd4qwmp39XqaSlIo4kl5tmjQvw6HVMxYx3BeLGTeuPtguQ 3KuP/Jb72pIS8/3TMGQ729tOTqlOAZCSmJKqcAigidSEiEiqx20gqV80Xza+ZKioswqu ZhEF4a3OE4bo5kui5PBozxVdNOrxPRFSLkzNIXplenAwshPwWUcY2QkZucImkDHeuU58 FjSynvvjhOsgpBncy99gySBhbfAAEs/wSHGbyhU5RDntbvpiewY51kpTibHsa8btyOZ7 z9CdsTWJ8IKofJkkozyy+nAhYtt82tJfBjdI60oarY+FjNgObnWMZPnBA7H0lkwBM52T SJGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:mime-version:user-agent :message-id:date:subject:cc:to:from:dkim-signature:dmarc-filter :delivered-to; bh=p+b7/Y+0Bmglp3LUIbp/2lLBl9d2eORZMnty0ux7q0c=; b=mn4rL1m6bIdKDZ96+YPB0/HqDUL4DNfeoTdqYHIqe6cQExtQpcGqD1Wxw1LbgFzZB2 6dhsUaqPqLzwwxyMdxH74kvbFRxK/93K4euLHd5MyAhe+nBpHt1rogG51SVzUlDXNUbV ZnsPy/iBx3opgJ8o4XndftYveyFA6BYvDB2inyguKaOPJVgi/41kQxkl47cQaRBuwYTz LP5ZQ50uLMN4Q9kv1IaF/5x/y1snaPEku2o1bCoMYXSapK22fRvJ+kUwQR6nMuHcmkTT +EWBU7iH/h0r3QgeTZtGOZLh7n9bCpvRVAz+N468CmYW0TWAz/M3/Y5RqKkmZogIxMi/ dK/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@CeBiTec.Uni-Bielefeld.DE header.s=20200306 header.b=Q2SdmVMo; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id 28-20020a170906019c00b008b12823c224si4676556ejb.370.2023.02.17.04.50.13 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 04:50:13 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@CeBiTec.Uni-Bielefeld.DE header.s=20200306 header.b=Q2SdmVMo; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 77D53384F034 for <ouuuleilei@gmail.com>; Fri, 17 Feb 2023 12:50:09 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp.CeBiTec.Uni-Bielefeld.DE (smtp.CeBiTec.Uni-Bielefeld.DE [129.70.160.84]) by sourceware.org (Postfix) with ESMTPS id 915583858C31 for <gcc-patches@gcc.gnu.org>; Fri, 17 Feb 2023 12:49:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 915583858C31 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=CeBiTec.Uni-Bielefeld.DE Authentication-Results: sourceware.org; spf=none smtp.mailfrom=cebitec.uni-bielefeld.de Received: from localhost (localhost [127.0.0.1]) by smtp.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id 335B2B924B; Fri, 17 Feb 2023 13:49:44 +0100 (CET) X-Virus-Scanned: amavisd-new at CeBiTec.Uni-Bielefeld.DE Received: from smtp.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (smtp.cebitec.uni-bielefeld.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7gF9kSelPQ4u; Fri, 17 Feb 2023 13:49:43 +0100 (CET) Received: from manam.CeBiTec.Uni-Bielefeld.DE (p5085574e.dip0.t-ipconnect.de [80.133.87.78]) (Authenticated sender: ro) by smtp.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPSA id 9B5B2B9803; Fri, 17 Feb 2023 13:49:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=CeBiTec.Uni-Bielefeld.DE; s=20200306; t=1676638183; bh=6+DP1M2yXFQomqX9MOeTXkpN4a3r1MHriqtZQXZv/Go=; h=From:To:Cc:Subject:Date:From; b=Q2SdmVMoPxX41+2ZiPnWrp5BNLVvaGyPVNzwDkU6pr8/000iX9+LVagYSzDbXwH7K RYqCluyZhDJScKH+pni5FpadTVrP6T1H/wSu82nY6F3ZpRraJVmNknKcgoi1G6x9Ji ldLWgUaR/QOMSdyreZyPA3K6h0ljXApTWlN8j/K/yJu2EHsrCaynp5/YZUJQADkvC+ Flbf2pOxRIjb+fmSEEskWtRLXo0UPATvqB523f5ELehUyySVR9dpnYgx8SQ06zKHPE TLzhIVMMdyLxU8ZcbNZ43IHr3Fbq739HjjliquSnuXFS8NY20QSYnwoEOun0jDpPCB Ye7OJ1Ui5lz2A== From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> To: gcc-patches@gcc.gnu.org Cc: Bruce Korb <bkorb@gnu.org> Subject: [COMMITTED] fixincludes: Bypass solaris_math_12 on newer Solaris 11.4 Date: Fri, 17 Feb 2023 13:49:42 +0100 Message-ID: <yddv8k0xxqx.fsf@CeBiTec.Uni-Bielefeld.DE> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1.90 (usg-unix-v) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Status: No, score=-3795.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, KAM_NUMSUBJECT, KAM_SHORT, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list <gcc-patches.gcc.gnu.org> List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=unsubscribe> List-Archive: <https://gcc.gnu.org/pipermail/gcc-patches/> List-Post: <mailto:gcc-patches@gcc.gnu.org> List-Help: <mailto:gcc-patches-request@gcc.gnu.org?subject=help> List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=subscribe> Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" <gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org> X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758082591849824860?= X-GMAIL-MSGID: =?utf-8?q?1758082591849824860?= |
Series |
[COMMITTED] fixincludes: Bypass solaris_math_12 on newer Solaris 11.4
|
|
Checks
Context | Check | Description |
---|---|---|
snail/gcc-patch-check | warning | Git am fail log |
Commit Message
Rainer Orth
Feb. 17, 2023, 12:49 p.m. UTC
Solaris 11 <math.h> long had this snippet #if __cplusplus >= 201103L #undef _GLIBCXX_USE_C99_MATH #undef _GLIBCXX_USE_C99_MATH_TR1 #endif which badly broke libstdc++. This has long been undone using fixincludes in [fixincludes, v3] Don't define libstdc++-internal macros in Solaris 10+ <math.h> https://gcc.gnu.org/ml/gcc-patches/2016-11/msg00330.html However, the issue came up again recently when that code broke the LLVM build, too, which unfortunately doesn't know about GCC's include-fixed directory. The issue was reinvestigated and it turned out that the workaround/hack is only needed for specific old versions of the Sun/Oracle Studio compilers. So <math.h> now looks like /* Accommodate historical C++11 -std=c++03 behavior of Studio 12.4 and 12.5 */ #if (__cplusplus >= 201103L) && \ ((__SUNPRO_CC == 0x5130) || (__SUNPRO_CC == 0x5140) || \ defined(__MATH_PREEMPTS_GLIBCXX_C99_MATH)) #ifdef _GLIBCXX_USE_C99_MATH #undef _GLIBCXX_USE_C99_MATH #endif #ifdef _GLIBCXX_USE_C99_MATH_TR1 #undef _GLIBCXX_USE_C99_MATH_TR1 #endif #endif If this change is in place, there's no longer a need for the fixincludes fix, so this patch bypasses it as appropriate. Tested on Solaris 11.3 (without the fixed header) and recent 11.4 (with the fixed header). Committed to trunk. I may backport to the gcc-11 and gcc-12 branches, too. Rainer
# HG changeset patch # Parent 76f1a1965f9296be97f6edc2b9610d6600036de1 fixincludes: Bypass solaris_math_12 on newer Solaris 11.4 diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -4306,6 +4306,7 @@ fix = { files = math.h; mach = '*-*-solaris2*'; select = '#undef.*_GLIBCXX_USE_C99_MATH'; + bypass = '__MATH_PREEMPTS_GLIBCXX_C99_MATH'; sed = "/#undef[ \t]*_GLIBCXX_USE_C99_MATH/d"; test_text = << _EOText_ #if __cplusplus >= 201103L