--- old/make/lib/Awt2dLibraries.gmk	2016-07-28 13:47:00.357579585 -0700
+++ new/make/lib/Awt2dLibraries.gmk	2016-07-28 13:47:00.213579589 -0700
@@ -56,9 +56,9 @@
     OPTIMIZATION := HIGHEST, \
     CFLAGS := $(CFLAGS_JDKLIB) \
         $(BUILD_LIBMLIB_CFLAGS), \
-    DISABLED_WARNINGS_gcc := parentheses array-bounds, \
-    DISABLED_WARNINGS_clang := parentheses, \
-    DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
+    xDISABLED_WARNINGS_gcc := parentheses array-bounds, \
+    xDISABLED_WARNINGS_clang := parentheses, \
+    xDISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
     MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
@@ -119,7 +119,7 @@
       CFLAGS := -xarch=sparcvis \
           $(LIBMLIB_IMAGE_V_CFLAGS) \
           $(CFLAGS_JDKLIB), \
-      DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
+      xDISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
       MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
--- old/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_NN_Bit.c	2016-07-28 13:47:00.801579573 -0700
+++ new/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_NN_Bit.c	2016-07-28 13:47:00.649579577 -0700
@@ -84,8 +84,7 @@
         ySrc = MLIB_POINTER_SHIFT(Y);
         srcPixelPtr = MLIB_POINTER_GET(lineAddr, ySrc);
 
-        res = (res & ~(1 << bit)) | (((srcPixelPtr[X >> (MLIB_SHIFT + 3)] >> (7 - (X >> MLIB_SHIFT) & 7)) & 1) <<
-           bit);
+        res = (res & ~(1 << bit)) | (((srcPixelPtr[X >> (MLIB_SHIFT + 3)] >> (7 - ((X >> MLIB_SHIFT) & 7))) & 1) << bit);
 
         X += dX;
         Y += dY;
@@ -150,7 +149,7 @@
         ySrc = MLIB_POINTER_SHIFT(Y);
         srcPixelPtr = MLIB_POINTER_GET(lineAddr, ySrc);
 
-        res = (res & ~(1 << bit)) | (((srcPixelPtr[X >> (MLIB_SHIFT + 3)] >> (7 - (X >> MLIB_SHIFT) & 7)) & 1) << bit);
+        res = (res & ~(1 << bit)) | (((srcPixelPtr[X >> (MLIB_SHIFT + 3)] >> (7 - ((X >> MLIB_SHIFT) & 7))) & 1) << bit);
 
         X += dX;
         Y += dY;
--- old/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16ext.c	2016-07-28 13:47:01.249579560 -0700
+++ new/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16ext.c	2016-07-28 13:47:01.105579564 -0700
@@ -529,7 +529,7 @@
 
   if (m == 1) {
     status = mlib_ImageConv1xN_ext(dst, src, k, n, dy_t, dy_b, cmask);
-    FREE_AND_RETURN_STATUS;
+    FREE_AND_RETURN_STATUS
   }
 
   swid = wid + (m - 1);
@@ -541,7 +541,7 @@
 
     if (pbuff == NULL) {
       status = MLIB_FAILURE;
-      FREE_AND_RETURN_STATUS;
+      FREE_AND_RETURN_STATUS
     }
     buffs = (FTYPE   **)(pbuff + bsize);
   }
@@ -946,7 +946,7 @@
     }
   }
 
-  FREE_AND_RETURN_STATUS;
+  FREE_AND_RETURN_STATUS
 }
 
 /***************************************************************/
--- old/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16nw.c	2016-07-28 13:47:01.769579546 -0700
+++ new/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16nw.c	2016-07-28 13:47:01.629579550 -0700
@@ -484,7 +484,7 @@
 
   if (m == 1) {
     status = mlib_ImageConv1xN(dst, src, k, n, dn, cmask);
-    FREE_AND_RETURN_STATUS;
+    FREE_AND_RETURN_STATUS
   }
 
   bsize = (n + 3)*wid;
@@ -494,7 +494,7 @@
 
     if (pbuff == NULL) {
       status = MLIB_FAILURE;
-      FREE_AND_RETURN_STATUS;
+      FREE_AND_RETURN_STATUS
     }
     buffs = (FTYPE   **)(pbuff + bsize);
   }
@@ -849,7 +849,7 @@
     }
   }
 
-  FREE_AND_RETURN_STATUS;
+  FREE_AND_RETURN_STATUS
 }
 
 /***************************************************************/
--- old/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_32nw.c	2016-07-28 13:47:02.233579534 -0700
+++ new/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_32nw.c	2016-07-28 13:47:02.089579537 -0700
@@ -350,7 +350,7 @@
 
   if (m == 1) {
     status = mlib_ImageConv1xN(dst, src, k, n, dn, cmask);
-    FREE_AND_RETURN_STATUS;
+    FREE_AND_RETURN_STATUS
   }
 
   bsize = (n + 2)*wid;
@@ -360,7 +360,7 @@
 
     if (pbuff == NULL) {
       status = MLIB_FAILURE;
-      FREE_AND_RETURN_STATUS;
+      FREE_AND_RETURN_STATUS
     }
     buffs = (mlib_d64**)(pbuff + bsize);
   }
@@ -706,7 +706,7 @@
     }
   }
 
-  FREE_AND_RETURN_STATUS;
+  FREE_AND_RETURN_STATUS
 }
 
 /***************************************************************/
