Skip to content

Commit 33bc0e3

Browse files
prsadhukprsadhuk
committed
Merge
2 parents 43c54e9 + 4b3c528 commit 33bc0e3

File tree

753 files changed

+26970
-6857
lines changed

Some content is hidden

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

753 files changed

+26970
-6857
lines changed

‎.hgtags

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -569,3 +569,8 @@ b034d2dee5fc93d42a81b65e58ce3f91e42586ff jdk-13+23
569569
43627549a488b7d0b4df8fad436e36233df89877 jdk-14+2
570570
b7f68ddec66f996ae3aad03291d129ca9f02482d jdk-13+27
571571
e64383344f144217c36196c3c8a2df8f588a2af3 jdk-14+3
572+
1e95931e7d8fa7e3899340a9c7cb28dbea50c10c jdk-13+28
573+
19d0b382f0869f72d4381b54fa129f1c74b6e766 jdk-14+4
574+
3081f39a3d30d63b112098386ac2bb027c2b7223 jdk-13+29
575+
0f1e29c77e50c7da11d83df410026392c4d1a28c jdk-14+5
576+
443f7359b34d60e7821216ffc60f88b6ffe0ccdd jdk-14+6

‎make/Docs.gmk

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ $(foreach n, 0 1 2, \
553553
$(eval specs_bottom_rel_path := $(specs_bottom_rel_path)../) \
554554
)
555555

556-
SPECS_TOP := $(if $(filter true, $(IS_DRAFT)), <div class="draft-header">$(DRAFT_TEXT)</div>)
556+
SPECS_TOP := $(if $(filter true, $(IS_DRAFT)), <header class="draft-header">$(DRAFT_TEXT)</header>)
557557

558558
# For all html files in $module/share/specs directories, copy and add the
559559
# copyright footer.
@@ -595,7 +595,9 @@ ifeq ($(ENABLE_PANDOC), true)
595595
DEST := $(DOCS_OUTPUTDIR)/specs/, \
596596
CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
597597
OPTIONS := -V include-before='$(SPECS_TOP)' -V include-after='$(SPECS_BOTTOM_$($m_$f_NOF_SUBDIRS))', \
598-
REPLACEMENTS := @@VERSION_STRING@@ => $(VERSION_STRING), \
598+
REPLACEMENTS := \
599+
@@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION) ; \
600+
@@VERSION_STRING@@ => $(VERSION_STRING), \
599601
POST_PROCESS := $(TOOL_FIXUPPANDOC), \
600602
)) \
601603
$(eval JDK_SPECS_TARGETS += $($($m_$f_NAME))) \
@@ -625,8 +627,11 @@ ifeq ($(ENABLE_PANDOC), true)
625627
DEST := $(DOCS_OUTPUTDIR)/specs/man, \
626628
FILTER := $(PANDOC_HTML_MANPAGE_FILTER), \
627629
CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
628-
REPLACEMENTS := @@VERSION_SHORT@@ => $(VERSION_SHORT), \
629-
OPTIONS := -V include-before='$(SPECS_TOP)' -V include-after='$(SPECS_BOTTOM_1)', \
630+
REPLACEMENTS := \
631+
@@COPYRIGHT_YEAR@@ => $(COPYRIGHT_YEAR) ; \
632+
@@VERSION_SHORT@@ => $(VERSION_SHORT) ; \
633+
@@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION), \
634+
OPTIONS := --toc -V include-before='$(SPECS_TOP)' -V include-after='$(SPECS_BOTTOM_1)', \
630635
POST_PROCESS := $(TOOL_FIXUPPANDOC), \
631636
EXTRA_DEPS := $(PANDOC_HTML_MANPAGE_FILTER) \
632637
$(PANDOC_HTML_MANPAGE_FILTER_JAVASCRIPT), \

‎make/Images.gmk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ $(eval $(call SetupExecute, jlink_jre, \
102102
WARN := Creating legacy jre image, \
103103
DEPS := $(JMODS) $(BASE_RELEASE_FILE) \
104104
$(call DependOnVariable, JDK_MODULES_LIST), \
105-
OUTPUT_DIR := $(JDK_IMAGE_DIR), \
105+
OUTPUT_DIR := $(JRE_IMAGE_DIR), \
106106
SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/images/jre, \
107107
PRE_COMMAND := $(RM) -r $(JRE_IMAGE_DIR), \
108108
COMMAND := $(JLINK_TOOL) --add-modules $(JRE_MODULES_LIST) \
@@ -138,7 +138,7 @@ ifeq ($(BUILD_CDS_ARCHIVE), true)
138138
-Xmx128M -Xms128M $(LOG_INFO), \
139139
))
140140

