Skip to content

Commit 631085b

Browse files
prraceprrace
committed
Merge
2 parents 1ce6ec6 + cd98f7d commit 631085b

3,321 files changed

Lines changed: 12939 additions & 11312 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.

‎.hgtags‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -645,6 +645,8 @@ bcbe7b8a77b8971bc221c0be1bd2abb6fb68c2d0 jdk-16+2
645645
b58fc60580550a4a587cab729d8fd87223ad6932 jdk-15+29
646646
76810b3a88c8c641ae3850a8dfd7c40c984aea9d jdk-16+3
647647
6909e4a1f25bfe9a2727026f5845fc1fc44a36aa jdk-15+30
648-
78c07dd7240412e60d8694e9dbfd46e57bd42ee0 jdk-16+4
649-
78c07dd7240412e60d8694e9dbfd46e57bd42ee0 jdk-16+4
650648
e2622818f0bd30e736252eba101fe7d2c27f400b jdk-16+4
649+
a32f58c6b8be81877411767de7ba9c4cf087c1b5 jdk-15+31
650+
143e258f64af490010eb7e0bacc1cfaeceff0993 jdk-16+5
651+
2dad000726b8d5db9f3df647fb4949d88f269dd4 jdk-15+32
652+
4a8fd81d64bafa523cddb45f82805536edace106 jdk-16+6

‎make/autoconf/basic.m4‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,17 +86,18 @@ AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
8686
AC_SUBST(TOPDIR)
8787
AC_SUBST(CONFIGURE_START_DIR)
8888
89+
# We can only call UTIL_FIXUP_PATH after BASIC_CHECK_PATHS_WINDOWS.
90+
UTIL_FIXUP_PATH(TOPDIR)
91+
UTIL_FIXUP_PATH(CONFIGURE_START_DIR)
92+
8993
if test "x$CUSTOM_ROOT" != x; then
94+
UTIL_FIXUP_PATH(CUSTOM_ROOT)
9095
WORKSPACE_ROOT="${CUSTOM_ROOT}"
9196
else
9297
WORKSPACE_ROOT="${TOPDIR}"
9398
fi
9499
AC_SUBST(WORKSPACE_ROOT)
95100
96-
# We can only call UTIL_FIXUP_PATH after BASIC_CHECK_PATHS_WINDOWS.
97-
UTIL_FIXUP_PATH(CONFIGURE_START_DIR)
98-
UTIL_FIXUP_PATH(TOPDIR)
99-
100101
# Locate the directory of this script.
101102
AUTOCONF_DIR=$TOPDIR/make/autoconf
102103

