From 34e66ce1ef2decc81557a362d6242313e98417fa Mon Sep 17 00:00:00 2001
From: Joshua Cao <joshcao@amazon.com>
Date: Sat, 1 Apr 2023 14:36:52 +0000
Subject: [PATCH] 8304295: harfbuzz build fails with GCC 7 after JDK-8301998

Reviewed-by: shade, erikj, serb, jwaters
---
 make/modules/java.desktop/lib/Awt2dLibraries.gmk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/make/modules/java.desktop/lib/Awt2dLibraries.gmk b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
index 47cfea05577..b2139188bfa 100644
--- a/make/modules/java.desktop/lib/Awt2dLibraries.gmk
+++ b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
@@ -465,7 +465,8 @@ else
 
    HARFBUZZ_DISABLED_WARNINGS_gcc := missing-field-initializers strict-aliasing \
        unused-result
-   HARFBUZZ_DISABLED_WARNINGS_CXX_gcc := class-memaccess
+   # noexcept-type required for GCC 7 builds. Not required for GCC 8+.
+   HARFBUZZ_DISABLED_WARNINGS_CXX_gcc := class-memaccess noexcept-type
    HARFBUZZ_DISABLED_WARNINGS_clang := missing-field-initializers range-loop-analysis
    HARFBUZZ_DISABLED_WARNINGS_microsoft := 4267 4244