141-
JDK_TARGETS += $(gen_cds_archive_jdk)
141+
JRE_TARGETS += $(gen_cds_archive_jre)
142142
endif
143143

144144
################################################################################

‎make/InitSupport.gmk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,8 +424,8 @@ else # $(HAS_SPEC)=true
424424
$(if $(filter all, $(LOG_REPORT)), \
425425
$(GREP) -v -e "^Note: including file:" < $(logfile) || true $(NEWLINE) \
426426
, \
427-
($(GREP) -v -e "^Note: including file:" < $(logfile) || true) | $(HEAD) -n 12 $(NEWLINE) \
428-
if test `$(WC) -l < $(logfile)` -gt 12; then \
427+
($(GREP) -v -e "^Note: including file:" < $(logfile) || true) | $(HEAD) -n 15 $(NEWLINE) \
428+
if test `$(WC) -l < $(logfile)` -gt 15; then \
429429
$(ECHO) " ... (rest of output omitted)" ; \
430430
fi $(NEWLINE) \
431431
) \

‎make/autoconf/flags-cflags.m4

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -576,10 +576,10 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
576576
577577
elif test "x$TOOLCHAIN_TYPE" = xxlc; then
578578
# Suggested additions: -qsrcmsg to get improved error reporting
579-
TOOLCHAIN_CFLAGS_JDK="-qchars=signed -qfullpath -qsaveopt -qstackprotect" # add on both CFLAGS
580-
TOOLCHAIN_CFLAGS_JVM="-qtune=balanced \
581-
-qalias=noansi -qstrict -qtls=default -qlanglvl=c99vla \
582-
-qlanglvl=noredefmac -qnortti -qnoeh -qignerrno -qstackprotect"
579+
# set -qtbtable=full for a better traceback table/better stacks in hs_err when xlc16 is used
580+
TOOLCHAIN_CFLAGS_JDK="-qtbtable=full -qchars=signed -qfullpath -qsaveopt -qstackprotect" # add on both CFLAGS
581+
TOOLCHAIN_CFLAGS_JVM="-qtbtable=full -qtune=balanced \
582+
-qalias=noansi -qstrict -qtls=default -qnortti -qnoeh -qignerrno -qstackprotect"
583583
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
584584
TOOLCHAIN_CFLAGS_JVM="-nologo -MD -MP"
585585
TOOLCHAIN_CFLAGS_JDK="-nologo -MD -Zc:wchar_t-"

‎make/autoconf/flags.m4

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,10 @@ AC_DEFUN_ONCE([FLAGS_SETUP_USER_SUPPLIED_FLAGS],
176176
AC_MSG_WARN([Ignoring LDFLAGS($LDFLAGS) found in environment. Use --with-extra-ldflags])
177177
fi
178178
179+
if test "x$ASFLAGS" != "x"; then
180+
AC_MSG_WARN([Ignoring ASFLAGS($ASFLAGS) found in environment. Use --with-extra-asflags])
181+
fi
182+
179183
AC_ARG_WITH(extra-cflags, [AS_HELP_STRING([--with-extra-cflags],
180184
[extra flags to be used when compiling jdk c-files])])
181185
@@ -185,9 +189,13 @@ AC_DEFUN_ONCE([FLAGS_SETUP_USER_SUPPLIED_FLAGS],
185189
AC_ARG_WITH(extra-ldflags, [AS_HELP_STRING([--with-extra-ldflags],
186190
[extra flags to be used when linking jdk])])
187191
192+
AC_ARG_WITH(extra-asflags, [AS_HELP_STRING([--with-extra-asflags],
193+
[extra flags to be passed to the assembler])])
194+
188195
USER_CFLAGS="$with_extra_cflags"
189196
USER_CXXFLAGS="$with_extra_cxxflags"
190197
USER_LDFLAGS="$with_extra_ldflags"
198+
USER_ASFLAGS="$with_extra_asflags"
191199
])
192200

