Skip to content

Commit 468c1c1

Browse files
JesperIRLJesperIRL
committed
Merge
2 parents 0ee5e92 + 9bfdee7 commit 468c1c1

451 files changed

Lines changed: 11187 additions & 5823 deletions

File tree

Some content is hidden

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

‎make/autoconf/flags-cflags.m4‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
453453
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
454454
ALWAYS_DEFINES_JDK="-DWIN32_LEAN_AND_MEAN -D_CRT_SECURE_NO_DEPRECATE \
455455
-D_CRT_NONSTDC_NO_DEPRECATE -DWIN32 -DIAL"
456+
ALWAYS_DEFINES_JVM="-DNOMINMAX"
456457
fi
457458
458459
###############################################################################

‎make/autoconf/libraries.m4‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -114,17 +114,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
114114
fi
115115
116116
# Math library
117-
if test "x$OPENJDK_TARGET_OS" != xsolaris; then
118-
BASIC_JVM_LIBS="$LIBM"
119-
else
120-
# FIXME: This hard-coded path is not really proper.
121-
if test "x$OPENJDK_TARGET_CPU" = xx86_64; then
122-
BASIC_SOLARIS_LIBM_LIBS="/usr/lib/amd64/libm.so.1"
123-
elif test "x$OPENJDK_TARGET_CPU" = xsparcv9; then
124-
BASIC_SOLARIS_LIBM_LIBS="/usr/lib/sparcv9/libm.so.1"
125-
fi
126-
BASIC_JVM_LIBS="$BASIC_SOLARIS_LIBM_LIBS"
127-
fi
117+
BASIC_JVM_LIBS="$LIBM"
128118
129119
# Dynamic loading library
130120
if test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xaix; then

‎make/autoconf/platform.m4‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU],
6060
VAR_CPU_BITS=64
6161
VAR_CPU_ENDIAN=little
6262
;;
63+
ia64)
64+
VAR_CPU=ia64
65+
VAR_CPU_ARCH=ia64
66+
VAR_CPU_BITS=64
67+
VAR_CPU_ENDIAN=little
68+
;;
6369
m68k)
6470
VAR_CPU=m68k
6571
VAR_CPU_ARCH=m68k

‎make/hotspot/lib/CompileJvm.gmk‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,11 @@ ifeq ($(OPENJDK_TARGET_OS), solaris)
113113
else ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
114114
JVM_CFLAGS += $(TOPDIR)/src/hotspot/os_cpu/solaris_sparc/solaris_sparc.il
115115
endif
116+
# Exclude warnings in devstudio 12.6
117+
ifeq ($(CC_VERSION_NUMBER), 5.15)
118+
DISABLED_WARNINGS_solstudio := SEC_ARR_OUTSIDE_BOUND_READ \
119+
SEC_ARR_OUTSIDE_BOUND_WRITE
120+
endif
116121
endif
117122

118123
ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-sparcv9)
@@ -154,6 +159,7 @@ $(eval $(call SetupNativeCompilation, BUILD_LIBJVM, \
154159
vm_version.cpp_CXXFLAGS := $(CFLAGS_VM_VERSION), \
155160
arguments.cpp_CXXFLAGS := $(CFLAGS_VM_VERSION), \
156161
DISABLED_WARNINGS_clang := tautological-compare, \
162+
DISABLED_WARNINGS_solstudio := $(DISABLED_WARNINGS_solstudio), \
157163
DISABLED_WARNINGS_xlc := 1540-0216 1540-0198 1540-1090 1540-1639 \
158164
1540-1088 1500-010, \
159165
ASFLAGS := $(JVM_ASFLAGS), \

‎make/lib/Awt2dLibraries.gmk‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -403,11 +403,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBLCMS, \
403403
LDFLAGS := $(LDFLAGS_JDKLIB) \
404404
$(call SET_SHARED_LIBRARY_ORIGIN), \
405405
LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
406-
LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \
407-
LIBS_unix := -lawt -ljvm -ljava $(LCMS_LIBS), \
408-
LIBS_linux := $(LIBM), \
409-
LIBS_macosx := $(LIBM), \
410-
LIBS_aix := $(LIBM),\
406+
LIBS_unix := -lawt -ljvm -ljava $(LCMS_LIBS) $(LIBM), \
411407
LIBS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
412408
))
413409

‎make/test/JtregNativeHotspot.gmk‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,11 @@ else
6565
exeinvoke.c exestack-gap.c
6666
endif
6767

68+
BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exesigtest := -ljvm
69+
6870
ifeq ($(OPENJDK_TARGET_OS), windows)
6971
BUILD_HOTSPOT_JTREG_EXECUTABLES_CFLAGS_exeFPRegs := -MT
72+
BUILD_HOTSPOT_JTREG_EXCLUDE += exesigtest.c
7073
endif
7174

