8339313: 32-bit build broken

Reviewed-by: coleenp, mbaesken, szaldana

Author: tstuefe

test/hotspot/jtreg/runtime/exceptionMsgs/NoClassDefFoundError/libNoClassDefFoundErrorTest.c

@@ -47,13 +47,22 @@ Java_NoClassDefFoundErrorTest_callFindClass(JNIEnv *env, jclass klass, jstring c
 
 
 static char* giant_string() {
+#ifdef _LP64
     size_t len = ((size_t)INT_MAX) + 3;
     char* c_name = malloc(len * sizeof(char));
     if (c_name != NULL) {
         memset(c_name, 'Y', len - 1);
         c_name[len - 1] = '\0';
     }
     return c_name;
+#else
+    /* On 32-bit, gcc warns us against using values larger than ptrdiff_t for malloc,
+     * memset and as array subscript. Since the chance of a 2GB allocation to be
+     * successful is slim (would typically reach or exceed the user address space
+     * size), lets just not bother. Returning NULL will cause the test to be silently
+     * skipped. */
+    return NULL;
+#endif
 }
 
 JNIEXPORT jboolean JNICALL

test/hotspot/jtreg/serviceability/sa/libupcall.c

@@ -22,11 +22,12 @@
  */
 
 #include <jni.h>
+#include <stdint.h>
 
 typedef void (*upcall_func)(void);
 
 JNIEXPORT void JNICALL
 Java_LingeredAppWithFFMUpcall_callJNI(JNIEnv *env, jclass cls, jlong upcallAddr) {
-  upcall_func upcall = (upcall_func)upcallAddr;
+  upcall_func upcall = (upcall_func)(uintptr_t)upcallAddr;
   upcall();
 }