Skip to content

Commit d74e2b0

Browse files
committed
Merge branch 'jdk17.0.16-ga' into cvm8+17
2 parents d169aaf + 162dbac commit d74e2b0

File tree

9,276 files changed

+495157
-281893
lines changed

Some content is hidden

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

9,276 files changed

+495157
-281893
lines changed

.github/actions/get-gtest/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ runs:
4040
var: GTEST_VERSION
4141

4242
- name: 'Checkout GTest source'
43-
uses: actions/checkout@v3
43+
uses: actions/checkout@v4
4444
with:
4545
repository: google/googletest
4646
ref: 'release-${{ steps.version.outputs.value }}'

.github/workflows/build-linux.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ jobs:
7979
- name: 'Get GTest'
8080
id: gtest
8181
uses: ./.github/actions/get-gtest
82+
if: false
8283

8384
- name: 'Set architecture'
8485
id: arch

.jcheck/conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
[general]
22
project=jdk-updates
33
jbs=JDK
4-
version=17.0.8
4+
version=17.0.16
55

66
[checks]
77
error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists
8+
warning=issuestitle,binary
89

910
[repository]
1011
tags=(?:jdk-(?:[1-9]([0-9]*)(?:\.(?:0|[1-9][0-9]*)){0,4})(?:\+(?:(?:[0-9]+))|(?:-ga)))|(?:jdk[4-9](?:u\d{1,3})?-(?:(?:b\d{2,3})|(?:ga)))|(?:hs\d\d(?:\.\d{1,2})?-b\d\d)

