Skip to content

Commit 4817f44

Browse files
OracleLabsAutomationOracleLabsAutomation
committed
Merge tag 'jdk-25+6' into labsjdk/adopt-jdk-25+6-master
Added tag jdk-25+6 for changeset 9c430c9
2 parents 3a5f5f6 + 9c430c9 commit 4817f44

File tree

1,171 files changed

+14770
-12056
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,171 files changed

+14770
-12056
lines changed

Diff for: ‎.github/workflows/main.yml

-11
Original file line numberDiff line numberDiff line change
@@ -325,17 +325,6 @@ jobs:
325325
bootjdk-platform: linux-x64
326326
runs-on: ubuntu-22.04
327327

328-
test-macos-x64:
329-
name: macos-x64
330-
needs:
331-
- build-macos-x64
332-
uses: ./.github/workflows/test.yml
333-
with:
334-
platform: macos-x64
335-
bootjdk-platform: macos-x64
336-
runs-on: macos-13
337-
xcode-toolset-version: '14.3.1'
338-
339328
test-macos-aarch64:
340329
name: macos-aarch64
341330
needs:

Diff for: ‎make/Coverage.gmk

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,6 @@ $(JCOV_IMAGE_DIR)/release: $(JCOV_INPUT_IMAGE_DIR)/release
4747
-t $(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR)/template.xml \
4848
-rt $(JCOV_HOME)/lib/jcov_network_saver.jar \
4949
-exclude 'java.lang.Object' \
50-
-exclude 'jdk.internal.org.objectweb.**' \
5150
-exclude jdk.test.Main -exclude '**\$Proxy*' \
5251
$(JCOV_FILTERS) \
5352
$(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR)

Diff for: ‎make/StaticLibs.gmk

+4-5
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,8 @@ else ifeq ($(call isTargetOs, windows), true)
6767
BROKEN_STATIC_LIBS += splashscreen
6868
# libsspi_bridge has name conflicts with sunmscapi
6969
BROKEN_STATIC_LIBS += sspi_bridge
70-
# These libs define DllMain which conflict with Hotspot
71-
BROKEN_STATIC_LIBS += awt dt_shmem dt_socket
72-
# These libs are dependent on any of the above disabled libs
73-
BROKEN_STATIC_LIBS += fontmanager jawt lcms net nio
70+
# dt_shmem define jdwpTransport_OnLoad which conflict with dt_socket
71+
BROKEN_STATIC_LIBS += dt_shmem
7472
endif
7573

7674
$(foreach module, $(STATIC_LIB_MODULES), \
@@ -107,7 +105,8 @@ else
107105
endif
108106

109107
$(eval $(call SetupBuildLauncher, java, \
110-
CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES, \
108+
ENABLE_ARG_FILES := true, \
109+
EXPAND_CLASSPATH_WILDCARDS := true, \
111110
EXTRA_RCFLAGS := $(JAVA_RCFLAGS), \
112111
VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \
113112
OPTIMIZATION := HIGH, \

Diff for: ‎make/autoconf/flags-cflags.m4

+18-2
Original file line numberDiff line numberDiff line change
@@ -564,8 +564,8 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
564564
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
565565
# The -utf-8 option sets source and execution character sets to UTF-8 to enable correct
566566
# compilation of all source files regardless of the active code page on Windows.
567-
TOOLCHAIN_CFLAGS_JVM="-nologo -MD -Zc:preprocessor -Zc:inline -permissive- -utf-8 -MP"
568-
TOOLCHAIN_CFLAGS_JDK="-nologo -MD -Zc:preprocessor -Zc:inline -permissive- -utf-8 -Zc:wchar_t-"
567+
TOOLCHAIN_CFLAGS_JVM="-nologo -MD -Zc:preprocessor -Zc:inline -Zc:throwingNew -permissive- -utf-8 -MP"
568+
TOOLCHAIN_CFLAGS_JDK="-nologo -MD -Zc:preprocessor -Zc:inline -Zc:throwingNew -permissive- -utf-8 -Zc:wchar_t-"
569569
fi
570570
571571
# CFLAGS C language level for JDK sources (hotspot only uses C++)
@@ -830,6 +830,22 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
830830
831831
FLAGS_SETUP_BRANCH_PROTECTION
832832
833+
if test "x$FLAGS_CPU" = xriscv64; then
834+
AC_MSG_CHECKING([if RVV/vector sigcontext supported])
835+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <linux/ptrace.h>],
836+
[
837+
return (int)sizeof(struct __riscv_v_ext_state);
838+
])],
839+
[
840+
AC_MSG_RESULT([yes])
841+
],
842+
[
843+
$1_DEFINES_CPU_JVM="${$1_DEFINES_CPU_JVM} -DNO_RVV_SIGCONTEXT"
844+
AC_MSG_RESULT([no])
845+
]
846+
)
847+
fi
848+
833849
# EXPORT to API
834850
CFLAGS_JVM_COMMON="$ALWAYS_CFLAGS_JVM $ALWAYS_DEFINES_JVM \
835851
$TOOLCHAIN_CFLAGS_JVM ${$1_TOOLCHAIN_CFLAGS_JVM} \

