--- old/make/lib/Awt2dLibraries.gmk	2018-11-26 16:07:27.645125181 +0530
+++ new/make/lib/Awt2dLibraries.gmk	2018-11-26 16:07:27.377259181 +0530
@@ -208,11 +208,7 @@
   LIBAWT_CFLAGS += $(EXPORT_ALL_SYMBOLS)
 endif
 
-# Turn off all warnings for debug_mem.c This is needed because the specific warning
-# about initializing a declared 'extern' cannot be turned off individually. Only
-# applies to debug builds.
 ifeq ($(TOOLCHAIN_TYPE), gcc)
-  BUILD_LIBAWT_debug_mem.c_CFLAGS := -w
   # This option improves performance of MaskFill in Java2D by 20% for some gcc
   LIBAWT_CFLAGS += -fgcse-after-reload
 endif
@@ -225,8 +221,7 @@
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \
     EXTRA_HEADER_DIRS := $(LIBAWT_EXTRA_HEADER_DIRS), \
-    DISABLED_WARNINGS_gcc := sign-compare unused-result maybe-uninitialized \
-        format-nonliteral parentheses unused-value unused-function, \
+    DISABLED_WARNINGS_gcc := unused-value unused-function, \
     DISABLED_WARNINGS_clang := logical-op-parentheses extern-initializer \
         sign-compare format-nonliteral, \
     DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \
@@ -313,17 +308,6 @@
       LIBAWT_XAWT_LIBS += -lpthread
     endif
 
-    ifeq ($(TOOLCHAIN_TYPE), gcc)
-      # Turn off all warnings for the following files since they contain warnings
-      # that cannot be turned of individually.
-      # redefining a macro
-      BUILD_LIBAWT_XAWT_gtk2_interface.c_CFLAGS := -w
-      # comparison between pointer and integer
-      BUILD_LIBAWT_XAWT_awt_Font.c_CFLAGS := -w
-      # initializing a declared 'extern'
-      BUILD_LIBAWT_XAWT_debug_mem.c_CFLAGS := -w
-    endif
-
     $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_XAWT, \
         NAME := awt_xawt, \
         EXTRA_SRC := $(LIBAWT_XAWT_EXTRA_SRC), \
@@ -333,10 +317,7 @@
         CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \
             $(X_CFLAGS), \
         WARNINGS_AS_ERRORS_xlc := false, \
-        DISABLED_WARNINGS_gcc := type-limits pointer-to-int-cast \
-            unused-result maybe-uninitialized format \
-            format-security int-to-pointer-cast parentheses \
-            implicit-fallthrough undef unused-function, \
+        DISABLED_WARNINGS_gcc := format unused-function, \
         DISABLED_WARNINGS_clang := parentheses format undef \
             logical-op-parentheses format-nonliteral int-conversion, \
         DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE \