From afa3d80e86fb538ce7f5f1485fa774c11fdaf0f6 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Sat, 21 Mar 2020 11:46:02 +0100 Subject: [PATCH] [gcn] Don't default to building target-libstdc++-v3 [PR92713] ... which hasn't been ported/fails to build when using newlib (with GCC commit b73f69020f08208d2d969fcf8879bd294a6e3596 sources, and newlib commit 6d79e0a58866548f435527798fbd4a6849d05bc7, tag: newlib-3.3.0 sources): In file included from [...]/build-gcc-offload-amdgcn-amdhsa/amdgcn-amdhsa/libstdc++-v3/include/csetjmp:42, from [...]/source-gcc/libstdc++-v3/include/precompiled/stdc++.h:42: [...]/source-gcc/newlib/libc/include/setjmp.h:15:6: error: variable or field 'longjmp' declared void 15 | void longjmp (jmp_buf __jmpb, int __retval) | ^~~~~~~ [...] Makefile:1824: recipe for target 'amdgcn-amdhsa/bits/stdc++.h.gch/O2ggnu++0x.gch' failed make[3]: *** [amdgcn-amdhsa/bits/stdc++.h.gch/O2ggnu++0x.gch] Error 1 PR target/92713 * configure.ac ["${ENABLE_LIBSTDCXX}" = "default" && amdgcn*-*-*] (noconfigdirs): Add 'target-libstdc++-v3'. * configure: Regenerate. --- ChangeLog | 7 +++++++ configure | 4 ++++ configure.ac | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/ChangeLog b/ChangeLog index 3b667b18f9f..a7fcf77b9b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2020-04-29 Thomas Schwinge + + PR target/92713 + * configure.ac ["${ENABLE_LIBSTDCXX}" = "default" && amdgcn*-*-*] + (noconfigdirs): Add 'target-libstdc++-v3'. + * configure: Regenerate. + 2020-04-21 Stephen Casner PR 25830 diff --git a/configure b/configure index 815069c9856..4cc938ebb7d 100755 --- a/configure +++ b/configure @@ -3387,6 +3387,10 @@ if test "${ENABLE_LIBSTDCXX}" = "default" ; then # VxWorks uses the Dinkumware C++ library. noconfigdirs="$noconfigdirs target-libstdc++-v3" ;; + amdgcn*-*-*) + # Not ported/fails to build when using newlib. + noconfigdirs="$noconfigdirs target-libstdc++-v3" + ;; arm*-wince-pe*) # the C++ libraries don't build on top of CE's C libraries noconfigdirs="$noconfigdirs target-libstdc++-v3" diff --git a/configure.ac b/configure.ac index b95532cae90..c78d9cbea62 100644 --- a/configure.ac +++ b/configure.ac @@ -668,6 +668,10 @@ if test "${ENABLE_LIBSTDCXX}" = "default" ; then # VxWorks uses the Dinkumware C++ library. noconfigdirs="$noconfigdirs target-libstdc++-v3" ;; + amdgcn*-*-*) + # Not ported/fails to build when using newlib. + noconfigdirs="$noconfigdirs target-libstdc++-v3" + ;; arm*-wince-pe*) # the C++ libraries don't build on top of CE's C libraries noconfigdirs="$noconfigdirs target-libstdc++-v3" -- 2.30.2