From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 7EF41385140A; Fri, 21 Oct 2022 09:51:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7EF41385140A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666345901; bh=hVu09O5WbOq0V9vSsL1vs3PaIzGS7dQLAlMn89gyWPo=; h=From:To:Subject:Date:From; b=xgolzn9dpxoBCKdHd3n18rK7mQlX8eDdeRYng7UX/5EiL2gLNBzw1ZqOCPDIaBmjc lj+bDKazesyfsAbuBMYLMc2CvXk5K4No5THm/siEtNc3AKc6ewuu/cfkDnhCTMEVqh KiLuZZdRD0IW6rYSNgmPiFfSYWkHdVU+YqzEmKEk= MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-3436] libstdc++: respect with-{headers, newlib} for default hosted value X-Act-Checkin: gcc X-Git-Author: =?utf-8?q?Arsen_Arsenovi=C4=87?= X-Git-Refname: refs/heads/master X-Git-Oldrev: 33de0ffcf050e581eb931eb4f1c5ad9c0cdc6bf6 X-Git-Newrev: 88b34661f73e9da8032d20a37299223b39db4ef9 Message-Id: <20221021095141.7EF41385140A@sourceware.org> Date: Fri, 21 Oct 2022 09:51:41 +0000 (GMT) List-Id: https://gcc.gnu.org/g:88b34661f73e9da8032d20a37299223b39db4ef9 commit r13-3436-g88b34661f73e9da8032d20a37299223b39db4ef9 Author: Arsen Arsenović Date: Wed Oct 12 21:47:35 2022 +0200 libstdc++: respect with-{headers, newlib} for default hosted value This saves us a build flag when building for freestanding targets. libstdc++-v3/ChangeLog: * acinclude.m4: Default hosted to off if building without headers and without newlib. * configure: Regenerate. Diff: --- libstdc++-v3/acinclude.m4 | 5 ++++- libstdc++-v3/configure | 17 ++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 6523ba9a816..6f672924a73 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -2982,7 +2982,10 @@ AC_DEFUN([GLIBCXX_ENABLE_HOSTED], [ enable_hosted_libstdcxx=no ;; *) - enable_hosted_libstdcxx=yes + case "${with_newlib}-${with_headers}" in + no-no) enable_hosted_libstdcxx=no ;; + *) enable_hosted_libstdcxx=yes ;; + esac ;; esac]) diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index a90097523ab..9159ffb766b 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -15698,7 +15698,10 @@ else enable_hosted_libstdcxx=no ;; *) - enable_hosted_libstdcxx=yes + case "${with_newlib}-${with_headers}" in + no-no) enable_hosted_libstdcxx=no ;; + *) enable_hosted_libstdcxx=yes ;; + esac ;; esac fi @@ -16063,7 +16066,7 @@ $as_echo "$glibcxx_cv_atomic_long_long" >&6; } # Fake what AC_TRY_COMPILE does. cat > conftest.$ac_ext << EOF -#line 16066 "configure" +#line 16069 "configure" int main() { typedef bool atomic_type; @@ -16098,7 +16101,7 @@ $as_echo "$glibcxx_cv_atomic_bool" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 16101 "configure" +#line 16104 "configure" int main() { typedef short atomic_type; @@ -16133,7 +16136,7 @@ $as_echo "$glibcxx_cv_atomic_short" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 16136 "configure" +#line 16139 "configure" int main() { // NB: _Atomic_word not necessarily int. @@ -16169,7 +16172,7 @@ $as_echo "$glibcxx_cv_atomic_int" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 16172 "configure" +#line 16175 "configure" int main() { typedef long long atomic_type; @@ -16325,7 +16328,7 @@ $as_echo "mutex" >&6; } # unnecessary for this test. cat > conftest.$ac_ext << EOF -#line 16328 "configure" +#line 16331 "configure" int main() { _Decimal32 d1; @@ -16367,7 +16370,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu # unnecessary for this test. cat > conftest.$ac_ext << EOF -#line 16370 "configure" +#line 16373 "configure" template struct same { typedef T2 type; };