From 0bac07b6e2b392ad567e81078d05f66ef6cbfc05 Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Thu, 29 Oct 2015 16:31:00 +0100 Subject: [PATCH] 8140661: Rename LDFLAGS_SUFFIX to LIBS Reviewed-by: erikj --- jdk/make/CompileDemos.gmk | 12 +- jdk/make/launcher/Launcher-java.base.gmk | 10 +- .../launcher/Launcher-jdk.accessibility.gmk | 4 +- jdk/make/launcher/Launcher-jdk.jconsole.gmk | 5 +- jdk/make/launcher/Launcher-jdk.pack200.gmk | 5 +- jdk/make/launcher/LauncherCommon.gmk | 35 ++--- jdk/make/lib/Awt2dLibraries.gmk | 123 +++++++++--------- jdk/make/lib/CoreLibraries.gmk | 69 +++++----- jdk/make/lib/Lib-java.instrument.gmk | 31 +++-- jdk/make/lib/Lib-java.management.gmk | 8 +- jdk/make/lib/Lib-java.prefs.gmk | 13 +- jdk/make/lib/Lib-java.security.jgss.gmk | 6 +- jdk/make/lib/Lib-java.smartcardio.gmk | 8 +- jdk/make/lib/Lib-jdk.accessibility.gmk | 14 +- jdk/make/lib/Lib-jdk.attach.gmk | 8 +- jdk/make/lib/Lib-jdk.crypto.ec.gmk | 6 +- jdk/make/lib/Lib-jdk.crypto.mscapi.gmk | 4 +- jdk/make/lib/Lib-jdk.crypto.pkcs11.gmk | 4 +- jdk/make/lib/Lib-jdk.crypto.ucrypto.gmk | 6 +- jdk/make/lib/Lib-jdk.deploy.osx.gmk | 8 +- jdk/make/lib/Lib-jdk.internal.le.gmk | 2 +- jdk/make/lib/Lib-jdk.jdi.gmk | 2 +- jdk/make/lib/Lib-jdk.jdwp.agent.gmk | 15 ++- jdk/make/lib/Lib-jdk.management.gmk | 8 +- jdk/make/lib/Lib-jdk.pack200.gmk | 6 +- jdk/make/lib/Lib-jdk.sctp.gmk | 7 +- jdk/make/lib/Lib-jdk.security.auth.gmk | 9 +- jdk/make/lib/NetworkingLibraries.gmk | 14 +- jdk/make/lib/NioLibraries.gmk | 18 +-- jdk/make/lib/PlatformLibraries.gmk | 2 +- jdk/make/lib/SecurityLibraries.gmk | 8 +- jdk/make/lib/SoundLibraries.gmk | 12 +- 32 files changed, 235 insertions(+), 247 deletions(-) diff --git a/jdk/make/CompileDemos.gmk b/jdk/make/CompileDemos.gmk index 7719a8663f5..03b84fb725d 100644 --- a/jdk/make/CompileDemos.gmk +++ b/jdk/make/CompileDemos.gmk @@ -269,11 +269,11 @@ define SetupJVMTIDemo DISABLED_WARNINGS_microsoft := $(11), \ LDFLAGS := $(filter-out -incremental:no -opt:ref, $(LDFLAGS_JDKLIB)), \ LDFLAGS_macosx := $(call SET_EXECUTABLE_ORIGIN), \ - LDFLAGS_SUFFIX := $$($1_EXTRA_CXX), \ - LDFLAGS_SUFFIX_unix := $5, \ - LDFLAGS_SUFFIX_windows := $6, \ - LDFLAGS_SUFFIX_solaris := $7 -lc, \ - LDFLAGS_SUFFIX_linux := $8, \ + LIBS := $$($1_EXTRA_CXX), \ + LIBS_unix := $5, \ + LIBS_linux := $8, \ + LIBS_solaris := $7 -lc, \ + LIBS_windows := $6, \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $$(RC_FLAGS) \ -D "JDK_FNAME=$1.dll" \ @@ -409,7 +409,7 @@ ifeq ($(OPENJDK_TARGET_OS), solaris) CFLAGS := $(CFLAGS_JDKLIB) \ -I$(SUPPORT_OUTPUTDIR)/demo/classes/jni/Poller, \ LDFLAGS := $(LDFLAGS_JDKLIB), \ - LDFLAGS_SUFFIX_solaris := -lc, \ + LIBS_solaris := -lc, \ OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/demo/native/jni/Poller, \ OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/demo/native, \ LIBRARY := Poller)) diff --git a/jdk/make/launcher/Launcher-java.base.gmk b/jdk/make/launcher/Launcher-java.base.gmk index c5afd5631d6..1cbab01bcad 100644 --- a/jdk/make/launcher/Launcher-java.base.gmk +++ b/jdk/make/launcher/Launcher-java.base.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, 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 @@ -125,7 +125,7 @@ BUILD_JSPAWNHELPER_SRC := $(JDK_TOPDIR)/src/java.base/unix/native/jspawnhelper JSPAWNHELPER_CFLAGS := -I$(JDK_TOPDIR)/src/java.base/unix/native/libjava BUILD_JSPAWNHELPER_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR) LINK_JSPAWNHELPER_OBJECTS := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjava/childproc.o -LINK_JSPAWNHELPER_FLAGS := +BUILD_JSPAWNHELPER_LDFLAGS := ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx solaris aix), ) BUILD_JSPAWNHELPER := 1 @@ -136,7 +136,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) endif ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) - LINK_JSPAWNHELPER_FLAGS += $(COMPILER_TARGET_BITS_FLAG)64 + BUILD_JSPAWNHELPER_LDFLAGS += $(COMPILER_TARGET_BITS_FLAG)64 endif ifeq ($(BUILD_JSPAWNHELPER), 1) @@ -145,8 +145,8 @@ ifeq ($(BUILD_JSPAWNHELPER), 1) INCLUDE_FILES := jspawnhelper.c, \ OPTIMIZATION := LOW, \ CFLAGS := $(CFLAGS_JDKEXE) $(JSPAWNHELPER_CFLAGS), \ - LDFLAGS := $(LDFLAGS_JDKEXE) $(LINK_JSPAWNHELPER_FLAGS), \ - LDFLAGS_SUFFIX := $(LINK_JSPAWNHELPER_OBJECTS), \ + LDFLAGS := $(LDFLAGS_JDKEXE) $(BUILD_JSPAWNHELPER_LDFLAGS), \ + LIBS := $(LINK_JSPAWNHELPER_OBJECTS), \ OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/jspawnhelper, \ OUTPUT_DIR := $(BUILD_JSPAWNHELPER_DST_DIR), \ PROGRAM := jspawnhelper)) diff --git a/jdk/make/launcher/Launcher-jdk.accessibility.gmk b/jdk/make/launcher/Launcher-jdk.accessibility.gmk index f9819264a75..33fbfc27a9c 100644 --- a/jdk/make/launcher/Launcher-jdk.accessibility.gmk +++ b/jdk/make/launcher/Launcher-jdk.accessibility.gmk @@ -40,8 +40,8 @@ ifeq ($(OPENJDK_TARGET_OS), windows) -analyze- -Od -Gd -D_WINDOWS \ -D_UNICODE -DUNICODE -RTC1 -EHsc, \ DISABLED_WARNINGS_microsoft := 4267 4996, \ - LDFLAGS := $(LDFLAGS_JDKEXE) \ - Advapi32.lib Version.lib User32.lib, \ + LDFLAGS := $(LDFLAGS_JDKEXE), \ + LIBS := advapi32.lib version.lib user32.lib, \ OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/jdk.accessibility/jabswitch, \ OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_cmds/jdk.accessibility, \ PROGRAM := jabswitch, \ diff --git a/jdk/make/launcher/Launcher-jdk.jconsole.gmk b/jdk/make/launcher/Launcher-jdk.jconsole.gmk index c67c0c0f933..905117cb53b 100644 --- a/jdk/make/launcher/Launcher-jdk.jconsole.gmk +++ b/jdk/make/launcher/Launcher-jdk.jconsole.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, 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 @@ -26,9 +26,8 @@ include LauncherCommon.gmk BUILD_LAUNCHER_jconsole_CFLAGS_windows := -DJAVAW -BUILD_LAUNCHER_jconsole_LDFLAGS_windows := user32.lib +BUILD_LAUNCHER_jconsole_LIBS_windows := user32.lib $(eval $(call SetupLauncher,jconsole, \ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "-J-Djconsole.showOutputViewer"$(COMMA) "sun.tools.jconsole.JConsole"$(COMMA) }' \ -DAPP_CLASSPATH='{ "/lib/jconsole.jar"$(COMMA) "/lib/tools.jar"$(COMMA) "/classes" }')) - diff --git a/jdk/make/launcher/Launcher-jdk.pack200.gmk b/jdk/make/launcher/Launcher-jdk.pack200.gmk index 2dcbb684af5..11611623a3b 100644 --- a/jdk/make/launcher/Launcher-jdk.pack200.gmk +++ b/jdk/make/launcher/Launcher-jdk.pack200.gmk @@ -90,9 +90,8 @@ $(eval $(call SetupNativeCompilation,BUILD_UNPACKEXE, \ $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \ $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX)) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_linux := , \ - LDFLAGS_solaris := $(UNPACKEXE_LDFLAGS_solaris) -lc, \ - LDFLAGS_SUFFIX := $(UNPACKEXE_LIBS) $(LIBCXX), \ + LIBS := $(UNPACKEXE_LIBS) $(LIBCXX), \ + LIBS_solaris := -lc, \ OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpackexe$(OUTPUT_SUBDIR), \ OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_cmds/$(MODULE), \ PROGRAM := unpack200, \ diff --git a/jdk/make/launcher/LauncherCommon.gmk b/jdk/make/launcher/LauncherCommon.gmk index f81b50a8239..0065114e687 100644 --- a/jdk/make/launcher/LauncherCommon.gmk +++ b/jdk/make/launcher/LauncherCommon.gmk @@ -75,8 +75,8 @@ define SetupLauncher # Parameter 1 is the name of the launcher (java, javac, jar...) # Parameter 2 is extra CFLAGS # Parameter 3 is extra LDFLAGS - # Parameter 4 is extra LDFLAGS_SUFFIX_unix - # Parameter 5 is extra LDFLAGS_SUFFIX_windows + # Parameter 4 is extra LIBS_unix + # Parameter 5 is extra LIBS_windows # Parameter 6 is optional Windows JLI library (full path) # Parameter 7 is optional Windows resource (RC) flags # Parameter 8 is optional Windows version resource file (.rc) @@ -96,7 +96,7 @@ define SetupLauncher endif $1_LDFLAGS := $3 - $1_LDFLAGS_SUFFIX := + $1_LIBS := ifeq ($(OPENJDK_TARGET_OS), macosx) $1_PLIST_FILE := Info-cmdline.plist ifneq ($(11), ) @@ -107,17 +107,18 @@ define SetupLauncher endif $1_LDFLAGS += -Wl,-all_load $(SUPPORT_OUTPUTDIR)/native/java.base/libjli_static.a \ - -framework Cocoa -framework Security -framework ApplicationServices \ -sectcreate __TEXT __info_plist $(MACOSX_PLIST_DIR)/$$($1_PLIST_FILE) - $1_LDFLAGS_SUFFIX += -pthread + $1_LIBS += -framework Cocoa -framework Security \ + -framework ApplicationServices endif ifeq ($(OPENJDK_TARGET_OS), aix) - $1_LDFLAGS_SUFFIX += -L$(SUPPORT_OUTPUTDIR)/native/java.base -ljli_static + $1_LDFLAGS += -L$(SUPPORT_OUTPUTDIR)/native/java.base + $1_LIBS += -ljli_static endif ifeq ($(USE_EXTERNAL_LIBZ), true) - $1_LDFLAGS_SUFFIX += -lz + $1_LIBS += -lz endif $1_OUTPUT_DIR_ARG := $9 @@ -130,7 +131,7 @@ define SetupLauncher $1_OPTIMIZATION_ARG := HIGH $1_LDFLAGS_solaris := -R$(OPENWIN_HOME)/lib$(OPENJDK_TARGET_CPU_ISADIR) else - $1_OPTIMIZATION_ARG := LOW + $1_OPTIMIZATION_ARG := LOW endif $1_CFLAGS := $(CFLAGS_JDKEXE) @@ -172,18 +173,20 @@ define SetupLauncher LDFLAGS := $(LDFLAGS_JDKEXE) \ $(ORIGIN_ARG) \ $$($1_LDFLAGS), \ + LDFLAGS_linux := \ + $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)) \ + -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR)/jli, \ LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_NAME,$1), \ - LDFLAGS_linux := -lpthread \ - $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \ LDFLAGS_solaris := $$($1_LDFLAGS_solaris) \ - $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \ + $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)) \ + -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR)/jli, \ MAPFILE := $$($1_MAPFILE), \ - LDFLAGS_SUFFIX := $(LDFLAGS_JDKEXE_SUFFIX) $$($1_LDFLAGS_SUFFIX), \ - LDFLAGS_SUFFIX_unix := $4, \ - LDFLAGS_SUFFIX_windows := $$($1_WINDOWS_JLI_LIB) \ + LIBS := $(JDKEXE_LIBS) $$($1_LIBS), \ + LIBS_unix := $4, \ + LIBS_linux := -lpthread -ljli $(LIBDL) -lc, \ + LIBS_solaris := -ljli -lthread $(LIBDL) -lc, \ + LIBS_windows := $$($1_WINDOWS_JLI_LIB) \ $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib advapi32.lib $5, \ - LDFLAGS_SUFFIX_linux := -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli $(LIBDL) -lc, \ - LDFLAGS_SUFFIX_solaris := -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli -lthread $(LIBDL) -lc, \ OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/$1_objs$(OUTPUT_SUBDIR), \ OUTPUT_DIR := $$($1_OUTPUT_DIR_ARG)$(OUTPUT_SUBDIR), \ PROGRAM := $1, \ diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk index e4097b566ba..7a26bbfc304 100644 --- a/jdk/make/lib/Awt2dLibraries.gmk +++ b/jdk/make/lib/Awt2dLibraries.gmk @@ -60,9 +60,9 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE, \ MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX := $(BUILD_LIBMLIB_LDLIBS) \ - $(LDFLAGS_JDKLIB_SUFFIX), \ - LDFLAGS_SUFFIX_solaris := -lc, \ + LIBS := $(BUILD_LIBMLIB_LDLIBS) \ + $(JDKLIB_LIBS), \ + LIBS_solaris := -lc, \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=mlib_image.dll" \ @@ -131,9 +131,8 @@ ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc) DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \ MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \ LDFLAGS := $(LDFLAGS_JDKLIB) \ - $(BUILD_LIBMLIB_LDLIBS) -ljava -ljvm \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX_solaris := -lc, \ + LIBS := -ljava -ljvm -lc $(BUILD_LIBMLIB_LDLIBS), \ OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libmlib_image_v, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) @@ -253,27 +252,27 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBAWT, \ ASFLAGS := $(LIBAWT_ASFLAGS), \ MAPFILE := $(LIBAWT_MAPFILE), \ LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX_linux := -ljvm $(LIBM) $(LIBDL) -ljava, \ - LDFLAGS_SUFFIX_solaris := -ljvm $(LIBM) $(LIBDL) -ljava -lc, \ - LDFLAGS_SUFFIX_aix :=-ljvm $(LIBM) $(LIBDL) -ljava -lm,\ - LDFLAGS_SUFFIX_macosx := -L$(INSTALL_LIBRARIES_HERE) \ - -lmlib_image -ljvm $(LIBM) \ + LDFLAGS_macosx := -L$(INSTALL_LIBRARIES_HERE), \ + LDFLAGS_windows := -delayload:user32.dll -delayload:gdi32.dll \ + -delayload:shell32.dll -delayload:winmm.dll \ + -delayload:winspool.drv -delayload:imm32.dll \ + -delayload:ole32.dll -delayload:comdlg32.dll \ + -delayload:comctl32.dll -delayload:shlwapi.dll, \ + LIBS_unix := -ljvm -ljava $(LIBM), \ + LIBS_linux := $(LIBDL), \ + LIBS_solaris := $(LIBDL) -lc, \ + LIBS_aix := $(LIBDL),\ + LIBS_macosx := -lmlib_image \ -framework Cocoa \ -framework OpenGL \ -framework JavaNativeFoundation \ -framework JavaRuntimeSupport \ -framework ApplicationServices \ - -framework AudioToolbox \ - -ljava, \ - LDFLAGS_SUFFIX_windows := kernel32.lib user32.lib gdi32.lib winspool.lib \ + -framework AudioToolbox, \ + LIBS_windows := kernel32.lib user32.lib gdi32.lib winspool.lib \ imm32.lib ole32.lib uuid.lib shell32.lib \ comdlg32.lib winmm.lib comctl32.lib shlwapi.lib \ - delayimp.lib jvm.lib $(WIN_JAVA_LIB) advapi32.lib \ - -DELAYLOAD:user32.dll -DELAYLOAD:gdi32.dll \ - -DELAYLOAD:shell32.dll -DELAYLOAD:winmm.dll \ - -DELAYLOAD:winspool.drv -DELAYLOAD:imm32.dll \ - -DELAYLOAD:ole32.dll -DELAYLOAD:comdlg32.dll \ - -DELAYLOAD:comctl32.dll -DELAYLOAD:shlwapi.dll, \ + delayimp.lib jvm.lib $(WIN_JAVA_LIB) advapi32.lib, \ VERSIONINFO_RESOURCE := $(LIBAWT_VERSIONINFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) $(LIBAWT_RC_FLAGS) \ -D "JDK_FNAME=awt.dll" \ @@ -338,11 +337,10 @@ ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),) endif endif - LIBAWT_XAWT_LDFLAGS_SUFFIX := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm -lc + LIBAWT_XAWT_LIBS := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm -lc ifeq ($(OPENJDK_TARGET_OS), linux) - # To match old build, add this to LDFLAGS instead of suffix. - LIBAWT_XAWT_LDFLAGS += -lpthread + LIBAWT_XAWT_LIBS += -lpthread endif $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_XAWT, \ @@ -361,11 +359,10 @@ ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),) WARNINGS_AS_ERRORS_gcc := false, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt_xawt/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ - $(X_LIBS) $(LIBAWT_XAWT_LDFLAGS) \ $(call SET_SHARED_LIBRARY_ORIGIN) \ $(call SET_SHARED_LIBRARY_ORIGIN,/..) \ -L$(INSTALL_LIBRARIES_HERE), \ - LDFLAGS_SUFFIX := $(LIBAWT_XAWT_LDFLAGS_SUFFIX), \ + LIBS := $(X_LIBS) $(LIBAWT_XAWT_LIBS), \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=xawt.dll" \ @@ -424,11 +421,12 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \ - LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \ - LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc $(LCMS_LIBS), \ - LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm $(LCMS_LIBS), \ - LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm $(LCMS_LIBS), \ - LDFLAGS_SUFFIX_aix := -lm -lawt -ljava -ljvm $(LCMS_LIBS),\ + LIBS_unix := -lawt -ljvm -ljava $(LCMS_LIBS), \ + LIBS_linux := $(LIBM), \ + LIBS_macosx := $(LIBM), \ + LIBS_solaris := -lc, \ + LIBS_aix := $(LIBM),\ + LIBS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=lcms.dll" \ @@ -502,8 +500,8 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJAVAJPEG, \ MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_windows := $(WIN_JAVA_LIB) jvm.lib, \ - LDFLAGS_SUFFIX := $(LIBJPEG_LIBS) $(LDFLAGS_JDKLIB_SUFFIX), \ + LIBS := $(LIBJPEG_LIBS) $(JDKLIB_LIBS), \ + LIBS_windows := $(WIN_JAVA_LIB) jvm.lib, \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=javajpeg.dll" \ @@ -575,11 +573,10 @@ ifeq ($(BUILD_HEADLESS), true) LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ - LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN)., \ REORDER := $(LIBAWT_HEADLESS_REORDER), \ - LDFLAGS_SUFFIX_linux := -ljvm -lawt -lm $(LIBDL) -ljava, \ - LDFLAGS_SUFFIX_aix := -ljvm -lawt -ljava,\ - LDFLAGS_SUFFIX_solaris := $(LIBDL) -ljvm -lawt -lm -ljava $(LIBCXX) -lc, \ + LIBS_unix := -lawt -ljvm -ljava, \ + LIBS_linux := -lm $(LIBDL), \ + LIBS_solaris := -lm $(LIBDL) $(LIBCXX) -lc, \ OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt_headless, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) @@ -662,13 +659,13 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER, \ LDFLAGS := $(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ - LDFLAGS_SUFFIX := $(BUILD_LIBFONTMANAGER_FONTLIB), \ - LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \ - LDFLAGS_SUFFIX_solaris := -lawt -lawt_headless -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \ - LDFLAGS_SUFFIX_aix := -lawt -lawt_headless $(LIBM) $(LIBCXX) -ljava -ljvm,\ - LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \ - -ljava -ljvm, \ - LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ + LDFLAGS_macosx := -undefined dynamic_lookup, \ + LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \ + LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \ + LIBS_linux := -lc, \ + LIBS_solaris := -lawt_headless -lc, \ + LIBS_aix := -lawt_headless,\ + LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ $(WIN_AWT_LIB), \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ @@ -713,9 +710,8 @@ ifeq ($(OPENJDK_TARGET_OS), windows) CFLAGS := $(CXXFLAGS_JDKLIB) \ -EHsc -DUNICODE -D_UNICODE \ $(LIBJAWT_CFLAGS), \ - LDFLAGS := $(LDFLAGS_JDKLIB) $(KERNEL32_LIB) $(LDFLAGS_CXX_JDK) \ - advapi32.lib $(WIN_AWT_LIB), \ - LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \ + LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \ + LIBS := $(JDKLIB_LIBS) $(KERNEL32_LIB) advapi32.lib $(WIN_AWT_LIB), \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=jawt.dll" \ @@ -776,12 +772,10 @@ else # OPENJDK_TARGET_OS not windows LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ - LDFLAGS_solaris := $(X_LIBS), \ - LDFLAGS_SUFFIX_linux := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX), \ - LDFLAGS_SUFFIX_aix := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX),\ - LDFLAGS_SUFFIX_solaris := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX) -lXrender, \ - LDFLAGS_SUFFIX_macosx := -Xlinker -rpath -Xlinker @loader_path $(JAWT_LIBS) \ - -framework Cocoa $(LDFLAGS_JDKLIB_SUFFIX), \ + LDFLAGS_macosx := -Xlinker -rpath -Xlinker @loader_path, \ + LIBS_unix := $(JAWT_LIBS) $(JDKLIB_LIBS), \ + LIBS_solaris := $(X_LIBS) -lXrender, \ + LIBS_macosx := -framework Cocoa, \ OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjawt, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) @@ -809,14 +803,14 @@ ifndef BUILD_HEADLESS_ONLY # ifeq ($(USE_EXTERNAL_LIBGIF), true) - GIFLIB_LDFLAGS := -lgif + GIFLIB_LIBS := -lgif LIBSPLASHSCREEN_EXCLUDES := giflib else LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/share/native/libsplashscreen/giflib endif ifeq ($(USE_EXTERNAL_LIBJPEG), true) - LIBJPEG_LDFLAGS := -ljpeg + LIBJPEG_LIBS := -ljpeg else LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/libjavajpeg LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/java.desktop/share/native/libjavajpeg @@ -857,7 +851,7 @@ ifndef BUILD_HEADLESS_ONLY LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) endif - LIBSPLASHSCREEN_LDFLAGS_SUFFIX := + LIBSPLASHSCREEN_LIBS := ifneq ($(USE_EXTERNAL_LIBZ), true) LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.base/share/native/libzip/zlib-1.2.8 @@ -865,17 +859,18 @@ ifndef BUILD_HEADLESS_ONLY endif ifeq ($(OPENJDK_TARGET_OS), macosx) - LIBSPLASHSCREEN_LDFLAGS_SUFFIX += \ - -L$(INSTALL_LIBRARIES_HERE) \ + LIBSPLASHSCREEN_LDFLAGS := -L$(INSTALL_LIBRARIES_HERE) + LIBSPLASHSCREEN_LIBS += \ $(LIBM) -lpthread -liconv -losxapp \ -framework ApplicationServices \ -framework Foundation \ -framework Cocoa \ -framework JavaNativeFoundation else ifeq ($(OPENJDK_TARGET_OS), windows) - LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll + LIBSPLASHSCREEN_LDFLAGS := -delayload:user32.dll + LIBSPLASHSCREEN_LIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib else - LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread + LIBSPLASHSCREEN_LIBS += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread endif $(eval $(call SetupNativeCompilation,BUILD_LIBSPLASHSCREEN, \ @@ -893,11 +888,11 @@ ifndef BUILD_HEADLESS_ONLY E_STATEMENT_NOT_REACHED, \ DISABLED_WARNINGS_microsoft := 4018 4244 4267, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \ - LDFLAGS := $(LDFLAGS_JDKLIB) \ + LDFLAGS := $(LIBSPLASHSCREEN_LDFLAGS) $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) \ - $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS) $(PNG_LIBS), \ - LDFLAGS_SUFFIX_solaris := -lc, \ + LIBS := $(LIBSPLASHSCREEN_LIBS) $(LIBZ) \ + $(GIFLIB_LIBS) $(LIBJPEG_LIBS) $(PNG_LIBS), \ + LIBS_solaris := -lc, \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=splashscreen.dll" \ @@ -967,7 +962,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN) \ -L$(INSTALL_LIBRARIES_HERE), \ - LDFLAGS_SUFFIX_macosx := -lawt -lmlib_image -losxapp -ljvm $(LIBM) \ + LIBS := -lawt -lmlib_image -losxapp -ljvm $(LIBM) \ -framework Accelerate \ -framework ApplicationServices \ -framework AudioToolbox \ @@ -1014,7 +1009,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) $(call SET_SHARED_LIBRARY_ORIGIN) \ -Xlinker -rpath -Xlinker @loader_path \ -L$(INSTALL_LIBRARIES_HERE), \ - LDFLAGS_SUFFIX_macosx := -lawt -losxapp -lawt_lwawt \ + LIBS := -lawt -losxapp -lawt_lwawt \ -framework Cocoa \ -framework Carbon \ -framework ApplicationServices \ diff --git a/jdk/make/lib/CoreLibraries.gmk b/jdk/make/lib/CoreLibraries.gmk index 843324c5329..99f5f752204 100644 --- a/jdk/make/lib/CoreLibraries.gmk +++ b/jdk/make/lib/CoreLibraries.gmk @@ -97,8 +97,8 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBVERIFY, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libverify/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX_unix := -ljvm -lc, \ - LDFLAGS_SUFFIX_windows := jvm.lib, \ + LIBS_unix := -ljvm -lc, \ + LIBS_windows := jvm.lib, \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=verify.dll" \ @@ -150,19 +150,20 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJAVA, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjava/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX_unix := -ljvm -lverify, \ - LDFLAGS_SUFFIX_solaris := -lsocket -lnsl -lscf $(LIBDL) $(BUILD_LIBFDLIBM) -lc, \ - LDFLAGS_SUFFIX_linux := $(LIBDL) $(BUILD_LIBFDLIBM), \ - LDFLAGS_SUFFIX_aix := $(LIBDL) $(BUILD_LIBFDLIBM) -lm,\ - LDFLAGS_SUFFIX_macosx := -L$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/ -lfdlibm \ + LDFLAGS_macosx := -L$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/, \ + LDFLAGS_windows := -export:winFileHandleOpen -export:handleLseek \ + -export:getLastErrorString \ + -export:getErrorString -delayload:shell32.dll, \ + LIBS_unix := -ljvm -lverify, \ + LIBS_linux := $(LIBDL) $(BUILD_LIBFDLIBM), \ + LIBS_solaris := -lsocket -lnsl -lscf $(LIBDL) $(BUILD_LIBFDLIBM) -lc, \ + LIBS_aix := $(LIBDL) $(BUILD_LIBFDLIBM) -lm,\ + LIBS_macosx := -lfdlibm \ -framework CoreFoundation \ -framework Foundation \ -framework Security -framework SystemConfiguration, \ - LDFLAGS_SUFFIX_windows := -export:winFileHandleOpen -export:handleLseek \ - -export:getLastErrorString \ - -export:getErrorString \ - jvm.lib $(BUILD_LIBFDLIBM) $(WIN_VERIFY_LIB) \ - shell32.lib delayimp.lib -DELAYLOAD:shell32.dll \ + LIBS_windows := jvm.lib $(BUILD_LIBFDLIBM) $(WIN_VERIFY_LIB) \ + shell32.lib delayimp.lib \ advapi32.lib version.lib, \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ @@ -215,16 +216,13 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBZIP, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libzip/mapfile-vers, \ REORDER := $(BUILD_LIBZIP_REORDER), \ LDFLAGS := $(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_ORIGIN) \ - $(EXPORT_ZIP_FUNCS), \ + $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_windows := -export:ZIP_Open -export:ZIP_Close -export:ZIP_FindEntry \ -export:ZIP_ReadEntry -export:ZIP_GetNextEntry \ - -export:ZIP_InflateFully -export:ZIP_CRC32 \ - jvm.lib $(WIN_JAVA_LIB), \ - LDFLAGS_SUFFIX_linux := -ljvm -ljava $(LIBZ), \ - LDFLAGS_SUFFIX_solaris := -ljvm -ljava $(LIBZ) -lc, \ - LDFLAGS_SUFFIX_aix := -ljvm -ljava $(LIBZ),\ - LDFLAGS_SUFFIX_macosx := $(LIBZ) -ljava -ljvm, \ + -export:ZIP_InflateFully -export:ZIP_CRC32, \ + LIBS_unix := -ljvm -ljava $(LIBZ), \ + LIBS_solaris := -lc, \ + LIBS_windows := jvm.lib $(WIN_JAVA_LIB), \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=zip.dll" \ @@ -261,18 +259,15 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJIMAGE, \ CFLAGS_unix := -UDEBUG, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjimage/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_ORIGIN) \ - $(EXPORT_JIMAGE_FUNCS), \ + $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_windows := -export:JIMAGE_Open -export:JIMAGE_Close \ -export:JIMAGE_PackageToModule \ -export:JIMAGE_FindResource -export:JIMAGE_GetResource \ -export:JIMAGE_ResourceIterator, \ - LDFLAGS_SUFFIX_unix := -ljvm -ldl $(LIBCXX), \ - LDFLAGS_SUFFIX_linux := , \ - LDFLAGS_SUFFIX_solaris := -lc, \ - LDFLAGS_SUFFIX_aix := ,\ - LDFLAGS_SUFFIX_macosx := -lc++, \ - LDFLAGS_SUFFIX_windows := jvm.lib, \ + LIBS_unix := -ljvm -ldl $(LIBCXX), \ + LIBS_solaris := -lc, \ + LIBS_macosx := -lc++, \ + LIBS_windows := jvm.lib, \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=jimage.dll" \ @@ -364,12 +359,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJLI, \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ - LDFLAGS_macosx := -framework Cocoa -framework Security -framework ApplicationServices, \ - LDFLAGS_SUFFIX_solaris := $(LIBZ) $(LIBDL) -lc, \ - LDFLAGS_SUFFIX_linux := $(LIBZ) $(LIBDL) -lc -lpthread, \ - LDFLAGS_SUFFIX_aix := $(LIBZ) $(LIBDL),\ - LDFLAGS_SUFFIX_macosx := $(LIBZ), \ - LDFLAGS_SUFFIX_windows := \ + LDFLAGS_windows := \ -export:JLI_Launch \ -export:JLI_ManifestIterate \ -export:JLI_SetTraceLauncher \ @@ -387,10 +377,13 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJLI, \ -export:JLI_MemFree \ -export:JLI_InitArgProcessing \ -export:JLI_PreprocessArg \ - -export:JLI_GetAppArgIndex \ - advapi32.lib \ - comctl32.lib \ - user32.lib, \ + -export:JLI_GetAppArgIndex, \ + LIBS_unix := $(LIBZ), \ + LIBS_linux := $(LIBDL) -lc -lpthread, \ + LIBS_solaris := $(LIBDL) -lc, \ + LIBS_aix := $(LIBDL),\ + LIBS_macosx := -framework Cocoa -framework Security -framework ApplicationServices, \ + LIBS_windows := advapi32.lib comctl32.lib user32.lib, \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=jli.dll" \ diff --git a/jdk/make/lib/Lib-java.instrument.gmk b/jdk/make/lib/Lib-java.instrument.gmk index ed40a831896..5b4eacc4703 100644 --- a/jdk/make/lib/Lib-java.instrument.gmk +++ b/jdk/make/lib/Lib-java.instrument.gmk @@ -40,20 +40,13 @@ LIBINSTRUMENT_CFLAGS := $(CFLAGS_JDKLIB) \ -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \ # -LIBINSTRUMENT_LDFLAGS := -LIBINSTRUMENT_LDFLAGS_SUFFIX := - ifeq ($(OPENJDK_TARGET_OS), windows) - LIBINSTRUMENT_LDFLAGS += $(SUPPORT_OUTPUTDIR)/native/java.base/jli_static.lib $(WIN_JAVA_LIB) \ - -export:Agent_OnAttach advapi32.lib # Statically link the C runtime so that there are not dependencies on modules # not on the search patch when invoked from the Windows system directory # (or elsewhere). LIBINSTRUMENT_CFLAGS := $(filter-out -MD, $(LIBINSTRUMENT_CFLAGS)) # equivalent of strcasecmp is stricmp on Windows LIBINSTRUMENT_CFLAGS += -Dstrcasecmp=stricmp -else - LIBINSTRUMENT_LDFLAGS_SUFFIX := -ljava endif $(eval $(call SetupNativeCompilation,BUILD_LIBINSTRUMENT, \ @@ -68,15 +61,21 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBINSTRUMENT, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN) \ $(LIBINSTRUMENT_LDFLAGS), \ - LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \ - LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \ - LDFLAGS_macosx := -Xlinker -all_load $(SUPPORT_OUTPUTDIR)/native/java.base/libjli_static.a \ - -framework Cocoa -framework Security -framework ApplicationServices, \ - LDFLAGS_SUFFIX := $(LIBINSTRUMENT_LDFLAGS_SUFFIX), \ - LDFLAGS_SUFFIX_macosx := -liconv $(LIBZ), \ - LDFLAGS_SUFFIX_solaris := $(LIBZ) -L$(call FindLibDirForModule, java.base)/jli -ljli $(LIBDL) -lc, \ - LDFLAGS_SUFFIX_linux := $(LIBZ) -L$(call FindLibDirForModule, java.base)/jli -ljli $(LIBDL), \ - LDFLAGS_SUFFIX_aix := $(LIBZ) -L$(SUPPORT_OUTPUTDIR)/native/java.base -ljli_static $(LIBDL),\ + LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/jli) \ + -L$(call FindLibDirForModule, java.base)/jli, \ + LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/jli) \ + -L$(call FindLibDirForModule, java.base)/jli, \ + LDFLAGS_macosx := -Xlinker -all_load $(SUPPORT_OUTPUTDIR)/native/java.base/libjli_static.a, \ + LDFLAGS_aix := -L$(SUPPORT_OUTPUTDIR)/native/java.base, \ + LDFLAGS_windows := -export:Agent_OnAttach, \ + LIBS_unix := -ljava $(LIBZ), \ + LIBS_linux := -ljli $(LIBDL), \ + LIBS_solaris := -ljli $(LIBDL) -lc, \ + LIBS_aix := -ljli_static $(LIBDL),\ + LIBS_macosx := -liconv -framework Cocoa -framework Security \ + -framework ApplicationServices, \ + LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib \ + $(SUPPORT_OUTPUTDIR)/native/java.base/jli_static.lib, \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=instrument.dll" \ diff --git a/jdk/make/lib/Lib-java.management.gmk b/jdk/make/lib/Lib-java.management.gmk index 9f5aaaed3a9..e2b30c8dae9 100644 --- a/jdk/make/lib/Lib-java.management.gmk +++ b/jdk/make/lib/Lib-java.management.gmk @@ -54,10 +54,10 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBMANAGEMENT, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libmanagement/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_solaris := -lkstat, \ - LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \ - LDFLAGS_SUFFIX_windows := jvm.lib psapi.lib $(WIN_JAVA_LIB) advapi32.lib, \ - LDFLAGS_SUFFIX_aix := -lperfstat,\ + LIBS := $(JDKLIB_LIBS), \ + LIBS_solaris := -lkstat, \ + LIBS_aix := -lperfstat,\ + LIBS_windows := jvm.lib psapi.lib $(WIN_JAVA_LIB) advapi32.lib, \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=management.dll" \ diff --git a/jdk/make/lib/Lib-java.prefs.gmk b/jdk/make/lib/Lib-java.prefs.gmk index d12d7eff7dd..a34083510e6 100644 --- a/jdk/make/lib/Lib-java.prefs.gmk +++ b/jdk/make/lib/Lib-java.prefs.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, 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 @@ -43,11 +43,12 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBPREFS, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libprefs/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX_linux := -ljvm -ljava, \ - LDFLAGS_SUFFIX_solaris := -ljvm -ljava -lc, \ - LDFLAGS_SUFFIX_aix := -ljvm -ljava, \ - LDFLAGS_SUFFIX_windows := advapi32.lib jvm.lib $(WIN_JAVA_LIB), \ - LDFLAGS_SUFFIX_macosx := -ljvm -framework CoreFoundation -framework Foundation, \ + LIBS_unix := -ljvm, \ + LIBS_linux := -ljava, \ + LIBS_solaris := -ljava -lc, \ + LIBS_aix := -ljava, \ + LIBS_macosx := -framework CoreFoundation -framework Foundation, \ + LIBS_windows := advapi32.lib jvm.lib $(WIN_JAVA_LIB), \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=prefs.dll" \ diff --git a/jdk/make/lib/Lib-java.security.jgss.gmk b/jdk/make/lib/Lib-java.security.jgss.gmk index 401d0e7c0e9..5d84a22a050 100644 --- a/jdk/make/lib/Lib-java.security.jgss.gmk +++ b/jdk/make/lib/Lib-java.security.jgss.gmk @@ -43,8 +43,8 @@ ifneq ($(OPENJDK_TARGET_OS), windows) MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2gss/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX := $(LIBDL), \ - LDFLAGS_SUFFIX_solaris := -lc, \ + LIBS := $(LIBDL), \ + LIBS_solaris := -lc, \ OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libj2gss, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) @@ -85,7 +85,7 @@ ifneq ($(BUILD_CRYPTO), no) DISABLED_WARNINGS_clang := deprecated-declarations, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX := $(BUILD_LIBKRB5_LIBS), \ + LIBS := $(BUILD_LIBKRB5_LIBS), \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=$(BUILD_LIBKRB5_NAME).dll" \ diff --git a/jdk/make/lib/Lib-java.smartcardio.gmk b/jdk/make/lib/Lib-java.smartcardio.gmk index 82dfbfd55c1..a078e5f03e3 100644 --- a/jdk/make/lib/Lib-java.smartcardio.gmk +++ b/jdk/make/lib/Lib-java.smartcardio.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, 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 @@ -43,9 +43,9 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJ2PCSC, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2pcsc/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX_unix := $(LIBDL), \ - LDFLAGS_SUFFIX_windows := winscard.lib, \ - LDFLAGS_SUFFIX_solaris := -lc, \ + LIBS_unix := $(LIBDL), \ + LIBS_solaris := -lc, \ + LIBS_windows := winscard.lib, \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=j2pcsc.dll" \ diff --git a/jdk/make/lib/Lib-jdk.accessibility.gmk b/jdk/make/lib/Lib-jdk.accessibility.gmk index a689c89c65c..66cee50e40b 100644 --- a/jdk/make/lib/Lib-jdk.accessibility.gmk +++ b/jdk/make/lib/Lib-jdk.accessibility.gmk @@ -50,11 +50,11 @@ ifeq ($(OPENJDK_TARGET_OS), windows) $(addprefix -I,$(JAVA_AB_SRCDIR)) \ -I$(JDK_TOPDIR)/src/jdk.accessibility/windows/native/include/bridge \ -DACCESSBRIDGE_ARCH_$2, \ - LDFLAGS := $(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \ + LDFLAGS := $(LDFLAGS_JDKLIB) -subsystem:windows, \ + LIBS := kernel32.lib user32.lib gdi32.lib \ winspool.lib comdlg32.lib advapi32.lib shell32.lib \ $(SUPPORT_OUTPUTDIR)/native/java.desktop/libjawt/jawt.lib \ - ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \ - -subsystem:windows, \ + ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib, \ VERSIONINFO_RESOURCE := $(ROOT_SRCDIR)/common/AccessBridgeStatusWindow.rc, \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=javaaccessbridge$1.dll" \ @@ -80,11 +80,11 @@ ifeq ($(OPENJDK_TARGET_OS), windows) $(addprefix -I,$(WIN_AB_SRCDIR)) \ -I$(JDK_TOPDIR)/src/jdk.accessibility/windows/native/include/bridge \ -DACCESSBRIDGE_ARCH_$2, \ - LDFLAGS := $(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \ - winspool.lib comdlg32.lib advapi32.lib shell32.lib \ - ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \ - -subsystem:windows \ + LDFLAGS := $(LDFLAGS_JDKLIB) -subsystem:windows \ -def:$(ROOT_SRCDIR)/libwindowsaccessbridge/WinAccessBridge.DEF, \ + LIBS := kernel32.lib user32.lib gdi32.lib \ + winspool.lib comdlg32.lib advapi32.lib shell32.lib \ + ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib, \ VERSIONINFO_RESOURCE := $(ROOT_SRCDIR)/common/AccessBridgeStatusWindow.rc, \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=windowsaccessbridge$1.dll" \ diff --git a/jdk/make/lib/Lib-jdk.attach.gmk b/jdk/make/lib/Lib-jdk.attach.gmk index d1bdd5e1bc0..c227414646d 100644 --- a/jdk/make/lib/Lib-jdk.attach.gmk +++ b/jdk/make/lib/Lib-jdk.attach.gmk @@ -51,10 +51,10 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBATTACH, \ -D "JDK_FTYPE=0x2L", \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_solaris := -ldoor, \ - LDFLAGS_windows := /ORDER:@$(JDK_TOPDIR)/make/mapfiles/libattach/reorder-windows-$(OPENJDK_TARGET_CPU), \ - LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \ - LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib psapi.lib, \ + LDFLAGS_windows := -order:@$(JDK_TOPDIR)/make/mapfiles/libattach/reorder-windows-$(OPENJDK_TARGET_CPU), \ + LIBS := $(JDKLIB_LIBS), \ + LIBS_solaris := -ldoor, \ + LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib psapi.lib, \ OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libattach, \ DEBUG_SYMBOLS := true)) diff --git a/jdk/make/lib/Lib-jdk.crypto.ec.gmk b/jdk/make/lib/Lib-jdk.crypto.ec.gmk index 5781b777d1e..6c62ba68011 100644 --- a/jdk/make/lib/Lib-jdk.crypto.ec.gmk +++ b/jdk/make/lib/Lib-jdk.crypto.ec.gmk @@ -59,9 +59,9 @@ ifeq ($(ENABLE_INTREE_EC), yes) MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsunec/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \ LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX := $(LIBCXX), \ - LDFLAGS_SUFFIX_linux := -lc, \ - LDFLAGS_SUFFIX_solaris := -lc, \ + LIBS := $(LIBCXX), \ + LIBS_linux := -lc, \ + LIBS_solaris := -lc, \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=sunec.dll" \ diff --git a/jdk/make/lib/Lib-jdk.crypto.mscapi.gmk b/jdk/make/lib/Lib-jdk.crypto.mscapi.gmk index a2816dfc26b..8a3bb4e9ccf 100644 --- a/jdk/make/lib/Lib-jdk.crypto.mscapi.gmk +++ b/jdk/make/lib/Lib-jdk.crypto.mscapi.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, 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 @@ ifeq ($(OPENJDK_TARGET_OS), windows) -I$(LIBSUNMSCAPI_SRC), \ LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX := Crypt32.Lib advapi32.lib, \ + LIBS := crypt32.lib advapi32.lib, \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=sunmscapi.dll" \ diff --git a/jdk/make/lib/Lib-jdk.crypto.pkcs11.gmk b/jdk/make/lib/Lib-jdk.crypto.pkcs11.gmk index 748b131045c..21c19b9e5d4 100644 --- a/jdk/make/lib/Lib-jdk.crypto.pkcs11.gmk +++ b/jdk/make/lib/Lib-jdk.crypto.pkcs11.gmk @@ -43,8 +43,8 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJ2PKCS11, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2pkcs11/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX_unix := $(LIBDL), \ - LDFLAGS_SUFFIX_solaris := -lc, \ + LIBS_unix := $(LIBDL), \ + LIBS_solaris := -lc, \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=j2pkcs11.dll" \ diff --git a/jdk/make/lib/Lib-jdk.crypto.ucrypto.gmk b/jdk/make/lib/Lib-jdk.crypto.ucrypto.gmk index 74f07d68376..9f2ff08d7be 100644 --- a/jdk/make/lib/Lib-jdk.crypto.ucrypto.gmk +++ b/jdk/make/lib/Lib-jdk.crypto.ucrypto.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, 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 @@ -41,8 +41,8 @@ ifeq ($(OPENJDK_TARGET_OS), solaris) DISABLED_WARNINGS_solstudio := E_MACRO_REDEFINED, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2ucrypto/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB), \ - LDFLAGS_SUFFIX := $(LIBDL), \ - LDFLAGS_SUFFIX_solaris := -lc, \ + LIBS := $(LIBDL), \ + LIBS_solaris := -lc, \ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2ucrypto, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) diff --git a/jdk/make/lib/Lib-jdk.deploy.osx.gmk b/jdk/make/lib/Lib-jdk.deploy.osx.gmk index 7ed6f9eb0a8..a5c0eb1d41f 100644 --- a/jdk/make/lib/Lib-jdk.deploy.osx.gmk +++ b/jdk/make/lib/Lib-jdk.deploy.osx.gmk @@ -42,10 +42,10 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) DISABLED_WARNINGS_clang := implicit-function-declaration format, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX := -framework Cocoa \ + LIBS := -framework Cocoa \ -framework Carbon \ -framework JavaNativeFoundation \ - $(LDFLAGS_JDKLIB_SUFFIX), \ + $(JDKLIB_LIBS), \ OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libAppleScriptEngine, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) @@ -74,14 +74,14 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) LDFLAGS := $(LDFLAGS_JDKLIB) \ -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.desktop \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX_macosx := \ + LIBS := \ -losxapp \ -framework Cocoa \ -framework ApplicationServices \ -framework JavaNativeFoundation \ -framework JavaRuntimeSupport \ -framework SystemConfiguration \ - $(LDFLAGS_JDKLIB_SUFFIX), \ + $(JDKLIB_LIBS), \ OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libosx, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) diff --git a/jdk/make/lib/Lib-jdk.internal.le.gmk b/jdk/make/lib/Lib-jdk.internal.le.gmk index 5f5cb3b58c5..7aeeac3711d 100644 --- a/jdk/make/lib/Lib-jdk.internal.le.gmk +++ b/jdk/make/lib/Lib-jdk.internal.le.gmk @@ -44,7 +44,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows) CFLAGS := $(CFLAGS_JDKLIB) $(LIBJAVA_HEADER_FLAGS)\ $(LIBLE_CPPFLAGS), \ LDFLAGS := $(LDFLAGS_JDKLIB), \ - LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX) user32.lib, \ + LIBS := $(JDKLIB_LIBS) user32.lib, \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=le.dll" \ diff --git a/jdk/make/lib/Lib-jdk.jdi.gmk b/jdk/make/lib/Lib-jdk.jdi.gmk index 74d246f50d4..0c7de8144df 100644 --- a/jdk/make/lib/Lib-jdk.jdi.gmk +++ b/jdk/make/lib/Lib-jdk.jdi.gmk @@ -48,7 +48,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows) $(LIBDT_SHMEM_CPPFLAGS), \ LDFLAGS := $(LDFLAGS_JDKLIB), \ LDFLAGS_windows := -export:jdwpTransport_OnLoad, \ - LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \ + LIBS := $(JDKLIB_LIBS), \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=dt_shmem.dll" \ diff --git a/jdk/make/lib/Lib-jdk.jdwp.agent.gmk b/jdk/make/lib/Lib-jdk.jdwp.agent.gmk index 03a1d3e3965..da2df699f52 100644 --- a/jdk/make/lib/Lib-jdk.jdwp.agent.gmk +++ b/jdk/make/lib/Lib-jdk.jdwp.agent.gmk @@ -46,9 +46,10 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBDT_SOCKET, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libdt_socket/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX_linux := -lpthread, \ - LDFLAGS_SUFFIX_solaris := -lnsl -lsocket -lc, \ - LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX) -export:jdwpTransport_OnLoad ws2_32.lib, \ + LDFLAGS_windows := -export:jdwpTransport_OnLoad, \ + LIBS_linux := -lpthread, \ + LIBS_solaris := -lnsl -lsocket -lc, \ + LIBS_windows := $(JDKLIB_LIBS) ws2_32.lib, \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=dt_socket.dll" \ @@ -83,10 +84,10 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJDWP, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjdwp/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX_linux := $(LIBDL), \ - LDFLAGS_SUFFIX_solaris := $(LIBDL) -lc, \ - LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX), \ - LDFLAGS_SUFFIX_macosx := -liconv, \ + LIBS_linux := $(LIBDL), \ + LIBS_solaris := $(LIBDL) -lc, \ + LIBS_macosx := -liconv, \ + LIBS_windows := $(JDKLIB_LIBS), \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=jdwp.dll" \ diff --git a/jdk/make/lib/Lib-jdk.management.gmk b/jdk/make/lib/Lib-jdk.management.gmk index 8950738b453..da9e15bd2be 100644 --- a/jdk/make/lib/Lib-jdk.management.gmk +++ b/jdk/make/lib/Lib-jdk.management.gmk @@ -63,10 +63,10 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBMANAGEMENT_EXT, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libmanagement_ext/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_solaris := -lkstat, \ - LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \ - LDFLAGS_SUFFIX_windows := jvm.lib psapi.lib $(WIN_JAVA_LIB) advapi32.lib, \ - LDFLAGS_SUFFIX_aix := -lperfstat,\ + LIBS := $(JDKLIB_LIBS), \ + LIBS_solaris := -lkstat, \ + LIBS_aix := -lperfstat,\ + LIBS_windows := jvm.lib psapi.lib $(WIN_JAVA_LIB) advapi32.lib, \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=management_ext.dll" \ diff --git a/jdk/make/lib/Lib-jdk.pack200.gmk b/jdk/make/lib/Lib-jdk.pack200.gmk index e9baaa3dbef..824fabdb343 100644 --- a/jdk/make/lib/Lib-jdk.pack200.gmk +++ b/jdk/make/lib/Lib-jdk.pack200.gmk @@ -43,9 +43,9 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBUNPACK, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libunpack/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_windows := -map:$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpack.map -debug \ - jvm.lib $(WIN_JAVA_LIB), \ - LDFLAGS_SUFFIX_unix := -ljvm $(LIBCXX) -ljava -lc, \ + LDFLAGS_windows := -map:$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpack.map -debug, \ + LIBS_unix := -ljvm $(LIBCXX) -ljava -lc, \ + LIBS_windows := jvm.lib $(WIN_JAVA_LIB), \ OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libunpack, \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ diff --git a/jdk/make/lib/Lib-jdk.sctp.gmk b/jdk/make/lib/Lib-jdk.sctp.gmk index dff84900595..574bc0e9841 100644 --- a/jdk/make/lib/Lib-jdk.sctp.gmk +++ b/jdk/make/lib/Lib-jdk.sctp.gmk @@ -49,10 +49,9 @@ ifeq ($(OPENJDK_TARGET_OS_TYPE), unix) MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsctp/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX_linux := -lpthread $(LIBDL) -ljava -ljvm, \ - LDFLAGS_SUFFIX_unix := -lnio -lnet, \ - LDFLAGS_SUFFIX_solaris := -lsocket -ljava -ljvm -lc, \ - LDFLAGS_SUFFIX_macosx := -ljava -ljvm, \ + LIBS_unix := -lnio -lnet -ljava -ljvm, \ + LIBS_linux := -lpthread $(LIBDL), \ + LIBS_solaris := -lsocket -lc, \ OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libsctp, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) diff --git a/jdk/make/lib/Lib-jdk.security.auth.gmk b/jdk/make/lib/Lib-jdk.security.auth.gmk index 61cd9a66d5c..2b1b62b6702 100644 --- a/jdk/make/lib/Lib-jdk.security.auth.gmk +++ b/jdk/make/lib/Lib-jdk.security.auth.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, 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 @@ -45,11 +45,10 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJAAS, \ OPTIMIZATION := LOW, \ CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/jdk.security.auth, \ MAPFILE := $(LIBJAAS_MAPFILE), \ - LDFLAGS := $(filter-out -ljava, $(LDFLAGS_JDKLIB)) \ + LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_windows := netapi32.lib user32.lib mpr.lib advapi32.lib, \ - LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX), \ - LDFLAGS_SUFFIX_solaris := -lc, \ + LIBS_solaris := -lc, \ + LIBS_windows := netapi32.lib user32.lib mpr.lib advapi32.lib $(JDKLIB_LIBS), \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=$(LIBJAAS_NAME).dll" \ diff --git a/jdk/make/lib/NetworkingLibraries.gmk b/jdk/make/lib/NetworkingLibraries.gmk index 38c3553509b..df04c8087c1 100644 --- a/jdk/make/lib/NetworkingLibraries.gmk +++ b/jdk/make/lib/NetworkingLibraries.gmk @@ -39,13 +39,13 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBNET, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnet/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX_macosx := -ljvm -ljava, \ - LDFLAGS_SUFFIX_solaris := -ljvm -ljava -lnsl -lsocket $(LIBDL) -lc, \ - LDFLAGS_SUFFIX_linux := $(LIBDL) -ljvm -lpthread -ljava, \ - LDFLAGS_SUFFIX_aix := $(LIBDL) -ljvm -ljava,\ - LDFLAGS_SUFFIX_windows := ws2_32.lib jvm.lib secur32.lib iphlpapi.lib \ - delayimp.lib $(WIN_JAVA_LIB) advapi32.lib \ - -DELAYLOAD:secur32.dll -DELAYLOAD:iphlpapi.dll, \ + LDFLAGS_windows := -delayload:secur32.dll -delayload:iphlpapi.dll, \ + LIBS_unix := -ljvm -ljava, \ + LIBS_linux := $(LIBDL) -lpthread, \ + LIBS_solaris := -lnsl -lsocket $(LIBDL) -lc, \ + LIBS_aix := $(LIBDL),\ + LIBS_windows := ws2_32.lib jvm.lib secur32.lib iphlpapi.lib \ + delayimp.lib $(WIN_JAVA_LIB) advapi32.lib, \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=net.dll" \ diff --git a/jdk/make/lib/NioLibraries.gmk b/jdk/make/lib/NioLibraries.gmk index f58610df6c8..bc021b14d58 100644 --- a/jdk/make/lib/NioLibraries.gmk +++ b/jdk/make/lib/NioLibraries.gmk @@ -70,18 +70,18 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBNIO, \ CFLAGS := $(CFLAGS_JDKLIB) \ $(BUILD_LIBNIO_CFLAGS), \ MAPFILE := $(BUILD_LIBNIO_MAPFILE), \ - LDFLAGS := $(LDFLAGS_JDKLIB) $(BUILD_LIBNIO_LDFLAGS) \ + LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX_linux := -ljava -lnet -lpthread $(LIBDL), \ - LDFLAGS_SUFFIX_aix := -ljava -lnet $(LIBDL),\ - LDFLAGS_SUFFIX_solaris := -ljvm -lsocket -lposix4 $(LIBDL) \ - -lsendfile -ljava -lnet -lc, \ - LDFLAGS_SUFFIX_windows := jvm.lib ws2_32.lib $(WIN_JAVA_LIB) \ + LIBS_unix := -ljava -lnet, \ + LIBS_linux := -lpthread $(LIBDL), \ + LIBS_solaris := -ljvm -lsocket -lposix4 $(LIBDL) \ + -lsendfile -lc, \ + LIBS_aix := $(LIBDL), \ + LIBS_macosx := \ + -framework CoreFoundation -framework CoreServices, \ + LIBS_windows := jvm.lib ws2_32.lib $(WIN_JAVA_LIB) \ $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libnet/net.lib \ advapi32.lib, \ - LDFLAGS_SUFFIX_macosx := -ljava -lnet -pthread \ - -framework CoreFoundation -framework CoreServices, \ - LDFLAGS_SUFFIX :=, \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=nio.dll" \ diff --git a/jdk/make/lib/PlatformLibraries.gmk b/jdk/make/lib/PlatformLibraries.gmk index 74d535d9095..c8850ac27c3 100644 --- a/jdk/make/lib/PlatformLibraries.gmk +++ b/jdk/make/lib/PlatformLibraries.gmk @@ -40,7 +40,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) DISABLED_WARNINGS_clang := objc-method-access objc-root-class, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX_macosx := \ + LIBS := \ -framework Accelerate \ -framework ApplicationServices \ -framework AudioToolbox \ diff --git a/jdk/make/lib/SecurityLibraries.gmk b/jdk/make/lib/SecurityLibraries.gmk index 9778137ae1f..a1c51b73ae3 100644 --- a/jdk/make/lib/SecurityLibraries.gmk +++ b/jdk/make/lib/SecurityLibraries.gmk @@ -44,13 +44,13 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) DISABLED_WARNINGS_clang := deprecated-declarations, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base \ - $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX_macosx := \ - -fobjc-link-runtime \ + $(call SET_SHARED_LIBRARY_ORIGIN) \ + -fobjc-link-runtime, \ + LIBS := \ -framework JavaNativeFoundation \ -framework CoreServices \ -framework Security \ - $(LDFLAGS_JDKLIB_SUFFIX), \ + $(JDKLIB_LIBS), \ OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libosxsecurity, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) diff --git a/jdk/make/lib/SoundLibraries.gmk b/jdk/make/lib/SoundLibraries.gmk index df8190eab51..9204afd36bf 100644 --- a/jdk/make/lib/SoundLibraries.gmk +++ b/jdk/make/lib/SoundLibraries.gmk @@ -126,12 +126,12 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJSOUND, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjsound/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_macosx := -framework CoreAudio -framework CoreFoundation \ + LIBS_unix := -ljava -ljvm, \ + LIBS_solaris := -lc, \ + LIBS_macosx := -framework CoreAudio -framework CoreFoundation \ -framework CoreServices -framework AudioUnit $(LIBCXX) \ -framework CoreMIDI -framework AudioToolbox, \ - LDFLAGS_windows := $(WIN_JAVA_LIB) advapi32.lib winmm.lib, \ - LDFLAGS_SUFFIX_unix := -ljava -ljvm, \ - LDFLAGS_SUFFIX_solaris := -lc, \ + LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib winmm.lib, \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=jsound.dll" \ @@ -171,7 +171,7 @@ ifneq ($(filter jsoundalsa, $(EXTRA_SOUND_JNI_LIBS)), ) MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjsoundalsa/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX := $(ALSA_LIBS) -ljava -ljvm, \ + LIBS := $(ALSA_LIBS) -ljava -ljvm, \ OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjsoundalsa, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) @@ -197,7 +197,7 @@ ifneq ($(filter jsoundds, $(EXTRA_SOUND_JNI_LIBS)), ) -DUSE_DAUDIO=TRUE, \ LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX) dsound.lib winmm.lib user32.lib ole32.lib, \ + LIBS := $(JDKLIB_LIBS) dsound.lib winmm.lib user32.lib ole32.lib, \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=jsoundds.dll" \