Diff for: ‎make/autoconf/flags-ldflags.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,8 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_CPU_DEP],
197197
$2LDFLAGS_JDKEXE="$LDFLAGS_JDK_COMMON $EXECUTABLE_LDFLAGS \
198198
${$1_CPU_EXECUTABLE_LDFLAGS} $REPRODUCIBLE_LDFLAGS $FILE_MACRO_LDFLAGS"
199199
200-
$2LDFLAGS_STATIC_JDK="$BASIC_LDFLAGS $BASIC_LDFLAGS_JVM_ONLY \
201-
$OS_LDFLAGS ${$2EXTRA_LDFLAGS} $REPRODUCIBLE_LDFLAGS $FILE_MACRO_LDFLAGS"
200+
$2LDFLAGS_STATIC_JDK="$BASIC_LDFLAGS $OS_LDFLAGS ${$2EXTRA_LDFLAGS} \
201+
$REPRODUCIBLE_LDFLAGS $FILE_MACRO_LDFLAGS"
202202
203203
$2JVM_LDFLAGS="$BASIC_LDFLAGS $BASIC_LDFLAGS_JVM_ONLY $OS_LDFLAGS $OS_LDFLAGS_JVM_ONLY \
204204
$DEBUGLEVEL_LDFLAGS $DEBUGLEVEL_LDFLAGS_JVM_ONLY \

