make/lib/Awt2dLibraries.gmk

*** 402,411 ****
--- 402,416 ----
      $(LIBJAVA_HEADER_FLAGS) \
      #
  # The fast floor code loses precision.
  LCMS_CFLAGS=-DCMS_DONT_USE_FAST_FLOOR
  
+ # Avoid warning for GCC 6
+ ifeq ($(TOOLCHAIN_TYPE), gcc)
+   LCMS_CFLAGS += -Wno-misleading-indentation
+ endif
+ 
  ifeq ($(USE_EXTERNAL_LCMS), true)
    # If we're using an external library, we'll just need the wrapper part.
    # By including it explicitely, all other files will be excluded.
    BUILD_LIBLCMS_INCLUDE_FILES := LCMS.c
  else
*** 484,493 ****
--- 489,504 ----
  #  ifeq ($(CC_43_OR_NEWER), 1)
  #    BUILD_LIBJAVAJPEG_CFLAGS_linux += -Wno-clobbered
  #  endif
  #endif
  
+ # Avoid warning for GCC 6
+ ifeq ($(TOOLCHAIN_TYPE), gcc)
+   BUILD_LIBJAVAJPEG_CFLAGS += -Wno-shift-negative-value
+ endif
+ 
+ 
  ifeq ($(USE_EXTERNAL_LIBJPEG), true)
    LIBJPEG_LIBS := -ljpeg
    BUILD_LIBJAVAJPEG_INCLUDE_FILES := \
        imageioJPEG.c \
        jpegdecoder.c
*** 504,513 ****
--- 515,525 ----
      SRC := $(LIBJAVAJPEG_SRC), \
      INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \
      OPTIMIZATION := HIGHEST, \
      CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBJAVAJPEG_HEADERS) \
          $(LIBJAVA_HEADER_FLAGS) \
+         $(BUILD_LIBJAVAJPEG_CFLAGS) \
          -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \
      DISABLED_WARNINGS_gcc := clobbered parentheses array-bounds, \
      DISABLED_WARNINGS_clang := logical-op-parentheses, \
      DISABLED_WARNINGS_microsoft := 4267, \
      MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \
*** 908,917 ****
--- 920,936 ----
  
    else ifeq ($(OPENJDK_TARGET_OS), windows)
      LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
    else
      LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)
+ 
+     # Avoid warning for GCC 6
+     ifeq ($(TOOLCHAIN_TYPE), gcc)
+       BUILD_LIBSPLASHSCREEN_jdhuff.c_CFLAGS += -Wno-shift-negative-value
+       BUILD_LIBSPLASHSCREEN_jdphuff.c_CFLAGS += -Wno-shift-negative-value
+     endif
+ 
    endif
  
    LIBSPLASHSCREEN_LIBS :=
  
    ifneq ($(USE_EXTERNAL_LIBZ), true)