Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit f39a0d5

Browse files
prraceprrace
committed
Merge
2 parents 59dc384 + 071bd52 commit f39a0d5

File tree

992 files changed

+1950
-128181
lines changed

Some content is hidden

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

992 files changed

+1950
-128181
lines changed

‎bin/unshuffle_list.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ src/jdk.compiler : jdk/src/jdk.compiler langtools/src/jdk.compiler
5858
src/jdk.crypto.cryptoki : jdk/src/jdk.crypto.cryptoki
5959
src/jdk.crypto.ec : jdk/src/jdk.crypto.ec
6060
src/jdk.crypto.mscapi : jdk/src/jdk.crypto.mscapi
61-
src/jdk.crypto.ucrypto : jdk/src/jdk.crypto.ucrypto
6261
src/jdk.dynalink : nashorn/src/jdk.dynalink
6362
src/jdk.editpad : jdk/src/jdk.editpad
6463
src/jdk.hotspot.agent : hotspot/src/jdk.hotspot.agent
@@ -101,21 +100,18 @@ src/jdk.zipfs : jdk/src/jdk.zipfs
101100
src/langtools/sample : langtools/src/sample
102101
src/linux : jdk/src/linux
103102
src/sample : jdk/src/sample
104-
src/solaris : jdk/src/solaris
105103
src/hotspot/share : hotspot/src/share/vm
106104
src/hotspot/cpu/aarch64 : hotspot/src/cpu/aarch64/vm
107105
src/hotspot/cpu/arm : hotspot/src/cpu/arm/vm
108106
src/hotspot/cpu/ppc : hotspot/src/cpu/ppc/vm
109107
src/hotspot/cpu/s390 : hotspot/src/cpu/s390/vm
110-
src/hotspot/cpu/sparc : hotspot/src/cpu/sparc/vm
111108
src/hotspot/cpu/x86 : hotspot/src/cpu/x86/vm
112109
src/hotspot/cpu/zero : hotspot/src/cpu/zero/vm
113110
src/hotspot/os/aix : hotspot/src/os/aix/vm
114111
src/hotspot/os/bsd : hotspot/src/os/bsd/vm
115112
src/hotspot/os/linux : hotspot/src/os/linux/vm
116113
src/hotspot/os/posix/dtrace : hotspot/src/os/posix/dtrace
117114
src/hotspot/os/posix : hotspot/src/os/posix/vm
118-
src/hotspot/os/solaris : hotspot/src/os/solaris/vm
119115
src/hotspot/os/windows : hotspot/src/os/windows/vm
120116
src/hotspot/os_cpu/aix_ppc : hotspot/src/os_cpu/aix_ppc/vm
121117
src/hotspot/os_cpu/bsd_x86 : hotspot/src/os_cpu/bsd_x86/vm
@@ -124,11 +120,8 @@ src/hotspot/os_cpu/linux_aarch64 : hotspot/src/os_cpu/linux_aarch64/vm
124120
src/hotspot/os_cpu/linux_arm : hotspot/src/os_cpu/linux_arm/vm
125121
src/hotspot/os_cpu/linux_ppc : hotspot/src/os_cpu/linux_ppc/vm
126122
src/hotspot/os_cpu/linux_s390 : hotspot/src/os_cpu/linux_s390/vm
127-
src/hotspot/os_cpu/linux_sparc : hotspot/src/os_cpu/linux_sparc/vm
128123
src/hotspot/os_cpu/linux_x86 : hotspot/src/os_cpu/linux_x86/vm
129124
src/hotspot/os_cpu/linux_zero : hotspot/src/os_cpu/linux_zero/vm
130-
src/hotspot/os_cpu/solaris_sparc : hotspot/src/os_cpu/solaris_sparc/vm
131-
src/hotspot/os_cpu/solaris_x86 : hotspot/src/os_cpu/solaris_x86/vm
132125
src/hotspot/os_cpu/windows_x86 : hotspot/src/os_cpu/windows_x86/vm
133126
src/hotspot : hotspot/src
134127
src/utils/IdealGraphVisualizer : hotspot/src/share/tools/IdealGraphVisualizer