Diff for: ‎make/autoconf/lib-hsdis.m4

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,9 @@ AC_DEFUN([LIB_SETUP_HSDIS_CAPSTONE],
4040
HSDIS_CFLAGS="-I${CAPSTONE}/include/capstone"
4141
if test "x$OPENJDK_TARGET_OS" != xwindows; then
4242
HSDIS_LDFLAGS="-L${CAPSTONE}/lib"
43+
if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" ; then
44+
HSDIS_LDFLAGS="-L${CAPSTONE}/lib64 $HSDIS_LDFLAGS"
45+
fi
4346
HSDIS_LIBS="-lcapstone"
4447
else
4548
HSDIS_LDFLAGS="-nodefaultlib:libcmt.lib"

Diff for: ‎make/common/JdkNativeCompilation.gmk

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -266,6 +266,9 @@ JDK_RCFLAGS=$(RCFLAGS) \
266266
# will be replaced with proper values for hotspot.
267267
# HEADERS_FROM_SRC -- if false, does not add source dirs automatically as
268268
# header include dirs. (Defaults to true.)
269+
# JAVA_HEADERS -- if false, does not add the directory with the generated
270+
# headers from the Java compilation of the current module to the search
271+
# path for include files. (Defaults to true.)
269272
# JDK_LIBS -- libraries generated by the JDK build system to link against.
270273
# These take the form <module>:<basename>. For the current module, the
271274
# module name and colon can be omitted. The basename should be specified
@@ -385,7 +388,9 @@ define SetupJdkNativeCompilationBody
385388

386389
# Add the module specific java header dir
387390
ifneq ($$(MODULE), )
388-
$1_SRC_HEADER_FLAGS += $$(addprefix -I, $$(call GetJavaHeaderDir, $$(MODULE)))
391+
ifneq ($$($1_JAVA_HEADERS), false)
392+
$1_SRC_HEADER_FLAGS += $$(addprefix -I, $$(call GetJavaHeaderDir, $$(MODULE)))
393+
endif
389394
endif
390395

391396
$1_JDK_LIBS += $$($1_JDK_LIBS_$$(OPENJDK_TARGET_OS))

Diff for: ‎make/common/modules/LauncherCommon.gmk

+20-23
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -48,41 +48,44 @@ JAVA_MANIFEST := $(TOPDIR)/src/java.base/windows/native/launcher/java.manifest
4848
# used as the name of the executable.
4949
#
5050
# Remaining parameters are named arguments. These include:
51-
# MAIN_MODULE The module of the main class to launch if different from the
52-
# current module
5351
# MAIN_CLASS The Java main class to launch
54-
# JAVA_ARGS Processed into a -DJAVA_ARGS and added to CFLAGS
55-
# EXTRA_JAVA_ARGS Processed into a -DEXTRA_JAVA_ARGS and is prepended
56-
# before JAVA_ARGS to CFLAGS, primarily to allow long string literal
57-
# compile time defines exceeding Visual Studio 2013 limitations.
58-
# CFLAGS Additional CFLAGS
59-
# CFLAGS_windows Additional CFLAGS_windows
52+
# JAVA_ARGS Additional arguments to pass to Java when launching the main class
53+
# EXPAND_CLASSPATH_WILDCARDS Set to true to pass EXPAND_CLASSPATH_WILDCARDS
54+
# ENABLE_ARG_FILES Set to true to pass ENABLE_ARG_FILES
55+
# WINDOWS_JAVAW Set to true to pass JAVAW on Windows
6056
# EXTRA_RCFLAGS Additional EXTRA_RCFLAGS
6157
# MACOSX_PRIVILEGED On macosx, allow to access other processes
6258
# OPTIMIZATION Override default optimization level (LOW)
6359
# OUTPUT_DIR Override default output directory
6460
# VERSION_INFO_RESOURCE Override default Windows resource file
6561
# STATIC_LAUNCHER If true, will use settings for building a static launcher
62+
# LIBS Additional libraries to pass as LIBS argument to SetupJdkExecutable
6663
SetupBuildLauncher = $(NamedParamsMacroTemplate)
6764
define SetupBuildLauncherBody
6865
# Setup default values (unless overridden)
6966
ifeq ($$($1_OPTIMIZATION), )
7067
$1_OPTIMIZATION := LOW
7168
endif
7269

73-
ifeq ($$($1_MAIN_MODULE), )
74-
$1_MAIN_MODULE := $(MODULE)
75-
endif
70+
$1_MAIN_MODULE := $(MODULE)
7671

7772
ifneq ($$($1_MAIN_CLASS), )
7873
$1_JAVA_ARGS += -Xms8m
7974
$1_LAUNCHER_CLASS := -m $$($1_MAIN_MODULE)/$$($1_MAIN_CLASS)
8075
endif
8176

82-
ifneq ($$($1_EXTRA_JAVA_ARGS), )
83-
$1_EXTRA_JAVA_ARGS_STR := '{ $$(strip $$(foreach a, \
84-
$$(addprefix -J, $$($1_EXTRA_JAVA_ARGS)), "$$a"$(COMMA) )) }'
85-
$1_CFLAGS += -DEXTRA_JAVA_ARGS=$$($1_EXTRA_JAVA_ARGS_STR)
77+
ifeq ($$($1_EXPAND_CLASSPATH_WILDCARDS), true)
78+
$1_CFLAGS += -DEXPAND_CLASSPATH_WILDCARDS
79+
endif
80+
81+
ifeq ($$($1_ENABLE_ARG_FILES), true)
82+
$1_CFLAGS += -DENABLE_ARG_FILES
83+
endif
84+
85+
ifeq ($(call isTargetOs, windows), true)
86+
ifeq ($$($1_WINDOWS_JAVAW), true)
87+
$1_CFLAGS += -DJAVAW
88+
endif
8689
endif
8790

