commit 69b09c5599b201ac039db564c303f7b20d87e0df
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Tue Aug 31 10:25:53 2021

    libstdc++: Fix 17_intro/names.cc failures on Solaris
    
    Signed-off-by: Jonathan Wakely <jwakely@redhat.com>
    
    libstdc++-v3/ChangeLog:
    
            * testsuite/17_intro/names.cc: Undefine some more names used
            by Solaris system headers.

diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc
index b945511e088..b5e926fb09f 100644
--- a/libstdc++-v3/testsuite/17_intro/names.cc
+++ b/libstdc++-v3/testsuite/17_intro/names.cc
@@ -243,6 +243,12 @@
 #endif
 
 #ifdef __sun__
+// <fenv.h> defines these as members of fex_numeric_t
+#undef l
+#undef f
+#undef d
+#undef q
+#undef p
 // See https://gcc.gnu.org/ml/libstdc++/2019-05/msg00175.html
 #undef ptr
 #endif