‎doc/building.html

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

‎doc/building.md

Lines changed: 5 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -109,19 +109,11 @@ one of the limiting factors for build performance.
109109

110110
At a minimum, a machine with 2-4 cores is advisable, as well as 2-4 GB of RAM.
111111
(The more cores to use, the more memory you need.) At least 6 GB of free disk
112-
space is required (8 GB minimum for building on Solaris).
112+
space is required.
113113

114114
Even for 32-bit builds, it is recommended to use a 64-bit build machine, and
115115
instead create a 32-bit target using `--with-target-bits=32`.
116116

117-
### Building on sparc
118-
119-
At a minimum, a machine with 4 cores is advisable, as well as 4 GB of RAM. (The
120-
more cores to use, the more memory you need.) At least 8 GB of free disk space
121-
is required.
122-
123-
Note: The sparc port is deprecated.
124-
125117
### Building on aarch64
126118

127119
At a minimum, a machine with 8 cores is advisable, as well as 8 GB of RAM.
@@ -138,7 +130,7 @@ This is not recommended. Instead, see the section on [Cross-compiling](
138130

139131
## Operating System Requirements
140132

141-
The mainline JDK project supports Linux, Solaris, macOS, AIX and Windows.
133+
The mainline JDK project supports Linux, macOS, AIX and Windows.
142134
Support for other operating system, e.g. BSD, exists in separate "port"
143135
projects.
144136

@@ -153,11 +145,10 @@ time of writing.
153145
Operating system Vendor/version used
154146
----------------- -------------------------------------------------------
155147
Linux Oracle Enterprise Linux 6.4 / 7.6
156-
Solaris Solaris 11.3 SRU 20
157148
macOS Mac OS X 10.13 (High Sierra)
158149
Windows Windows Server 2012 R2
159150

160-
The double version numbers for Linux and Solaris are due to the hybrid model
151+
The double version numbers for Linux are due to the hybrid model
161152
used at Oracle, where header files and external libraries from an older version
162153
are used when building on a more modern version of the OS.
163154

@@ -247,21 +238,6 @@ options.
247238
Note that while it's possible to build on WSL, testing is still not fully
248239
supported.
249240

250-
### Solaris
251-
252-
See `make/devkit/solaris11.1-package-list.txt` for a list of recommended
253-
packages to install when building on Solaris. The versions specified in this
254-
list is the versions used by the daily builds at Oracle, and is likely to work
255-
properly.
256-
257-
Older versions of Solaris shipped a broken version of `objcopy`. At least
258-
version 2.21.1 is needed, which is provided by Solaris 11 Update 1. Objcopy is
259-
needed if you want to have external debug symbols. Please make sure you are
260-
using at least version 2.21.1 of objcopy, or that you disable external debug
261-
symbols.
262-
263-
Note: The Solaris port is deprecated.
264-
265241
### macOS
266242

267243
Apple is using a quite aggressive scheme of pushing OS updates, and coupling
@@ -314,7 +290,6 @@ one-to-one correlation between target operating system and toolchain.
314290
------------------ -------------------------
315291
Linux gcc, clang
316292
macOS Apple Xcode (using clang)
317-
Solaris Oracle Solaris Studio
318293
AIX IBM XL C/C++
319294
Windows Microsoft Visual Studio
320295

@@ -329,7 +304,6 @@ issues.
329304
------------------ -------------------------------------------------------
330305
Linux gcc 9.2.0
331306
macOS Apple Xcode 10.1 (using clang 10.0.0)
332-
Solaris Oracle Solaris Studio 12.6 (with compiler version 5.15)
333307
Windows Microsoft Visual Studio 2019 update 16.5.3
334308

335309
All compilers are expected to be able to compile to the C99 language standard,
@@ -379,36 +353,6 @@ Build Environment](#problems-with-the-build-environment), and [Getting
379353
Help](#getting-help) to find out if there are any recent, non-merged patches
380354
available for this update.
381355

382-
### Oracle Solaris Studio
383-
384-
The minimum accepted version of the Solaris Studio compilers is 5.13
385-
(corresponding to Solaris Studio 12.4). Older versions will not be accepted by
386-
configure.
387-
388-
The Solaris Studio installation should contain at least these packages:
389-
390-
Package Version
391-
-------------------------------------------------- -------------
392-
developer/solarisstudio-124/backend 12.4-1.0.6.0
393-
developer/solarisstudio-124/c++ 12.4-1.0.10.0
394-
developer/solarisstudio-124/cc 12.4-1.0.4.0
395-
developer/solarisstudio-124/library/c++-libs 12.4-1.0.10.0
396-
developer/solarisstudio-124/library/math-libs 12.4-1.0.0.1
397-
developer/solarisstudio-124/library/studio-gccrt 12.4-1.0.0.1
398-
developer/solarisstudio-124/studio-common 12.4-1.0.0.1
399-
developer/solarisstudio-124/studio-ja 12.4-1.0.0.1
400-
developer/solarisstudio-124/studio-legal 12.4-1.0.0.1
401-
developer/solarisstudio-124/studio-zhCN 12.4-1.0.0.1
402-
403-
Compiling with Solaris Studio can sometimes be finicky. This is the exact
404-
version used by Oracle, which worked correctly at the time of writing:
405-
```
406-
$ cc -V
407-
cc: Sun C 5.13 SunOS_i386 2014/10/20
408-
$ CC -V
409-
CC: Sun C++ 5.13 SunOS_i386 151846-10 2015/10/30
410-
```
411-
412356
### Microsoft Visual Studio
413357

414358
The minimum accepted version of Visual Studio is 2010. Older versions will not
@@ -494,7 +438,6 @@ rather than bundling the JDK's own copy.
494438
libfreetype6-dev`.
495439
* To install on an rpm-based Linux, try running `sudo yum install
496440
freetype-devel`.
497-
* To install on Solaris, try running `pkg install system/library/freetype-2`.
498441

499442
Use `--with-freetype-include=<path>` and `--with-freetype-lib=<path>`
500443
if `configure` does not automatically locate the platform FreeType files.
@@ -509,26 +452,19 @@ your operating system.
509452
libcups2-dev`.
510453
* To install on an rpm-based Linux, try running `sudo yum install
511454
cups-devel`.
512-
* To install on Solaris, try running `pkg install print/cups`.
513455

514456
Use `--with-cups=<path>` if `configure` does not properly locate your CUPS
515457
files.
516458

517459
### X11
518460

519461
Certain [X11](http://www.x.org/) libraries and include files are required on
520-
Linux and Solaris.
462+
Linux.
521463

522464
* To install on an apt-based Linux, try running `sudo apt-get install
523465
libx11-dev libxext-dev libxrender-dev libxrandr-dev libxtst-dev libxt-dev`.
524466
* To install on an rpm-based Linux, try running `sudo yum install
525467
libXtst-devel libXt-devel libXrender-devel libXrandr-devel libXi-devel`.
526-
* To install on Solaris, try running `pkg install x11/header/x11-protocols
527-
x11/library/libice x11/library/libpthread-stubs x11/library/libsm
528-
x11/library/libx11 x11/library/libxau x11/library/libxcb
529-
x11/library/libxdmcp x11/library/libxevie x11/library/libxext
530-
x11/library/libxrender x11/library/libxrandr x11/library/libxscrnsaver
531-
x11/library/libxtst x11/library/toolkit/libxt`.
532468

533469
Use `--with-x=<path>` if `configure` does not properly locate your X11 files.
534470

@@ -603,8 +539,6 @@ will present no issues, but if you have a very old `make`, or a non-GNU Make
603539
If you want to override the default make found by `configure`, use the `MAKE`
604540
configure variable, e.g. `configure MAKE=/opt/gnu/make`.
605541

606-
On Solaris, it is common to call the GNU version of make by using `gmake`.
607-
608542
### GNU Bash
609543

610544
The JDK requires [GNU Bash](http://www.gnu.org/software/bash). No other shells
@@ -1460,12 +1394,6 @@ clean` and restart the build.
14601394
14611395
#### Out of Memory Errors
14621396
1463-
On Solaris, you might get an error message like this:
1464-
```
1465-
Trouble writing out table to disk
1466-
```
1467-
To solve this, increase the amount of swap space on your build machine.
1468-
14691397
On Windows, you might get error messages like this:
14701398
```
14711399
fatal error - couldn't allocate heap
@@ -1604,8 +1532,7 @@ module depends on other modules (e.g. `java.base`), those modules will be built
16041532
first.
16051533
16061534
You can also specify a set of modules, just as you can always specify a set of
1607-
make targets: `make jdk.crypto.cryptoki jdk.crypto.ec jdk.crypto.mscapi
1608-
jdk.crypto.ucrypto`
1535+
make targets: `make jdk.crypto.cryptoki jdk.crypto.ec jdk.crypto.mscapi`
16091536
16101537
#### Building Individual Module Phases
16111538

‎doc/testing.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ <h4 id="jcov_diff_changeset">JCOV_DIFF_CHANGESET</h4>
133133
<h3 id="jtreg-keywords">JTReg keywords</h3>
134134
<h4 id="jobs-1">JOBS</h4>
135135
<p>The test concurrency (<code>-concurrency</code>).</p>
136-
<p>Defaults to TEST_JOBS (if set by <code>--with-test-jobs=</code>), otherwise it defaults to JOBS, except for Hotspot, where the default is <em>number of CPU cores/2</em> (for sparc, if more than 16 cpus, then <em>number of CPU cores/5</em>, otherwise <em>number of CPU cores/4</em>), but never more than <em>memory size in GB/2</em>.</p>
136+
<p>Defaults to TEST_JOBS (if set by <code>--with-test-jobs=</code>), otherwise it defaults to JOBS, except for Hotspot, where the default is <em>number of CPU cores/2</em>, but never more than <em>memory size in GB/2</em>.</p>
137137
<h4 id="timeout_factor-1">TIMEOUT_FACTOR</h4>
138138
<p>The timeout factor (<code>-timeoutFactor</code>).</p>
139139
<p>Defaults to 4.</p>

‎doc/testing.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,9 +261,8 @@ file.
261261
The test concurrency (`-concurrency`).
262262

263263
Defaults to TEST_JOBS (if set by `--with-test-jobs=`), otherwise it defaults to
264-
JOBS, except for Hotspot, where the default is *number of CPU cores/2* (for
265-
sparc, if more than 16 cpus, then *number of CPU cores/5*, otherwise *number of
266-
CPU cores/4*), but never more than *memory size in GB/2*.
264+
JOBS, except for Hotspot, where the default is *number of CPU cores/2*,
265+
but never more than *memory size in GB/2*.
267266

268267
#### TIMEOUT_FACTOR
269268
The timeout factor (`-timeoutFactor`).

‎make/Bundles.gmk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ define SetupBundleFileBody
101101
# If no subdir is specified and only one BASE_DIR, tar.gz can be done
102102
# directly from BASE_DIR.
103103
$(CD) $$($1_BASE_DIRS) \
104-
&& ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) \
104+
&& ( $(TAR) cf - \
105105
-$(TAR_INCLUDE_PARAM) $$($1_$$($1_BASE_DIRS)_LIST_FILE) \
106106
$(TAR_IGNORE_EXIT_VALUE) ) \
107107
| $(GZIP) > $$@
@@ -110,7 +110,7 @@ define SetupBundleFileBody
110110
# If only one BASE_DIR, but with a SUBDIR set, tar.gz can use the
111111
# transform option to create bundle directly from the BASE_DIR.
112112
$(CD) $$($1_BASE_DIRS) \
113-
&& ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) \
113+
&& ( $(TAR) cf - \
114114
-$(TAR_INCLUDE_PARAM) $$($1_$$($1_BASE_DIRS)_LIST_FILE) \
115115
$$(if $$($1_SUBDIR), --transform 's|^|$$($1_SUBDIR)/|S') \
116116
$(TAR_IGNORE_EXIT_VALUE) ) \
@@ -140,7 +140,7 @@ define SetupBundleFileBody
140140
endif
141141
ifeq ($$($1_TYPE), tar.gz)
142142
$(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1 && \
143-
( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) \
143+
( $(TAR) cf - \
144144
$$(if $$($1_SUBDIR), $$($1_SUBDIR), .) $(TAR_IGNORE_EXIT_VALUE) ) \
145145
| $(GZIP) > $$@
146146
else ifeq ($$($1_TYPE), zip)

‎make/CompileDemos.gmk

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -240,15 +240,9 @@ $(SUPPORT_OUTPUTDIR)/demos/image/nbproject/%: $(DEMO_SHARE_SRC)/nbproject/%
240240
$(call install-file)
241241
$(CHMOD) -f ug+w $@
242242

243-
ifeq ($(call isTargetOs, solaris), true)
244-
TARGETS += $(patsubst $(DEMO_SHARE_SRC)/nbproject/%, \
245-
$(SUPPORT_OUTPUTDIR)/demos/image/nbproject/%, \
246-
$(call FindFiles, $(DEMO_SHARE_SRC)/nbproject))
247-
else
248-
TARGETS += $(patsubst $(DEMO_SHARE_SRC)/nbproject/%, \
249-
$(SUPPORT_OUTPUTDIR)/demos/image/nbproject/%, \
250-
$(call FindFiles, $(DEMO_SHARE_SRC)/nbproject))
251-
endif
243+
TARGETS += $(patsubst $(DEMO_SHARE_SRC)/nbproject/%, \
244+
$(SUPPORT_OUTPUTDIR)/demos/image/nbproject/%, \
245+
$(call FindFiles, $(DEMO_SHARE_SRC)/nbproject))
252246

253247
################################################################################
254248

‎make/CompileJavaModules.gmk

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,7 @@ java.base_EXCLUDES += java/lang/doc-files
5353
# data files and shouldn't go in the product
5454
java.base_EXCLUDE_FILES += sun/text/resources/BreakIteratorRules.java
5555

56-
ifeq ($(call isTargetOs, solaris), false)
57-
java.base_EXCLUDE_FILES += \
58-
SolarisLoginModule.java \
59-
SolarisSystem.java \
60-
#
61-
endif
62-
63-
ifeq ($(call isTargetOs, solaris macosx aix), false)
56+
ifeq ($(call isTargetOs, macosx aix), false)
6457
java.base_EXCLUDE_FILES += sun/nio/fs/PollingWatchService.java
6558
endif
6659

@@ -448,10 +441,8 @@ jdk.internal.vm.compiler_JAVAC_FLAGS += -parameters -XDstringConcat=inline \
448441
--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot=jdk.internal.vm.compiler \
449442
--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.aarch64=jdk.internal.vm.compiler \
450443
--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.amd64=jdk.internal.vm.compiler \
451-
--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.sparc=jdk.internal.vm.compiler \
452444
--add-exports jdk.internal.vm.ci/jdk.vm.ci.meta=jdk.internal.vm.compiler \
453445
--add-exports jdk.internal.vm.ci/jdk.vm.ci.runtime=jdk.internal.vm.compiler \
454-
--add-exports jdk.internal.vm.ci/jdk.vm.ci.sparc=jdk.internal.vm.compiler \
455446
#
456447

457448
jdk.internal.vm.compiler_EXCLUDES += \
@@ -461,7 +452,6 @@ jdk.internal.vm.compiler_EXCLUDES += \
461452
org.graalvm.compiler.api.test \
462453
org.graalvm.compiler.asm.aarch64.test \
463454
org.graalvm.compiler.asm.amd64.test \
464-
org.graalvm.compiler.asm.sparc.test \
465455
org.graalvm.compiler.asm.test \
466456
org.graalvm.compiler.core.aarch64.test \
467457
org.graalvm.compiler.core.amd64.test \
@@ -475,7 +465,6 @@ jdk.internal.vm.compiler_EXCLUDES += \
475465
org.graalvm.compiler.hotspot.jdk15.test \
476466
org.graalvm.compiler.hotspot.jdk9.test \
477467
org.graalvm.compiler.hotspot.lir.test \
478-
org.graalvm.compiler.hotspot.sparc.test \
479468
org.graalvm.compiler.hotspot.test \
480469
org.graalvm.compiler.jtt \
481470
org.graalvm.compiler.lir.jtt \
@@ -517,10 +506,8 @@ jdk.aot_JAVAC_FLAGS += -parameters -XDstringConcat=inline \
517506
--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot=jdk.internal.vm.compiler,jdk.aot \
518507
--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.aarch64=jdk.internal.vm.compiler,jdk.aot \
519508
--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.amd64=jdk.internal.vm.compiler,jdk.aot \
520-
--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.sparc=jdk.internal.vm.compiler,jdk.aot \
521509
--add-exports jdk.internal.vm.ci/jdk.vm.ci.meta=jdk.internal.vm.compiler,jdk.aot \
522510
--add-exports jdk.internal.vm.ci/jdk.vm.ci.runtime=jdk.internal.vm.compiler,jdk.aot \
523-
--add-exports jdk.internal.vm.ci/jdk.vm.ci.sparc=jdk.internal.vm.compiler,jdk.aot \
524511
#
525512

526513
jdk.aot_EXCLUDES += \

‎make/RunTests.gmk

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -237,16 +237,6 @@ TEST_JOBS_FACTOR_MACHINE ?= 1
237237

238238
ifeq ($(TEST_JOBS), 0)
239239
CORES_DIVIDER := 2
240-
ifeq ($(call isTargetCpuArch, sparc), true)
241-
# For smaller SPARC machines we see reasonable scaling of throughput up to
242-
# cpus/4 without affecting test reliability. On the bigger machines, cpus/4
243-
# causes intermittent timeouts.
244-
ifeq ($(shell $(EXPR) $(NUM_CORES) \> 16), 1)
245-
CORES_DIVIDER := 5
246-
else
247-
CORES_DIVIDER := 4
248-
endif
249-
endif
250240
# For some big multi-core machines with low ulimit -u setting we hit the max
251241
# threads/process limit. In such a setup the memory/cores-only-guided
252242
# TEST_JOBS config is insufficient. From experience a concurrency setting of
@@ -843,12 +833,8 @@ define SetupRunJtregTestBody
843833
# we may end up with a lot of JVM's
844834
$1_JTREG_MAX_RAM_PERCENTAGE := $$(shell $$(EXPR) 25 / $$($1_JTREG_JOBS))
845835

846-
# SPARC is in general slower per core so need to scale up timeouts a bit.
847-
ifeq ($(call isTargetCpuArch, sparc), true)
848-
JTREG_TIMEOUT_FACTOR ?= 8
849-
else
850-
JTREG_TIMEOUT_FACTOR ?= 4
851-
endif
836+
JTREG_TIMEOUT_FACTOR ?= 4
837+
852838
JTREG_VERBOSE ?= fail,error,summary
853839
JTREG_RETAIN ?= fail,error
854840
JTREG_RUN_PROBLEM_LISTS ?= false

0 commit comments

Comments
 (0)