8891
ifneq ($$($1_JAVA_ARGS), )
@@ -143,8 +146,8 @@ define SetupBuildLauncherBody
143146
-DLAUNCHER_NAME='"$$(LAUNCHER_NAME)"' \
144147
-DPROGNAME='"$1"' \
145148
$$($1_CFLAGS), \
146-
CFLAGS_windows := $$($1_CFLAGS_windows), \
147149
EXTRA_HEADER_DIRS := java.base:libjvm, \
150+
JAVA_HEADERS := false, \
148151
DISABLED_WARNINGS_gcc := unused-function unused-variable, \
149152
DISABLED_WARNINGS_clang := unused-function, \
150153
LDFLAGS := $$($1_LDFLAGS), \
@@ -154,12 +157,6 @@ define SetupBuildLauncherBody
154157
JDK_LIBS := $$($1_JDK_LIBS), \
155158
JDK_LIBS_windows := $$($1_JDK_LIBS_windows), \
156159
LIBS := $$($1_LIBS), \
157-
LIBS_unix := $(LIBZ_LIBS), \
158-
LIBS_linux := $(LIBDL) -lpthread, \
159-
LIBS_macosx := \
160-
-framework ApplicationServices \
161-
-framework Cocoa \
162-
-framework Security, \
163160
LINK_TYPE := $$($1_LINK_TYPE), \
164161
OUTPUT_DIR := $$($1_OUTPUT_DIR), \
165162
OBJECT_DIR := $$($1_OBJECT_DIR), \

Diff for: ‎make/conf/module-loader-map.conf

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -103,6 +103,7 @@ NATIVE_ACCESS_MODULES= \
103103
java.smartcardio \
104104
jdk.accessibility \
105105
jdk.attach \
106+
jdk.compiler \
106107
jdk.crypto.cryptoki \
107108
jdk.crypto.mscapi \
108109
jdk.hotspot.agent \

Diff for: ‎make/modules/java.base/Launcher.gmk

+5-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ JAVA_RCFLAGS ?= -I$(TOPDIR)/src/java.base/windows/native/launcher/icons
3838
################################################################################
3939