--- old/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8ext.c	2016-07-28 13:47:02.613579523 -0700
+++ new/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8ext.c	2016-07-28 13:47:02.465579527 -0700
@@ -514,7 +514,7 @@
 
   if (m == 1) {
     status = mlib_ImageConv1xN_ext(dst, src, k, n, dy_t, dy_b, cmask);
-    FREE_AND_RETURN_STATUS;
+    FREE_AND_RETURN_STATUS
   }
 
   swid = wid + (m - 1);
@@ -526,7 +526,7 @@
 
     if (pbuff == NULL) {
       status = MLIB_FAILURE;
-      FREE_AND_RETURN_STATUS;
+      FREE_AND_RETURN_STATUS
     }
     buffs = (FTYPE   **)(pbuff + bsize);
   }
@@ -931,7 +931,7 @@
     }
   }
 
-  FREE_AND_RETURN_STATUS;
+  FREE_AND_RETURN_STATUS
 }
 
 /***************************************************************/
--- old/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8nw.c	2016-07-28 13:47:02.985579513 -0700
+++ new/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8nw.c	2016-07-28 13:47:02.845579517 -0700
@@ -485,7 +485,7 @@
 
   if (m == 1) {
     status = mlib_ImageConv1xN(dst, src, k, n, dn, cmask);
-    FREE_AND_RETURN_STATUS;
+    FREE_AND_RETURN_STATUS
   }
 
   bsize = (n + 3)*wid;
@@ -495,7 +495,7 @@
 
     if (pbuff == NULL) {
       status = MLIB_FAILURE;
-      FREE_AND_RETURN_STATUS;
+      FREE_AND_RETURN_STATUS
     }
     buffs = (FTYPE   **)(pbuff + bsize);
   }
@@ -850,7 +850,7 @@
     }
   }
 
-  FREE_AND_RETURN_STATUS;
+  FREE_AND_RETURN_STATUS
 }
 
 /***************************************************************/
--- old/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16ext.c	2016-07-28 13:47:03.361579503 -0700
+++ new/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16ext.c	2016-07-28 13:47:03.217579507 -0700
@@ -539,7 +539,7 @@
 
   if (m == 1) {
     status = mlib_ImageConv1xN_ext(dst, src, k, n, dy_t, dy_b, cmask);
-    FREE_AND_RETURN_STATUS;
+    FREE_AND_RETURN_STATUS
   }
 
   swid = wid + (m - 1);
@@ -551,7 +551,7 @@
 
     if (pbuff == NULL) {
       status = MLIB_FAILURE;
-      FREE_AND_RETURN_STATUS;
+      FREE_AND_RETURN_STATUS
     }
     buffs = (FTYPE   **)(pbuff + bsize);
   }
@@ -956,7 +956,7 @@
     }
   }
 
-  FREE_AND_RETURN_STATUS;
+  FREE_AND_RETURN_STATUS
 }
 
 /***************************************************************/
--- old/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16nw.c	2016-07-28 13:47:03.745579492 -0700
+++ new/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16nw.c	2016-07-28 13:47:03.597579496 -0700
@@ -484,7 +484,7 @@
 
   if (m == 1) {
     status = mlib_ImageConv1xN(dst, src, k, n, dn, cmask);
-    FREE_AND_RETURN_STATUS;
+    FREE_AND_RETURN_STATUS
   }
 
   bsize = (n + 3)*wid;
@@ -494,7 +494,7 @@
 
     if (pbuff == NULL) {
       status = MLIB_FAILURE;
-      FREE_AND_RETURN_STATUS;
+      FREE_AND_RETURN_STATUS
     }
     buffs = (FTYPE   **)(pbuff + bsize);
   }
@@ -849,7 +849,7 @@
     }
   }
 
-  FREE_AND_RETURN_STATUS;
+  FREE_AND_RETURN_STATUS
 }
 
 /***************************************************************/
--- old/src/java.desktop/share/native/libmlib_image/mlib_c_ImageCopy.c	2016-07-28 13:47:04.141579481 -0700
+++ new/src/java.desktop/share/native/libmlib_image/mlib_c_ImageCopy.c	2016-07-28 13:47:03.985579486 -0700
@@ -182,7 +182,7 @@
 #define STRIP(pd, ps, w, h, data_type) {                        \
   data_type s0, s1;                                             \
   for ( i = 0; i < h; i++ ) {                                   \
-    if (j = w & 1)                                              \
+    if ((j = (w & 1)))                                              \
       pd[i * dst_stride] = ps[i * src_stride];                  \
     for (; j < w; j += 2) {                                     \
       s0 = ps[i * src_stride + j];                              \
@@ -546,7 +546,7 @@
     mlib_u32 *psrc_row = psrc + i * src_stride, *pdst_row = pdst + i * dst_stride;
 
     if (!(((mlib_addr) psrc_row ^ (mlib_addr) pdst_row) & 7)) {
-      if (j = ((mlib_s32) ((mlib_addr) psrc_row & 4) >> 2)) {
+      if ((j = ((mlib_s32) ((mlib_addr) psrc_row & 4) >> 2))) {
         pdst_row[0] = psrc_row[0];
       }
 
@@ -575,7 +575,7 @@
       {
         mlib_u64 *ps, src0, src1;
 
-        if (j = ((mlib_s32) ((mlib_addr) pdst_row & 4) >> 2))
+        if ((j = ((mlib_s32) ((mlib_addr) pdst_row & 4) >> 2)))
           pdst_row[0] = psrc_row[0];
         ps = (mlib_u64 *) (psrc_row + j - 1);
         src1 = ps[0];