This patch reverts upstream commit b4d3485e4fc1d:

  https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=b4d3485e4fc1d029e620a59deb54b3f4f3f6b209

Otherwise, GCC ends up searching the wrong target directory for cross-headers.

diff --git a/gcc/configure b/gcc/configure
--- a/gcc/configure
+++ b/gcc/configure
@@ -3689,11 +3689,6 @@ esac
 fi
 
 
-# If both --with-sysroot and --with-gxx-include-dir are passed, we interpolate
-# the former in the latter and, upon success, compute gcc_gxx_include_dir as
-# relative to the sysroot.
-gcc_gxx_include_dir_add_sysroot=0
-
 # This logic must match libstdc++-v3/acinclude.m4:GLIBCXX_EXPORT_INSTALL_INFO.
 if test x${gcc_gxx_include_dir} = x; then
   if test x${enable_version_specific_runtime_libs} = xyes; then
@@ -3705,10 +3700,15 @@ if test x${gcc_gxx_include_dir} = x; then
     fi
     gcc_gxx_include_dir="\$(libsubdir)/\$(libsubdir_to_prefix)$libstdcxx_incdir"
   fi
-elif test "${with_sysroot+set}" = set; then
+fi
+
+gcc_gxx_include_dir_add_sysroot=0
+if test "${with_sysroot+set}" = set; then
   gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'`
   if test "${gcc_gxx_without_sysroot}"; then
-    gcc_gxx_include_dir="${gcc_gxx_without_sysroot}"
+    if test x${with_sysroot} != x/; then
+      gcc_gxx_include_dir="${gcc_gxx_without_sysroot}"
+    fi
     gcc_gxx_include_dir_add_sysroot=1
   fi
 fi
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 715fcba0482..88136e232df 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -204,11 +204,6 @@ no)	;;
 *)	gcc_gxx_include_dir=$with_gxx_include_dir ;;
 esac])
 
-# If both --with-sysroot and --with-gxx-include-dir are passed, we interpolate
-# the former in the latter and, upon success, compute gcc_gxx_include_dir as
-# relative to the sysroot.
-gcc_gxx_include_dir_add_sysroot=0
-
 # This logic must match libstdc++-v3/acinclude.m4:GLIBCXX_EXPORT_INSTALL_INFO.
 if test x${gcc_gxx_include_dir} = x; then
   if test x${enable_version_specific_runtime_libs} = xyes; then
@@ -220,10 +215,15 @@ if test x${gcc_gxx_include_dir} = x; then
     fi
     gcc_gxx_include_dir="\$(libsubdir)/\$(libsubdir_to_prefix)$libstdcxx_incdir"
   fi
-elif test "${with_sysroot+set}" = set; then
+fi
+
+gcc_gxx_include_dir_add_sysroot=0
+if test "${with_sysroot+set}" = set; then
   gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'`
   if test "${gcc_gxx_without_sysroot}"; then
-    gcc_gxx_include_dir="${gcc_gxx_without_sysroot}"
+    if test x${with_sysroot} != x/; then
+      gcc_gxx_include_dir="${gcc_gxx_without_sysroot}"
+    fi
     gcc_gxx_include_dir_add_sysroot=1
   fi
 fi