193201
# Setup the sysroot flags and add them to global CFLAGS and LDFLAGS so
@@ -280,10 +288,12 @@ AC_DEFUN_ONCE([FLAGS_PRE_TOOLCHAIN],
280288
EXTRA_CFLAGS="$MACHINE_FLAG $USER_CFLAGS"
281289
EXTRA_CXXFLAGS="$MACHINE_FLAG $USER_CXXFLAGS"
282290
EXTRA_LDFLAGS="$MACHINE_FLAG $USER_LDFLAGS"
291+
EXTRA_ASFLAGS="$USER_ASFLAGS"
283292
284293
AC_SUBST(EXTRA_CFLAGS)
285294
AC_SUBST(EXTRA_CXXFLAGS)
286295
AC_SUBST(EXTRA_LDFLAGS)
296+
AC_SUBST(EXTRA_ASFLAGS)
287297
288298
# For autoconf testing to work, the global flags must also be stored in the
289299
# "unnamed" CFLAGS etc.

‎make/autoconf/spec.gmk.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,7 @@ JVM_RCFLAGS := @JVM_RCFLAGS@
489489
EXTRA_CFLAGS = @EXTRA_CFLAGS@
490490
EXTRA_CXXFLAGS = @EXTRA_CXXFLAGS@
491491
EXTRA_LDFLAGS = @EXTRA_LDFLAGS@
492+
EXTRA_ASFLAGS = @EXTRA_ASFLAGS@
492493

493494
CXX:=@FIXPATH@ @CCACHE@ @ICECC@ @CXX@
494495

‎make/data/docs-resources/resources/jdk-default.css

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2019, 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
@@ -85,6 +85,8 @@ h1.title + .subtitle {
8585
margin-top: -1em;
8686
}
8787

88+
a { text-decoration: none }
89+
8890
a:link {
8991
color: #4A6782;
9092
}
@@ -162,3 +164,22 @@ table.centered td {
162164
font-style: italic;
163165
font-size: 80%;
164166
}
167+
168+
nav#TOC {
169+
border: 1px solid gray;
170+
border-radius: 10px;
171+
padding: 5px 10px;
172+
margin-bottom: 15px;
173+
}
174+
175+
nav#TOC ul ul {
176+
font-size:smaller;
177+
}
178+
179+
nav#TOC ul ul li {
180+
display: inline-block
181+
}
182+
183+
nav#TOC ul ul li::before {
184+
content: " \2022 "
185+
}

‎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-
tzdata2018g
24+
tzdata2019a

‎make/data/tzdata/africa

Lines changed: 97 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,11 @@ Zone Africa/Cairo 2:05:09 - LMT 1900 Oct
387387
# See Africa/Lagos.
388388

389389
# Eritrea
390+
# See Africa/Nairobi.
391+
392+
# Eswatini (formerly Swaziland)
393+
# See Africa/Johannesburg.
394+
390395
# Ethiopia
391396
# See Africa/Nairobi.
392397
#
@@ -870,8 +875,41 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis
870875
# From Mohamed Essedik Najd (2018-10-26):
871876
# Today, a Moroccan government council approved the perpetual addition
872877
# of 60 minutes to the regular Moroccan timezone.
873-
# From Brian Inglis (2018-10-26):
874-
# http://www.maroc.ma/fr/actualites/le-conseil-de-gouvernement-adopte-un-projet-de-decret-relatif-lheure-legale-stipulant-le
878+
# From Matt Johnson (2018-10-28):
879+
# http://www.sgg.gov.ma/Portals/1/BO/2018/BO_6720-bis_Ar.pdf
880+
#
881+
# From Maamar Abdelkader (2018-11-01):
882+
# We usually move clocks back the previous week end and come back to the +1
883+
# the week end after.... The government does not announce yet the decision
884+
# about this temporary change. But it s 99% sure that it will be the case,
885+
# as in previous years. An unofficial survey was done these days, showing
886+
# that 64% of asked peopke are ok for moving from +1 to +0 during Ramadan.
887+
# https://leconomiste.com/article/1035870-enquete-l-economiste-sunergia-64-des-marocains-plebiscitent-le-gmt-pendant-ramadan
888+
#
889+
# From Paul Eggert (2018-11-01):
890+
# For now, guess that Morocco will fall back at 03:00 the last Sunday
891+
# before Ramadan, and spring forward at 02:00 the first Sunday after
892+
# Ramadan, as this has been the practice since 2012. To implement this,
893+
# transition dates for 2019 through 2037 were determined by running the
894+
# following program under GNU Emacs 26.1.
895+
# (let ((islamic-year 1440))
896+
# (require 'cal-islam)
897+
# (while (< islamic-year 1460)
898+
# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
899+
# (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
900+
# (sunday 0))
901+
# (while (/= sunday (mod (setq a (1- a)) 7)))
902+
# (while (/= sunday (mod b 7))
903+
# (setq b (1+ b)))
904+
# (setq a (calendar-gregorian-from-absolute a))
905+
# (setq b (calendar-gregorian-from-absolute b))
906+
# (insert
907+
# (format
908+
# (concat "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 3:00\t-1:00\t-\n"
909+
# "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 2:00\t0\t-\n")
910+
# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
911+
# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
912+
# (setq islamic-year (+ 1 islamic-year))))
875913