‎make/common/MakeBase.gmk‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ endif
484484
# Defines the sub directory structure to store variable value file in
485485
DependOnVariableDirName = \
486486
$(strip $(addsuffix $(if $(MODULE),/$(MODULE)), \
487-
$(subst $(TOPDIR)/,, $(if $(filter /%, $(firstword $(MAKEFILE_LIST))), \
487+
$(subst $(WORKSPACE_ROOT)/,, $(if $(filter /%, $(firstword $(MAKEFILE_LIST))), \
488488
$(firstword $(MAKEFILE_LIST)), \
489489
$(CURDIR)/$(firstword $(MAKEFILE_LIST))))))
490490

@@ -496,6 +496,13 @@ DependOnVariableFileName = \
496496
$(strip $(if $(strip $2), $2, \
497497
$(MAKESUPPORT_OUTPUTDIR)/vardeps/$(DependOnVariableDirName)/$(strip $1).vardeps))
498498

499+
# Writes the vardeps file. Assumes $1_filename has been setup
500+
# Param 1 - Name of variable
501+
DependOnVariableWriteFile = \
502+
$(call MakeDir, $(dir $($1_filename))) \
503+
$(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \
504+
$($1_filename)) \
505+
499506
# Does the actual work with parameters stripped.
500507
# If the file exists AND the contents is the same as the variable, do nothing
501508
# else print a new file.
@@ -505,14 +512,18 @@ DependOnVariableFileName = \
505512
DependOnVariableHelper = \
506513
$(strip \
507514
$(eval $1_filename := $(call DependOnVariableFileName, $1, $2)) \
508-
$(if $(wildcard $($1_filename)), $(eval include $($1_filename))) \
509-
$(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\
510-
$(call MakeDir, $(dir $($1_filename))) \
511-
$(if $(findstring $(LOG_LEVEL), trace), \
512-
$(info NewVariable $1: >$(strip $($1))<) \
513-
$(info OldVariable $1: >$(strip $($1_old))<)) \
514-
$(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \
515-
$($1_filename))) \
515+
$(if $(wildcard $($1_filename)), \
516+
$(eval include $($1_filename)) \
517+
$(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\
518+
$(if $(findstring $(LOG_LEVEL), trace), \
519+
$(info NewVariable $1: >$(strip $($1))<) \
520+
$(info OldVariable $1: >$(strip $($1_old))<) \
521+
) \
522+
$(call DependOnVariableWriteFile,$1) \
523+
) \
524+
, \
525+
$(call DependOnVariableWriteFile,$1) \
526+
) \
516527
$($1_filename) \
517528
)
518529

‎make/common/Modules.gmk‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,7 @@ $(MODULE_DEPS_MAKEFILE): $(MODULE_INFOS) \
346346
sub(/\/\*.*\*\//, ""); \
347347
gsub(/^ +\*.*/, ""); \
348348
gsub(/ /, ""); \
349+
gsub(/\r/, ""); \
349350
printf(" %s", $$0) } \
350351
END { printf("\n") }' $m && \
351352
$(PRINTF) "TRANSITIVE_MODULES_$(call GetModuleNameFromModuleInfo, $m) :=" && \
@@ -359,6 +360,7 @@ $(MODULE_DEPS_MAKEFILE): $(MODULE_INFOS) \
359360
sub(/\/\*.*\*\//, ""); \
360361
gsub(/^ +\*.*/, ""); \
361362
gsub(/ /, ""); \
363+
gsub(/\r/, ""); \
362364
printf(" %s", $$0) } \
363365
END { printf("\n") }' $m \
364366
) >> $@ $(NEWLINE))

‎make/common/TestFilesCompilation.gmk‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,11 @@ define SetupTestFilesCompilationBody
6262
$1_OUTPUT_SUBDIR := lib
6363
$1_BASE_CFLAGS := $(CFLAGS_JDKLIB)
6464
$1_BASE_CXXFLAGS := $(CXXFLAGS_JDKLIB)
65-
$1_LDFLAGS := $(LDFLAGS_JDKLIB) $$(call SET_SHARED_LIBRARY_ORIGIN)
65+
ifeq ($(call isTargetOs, windows), false)
66+
$1_LDFLAGS := $(LDFLAGS_JDKLIB) $$(call SET_SHARED_LIBRARY_ORIGIN) -pthread
67+
else
68+
$1_LDFLAGS := $(LDFLAGS_JDKLIB) $$(call SET_SHARED_LIBRARY_ORIGIN)
69+
endif
6670
$1_COMPILATION_TYPE := LIBRARY
6771
else ifeq ($$($1_TYPE), PROGRAM)
6872
$1_PREFIX = exe

