diff -Nru openjdk-21-21.0.1+12/debian/changelog openjdk-21-21.0.1+12/debian/changelog
--- openjdk-21-21.0.1+12/debian/changelog	2023-11-07 03:08:55.000000000 +1300
+++ openjdk-21-21.0.1+12/debian/changelog	2023-11-29 08:05:34.000000000 +1300
@@ -1,3 +1,9 @@
+openjdk-21 (21.0.1+12-2~20.04.1) focal; urgency=medium
+
+  * Use gcc 10 to workaround LP: 2044899.
+
+ -- Vladimir Petko <vladimir.petko@canonical.com>  Wed, 29 Nov 2023 08:05:34 +1300
+
 openjdk-21 (21.0.1+12-2~20.04) focal; urgency=medium
 
   * Upload to Ubuntu 20.04 (LP: #2036873).
diff -Nru openjdk-21-21.0.1+12/debian/control openjdk-21-21.0.1+12/debian/control
--- openjdk-21-21.0.1+12/debian/control	2023-11-07 03:08:55.000000000 +1300
+++ openjdk-21-21.0.1+12/debian/control	2023-11-29 08:05:34.000000000 +1300
@@ -9,7 +9,7 @@
   time, strip-nondeterminism,
   file,
   autoconf, automake, autotools-dev, ant, ant-optional,
-  g++-9 <!cross>,
+  g++-10 <!cross>,
   openjdk-21-jdk-headless:native,
   libxtst-dev, libxi-dev, libxt-dev, libxaw7-dev, libxrender-dev, libcups2-dev, libasound2-dev, liblcms2-dev, libxinerama-dev, libkrb5-dev, xsltproc, libpcsclite-dev, libxrandr-dev, libelf-dev, libfontconfig1-dev, libgtk2.0-0 | libgtk-3-0, libfreetype-dev, libharfbuzz-dev,
   libffi-dev, libffi-dev:native,
diff -Nru openjdk-21-21.0.1+12/debian/rules openjdk-21-21.0.1+12/debian/rules
--- openjdk-21-21.0.1+12/debian/rules	2023-11-07 03:08:55.000000000 +1300
+++ openjdk-21-21.0.1+12/debian/rules	2023-11-29 08:01:59.000000000 +1300
@@ -259,11 +259,7 @@
   ifneq (,$(filter $(distrel),buster bionic cosmic disco))
     bd_gcc = g++-8 <!cross>,
   endif
-else ifneq (,$(filter $(distrel),focal))
-  export CC = $(DEB_HOST_GNU_TYPE)-gcc-9
-  export CXX = $(DEB_HOST_GNU_TYPE)-g++-9
-  bd_gcc = g++-9 <!cross>,
-else ifneq (,$(filter $(distrel),bullseye groovy hirsute))
+else ifneq (,$(filter $(distrel),bullseye groovy hirsute focal))
   export CC = $(DEB_HOST_GNU_TYPE)-gcc-10
   export CXX = $(DEB_HOST_GNU_TYPE)-g++-10
   bd_gcc = g++-10 <!cross>,