summaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorEric Botcazou <ebotcazou@adacore.com>2018-01-16 20:40:09 +0000
committerEric Botcazou <ebotcazou@gcc.gnu.org>2018-01-16 20:40:09 +0000
commit229433c94f80752955908498be55c1ed017d8fa7 (patch)
tree0fb17454c90a042dfbfb409f7c39ef14d0b7b438 /libstdc++-v3
parentb50e164942ea0cfc7abdd785a6f6449d4d0d8066 (diff)
downloadgcc-229433c94f80752955908498be55c1ed017d8fa7.tar.gz
* testsuite/17_intro/names.cc: Undefine 'y' on SPARC/Linux.
From-SVN: r256754
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog4
-rw-r--r--libstdc++-v3/testsuite/17_intro/names.cc4
2 files changed, 8 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 308a7f35501..e5614460b8e 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2018-01-16 Eric Botcazou <ebotcazou@adacore.com>
+
+ * testsuite/17_intro/names.cc: Undefine 'y' on SPARC/Linux.
+
2018-01-16 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/83834
diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc
index 8781e441720..4e6cff1fe37 100644
--- a/libstdc++-v3/testsuite/17_intro/names.cc
+++ b/libstdc++-v3/testsuite/17_intro/names.cc
@@ -112,4 +112,8 @@
#undef r
#endif
+#if defined (__linux__) && defined (__sparc__)
+#undef y
+#endif
+
#include <bits/stdc++.h>