Skip to content

Commit 9359d74

Browse files
committed
Merge
2 parents b85db91 + 0ec1838 commit 9359d74

File tree

391 files changed

+9548
-4828
lines changed

Some content is hidden

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

391 files changed

+9548
-4828
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Welcome to the JDK!
22

33
For build instructions please see the
4-
[online documentation](https://openjdk.java.net/groups/build/doc/building.html),
4+
[online documentation](https://openjdk.org/groups/build/doc/building.html),
55
or either of these files:
66

77
- [doc/building.html](doc/building.html) (html version)
88
- [doc/building.md](doc/building.md) (markdown version)
99

10-
See <https://openjdk.java.net/> for more information about
10+
See <https://openjdk.org/> for more information about
1111
the OpenJDK Community and the JDK.

doc/building.html

Lines changed: 13 additions & 13 deletions
Large diffs are not rendered by default.

doc/building.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ the time. They assume that you have installed Git (and Cygwin if running
77
on Windows) and cloned the top-level JDK repository that you want to build.
88

99
1. [Get the complete source code](#getting-the-source-code): \
10-
`git clone https://git.openjdk.java.net/jdk/`
10+
`git clone https://git.openjdk.org/jdk/`
1111

1212
2. [Run configure](#running-configure): \
1313
`bash configure`
@@ -40,14 +40,14 @@ reasonably powerful hardware.
4040

4141
If you just want to use the JDK and not build it yourself, this document is not
4242
for you. See for instance [OpenJDK installation](
43-
http://openjdk.java.net/install) for some methods of installing a prebuilt
43+
http://openjdk.org/install) for some methods of installing a prebuilt
4444
JDK.
4545

4646
## Getting the Source Code
4747

4848
Make sure you are getting the correct version. As of JDK 10, the source is no
4949
longer split into separate repositories so you only need to clone one single
50-
repository. At the [OpenJDK Git site](https://git.openjdk.java.net/) you
50+
repository. At the [OpenJDK Git site](https://git.openjdk.org/) you
5151
can see a list of all available repositories. If you want to build an older version,
5252
e.g. JDK 11, it is recommended that you get the `jdk11u` repo, which contains
5353
incremental updates, instead of the `jdk11` repo, which was frozen at JDK 11 GA.
@@ -96,7 +96,7 @@ on where and how to check out the source code.
9696
Cygwin paths (which are used throughout the JDK build system).
9797
However, it does not currently work well with the Skara CLI tooling.
9898
Please see the [Skara wiki on Git clients](
99-
https://wiki.openjdk.java.net/display/SKARA/Skara#Skara-Git) for
99+
https://wiki.openjdk.org/display/SKARA/Skara#Skara-Git) for
100100
up-to-date information about the Skara git client support.
101101

102102
* The [Git for Windows](https://gitforwindows.org) client has issues
@@ -173,7 +173,7 @@ used at Oracle, where header files and external libraries from an older version
173173
are used when building on a more modern version of the OS.
174174

175175
The Build Group has a wiki page with [Supported Build Platforms](
176-
https://wiki.openjdk.java.net/display/Build/Supported+Build+Platforms). From
176+
https://wiki.openjdk.org/display/Build/Supported+Build+Platforms). From
177177
time to time, this is updated by contributors to list successes or failures of
178178
building on different platforms.
179179

@@ -303,7 +303,7 @@ sudo apk add build-base bash grep zip
303303
### AIX
304304

305305
Please consult the AIX section of the [Supported Build Platforms](
306-
https://wiki.openjdk.java.net/display/Build/Supported+Build+Platforms) OpenJDK
306+
https://wiki.openjdk.org/display/Build/Supported+Build+Platforms) OpenJDK
307307
Build Wiki page for details about which versions of AIX are supported.
308308

309309
## Native Compiler (Toolchain) Requirements
@@ -397,7 +397,7 @@ be because of [spaces in path](#spaces-in-path).
397397
### IBM XL C/C++
398398

399399
Please consult the AIX section of the [Supported Build Platforms](
400-
https://wiki.openjdk.java.net/display/Build/Supported+Build+Platforms) OpenJDK
400+
https://wiki.openjdk.org/display/Build/Supported+Build+Platforms) OpenJDK
401401
Build Wiki page for details about which versions of XLC are supported.
402402

403403

@@ -848,14 +848,14 @@ Suggestions for Advanced Users](#hints-and-suggestions-for-advanced-users) and
848848
849849
## Running Tests
850850
851-
Most of the JDK tests are using the [JTReg](http://openjdk.java.net/jtreg)
851+
Most of the JDK tests are using the [JTReg](http://openjdk.org/jtreg)
852852
test framework. Make sure that your configuration knows where to find your
853853
installation of JTReg. If this is not picked up automatically, use the
854854
`--with-jtreg=<path to jtreg home>` option to point to the JTReg framework.
855855
Note that this option should point to the JTReg home, i.e. the top directory,
856856
containing `lib/jtreg.jar` etc.
857857
858-
The [Adoption Group](https://wiki.openjdk.java.net/display/Adoption) provides
858+
The [Adoption Group](https://wiki.openjdk.org/display/Adoption) provides
859859
recent builds of jtreg [here](
860860
https://ci.adoptopenjdk.net/view/Dependencies/job/dependency_pipeline/lastSuccessfulBuild/artifact/jtreg/).
861861
Download the latest `.tar.gz` file, unpack it, and point `--with-jtreg` to the
@@ -1548,7 +1548,7 @@ You can run `fsutil file setshortname` in `cmd` on certain directories, such as
15481548
15491549
If none of the suggestions in this document helps you, or if you find what you
15501550
believe is a bug in the build system, please contact the Build Group by sending
1551-
a mail to [build-dev@openjdk.java.net](mailto:build-dev@openjdk.java.net).
1551+
a mail to [build-dev@openjdk.org](mailto:build-dev@openjdk.org).
15521552
Please include the relevant parts of the configure and/or build log.
15531553
15541554
If you need general help or advice about developing for the JDK, you can also
@@ -1958,7 +1958,7 @@ To analyze build performance, run with `LOG=trace` and check `$BUILD/build-trace
19581958
Use `JOBS=1` to avoid parallelism.
19591959
19601960
Please check that you adhere to the [Code Conventions for the Build System](
1961-
http://openjdk.java.net/groups/build/doc/code-conventions.html) before
1961+
http://openjdk.org/groups/build/doc/code-conventions.html) before
19621962
submitting patches.
19631963
19641964
## Contributing to the JDK
@@ -1971,19 +1971,19 @@ However, please bear in mind that the JDK is a massive project, and we must ask
19711971
you to follow our rules and guidelines to be able to accept your contribution.
19721972
19731973
The official place to start is the ['How to contribute' page](
1974-
http://openjdk.java.net/contribute/). There is also an official (but somewhat
1974+
http://openjdk.org/contribute/). There is also an official (but somewhat
19751975
outdated and skimpy on details) [Developer's Guide](
1976-
http://openjdk.java.net/guide/).
1976+
http://openjdk.org/guide/).
19771977
19781978
If this seems overwhelming to you, the Adoption Group is there to help you! A
19791979
good place to start is their ['New Contributor' page](
1980-
https://wiki.openjdk.java.net/display/Adoption/New+Contributor), or start
1980+
https://wiki.openjdk.org/display/Adoption/New+Contributor), or start
19811981
reading the comprehensive [Getting Started Kit](
19821982
https://adoptopenjdk.gitbooks.io/adoptopenjdk-getting-started-kit/en/). The
19831983
Adoption Group will also happily answer any questions you have about
19841984
contributing. Contact them by [mail](
1985-
http://mail.openjdk.java.net/mailman/listinfo/adoption-discuss) or [IRC](
1986-
http://openjdk.java.net/irc/).
1985+
http://mail.openjdk.org/mailman/listinfo/adoption-discuss) or [IRC](
1986+
http://openjdk.org/irc/).
19871987
19881988
## Editing this document
19891989

doc/hotspot-style.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ <h3 id="why-care-about-style">Why Care About Style?</h3>
6868
<h3 id="counterexamples-and-updates">Counterexamples and Updates</h3>
6969
<p>Many of the guidelines mentioned here have (sometimes widespread) counterexamples in the HotSpot code base. Finding a counterexample is not sufficient justification for new code to follow the counterexample as a precedent, since readers of your code will rightfully expect your code to follow the greater bulk of precedents documented here.</p>
7070
<p>Occasionally a guideline mentioned here may be just out of synch with the actual HotSpot code base. If you find that a guideline is consistently contradicted by a large number of counterexamples, please bring it up for discussion and possible change. The architectural rule, of course, is &quot;When in Rome do as the Romans&quot;. Sometimes in the suburbs of Rome the rules are a little different; these differences can be pointed out here.</p>
71-
<p>Proposed changes should be discussed on the <a href="mailto:hotspot-dev@openjdk.java.net">HotSpot Developers</a> mailing list. Changes are likely to be cautious and incremental, since HotSpot coders have been using these guidelines for years.</p>
72-
<p>Substantive changes are approved by <a href="https://www.rfc-editor.org/rfc/rfc7282.html">rough consensus</a> of the <a href="https://openjdk.java.net/census#hotspot">HotSpot Group</a> Members. The Group Lead determines whether consensus has been reached.</p>
71+
<p>Proposed changes should be discussed on the <a href="mailto:hotspot-dev@openjdk.org">HotSpot Developers</a> mailing list. Changes are likely to be cautious and incremental, since HotSpot coders have been using these guidelines for years.</p>
72+
<p>Substantive changes are approved by <a href="https://www.rfc-editor.org/rfc/rfc7282.html">rough consensus</a> of the <a href="https://openjdk.org/census#hotspot">HotSpot Group</a> Members. The Group Lead determines whether consensus has been reached.</p>
7373
<p>Editorial changes (changes that only affect the description of HotSpot style, not its substance) do not require the full consensus gathering process. The normal HotSpot pull request process may be used for editorial changes, with the additional requirement that the requisite reviewers are also HotSpot Group Members.</p>
7474
<h2 id="structure-and-formatting">Structure and Formatting</h2>
7575
<h3 id="factoring-and-class-design">Factoring and Class Design</h3>
@@ -238,7 +238,7 @@ <h3 id="c-standard-library">C++ Standard Library</h3>
238238
<p>Some reasons for this include</p>
239239
<ul>
240240
<li><p>Exceptions. Perhaps the largest core issue with adopting the use of Standard Library facilities is exceptions. HotSpot does not use exceptions and, for platforms which allow doing so, builds with them turned off. Many Standard Library facilities implicitly or explicitly use exceptions.</p></li>
241-
<li><p><code>assert</code>. An issue that is quickly encountered is the <code>assert</code> macro name collision (<a href="https://bugs.openjdk.java.net/browse/JDK-8007770">JDK-8007770</a>). Some mechanism for addressing this would be needed before much of the Standard Library could be used. (Not all Standard Library implementations use assert in header files, but some do.)</p></li>
241+
<li><p><code>assert</code>. An issue that is quickly encountered is the <code>assert</code> macro name collision (<a href="https://bugs.openjdk.org/browse/JDK-8007770">JDK-8007770</a>). Some mechanism for addressing this would be needed before much of the Standard Library could be used. (Not all Standard Library implementations use assert in header files, but some do.)</p></li>
242242
<li><p>Memory allocation. HotSpot requires explicit control over where allocations occur. The C++98/03 <code>std::allocator</code> class is too limited to support our usage. (Changes in more recent Standards may remove this limitation.)</p></li>
243243
<li><p>Implementation vagaries. Bugs, or simply different implementation choices, can lead to different behaviors among the various Standard Libraries we need to deal with.</p></li>
244244
<li><p>Inconsistent naming conventions. HotSpot and the C++ Standard use different naming conventions. The coexistence of those different conventions might appear jarring and reduce readability.</p></li>
@@ -272,7 +272,7 @@ <h3 id="enum">enum</h3>
272272
<p>Due to bugs in certain (very old) compilers, there is widespread use of enums and avoidance of in-class initialization of static integral constant members. Compilers having such bugs are no longer supported. Except where an enum is semantically appropriate, new code should use integral constants.</p>
273273
<h3 id="thread_local">thread_local</h3>
274274
<p>Avoid use of <code>thread_local</code> (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2659.htm">n2659</a>); and instead, use the HotSpot macro <code>THREAD_LOCAL</code>, for which the initializer must be a constant expression. When <code>thread_local</code> must be used, use the Hotspot macro <code>APPROVED_CPP_THREAD_LOCAL</code> to indicate that the use has been given appropriate consideration.</p>
275-
<p>As was discussed in the review for <a href="https://mail.openjdk.java.net/pipermail/hotspot-dev/2019-September/039487.html">JDK-8230877</a>, <code>thread_local</code> allows dynamic initialization and destruction semantics. However, that support requires a run-time penalty for references to non-function-local <code>thread_local</code> variables defined in a different translation unit, even if they don't need dynamic initialization. Dynamic initialization and destruction of non-local <code>thread_local</code> variables also has the same ordering problems as for ordinary non-local variables. So we avoid use of <code>thread_local</code> in general, limiting its use to only those cases where dynamic initialization or destruction are essential. See <a href="https://bugs.openjdk.java.net/browse/JDK-8282469">JDK-8282469</a> for further discussion.</p>
275+
<p>As was discussed in the review for <a href="https://mail.openjdk.org/pipermail/hotspot-dev/2019-September/039487.html">JDK-8230877</a>, <code>thread_local</code> allows dynamic initialization and destruction semantics. However, that support requires a run-time penalty for references to non-function-local <code>thread_local</code> variables defined in a different translation unit, even if they don't need dynamic initialization. Dynamic initialization and destruction of non-local <code>thread_local</code> variables also has the same ordering problems as for ordinary non-local variables. So we avoid use of <code>thread_local</code> in general, limiting its use to only those cases where dynamic initialization or destruction are essential. See <a href="https://bugs.openjdk.org/browse/JDK-8282469">JDK-8282469</a> for further discussion.</p>
276276
<h3 id="nullptr">nullptr</h3>
277277
<p>Prefer <code>nullptr</code> (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2431.pdf">n2431</a>) to <code>NULL</code>. Don't use (constexpr or literal) 0 for pointers.</p>
278278
<p>For historical reasons there are widespread uses of both <code>NULL</code> and of integer 0 as a pointer value.</p>

doc/hotspot-style.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ suburbs of Rome the rules are a little different; these differences
5555
can be pointed out here.
5656

5757
Proposed changes should be discussed on the
58-
[HotSpot Developers](mailto:hotspot-dev@openjdk.java.net) mailing
58+
[HotSpot Developers](mailto:hotspot-dev@openjdk.org) mailing
5959
list. Changes are likely to be cautious and incremental, since HotSpot
6060
coders have been using these guidelines for years.
6161

6262
Substantive changes are approved by
6363
[rough consensus](https://www.rfc-editor.org/rfc/rfc7282.html) of
64-
the [HotSpot Group](https://openjdk.java.net/census#hotspot) Members.
64+
the [HotSpot Group](https://openjdk.org/census#hotspot) Members.
6565
The Group Lead determines whether consensus has been reached.
6666

6767
Editorial changes (changes that only affect the description of HotSpot
@@ -550,7 +550,7 @@ turned off. Many Standard Library facilities implicitly or explicitly
550550
use exceptions.
551551

552552
* `assert`. An issue that is quickly encountered is the `assert` macro name
553-
collision ([JDK-8007770](https://bugs.openjdk.java.net/browse/JDK-8007770)).
553+
collision ([JDK-8007770](https://bugs.openjdk.org/browse/JDK-8007770)).
554554
Some mechanism for addressing this would be needed before much of the
555555
Standard Library could be used. (Not all Standard Library implementations
556556
use assert in header files, but some do.)
@@ -661,7 +661,7 @@ be a constant expression. When `thread_local` must be used, use the Hotspot macr
661661
consideration.
662662

663663
As was discussed in the review for
664-
[JDK-8230877](https://mail.openjdk.java.net/pipermail/hotspot-dev/2019-September/039487.html),
664+
[JDK-8230877](https://mail.openjdk.org/pipermail/hotspot-dev/2019-September/039487.html),
665665
`thread_local` allows dynamic initialization and destruction
666666
semantics. However, that support requires a run-time penalty for
667667
references to non-function-local `thread_local` variables defined in a
@@ -671,7 +671,7 @@ non-local `thread_local` variables also has the same ordering
671671
problems as for ordinary non-local variables. So we avoid use of
672672
`thread_local` in general, limiting its use to only those cases where dynamic
673673
initialization or destruction are essential. See
674-
[JDK-8282469](https://bugs.openjdk.java.net/browse/JDK-8282469)
674+
[JDK-8282469](https://bugs.openjdk.org/browse/JDK-8282469)
675675
for further discussion.
676676

677677
### nullptr

make/Doctor.gmk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ epilogue: check-bad-file-names
134134
$(ECHO) '* The build README (doc/building.md) is a great source of information,'
135135
$(ECHO) 'especially the chapter "Fixing Unexpected Build Failures". Check it out!'
136136
$(ECHO)
137-
$(ECHO) '* If you still need assistance please contact build-dev@openjdk.java.net.'
137+
$(ECHO) '* If you still need assistance please contact build-dev@openjdk.org.'
138138
$(ECHO)
139139

140140
TARGETS += epilogue

make/RunTests.gmk

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,13 +1185,11 @@ ifeq ($(TEST_OPTS_JCOV), true)
11851185
JCOV_SOURCE_DIFF := $(JCOV_OUTPUT_DIR)/source_diff
11861186
JCOV_DIFF_COVERAGE_REPORT := $(JCOV_OUTPUT_DIR)/diff_coverage_report
11871187

1188-
ifneq ($(and $(HG), $(wildcard $(TOPDIR)/.hg)), )
1189-
DIFF_COMMAND := $(HG) -R $(TOPDIR) diff -r $(TEST_OPTS_JCOV_DIFF_CHANGESET) > $(JCOV_SOURCE_DIFF)
1190-
else ifneq ($(and $(GIT), $(wildcard $(TOPDIR)/.git)), )
1188+
ifneq ($(and $(GIT), $(wildcard $(TOPDIR)/.git)), )
11911189
DIFF_COMMAND := $(GIT) -C $(TOPDIR) diff $(TEST_OPTS_JCOV_DIFF_CHANGESET) > $(JCOV_SOURCE_DIFF)
11921190
else
1193-
$(info Error: Must be either hg or git source tree for diff coverage.)
1194-
$(error Neither hg nor git source tree.)
1191+
$(info Error: Must be a git source tree for diff coverage.)
1192+
$(error No git source tree.)
11951193
endif
11961194

11971195
jcov-gen-diffcoverage: jcov-stop-grabber

make/RunTestsPrebuiltSpec.gmk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ ZIPEXE := zip
169169
UNZIP := unzip
170170
EXPR := expr
171171
FILE := file
172-
HG := hg
173172
ULIMIT := ulimit
174173

175174
ifeq ($(OPENJDK_BUILD_OS), windows)

make/SourceRevision.gmk

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,7 @@ $(eval $(call IncludeCustomExtension, SourceRevision-pre.gmk))
4242
STORED_SOURCE_REVISION := $(TOPDIR)/.src-rev
4343

4444
USE_SCM := false
45-
ifneq ($(and $(HG), $(wildcard $(TOPDIR)/.hg)), )
46-
USE_SCM := true
47-
SCM_DIR := .hg
48-
ID_COMMAND := $(PRINTF) "hg:%s" "$$($(HG) id -i)"
49-
else ifneq ($(and $(GIT), $(wildcard $(TOPDIR)/.git)), )
45+
ifneq ($(and $(GIT), $(wildcard $(TOPDIR)/.git)), )
5046
USE_SCM := true
5147
SCM_DIR := .git
5248
ID_COMMAND := $(PRINTF) "git:%s%s\n" \
@@ -85,7 +81,7 @@ ifeq ($(USE_SCM), true)
8581
REPO_REVISIONS += $$(SUPPORT_OUTPUTDIR)/src-rev/$$($1_FILENAME)
8682
endef
8783

88-
# Setup rules for all repos. This makes sure all the "hg id" calls are made
84+
# Setup rules for all repos. This makes sure all the "git log" calls are made
8985
# in parallel.
9086
$(foreach repo, $(call FindAllReposRel), \
9187
$(eval $(call SetupGetRevisionForRepo, $(repo))) \

make/autoconf/basic.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ AC_DEFUN_ONCE([BASIC_CHECK_SRC_PERMS],
453453
# in the source tree when configure runs
454454
file_to_test="$TOPDIR/Makefile"
455455
if test `$STAT -c '%a' "$file_to_test"` -lt 400; then
456-
AC_MSG_ERROR([Bad file permissions on src files. This is usually caused by cloning the repositories with a non cygwin hg in a directory not created in cygwin.])
456+
AC_MSG_ERROR([Bad file permissions on src files. This is usually caused by cloning the repositories with non cygwin tools in a directory not created in cygwin.])
457457
fi
458458
fi
459459
])

0 commit comments

Comments
 (0)