make/lib/Awt2dLibraries.gmk

*** 369,378 ****
--- 369,388 ----
    LIBLCMS_HEADERS_FROM_SRC := false
  else
    BUILD_LIBLCMS_INCLUDE_FILES :=
  endif
  
+ BUILD_LIBLCMS_DISABLE_WARNINGS_gcc := format-nonliteral type-limits \
+     misleading-indentation undef unused-function
+ ifeq ($(TOOLCHAIN_TYPE), gcc)
+   GCC_MAJOR_VER := $(shell $(ECHO) $(CC_VERSION_NUMBER) | $(CUT) -d . -f 1)
+   GCC_8_OR_LATER := $(shell [ $(GCC_MAJOR_VER) -ge 8 ] && echo true)
+   ifeq ($(GCC_8_OR_LATER), true)
+     BUILD_LIBLCMS_DISABLE_WARNINGS_gcc += stringop-truncation
+   endif
+ endif
+ 
  $(eval $(call SetupJdkLibrary, BUILD_LIBLCMS, \
      NAME := lcms, \
      INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \
      OPTIMIZATION := HIGHEST, \
      CFLAGS := $(CFLAGS_JDKLIB) \
*** 380,391 ****
      CFLAGS_windows := -DCMS_IS_WINDOWS_, \
      EXTRA_HEADER_DIRS := \
          common/awt/debug \
          libawt/java2d, \
      HEADERS_FROM_SRC := $(LIBLCMS_HEADERS_FROM_SRC), \
!     DISABLED_WARNINGS_gcc := format-nonliteral type-limits \
!         misleading-indentation undef unused-function, \
      DISABLED_WARNINGS_clang := tautological-compare format-nonliteral undef, \
      DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
      DISABLED_WARNINGS_microsoft := 4819, \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
--- 390,400 ----
      CFLAGS_windows := -DCMS_IS_WINDOWS_, \
      EXTRA_HEADER_DIRS := \
          common/awt/debug \
          libawt/java2d, \
      HEADERS_FROM_SRC := $(LIBLCMS_HEADERS_FROM_SRC), \
!     DISABLED_WARNINGS_gcc := $(BUILD_LIBLCMS_DISABLE_WARNINGS_gcc), \
      DISABLED_WARNINGS_clang := tautological-compare format-nonliteral undef, \
      DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
      DISABLED_WARNINGS_microsoft := 4819, \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \