Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge jdk #319

Closed
wants to merge 232 commits into from
Closed

Merge jdk #319

Changes from all commits
Commits
Show all changes
232 commits
Select commit Hold shift + click to select a range
139f5d3
8259035: Comments for load order of hsdis should be updated
YaSuenag Jan 19, 2021
a9519c8
8259924: GitHub actions fail on Linux x86_32 with "Could not configur…
shipilev Jan 19, 2021
82adfb3
8134540: Much nearly duplicated code for PerfMemory support
Jan 19, 2021
c0e9c44
8259962: Shenandoah: task queue statistics is inconsistent after JDK-…
shipilev Jan 19, 2021
5cfb36e
8259036: Failed JfrVersionSystem invariant when VM built with -fno-el…
Jan 19, 2021
5d8861b
8259995: Missing comma to separate years in copyright header
Jan 19, 2021
3edf393
8259978: PPC64 builds broken after JDK-8258004
shipilev Jan 19, 2021
f7b96d3
8259796: timed CompletableFuture.get may swallow InterruptedException
Jan 19, 2021
33dcc00
8132984: incorrect type for Reference.discovered
Jan 19, 2021
a37cd5a
8259859: Missing metaspace NMT memory tag
zhengyu123 Jan 19, 2021
cf25383
Merge
JesperIRL Jan 19, 2021
9f21bb6
8259983: do not use uninitialized expand_ms value in G1CollectedHeap:…
MBaesken Jan 20, 2021
7c32ffe
8258383: vmTestbase/gc/g1/unloading/tests/unloading_compilation_level…
TobiHartmann Jan 20, 2021
0529480
8259867: Move encoding checks into ZipCoder
eirbjo Jan 20, 2021
0b01d69
8260005: Shenandoah: Remove unused AlwaysTrueClosure in ShenandoahCon…
zhengyu123 Jan 20, 2021
70b5b31
8257664: HTMLEditorKit: Wrong CSS relative font sizes
stanio Jan 20, 2021
0120510
8259732: JDK 16 L10n resource file update - msg drop 10
Jan 20, 2021
52ed2aa
8259786: initialize last parameter of getpwuid_r
MBaesken Jan 20, 2021
69f90b5
8259843: initialize dli_fname array before calling dll_address_to_lib…
MBaesken Jan 20, 2021
5891509
8259947: (fs) Optimize UnixPath.encode implementation
cl4es Jan 20, 2021
0785147
8259949: x86 32-bit build fails when -fcf-protection is passed in the…
gnu-andrew Jan 20, 2021
0408b23
8259757: add a regression test for 8259353 and 8259601
iignatev Jan 20, 2021
4f11ff3
8259488: Shenandoah: Missing timing tracking for STW CLD root processing
zhengyu123 Jan 20, 2021
8b95d95
8256895: Add support for RFC 8954: Online Certificate Status Protocol…
Jan 20, 2021
1f47de5
8260010: UTF8ZipCoder not thread-safe since JDK-8243469
cl4es Jan 20, 2021
27cc62a
8259911: byteArrayViewVarHandle should throw ArrayIndexOutOfBoundsExc…
cl4es Jan 20, 2021
35c9da7
8259498: Reduce overhead of MD5 and SHA digests
cl4es Jan 20, 2021
77a4302
8223056: Remove Type-Stable-Memory support for Parkers
Jan 21, 2021
044bae0
8260191: Do not include access.hpp in oop.hpp
iklam Jan 21, 2021
133bcb0
Merge
JesperIRL Jan 21, 2021
f8a9602
8260025: Missing comma in VM_Version_Ext::_family_id_amd
YaSuenag Jan 21, 2021
5940287
8260048: Shenandoah: ShenandoahMarkingContext asserts are unnecessary
shipilev Jan 21, 2021
7f7166d
8260035: Deproblemlist few problemlisted test
prsadhuk Jan 21, 2021
4dfd8cc
8259897: gtest os.dll_address_to_function_and_library_name_vm fails o…
tstuefe Jan 21, 2021
e1de0bf
8260043: Reduce allocation in sun.net.www.protocol.jar.Handler.parseURL
eirbjo Jan 21, 2021
4bcffeb
8260029: aarch64: fix typo in verify_oop_array
Jan 21, 2021
6ce0799
8259851: Use boolean type for tasks in SubTasksDone
albertnetymk Jan 21, 2021
c3c6662
8259954: gc/shenandoah/mxbeans tests fail with -Xcomp
shipilev Jan 21, 2021
a5367cb
8247619: Improve Direct Buffering of Characters
Jul 29, 2020
62eab50
8255199: Catching a few NumberFormatExceptions in xmldsig
wangweij Oct 23, 2020
34eb8b3
8255765: Shenandoah: Isolate concurrent, degenerated and full GC
zhengyu123 Jan 21, 2021
ede1bea
8227695: assert(pss->trim_ticks().seconds() == 0.0) failed: Unexpecte…
Jan 21, 2021
a8073ef
8253478: (se) epoll Selector should use eventfd for wakeup instead of…
Jan 21, 2021
2f47c39
8259943: FileDescriptor.close0 does not handle EINTR
Jan 21, 2021
d90e06a
8259775: [Vector API] Incorrect code-gen for VectorReinterpret operation
DamonFool Jan 22, 2021
a7c2ebc
8239894: Xserver crashes when the wrong high refresh rate is used
mrserb Jan 22, 2021
92c2f08
8259869: [macOS] Remove desktop module dependencies on JNF Reference …
Jan 22, 2021
ba38661
8259882: Reduce the inclusion of perfData.hpp
iklam Jan 22, 2021
a70acf2
8259928: compiler/jvmci tests fail with -Xint
shipilev Jan 22, 2021
1452280
8164484: Unity, JTable cell editor, javax/swing/JComboBox/6559152/bug…
prsadhuk Jan 22, 2021
d066f2b
8260030: Improve stringStream buffer handling
tstuefe Jan 22, 2021
685c03d
8259271: gc/parallel/TestDynShrinkHeap.java still fails "assert(cover…
Jan 22, 2021
58ceb25
8259842: Remove Result cache from StringCoding
cl4es Jan 22, 2021
bfac3fb
8260212: Shenandoah: resolve-only UpdateRefsMode is not used
shipilev Jan 22, 2021
7ed8ba1
8256814: WeakProcessorPhases may be redundant
Jan 22, 2021
f928265
8260009: InstanceKlass::has_as_permitted_subclass() fails if subclass…
Jan 22, 2021
acbcde8
8256111: Create implementation for NSAccessibilityStaticText protocol
Jan 22, 2021
154e1d6
8259009: G1 heap summary should be shown in "Heap Parameters" window …
YaSuenag Jan 22, 2021
a97f3c1
8258853: Support separate function declaration and definition with EN…
Jan 22, 2021
18eb6d9
8255348: NPE in PKIXCertPathValidator event logging code
coffeys Jan 22, 2021
0ea5862
8260053: Optimize Tokens' use of Names
lgxbslgx Jan 22, 2021
bf5e801
8259922: MethodHandles.collectArguments does not throw IAE if pos is …
DasBrain Jan 22, 2021
c5ad713
8260250: Duplicate check in DebugInformationRecorder::recorders_frozen
shipilev Jan 22, 2021
874aef4
8259707: LDAP channel binding does not work with StartTLS extension
Jan 22, 2021
a887177
8246788: ZoneRules invariants can be broken
Jan 22, 2021
53fecba
8258805: Japanese characters not entered by mouse click on Windows 10
Jan 22, 2021
5aca934
8260304: (se) EPollSelectorImpl wakeup mechanism broken on Linux 32-bit
shipilev Jan 22, 2021
7be9113
8255216: Change _directive->BreakAtCompileOption to env()->break_at_c…
danlemmond Jan 22, 2021
bdc305e
8258917: NativeMemoryTracking is handled by launcher inconsistenly
Jan 22, 2021
aa57d07
8259214: MetaspaceClosure support for Arrays of MetaspaceObj
iklam Jan 22, 2021
6f2a394
Merge
JesperIRL Jan 23, 2021
5cdcce1
8260307: Do not include method.hpp in frame.hpp
iklam Jan 23, 2021
f624dba
8240247: No longer need to wrap files with contentContainer
Jan 23, 2021
b53d5ca
8260315: Typo "focul" instead of "focus" in FocusSpec.html
Jan 23, 2021
6c4c96f
8258742: Move PtrQueue reset to PtrQueueSet subclasses
Jan 23, 2021
06348df
8259776: Remove ParallelGC non-CAS oldgen allocation
Jan 23, 2021
535c292
8260306: Do not include osThread.hpp in thread.hpp
iklam Jan 24, 2021
c52c6c6
8260273: DataOutputStream writeChars optimization
Jan 25, 2021
4ae39b1
8260208: Improve dummy object filling condition in G1CollectedHeap::f…
Jan 25, 2021
764111f
8260272: bash configure --prefix does not work after JDK-8257679
Jan 25, 2021
5898ab6
8259894: refactor parts of jvm.h into jvm_io.h and jvm_constants.h
iklam Jan 25, 2021
d825339
8260263: Remove PtrQueue::_qset
Jan 25, 2021
af155fc
8258836: JNI local refs exceed capacity getDiagnosticCommandInfo
jerboaa Jan 25, 2021
09489e2
8260338: Some fields in HaltNode is not cloned
YaSuenag Jan 25, 2021
ca20c63
8259710: Inlining trace leaks memory
tstuefe Jan 25, 2021
6e03735
8259845: Move placeholder implementation details to cpp file and add …
coleenp Jan 25, 2021
d076977
8260169: LogCompilation: Unexpected method mismatch
Jan 25, 2021
c5ab7c3
8260284: C2: assert(_base == Int) failed: Not an Int
chhagedorn Jan 25, 2021
ef247ab
8260308: Update LogCompilation junit to 4.13.1
lutkerd Jan 25, 2021
47c7dc7
8258833: Cancel multi-part cipher operations in SunPKCS11 after failures
martinuy Jan 25, 2021
5b0b24b
8260381: ProblemList com/sun/management/DiagnosticCommandMBean/DcmdMB…
Jan 25, 2021
73c78c8
8260329: Update references to TAOCP to latest edition
jddarcy Jan 25, 2021
12ccd21
8260289: Unable to customize module lists after change JDK-8258411
Jan 25, 2021
81e730e
8259276: C2: Empty expression stack when reexecuting tableswitch/look…
Jan 25, 2021
d6fb9d7
8255464: Cannot access ModuleTree in a CompilationUnitTree
jonathan-gibbons Jan 25, 2021
982e42b
8259726: Use of HashSet leads to undefined order in test output
jonathan-gibbons Jan 25, 2021
9ea9323
8254246: SymbolHashMapEntry wastes space
coleenp Jan 25, 2021
c538cd8
8165276: Spec states to invoke the premain method in an agent class i…
Jan 26, 2021
abd9310
8260222: remove unused _thread member SymbolTableLookup
MBaesken Jan 26, 2021
23edb6f
8236490: Compiler bug relating to @NonNull annotation
lgxbslgx Jan 26, 2021
b4ace3e
8260042: G1 Post-cleanup liveness printing occurs too early
Jan 26, 2021
81a66df
8259809: Remove PerfEvent class loading locking counters
coleenp Jan 26, 2021
edd2707
8260408: Shenandoah: adjust inline hints after JDK-8255019
shipilev Jan 26, 2021
e080ce9
8252545: runtime/ErrorHandling/TestHeapDumpOnOutOfMemoryError.java ti…
Jan 26, 2021
5e8e0ad
8242456: PreviewFeature.Feature enum removal of TEXT_BLOCKS
Jan 26, 2021
8d2f77f
8260406: Do not copy pure java source code to gensrc
magicus Jan 26, 2021
af8a08f
8260378: [TESTBUG] DcmdMBeanTestCheckJni.java reports false positive
jerboaa Jan 26, 2021
b07797c
8260391: Remove StringCoding::err
cl4es Jan 26, 2021
408772c
8259025: Record compact constructor using Objects.requireNonNull
Jan 26, 2021
fd00ed7
8256298: Shenandoah: Enable concurrent stack processing
zhengyu123 Jan 26, 2021
9f0a043
8260286: Manual Test "ws/open/test/jdk/sun/security/tools/jarsigner/c…
Jan 26, 2021
42cef27
8260343: Delete obsolete classes in the Windows L&F
mrserb Jan 26, 2021
1bebd41
8260421: Shenandoah: Fix conc_mark_roots timing name and indentations
zhengyu123 Jan 26, 2021
19b6f61
8260334: Remove deprecated sv_for_node_id() from Compile
Jan 26, 2021
6f2be9c
8246112: Remove build-time and run-time checks for clock_gettime and …
Jan 27, 2021
e1411fd
6606673: Path2D.Double, Path2D.Float and GeneralPath ctors throw exce…
mrserb Jan 27, 2021
c836da3
8252412: [macos11] system dynamic libraries removed from filesystem
Jan 27, 2021
bd2744d
8260106: Shenandoah: refactor reference updating closures and related…
shipilev Jan 27, 2021
1c77046
8260404: jvm_io.h include missing in a number of files
tstuefe Jan 27, 2021
fd2641e
8260236: better init AnnotationCollector _contended_group
MBaesken Jan 27, 2021
4d004c9
8260449: Remove stale declaration of SATBMarkQueue::apply_closure_and…
rkennke Jan 27, 2021
fa40a96
8253420: Refactor HeapRegionManager::find_highest_free
albertnetymk Jan 27, 2021
e28e111
8260370: C2: LoopLimit node is not eliminated
Jan 27, 2021
3e4194c
8260022: [ppc] os::print_function_and_library_name shall resolve func…
tstuefe Jan 27, 2021
bf15c70
8260460: GitHub actions still fail on Linux x86_32 with "Could not co…
shipilev Jan 27, 2021
b3c8a52
8259050: Error recovery in lexer could be improved
Jan 27, 2021
e696baa
8260448: Simplify ManagementFactory$PlatformMBeanFinder
cl4es Jan 27, 2021
7ed591c
8260314: Replace border="1" on tables with CSS
Jan 27, 2021
ac276bb
8257074: Update the ByteBuffers micro benchmark
ChrisHegarty Jan 27, 2021
f353fcf
8258894: C2: Forbid GCM to move stores into loops
Jan 27, 2021
311a0a9
8259808: Add JFR event to detect GC locker stall
Jan 27, 2021
684c855
8260524: validate-source fails on test/jdk/jdk/jfr/event/gc/detailed/…
Jan 27, 2021
0eed2c3
8259359: javac does not attribute unexpected super constructor invoca…
lgxbslgx Jan 27, 2021
eb92368
8259816: Typo in java.util.stream package description
Jan 27, 2021
c52212b
Merge
JesperIRL Jan 27, 2021
c7661ae
8260561: [doc] HexFormat has incorrect @since tag
Jan 27, 2021
7030d2e
8260200: G1: Remove unnecessary update in FreeRegionList::remove_star…
Jan 28, 2021
62ffe75
Merge
JesperIRL Jan 28, 2021
396a496
8260467: Move well-known classes from systemDictionary.hpp to vmClass…
iklam Jan 28, 2021
11a70d1
8260426: awt debug_mem.c DMem_AllocateBlock might leak memory
MBaesken Jan 28, 2021
316d52c
8260497: Shenandoah: Improve SATB flushing
rkennke Jan 28, 2021
a97aedf
8256215: Shenandoah: re-organize saving/restoring machine state in as…
shipilev Jan 28, 2021
ecde52e
8260506: VersionHelper cleanup
cl4es Jan 28, 2021
8fe1323
8260520: Avoid getting permissions in JarFileFactory when no Security…
cl4es Jan 28, 2021
8752257
8260502: [s390] NativeMovRegMem::verify() fails because it's too strict
TheRealMDoerr Jan 28, 2021
a68c6c2
8260579: PPC64 and S390 builds failures after JDK-8260467
shipilev Jan 28, 2021
d07af2b
8255531: MethodHandles::permuteArguments throws NPE when duplicating …
JornVernee Jan 28, 2021
11d6467
8260407: cmp != __null && cmp->Opcode() == Op_CmpL failure with -XX:S…
rwestrel Jan 28, 2021
20e7df5
8260466: Test TestHeapDumpOnOutOfMemoryError.java needs multiple @tes…
Jan 28, 2021
baf46ba
8259801: Enable XML Signature secure validation mode by default
Jan 28, 2021
13ca433
8259628: jdk/net/ExtendedSocketOption/AsynchronousSocketChannelNAPITe…
pconcannon Jan 28, 2021
abc4300
8257746: Regression introduced with JDK-8250984 - memory might be nul…
Jan 28, 2021
3aabbd7
8260432: allocateSpaceForGP in freetypeScaler.c might leak memory
MBaesken Jan 28, 2021
bbbfaa5
8249262: Initialize InstanceKlass::_package_entry during CDS dump time
calvinccheung Jan 28, 2021
1de3c55
8260584: Shenandoah: simplify "Concurrent Thread Roots" logging
shipilev Jan 28, 2021
2b166d8
8260596: Comment cleanup in BigInteger
wangweij Jan 28, 2021
81e9e6a
8260461: Modernize jsr166 tck tests
Jan 28, 2021
71128cf
8260586: Shenandoah: simplify "Concurrent Weak References" logging
shipilev Jan 28, 2021
1519632
8251462: Simplify compilation policy
Jan 28, 2021
251c641
8259487: Remove unused StarTask
Jan 29, 2021
ea2c447
8259778: Merge MutableSpace and ImmutableSpace
Jan 29, 2021
64a150c
6986863: ProfileDeferralMgr throwing ConcurrentModificationException
mrserb Jan 29, 2021
0675473
8252409: JShell: Intersection types cause NoSuchFieldError
Jan 29, 2021
a5fb517
8259404: Shenandoah: Fix time tracking in parallel_cleaning
zhengyu123 Jan 29, 2021
d2b0ea1
8260282: Add option to compress heap dumps created by -XX:+HeapDumpOn…
schmelter-sap Jan 29, 2021
24a2621
8260592: jpackage tests fail when Desktop is not supported
shipilev Jan 29, 2021
53f1b93
8260518: Change default -mmacosx-version-min to 10.12
erikj79 Jan 29, 2021
22bfa5b
8255837: Shenandoah: Remove ShenandoahConcurrentRoots class
zhengyu123 Jan 29, 2021
b7b391b
8260625: Rename MetaspaceExpand_lock
tstuefe Jan 29, 2021
6415d3b
8259584: SuperWord::fix_commutative_inputs checks in_bb(fin1) instead…
Jan 29, 2021
b2e582a
8259905: Compiler treats 'sealed' keyword as 'var' keyword
Jan 29, 2021
739bbd0
8260566: Pattern type X is a subtype of expression type Y message is …
lgxbslgx Jan 29, 2021
f5ca838
8065773: JDI: UOE is not thrown, when redefineClasses changes a class…
lmesnik Jan 29, 2021
71bfe96
8217633: Configurable extensions with system properties
XueleiFan Jan 30, 2021
fb46c91
8260674: ProblemList jdk/incubator/vector/VectorHash.java in Xcomp co…
Jan 30, 2021
69ee314
8249867: xml declaration is not followed by a newline
JoeWang-Java Jan 30, 2021
6b24e98
8259008: ArithmeticException was thrown at "Monitor Cache Dump" on HSDB
YaSuenag Jan 30, 2021
67a34da
8260630: Templatize literal_size
Jan 30, 2021
fcfe647
8260462: Missing <thead> in Modality.html
Jan 30, 2021
a61ff87
8260685: ProblemList 2 compiler/jvmci/compilerToVM tests in Xcomp con…
Jan 30, 2021
0da9cad
8260501: [Vector API] Improve register usage for shift operations on x86
DamonFool Jan 31, 2021
8a9004d
8260574: Remove parallel constructs in GenCollectedHeap::process_roots
albertnetymk Jan 31, 2021
039affc
8260577: Unused code in AbstractCompiler after Shark compiler removal
TobiHartmann Feb 1, 2021
cf94208
8259395: Patching automatic module with additional packages re-create…
DasBrain Feb 1, 2021
ab727f0
8260591: Shenandoah: improve parallelism for concurrent thread root s…
shipilev Feb 1, 2021
aec0377
8257498: Remove useless skeleton predicates
chhagedorn Feb 1, 2021
c0cde7d
8259814: test/jdk/tools/jlink/plugins/CompressorPluginTest.java has c…
sundararajana Feb 1, 2021
80760a3
8260669: Missing quotes in fixpath.sh
erikj79 Feb 1, 2021
02d586e
8259398: Super word not applied to a loop with byteArrayViewVarHandle
Feb 1, 2021
181d63f
8260522: Clean up warnings in hotspot JTReg runtime tests
Feb 1, 2021
df33595
8260309: Shenandoah: Clean up ShenandoahBarrierSet
rkennke Feb 1, 2021
e963ebd
8260004: Shenandoah: Rename ShenandoahMarkCompact to ShenandoahFullGC
zhengyu123 Feb 1, 2021
50f9a70
8217327: G1 Post-Cleanup region liveness printing should not print ou…
Feb 1, 2021
b6a7367
8260349: Cannot programmatically retrieve Metaspace max set via JAVA_…
Feb 1, 2021
55d62a5
8213226: [TESTBUG] Reduce the usage of CDSTestUtils.executeAndLog()
calvinccheung Feb 1, 2021
9880c4c
8260860: ProblemList tools/jlink/plugins/CompressorPluginTest.java
Feb 1, 2021
a6d9505
8260864: ProblemList two security/krb5 tests on Linux
Feb 1, 2021
54e7a64
8260576: Typo in compiler/runtime/safepoints/TestRegisterRestoring.java
Feb 2, 2021
474dba2
8257086: Clarify differences between {Float, Double}.equals and ==
jddarcy Feb 2, 2021
fe407cf
8260420: C2 compilation fails with assert(found_sfpt) failed: no node…
TobiHartmann Feb 2, 2021
ddd2951
8260571: Add PrintMetaspaceStatistics to print metaspace statistics u…
tstuefe Feb 2, 2021
288a4fe
8260643: Remove parallel version handling in CardTableRS::younger_ref…
Feb 2, 2021
189b65b
8260264: Move common os_<unix> inline methods to a common posix sourc…
Feb 2, 2021
a421bfa
8259839: SystemDictionary exports too much implementation
coleenp Feb 2, 2021
defcb04
8260867: ProblemList java/awt/FullScreen/TranslucentWindow/Translucen…
Feb 2, 2021
0093183
8260368: [PPC64] GC interface needs enhancement to support GCs with l…
Quaffel Feb 2, 2021
d7b1fc5
8260707: java/lang/instrument/PremainClass/InheritAgent0100.java time…
tstuefe Feb 2, 2021
f546fd0
8260902: CDS mapping errors should not lead to unconditional output
tstuefe Feb 2, 2021
69189f8
8256421: Add 2 HARICA roots to cacerts truststore
rhalade Feb 2, 2021
105d3e8
8260861: TrustStoreDescriptor log the same value
davinkevin Feb 2, 2021
6dc3c6d
8183372: Refactor java/lang/Class shell tests to java
mahendrachhipa Feb 2, 2021
9af3339
8261003: Bad Copyright header format after JDK-8183372
mahendrachhipa Feb 2, 2021
ffbcf1b
8260471: Change SystemDictionary::X_klass calls to vmClasses::X_klass
iklam Feb 2, 2021
bec6043
8259570: (macos) tools/jpackage tests fails with 'hdiutil: couldn't e…
Feb 3, 2021
d423d36
8258508: Merge G1RedirtyCardsQueue into qset
Feb 3, 2021
a47befc
8260878: com/sun/jdi/JdbOptions.java fails without jfr
DamonFool Feb 3, 2021
98a7692
8076313: GraphicsEnvironment does not detect changes in count of moni…
mrserb Feb 3, 2021
b9d4211
8260193: Remove JVM_GetInterfaceVersion() and JVM_DTraceXXX
iklam Feb 3, 2021
c008410
8197825: [Test] Intermittent timeout with javax/swing JColorChooser Test
prsadhuk Feb 3, 2021
cb127a4
8198343: Test java/awt/print/PrinterJob/TestPgfmtSetMPA.java may fail…
prsadhuk Feb 3, 2021
91e6c75
8260928: InitArrayShortSize constraint func should print a helpful er…
TobiHartmann Feb 3, 2021
9037615
8222850: jshell tool: Misleading cascade compiler error in switch exp…
Feb 3, 2021
ae2c5f0
8260581: IGV: enhance node search
Feb 3, 2021
c8de943
8260617: Merge ZipFile encoding check with the initial hash calculation
cl4es Feb 3, 2021
5324b5c
8260998: Shenandoah: Restore reference processing statistics reporting
zhengyu123 Feb 3, 2021
0ef93fe
8259265: Refactor UncaughtExceptions shell test as java test.
Feb 3, 2021
b0ee7a8
8241995: Clarify InetSocketAddress::toString specification
FrauBoes Feb 3, 2021
472bf62
8258799: [Testbug] RandomCommandsTest must check if tested directive …
Feb 3, 2021
4a8b5c1
8257858: [macOS]: Remove JNF dependency from libosxsecurity/KeystoreI…
wangweij Feb 3, 2021
f025bc1
8260301: misc gc/g1/unloading tests fails with "RuntimeException: Met…
Feb 3, 2021
330731d
Merge tag 'jdk-17+8' into lworld_merge_jdk_17_8
MrSimms Feb 4, 2021
604b0cb
Logical merge compilation fixes
MrSimms Feb 4, 2021
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
@@ -1,5 +1,5 @@
#
# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2011, 2021, 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
@@ -605,25 +605,6 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
fi
fi
# Optional POSIX functionality needed by the JVM
#
# Check if clock_gettime is available and in which library. This indicates
# availability of CLOCK_MONOTONIC for hotspot. But we don't need to link, so
# don't let it update LIBS.
save_LIBS="$LIBS"
AC_SEARCH_LIBS(clock_gettime, rt, [HAS_CLOCK_GETTIME=true], [])
if test "x$LIBS" = "x-lrt "; then
CLOCK_GETTIME_IN_LIBRT=true
fi
LIBS="$save_LIBS"
if test "x$HAS_CLOCK_GETTIME" = "xtrue"; then
OS_CFLAGS_JVM="$OS_CFLAGS_JVM -DSUPPORTS_CLOCK_MONOTONIC"
if test "x$CLOCK_GETTIME_IN_LIBRT" = "xtrue"; then
OS_CFLAGS_JVM="$OS_CFLAGS_JVM -DNEEDS_LIBRT"
fi
fi
# Extra flags needed when building optional static versions of certain
# JDK libraries.
STATIC_LIBS_CFLAGS="-DSTATIC_BUILD=1"
@@ -684,9 +665,21 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
# CFLAGS PER CPU
if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
# COMMON to gcc and clang
AC_MSG_CHECKING([if $1 is x86])
if test "x$FLAGS_CPU" = xx86; then
# Force compatibility with i586 on 32 bit intel platforms.
$1_CFLAGS_CPU="-march=i586"
AC_MSG_RESULT([yes])
AC_MSG_CHECKING([if control flow protection is enabled by additional compiler flags])
if echo "${EXTRA_CFLAGS}${EXTRA_CXXFLAGS}${EXTRA_ASFLAGS}" | ${GREP} -q 'fcf-protection' ; then
# cf-protection requires CMOV and thus i686
$1_CFLAGS_CPU="-march=i686"
AC_MSG_RESULT([yes, forcing ${$1_CFLAGS_CPU}])
else
# Force compatibility with i586 on 32 bit intel platforms.
$1_CFLAGS_CPU="-march=i586"
AC_MSG_RESULT([no, forcing ${$1_CFLAGS_CPU}])
fi
else
AC_MSG_RESULT([no])
fi
fi
@@ -1,5 +1,5 @@
#
# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2011, 2021, 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
@@ -108,6 +108,13 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
OS_LDFLAGS_JVM_ONLY="-Wl,-rpath,@loader_path/. -Wl,-rpath,@loader_path/.."
OS_LDFLAGS="-mmacosx-version-min=$MACOSX_VERSION_MIN"
fi
if test "x$OPENJDK_TARGET_OS" = xlinux; then
# Hotspot needs to link librt to get the clock_* functions.
# But once our supported minimum build and runtime platform
# has glibc 2.17, this can be removed as the functions are
# in libc.
OS_LDFLAGS_JVM_ONLY="-lrt"
fi
fi
# Setup debug level-dependent LDFLAGS
@@ -1,5 +1,5 @@
#
# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2011, 2021, 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
@@ -130,7 +130,7 @@ AC_DEFUN([FLAGS_SETUP_MACOSX_VERSION],
# of the OS. It currently has a hard coded value. Setting this also limits
# exposure to API changes in header files. Bumping this is likely to
# require code changes to build.
MACOSX_VERSION_MIN=10.9.0
MACOSX_VERSION_MIN=10.12.0
MACOSX_VERSION_MIN_NODOTS=${MACOSX_VERSION_MIN//\./}
AC_SUBST(MACOSX_VERSION_MIN)
@@ -176,10 +176,10 @@ AC_DEFUN([UTIL_FIXUP_EXECUTABLE],
# space.
[ if [[ "$OPENJDK_BUILD_OS" = "windows" && input =~ ^$FIXPATH ]]; then
line="${input#$FIXPATH }"
prefix="$FIXPATH "
fixpath_prefix="$FIXPATH "
else
line="$input"
prefix=""
fixpath_prefix=""
fi ]
path="${line%% *}"
arguments="${line#"$path"}"
@@ -247,11 +247,11 @@ AC_DEFUN([UTIL_FIXUP_EXECUTABLE],
# Now we have a usable command as new_path, with arguments in arguments
if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
if test "x$prefix" = x; then
# Only mess around if prefix was not given
if test "x$fixpath_prefix" = x; then
# Only mess around if fixpath_prefix was not given
UTIL_CHECK_WINENV_EXEC_TYPE("$new_path")
if test "x$RESULT" = xwindows; then
prefix="$FIXPATH "
fixpath_prefix="$FIXPATH "
# make sure we have an .exe suffix (but not two)
new_path="${new_path%.exe}.exe"
else
@@ -262,11 +262,11 @@ AC_DEFUN([UTIL_FIXUP_EXECUTABLE],
fi
if test "x$3" = xNOFIXPATH; then
prefix=""
fixpath_prefix=""
fi
# Now join together the path and the arguments once again
new_complete="$prefix$new_path$arguments"
new_complete="$fixpath_prefix$new_path$arguments"
$1="$new_complete"
fi
])
@@ -1,5 +1,5 @@
#
# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2014, 2021, 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,6 @@
ifndef _MODULES_GMK
_MODULES_GMK := 1

# Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, common/Modules.gmk))

################################################################################
# Setup module sets for classloaders

@@ -48,6 +45,11 @@ include $(TOPDIR)/make/conf/docs-modules.conf

include $(TOPDIR)/make/conf/build-module-sets.conf

################################################################################
# Hook to include the corresponding custom file, if present.
# Allowing MODULE list extensions setup above.
$(eval $(call IncludeCustomExtension, common/Modules.gmk))

################################################################################
# Depending on the configuration, we might need to filter out some modules that
# normally should have been included
@@ -81,7 +81,7 @@ define SetupTestFilesCompilationBody

# Locate all files with the matching prefix
$1_FILE_LIST := \
$$(call FindFiles, $$($1_SOURCE_DIRS), $$($1_PREFIX)*.c $$($1_PREFIX)*.cpp)
$$(call FindFiles, $$($1_SOURCE_DIRS), $$($1_PREFIX)*.c $$($1_PREFIX)*.cpp $$($1_PREFIX)*.m)

$1_EXCLUDE_PATTERN := $$(addprefix %/, $$($1_EXCLUDE))
$1_FILTERED_FILE_LIST := $$(filter-out $$($1_EXCLUDE_PATTERN), $$($1_FILE_LIST))
@@ -440,7 +440,7 @@ var getJibProfilesProfiles = function (input, common, data) {
target_cpu: "x64",
dependencies: ["devkit", "gtest", "pandoc"],
configure_args: concat(common.configure_args_64bit, "--with-zlib=system",
"--with-macosx-version-max=10.9.0",
"--with-macosx-version-max=10.12.00",
// Use system SetFile instead of the one in the devkit as the
// devkit one may not work on Catalina.
"SETFILE=/usr/bin/SetFile"),
@@ -0,0 +1,24 @@
Owner: CN=Hellenic Academic and Research Institutions ECC RootCA 2015, O=Hellenic Academic and Research Institutions Cert. Authority, L=Athens, C=GR
Issuer: CN=Hellenic Academic and Research Institutions ECC RootCA 2015, O=Hellenic Academic and Research Institutions Cert. Authority, L=Athens, C=GR
Serial number: 0
Valid from: Tue Jul 07 10:37:12 GMT 2015 until: Sat Jun 30 10:37:12 GMT 2040
Signature algorithm name: SHA256withECDSA
Subject Public Key Algorithm: 384-bit EC key
Version: 3
-----BEGIN CERTIFICATE-----
MIICwzCCAkqgAwIBAgIBADAKBggqhkjOPQQDAjCBqjELMAkGA1UEBhMCR1IxDzAN
BgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJl
c2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxRDBCBgNVBAMTO0hl
bGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgRUNDIFJv
b3RDQSAyMDE1MB4XDTE1MDcwNzEwMzcxMloXDTQwMDYzMDEwMzcxMlowgaoxCzAJ
BgNVBAYTAkdSMQ8wDQYDVQQHEwZBdGhlbnMxRDBCBgNVBAoTO0hlbGxlbmljIEFj
YWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9yaXR5
MUQwQgYDVQQDEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0
dXRpb25zIEVDQyBSb290Q0EgMjAxNTB2MBAGByqGSM49AgEGBSuBBAAiA2IABJKg
QehLgoRc4vgxEZmGZE4JJS+dQS8KrjVPdJWyUWRrjWvmP3CV8AVER6ZyOFB2lQJa
jq4onvktTpnvLEhvTCUp6NFxW98dwXU3tNf6e3pCnGoKVlp8aQuqgAkkbH7BRqNC
MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFLQi
C4KZJAEOnLvkDv2/+5cgk5kqMAoGCCqGSM49BAMCA2cAMGQCMGfOFmI4oqxiRaep
lSTAGiecMjvAwNW6qef4BENThe5SId6d9SWDPp5YSy/XZxMOIQIwBeF1Ad5o7Sof
TUwJCA3sS61kFyjndc5FZXIhF8siQQ6ME5g4mlRtm8rifOoCWCKR
-----END CERTIFICATE-----
@@ -0,0 +1,42 @@
Owner: CN=Hellenic Academic and Research Institutions RootCA 2015, O=Hellenic Academic and Research Institutions Cert. Authority, L=Athens, C=GR
Issuer: CN=Hellenic Academic and Research Institutions RootCA 2015, O=Hellenic Academic and Research Institutions Cert. Authority, L=Athens, C=GR
Serial number: 0
Valid from: Tue Jul 07 10:11:21 GMT 2015 until: Sat Jun 30 10:11:21 GMT 2040
Signature algorithm name: SHA256withRSA
Subject Public Key Algorithm: 4096-bit RSA key
Version: 3
-----BEGIN CERTIFICATE-----
MIIGCzCCA/OgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBpjELMAkGA1UEBhMCR1Ix
DzANBgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5k
IFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNVBAMT
N0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgUm9v
dENBIDIwMTUwHhcNMTUwNzA3MTAxMTIxWhcNNDAwNjMwMTAxMTIxWjCBpjELMAkG
A1UEBhMCR1IxDzANBgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNh
ZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkx
QDA+BgNVBAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1
dGlvbnMgUm9vdENBIDIwMTUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
AQDC+Kk/G4n8PDwEXT2QNrCROnk8ZlrvbTkBSRq0t89/TSNTt5AA4xMqKKYx8ZEA
4yjsriFBzh/a/X0SWwGDD7mwX5nh8hKDgE0GPt+sr+ehiGsxr/CL0BgzuNtFajT0
AoAkKAoCFZVedioNmToUW/bLy1O8E00BiDeUJRtCvCLYjqOWXjrZMts+6PAQZe10
4S+nfK8nNLspfZu2zwnI5dMK/IhlZXQK3HMcXM1AsRzUtoSMTFDPaI6oWa7CJ06C
ojXdFPQf/7J31Ycvqm59JCfnxssm5uX+Zwdj2EUN3TpZZTlYepKZcj2chF6IIbjV
9Cz82XBST3i4vTwri5WY9bPRaM8gFH5MXF/ni+X1NYEZN9cRCLdmvtNKzoNXADrD
gfgXy5I2XdGj2HUb4Ysn6npIQf1FGQatJ5lOwXBH3bWfgVMS5bGMSF0xQxfjjMZ6
Y5ZLKTBOhE5iGV48zpeQpX8B653g+IuJ3SWYPZK2fu/Z8VFRfS0myGlZYeCsargq
NhEEelC9MoS+L9xy1dcdFkfkR2YgP/SWxa+OAXqlD3pk9Q0Yh9muiNX6hME6wGko
LfINaFGq46V3xqSQDqE3izEjR8EJCOtu93ib14L8hCCZSRm2Ekax+0VVFqmjZayc
Bw/qa9wfLgZy7IaIEuQt218FL+TwA9MmM+eAws1CoRc0CwIDAQABo0IwQDAPBgNV
HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUcRVnyMjJvXVd
ctA4GGqd83EkVAswDQYJKoZIhvcNAQELBQADggIBAHW7bVRLqhBYRjTyYtcWNl0I
XtVsyIe9tC5G8jH4fOpCtZMWVdyhDBKg2mF+D1hYc2Ryx+hFjtyp8iY/xnmMsVMI
M4GwVhO+5lFc2JsKT0ucVlMC6U/2DWDqTUJV6HwbISHTGzrMd/K4kPFox/la/vot
9L/J9UUbzjgQKjeKeaO04wlshYaT/4mWJ3iBj2fjRnRUjtkNaeJK9E10A/+yd+2V
Z5fkscWrv2oj6NSU4kQoYsRL4vDY4ilrGnB+JGGTe08DMiUNRSQrlrRGar9KC/ea
j8GsGsVn82800vpzY4zvFrCopEYq+OsS7HK07/grfoxSwIuEVPkvPuNVqNxmsdnh
X9izjFk0WaSrT2y7HxjbdavYy5LNlDhhDgcGH0tGEPEVvo2FXDtKK4F5D7Rpn0lQ
l033DlZdwJVqwjbDG2jJ9SrcR5q+ss7FJej6A7na+RZukYT1HCjI/CbM1xyQVqdf
bzoEvM14iQuODy+jqk+iGxI9FghAD/FGTNeqewjBCvVtJ94Cj8rDtSvK6evIIVM4
pcw72Hc3MKJP2W/R8kCtQXoXxdZKNYm3QdV8hn9VTYNKpXMgwDqvkPGaJI7ZjnHK
e7iG2rKPmT4dEw0SEe7Uq/DpFXYC5ODfqiAeW2GFZECpkJcNrVPSWh2HagCXZWK0
vm9qp/UsQu0yrbYhnr68
-----END CERTIFICATE-----
@@ -1,5 +1,5 @@
#
# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2016, 2021, 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
@@ -100,7 +100,6 @@ JVM_GetExtendedNPEMessage
JVM_GetFieldIxModifiers
JVM_GetFieldTypeAnnotations
JVM_GetInheritedAccessControlContext
JVM_GetInterfaceVersion
JVM_GetManagement
JVM_GetMethodIxArgsSize
JVM_GetMethodIxByteCode
@@ -37,9 +37,8 @@ ifeq ($(TOOLCHAIN_TYPE), gcc)
BUILD_LIBJVM_cardTableBarrierSetAssembler_x86.cpp_CXXFLAGS := -Wno-maybe-uninitialized
BUILD_LIBJVM_interp_masm_x86.cpp_CXXFLAGS := -Wno-uninitialized
ifeq ($(DEBUG_LEVEL), release)
# Need extra inlining to collapse all marking code into the hot marking loop
BUILD_LIBJVM_shenandoahConcurrentMark.cpp_CXXFLAGS := --param inline-unit-growth=1000
BUILD_LIBJVM_shenandoahTraversalGC.cpp_CXXFLAGS := --param inline-unit-growth=1000
# Need extra inlining to collapse shared marking code into the hot marking loop
BUILD_LIBJVM_shenandoahMark.cpp_CXXFLAGS := --param inline-unit-growth=1000
endif
endif

@@ -1,5 +1,5 @@
#
# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2011, 2021, 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
@@ -110,9 +110,9 @@ ifeq ($(call isTargetOs, macosx), true)
$(call SET_SHARED_LIBRARY_ORIGIN), \
LIBS := \
-lobjc \
-framework JavaNativeFoundation \
-framework CoreServices \
-framework Security \
-framework Foundation \
$(JDKLIB_LIBS), \
))

@@ -1,5 +1,5 @@
#
# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2011, 2021, 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
@@ -62,14 +62,6 @@ $(eval $(call SetupCharacterData,CharacterData02, -string -plane 2, 11 4 1))
$(eval $(call SetupCharacterData,CharacterData03, -string -plane 3, 11 4 1))
$(eval $(call SetupCharacterData,CharacterData0E, -string -plane 14, 11 4 1))

# Copy two Java files that need no preprocessing.
$(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/%.java: $(CHARACTERDATA)/%.java.template
$(call LogInfo, Generating $(@F))
$(call install-file)

GENSRC_CHARACTERDATA += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/CharacterDataUndefined.java \
$(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/CharacterDataPrivateUse.java

$(GENSRC_CHARACTERDATA): $(BUILD_TOOLS_JDK)

TARGETS += $(GENSRC_CHARACTERDATA)
@@ -794,7 +794,8 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
DISABLED_WARNINGS_gcc := sign-compare type-limits unused-result \
maybe-uninitialized shift-negative-value implicit-fallthrough \
unused-function, \
DISABLED_WARNINGS_clang := incompatible-pointer-types sign-compare, \
DISABLED_WARNINGS_clang := incompatible-pointer-types sign-compare \
deprecated-declarations, \
DISABLED_WARNINGS_microsoft := 4018 4244 4267, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
@@ -1,5 +1,5 @@
#
# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2011, 2021, 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
@@ -80,8 +80,8 @@ ifneq ($(BUILD_CRYPTO), false)
DISABLED_WARNINGS_clang := deprecated-declarations, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
LIBS := -framework JavaNativeFoundation -framework Cocoa \
-framework SystemConfiguration -framework Kerberos, \
LIBS := -framework Cocoa -framework SystemConfiguration \
-framework Kerberos, \
))

TARGETS += $(BUILD_LIBOSXKRB5)
@@ -166,7 +166,7 @@ function import_path() {
# unixpath is based on short name
fi
# Make it lower case
path="$(echo "$unixpath" | tr [:upper:] [:lower:])"
path="$(echo "$unixpath" | tr '[:upper:]' '[:lower:]')"
fi
else
# On WSL1, PATHTOOL will fail for files in envroot. If the unix path
@@ -1,5 +1,5 @@
#
# Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2015, 2021, 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
@@ -77,13 +77,15 @@ endif

ifeq ($(call isTargetOs, macosx), true)
BUILD_JDK_JTREG_EXCLUDE += exelauncher.c
BUILD_JDK_JTREG_LIBRARIES_CFLAGS_libTestMainKeyWindow := -ObjC
BUILD_JDK_JTREG_LIBRARIES_LIBS_libTestMainKeyWindow := \
-framework Cocoa -framework JavaNativeFoundation
BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeJniInvocationTest := -ljli
BUILD_JDK_JTREG_LIBRARIES_LIBS_libTestDynamicStore := \
-framework Cocoa -framework SystemConfiguration
else
BUILD_JDK_JTREG_EXCLUDE += libTestMainKeyWindow.c
BUILD_JDK_JTREG_EXCLUDE += libTestMainKeyWindow.m
BUILD_JDK_JTREG_EXCLUDE += exeJniInvocationTest.c
BUILD_JDK_JTREG_EXCLUDE += libTestDynamicStore.m
endif

ifeq ($(call isTargetOs, linux), true)
@@ -1,4 +1,4 @@
# Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -158,7 +158,7 @@ OptionsMenu.dragEnabled_accessible_description=\u30C9\u30E9\u30C3\u30B0\u3092\u6

FileMenu.file.labelAndMnemonic=\u30D5\u30A1\u30A4\u30EB(&F)
FileMenu.accessible_description=\u30D5\u30A1\u30A4\u30EB\u30FB\u30E1\u30CB\u30E5\u30FC
FileMenu.about.labelAndMnemonic=\u6982\u8981(&B)
FileMenu.about.labelAndMnemonic=\u60C5\u5831(&B)
FileMenu.about_accessible_description=SwingSet2\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u8A73\u7D30\u3092\u78BA\u8A8D\u3057\u307E\u3059
FileMenu.open.labelAndMnemonic=\u958B\u304F(&O)
FileMenu.open_accessible_description=\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304F\u305F\u3081\u306E\u30E1\u30CB\u30E5\u30FC\u9805\u76EE