>
<tr><td><span title='2021-12-22 10:53:19 +0100'>2021-12-22</span></td><td><a href='/guix/commit/tests/keys/civodul.pub?id=9ebc9ca070a21ba0aeb3f61202a8071bb250ccc8'>tests: Move keys into ./tests/keys/ and add a third ed25519 key.</a><span class='msg-avail'>...</span></td><td>Attila Lendvai</td></tr>
'2020-12-01 00:10:48 +0100'>2020-12-01</span></td><td><a href='/guix/commit/gnu/packages/emacs.scm?id=50b18b5c10803a910cf29718e9c35261e65f5d93'>gnu: emacs-next-pgtk: Update to savannah feature/pgtk branch.</a><span class='msg-avail'>...</span></td><td>Ryan Prior</td></tr>
<tr><td><span title='2020-11-26 23:39:16 +0100'>2020-11-26</span></td><td><a href='/guix/commit/gnu/packages/emacs.scm?id=2a1eda5a9ba55aca4a205408c8f3988ffff7e03b'>gnu: Add emacs-next-pgtk.</a><span class='msg-avail'>...</span></td><td>Andrew Tropin</td></tr>
<tr><td><span title='2020-11-11 21:37:11 +0100'>2020-11-11</span></td><td><a href='/guix/commit/gnu/packages/emacs.scm?id=b05c96d93d974723142846f94790f349913c0df5'>gnu: emacs.scm: Remove unused module import.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-11-03 12:07:18 +0100'>2020-11-03</span></td><td><a href='/guix/commit/gnu/packages/emacs.scm?id=c41c089ad0d686a2de1728147a1a2d921fa7c44c'>Revert "gnu: emacs: Make strip-double-wrap more robust."</a><span class='msg-avail'>...</span></td><td>Nicolas Goaziou</td></tr>
<tr><td><span title='2020-11-03 10:30:03 +0100'>2020-11-03</span></td><td><a href='/guix/commit/gnu/packages/emacs.scm?id=b107a19ffb6a6abb7bde3436f3fa359071bd1f5c'>gnu: emacs: Make strip-double-wrap more robust.</a><span class='msg-avail'>...</span></td><td>Morgan Smith</td></tr>
<tr><td><span title='2020-10-01 11:03:56 -0400'>2020-10-01</span></td><td><a href='/guix/commit/gnu/packages/emacs.scm?id=f88fea0eaa5796303790450ee4543a6d7e61a06e'>gnu: emacs-next: Fix load path and version.</a><span class='msg-avail'>...</span></td><td>Morgan Smith</td></tr>
<tr><td><span title='2020-09-02 17:17:37 +0200'>2020-09-02</span></td><td><a href='/guix/commit/gnu/packages/emacs.scm?id=562f7e3fdb01924749ff78aacdee0dc7eedab0d9'>gnu: Add emacs-next.</a><span class='msg-avail'>...</span></td><td>Morgan Smith</td></tr>
<tr><td><span title='2020-08-31 08:48:54 +0200'>2020-08-31</span></td><td><a href='/guix/commit/gnu/packages/emacs.scm?id=68be4da83087d0faff227c61ca93c7679230c998'>gnu: emacs: Strip double wrap.</a><span class='msg-avail'>...</span></td><td>Leo Prikler</td></tr>
<tr><td><span title='2020-08-29 15:58:53 +0200'>2020-08-29</span></td><td><a href='/guix/commit/gnu/packages/emacs.scm?id=6c77a5040604ebb7c0196f47520cf5fcc30c2087'>Revert "gnu: emacs: Strip double wrap."</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2020-08-29 13:24:50 +0200'>2020-08-29</span></td><td><a href='/guix/commit/gnu/packages/emacs.scm?id=0ec6b8afd7e7a6c288fbf48c5779f2e0bdaffb55'>gnu: emacs: Strip double wrap.</a><span class='msg-avail'>...</span></td><td>Leo Prikler</td></tr>
<tr><td><span title='2020-08-28 00:13:51 -0400'>2020-08-28</span></td><td><a href='/guix/commit/gnu/packages/emacs.scm?id=36a09d185343375a5cba370431870f9c4435d623'>gnu: emacs: Update to 27.1.</a><span class='msg-avail'>...</span></td><td>Mark H Weaver</td></tr>
<tr><td><span title='2020-08-03 12:26:02 +0200'>2020-08-03</span></td><td><a href='/guix/commit/gnu/packages/emacs.scm?id=f574f859ee7343d894ecf7318fa53b7a73426775'>gnu: emacs: Ignore empty XIM styles.</a><span class='msg-avail'>...</span></td><td>Leo Prikler</td></tr>