4040
$(eval $(call SetupBuildLauncher, java, \
41-
CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES, \
41+
ENABLE_ARG_FILES := true, \
42+
EXPAND_CLASSPATH_WILDCARDS := true, \
4243
EXTRA_RCFLAGS := $(JAVA_RCFLAGS), \
4344
VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \
4445
OPTIMIZATION := HIGH, \
@@ -50,7 +51,9 @@ $(eval $(call SetupBuildLauncher, java, \
5051

5152
ifeq ($(call isTargetOs, windows), true)
5253
$(eval $(call SetupBuildLauncher, javaw, \
53-
CFLAGS := -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES, \
54+
ENABLE_ARG_FILES := true, \
55+
EXPAND_CLASSPATH_WILDCARDS := true, \
56+
WINDOWS_JAVAW := true, \
5457
EXTRA_RCFLAGS := $(JAVA_RCFLAGS), \
5558
VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \
5659
))

Diff for: ‎make/modules/jdk.compiler/Launcher.gmk

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ include LauncherCommon.gmk
3232
$(eval $(call SetupBuildLauncher, javac, \
3333
MAIN_CLASS := com.sun.tools.javac.Main, \
3434
JAVA_ARGS := --add-modules ALL-DEFAULT, \
35-
CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
35+
EXPAND_CLASSPATH_WILDCARDS := true, \
3636
))
3737

3838
################################################################################
@@ -41,5 +41,5 @@ $(eval $(call SetupBuildLauncher, javac, \
4141

4242
$(eval $(call SetupBuildLauncher, serialver, \
4343
MAIN_CLASS := sun.tools.serialver.SerialVer, \
44-
CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
44+
EXPAND_CLASSPATH_WILDCARDS := true, \
4545
))

Diff for: ‎make/modules/jdk.javadoc/Launcher.gmk

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ include LauncherCommon.gmk
3232
$(eval $(call SetupBuildLauncher, javadoc, \
3333
MAIN_CLASS := jdk.javadoc.internal.tool.Main, \
3434
JAVA_ARGS := --add-modules ALL-DEFAULT, \
35-
CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
35+
EXPAND_CLASSPATH_WILDCARDS := true, \
3636
))

Diff for: ‎make/modules/jdk.jconsole/Launcher.gmk

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,5 @@ $(eval $(call SetupBuildLauncher, jconsole, \
3636
--add-modules ALL-DEFAULT \
3737
-Djconsole.showOutputViewer \
3838
-Djdk.attach.allowAttachSelf=true, \
39-
CFLAGS_windows := -DJAVAW, \
39+
WINDOWS_JAVAW := true, \
4040
))

Diff for: ‎make/modules/jdk.jdeps/Launcher.gmk

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ include LauncherCommon.gmk
3131

3232
$(eval $(call SetupBuildLauncher, javap, \
3333
MAIN_CLASS := com.sun.tools.javap.Main, \
34-
CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
34+
EXPAND_CLASSPATH_WILDCARDS := true, \
3535
))
3636

3737
################################################################################
@@ -40,7 +40,7 @@ $(eval $(call SetupBuildLauncher, javap, \
4040

4141
$(eval $(call SetupBuildLauncher, jdeps, \
4242
MAIN_CLASS := com.sun.tools.jdeps.Main, \
43-
CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
43+
EXPAND_CLASSPATH_WILDCARDS := true, \
4444
))
4545

4646
################################################################################
@@ -49,7 +49,7 @@ $(eval $(call SetupBuildLauncher, jdeps, \
4949

5050
$(eval $(call SetupBuildLauncher, jdeprscan, \
5151
MAIN_CLASS := com.sun.tools.jdeprscan.Main, \
52-
CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
52+
EXPAND_CLASSPATH_WILDCARDS := true, \
5353
))
5454

5555
################################################################################
@@ -58,5 +58,5 @@ $(eval $(call SetupBuildLauncher, jdeprscan, \
5858

5959
$(eval $(call SetupBuildLauncher, jnativescan, \
6060
MAIN_CLASS := com.sun.tools.jnativescan.Main, \
61-
CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
61+
EXPAND_CLASSPATH_WILDCARDS := true, \
6262
))

Diff for: ‎make/modules/jdk.jfr/Launcher.gmk

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ include LauncherCommon.gmk
3131

3232
$(eval $(call SetupBuildLauncher, jfr, \
3333
MAIN_CLASS := jdk.jfr.internal.tool.Main, \
34-
CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
34+
EXPAND_CLASSPATH_WILDCARDS := true, \
3535
))

Diff for: ‎make/modules/jdk.jlink/Launcher.gmk

+5-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ include LauncherCommon.gmk
3131

3232
$(eval $(call SetupBuildLauncher, jimage, \
3333
MAIN_CLASS := jdk.tools.jimage.Main, \
34-
CFLAGS := -DENABLE_ARG_FILES, \
34+
ENABLE_ARG_FILES := true, \
3535
))
3636

3737
################################################################################
@@ -41,7 +41,8 @@ $(eval $(call SetupBuildLauncher, jimage, \
4141
$(eval $(call SetupBuildLauncher, jlink, \
4242
MAIN_CLASS := jdk.tools.jlink.internal.Main, \
4343
JAVA_ARGS := --add-modules ALL-DEFAULT, \
44-
CFLAGS := -DENABLE_ARG_FILES -DEXPAND_CLASSPATH_WILDCARDS, \
44+
ENABLE_ARG_FILES := true, \
45+
EXPAND_CLASSPATH_WILDCARDS := true, \
4546
))
4647

4748
################################################################################
@@ -50,5 +51,6 @@ $(eval $(call SetupBuildLauncher, jlink, \
5051

5152
$(eval $(call SetupBuildLauncher, jmod, \
5253
MAIN_CLASS := jdk.tools.jmod.Main, \
53-
CFLAGS := -DENABLE_ARG_FILES -DEXPAND_CLASSPATH_WILDCARDS, \
54+
ENABLE_ARG_FILES := true, \
55+
EXPAND_CLASSPATH_WILDCARDS := true, \
5456
))

Diff for: ‎make/modules/jdk.jshell/Launcher.gmk

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ include LauncherCommon.gmk
3131

3232
$(eval $(call SetupBuildLauncher, jshell, \
3333
MAIN_CLASS := jdk.internal.jshell.tool.JShellToolProvider, \
34-
CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
34+
EXPAND_CLASSPATH_WILDCARDS := true, \
3535
))

Diff for: ‎src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -779,13 +779,11 @@ void LIRGenerator::do_MathIntrinsic(Intrinsic* x) {
779779
}
780780
case vmIntrinsics::_floatToFloat16: {
781781
LIR_Opr tmp = new_register(T_FLOAT);
782-
__ move(LIR_OprFact::floatConst(-0.0), tmp);
783782
__ f2hf(src, dst, tmp);
784783
break;
785784
}
786785
case vmIntrinsics::_float16ToFloat: {
787786
LIR_Opr tmp = new_register(T_FLOAT);
788-
__ move(LIR_OprFact::floatConst(-0.0), tmp);
789787
__ hf2f(src, dst, tmp);
790788
break;
791789
}

0 commit comments

Comments
 (0)