From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 C4557380FAFF for ; Tue, 6 Dec 2022 21:41:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C4557380FAFF Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670362874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AzriyT0mGFjVKs8+NPNnfQHFpCLWqQvHLSsPRSg2ryU=; b=E3Y8b4hVebfQ+nDxPk4znyi3Ca7cC7efl/hSk0ykiok1eHph/Ea3LlF6gK1MstL4QR82l+ 5GGn35wgVObNWcLOdKDghn+ob1FCj5TUkBc8Z0fT4cpjlsCA52zdVW3KEzxXRUdyxfQm69 UaJIhCaezPpacfSn1ZB83yt27Zda4n8= 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) From: Jonathan Wakely 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=-13.3 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=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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's defines these as macros. #undef __lockable -- 2.38.1