diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e0c46e0a9aa..eec84881235 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-13  Jonathan Wakely  <jwakely@redhat.com>
 
 	* python/libstdcxx/v6/printers.py (register_type_printers): Remove
diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc
index 1873deb6936..158895e89d2 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>