From bc34591697b1772dfbe908bc8fc549c6eb4fdabc Mon Sep 17 00:00:00 2001
From: dbuck <unknown>
Date: Sat, 11 Jan 2014 10:34:26 -0800
Subject: [PATCH] 6571600: JNI use results in UnsatisfiedLinkError looking for
 libmawt.so Summary: Fix is to call dladdr with name less likely to cause name
 conflict. Reviewed-by: serb, anthony

---
 src/solaris/native/sun/awt/awt_LoadLibrary.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/solaris/native/sun/awt/awt_LoadLibrary.c b/src/solaris/native/sun/awt/awt_LoadLibrary.c
index 2838cba7f..7692d0113 100644
--- a/src/solaris/native/sun/awt/awt_LoadLibrary.c
+++ b/src/solaris/native/sun/awt/awt_LoadLibrary.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2014, 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
@@ -109,7 +109,7 @@ AWT_OnLoad(JavaVM *vm, void *reserved)
     jvm = vm;
 
     /* Get address of this library and the directory containing it. */
-    dladdr((void *)JNI_OnLoad, &dlinfo);
+    dladdr((void *)AWT_OnLoad, &dlinfo);
     realpath((char *)dlinfo.dli_fname, buf);
     len = strlen(buf);
     p = strrchr(buf, '/');
-- 
GitLab