Update configure scripts for RISC-V (src)

The changes are to modify the java code in the
src directory to disable compiling AWT related
library in cross-compilation for RISC-V.

Issue: ibmruntimes#218

Signed-off-by: Cheng Jin <[email protected]>

Author: Cheng Jin

src/java.desktop/share/native/common/awt/utility/rect.c

@@ -22,6 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2019, 2019 All Rights Reserved
+ * ===========================================================================
+ */
+
+#ifndef RISCV64_CROSS
 
 #include "utility/rect.h"
 
@@ -100,3 +107,5 @@ int BitmapToYXBandedRectangles(int bitsPerPixel, int width, int height, unsigned
 #if defined(__cplusplus)
 }
 #endif
+
+#endif /* !RISCV64_CROSS */

src/java.desktop/share/native/libawt/java2d/pipe/Region.c

@@ -22,6 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2019, 2019 All Rights Reserved
+ * ===========================================================================
+ */
 
 #include <stdlib.h>
 
@@ -222,6 +227,7 @@ Region_EndIteration(JNIEnv *env, RegionData *pRgnInfo)
     }
 }
 
+#ifndef RISCV64_CROSS
 /*
  * The code was extracted from
  * src/solaris/native/sun/java2d/x11/X11SurfaceData.c
@@ -282,3 +288,5 @@ RegionToYXBandedRectangles(JNIEnv *env,
 
     return numrects;
 }
+
+#endif /* !RISCV64_CROSS */

src/java.desktop/share/native/libawt/java2d/pipe/Region.h

@@ -22,6 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2019, 2019 All Rights Reserved
+ * ===========================================================================
+ */
 
 #ifndef _Included_Region
 #define _Included_Region
@@ -198,7 +203,7 @@ Region_NextIteration(RegionData *pRgnInfo, SurfaceDataBounds *pSpan);
 JNIEXPORT void JNICALL
 Region_EndIteration(JNIEnv *env, RegionData *pRgnInfo);
 
-
+#ifndef RISCV64_CROSS
 /*
  * Converts a sun.java2d.pipe.Region object to a list of
  * rectangles using platform specific native data representation
@@ -210,6 +215,7 @@ RegionToYXBandedRectangles(JNIEnv *env,
         jint x1, jint y1, jint x2, jint y2, jobject region,
         RECT_T ** pRect, unsigned int initialBufferSize);
 
+#endif /* !RISCV64_CROSS */
 
 #ifdef __cplusplus
 };

src/java.desktop/unix/native/common/awt/utility/rect.h

@@ -22,15 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2019, 2019 All Rights Reserved
+ * ===========================================================================
+ */
 
 /* platform-dependent definitions */
 
 #ifndef _AWT_RECT_H
 #define _AWT_RECT_H
 
 #ifndef MACOSX
+#ifndef RISCV64_CROSS
 #include <X11/Xlib.h>
 typedef XRectangle RECT_T;
+#endif /* !RISCV64_CROSS */
 #else
 // OSX still needs this for BitmapToYXBandedRectangles
 typedef struct {
@@ -57,8 +64,10 @@ typedef struct {
 extern "C" {
 #endif
 
+#ifndef RISCV64_CROSS
 int BitmapToYXBandedRectangles(int bitsPerPixel, int width, int height,
         unsigned char * buf, RECT_T * outBuf);
+#endif /* !RISCV64_CROSS */
 
 #if defined(__cplusplus)
 }

src/jdk.compiler/share/classes/com/sun/tools/sjavac/client/SjavacClient.java

@@ -22,6 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2019, 2019 All Rights Reserved
+ * ===========================================================================
+ */
 
 package com.sun.tools.sjavac.client;
 
@@ -84,6 +89,8 @@ public class SjavacClient implements Sjavac {
 
     // Store the server conf settings here.
     private final String settings;
+    
+    private boolean isRiscv = System.getProperty("os.arch").toLowerCase().contains("riscv");
 
     public SjavacClient(Options options) {
         String tmpServerConf = options.getServerConf();
@@ -183,10 +190,15 @@ private Socket tryConnect() throws IOException, InterruptedException {
             try {
                 return makeConnectionAttempt();
             } catch (IOException ex) {
-                Log.error("Connection attempt failed: " + ex.getMessage());
-                if (attempt >= MAX_CONNECT_ATTEMPTS) {
-                    Log.error("Giving up");
-                    throw new IOException("Could not connect to server", ex);
+                /* Keep trying to connect as the native compilation with a non-JIT cross build
+                 * on Linux/RISCV is extremely slow.
+                 */
+                if (!isRiscv) {
+                   Log.error("Connection attempt failed: " + ex.getMessage());
+                   if (attempt >= MAX_CONNECT_ATTEMPTS) {
+                       Log.error("Giving up");
+                       throw new IOException("Could not connect to server", ex);
+                   }
                 }
             }
             Thread.sleep(WAIT_BETWEEN_CONNECT_ATTEMPTS);

src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/PortFile.java

@@ -22,6 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2019, 2019 All Rights Reserved
+ * ===========================================================================
+ */
 
 package com.sun.tools.sjavac.server;
 
@@ -76,6 +81,7 @@ public class PortFile {
     private long serverCookie;
     private int myServerPort;
     private long myServerCookie;
+    private boolean isRiscv = System.getProperty("os.arch").toLowerCase().contains("riscv");
 
     /**
      * Create a new portfile.
@@ -247,7 +253,11 @@ public void waitForValidValues() throws IOException, InterruptedException {
                 Log.debug("Valid port file values found after " + (System.currentTimeMillis() - startTime) + " ms");
                 return;
             }
-            if (System.currentTimeMillis() > timeout) {
+            
+            /* Keep waiting for port file values as the native compilation with a non-JIT cross build
+             * on Linux/RISCV is extremely slow.
+             */
+            if (!isRiscv && (System.currentTimeMillis() > timeout)) {
                 break;
             }
             Thread.sleep(MS_BETWEEN_ATTEMPTS);