--- a/make/hotspot/lib/CompileJvm.gmk	Tue Oct 22 21:26:45 2019 -0500
+++ b/make/hotspot/lib/CompileJvm.gmk	Wed Oct 23 09:45:41 2019 +0200
@@ -78,14 +78,14 @@
 ################################################################################
 # Disabled warnings
 
-DISABLED_WARNINGS_gcc := extra parentheses comment unknown-pragmas address \
+DISABLED_WARNINGS_gcc := parentheses comment unknown-pragmas address \
     delete-non-virtual-dtor char-subscripts array-bounds int-in-bool-context \
     ignored-qualifiers  missing-field-initializers implicit-fallthrough \
     empty-body strict-overflow sequence-point maybe-uninitialized \
-    misleading-indentation
+    misleading-indentation cast-function-type
 
 ifeq ($(call check-jvm-feature, zero), true)
-  DISABLED_WARNINGS_gcc += return-type switch
+  DISABLED_WARNINGS_gcc += return-type switch clobbered
 endif
 
 DISABLED_WARNINGS_clang := tautological-compare \