[gcc r15-2450] libstdc++: Only append "@euro" to locale names for Glibc testing

Jonathan Wakely redi@gcc.gnu.org
Wed Jul 31 16:08:32 GMT 2024


https://gcc.gnu.org/g:5dd1f0d69f51dc6b290977503dcfb7734948e841

commit r15-2450-g5dd1f0d69f51dc6b290977503dcfb7734948e841
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Wed Jul 31 12:03:32 2024 +0100

    libstdc++: Only append "@euro" to locale names for Glibc testing
    
    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.

Diff:
---
 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 18331c80bc27..2510c7f4cbb9 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 "    }"


More information about the Libstdc++-cvs mailing list