doc/building.html

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -174,22 +174,22 @@ <h2 id="operating-system-requirements">Operating System Requirements</h2>
174174
<table>
175175
<thead>
176176
<tr class="header">
177-
<th style="text-align: left;">Operating system</th>
178-
<th style="text-align: left;">Vendor/version used</th>
177+
<th>Operating system</th>
178+
<th>Vendor/version used</th>
179179
</tr>
180180
</thead>
181181
<tbody>
182182
<tr class="odd">
183-
<td style="text-align: left;">Linux</td>
184-
<td style="text-align: left;">Oracle Enterprise Linux 6.4 / 7.6</td>
183+
<td>Linux</td>
184+
<td>Oracle Enterprise Linux 6.4 / 7.6</td>
185185
</tr>
186186
<tr class="even">
187-
<td style="text-align: left;">macOS</td>
188-
<td style="text-align: left;">Mac OS X 10.13 (High Sierra)</td>
187+
<td>macOS</td>
188+
<td>Mac OS X 10.13 (High Sierra)</td>
189189
</tr>
190190
<tr class="odd">
191-
<td style="text-align: left;">Windows</td>
192-
<td style="text-align: left;">Windows Server 2012 R2</td>
191+
<td>Windows</td>
192+
<td>Windows Server 2012 R2</td>
193193
</tr>
194194
</tbody>
195195
</table>
@@ -514,10 +514,10 @@ <h4 id="advanced-make-control-variables">Advanced Make Control Variables</h4>
514514
<h2 id="running-tests">Running Tests</h2>
515515
<p>Most of the JDK tests are using the <a href="http://openjdk.java.net/jtreg">JTReg</a> test framework. Make sure that your configuration knows where to find your installation of JTReg. If this is not picked up automatically, use the <code>--with-jtreg=&lt;path to jtreg home&gt;</code> option to point to the JTReg framework. Note that this option should point to the JTReg home, i.e. the top directory, containing <code>lib/jtreg.jar</code> etc.</p>
516516
<p>The <a href="https://wiki.openjdk.java.net/display/Adoption">Adoption Group</a> provides recent builds of jtreg <a href="https://ci.adoptium.net/view/Dependencies/job/dependency_pipeline/lastSuccessfulBuild/artifact/jtreg/">here</a>. Download the latest <code>.tar.gz</code> file, unpack it, and point <code>--with-jtreg</code> to the <code>jtreg</code> directory that you just unpacked.</p>
517-
<p>Building of Hotspot Gtest suite requires the source code of Google Test framework. The top directory, which contains both <code>googletest</code> and <code>googlemock</code> directories, should be specified via <code>--with-gtest</code>. The supported version of Google Test is 1.8.1, whose source code can be obtained:</p>
517+
<p>Building of Hotspot Gtest suite requires the source code of Google Test framework. The top directory, which contains both <code>googletest</code> and <code>googlemock</code> directories, should be specified via <code>--with-gtest</code>. The supported version of Google Test is 1.13.0, whose source code can be obtained:</p>
518518
<ul>
519-
<li>by downloading and unpacking the source bundle from <a href="https://github.com/google/googletest/releases/tag/release-1.8.1">here</a></li>
520-
<li>or by checking out <code>release-1.8.1</code> tag of <code>googletest</code> project: <code>git clone -b release-1.8.1 https://github.com/google/googletest</code></li>
519+
<li>by downloading and unpacking the source bundle from <a href="https://github.com/google/googletest/releases/tag/v1.13.0">here</a></li>
520+
<li>or by checking out <code>v1.13.0</code> tag of <code>googletest</code> project: <code>git clone -b v1.13.0 https://github.com/google/googletest</code></li>
521521
</ul>
522522
<p>To execute the most basic tests (tier 1), use:</p>
523523
<pre><code>make run-test-tier1</code></pre>
@@ -544,27 +544,27 @@ <h3 id="cross-compiling-the-easy-way-with-openjdk-devkits">Cross compiling the e
544544
<table>
545545
<thead>
546546
<tr class="header">
547-
<th style="text-align: left;">Supported devkit targets</th>
547+
<th>Supported devkit targets</th>
548548
</tr>
549549
</thead>
550550
<tbody>
551551
<tr class="odd">
552-
<td style="text-align: left;">x86_64-linux-gnu</td>
552+
<td>x86_64-linux-gnu</td>
553553
</tr>
554554
<tr class="even">
555-
<td style="text-align: left;">aarch64-linux-gnu</td>
555+
<td>aarch64-linux-gnu</td>
556556
</tr>
557557
<tr class="odd">
558-
<td style="text-align: left;">arm-linux-gnueabihf</td>
558+
<td>arm-linux-gnueabihf</td>
559559
</tr>
560560
<tr class="even">
561-
<td style="text-align: left;">ppc64-linux-gnu</td>
561+
<td>ppc64-linux-gnu</td>
562562
</tr>
563563
<tr class="odd">
564-
<td style="text-align: left;">ppc64le-linux-gnu</td>
564+
<td>ppc64le-linux-gnu</td>
565565
</tr>
566566
<tr class="even">
567-
<td style="text-align: left;">s390x-linux-gnu</td>
567+
<td>s390x-linux-gnu</td>
568568
</tr>
569569
</tbody>
570570
</table>
@@ -678,103 +678,103 @@ <h3 id="cross-compiling-with-debian-sysroots">Cross compiling with Debian sysroo
678678
<table>
679679
<thead>
680680
<tr class="header">
681-
<th style="text-align: left;">Target</th>
682-
<th style="text-align: left;">Debian tree</th>
683-
<th style="text-align: left;">Debian arch</th>
684-
<th style="text-align: left;"><code>--openjdk-target=...</code></th>
681+
<th>Target</th>
682+
<th>Debian tree</th>
683+
<th>Debian arch</th>
684+
<th><code>--openjdk-target=...</code></th>
685685
<th><code>--with-jvm-variants=...</code></th>
686686
</tr>
687687
</thead>
688688
<tbody>
689689
<tr class="odd">
690-
<td style="text-align: left;">x86</td>
691-
<td style="text-align: left;">buster</td>
692-
<td style="text-align: left;">i386</td>
693-
<td style="text-align: left;">i386-linux-gnu</td>
690+
<td>x86</td>
691+
<td>buster</td>
692+
<td>i386</td>
693+
<td>i386-linux-gnu</td>
694694
<td>(all)</td>
695695
</tr>
696696
<tr class="even">
697-
<td style="text-align: left;">arm</td>
698-
<td style="text-align: left;">buster</td>
699-
<td style="text-align: left;">armhf</td>
700-
<td style="text-align: left;">arm-linux-gnueabihf</td>
697+
<td>arm</td>
698+
<td>buster</td>
699+
<td>armhf</td>
700+
<td>arm-linux-gnueabihf</td>
701701
<td>(all)</td>
702702
</tr>
703703
<tr class="odd">
704-
<td style="text-align: left;">aarch64</td>
705-
<td style="text-align: left;">buster</td>
706-
<td style="text-align: left;">arm64</td>
707-
<td style="text-align: left;">aarch64-linux-gnu</td>
704+
<td>aarch64</td>
705+
<td>buster</td>
706+
<td>arm64</td>
707+
<td>aarch64-linux-gnu</td>
708708
<td>(all)</td>
709709
</tr>
710710
<tr class="even">
711-
<td style="text-align: left;">ppc64le</td>
712-
<td style="text-align: left;">buster</td>
713-
<td style="text-align: left;">ppc64el</td>
714-
<td style="text-align: left;">powerpc64le-linux-gnu</td>
711+
<td>ppc64le</td>
712+
<td>buster</td>
713+
<td>ppc64el</td>
714+
<td>powerpc64le-linux-gnu</td>
715715
<td>(all)</td>
716716
</tr>
717717
<tr class="odd">
718-
<td style="text-align: left;">s390x</td>
719-
<td style="text-align: left;">buster</td>
720-
<td style="text-align: left;">s390x</td>
721-
<td style="text-align: left;">s390x-linux-gnu</td>
718+
<td>s390x</td>
719+
<td>buster</td>
720+
<td>s390x</td>
721+
<td>s390x-linux-gnu</td>
722722
<td>(all)</td>
723723
</tr>
724724
<tr class="even">
725-
<td style="text-align: left;">mipsle</td>
726-
<td style="text-align: left;">buster</td>
727-
<td style="text-align: left;">mipsel</td>
728-
<td style="text-align: left;">mipsel-linux-gnu</td>
725+
<td>mipsle</td>
726+
<td>buster</td>
727+
<td>mipsel</td>
728+
<td>mipsel-linux-gnu</td>
729729
<td>zero</td>
730730
</tr>
731731
<tr class="odd">
732-
<td style="text-align: left;">mips64le</td>
733-
<td style="text-align: left;">buster</td>
734-
<td style="text-align: left;">mips64el</td>
735-
<td style="text-align: left;">mips64el-linux-gnueabi64</td>
732+
<td>mips64le</td>
733+
<td>buster</td>
734+
<td>mips64el</td>
735+
<td>mips64el-linux-gnueabi64</td>
736736
<td>zero</td>
737737
</tr>
738738
<tr class="even">
739-
<td style="text-align: left;">armel</td>
740-
<td style="text-align: left;">buster</td>
741-
<td style="text-align: left;">arm</td>
742-
<td style="text-align: left;">arm-linux-gnueabi</td>
739+
<td>armel</td>
740+
<td>buster</td>
741+
<td>arm</td>
742+
<td>arm-linux-gnueabi</td>
743743
<td>zero</td>
744744
</tr>
745745
<tr class="odd">
746-
<td style="text-align: left;">ppc</td>
747-
<td style="text-align: left;">sid</td>
748-
<td style="text-align: left;">powerpc</td>
749-
<td style="text-align: left;">powerpc-linux-gnu</td>
746+
<td>ppc</td>
747+
<td>sid</td>
748+
<td>powerpc</td>
749+
<td>powerpc-linux-gnu</td>
750750
<td>zero</td>
751751
</tr>
752752
<tr class="even">
753-
<td style="text-align: left;">ppc64be</td>
754-
<td style="text-align: left;">sid</td>
755-
<td style="text-align: left;">ppc64</td>
756-
<td style="text-align: left;">powerpc64-linux-gnu</td>
753+
<td>ppc64be</td>
754+
<td>sid</td>
755+
<td>ppc64</td>
756+
<td>powerpc64-linux-gnu</td>
757757
<td>(all)</td>
758758
</tr>
759759
<tr class="odd">
760-
<td style="text-align: left;">m68k</td>
761-
<td style="text-align: left;">sid</td>
762-
<td style="text-align: left;">m68k</td>
763-
<td style="text-align: left;">m68k-linux-gnu</td>
760+
<td>m68k</td>
761+
<td>sid</td>
762+
<td>m68k</td>
763+
<td>m68k-linux-gnu</td>
764764
<td>zero</td>
765765
</tr>
766766
<tr class="even">
767-
<td style="text-align: left;">alpha</td>
768-
<td style="text-align: left;">sid</td>
769-
<td style="text-align: left;">alpha</td>
770-
<td style="text-align: left;">alpha-linux-gnu</td>
767+
<td>alpha</td>
768+
<td>sid</td>
769+
<td>alpha</td>
770+
<td>alpha-linux-gnu</td>
771771
<td>zero</td>
772772
</tr>
773773
<tr class="odd">
774-
<td style="text-align: left;">sh4</td>
775-
<td style="text-align: left;">sid</td>
776-
<td style="text-align: left;">sh4</td>
777-
<td style="text-align: left;">sh4-linux-gnu</td>
774+
<td>sh4</td>
775+
<td>sid</td>
776+
<td>sh4</td>
777+
<td>sh4-linux-gnu</td>
778778
<td>zero</td>
779779
</tr>
780780
</tbody>