876914
# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
877915
Rule Morocco 1939 only - Sep 12 0:00 1:00 -
@@ -903,7 +941,7 @@ Rule Morocco 2012 only - Aug 20 2:00 1:00 -
903941
Rule Morocco 2012 only - Sep 30 3:00 0 -
904942
Rule Morocco 2013 only - Jul 7 3:00 0 -
905943
Rule Morocco 2013 only - Aug 10 2:00 1:00 -
906-
Rule Morocco 2013 2018 - Oct lastSun 3:00 0 -
944+
Rule Morocco 2013 2017 - Oct lastSun 3:00 0 -
907945
Rule Morocco 2014 2018 - Mar lastSun 2:00 1:00 -
908946
Rule Morocco 2014 only - Jun 28 3:00 0 -
909947
Rule Morocco 2014 only - Aug 2 2:00 1:00 -
@@ -915,13 +953,53 @@ Rule Morocco 2017 only - May 21 3:00 0 -
915953
Rule Morocco 2017 only - Jul 2 2:00 1:00 -
916954
Rule Morocco 2018 only - May 13 3:00 0 -
917955
Rule Morocco 2018 only - Jun 17 2:00 1:00 -
956+
Rule Morocco 2019 only - May 5 3:00 0 -
957+
Rule Morocco 2019 only - Jun 9 2:00 1:00 -
958+
Rule Morocco 2020 only - Apr 19 3:00 0 -
959+
Rule Morocco 2020 only - May 24 2:00 1:00 -
960+
Rule Morocco 2021 only - Apr 11 3:00 0 -
961+
Rule Morocco 2021 only - May 16 2:00 1:00 -
962+
Rule Morocco 2022 only - Mar 27 3:00 0 -
963+
Rule Morocco 2022 only - May 8 2:00 1:00 -
964+
Rule Morocco 2023 only - Mar 19 3:00 0 -
965+
Rule Morocco 2023 only - Apr 23 2:00 1:00 -
966+
Rule Morocco 2024 only - Mar 10 3:00 0 -
967+
Rule Morocco 2024 only - Apr 14 2:00 1:00 -
968+
Rule Morocco 2025 only - Feb 23 3:00 0 -
969+
Rule Morocco 2025 only - Apr 6 2:00 1:00 -
970+
Rule Morocco 2026 only - Feb 15 3:00 0 -
971+
Rule Morocco 2026 only - Mar 22 2:00 1:00 -
972+
Rule Morocco 2027 only - Feb 7 3:00 0 -
973+
Rule Morocco 2027 only - Mar 14 2:00 1:00 -
974+
Rule Morocco 2028 only - Jan 23 3:00 0 -
975+
Rule Morocco 2028 only - Feb 27 2:00 1:00 -
976+
Rule Morocco 2029 only - Jan 14 3:00 0 -
977+
Rule Morocco 2029 only - Feb 18 2:00 1:00 -
978+
Rule Morocco 2029 only - Dec 30 3:00 0 -
979+
Rule Morocco 2030 only - Feb 10 2:00 1:00 -
980+
Rule Morocco 2030 only - Dec 22 3:00 0 -
981+
Rule Morocco 2031 only - Jan 26 2:00 1:00 -
982+
Rule Morocco 2031 only - Dec 14 3:00 0 -
983+
Rule Morocco 2032 only - Jan 18 2:00 1:00 -
984+
Rule Morocco 2032 only - Nov 28 3:00 0 -
985+
Rule Morocco 2033 only - Jan 9 2:00 1:00 -
986+
Rule Morocco 2033 only - Nov 20 3:00 0 -
987+
Rule Morocco 2033 only - Dec 25 2:00 1:00 -
988+
Rule Morocco 2034 only - Nov 5 3:00 0 -
989+
Rule Morocco 2034 only - Dec 17 2:00 1:00 -
990+
Rule Morocco 2035 only - Oct 28 3:00 0 -
991+
Rule Morocco 2035 only - Dec 2 2:00 1:00 -
992+
Rule Morocco 2036 only - Oct 19 3:00 0 -
993+
Rule Morocco 2036 only - Nov 23 2:00 1:00 -
994+
Rule Morocco 2037 only - Oct 4 3:00 0 -
995+
Rule Morocco 2037 only - Nov 15 2:00 1:00 -
918996

