8306949: Resolve miscellaneous multiple symbol definition issues when statically linking JDK/VM natives with standard launcher

Reviewed-by: alanb

Author: jianglizhou

src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2023, 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
@@ -55,7 +55,7 @@ Boolean  awt_ModLockIsShiftLock = False;
 static int32_t num_buttons = 0;
 int32_t getNumButtons();
 
-extern JavaVM *jvm;
+extern JavaVM *jvm_xawt;
 
 // Tracing level
 static int tracing = 0;
@@ -130,7 +130,7 @@ JNIEXPORT jlong JNICALL Java_sun_awt_X11_XToolkit_getDefaultXColormap
 JNIEXPORT jint JNICALL
 DEF_JNI_OnLoad(JavaVM *vm, void *reserved)
 {
-    jvm = vm;
+    jvm_xawt = vm;
 
     //Set the gtk backend to x11 on all the systems
     putenv("GDK_BACKEND=x11");
@@ -698,7 +698,7 @@ performPoll(JNIEnv *env, jlong nextTaskTime) {
  */
 void awt_output_flush() {
     if (awt_next_flush_time == 0) {
-        JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
+        JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm_xawt, JNI_VERSION_1_2);
 
         jlong curTime = awtJNI_TimeMillis(); // current time
         jlong l_awt_last_flush_time = awt_last_flush_time; // last time we flushed queue

src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2023, 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
@@ -1324,15 +1324,15 @@ JNIEXPORT jboolean JNICALL Java_sun_awt_X11_XlibWrapper_IsKanaKeyboard
     return result ? JNI_TRUE : JNI_FALSE;
 }
 
-JavaVM* jvm = NULL;
+JavaVM* jvm_xawt = NULL;
 static int ToolkitErrorHandler(Display * dpy, XErrorEvent * event) {
     JNIEnv * env;
     // First call the native synthetic error handler declared in "awt_util.h" file.
     if (current_native_xerror_handler != NULL) {
         current_native_xerror_handler(dpy, event);
     }
-    if (jvm != NULL) {
-        env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
+    if (jvm_xawt != NULL) {
+        env = (JNIEnv *)JNU_GetEnv(jvm_xawt, JNI_VERSION_1_2);
         if (env) {
             return JNU_CallStaticMethodByName(env, NULL, "sun/awt/X11/XErrorHandlerUtil",
                 "globalErrorHandler", "(JJ)I", ptr_to_jlong(dpy), ptr_to_jlong(event)).i;
@@ -1349,7 +1349,7 @@ static int ToolkitErrorHandler(Display * dpy, XErrorEvent * event) {
 JNIEXPORT jlong JNICALL Java_sun_awt_X11_XlibWrapper_SetToolkitErrorHandler
 (JNIEnv *env, jclass clazz)
 {
-    if ((*env)->GetJavaVM(env, &jvm) < 0) {
+    if ((*env)->GetJavaVM(env, &jvm_xawt) < 0) {
         return 0;
     }
     AWT_CHECK_HAVE_LOCK_RETURN(0);

src/java.desktop/unix/native/libawt_xawt/xawt/awt_Taskbar.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, 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
@@ -35,8 +35,7 @@
 #include "jni_util.h"
 #include "awt_Taskbar.h"
 
-
-extern JavaVM *jvm;
+extern JavaVM *jvm_xawt;
 
 #define NO_SYMBOL_EXCEPTION 1
 
@@ -100,7 +99,7 @@ static gboolean unity_load() {
 }
 
 void callback(DbusmenuMenuitem* mi, guint ts, jobject data) {
-    JNIEnv* env = (JNIEnv*) JNU_GetEnv(jvm, JNI_VERSION_1_2);
+    JNIEnv* env = (JNIEnv*) JNU_GetEnv(jvm_xawt, JNI_VERSION_1_2);
     (*env)->CallStaticVoidMethod(env, jTaskbarCls, jTaskbarCallback, data);
 }
 
@@ -196,7 +195,7 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XTaskbarPeer_updateProgress
 }
 
 void deleteGlobalRef(gpointer data) {
-    JNIEnv* env = (JNIEnv*) JNU_GetEnv(jvm, JNI_VERSION_1_2);
+    JNIEnv* env = (JNIEnv*) JNU_GetEnv(jvm_xawt, JNI_VERSION_1_2);
     (*env)->DeleteGlobalRef(env, data);
 }
 

src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.c

@@ -75,7 +75,7 @@ static void throwIOException(JNIEnv *env, const char *msg)
     throwByName(env, "java/io/IOException", msg);
 }
 
-void *findFunction(JNIEnv *env, void *hModule, char *functionName) {
+static void *findFunction(JNIEnv *env, void *hModule, char *functionName) {
     void *fAddress = dlsym(hModule, functionName);
     if (fAddress == NULL) {
         char errorMessage[256];

src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2023, 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
@@ -40,7 +40,7 @@ JNIEXPORT jboolean JNICALL Java_sun_security_pkcs11_Secmod_nssVersionCheck
     FPTR_VersionCheck versionCheck;
     const char *requiredVersion;
 
-    versionCheck = (FPTR_VersionCheck)findFunction(env, jHandle,
+    versionCheck = (FPTR_VersionCheck)p11FindFunction(env, jHandle,
         "NSS_VersionCheck");
     if (versionCheck == NULL) {
         return JNI_FALSE;
@@ -68,10 +68,10 @@ JNIEXPORT jboolean JNICALL Java_sun_security_pkcs11_Secmod_nssInitialize
 {
     int res = 0;
     FPTR_Initialize initialize =
-        (FPTR_Initialize)findFunction(env, jHandle, "NSS_Initialize");
+        (FPTR_Initialize)p11FindFunction(env, jHandle, "NSS_Initialize");
     #ifdef SECMOD_DEBUG
     FPTR_GetError getError =
-        (FPTR_GetError)findFunction(env, jHandle, "PORT_GetError");
+        (FPTR_GetError)p11FindFunction(env, jHandle, "PORT_GetError");
     #endif // SECMOD_DEBUG
     unsigned int flags = 0x00;
     const char *configDir = NULL;
@@ -162,7 +162,7 @@ JNIEXPORT jobject JNICALL Java_sun_security_pkcs11_Secmod_nssGetModuleList
   (JNIEnv *env, jclass thisClass, jlong jHandle, jstring jLibDir)
 {
     FPTR_GetDBModuleList getModuleList =
-        (FPTR_GetDBModuleList)findFunction(env, jHandle, "SECMOD_GetDefaultModuleList");
+        (FPTR_GetDBModuleList)p11FindFunction(env, jHandle, "SECMOD_GetDefaultModuleList");
 
     SECMODModuleList *list;
     SECMODModule *module;

src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2023, 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
@@ -34,7 +34,7 @@
 #include "p11_md.h"
 
 
-void *findFunction(JNIEnv *env, jlong jHandle, const char *functionName);
+void *p11FindFunction(JNIEnv *env, jlong jHandle, const char *functionName);
 
 #ifdef SECMOD_DEBUG
 #define dprintf(s) printf(s)

src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_general.c

@@ -75,7 +75,7 @@ jclass jLongClass;
 
 JavaVM* jvm_j2pkcs11 = NULL;
 
-jboolean debug = 0;
+jboolean debug_j2pkcs11 = 0;
 
 JNIEXPORT jint JNICALL DEF_JNI_OnLoad(JavaVM *vm, void *reserved) {
     jvm_j2pkcs11 = vm;
@@ -122,7 +122,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_initializeLibrary
 #endif
 
     prefetchFields(env, thisClass);
-    debug = enableDebug;
+    debug_j2pkcs11 = enableDebug;
 }
 
 jclass fetchClass(JNIEnv *env, const char *name) {

src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_util.c

@@ -1334,7 +1334,7 @@ void p11free(void *p, char *file, int line) {
 
 // prints a message to stdout if debug output is enabled
 void printDebug(const char *format, ...) {
-    if (debug == JNI_TRUE) {
+    if (debug_j2pkcs11 == JNI_TRUE) {
         va_list args;
         fprintf(stdout, "sunpkcs11: ");
         va_start(args, format);

src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11wrapper.h

@@ -231,7 +231,7 @@
 #endif
 
 /* debug output */
-extern jboolean debug;
+extern jboolean debug_j2pkcs11;
 void printDebug(const char *format, ...);
 
 #define CK_ASSERT_OK 0L

src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.c

@@ -34,7 +34,7 @@
 #include "j2secmod.h"
 #include "pkcs11wrapper.h"
 
-void *findFunction(JNIEnv *env, jlong jHandle, const char *functionName) {
+void *p11FindFunction(JNIEnv *env, jlong jHandle, const char *functionName) {
     void *hModule = (void*)jlong_to_ptr(jHandle);
     void *fAddress = dlsym(hModule, functionName);
     if (fAddress == NULL) {

src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/j2secmod_md.c

@@ -34,7 +34,7 @@
 extern void p11ThrowNullPointerException(JNIEnv *env, const char *message);
 extern void p11ThrowIOException(JNIEnv *env, const char *message);
 
-void *findFunction(JNIEnv *env, jlong jHandle, const char *functionName) {
+void *p11FindFunction(JNIEnv *env, jlong jHandle, const char *functionName) {
     HINSTANCE hModule = (HINSTANCE)jHandle;
     void *fAddress = GetProcAddress(hModule, functionName);
     if (fAddress == NULL) {