doc/building.md

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,11 @@ This table lists the OS versions used by Oracle when building the JDK. Such
154154
information is always subject to change, but this table is up to date at the
155155
time of writing.
156156

157-
Operating system Vendor/version used
158-
----------------- -------------------------------------------------------
159-
Linux Oracle Enterprise Linux 6.4 / 7.6
160-
macOS Mac OS X 10.13 (High Sierra)
161-
Windows Windows Server 2012 R2
157+
| Operating system | Vendor/version used |
158+
| ----------------- | ---------------------------------- |
159+
| Linux | Oracle Enterprise Linux 6.4 / 7.6 |
160+
| macOS | Mac OS X 10.13 (High Sierra) |
161+
| Windows | Windows Server 2012 R2 |
162162

163163
The double version numbers for Linux are due to the hybrid model
164164
used at Oracle, where header files and external libraries from an older version
@@ -852,13 +852,14 @@ https://ci.adoptium.net/view/Dependencies/job/dependency_pipeline/lastSuccessful
852852
Download the latest `.tar.gz` file, unpack it, and point `--with-jtreg` to the
853853
`jtreg` directory that you just unpacked.
854854
855-
Building of Hotspot Gtest suite requires the source code of Google Test framework.
856-
The top directory, which contains both `googletest` and `googlemock`
857-
directories, should be specified via `--with-gtest`.
858-
The supported version of Google Test is 1.8.1, whose source code can be obtained:
855+
Building of Hotspot Gtest suite requires the source code of Google
856+
Test framework. The top directory, which contains both `googletest`
857+
and `googlemock` directories, should be specified via `--with-gtest`.
858+
The minimum supported version of Google Test is 1.13.0, whose source
859+
code can be obtained:
859860
860-
* by downloading and unpacking the source bundle from [here](https://github.com/google/googletest/releases/tag/release-1.8.1)
861-
* or by checking out `release-1.8.1` tag of `googletest` project: `git clone -b release-1.8.1 https://github.com/google/googletest`
861+
* by downloading and unpacking the source bundle from [here](https://github.com/google/googletest/releases/tag/v1.13.0)
862+
* or by checking out `v1.13.0` tag of `googletest` project: `git clone -b v1.13.0 https://github.com/google/googletest`
862863
863864
To execute the most basic tests (tier 1), use:
864865
```
@@ -957,14 +958,14 @@ https://sourceware.org/autobook/autobook/autobook_17.html). If no
957958
targets are given, a native toolchain for the current platform will be
958959
created. Currently, at least the following targets are known to work:
959960
960-
Supported devkit targets
961-
-------------------------
962-
x86_64-linux-gnu
963-
aarch64-linux-gnu
964-
arm-linux-gnueabihf
965-
ppc64-linux-gnu
966-
ppc64le-linux-gnu
967-
s390x-linux-gnu
961+
| Supported devkit targets |
962+
| ------------------------ |
963+
| x86_64-linux-gnu |
964+
| aarch64-linux-gnu |
965+
| arm-linux-gnueabihf |
966+
| ppc64-linux-gnu |
967+
| ppc64le-linux-gnu |
968+
| s390x-linux-gnu |
968969
969970
`BASE_OS` must be one of "OEL6" for Oracle Enterprise Linux 6 or
970971
"Fedora" (if not specified "OEL6" will be the default). If the base OS
@@ -1184,21 +1185,21 @@ it might require a little nudge with:
11841185
11851186
Architectures that are known to successfully cross-compile like this are:
11861187
1187-
Target Debian tree Debian arch `--openjdk-target=...` `--with-jvm-variants=...`
1188-
------------ ------------ ------------- ------------------------ --------------
1189-
x86 buster i386 i386-linux-gnu (all)
1190-
arm buster armhf arm-linux-gnueabihf (all)
1191-
aarch64 buster arm64 aarch64-linux-gnu (all)
1192-
ppc64le buster ppc64el powerpc64le-linux-gnu (all)
1193-
s390x buster s390x s390x-linux-gnu (all)
1194-
mipsle buster mipsel mipsel-linux-gnu zero
1195-
mips64le buster mips64el mips64el-linux-gnueabi64 zero
1196-
armel buster arm arm-linux-gnueabi zero
1197-
ppc sid powerpc powerpc-linux-gnu zero
1198-
ppc64be sid ppc64 powerpc64-linux-gnu (all)
1199-
m68k sid m68k m68k-linux-gnu zero
1200-
alpha sid alpha alpha-linux-gnu zero
1201-
sh4 sid sh4 sh4-linux-gnu zero
1188+
| Target | Debian tree | Debian arch | `--openjdk-target=...` | `--with-jvm-variants=...` |
1189+
| ------------ | ------------ | ------------- | ------------------------ | ------------------------- |
1190+
| x86 | buster | i386 | i386-linux-gnu | (all) |
1191+
| arm | buster | armhf | arm-linux-gnueabihf | (all) |
1192+
| aarch64 | buster | arm64 | aarch64-linux-gnu | (all) |
1193+
| ppc64le | buster | ppc64el | powerpc64le-linux-gnu | (all) |
1194+
| s390x | buster | s390x | s390x-linux-gnu | (all) |
1195+
| mipsle | buster | mipsel | mipsel-linux-gnu | zero |
1196+
| mips64le | buster | mips64el | mips64el-linux-gnueabi64 | zero |
1197+
| armel | buster | arm | arm-linux-gnueabi | zero |
1198+
| ppc | sid | powerpc | powerpc-linux-gnu | zero |
1199+
| ppc64be | sid | ppc64 | powerpc64-linux-gnu | (all) |
1200+
| m68k | sid | m68k | m68k-linux-gnu | zero |
1201+
| alpha | sid | alpha | alpha-linux-gnu | zero |
1202+
| sh4 | sid | sh4 | sh4-linux-gnu | zero |
12021203
12031204
### Building for ARM/aarch64
12041205

0 commit comments

Comments
 (0)