public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r13-4528] libstdc++: Fix test that fails due to name clash with old glibc [PR107979]
Date: Tue,  6 Dec 2022 21:40:41 +0000 (GMT)	[thread overview]
Message-ID: <20221206214041.7E1D4382D3C1@sourceware.org> (raw)

https://gcc.gnu.org/g:2a23b93f944fa78d4284eb5687051c224e5ab08f

commit r13-4528-g2a23b93f944fa78d4284eb5687051c224e5ab08f
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Mon Dec 5 21:44:26 2022 +0000

    libstdc++: Fix test that fails due to name clash with old glibc [PR107979]
    
    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.

Diff:
---
 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

                 reply	other threads:[~2022-12-06 21:40 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221206214041.7E1D4382D3C1@sourceware.org \
    --to=redi@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    --cc=libstdc++-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).