make/lib/Awt2dLibraries.gmk

*** 1,5 ****
--- 1,6 ----
+ 
  #
  # Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
*** 206,220 ****
  ifeq ($(OPENJDK_TARGET_OS), linux)
    # FIXME: This is probably not what we want to do, but keep it now for compatibility.
    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
  
  $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
--- 207,217 ----
*** 223,238 ****
      EXCLUDES := $(LIBAWT_EXCLUDES), \
      EXCLUDE_FILES := $(LIBAWT_EXFILES), \
      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_clang := logical-op-parentheses extern-initializer \
!         sign-compare format-nonliteral, \
      DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \
!     DISABLED_WARNINGS_microsoft := 4244 4267 4996, \
      ASFLAGS := $(LIBAWT_ASFLAGS), \
      LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \
      LDFLAGS_macosx := -L$(INSTALL_LIBRARIES_HERE), \
      LDFLAGS_windows := -delayload:user32.dll -delayload:gdi32.dll \
          -delayload:shell32.dll -delayload:winmm.dll \
--- 220,233 ----
      EXCLUDES := $(LIBAWT_EXCLUDES), \
      EXCLUDE_FILES := $(LIBAWT_EXFILES), \
      OPTIMIZATION := LOW, \
      CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \
      EXTRA_HEADER_DIRS := $(LIBAWT_EXTRA_HEADER_DIRS), \
!     DISABLED_WARNINGS_gcc := unused-value unused-function, \
!     DISABLED_WARNINGS_clang := format-nonliteral, \
      DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \
!     DISABLED_WARNINGS_microsoft := 4996, \
      ASFLAGS := $(LIBAWT_ASFLAGS), \
      LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \
      LDFLAGS_macosx := -L$(INSTALL_LIBRARIES_HERE), \
      LDFLAGS_windows := -delayload:user32.dll -delayload:gdi32.dll \
          -delayload:shell32.dll -delayload:winmm.dll \
*** 311,346 ****
  
      ifeq ($(OPENJDK_TARGET_OS), linux)
        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), \
          EXTRA_HEADER_DIRS := $(LIBAWT_XAWT_EXTRA_HEADER_DIRS), \
          EXCLUDES := $(LIBAWT_XAWT_EXCLUDES), \
          OPTIMIZATION := LOW, \
          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_clang := parentheses format undef \
!             logical-op-parentheses format-nonliteral int-conversion, \
          DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE \
              E_ASSIGNMENT_TYPE_MISMATCH E_NON_CONST_INIT, \
          LDFLAGS := $(LDFLAGS_JDKLIB) \
              $(call SET_SHARED_LIBRARY_ORIGIN) \
              -L$(INSTALL_LIBRARIES_HERE), \
--- 306,325 ----
  
      ifeq ($(OPENJDK_TARGET_OS), linux)
        LIBAWT_XAWT_LIBS += -lpthread
      endif
  
      $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_XAWT, \
          NAME := awt_xawt, \
          EXTRA_SRC := $(LIBAWT_XAWT_EXTRA_SRC), \
          EXTRA_HEADER_DIRS := $(LIBAWT_XAWT_EXTRA_HEADER_DIRS), \
          EXCLUDES := $(LIBAWT_XAWT_EXCLUDES), \
          OPTIMIZATION := LOW, \
          CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \
              $(X_CFLAGS), \
          WARNINGS_AS_ERRORS_xlc := false, \
!         DISABLED_WARNINGS_gcc := format implicit-fallthrough unused-function, \
          DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE \
              E_ASSIGNMENT_TYPE_MISMATCH E_NON_CONST_INIT, \
          LDFLAGS := $(LDFLAGS_JDKLIB) \
              $(call SET_SHARED_LIBRARY_ORIGIN) \
              -L$(INSTALL_LIBRARIES_HERE), \