stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8210705: Stop exporting all symbols on macosx

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Magnus Ihse Bursie 2018-09-24 20:45:06 +02:00
parent 3910193204
commit 6d9cf91bf0
6 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
make/launcher/LauncherCommon.gmk
View File

@ -36,9 +36,7 @@ ifeq ($(TOOLCHAIN_TYPE), gcc)
LAUNCHER_CFLAGS += -fvisibility=hidden LAUNCHER_CFLAGS += -fvisibility=hidden
LDFLAGS_JDKEXE += -Wl,--exclude-libs,ALL LDFLAGS_JDKEXE += -Wl,--exclude-libs,ALL
else ifeq ($(TOOLCHAIN_TYPE), clang) else ifeq ($(TOOLCHAIN_TYPE), clang)
ifneq ($(OPENJDK_TARGET_OS), macosx) LAUNCHER_CFLAGS += -fvisibility=hidden
LAUNCHER_CFLAGS += -fvisibility=hidden
endif
else ifeq ($(TOOLCHAIN_TYPE), solstudio) else ifeq ($(TOOLCHAIN_TYPE), solstudio)
LAUNCHER_CFLAGS += -xldscope=hidden LAUNCHER_CFLAGS += -xldscope=hidden
else ifeq ($(TOOLCHAIN_TYPE), xlc) else ifeq ($(TOOLCHAIN_TYPE), xlc)

8
make/lib/LibCommon.gmk
View File

@ -46,11 +46,9 @@ ifeq ($(TOOLCHAIN_TYPE), gcc)
LDFLAGS_JDKLIB += -Wl,--exclude-libs,ALL LDFLAGS_JDKLIB += -Wl,--exclude-libs,ALL
EXPORT_ALL_SYMBOLS := -fvisibility=default EXPORT_ALL_SYMBOLS := -fvisibility=default
else ifeq ($(TOOLCHAIN_TYPE), clang) else ifeq ($(TOOLCHAIN_TYPE), clang)
ifneq ($(OPENJDK_TARGET_OS), macosx) CFLAGS_JDKLIB += -fvisibility=hidden
CFLAGS_JDKLIB += -fvisibility=hidden CXXFLAGS_JDKLIB += -fvisibility=hidden
CXXFLAGS_JDKLIB += -fvisibility=hidden EXPORT_ALL_SYMBOLS := -fvisibility=default
EXPORT_ALL_SYMBOLS := -fvisibility=default
endif
else ifeq ($(TOOLCHAIN_TYPE), solstudio) else ifeq ($(TOOLCHAIN_TYPE), solstudio)
CFLAGS_JDKLIB += -xldscope=hidden CFLAGS_JDKLIB += -xldscope=hidden
CXXFLAGS_JDKLIB += -xldscope=hidden CXXFLAGS_JDKLIB += -xldscope=hidden

4
src/java.desktop/macosx/native/libosxapp/AWT_debug.h
View File

@ -26,9 +26,11 @@
#ifndef macosx_port_awt_debug_h #ifndef macosx_port_awt_debug_h
#define macosx_port_awt_debug_h #define macosx_port_awt_debug_h
#include "jni.h"
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
bool ShouldPrintVerboseDebugging(); JNIEXPORT bool ShouldPrintVerboseDebugging();
#define kInternalError "java/lang/InternalError" #define kInternalError "java/lang/InternalError"

4
src/java.desktop/macosx/native/libosxapp/NSApplicationAWT.h
View File

@ -32,7 +32,7 @@
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import <JavaNativeFoundation/JavaNativeFoundation.h> #import <JavaNativeFoundation/JavaNativeFoundation.h>
@interface NSApplicationAWT : NSApplication <NSUserNotificationCenterDelegate> { JNIEXPORT @interface NSApplicationAWT : NSApplication <NSUserNotificationCenterDelegate> {
NSString *fApplicationName; NSString *fApplicationName;
NSWindow *eventTransparentWindow; NSWindow *eventTransparentWindow;
NSTimeInterval dummyEventTimestamp; NSTimeInterval dummyEventTimestamp;
@ -57,5 +57,5 @@
@end @end
void OSXAPP_SetApplicationDelegate(id <NSApplicationDelegate> delegate); JNIEXPORT void OSXAPP_SetApplicationDelegate(id <NSApplicationDelegate> delegate);

8
src/java.desktop/macosx/native/libosxapp/PropertiesUtilities.h
View File

@ -23,11 +23,17 @@
* questions. * questions.
*/ */
/*
* Must include this before JavaNativeFoundation.h to get jni.h from build
*/
#include "jni.h"
#include "jni_util.h"
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import <JavaNativeFoundation/JavaNativeFoundation.h> #import <JavaNativeFoundation/JavaNativeFoundation.h>
@interface PropertiesUtilities : NSObject JNIEXPORT @interface PropertiesUtilities : NSObject
+ (NSString *) javaSystemPropertyForKey:(NSString *)key withEnv:(JNIEnv *)env; + (NSString *) javaSystemPropertyForKey:(NSString *)key withEnv:(JNIEnv *)env;

4
src/java.desktop/macosx/native/libosxapp/ThreadUtilities.h
View File

@ -26,6 +26,8 @@
#ifndef __THREADUTILITIES_H #ifndef __THREADUTILITIES_H
#define __THREADUTILITIES_H #define __THREADUTILITIES_H
#include "jni.h"
#import <pthread.h> #import <pthread.h>
#import "AWT_debug.h" #import "AWT_debug.h"
@ -135,6 +137,6 @@ __attribute__((visibility("default")))
+ (void)performOnMainThread:(SEL)aSelector on:(id)target withObject:(id)arg waitUntilDone:(BOOL)wait; + (void)performOnMainThread:(SEL)aSelector on:(id)target withObject:(id)arg waitUntilDone:(BOOL)wait;
@end @end
void OSXAPP_SetJavaVM(JavaVM *vm); JNIEXPORT void OSXAPP_SetJavaVM(JavaVM *vm);
#endif /* __THREADUTILITIES_H */ #endif /* __THREADUTILITIES_H */