Skip to content

Commit 6fafd01

Browse files
pronpron
committed
Merge branch 'master' into fibers
2 parents 32b4209 + bfa060f commit 6fafd01

File tree

760 files changed

+41238
-26594
lines changed

Some content is hidden

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

760 files changed

+41238
-26594
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/dist/
33
/.idea/
44
/.vscode/
5+
/nbproject/
56
nbproject/private/
67
make/nb_native/nbproject/private
78
/webrev
@@ -15,6 +16,7 @@ test/nashorn/lib
1516
NashornProfile.txt
1617
**/JTreport/**
1718
**/JTwork/**
19+
/src/utils/LogCompilation/target/
1820
/src/utils/hsdis/build/
1921
/test/micro/.idea/
2022
/test/micro/bench.iml

‎doc/building.html

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -629,21 +629,30 @@ <h3 id="creating-and-using-sysroots-with-qemu-deboostrap">Creating And Using Sys
629629
<p>Fortunately, you can create sysroots for foreign architectures with tools provided by your OS. On Debian/Ubuntu systems, one could use <code>qemu-deboostrap</code> to create the <em>target</em> system chroot, which would have the native libraries and headers specific to that <em>target</em> system. After that, we can use the cross-compiler on the <em>build</em> system, pointing into chroot to get the build dependencies right. This allows building for foreign architectures with native compilation speed.</p>
630630
<p>For example, cross-compiling to AArch64 from x86_64 could be done like this:</p>
631631
<ul>
632-
<li>Install cross-compiler on the <em>build</em> system:</li>
633-
</ul>
634-
<pre><code>apt install g++-aarch64-linux-gnu gcc-aarch64-linux-gnu</code></pre>
635-
<ul>
636-
<li>Create chroot on the <em>build</em> system, configuring it for <em>target</em> system:</li>
637-
</ul>
638-
<pre><code>sudo qemu-debootstrap --arch=arm64 --verbose \
639-
--include=fakeroot,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype6-dev,libpng12-dev \
640-
--resolve-deps jessie /chroots/arm64 http://httpredir.debian.org/debian/</code></pre>
641-
<ul>
642-
<li>Configure and build with newly created chroot as sysroot/toolchain-path:</li>
643-
</ul>
644-
<pre><code>CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ sh ./configure --openjdk-target=aarch64-linux-gnu --with-sysroot=/chroots/arm64/ --with-toolchain-path=/chroots/arm64/
632+
<li><p>Install cross-compiler on the <em>build</em> system:</p>
633+
<pre><code>apt install g++-aarch64-linux-gnu gcc-aarch64-linux-gnu</code></pre></li>
634+
<li><p>Create chroot on the <em>build</em> system, configuring it for <em>target</em> system:</p>
635+
<pre><code>sudo qemu-debootstrap \
636+
--arch=arm64 \
637+
--verbose \
638+
--include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype6-dev,libpng-dev \
639+
--resolve-deps \
640+
buster \
641+
~/sysroot-arm64 \
642+
http://httpredir.debian.org/debian/</code></pre></li>
643+
<li><p>Make sure the symlinks inside the newly created chroot point to proper locations:</p>
644+
<pre><code>sudo chroot ~/sysroot-arm64 symlinks -cr .</code></pre></li>
645+
<li><p>Configure and build with newly created chroot as sysroot/toolchain-path:</p>
646+
<pre><code>CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ sh ./configure \
647+
--openjdk-target=aarch64-linux-gnu \
648+
--with-sysroot=~/sysroot-arm64 \
649+
--with-toolchain-path=~/sysroot-arm64 \
650+
--with-freetype-lib=~/sysroot-arm64/usr/lib/aarch64-linux-gnu/ \
651+
--with-freetype-include=~/sysroot-arm64/usr/include/freetype2/ \
652+
--x-libraries=~/sysroot-arm64/usr/lib/aarch64-linux-gnu/
645653
make images
646-
ls build/linux-aarch64-normal-server-release/</code></pre>
654+
ls build/linux-aarch64-server-release/</code></pre></li>
655+
</ul>
647656
<p>The build does not create new files in that chroot, so it can be reused for multiple builds without additional cleanup.</p>
648657
<p>Architectures that are known to successfully cross-compile like this are:</p>
649658
<table>

‎doc/building.md

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1086,23 +1086,39 @@ for foreign architectures with native compilation speed.
10861086
For example, cross-compiling to AArch64 from x86_64 could be done like this:
10871087
10881088
* Install cross-compiler on the *build* system:
1089-
```
1090-
apt install g++-aarch64-linux-gnu gcc-aarch64-linux-gnu
1091-
```
1089+
```
1090+
apt install g++-aarch64-linux-gnu gcc-aarch64-linux-gnu
1091+
```
10921092
10931093
* Create chroot on the *build* system, configuring it for *target* system:
1094-
```
1095-
sudo qemu-debootstrap --arch=arm64 --verbose \
1096-
--include=fakeroot,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype6-dev,libpng12-dev \
1097-
--resolve-deps jessie /chroots/arm64 http://httpredir.debian.org/debian/
1098-
```
1094+
```
1095+
sudo qemu-debootstrap \
1096+
--arch=arm64 \
1097+
--verbose \
1098+
--include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype6-dev,libpng-dev \
1099+
--resolve-deps \
1100+
buster \
1101+
~/sysroot-arm64 \
1102+
http://httpredir.debian.org/debian/
1103+
```
1104+
1105+
* Make sure the symlinks inside the newly created chroot point to proper locations:
1106+
```
1107+
sudo chroot ~/sysroot-arm64 symlinks -cr .
1108+
```
10991109
11001110
* Configure and build with newly created chroot as sysroot/toolchain-path:
1101-
```
1102-
CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ sh ./configure --openjdk-target=aarch64-linux-gnu --with-sysroot=/chroots/arm64/ --with-toolchain-path=/chroots/arm64/
1103-
make images
1104-
ls build/linux-aarch64-normal-server-release/
1105-
```
1111+
```
1112+
CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ sh ./configure \
1113+
--openjdk-target=aarch64-linux-gnu \
1114+
--with-sysroot=~/sysroot-arm64 \
1115+
--with-toolchain-path=~/sysroot-arm64 \
1116+
--with-freetype-lib=~/sysroot-arm64/usr/lib/aarch64-linux-gnu/ \
1117+
--with-freetype-include=~/sysroot-arm64/usr/include/freetype2/ \
1118+
--x-libraries=~/sysroot-arm64/usr/lib/aarch64-linux-gnu/
1119+
make images
1120+
ls build/linux-aarch64-server-release/
1121+
```
11061122
11071123
The build does not create new files in that chroot, so it can be reused for multiple builds
11081124
without additional cleanup.

‎make/data/tzdata/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@
2121
# or visit www.oracle.com if you need additional information or have any
2222
# questions.
2323
#
24-
tzdata2020c
24+
tzdata2020d

‎make/data/tzdata/asia

Lines changed: 43 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3244,13 +3244,40 @@ Zone Asia/Karachi 4:28:12 - LMT 1907
32443244

32453245
# From Sharef Mustafa (2019-10-18):
32463246
# Palestine summer time will end on midnight Oct 26th 2019 ...
3247-
# http://www.palestinecabinet.gov.ps/website/ar/ViewDetails?ID=43948
32483247
#
3249-
# From Paul Eggert (2019-04-10):
3250-
# For now, guess spring-ahead transitions are March's last Friday at 00:00.
3248+
# From Steffen Thorsen (2020-10-20):
3249+
# Some sources such as these say, and display on clocks, that DST ended at
3250+
# midnight last year...
3251+
# https://www.amad.ps/ar/post/320006
3252+
#
3253+
# From Tim Parenti (2020-10-20):
3254+
# The report of the Palestinian Cabinet meeting of 2019-10-14 confirms
3255+
# a decision on (translated): "The start of the winter time in Palestine, by
3256+
# delaying the clock by sixty minutes, starting from midnight on Friday /
3257+
# Saturday corresponding to 26/10/2019."
3258+
# http://www.palestinecabinet.gov.ps/portal/meeting/details/43948
3259+
3260+
# From Sharef Mustafa (2020-10-20):
3261+
# As per the palestinian cabinet announcement yesterday , the day light saving
3262+
# shall [end] on Oct 24th 2020 at 01:00AM by delaying the clock by 60 minutes.
3263+
# http://www.palestinecabinet.gov.ps/portal/Meeting/Details/51584
3264+
3265+
# From Tim Parenti (2020-10-20):
3266+
# Predict future fall transitions at 01:00 on the Saturday preceding October's
3267+
# last Sunday (i.e., Sat>=24). This is consistent with our predictions since
3268+
# 2016, although the time of the change differed slightly in 2019.
3269+
3270+
# From Pierre Cashon (2020-10-20):
3271+
# The summer time this year started on March 28 at 00:00.
3272+
# https://wafa.ps/ar_page.aspx?id=GveQNZa872839351758aGveQNZ
3273+
# http://www.palestinecabinet.gov.ps/portal/meeting/details/50284
3274+
# The winter time in 2015 started on October 23 at 01:00.
3275+
# https://wafa.ps/ar_page.aspx?id=CgpCdYa670694628582aCgpCdY
3276+
# http://www.palestinecabinet.gov.ps/portal/meeting/details/27583
32513277
#
3252-
# From Tim Parenti (2016-10-19):
3253-
# Predict fall transitions on October's last Saturday at 01:00 from now on.
3278+
# From Paul Eggert (2019-04-10):
3279+
# For now, guess spring-ahead transitions are at 00:00 on the Saturday
3280+
# preceding March's last Sunday (i.e., Sat>=24).
32543281

32553282
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
32563283
Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
@@ -3266,10 +3293,10 @@ Rule Palestine 2004 only - Oct 1 1:00 0 -
32663293
Rule Palestine 2005 only - Oct 4 2:00 0 -
32673294
Rule Palestine 2006 2007 - Apr 1 0:00 1:00 S
32683295
Rule Palestine 2006 only - Sep 22 0:00 0 -
3269-
Rule Palestine 2007 only - Sep Thu>=8 2:00 0 -
3296+
Rule Palestine 2007 only - Sep 13 2:00 0 -
32703297
Rule Palestine 2008 2009 - Mar lastFri 0:00 1:00 S
32713298
Rule Palestine 2008 only - Sep 1 0:00 0 -
3272-
Rule Palestine 2009 only - Sep Fri>=1 1:00 0 -
3299+
Rule Palestine 2009 only - Sep 4 1:00 0 -
32733300
Rule Palestine 2010 only - Mar 26 0:00 1:00 S
32743301
Rule Palestine 2010 only - Aug 11 0:00 0 -
32753302
Rule Palestine 2011 only - Apr 1 0:01 1:00 S
@@ -3278,12 +3305,16 @@ Rule Palestine 2011 only - Aug 30 0:00 1:00 S
32783305
Rule Palestine 2011 only - Sep 30 0:00 0 -
32793306
Rule Palestine 2012 2014 - Mar lastThu 24:00 1:00 S
32803307
Rule Palestine 2012 only - Sep 21 1:00 0 -
3281-
Rule Palestine 2013 only - Sep Fri>=21 0:00 0 -
3282-
Rule Palestine 2014 2015 - Oct Fri>=21 0:00 0 -
3283-
Rule Palestine 2015 only - Mar lastFri 24:00 1:00 S
3308+
Rule Palestine 2013 only - Sep 27 0:00 0 -
3309+
Rule Palestine 2014 only - Oct 24 0:00 0 -
3310+
Rule Palestine 2015 only - Mar 28 0:00 1:00 S
3311+
Rule Palestine 2015 only - Oct 23 1:00 0 -
32843312
Rule Palestine 2016 2018 - Mar Sat>=24 1:00 1:00 S
3285-
Rule Palestine 2016 max - Oct lastSat 1:00 0 -
3286-
Rule Palestine 2019 max - Mar lastFri 0:00 1:00 S
3313+
Rule Palestine 2016 2018 - Oct Sat>=24 1:00 0 -
3314+
Rule Palestine 2019 only - Mar 29 0:00 1:00 S
3315+
Rule Palestine 2019 only - Oct Sat>=24 0:00 0 -
3316+
Rule Palestine 2020 max - Mar Sat>=24 0:00 1:00 S
3317+
Rule Palestine 2020 max - Oct Sat>=24 1:00 0 -
32873318

32883319
# Zone NAME STDOFF RULES FORMAT [UNTIL]
32893320
Zone Asia/Gaza 2:17:52 - LMT 1900 Oct

‎make/data/tzdata/europe

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,17 +1052,16 @@ Zone Europe/Prague 0:57:44 - LMT 1850
10521052
# Denmark, Faroe Islands, and Greenland
10531053

10541054
# From Jesper Nørgaard Welen (2005-04-26):
1055-
# http://www.hum.aau.dk/~poe/tid/tine/DanskTid.htm says that the law
1056-
# [introducing standard time] was in effect from 1894-01-01....
1057-
# The page http://www.retsinfo.dk/_GETDOCI_/ACCN/A18930008330-REGL
1055+
# the law [introducing standard time] was in effect from 1894-01-01....
1056+
# The page https://www.retsinformation.dk/eli/lta/1893/83
10581057
# confirms this, and states that the law was put forth 1893-03-29.
10591058
#
10601059
# The EU [actually, EEC and Euratom] treaty with effect from 1973:
1061-
# http://www.retsinfo.dk/_GETDOCI_/ACCN/A19722110030-REGL
1060+
# https://www.retsinformation.dk/eli/lta/1972/21100
10621061
#
10631062
# This provoked a new law from 1974 to make possible summer time changes
10641063
# in subsequent decrees with the law
1065-
# http://www.retsinfo.dk/_GETDOCI_/ACCN/A19740022330-REGL
1064+
# https://www.retsinformation.dk/eli/lta/1974/223
10661065
#
10671066
# It seems however that no decree was set forward until 1980. I have
10681067
# not found any decree, but in another related law, the effecting DST
@@ -1074,7 +1073,7 @@ Zone Europe/Prague 0:57:44 - LMT 1850
10741073
# The law is about the management of the extra hour, concerning
10751074
# working hours reported and effect on obligatory-rest rules (which
10761075
# was suspended on that night):
1077-
# http://www.retsinfo.dk/_GETDOCI_/ACCN/C19801120554-REGL
1076+
# https://web.archive.org/web/20140104053304/https://www.retsinformation.dk/Forms/R0710.aspx?id=60267
10781077

10791078
# From Jesper Nørgaard Welen (2005-06-11):
10801079
# The Herning Folkeblad (1980-09-26) reported that the night between

‎make/hotspot/gensrc/GensrcJvmti.gmk

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -106,17 +106,6 @@ $(eval $(call SetupJvmtiGeneration, jvmti.h, jvmtiH.xsl, \
106106
$(eval $(call SetupJvmtiGeneration, jvmti.html, jvmti.xsl, \
107107
-PARAM majorversion $(VERSION_FEATURE)))
108108

109-
JVMTI_BC_SRCDIR := $(TOPDIR)/src/hotspot/share/interpreter/zero
110-
111-
ifeq ($(call check-jvm-feature, zero), true)
112-
$(eval $(call SetupXslTransform, bytecodeInterpreterWithChecks.cpp, \
113-
XML_FILE := $(JVMTI_BC_SRCDIR)/bytecodeInterpreterWithChecks.xml, \
114-
XSL_FILE := $(JVMTI_BC_SRCDIR)/bytecodeInterpreterWithChecks.xsl, \
115-
OUTPUT_DIR := $(JVMTI_OUTPUTDIR), \
116-
DEPS := $(JVMTI_BC_SRCDIR)/bytecodeInterpreter.cpp, \
117-
))
118-
endif
119-
120109
################################################################################
121110
# Copy jvmti.h to include dir
122111

‎make/hotspot/symbols/symbols-aix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# questions.
2222
#
2323

24-
JVM_handle_linux_signal
24+
JVM_handle_aix_signal
2525
numa_error
2626
numa_warn
2727
sysThreadAvailableStackWithSlack

‎make/modules/java.desktop/lib/Awt2dLibraries.gmk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,6 @@ endif
435435
ifeq ($(USE_EXTERNAL_HARFBUZZ), true)
436436
LIBHARFBUZZ_LIBS := $(HARFBUZZ_LIBS)
437437
else
438-
HARFBUZZ_CFLAGS := -DHAVE_OT -DHAVE_FALLBACK -DHAVE_UCDN -DHAVE_ROUND
439438

440439
# This is better than adding EXPORT_ALL_SYMBOLS
441440
ifneq ($(filter $(TOOLCHAIN_TYPE), gcc clang), )
@@ -493,7 +492,7 @@ else
493492
maybe-uninitialized class-memaccess, \
494493
DISABLED_WARNINGS_clang := unused-value incompatible-pointer-types \
495494
tautological-constant-out-of-range-compare int-to-pointer-cast \
496-
undef missing-field-initializers, \
495+
undef missing-field-initializers range-loop-analysis, \
497496
DISABLED_WARNINGS_microsoft := 4267 4244 4090 4146 4334 4819 4101 4068 4805 4138, \
498497
LDFLAGS := $(LDFLAGS_JDKLIB) \
499498
$(call SET_SHARED_LIBRARY_ORIGIN), \

‎src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/CMMTests.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,16 @@ public static void init() {
7373
ColorSpace.CS_sRGB,
7474
ColorSpace.CS_GRAY,
7575
ColorSpace.CS_LINEAR_RGB,
76-
ColorSpace.CS_CIEXYZ
76+
ColorSpace.CS_CIEXYZ,
77+
ColorSpace.CS_PYCC
7778
};
7879

7980
String[] csNames = new String[]{
8081
"CS_sRGB",
8182
"CS_GRAY",
8283
"CS_LINEAR_RGB",
83-
"CS_CIEXYZ"
84+
"CS_CIEXYZ",
85+
"CS_PYCC"
8486
};
8587

8688
csList = new Option.IntList(cmmOptRoot,

0 commit comments

Comments
 (0)