--- old/src/java.desktop/share/native/libmlib_image/mlib_ImageConvKernelConvert.c	2020-05-20 18:01:59.604370275 -0700
+++ new/src/java.desktop/share/native/libmlib_image/mlib_ImageConvKernelConvert.c	2020-05-20 18:01:59.272363900 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2020, 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
@@ -61,12 +61,6 @@
 #include "mlib_ImageConv.h"
 
 /***************************************************************/
-#ifdef __sparc
-
-#define CLAMP_S32(dst, src)                                     \
-  dst = (mlib_s32)(src)
-
-#else
 
 #define CLAMP_S32(dst, src) {                                   \
   mlib_d64 s0 = (mlib_d64)(src);                                \
@@ -75,8 +69,6 @@
   dst = (mlib_s32)s0;                                           \
 }
 
-#endif /* __sparc */
-
 /***************************************************************/
 JNIEXPORT
 mlib_status mlib_ImageConvKernelConvert(mlib_s32       *ikernel,
@@ -150,15 +142,10 @@
     }
 
     /* try to round coefficients */
-#ifdef __sparc
-    scale1 = 16;                            /* shift of coefficients is 16 */
-#else
-
     if (chk_flag == 3)
       scale1 = 16;                          /* MMX */
     else
       scale1 = (type == MLIB_BYTE) ? 8 : 16;
-#endif /* __sparc */
     norm = (1u << (scale - scale1));
 
     for (i = 0; i < m * n; i++) {