From: Gaius Mulley <gaiusmod2@gmail.com>
Date: Tue, 15 Nov 2022 20:52:14 +0000 (+0000)
Subject: Merge branch 'master' into devel/modula-2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81b4437fd01963f635c361615e876e1a3fa079fb;p=thirdparty%2Fgcc.git

Merge branch 'master' into devel/modula-2

Signed-off-by: Gaius Mulley <gaiusmod2@gmail.com>
---

81b4437fd01963f635c361615e876e1a3fa079fb
diff --cc configure
index b4c28c5031be,7b1238877f55..67af2a7c0b3e
--- a/configure
+++ b/configure
@@@ -804,10 -802,8 +803,9 @@@ enable_compressed_debug_section
  enable_libquadmath
  enable_libquadmath_support
  enable_libada
 +enable_libgm2
  enable_libssp
  enable_libstdcxx
- enable_liboffloadmic
  enable_bootstrap
  enable_pgo_build
  with_mpc
@@@ -1544,11 -1539,8 +1542,9 @@@ Optional Features
    --disable-libquadmath-support
                            disable libquadmath support for Fortran
    --enable-libada         build libada directory
 +  --enable-libgm2         build libgm2 directory
    --enable-libssp         build libssp directory
    --disable-libstdcxx     do not build libstdc++-v3 directory
-   --enable-liboffloadmic=ARG
-                           build liboffloadmic [ARG={no,host,target}]
    --enable-bootstrap      enable bootstrapping [yes if native build]
    --enable-pgo-build[=lto]
                            enable the PGO build