Skip to content

Commit cf24236

Browse files
theaoqitheaoqi
committed
Merge
2 parents 114dfbe + ea6e92e commit cf24236

File tree

642 files changed

+13431
-5266
lines changed

Some content is hidden

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

642 files changed

+13431
-5266
lines changed

‎.github/actions/get-msys2/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2022, 2023, 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

‎.github/workflows/build-cross-compile.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2022, 2023, 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

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ on:
3030
branches-ignore:
3131
- master
3232
- pr/*
33+
- jdk*
3334
workflow_dispatch:
3435
inputs:
3536
platforms:

‎configure‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
44
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
#
66
# This code is free software; you can redistribute it and/or modify it
@@ -26,10 +26,14 @@
2626
# make sure that is called using bash.
2727

2828
# Get an absolute path to this script, since that determines the top-level directory.
29-
this_script_dir=`dirname $0`
30-
this_script_dir=`cd $this_script_dir > /dev/null && pwd`
29+
source_path="$(dirname ${0})"
30+
this_script_dir="$(cd -- "${source_path}" > /dev/null && pwd)"
31+
if test -z "${this_script_dir}"; then
32+
echo "Error: Could not determine location of configure script"
33+
exit 1
34+
fi
3135

3236
# Delegate to wrapper, forcing wrapper to believe $0 is this script by using -c.
3337
# This trick is needed to get autoconf to co-operate properly.
3438
# The ${-:+-$-} construction passes on bash options.
35-
bash ${-:+-$-} -c ". $this_script_dir/make/autoconf/configure" $this_script_dir/configure CHECKME $this_script_dir "$@"
39+
bash ${-:+-$-} -c ". \"${this_script_dir}/make/autoconf/configure\"" "${this_script_dir}/configure" CHECKME "${this_script_dir}" "$@"

‎doc/testing.html‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -586,12 +586,15 @@ <h3 id="pkcs11-tests">PKCS11 Tests</h3>
586586
are hard to diagnose. For example,
587587
sun/security/pkcs11/Secmod/AddTrustedCert.java may fail on Ubuntu 18.04
588588
with the default NSS version in the system. To run these tests
589-
correctly, the system property <code>test.nss.lib.paths</code> is
590-
required on Ubuntu 18.04 to specify the alternative NSS lib
591-
directories.</p>
589+
correctly, the system property
590+
<code>jdk.test.lib.artifacts.&lt;NAME&gt;</code> is required on Ubuntu
591+
18.04 to specify the alternative NSS lib directory. The
592+
<code>&lt;NAME&gt;</code> component should be replaced with the name
593+
element of the appropriate <code>@Artifact</code> class. (See
594+
<code>test/jdk/sun/security/pkcs11/PKCS11Test.java</code>)</p>
592595
<p>For example:</p>
593596
<pre><code>$ make test TEST=&quot;jtreg:sun/security/pkcs11/Secmod/AddTrustedCert.java&quot; \
594-
JTREG=&quot;JAVA_OPTIONS=-Dtest.nss.lib.paths=/path/to/your/latest/NSS-libs&quot;</code></pre>
597+
JTREG=&quot;JAVA_OPTIONS=-Djdk.test.lib.artifacts.nsslib-linux_aarch64=/path/to/NSS-libs&quot;</code></pre>
595598
<p>For more notes about the PKCS11 tests, please refer to
596599
test/jdk/sun/security/pkcs11/README.</p>
597600
<h3 id="client-ui-tests">Client UI Tests</h3>

‎doc/testing.md‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -604,14 +604,16 @@ It is highly recommended to use the latest NSS version when running PKCS11
604604
tests. Improper NSS version may lead to unexpected failures which are hard to
605605
diagnose. For example, sun/security/pkcs11/Secmod/AddTrustedCert.java may fail
606606
on Ubuntu 18.04 with the default NSS version in the system. To run these tests
607-
correctly, the system property `test.nss.lib.paths` is required on Ubuntu 18.04
608-
to specify the alternative NSS lib directories.
607+
correctly, the system property `jdk.test.lib.artifacts.<NAME>` is required on
608+
Ubuntu 18.04 to specify the alternative NSS lib directory. The `<NAME>`
609+
component should be replaced with the name element of the appropriate
610+
`@Artifact` class. (See `test/jdk/sun/security/pkcs11/PKCS11Test.java`)
609611

610612
For example:
611613

612614
```
613615
$ make test TEST="jtreg:sun/security/pkcs11/Secmod/AddTrustedCert.java" \
614-
JTREG="JAVA_OPTIONS=-Dtest.nss.lib.paths=/path/to/your/latest/NSS-libs"
616+
JTREG="JAVA_OPTIONS=-Djdk.test.lib.artifacts.nsslib-linux_aarch64=/path/to/NSS-libs"
615617
```
616618

617619
For more notes about the PKCS11 tests, please refer to

‎make/CompileDemos.gmk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2011, 2023, 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

‎make/CompileModuleTools.gmk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2013, 2023, 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

‎make/Global.gmk‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2012, 2023, 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
@@ -52,7 +52,6 @@ help:
5252
$(info $(_) make docs # Create all docs)
5353
$(info $(_) make docs-jdk-api # Create just JDK javadocs)
5454
$(info $(_) make bootcycle-images # Build images twice, second time with newly built JDK)
55-
$(info $(_) make install # Install the generated images locally)
5655
$(info $(_) make check # Run basic testing (currently tier1))
5756
$(info $(_) make test-<test> # Run test, e.g. test-tier1)
5857
$(info $(_) make test TEST=<t> # Run test(s) given by TEST specification)

‎make/Hsdis.gmk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2020, 2023, 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,7 @@ ifeq ($(HSDIS_BACKEND), capstone)
4747
CAPSTONE_ARCH := CS_ARCH_X86
4848
CAPSTONE_MODE := CS_MODE_$(OPENJDK_TARGET_CPU_BITS)
4949
else ifeq ($(call isTargetCpuArch, aarch64), true)
50-
CAPSTONE_ARCH := CS_ARCH_ARM64
50+
CAPSTONE_ARCH := CS_ARCH_$(CAPSTONE_ARCH_AARCH64_NAME)
5151
CAPSTONE_MODE := CS_MODE_ARM
5252
else
5353
$(error No support for Capstone on this platform)

0 commit comments

Comments
 (0)