--- a/jdk/make/CompileDemos.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/CompileDemos.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -269,11 +269,11 @@
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 @@
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))
--- a/jdk/make/launcher/Launcher-java.base.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/launcher/Launcher-java.base.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -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 @@
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 @@
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 @@
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))
--- a/jdk/make/launcher/Launcher-jdk.accessibility.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/launcher/Launcher-jdk.accessibility.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -40,8 +40,8 @@
-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, \
--- a/jdk/make/launcher/Launcher-jdk.jconsole.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/launcher/Launcher-jdk.jconsole.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -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" }'))
-
--- a/jdk/make/launcher/Launcher-jdk.pack200.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/launcher/Launcher-jdk.pack200.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -90,9 +90,8 @@
$(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, \
--- a/jdk/make/launcher/LauncherCommon.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/launcher/LauncherCommon.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -75,8 +75,8 @@
# 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 @@
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 @@
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 @@
$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 @@
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, \
--- a/jdk/make/lib/Awt2dLibraries.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/lib/Awt2dLibraries.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -60,9 +60,9 @@
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 @@
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 @@
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 @@
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 @@
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 @@
$(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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
#
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 @@
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 @@
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 @@
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 @@
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 @@
$(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 \
--- a/jdk/make/lib/CoreLibraries.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/lib/CoreLibraries.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -97,8 +97,8 @@
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 @@
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 @@
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 @@
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 @@
$(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 @@
-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" \
--- a/jdk/make/lib/Lib-java.instrument.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/lib/Lib-java.instrument.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -40,20 +40,13 @@
-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 @@
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" \
--- a/jdk/make/lib/Lib-java.management.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/lib/Lib-java.management.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -54,10 +54,10 @@
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" \
--- a/jdk/make/lib/Lib-java.prefs.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/lib/Lib-java.prefs.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -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 @@
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" \
--- a/jdk/make/lib/Lib-java.security.jgss.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/lib/Lib-java.security.jgss.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -43,8 +43,8 @@
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 @@
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" \
--- a/jdk/make/lib/Lib-java.smartcardio.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/lib/Lib-java.smartcardio.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -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 @@
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" \
--- a/jdk/make/lib/Lib-jdk.accessibility.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/lib/Lib-jdk.accessibility.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -50,11 +50,11 @@
$(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 @@
$(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 \
+ 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 \
- -subsystem:windows \
- -def:$(ROOT_SRCDIR)/libwindowsaccessbridge/WinAccessBridge.DEF, \
+ 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" \
--- a/jdk/make/lib/Lib-jdk.attach.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/lib/Lib-jdk.attach.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -51,10 +51,10 @@
-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))
--- a/jdk/make/lib/Lib-jdk.crypto.ec.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/lib/Lib-jdk.crypto.ec.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -59,9 +59,9 @@
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" \
--- a/jdk/make/lib/Lib-jdk.crypto.mscapi.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/lib/Lib-jdk.crypto.mscapi.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -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 @@
-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" \
--- a/jdk/make/lib/Lib-jdk.crypto.pkcs11.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/lib/Lib-jdk.crypto.pkcs11.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -43,8 +43,8 @@
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" \
--- a/jdk/make/lib/Lib-jdk.crypto.ucrypto.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/lib/Lib-jdk.crypto.ucrypto.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -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 @@
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)))
--- a/jdk/make/lib/Lib-jdk.deploy.osx.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/lib/Lib-jdk.deploy.osx.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -42,10 +42,10 @@
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 @@
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)))
--- a/jdk/make/lib/Lib-jdk.internal.le.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/lib/Lib-jdk.internal.le.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -44,7 +44,7 @@
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" \
--- a/jdk/make/lib/Lib-jdk.jdi.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/lib/Lib-jdk.jdi.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -48,7 +48,7 @@
$(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" \
--- a/jdk/make/lib/Lib-jdk.jdwp.agent.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/lib/Lib-jdk.jdwp.agent.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -46,9 +46,10 @@
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 @@
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" \
--- a/jdk/make/lib/Lib-jdk.management.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/lib/Lib-jdk.management.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -63,10 +63,10 @@
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" \
--- a/jdk/make/lib/Lib-jdk.pack200.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/lib/Lib-jdk.pack200.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -43,9 +43,9 @@
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) \
--- a/jdk/make/lib/Lib-jdk.sctp.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/lib/Lib-jdk.sctp.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -49,10 +49,9 @@
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)))
--- a/jdk/make/lib/Lib-jdk.security.auth.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/lib/Lib-jdk.security.auth.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -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 @@
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" \
--- a/jdk/make/lib/NetworkingLibraries.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/lib/NetworkingLibraries.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -39,13 +39,13 @@
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" \
--- a/jdk/make/lib/NioLibraries.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/lib/NioLibraries.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -70,18 +70,18 @@
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" \
--- a/jdk/make/lib/PlatformLibraries.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/lib/PlatformLibraries.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -40,7 +40,7 @@
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 \
--- a/jdk/make/lib/SecurityLibraries.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/lib/SecurityLibraries.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -44,13 +44,13 @@
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)))
--- a/jdk/make/lib/SoundLibraries.gmk Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/make/lib/SoundLibraries.gmk Thu Oct 29 12:39:08 2015 -0700
@@ -126,12 +126,12 @@
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 @@
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 @@
-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" \
--- a/jdk/src/java.base/share/classes/java/io/ObjectInputStream.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/src/java.base/share/classes/java/io/ObjectInputStream.java Thu Oct 29 12:39:08 2015 -0700
@@ -3383,10 +3383,11 @@
* Registers a dependency (in exception status) of one handle on
* another. The dependent handle must be "open" (i.e., assigned, but
* not finished yet). No action is taken if either dependent or target
- * handle is NULL_HANDLE.
+ * handle is NULL_HANDLE. Additionally, no action is taken if the
+ * dependent and target are the same.
*/
void markDependency(int dependent, int target) {
- if (dependent == NULL_HANDLE || target == NULL_HANDLE) {
+ if (dependent == target || dependent == NULL_HANDLE || target == NULL_HANDLE) {
return;
}
switch (status[dependent]) {
--- a/jdk/src/java.base/share/classes/java/util/zip/ZipUtils.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/src/java.base/share/classes/java/util/zip/ZipUtils.java Thu Oct 29 12:39:08 2015 -0700
@@ -26,7 +26,9 @@
package java.util.zip;
import java.nio.file.attribute.FileTime;
-import java.util.Date;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
import java.util.concurrent.TimeUnit;
class ZipUtils {
@@ -66,15 +68,16 @@
/**
* Converts DOS time to Java time (number of milliseconds since epoch).
*/
- private static long dosToJavaTime(long dtime) {
- @SuppressWarnings("deprecation") // Use of date constructor.
- Date d = new Date((int)(((dtime >> 25) & 0x7f) + 80),
- (int)(((dtime >> 21) & 0x0f) - 1),
- (int)((dtime >> 16) & 0x1f),
- (int)((dtime >> 11) & 0x1f),
- (int)((dtime >> 5) & 0x3f),
- (int)((dtime << 1) & 0x3e));
- return d.getTime();
+ public static long dosToJavaTime(long dtime) {
+ LocalDateTime ldt = LocalDateTime.of(
+ (int) (((dtime >> 25) & 0x7f) + 1980),
+ (int) ((dtime >> 21) & 0x0f),
+ (int) ((dtime >> 16) & 0x1f),
+ (int) ((dtime >> 11) & 0x1f),
+ (int) ((dtime >> 5) & 0x3f),
+ (int) ((dtime << 1) & 0x3e));
+ return TimeUnit.MILLISECONDS.convert(ldt.toEpochSecond(
+ ZoneId.systemDefault().getRules().getOffset(ldt)), TimeUnit.SECONDS);
}
/**
@@ -92,16 +95,20 @@
/**
* Converts Java time to DOS time.
*/
- @SuppressWarnings("deprecation") // Use of date methods
private static long javaToDosTime(long time) {
- Date d = new Date(time);
- int year = d.getYear() + 1900;
- if (year < 1980) {
- return ZipEntry.DOSTIME_BEFORE_1980;
+ Instant instant = Instant.ofEpochMilli(time);
+ LocalDateTime ldt = LocalDateTime.ofInstant(
+ instant, ZoneId.systemDefault());
+ int year = ldt.getYear() - 1980;
+ if (year < 0) {
+ return (1 << 21) | (1 << 16);
}
- return ((year - 1980) << 25 | (d.getMonth() + 1) << 21 |
- d.getDate() << 16 | d.getHours() << 11 | d.getMinutes() << 5 |
- d.getSeconds() >> 1) & 0xffffffffL;
+ return (year << 25 |
+ ldt.getMonthValue() << 21 |
+ ldt.getDayOfMonth() << 16 |
+ ldt.getHour() << 11 |
+ ldt.getMinute() << 5 |
+ ldt.getSecond() >> 1) & 0xffffffffL;
}
/**
--- a/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipUtils.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipUtils.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,8 +27,10 @@
import java.io.IOException;
import java.io.OutputStream;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
import java.util.Arrays;
-import java.util.Date;
import java.util.regex.PatternSyntaxException;
import java.util.concurrent.TimeUnit;
@@ -103,30 +105,35 @@
/*
* Converts DOS time to Java time (number of milliseconds since epoch).
*/
- @SuppressWarnings("deprecation")
public static long dosToJavaTime(long dtime) {
- Date d = new Date((int)(((dtime >> 25) & 0x7f) + 80),
- (int)(((dtime >> 21) & 0x0f) - 1),
- (int)((dtime >> 16) & 0x1f),
- (int)((dtime >> 11) & 0x1f),
- (int)((dtime >> 5) & 0x3f),
- (int)((dtime << 1) & 0x3e));
- return d.getTime();
+ LocalDateTime ldt = LocalDateTime.of(
+ (int) (((dtime >> 25) & 0x7f) + 1980),
+ (int) ((dtime >> 21) & 0x0f),
+ (int) ((dtime >> 16) & 0x1f),
+ (int) ((dtime >> 11) & 0x1f),
+ (int) ((dtime >> 5) & 0x3f),
+ (int) ((dtime << 1) & 0x3e));
+ return TimeUnit.MILLISECONDS.convert(ldt.toEpochSecond(
+ ZoneId.systemDefault().getRules().getOffset(ldt)), TimeUnit.SECONDS);
}
/*
* Converts Java time to DOS time.
*/
- @SuppressWarnings("deprecation")
public static long javaToDosTime(long time) {
- Date d = new Date(time);
- int year = d.getYear() + 1900;
- if (year < 1980) {
+ Instant instant = Instant.ofEpochMilli(time);
+ LocalDateTime ldt = LocalDateTime.ofInstant(
+ instant, ZoneId.systemDefault());
+ int year = ldt.getYear() - 1980;
+ if (year < 0) {
return (1 << 21) | (1 << 16);
}
- return (year - 1980) << 25 | (d.getMonth() + 1) << 21 |
- d.getDate() << 16 | d.getHours() << 11 | d.getMinutes() << 5 |
- d.getSeconds() >> 1;
+ return (year << 25 |
+ ldt.getMonthValue() << 21 |
+ ldt.getDayOfMonth() << 16 |
+ ldt.getHour() << 11 |
+ ldt.getMinute() << 5 |
+ ldt.getSecond() >> 1) & 0xffffffffL;
}
--- a/jdk/test/ProblemList.txt Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/ProblemList.txt Thu Oct 29 12:39:08 2015 -0700
@@ -300,9 +300,6 @@
# 8074580
sun/security/pkcs11/rsa/TestKeyPairGenerator.java generic-all
-# 8139860
-com/oracle/security/ucrypto/TestRSA.java solaris-all
-
############################################################################
# jdk_sound
--- a/jdk/test/com/oracle/security/ucrypto/TestRSA.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/com/oracle/security/ucrypto/TestRSA.java Thu Oct 29 12:39:08 2015 -0700
@@ -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
@@ -171,17 +171,24 @@
return kpg.generateKeyPair();
}
- private static KeyPair genPredefinedRSAKeyPair() throws Exception {
- KeyFactory kf = KeyFactory.getInstance("RSA");
- BigInteger mod = new BigInteger(MOD);
- BigInteger pub = new BigInteger(PUB_EXP);
+ private static KeyPair genPredefinedRSAKeyPair(String prov) throws Exception {
+ KeyFactory kf;
+ if (prov == null) {
+ kf = KeyFactory.getInstance("RSA");
+ System.out.println("Using default KeyFactory: "+kf.getProvider().getName());
+ } else {
+ kf = KeyFactory.getInstance("RSA", prov);
+ System.out.println("Using specified KeyFactory: "+kf.getProvider().getName());
+ }
+ BigInteger mod = new BigInteger(1, MOD);
+ BigInteger pub = new BigInteger(1, PUB_EXP);
PrivateKey privKey = kf.generatePrivate
(new RSAPrivateCrtKeySpec
- (mod, pub, new BigInteger(PRIV_EXP),
- new BigInteger(PRIME_P), new BigInteger(PRIME_Q),
- new BigInteger(EXP_P), new BigInteger(EXP_Q),
- new BigInteger(CRT_COEFF)));
+ (mod, pub, new BigInteger(1, PRIV_EXP),
+ new BigInteger(1, PRIME_P), new BigInteger(1, PRIME_Q),
+ new BigInteger(1, EXP_P), new BigInteger(1, EXP_Q),
+ new BigInteger(1, CRT_COEFF)));
PublicKey pubKey = kf.generatePublic(new RSAPublicKeySpec(mod, pub));
return new KeyPair(pubKey, privKey);
}
@@ -210,11 +217,20 @@
public void doTest(Provider prov) throws Exception {
// first test w/ predefine KeyPair
- KeyPair pkp = genPredefinedRSAKeyPair();
System.out.println("Test against Predefined RSA Key Pair");
+ KeyPair pkp = genPredefinedRSAKeyPair("SunPKCS11-Solaris");
testCipher(pkp, 128, true, prov);
testSignature(pkp, true, prov);
+ pkp = genPredefinedRSAKeyPair("SunRsaSign");
+ testCipher(pkp, 128, true, prov);
+ testSignature(pkp, true, prov);
+
+ pkp = genPredefinedRSAKeyPair(null);
+ testCipher(pkp, 128, true, prov);
+ testSignature(pkp, true, prov);
+
+ System.out.println("Running key length test loop");
for (int i = 0; i < 10; i++) {
// then test w/ various key lengths
int keyLens[] = { 1024, 2048 };
--- a/jdk/test/java/lang/ProcessHandle/TEST.properties Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/ProcessHandle/TEST.properties Thu Oct 29 12:39:08 2015 -0700
@@ -1,4 +1,4 @@
# ProcessHandle tests use TestNG
TestNG.dirs = .
lib.dirs = /lib/testlibrary
-
+modules = jdk.management
--- a/jdk/test/java/lang/annotation/AnnotationType/AnnotationTypeDeadlockTest.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/annotation/AnnotationType/AnnotationTypeDeadlockTest.java Thu Oct 29 12:39:08 2015 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -25,6 +25,7 @@
* @test
* @bug 7122142
* @summary Test deadlock situation when recursive annotations are parsed
+ * @modules java.management
*/
import java.lang.annotation.Retention;
--- a/jdk/test/java/lang/instrument/AddTransformerTest.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/AddTransformerTest.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary confirms that added transformers all really run
* @author Gabriel Adauto, Wily Technology
*
- * @modules java.instrument
* @run build AddTransformerTest ATransformerManagementTestCase
* @run shell MakeJAR.sh redefineAgent
* @run main/othervm -javaagent:redefineAgent.jar AddTransformerTest AddTransformerTest
--- a/jdk/test/java/lang/instrument/AppendToBootstrapClassPathTest.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/AppendToBootstrapClassPathTest.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary simple test for the Boot-Class-Path manifest attribute
* @author Gabriel Adauto, Wily Technology, Robert Field, Sun Microsystems
*
- * @modules java.instrument
* @run build AppendToBootstrapClassPathTest ExampleForBootClassPath
* @run shell AppendToBootstrapClassPathSetUp.sh
* @run shell MakeJAR.sh bootclasspathAgent
--- a/jdk/test/java/lang/instrument/AppendToClassPathTest.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/AppendToClassPathTest.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary simple test for the Class-Path manifest attribute
* @author Gabriel Adauto, Wily Technology; Robert Field, Sun Microsystems
*
- * @modules java.instrument
* @run build AppendToClassPathTest
* @run shell AppendToClassPathSetUp.sh
* @run shell MakeJAR.sh classpathAgent
--- a/jdk/test/java/lang/instrument/BootClassPath/BootClassPathTest.sh Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/BootClassPath/BootClassPathTest.sh Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
# attribute.
#
# @key intermittent
-# @modules java.instrument
# @run shell/timeout=240 BootClassPathTest.sh
if [ "${TESTJAVA}" = "" ]
--- a/jdk/test/java/lang/instrument/FromShutdownHook.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/FromShutdownHook.java Thu Oct 29 12:39:08 2015 -0700
@@ -26,7 +26,6 @@
* @bug 5050487
* @summary Check that Instrumentation methods can execute from a runtime
* shutdown hook
- * @modules java.instrument
* @run build FromShutdownHook
* @run shell MakeJAR.sh basicAgent
* @run main/othervm -javaagent:basicAgent.jar FromShutdownHook FromShutdownHook
--- a/jdk/test/java/lang/instrument/GetAllLoadedClassesTest.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/GetAllLoadedClassesTest.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary simple tests for getAllLoadedClasses (is Object there? does a newly loaded class show up?)
* @author Gabriel Adauto, Wily Technology
*
- * @modules java.instrument
* @run build GetAllLoadedClassesTest DummyClass
* @run shell MakeJAR.sh basicAgent
* @run main/othervm -javaagent:basicAgent.jar GetAllLoadedClassesTest GetAllLoadedClassesTest
--- a/jdk/test/java/lang/instrument/GetInitiatedClassesTest.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/GetInitiatedClassesTest.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary simple tests for getInitiatedClasses (does a newly loaded class show up?)
* @author Gabriel Adauto, Wily Technology
*
- * @modules java.instrument
* @run build GetInitiatedClassesTest DummyClass
* @run shell MakeJAR.sh basicAgent
* @run main/othervm -javaagent:basicAgent.jar GetInitiatedClassesTest GetInitiatedClassesTest
--- a/jdk/test/java/lang/instrument/GetObjectSizeTest.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/GetObjectSizeTest.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary round-trip test for getObjectSize (does it return, and is the result non-zero?)
* @author Gabriel Adauto, Wily Technology
*
- * @modules java.instrument
* @run build GetObjectSizeTest
* @run shell MakeJAR.sh basicAgent
* @run main/othervm -javaagent:basicAgent.jar GetObjectSizeTest GetObjectSizeTest
--- a/jdk/test/java/lang/instrument/IsModifiableClassAgent.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/IsModifiableClassAgent.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary test isModifiableClass
* @author Robert Field, Sun Microsystems
*
- * @modules java.instrument
* @run build IsModifiableClassApp IsModifiableClassAgent
* @run shell MakeJAR3.sh IsModifiableClassAgent 'Can-Retransform-Classes: true'
* @run main/othervm -javaagent:IsModifiableClassAgent.jar IsModifiableClassApp
--- a/jdk/test/java/lang/instrument/ManifestTest.sh Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/ManifestTest.sh Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
# @author Daniel D. Daugherty
#
# @key intermittent
-# @modules java.instrument
# @run build ManifestTestApp ExampleForBootClassPath
# @run shell/timeout=900 ManifestTest.sh
#
--- a/jdk/test/java/lang/instrument/NativeMethodPrefixAgent.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/NativeMethodPrefixAgent.java Thu Oct 29 12:39:08 2015 -0700
@@ -28,6 +28,8 @@
* @author Robert Field, Sun Microsystems
*
* @modules java.base/jdk.internal.org.objectweb.asm
+ * java.management
+ * java.instrument
* @run shell/timeout=240 MakeJAR2.sh NativeMethodPrefixAgent NativeMethodPrefixApp 'Can-Retransform-Classes: true' 'Can-Set-Native-Method-Prefix: true'
* @run main/othervm -javaagent:NativeMethodPrefixAgent.jar NativeMethodPrefixApp
*/
--- a/jdk/test/java/lang/instrument/NoTransformerAddedTest.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/NoTransformerAddedTest.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary make sure no transformers run when none are registered
* @author Gabriel Adauto, Wily Technology
*
- * @modules java.instrument
* @run build NoTransformerAddedTest
* @run shell MakeJAR.sh redefineAgent
* @run main/othervm -javaagent:redefineAgent.jar NoTransformerAddedTest NoTransformerAddedTest
--- a/jdk/test/java/lang/instrument/NullGetObjectSizeTest.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/NullGetObjectSizeTest.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary make sure getObjectSize(null) throws NullPointerException.
* @author Robert Field as modified from the code of Gabriel Adauto, Wily Technology
*
- * @modules java.instrument
* @run build NullGetObjectSizeTest
* @run shell MakeJAR.sh basicAgent
* @run main/othervm -javaagent:basicAgent.jar NullGetObjectSizeTest NullGetObjectSizeTest
--- a/jdk/test/java/lang/instrument/NullRedefineClassesTests.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/NullRedefineClassesTests.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary make sure redefineClasses throws NullPointerException in the right places.
* @author Robert Field as modified from the code of Gabriel Adauto, Wily Technology
*
- * @modules java.instrument
* @run build NullRedefineClassesTests
* @run shell MakeJAR.sh redefineAgent
* @run main/othervm -javaagent:redefineAgent.jar NullRedefineClassesTests NullRedefineClassesTests
--- a/jdk/test/java/lang/instrument/NullTransformerAddTest.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/NullTransformerAddTest.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary make sure addTransformer(null) throws what it should
* @author Gabriel Adauto, Wily Technology
*
- * @modules java.instrument
* @run build NullTransformerAddTest
* @run shell MakeJAR.sh redefineAgent
* @run main/othervm -javaagent:redefineAgent.jar NullTransformerAddTest NullTransformerAddTest
--- a/jdk/test/java/lang/instrument/NullTransformerRemoveTest.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/NullTransformerRemoveTest.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary make sure removeTransformer(null) throws NullPointerException
* @author Robert Field as modified from the code of Gabriel Adauto, Wily Technology
*
- * @modules java.instrument
* @run build NullTransformerRemoveTest
* @run shell MakeJAR.sh redefineAgent
* @run main/othervm -javaagent:redefineAgent.jar NullTransformerRemoveTest NullTransformerRemoveTest
--- a/jdk/test/java/lang/instrument/ParallelTransformerLoader.sh Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/ParallelTransformerLoader.sh Thu Oct 29 12:39:08 2015 -0700
@@ -26,7 +26,6 @@
# @summary Test parallel class loading by parallel transformers.
# @author Daniel D. Daugherty as modified from the code of Daryl Puryear @ Wily
#
-# @modules java.instrument
# @run shell MakeJAR3.sh ParallelTransformerLoaderAgent
# @run build ParallelTransformerLoaderApp
# @run shell/timeout=240 ParallelTransformerLoader.sh
--- a/jdk/test/java/lang/instrument/PremainClass/InheritAgent0010.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/PremainClass/InheritAgent0010.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary test config (0,0,1,0): declared 2-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems
*
- * @modules java.instrument
* @run shell ../MakeJAR3.sh InheritAgent0010
* @run main/othervm -javaagent:InheritAgent0010.jar DummyMain
*/
--- a/jdk/test/java/lang/instrument/PremainClass/InheritAgent0011.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/PremainClass/InheritAgent0011.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary test config (0,0,1,1): declared 2-arg and declared 1-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems
*
- * @modules java.instrument
* @run shell ../MakeJAR3.sh InheritAgent0011
* @run main/othervm -javaagent:InheritAgent0011.jar DummyMain
*/
--- a/jdk/test/java/lang/instrument/PremainClass/InheritAgent0110.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/PremainClass/InheritAgent0110.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary test config (0,1,1,0): inherited 1-arg and declared 2-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems
*
- * @modules java.instrument
* @run shell ../MakeJAR3.sh InheritAgent0110
* @run main/othervm -javaagent:InheritAgent0110.jar DummyMain
*/
--- a/jdk/test/java/lang/instrument/PremainClass/InheritAgent0111.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/PremainClass/InheritAgent0111.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary test config (0,1,1,1): inherited 1-arg, declared 2-arg and declared 1-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems
*
- * @modules java.instrument
* @run shell ../MakeJAR3.sh InheritAgent0111
* @run main/othervm -javaagent:InheritAgent0111.jar DummyMain
*/
--- a/jdk/test/java/lang/instrument/PremainClass/InheritAgent1000.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/PremainClass/InheritAgent1000.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary test config (1,0,0,0): inherited 2-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems
*
- * @modules java.instrument
* @run shell ../MakeJAR3.sh InheritAgent1000
* @run main/othervm -javaagent:InheritAgent1000.jar DummyMain
*/
--- a/jdk/test/java/lang/instrument/PremainClass/InheritAgent1001.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/PremainClass/InheritAgent1001.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary test config (1,0,0,1): inherited 2-arg, and declared 1-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems
*
- * @modules java.instrument
* @run shell ../MakeJAR3.sh InheritAgent1001
* @run main/othervm -javaagent:InheritAgent1001.jar DummyMain
*/
--- a/jdk/test/java/lang/instrument/PremainClass/InheritAgent1010.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/PremainClass/InheritAgent1010.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary test config (1,0,1,0): inherited 2-arg, and declared 2-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems
*
- * @modules java.instrument
* @run shell ../MakeJAR3.sh InheritAgent1010
* @run main/othervm -javaagent:InheritAgent1010.jar DummyMain
*/
--- a/jdk/test/java/lang/instrument/PremainClass/InheritAgent1011.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/PremainClass/InheritAgent1011.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary test config (1,0,1,1): inherited 2-arg, declared 2-arg and declared 1-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems
*
- * @modules java.instrument
* @run shell ../MakeJAR3.sh InheritAgent1011
* @run main/othervm -javaagent:InheritAgent1011.jar DummyMain
*/
--- a/jdk/test/java/lang/instrument/PremainClass/InheritAgent1100.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/PremainClass/InheritAgent1100.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary test config (1,1,0,0): inherited 2-arg and inherited 1-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems
*
- * @modules java.instrument
* @run shell ../MakeJAR3.sh InheritAgent1100
* @run main/othervm -javaagent:InheritAgent1100.jar DummyMain
*/
--- a/jdk/test/java/lang/instrument/PremainClass/InheritAgent1101.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/PremainClass/InheritAgent1101.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary test config (1,1,0,1): inherited 2-arg, inherited 1-arg, and declared 1-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems
*
- * @modules java.instrument
* @run shell ../MakeJAR3.sh InheritAgent1101
* @run main/othervm -javaagent:InheritAgent1101.jar DummyMain
*/
--- a/jdk/test/java/lang/instrument/PremainClass/InheritAgent1110.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/PremainClass/InheritAgent1110.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary test config (1,1,1,0): inherited 2-arg, inherited 1-arg, and declared 2-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems
*
- * @modules java.instrument
* @run shell ../MakeJAR3.sh InheritAgent1110
* @run main/othervm -javaagent:InheritAgent1110.jar DummyMain
*/
--- a/jdk/test/java/lang/instrument/PremainClass/InheritAgent1111.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/PremainClass/InheritAgent1111.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary test config (1,1,1,1): inherited 2-arg, inherited 1-arg, declared 2-arg and declared 1-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems
*
- * @modules java.instrument
* @run shell ../MakeJAR3.sh InheritAgent1111
* @run main/othervm -javaagent:InheritAgent1111.jar DummyMain
*/
--- a/jdk/test/java/lang/instrument/RedefineBigClass.sh Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/RedefineBigClass.sh Thu Oct 29 12:39:08 2015 -0700
@@ -28,6 +28,7 @@
#
# @key intermittent
# @modules java.instrument
+# java.management
# @run shell MakeJAR3.sh RedefineBigClassAgent 'Can-Redefine-Classes: true'
# @run build BigClass RedefineBigClassApp NMTHelper
# @run shell/timeout=600 RedefineBigClass.sh
--- a/jdk/test/java/lang/instrument/RedefineClassWithNativeMethod.sh Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/RedefineClassWithNativeMethod.sh Thu Oct 29 12:39:08 2015 -0700
@@ -26,7 +26,6 @@
# @summary Redefine a class with a native method.
# @author Daniel D. Daugherty as modified from the test submitted by clovis@par.univie.ac.at
#
-# @modules java.instrument
# @run shell MakeJAR3.sh RedefineClassWithNativeMethodAgent 'Can-Redefine-Classes: true'
# @run build RedefineClassWithNativeMethodApp
# @run shell RedefineClassWithNativeMethod.sh
--- a/jdk/test/java/lang/instrument/RedefineClassesDisabledTest.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/RedefineClassesDisabledTest.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary test that redefineClasses and isRedefineClassesSupported behave correctly when redefine is not enabled
* @author Robert Field, Sun Microsystems -- as modified from the work of Gabriel Adauto, Wily Technology
*
- * @modules java.instrument
* @run build RedefineClassesDisabledTest
* @run shell RedefineSetUp.sh
* @run shell MakeJAR.sh basicAgent
--- a/jdk/test/java/lang/instrument/RedefineClassesTests.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/RedefineClassesTests.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary insure redefine is supported. exercise a class, then redefine it and do it again
* @author Gabriel Adauto, Wily Technology
*
- * @modules java.instrument
* @run build RedefineClassesTests
* @run shell RedefineSetUp.sh
* @run shell MakeJAR.sh redefineAgent
--- a/jdk/test/java/lang/instrument/RedefineMethodAddInvoke.sh Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/RedefineMethodAddInvoke.sh Thu Oct 29 12:39:08 2015 -0700
@@ -26,7 +26,6 @@
# @summary Reflexive invocation of newly added methods broken.
# @author Daniel D. Daugherty
#
-# @modules java.instrument
# @run shell MakeJAR3.sh RedefineMethodAddInvokeAgent 'Can-Redefine-Classes: true'
# @run build RedefineMethodAddInvokeApp
# @run shell RedefineMethodAddInvoke.sh
--- a/jdk/test/java/lang/instrument/RedefineMethodDelInvoke.sh Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/RedefineMethodDelInvoke.sh Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
# @author Daniel D. Daugherty
# @author Serguei Spitsyn
#
-# @modules java.instrument
# @run shell MakeJAR3.sh RedefineMethodDelInvokeAgent 'Can-Redefine-Classes: true'
# @run build RedefineMethodDelInvokeApp
# @run shell RedefineMethodDelInvoke.sh
--- a/jdk/test/java/lang/instrument/RedefineMethodInBacktrace.sh Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/RedefineMethodInBacktrace.sh Thu Oct 29 12:39:08 2015 -0700
@@ -27,6 +27,7 @@
# @author Stefan Karlsson
#
# @modules java.instrument
+# java.management
# @run shell MakeJAR3.sh RedefineMethodInBacktraceAgent 'Can-Redefine-Classes: true'
# @run build RedefineMethodInBacktraceTarget RedefineMethodInBacktraceApp
# @run shell RedefineMethodInBacktrace.sh
--- a/jdk/test/java/lang/instrument/RedefineMethodWithAnnotations.sh Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/RedefineMethodWithAnnotations.sh Thu Oct 29 12:39:08 2015 -0700
@@ -26,7 +26,6 @@
# @summary Method annotations are incorrectly set when redefining classes.
# @author Stefan Karlsson
#
-# @modules java.instrument
# @run shell MakeJAR3.sh RedefineMethodWithAnnotationsAgent 'Can-Redefine-Classes: true'
# @run build RedefineMethodWithAnnotationsTarget RedefineMethodWithAnnotationsApp RedefineMethodWithAnnotationsAnnotations
# @run shell RedefineMethodWithAnnotations.sh
--- a/jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh Thu Oct 29 12:39:08 2015 -0700
@@ -28,7 +28,6 @@
# verify that the right methods are called.
# @author Daniel D. Daugherty
#
-# @modules java.instrument
# @run shell MakeJAR3.sh RedefineSubclassWithTwoInterfacesAgent 'Can-Redefine-Classes: true'
# @run build RedefineSubclassWithTwoInterfacesApp
# @run shell RedefineSubclassWithTwoInterfaces.sh
--- a/jdk/test/java/lang/instrument/RemoveAbsentTransformerTest.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/RemoveAbsentTransformerTest.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary remove an transformer that was never added
* @author Gabriel Adauto, Wily Technology
*
- * @modules java.instrument
* @run build RemoveAbsentTransformerTest
* @run shell MakeJAR.sh redefineAgent
* @run main/othervm -javaagent:redefineAgent.jar RemoveAbsentTransformerTest RemoveAbsentTransformerTest
--- a/jdk/test/java/lang/instrument/RemoveTransformerTest.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/RemoveTransformerTest.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary simple remove of a transformer that was added
* @author Gabriel Adauto, Wily Technology
*
- * @modules java.instrument
* @run build RemoveTransformerTest
* @run shell MakeJAR.sh redefineAgent
* @run main/othervm -javaagent:redefineAgent.jar RemoveTransformerTest RemoveTransformerTest
--- a/jdk/test/java/lang/instrument/RetransformBigClass.sh Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/RetransformBigClass.sh Thu Oct 29 12:39:08 2015 -0700
@@ -28,6 +28,7 @@
#
# @key intermittent
# @modules java.instrument
+# java.management
# @run shell MakeJAR4.sh RetransformBigClassAgent SimpleIdentityTransformer 'Can-Retransform-Classes: true'
# @run build BigClass RetransformBigClassApp NMTHelper
# @run shell/timeout=600 RetransformBigClass.sh
--- a/jdk/test/java/lang/instrument/SingleTransformerTest.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/SingleTransformerTest.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary simple test with one transformer (makes sure it gets called)
* @author Gabriel Adauto, Wily Technology
*
- * @modules java.instrument
* @run build SingleTransformerTest
* @run shell MakeJAR.sh redefineAgent
* @run main/othervm -javaagent:redefineAgent.jar SingleTransformerTest SingleTransformerTest
--- a/jdk/test/java/lang/instrument/StressGetObjectSizeTest.sh Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/StressGetObjectSizeTest.sh Thu Oct 29 12:39:08 2015 -0700
@@ -26,7 +26,6 @@
# @summary stress getObjectSize() API
# @author Daniel D. Daugherty as modified from the code of fischman@google.com
#
-# @modules java.instrument
# @run build StressGetObjectSizeApp
# @run shell MakeJAR.sh basicAgent
# @run shell StressGetObjectSizeTest.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/instrument/TEST.properties Thu Oct 29 12:39:08 2015 -0700
@@ -0,0 +1,1 @@
+modules = java.instrument
--- a/jdk/test/java/lang/instrument/TransformMethodTest.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/TransformMethodTest.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary test transformer add/remove pairs in sequence
* @author Gabriel Adauto, Wily Technology
*
- * @modules java.instrument
* @run build TransformMethodTest
* @run shell MakeJAR.sh redefineAgent
* @run main/othervm -javaagent:redefineAgent.jar TransformMethodTest TransformMethodTest
--- a/jdk/test/java/lang/instrument/TransformerManagementThreadAddTests.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/TransformerManagementThreadAddTests.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary multi-thread test to exercise sync and contention for adds to transformer registry
* @author Gabriel Adauto, Wily Technology
*
- * @modules java.instrument
* @run build TransformerManagementThreadAddTests
* @run shell MakeJAR.sh redefineAgent
* @run main/othervm -javaagent:redefineAgent.jar TransformerManagementThreadAddTests TransformerManagementThreadAddTests
--- a/jdk/test/java/lang/instrument/TransformerManagementThreadRemoveTests.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/TransformerManagementThreadRemoveTests.java Thu Oct 29 12:39:08 2015 -0700
@@ -27,7 +27,6 @@
* @summary multi-thread test to exercise sync and contention for removes to transformer registry
* @author Gabriel Adauto, Wily Technology
*
- * @modules java.instrument
* @run build TransformerManagementThreadRemoveTests
* @run shell MakeJAR.sh redefineAgent
* @run main/othervm -javaagent:redefineAgent.jar TransformerManagementThreadRemoveTests TransformerManagementThreadRemoveTests
--- a/jdk/test/java/lang/instrument/VerifyLocalVariableTableOnRetransformTest.sh Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/VerifyLocalVariableTableOnRetransformTest.sh Thu Oct 29 12:39:08 2015 -0700
@@ -29,7 +29,6 @@
# transform() on a retransform operation.
# @author Daniel D. Daugherty
#
-# @modules java.instrument
# @run build VerifyLocalVariableTableOnRetransformTest
# @run compile -g DummyClassWithLVT.java
# @run shell MakeJAR.sh retransformAgent
--- a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.sh Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.sh Thu Oct 29 12:39:08 2015 -0700
@@ -26,7 +26,6 @@
# @summary Unit tests for appendToBootstrapClassLoaderSearch and
# appendToSystemClasLoaderSearch methods.
#
-# @modules java.instrument
# @run shell/timeout=240 CircularityErrorTest.sh
if [ "${TESTSRC}" = "" ]
--- a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.sh Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.sh Thu Oct 29 12:39:08 2015 -0700
@@ -26,7 +26,6 @@
# @summary Unit tests for appendToBootstrapClassLoaderSearch and
# appendToSystemClasLoaderSearch methods.
#
-# @modules java.instrument
# @build ClassUnloadTest
# @run shell ClassUnloadTest.sh
--- a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/run_tests.sh Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/instrument/appendToClassLoaderSearch/run_tests.sh Thu Oct 29 12:39:08 2015 -0700
@@ -29,7 +29,6 @@
# @summary Unit tests for appendToBootstrapClassLoaderSearch and
# appendToSystemClasLoaderSearch methods.
#
-# @modules java.instrument
# @build Agent AgentSupport BootSupport BasicTest PrematureLoadTest DynamicTest
# @run shell/timeout=240 run_tests.sh
--- a/jdk/test/java/lang/invoke/LFCaching/LFMultiThreadCachingTest.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/invoke/LFCaching/LFMultiThreadCachingTest.java Thu Oct 29 12:39:08 2015 -0700
@@ -28,6 +28,7 @@
* @summary Test verifies that lambda forms are cached when run with multiple threads
* @author kshefov
* @library /lib/testlibrary/jsr292 /lib/testlibrary
+ * @modules java.management
* @build TestMethods
* @build LambdaFormTestCase
* @build LFCachingTestCase
--- a/jdk/test/java/lang/invoke/lambda/LambdaAccessControlDoPrivilegedTest.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/invoke/lambda/LambdaAccessControlDoPrivilegedTest.java Thu Oct 29 12:39:08 2015 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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,6 +26,7 @@
* @bug 8003881
* @summary tests DoPrivileged action (implemented as lambda expressions) by
* inserting them into the BootClassPath.
+ * @modules jdk.compiler
* @compile -XDignore.symbol.file LambdaAccessControlDoPrivilegedTest.java LUtils.java
* @run main/othervm LambdaAccessControlDoPrivilegedTest
*/
--- a/jdk/test/java/lang/invoke/lambda/LambdaAccessControlTest.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/invoke/lambda/LambdaAccessControlTest.java Thu Oct 29 12:39:08 2015 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -25,6 +25,7 @@
* @test
* @bug 8003881
* @summary tests Lambda expression with a a security manager at top level
+ * @modules jdk.compiler
* @compile -XDignore.symbol.file LambdaAccessControlTest.java LUtils.java
*
* @run main/othervm LambdaAccessControlTest
--- a/jdk/test/java/lang/invoke/lambda/LambdaAsm.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/invoke/lambda/LambdaAsm.java Thu Oct 29 12:39:08 2015 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
--- a/jdk/test/java/lang/invoke/lambda/LambdaStackTrace.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/lang/invoke/lambda/LambdaStackTrace.java Thu Oct 29 12:39:08 2015 -0700
@@ -26,6 +26,7 @@
* @bug 8025636
* @summary Synthetic frames should be hidden in exceptions
* @modules java.base/jdk.internal.org.objectweb.asm
+ * jdk.compiler
* @compile -XDignore.symbol.file LUtils.java LambdaStackTrace.java
* @run main LambdaStackTrace
*/
--- a/jdk/test/java/util/Currency/PropertiesTest.sh Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/java/util/Currency/PropertiesTest.sh Thu Oct 29 12:39:08 2015 -0700
@@ -101,11 +101,7 @@
# without disturbing other users, including concurrently executing tests.
WRITABLEJDK=.${FS}testjava
cp -H -R $TESTJAVA $WRITABLEJDK || exit 1
-if [ -d ${TESTJAVA}${FS}jre ]; then
- PROPLOCATION=${WRITABLEJDK}${FS}jre${FS}lib
-else
- PROPLOCATION=${WRITABLEJDK}${FS}lib
-fi
+PROPLOCATION=${WRITABLEJDK}${FS}lib
chmod -R +w $WRITABLEJDK || exit 1
cp ${PROPS} $PROPLOCATION || exit 1
echo "Properties location: ${PROPLOCATION}"
--- a/jdk/test/jdk/lambda/TEST.properties Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/jdk/lambda/TEST.properties Thu Oct 29 12:39:08 2015 -0700
@@ -3,3 +3,4 @@
TestNG.dirs = .
javatest.maxOutputSize = 250000
+modules = jdk.compiler
--- a/jdk/test/sun/misc/JarIndex/metaInfFilenames/Basic.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/sun/misc/JarIndex/metaInfFilenames/Basic.java Thu Oct 29 12:39:08 2015 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 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,6 +26,8 @@
* @bug 6887710
* @summary Verify the impact of sun.misc.JarIndex.metaInfFilenames on ServiceLoader
* @modules jdk.jartool/sun.tools.jar
+ * jdk.httpserver
+ * jdk.compiler
* @run main/othervm Basic
*/
--- a/jdk/test/sun/reflect/AnonymousNewInstance/ManyNewInstanceAnonTest.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/sun/reflect/AnonymousNewInstance/ManyNewInstanceAnonTest.java Thu Oct 29 12:39:08 2015 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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,7 +26,7 @@
* @bug 7194897
* @summary JSR 292: Cannot create more than 16 instances of an anonymous class
* @modules java.base/sun.misc
- * @modules java.management
+ * java.management
* @library /lib/testlibrary
* @author Robert Field
* @compile -XDignore.symbol.file ManyNewInstanceAnonTest.java
--- a/jdk/test/vm/verifier/defaultMethods/DefaultMethodRegressionTestsRun.java Wed Jul 05 20:57:41 2017 +0200
+++ b/jdk/test/vm/verifier/defaultMethods/DefaultMethodRegressionTestsRun.java Thu Oct 29 12:39:08 2015 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -25,6 +25,7 @@
* @test
* @bug 8003639
* @summary defaultMethod resolution and verification using an URLClassLoader
+ * @modules jdk.compiler
* @compile -XDignore.symbol.file=true DefaultMethodRegressionTestsRun.java
* @run main DefaultMethodRegressionTestsRun
*/