919997
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
920998
Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
921999
0:00 Morocco +00/+01 1984 Mar 16
9221000
1:00 - +01 1986
923-
0:00 Morocco +00/+01 2018 Oct 27
924-
1:00 - +01
1001+
0:00 Morocco +00/+01 2018 Oct 28 3:00
1002+
0:00 Morocco +00/+01
9251003

9261004
# Western Sahara
9271005
#
@@ -936,8 +1014,8 @@ Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
9361014

9371015
Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan # El Aaiún
9381016
-1:00 - -01 1976 Apr 14
939-
0:00 Morocco +00/+01 2018 Oct 27
940-
1:00 - +01
1017+
0:00 Morocco +00/+01 2018 Oct 28 3:00
1018+
0:00 Morocco +00/+01
9411019

9421020
# Mozambique
9431021
#
@@ -1094,10 +1172,20 @@ Zone Indian/Reunion 3:41:52 - LMT 1911 Jun # Saint-Denis
10941172
# the switch is from 01:00 to 02:00 ... [Decree No. 25/2017]
10951173
# http://www.mnec.gov.st/index.php/publicacoes/documentos/file/90-decreto-lei-n-25-2017
10961174

1175+
# From Vadim Nasardinov (2018-12-29):
1176+
# São Tomé and Príncipe is about to do the following on Jan 1, 2019:
1177+
# https://www.stp-press.st/2018/12/05/governo-jesus-ja-decidiu-repor-hora-legal-sao-tomense/
1178+
#
1179+
# From Michael Deckers (2018-12-30):
1180+
# https://www.legis-palop.org/download.jsp?idFile=102818
1181+
# ... [The legal time of the country, which coincides with universal
1182+
# coordinated time, will be restituted at 2 o'clock on day 1 of January, 2019.]
1183+
10971184
Zone Africa/Sao_Tome 0:26:56 - LMT 1884
10981185
-0:36:45 - LMT 1912 Jan 1 00:00u # Lisbon MT
10991186
0:00 - GMT 2018 Jan 1 01:00
1100-
1:00 - WAT
1187+
1:00 - WAT 2019 Jan 1 02:00
1188+
0:00 - GMT
11011189

11021190
# Senegal
11031191
# See Africa/Abidjan.
@@ -1128,7 +1216,7 @@ Zone Africa/Johannesburg 1:52:00 - LMT 1892 Feb 8
11281216
1:30 - SAST 1903 Mar
11291217
2:00 SA SAST
11301218
Link Africa/Johannesburg Africa/Maseru # Lesotho
1131-
Link Africa/Johannesburg Africa/Mbabane # Swaziland
1219+
Link Africa/Johannesburg Africa/Mbabane # Eswatini
11321220
#
11331221
# Marion and Prince Edward Is
11341222
# scientific station since 1947
@@ -1170,9 +1258,6 @@ Zone Africa/Juba 2:06:28 - LMT 1931
11701258
2:00 Sudan CA%sT 2000 Jan 15 12:00
11711259
3:00 - EAT
11721260

1173-
# Swaziland
1174-
# See Africa/Johannesburg.
1175-
11761261
# Tanzania
11771262
# See Africa/Nairobi.
11781263

0 commit comments

Comments
 (0)