‎make/conf/jib-profiles.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,7 @@ var getJibProfilesDependencies = function (input, common) {
960960

961961
var devkit_platform_revisions = {
962962
linux_x64: "gcc9.2.0-OL6.4+1.0",
963-
macosx_x64: "Xcode10.1-MacOSX10.14+1.0",
963+
macosx_x64: "Xcode11.3.1-MacOSX10.15+1.0",
964964
windows_x64: "VS2019-16.5.3+1.0",
965965
linux_aarch64: "gcc9.2.0-OL7.6+1.0",
966966
linux_arm: "gcc8.2.0-Fedora27+1.0",

‎make/data/jdwp/jdwp.spec‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ JDWP "Java(tm) Debug Wire Protocol"
530530
"returned for each class. "
531531
"Generic signatures are described in the signature attribute "
532532
"section in "
533-
"<cite>The Java&trade; Virtual Machine Specification</cite>. "
533+
"<cite>The Java Virtual Machine Specification</cite>. "
534534
"Since JDWP version 1.5."
535535
(Out
536536
)
@@ -643,7 +643,7 @@ JDWP "Java(tm) Debug Wire Protocol"
643643
)
644644
(Reply
645645
(int modBits "Modifier bits as defined in Chapter 4 of "
646-
"<cite>The Java&trade; Virtual Machine Specification</cite>")
646+
"<cite>The Java Virtual Machine Specification</cite>")
647647
)
648648
(ErrorSet
649649
(Error INVALID_CLASS "refType is not the ID of a reference "
@@ -671,7 +671,7 @@ JDWP "Java(tm) Debug Wire Protocol"
671671
"which provide additional information on the "
672672
"field declaration. Individual flag values are "
673673
"defined in Chapter 4 of "
674-
"<cite>The Java&trade; Virtual Machine Specification</cite>. "
674+
"<cite>The Java Virtual Machine Specification</cite>. "
675675
"In addition, The <code>0xf0000000</code> bit identifies "
676676
"the field as synthetic, if the synthetic attribute "
677677
"<a href=\"#JDWP_VirtualMachine_Capabilities\">capability</a> is available.")
@@ -706,7 +706,7 @@ JDWP "Java(tm) Debug Wire Protocol"
706706
"which provide additional information on the "
707707
"method declaration. Individual flag values are "
708708
"defined in Chapter 4 of "
709-
"<cite>The Java&trade; Virtual Machine Specification</cite>. "
709+
"<cite>The Java Virtual Machine Specification</cite>. "
710710
"In addition, The <code>0xf0000000</code> bit identifies "
711711
"the method as synthetic, if the synthetic attribute "
712712
"<a href=\"#JDWP_VirtualMachine_Capabilities\">capability</a> is available.")
@@ -793,7 +793,7 @@ JDWP "Java(tm) Debug Wire Protocol"
793793
"Returns the current status of the reference type. The status "
794794
"indicates the extent to which the reference type has been "
795795
"initialized, as described in section 2.1.6 of "
796-
"<cite>The Java&trade; Virtual Machine Specification</cite>. "
796+
"<cite>The Java Virtual Machine Specification</cite>. "
797797
"If the class is linked the PREPARED and VERIFIED bits in the returned status bits "
798798
"will be set. If the class is initialized the INITIALIZED bit in the returned "
799799
"status bits will be set. If an error occured during initialization then the "
@@ -872,7 +872,7 @@ JDWP "Java(tm) Debug Wire Protocol"
872872
"generic signature if there is one. "
873873
"Generic signatures are described in the signature attribute "
874874
"section in "
875-
"<cite>The Java&trade; Virtual Machine Specification</cite>. "
875+
"<cite>The Java Virtual Machine Specification</cite>. "
876876
"Since JDWP version 1.5."
877877
(Out
878878
(referenceType refType "The reference type ID.")
@@ -900,7 +900,7 @@ JDWP "Java(tm) Debug Wire Protocol"
900900
"Fields are returned in the order they occur in the class file. "
901901
"Generic signatures are described in the signature attribute "
902902
"section in "
903-
"<cite>The Java&trade; Virtual Machine Specification</cite>. "
903+
"<cite>The Java Virtual Machine Specification</cite>. "
904904
"Since JDWP version 1.5."
905905
(Out
906906
(referenceType refType "The reference type ID.")
@@ -917,7 +917,7 @@ JDWP "Java(tm) Debug Wire Protocol"
917917
"which provide additional information on the "
918918
"field declaration. Individual flag values are "
919919
"defined in Chapter 4 of "
920-
"<cite>The Java&trade; Virtual Machine Specification</cite>. "
920+
"<cite>The Java Virtual Machine Specification</cite>. "
921921
"In addition, The <code>0xf0000000</code> bit identifies "
922922
"the field as synthetic, if the synthetic attribute "
923923
"<a href=\"#JDWP_VirtualMachine_Capabilities\">capability</a> is available.")
@@ -942,7 +942,7 @@ JDWP "Java(tm) Debug Wire Protocol"
942942
"Methods are returned in the order they occur in the class file. "
943943
"Generic signatures are described in the signature attribute "
944944
"section in "
945-
"<cite>The Java&trade; Virtual Machine Specification</cite>. "
945+
"<cite>The Java Virtual Machine Specification</cite>. "
946946
"Since JDWP version 1.5."
947947
(Out
948948
(referenceType refType "The reference type ID.")
@@ -959,7 +959,7 @@ JDWP "Java(tm) Debug Wire Protocol"
959959
"which provide additional information on the "
960960
"method declaration. Individual flag values are "
961961
"defined in Chapter 4 of "
962-
"<cite>The Java&trade; Virtual Machine Specification</cite>. "
962+
"<cite>The Java Virtual Machine Specification</cite>. "
963963
"In addition, The <code>0xf0000000</code> bit identifies "
964964
"the method as synthetic, if the synthetic attribute "
965965
"<a href=\"#JDWP_VirtualMachine_Capabilities\">capability</a> is available.")
@@ -1022,7 +1022,7 @@ JDWP "Java(tm) Debug Wire Protocol"
10221022
(Command ConstantPool=18
10231023
"Return the raw bytes of the constant pool in the format of the "
10241024
"constant_pool item of the Class File Format in "
1025-
"<cite>The Java&trade; Virtual Machine Specification</cite>. "
1025+
"<cite>The Java Virtual Machine Specification</cite>. "
10261026
"<p>Since JDWP version 1.6. Requires canGetConstantPool capability - see "
10271027
"<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>.""
10281028
(Out
@@ -1032,7 +1032,7 @@ JDWP "Java(tm) Debug Wire Protocol"
10321032
(int count "Total number of constant pool entries plus one. This "
10331033
"corresponds to the constant_pool_count item of the "
10341034
"Class File Format in "
1035-
"<cite>The Java&trade; Virtual Machine Specification</cite>. ")
1035+
"<cite>The Java Virtual Machine Specification</cite>. ")
10361036
(Repeat bytes
10371037
(byte cpbytes "Raw bytes of constant pool")
10381038
)
@@ -1435,7 +1435,7 @@ JDWP "Java(tm) Debug Wire Protocol"
14351435
)
14361436
(Command Bytecodes=3
14371437
"Retrieve the method's bytecodes as defined in "
1438-
"<cite>The Java&trade; Virtual Machine Specification</cite>. "
1438+
"<cite>The Java Virtual Machine Specification</cite>. "
14391439
"Requires canGetBytecodes capability - see "
14401440
"<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."
14411441
(Out
@@ -1491,7 +1491,7 @@ JDWP "Java(tm) Debug Wire Protocol"
14911491
"table. Also, synthetic variables may be present. "
14921492
"Generic signatures are described in the signature attribute "
14931493
"section in "
1494-
"<cite>The Java&trade; Virtual Machine Specification</cite>. "
1494+
"<cite>The Java Virtual Machine Specification</cite>. "
14951495
"Since JDWP version 1.5."
14961496
(Out
14971497
(referenceType refType "The class.")
@@ -2082,7 +2082,7 @@ JDWP "Java(tm) Debug Wire Protocol"
20822082
"The method which will return early is referred to as the "
20832083
"called method. The called method is the current method (as "
20842084
"defined by the Frames section in "
2085-
"<cite>The Java&trade; Virtual Machine Specification</cite>) "
2085+
"<cite>The Java Virtual Machine Specification</cite>) "
20862086
"for the specified thread at the time this command "
20872087
"is received. "
20882088
"<p>"

‎make/data/symbols/java.base-F.sym.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -254,18 +254,18 @@ method name merge descriptor (Ljava/lang/Object;Ljava/lang/Object;Ljava/util/fun
254254

255255
class name java/util/concurrent/locks/StampedLock
256256
header extends java/lang/Object implements java/io/Serializable flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I1)
257-
method name tryWriteLock descriptor ()J flags 1
258-
method name writeLockInterruptibly descriptor ()J thrownTypes java/lang/InterruptedException flags 1
259-
method name tryReadLock descriptor ()J flags 1
260-
method name tryReadLock descriptor (JLjava/util/concurrent/TimeUnit;)J thrownTypes java/lang/InterruptedException flags 1
261-
method name readLockInterruptibly descriptor ()J thrownTypes java/lang/InterruptedException flags 1
262-
method name unlock descriptor (J)V flags 1
263257
-method name tryWriteLock descriptor ()J
264258
-method name writeLockInterruptibly descriptor ()J
265259
-method name tryReadLock descriptor ()J
266260
-method name tryReadLock descriptor (JLjava/util/concurrent/TimeUnit;)J
267261
-method name readLockInterruptibly descriptor ()J
268262
-method name unlock descriptor (J)V
263+
method name tryWriteLock descriptor ()J flags 1
264+
method name writeLockInterruptibly descriptor ()J thrownTypes java/lang/InterruptedException flags 1
265+
method name tryReadLock descriptor ()J flags 1
266+
method name tryReadLock descriptor (JLjava/util/concurrent/TimeUnit;)J thrownTypes java/lang/InterruptedException flags 1
267+
method name readLockInterruptibly descriptor ()J thrownTypes java/lang/InterruptedException flags 1
268+
method name unlock descriptor (J)V flags 1
269269

270270
class name javax/net/ssl/SSLSession
271271
-method name getPeerCertificateChain descriptor ()[Ljavax/security/cert/X509Certificate;

‎make/data/symbols/java.xml-F.sym.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@
2727
# ##########################################################
2828
#
2929
class name javax/xml/stream/XMLInputFactory
30-
method name newFactory descriptor ()Ljavax/xml/stream/XMLInputFactory; thrownTypes javax/xml/stream/FactoryConfigurationError flags 9
3130
-method name newFactory descriptor ()Ljavax/xml/stream/XMLInputFactory;
31+
method name newFactory descriptor ()Ljavax/xml/stream/XMLInputFactory; thrownTypes javax/xml/stream/FactoryConfigurationError flags 9
3232

‎make/data/symbols/symbols‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
# ##########################################################
2828
#
2929
#command used to generate this file:
30-
#build.tools.symbolgenerator.CreateSymbols build-description-incremental-file symbols include.list 8 jdk8-updated.classes <none> --normalize-method-flags
30+
#build.tools.symbolgenerator.CreateSymbols build-description-incremental symbols include.list
3131
#
3232
generate platforms 7:8:9:A:B:C:D:E:F
3333
platform version 8 files java.activation-8.sym.txt:java.base-8.sym.txt:java.compiler-8.sym.txt:java.corba-8.sym.txt:java.datatransfer-8.sym.txt:java.desktop-8.sym.txt:java.instrument-8.sym.txt:java.logging-8.sym.txt:java.management-8.sym.txt:java.management.rmi-8.sym.txt:java.naming-8.sym.txt:java.prefs-8.sym.txt:java.rmi-8.sym.txt:java.scripting-8.sym.txt:java.security.jgss-8.sym.txt:java.security.sasl-8.sym.txt:java.sql-8.sym.txt:java.sql.rowset-8.sym.txt:java.transaction-8.sym.txt:java.xml-8.sym.txt:java.xml.bind-8.sym.txt:java.xml.crypto-8.sym.txt:java.xml.ws-8.sym.txt:java.xml.ws.annotation-8.sym.txt:jdk.httpserver-8.sym.txt:jdk.management-8.sym.txt:jdk.scripting.nashorn-8.sym.txt:jdk.sctp-8.sym.txt:jdk.security.auth-8.sym.txt:jdk.security.jgss-8.sym.txt

0 commit comments

Comments
 (0)