--- old/make/lib/Awt2dLibraries.gmk	2016-06-25 22:29:03.636068255 +0900
+++ new/make/lib/Awt2dLibraries.gmk	2016-06-25 22:29:03.467068553 +0900
@@ -404,6 +404,11 @@
 # 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.
@@ -486,6 +491,12 @@
 #  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 := \
@@ -506,6 +517,7 @@
     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, \
@@ -910,6 +922,13 @@
     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 :=