I doubt we want the @euro suffix anywhere except Glibc-based targets. We certainly don't want to append "@euro" on Solaris, where this change flips some tests from UNSUPPORTED to PASS, e.g. 21_strings/basic_string/numeric_conversions/char/to_string_float.cc It will probably also cause some to flip from UNSUPPORTED to FAIL, which we'll need to address.
Let's restrict it to Glibc. Tested x86_64-linux and sparc-solaris11.4. -- >8 -- The testsuite automatically appends "@euro" to "xx.ISO8859-15" locale names on all targets except FreeBSD, DragonflyBSD, and NetBSD. It should only be for Glibc, not all non-BSD targets. libstdc++-v3/ChangeLog: * testsuite/lib/libstdc++.exp (check_v3_target_namedlocale): Only append "@euro" to ".ISO8859-15" locales for Glibc. --- libstdc++-v3/testsuite/lib/libstdc++.exp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index 18331c80bc2..2510c7f4cbb 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -1032,7 +1032,7 @@ proc check_v3_target_namedlocale { args } { puts $f " strcpy(result, name);" puts $f "#if defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__" puts $f " /* fall-through */" - puts $f "#else" + puts $f "#elif defined __GLIBC__" puts $f " if (strstr(result, \"ISO8859-15\")) {" puts $f " strcat(result, \"@euro\");" puts $f " }" -- 2.45.2