[committed] libstdc++: Fix test that fails due to name clash with old glibc [PR107979]
Message ID | 20221206214100.239663-1-jwakely@redhat.com |
---|---|
State | Repeat Merge |
Headers |
Return-Path: <gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3063908wrr; Tue, 6 Dec 2022 13:44:50 -0800 (PST) X-Google-Smtp-Source: AA0mqf70n2/6AqNclpUQWtMRLg/fOEVmV+ZqMsSsh1nuPguIdaI8vuOH53qivChr+YraCPUnzOKb X-Received: by 2002:a05:6402:2025:b0:46b:b19a:252e with SMTP id ay5-20020a056402202500b0046bb19a252emr26409856edb.188.1670363090063; Tue, 06 Dec 2022 13:44:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670363090; cv=none; d=google.com; s=arc-20160816; b=hSJJmblVsbQBtC9uH51SMY/Usd14wU5OAbpD/hGxQP0Addm/swvJnxxK4UENtVucRh lraOqRPf6nIjSnnlKHJnmECLq4jBRY6vGZl+1hqhJmOOicgOvv90MIxP8Wyb+AY6FTBw ge49kve3mn5Cz8ZuRmnmgoqMfhRFfza0ZHxv1+cPuv9lNkApK1wZTZ2YxgL5obtxHMf8 Im1CmRgZVEFuvmbrVOTQN1vfD86fCBYSmKuLOufNQJNHVQ92l43bpixrEbKLIh7Dwm5/ 3IS4cfnFED+HawflLKDzo2Xho6Xhm7CrmwW4WYgeLo/pQ4dPFxJmz5rq1z8gMEifeYFc 2uYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=AzriyT0mGFjVKs8+NPNnfQHFpCLWqQvHLSsPRSg2ryU=; b=pQFMJ+q7aSRM+naT1XkffzMotowchUlvoYWcoR3azdyEXvReoD78oWMNuhex7gpAqA eIS7iSX4WzTqTJNpHfrsuioFb5ueptJJiiWJfUP085d8NItTwkj07+K3iU2c0M6oTOXj 4q6c+kY+sQT/mrTOL5xXaSSSxRfWgdGxwFzFccuW6RAYDSeU6stLGsJGrwjSHX20kVnw 7I0YitNQ/HElqorSm6cKpQOq+G32p8tNiL3rqJGA6b+dEt2jAYSM9OCpl0KTiEY2mLAO YOZBBVw/Wtko4r+abh/0G2hymemD66uTJsr7Ioxl56kyPGOagfCjBk98H891kVViZU+9 1WcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="S6i/dPdo"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id vr10-20020a170907a50a00b007ade3ea871esi12892686ejc.627.2022.12.06.13.44.49 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Dec 2022 13:44:50 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="S6i/dPdo"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CAEC33839D2A for <ouuuleilei@gmail.com>; Tue, 6 Dec 2022 21:42:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CAEC33839D2A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1670362979; bh=AzriyT0mGFjVKs8+NPNnfQHFpCLWqQvHLSsPRSg2ryU=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=S6i/dPdoZT68isEh77o8CF6DCmSt0bPZB4FGsa1SoHIOT/Py5BQmoOHxtuh450UoC xrJYpCB4KRYzr5pYCfRPuFleSPhBmFK5lvibH2n8xr3BDsKAwXsnGju0fV/wlhD2Zi PuoFJNvFTT5SSaUQCArySXkFGi+hyRyg8sCPn37c= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id C3DB9380FAE9 for <gcc-patches@gcc.gnu.org>; Tue, 6 Dec 2022 21:41:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C3DB9380FAE9 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-591-Q4cpxVvdMFmDeaouW3eqLg-1; Tue, 06 Dec 2022 16:41:03 -0500 X-MC-Unique: Q4cpxVvdMFmDeaouW3eqLg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 66903811E75; Tue, 6 Dec 2022 21:41:03 +0000 (UTC) Received: from localhost (unknown [10.33.36.203]) by smtp.corp.redhat.com (Postfix) with ESMTP id 312E853AA; Tue, 6 Dec 2022 21:41:03 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix test that fails due to name clash with old glibc [PR107979] Date: Tue, 6 Dec 2022 21:41:00 +0000 Message-Id: <20221206214100.239663-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, 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> From: Jonathan Wakely via Gcc-patches <gcc-patches@gcc.gnu.org> Reply-To: Jonathan Wakely <jwakely@redhat.com> 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?1751502647565309985?= X-GMAIL-MSGID: =?utf-8?q?1751502647565309985?= |
Series |
[committed] libstdc++: Fix test that fails due to name clash with old glibc [PR107979]
|
|
Checks
Context | Check | Description |
---|---|---|
snail/gcc-patch-check | warning | Git am fail log |
Commit Message
Jonathan Wakely
Dec. 6, 2022, 9:41 p.m. UTC
Tested x86_64-linux. Pushed to trunk. -- >8 -- This test was recently modified to check that the library doesn't use __unused anywhere, because that's a macro in newlib. But it's also a macro in old versions of glibc, so the test now fails for those targets. Disable that check for those targets as well as for newlib. libstdc++-v3/ChangeLog: PR libstdc++/107979 * testsuite/17_intro/names.cc: Do not check __unused on old Glibc versions. --- libstdc++-v3/testsuite/17_intro/names.cc | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc index ffbb199797b..963f74c11f3 100644 --- a/libstdc++-v3/testsuite/17_intro/names.cc +++ b/libstdc++-v3/testsuite/17_intro/names.cc @@ -241,6 +241,13 @@ #undef y #endif +#ifdef __GLIBC_PREREQ +#if ! __GLIBC_PREREQ(2, 19) +// Glibc defines this prior to 2.19 +#undef __unused +#endif +#endif + #if __has_include(<newlib.h>) // newlib's <sys/cdefs.h> defines these as macros. #undef __lockable