gcc: fix bad-mapper-3.C test failures on some hosts

This test tries to open an IPv6 socket to 'localhost', but some distros
(such as ubuntu 24.04) only have an IPv4 address for localhost and use
ip6-localhost for ::1.  This means the lookups fail in a way that the
test was not expecting, and the test fails.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/gcc/gcc-15.2.inc b/meta/recipes-devtools/gcc/gcc-15.2.inc
index d178b254878a634994b89c644f84bdda5dd8e725..3ed4600361b3abeff690924170f158531e4657f5 100644 (file)
--- a/meta/recipes-devtools/gcc/gcc-15.2.inc
+++ b/meta/recipes-devtools/gcc/gcc-15.2.inc
@@ -72,7 +72,8 @@ SRC_URI = "${BASEURI} \
            file://0023-Fix-install-path-of-linux64.h.patch \
            file://0024-Avoid-hardcoded-build-paths-into-ppc-libgcc.patch \
            file://0025-gcc-testsuite-tweaks-for-mips-OE.patch \
-          file://0026-fix-pr90579-testcases.patch \
+           file://0026-fix-pr90579-testcases.patch \
+           file://0001-mapper-localhost-might-not-be-known.patch \
 "
 
 UNPACKDIR = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/sources"

diff --git a/meta/recipes-devtools/gcc/gcc/0001-mapper-localhost-might-not-be-known.patch b/meta/recipes-devtools/gcc/gcc/0001-mapper-localhost-might-not-be-known.patch
new file mode 100644 (file)
index 0000000..c745951
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc/0001-mapper-localhost-might-not-be-known.patch
@@ -0,0 +1,38 @@
+From ce2d518fd685adf6e69a045ac37fa03d3b54ae53 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@arm.com>
+Date: Wed, 3 Dec 2025 15:05:12 +0000
+Subject: [PATCH] gcc/testsuite/g++/bad-mapper-3.C: localhost might not be
+ known
+
+The module-mapper uses Cody::OpenInet6 to open the connection to the
+host. However, some distributions (such as Ubuntu 24.04) only have a v4
+address for localhost:
+
+  $ grep localhost /etc/hosts
+  127.0.0.1  localhost
+  ::1        ip6-localhost ip6-loopback
+
+On these systems this test fails with "Name or service not known", so
+add that to the list of allowed error messages.
+
+Upstream-Status: Submitted [https://gcc.gnu.org/pipermail/gcc-patches/2025-December/702846.html]
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+---
+ gcc/testsuite/g++.dg/modules/bad-mapper-3.C | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcc/testsuite/g++.dg/modules/bad-mapper-3.C b/gcc/testsuite/g++.dg/modules/bad-mapper-3.C
+index 2a57956afc87..ca7eec2e1df5 100644
+--- a/gcc/testsuite/g++.dg/modules/bad-mapper-3.C
++++ b/gcc/testsuite/g++.dg/modules/bad-mapper-3.C
+@@ -1,6 +1,6 @@
+ //  { dg-additional-options "-fmodules-ts -fmodule-mapper=localhost:172477262" }
+ import unique3.bob;
+-// { dg-error {failed (socket|connecting|disabled) mapper 'localhost:172477262'} "" { target *-*-* } 0 }
++// { dg-error {failed (socket|connecting|disabled|Name or service not known) mapper 'localhost:172477262'} "" { target *-*-* } 0 }
+ // { dg-prune-output "fatal error:" }
+ // { dg-prune-output "failed to read" }
+ // { dg-prune-output "compilation terminated" }
+-- 
+2.43.0
+