7275
$(eval $(call SetupTestFilesCompilation, BUILD_HOTSPOT_JTREG_LIBRARIES, \

‎src/bsd/doc/man/java.1‎

Lines changed: 1 addition & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'\" t
2-
.\" Copyright (c) 1994, 2015, Oracle and/or its affiliates. All rights reserved.
2+
.\" Copyright (c) 1994, 2018, 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
@@ -1178,65 +1178,6 @@ Verify all classes\&.
11781178
.PP
11791179
These options control the runtime behavior of the Java HotSpot VM\&.
11801180
.PP
1181-
\-XX:+CheckEndorsedAndExtDirs
1182-
.RS 4
1183-
Enables the option to prevent the
1184-
\fBjava\fR
1185-
command from running a Java application if it uses the endorsed\-standards override mechanism or the extension mechanism\&. This option checks if an application is using one of these mechanisms by checking the following:
1186-
.sp
1187-
.RS 4
1188-
.ie n \{\
1189-
\h'-04'\(bu\h'+03'\c
1190-
.\}
1191-
.el \{\
1192-
.sp -1
1193-
.IP \(bu 2.3
1194-
.\}
1195-
The
1196-
\fBjava\&.ext\&.dirs\fR
1197-
or
1198-
\fBjava\&.endorsed\&.dirs\fR
1199-
system property is set\&.
1200-
.RE
1201-
.sp
1202-
.RS 4
1203-
.ie n \{\
1204-
\h'-04'\(bu\h'+03'\c
1205-
.\}
1206-
.el \{\
1207-
.sp -1
1208-
.IP \(bu 2.3
1209-
.\}
1210-
The
1211-
\fBlib/endorsed\fR
1212-
directory exists and is not empty\&.
1213-
.RE
1214-
.sp
1215-
.RS 4
1216-
.ie n \{\
1217-
\h'-04'\(bu\h'+03'\c
1218-
.\}
1219-
.el \{\
1220-
.sp -1
1221-
.IP \(bu 2.3
1222-
.\}
1223-
The
1224-
\fBlib/ext\fR
1225-
directory contains any JAR files other than those of the JDK\&.
1226-
.RE
1227-
.sp
1228-
.RS 4
1229-
.ie n \{\
1230-
\h'-04'\(bu\h'+03'\c
1231-
.\}
1232-
.el \{\
1233-
.sp -1
1234-
.IP \(bu 2.3
1235-
.\}
1236-
The system\-wide platform\-specific extension directory contains any JAR files\&.
1237-
.RE
1238-
.RE
1239-
.PP
12401181
\-XX:+DisableAttachMechanism
12411182
.RS 4
12421183
Enables the option that disables the mechanism that lets tools attach to the JVM\&. By default, this option is disabled, meaning that the attach mechanism is enabled and you can use tools such as

‎src/hotspot/cpu/aarch64/aarch64.ad‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -995,8 +995,10 @@ definitions %{
995995

996996
source_hpp %{
997997

998+
#include "asm/macroAssembler.hpp"
998999
#include "gc/shared/cardTable.hpp"
9991000
#include "gc/shared/cardTableBarrierSet.hpp"
1001+
#include "gc/shared/collectedHeap.hpp"
10001002
#include "opto/addnode.hpp"
10011003

10021004
class CallStubImpl {

‎src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@
3535
#include "compiler/disassembler.hpp"
3636
#include "memory/resourceArea.hpp"
3737
#include "nativeInst_aarch64.hpp"
38+
#include "oops/compressedOops.inline.hpp"
3839
#include "oops/klass.inline.hpp"
39-
#include "oops/oop.inline.hpp"
40+
#include "oops/oop.hpp"
4041
#include "opto/compile.hpp"
4142
#include "opto/intrinsicnode.hpp"
4243
#include "opto/node.hpp"
@@ -46,7 +47,6 @@
4647
#include "runtime/jniHandles.inline.hpp"
4748
#include "runtime/sharedRuntime.hpp"
4849
#include "runtime/thread.hpp"
49-
5050
#if INCLUDE_ALL_GCS
5151
#include "gc/g1/g1BarrierSet.hpp"
5252
#include "gc/g1/g1CardTable.hpp"
@@ -173,7 +173,7 @@ int MacroAssembler::patch_oop(address insn_addr, address o) {
173173
// instruction.
174174
if (Instruction_aarch64::extract(insn, 31, 21) == 0b11010010101) {
175175
// Move narrow OOP
176-
narrowOop n = oopDesc::encode_heap_oop((oop)o);
176+
narrowOop n = CompressedOops::encode((oop)o);
177177
Instruction_aarch64::patch(insn_addr, 20, 5, n >> 16);
178178
Instruction_aarch64::patch(insn_addr+4, 20, 5, n & 0xffff);
179179
instructions = 2;
@@ -3712,7 +3712,7 @@ void MacroAssembler::store_klass_gap(Register dst, Register src) {
37123712
}
37133713
}
37143714

3715-
// Algorithm must match oop.inline.hpp encode_heap_oop.
3715+
// Algorithm must match CompressedOops::encode.
37163716
void MacroAssembler::encode_heap_oop(Register d, Register s) {
37173717
#ifdef ASSERT
37183718
verify_heapbase("MacroAssembler::encode_heap_oop: heap base corrupted?");

‎src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#define CPU_AARCH64_VM_NATIVEINST_AARCH64_HPP
2828

2929
#include "asm/assembler.hpp"
30-
#include "memory/allocation.hpp"
3130
#include "runtime/icache.hpp"
3231
#include "runtime/os.hpp"
3332

0 commit comments

Comments
 (0)