Skip to content

Commit

Permalink
Merge remote-tracking branch 'openjdk-jdk/master' into JDK-8319932_v2
Browse files Browse the repository at this point in the history
  • Loading branch information
@dougxc
dougxc committed Mar 5, 2024
2 parents 1175d59 + a7280d1 commit e231f62
Show file tree
Hide file tree
Showing 1,532 changed files with 6,000 additions and 70,676 deletions.
2 changes: 1 addition & 1 deletion doc/building.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ <h2 id="native-compiler-toolchain-requirements">Native Compiler
<p>All compilers are expected to be able to handle the C11 language
standard for C, and C++14 for C++.</p>
<h3 id="gcc">gcc</h3>
<p>The minimum accepted version of gcc is 6.0. Older versions will not
<p>The minimum accepted version of gcc is 10.0. Older versions will not
be accepted by <code>configure</code>.</p>
<p>The JDK is currently known to compile successfully with gcc version
13.2 or newer.</p>
Expand Down
2 changes: 1 addition & 1 deletion doc/building.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ C, and C++14 for C++.

### gcc

The minimum accepted version of gcc is 6.0. Older versions will not be accepted
The minimum accepted version of gcc is 10.0. Older versions will not be accepted
by `configure`.

The JDK is currently known to compile successfully with gcc version 13.2 or
Expand Down
6 changes: 3 additions & 3 deletions make/Global.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,9 @@ help:
$(info $(_) # method is 'auto', 'ignore' or 'fail' (default))
$(info $(_) TEST="test1 ..." # Use the given test descriptor(s) for testing, e.g.)
$(info $(_) # make test TEST="jdk_lang gtest:all")
$(info $(_) JTREG="OPT1=x;OPT2=y" # Control the JTREG test harness, use 'help' to list)
$(info $(_) GTEST="OPT1=x;OPT2=y" # Control the GTEST test harness, use 'help' to list)
$(info $(_) MICRO="OPT1=x;OPT2=y" # Control the MICRO test harness, use 'help' to list)
$(info $(_) JTREG="OPT1=x;OPT2=y" # Control the JTREG test harness, use 'make test-only JTREG=help' to list)
$(info $(_) GTEST="OPT1=x;OPT2=y" # Control the GTEST test harness, use 'make test-only GTEST=help' to list)
$(info $(_) MICRO="OPT1=x;OPT2=y" # Control the MICRO test harness, use 'make test-only MICRO=help' to list)
$(info $(_) TEST_OPTS="OPT1=x;..." # Generic control of all test harnesses)
$(info $(_) TEST_VM_OPTS="ARG ..." # Same as setting TEST_OPTS to VM_OPTIONS="ARG ...")
$(info )
Expand Down
10 changes: 8 additions & 2 deletions make/autoconf/flags-cflags.m4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
# Setup flags for C/C++ compiler
#

###############################################################################
################################################################################
#
# How to compile shared libraries.
#
Expand All @@ -37,7 +37,10 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS],
if test "x$TOOLCHAIN_TYPE" = xgcc; then
# Default works for linux, might work on other platforms as well.
SHARED_LIBRARY_FLAGS='-shared'
SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1'
# --disable-new-dtags forces use of RPATH instead of RUNPATH for rpaths.
# This protects internal library dependencies within the JDK from being
# overridden using LD_LIBRARY_PATH. See JDK-8326891 for more information.
SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1 -Wl,--disable-new-dtags'
SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN"
SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
Expand All @@ -60,6 +63,9 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS],
# Default works for linux, might work on other platforms as well.
SHARED_LIBRARY_FLAGS='-shared'
SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1'
if test "x$OPENJDK_TARGET_OS" = xlinux; then
SET_EXECUTABLE_ORIGIN="$SET_EXECUTABLE_ORIGIN -Wl,--disable-new-dtags"
fi
SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
# arm specific settings
Expand Down
2 changes: 1 addition & 1 deletion make/autoconf/toolchain.m4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++"

# Minimum supported versions, empty means unspecified
TOOLCHAIN_MINIMUM_VERSION_clang="3.5"
TOOLCHAIN_MINIMUM_VERSION_gcc="6.0"
TOOLCHAIN_MINIMUM_VERSION_gcc="10.0"
TOOLCHAIN_MINIMUM_VERSION_microsoft="19.28.0.0" # VS2019 16.8, aka MSVC 14.28
TOOLCHAIN_MINIMUM_VERSION_xlc="16.1.0.0011"

Expand Down
13 changes: 8 additions & 5 deletions make/hotspot/lib/CompileJvm.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,11 @@ $(call FillFindCache, $(JVM_SRC_DIRS))
LIBJVM_STATIC_EXCLUDE_OBJS := operator_new.o

ifeq ($(call isTargetOs, windows), true)
WIN_EXPORT_FILE := $(JVM_OUTPUTDIR)/win-exports.def
ifeq ($(STATIC_LIBS), true)
WIN_EXPORT_FILE := $(JVM_OUTPUTDIR)/static-win-exports.def
else
WIN_EXPORT_FILE := $(JVM_OUTPUTDIR)/win-exports.def
endif

JVM_LDFLAGS += -def:$(WIN_EXPORT_FILE)
endif
Expand Down Expand Up @@ -232,7 +236,7 @@ ifeq ($(call isTargetOs, windows), true)
# std::function<void()> f = [](){}
FILTER_SYMBOLS_AWK_SCRIPT := \
'{ \
if ($$7 ~ /\?\?_7.*@@6B@/ && $$7 !~ /type_info/ && $$7 !~ /lambda/) print $$7; \
if ($$7 ~ /\?\?_7.*@@6B@/ && $$7 !~ /type_info/ && $$7 !~ /lambda/) print " " $$7; \
}'

# A more correct solution would be to send BUILD_LIBJVM_ALL_OBJS instead of
Expand All @@ -241,10 +245,9 @@ ifeq ($(call isTargetOs, windows), true)
$(WIN_EXPORT_FILE): $(BUILD_LIBJVM_ALL_OBJS)
$(call LogInfo, Generating list of symbols to export from object files)
$(call MakeDir, $(@D))
$(CD) $(JVM_OUTPUTDIR)/objs && \
$(DUMPBIN) -symbols *$(OBJ_SUFFIX) | $(AWK) $(FILTER_SYMBOLS_AWK_SCRIPT) | $(SORT) -u > [email protected]
$(ECHO) "EXPORTS" > [email protected]
$(AWK) '{ if ($$0 ~ ".") { print " " $$0 } }' < [email protected] >> [email protected]
$(CD) $(BUILD_LIBJVM_OBJECT_DIR) && \
$(DUMPBIN) -symbols *$(OBJ_SUFFIX) | $(AWK) $(FILTER_SYMBOLS_AWK_SCRIPT) | $(SORT) -u >> [email protected]
$(RM) $@
$(MV) [email protected] $@

Expand Down
114 changes: 84 additions & 30 deletions make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,10 @@ public class CLDRConverter {
static Map<String, String> pluralRules;
static Map<String, String> dayPeriodRules;

// TZDB Short Names Map
// TZDB maps
private static final Map<String, String> tzdbShortNamesMap = HashMap.newHashMap(512);
private static final Map<String, String> tzdbSubstLetters = HashMap.newHashMap(512);
private static final Map<String, String> tzdbLinks = HashMap.newHashMap(512);

static enum DraftType {
UNCONFIRMED,
Expand Down Expand Up @@ -762,12 +763,32 @@ private static Map<String, Object> extractCurrencyNames(Map<String, Object> map,

private static Map<String, Object> extractZoneNames(Map<String, Object> map, String id) {
Map<String, Object> names = new TreeMap<>(KeyComparator.INSTANCE);
var availableIds = getAvailableZoneIds();

getAvailableZoneIds().stream().forEach(tzid -> {
availableIds.forEach(tzid -> {
// If the tzid is deprecated, get the data for the replacement id
String tzKey = Optional.ofNullable((String)handlerSupplMeta.get(tzid))
.orElse(tzid);
// Follow link, if needed
var tzLink = tzdbLinks.get(tzKey);
if (tzLink == null && tzdbLinks.containsValue(tzKey)) {
// reverse link search
// this is needed as in tzdb, "America/Buenos_Aires" links to
// "America/Argentina/Buenos_Aires", but CLDR contains metaZone
// "Argentina" only for "America/Buenos_Aires" (as of CLDR 44)
// Both tzids should have "Argentina" meta zone names
tzLink = tzdbLinks.entrySet().stream()
.filter(e -> e.getValue().equals(tzKey))
.map(Map.Entry::getKey)
.findAny()
.orElse(null);

}
Object data = map.get(TIMEZONE_ID_PREFIX + tzKey);
if (data == null && tzLink != null) {
// data for tzLink
data = map.get(TIMEZONE_ID_PREFIX + tzLink);
}

if (data instanceof String[] tznames) {
// Hack for UTC. UTC is an alias to Etc/UTC in CLDR
Expand All @@ -777,20 +798,36 @@ private static Map<String, Object> extractZoneNames(Map<String, Object> map, Str
names.put("UTC", META_ETCUTC_ZONE_NAME);
} else {
// TZDB short names
tznames = Arrays.copyOf(tznames, tznames.length);
fillTZDBShortNames(tzid, tznames);
names.put(tzid, tznames);
}
} else {
String meta = handlerMetaZones.get(tzKey);
if (meta == null && tzLink != null) {
// Check for tzLink
meta = handlerMetaZones.get(tzLink);
}
if (meta != null) {
String metaKey = METAZONE_ID_PREFIX + meta;
data = map.get(metaKey);
if (data instanceof String[] tznames) {
// TZDB short names
tznames = Arrays.copyOf((String[])names.getOrDefault(metaKey, tznames), 6);
fillTZDBShortNames(tzid, tznames);
// Keep the metazone prefix here.
names.put(metaKey, data);
names.putIfAbsent(metaKey, tznames);
names.put(tzid, meta);
if (tzLink != null && availableIds.contains(tzLink)) {
names.put(tzLink, meta);
}
}
} else if (id.equals("root")) {
// supply TZDB short names if available
if (tzdbShortNamesMap.containsKey(tzid)) {
var tznames = new String[6];
fillTZDBShortNames(tzid, tznames);
names.put(tzid, tznames);
}
}
}
Expand Down Expand Up @@ -1263,7 +1300,7 @@ private static Map<Locale, String> coverageLevelsMap() throws Exception {
}

/*
* Generates two maps from TZ database files, where they have usual abbreviation
* Generates three maps from TZ database files, where they have usual abbreviation
* of the time zone names as "FORMAT".
*
* `tzdbShortNamesMap` maps the time zone id, such as "America/Los_Angeles" to
Expand All @@ -1273,53 +1310,46 @@ private static Map<Locale, String> coverageLevelsMap() throws Exception {
*
* "America/Los_Angeles" -> "P%sT<NBSP>US"
*
* The other map, `tzdbSubstLetters` maps the Rule to its substitution letters.
* The map, `tzdbSubstLetters` maps the Rule to its substitution letters.
* The key of the map is the Rule name, appended with "<NBSP>std" or "<NBSP>dst"
* depending on the savings, e.g.,
*
* "US<NBSP>std" -> "S"
* "US<NBSP>dst" -> "D"
*
* These two mappings resolve the short names for time zones in each type,
* These mappings resolve the short names for time zones in each type,
* such as:
*
* Standard short name for "America/Los_Angeles" -> "PST"
* DST short name for "America/Los_Angeles" -> "PDT"
* Generic short name for "America/Los_Angeles" -> "PT"
*
* The map, `tzdbLinks` retains `Link`s of time zones. For example,
* the mapping:
*
* "US/Hawaii" -> "Pacific/Honolulu"
*
* resolves names for "US/Hawaii" correctly with "Pacific/Honolulu"
* names.
*/
private static void generateTZDBShortNamesMap() throws IOException {
Files.walk(Path.of(tzDataDir), 1, FileVisitOption.FOLLOW_LINKS)
.filter(p -> p.toFile().isFile() && !p.endsWith("jdk11_backward"))
.filter(p -> p.toFile().isFile())
.forEach(p -> {
try {
String zone = null;
String rule = null;
String format = null;
boolean inVanguard = false;
boolean inRearguard = false;
for (var line : Files.readAllLines(p)) {
// Interpret the line in rearguard mode so that STD/DST
// correctly handles negative DST cases, such as "GMT/IST"
// vs. "IST/GMT" case for Europe/Dublin
if (inVanguard) {
if (line.startsWith("# Rearguard")) {
inVanguard = false;
inRearguard = true;
}
continue;
} else if (line.startsWith("# Vanguard")) {
// check for Vanguard lines
if (line.startsWith("# Vanguard section")) {
inVanguard = true;
continue;
}
if (inRearguard) {
if (line.startsWith("# End of rearguard")) {
inRearguard = false;
continue;
} else {
if (line.startsWith("#\t")) {
line = line.substring(1); // omit #
}
}
if (inVanguard && line.startsWith("# Rearguard section")) {
inVanguard = false;
continue;
}
if (line.isBlank() || line.matches("^[ \t]*#.*")) {
// ignore blank/comment lines
Expand All @@ -1336,7 +1366,7 @@ private static void generateTZDBShortNamesMap() throws IOException {
var zl = line.split("[ \t]+", -1);
zone = zl[1];
rule = zl[3];
format = zl[4];
format = flipIfNeeded(inVanguard, zl[4]);
} else {
if (zone != null) {
if (line.startsWith("Rule") ||
Expand All @@ -1348,7 +1378,7 @@ private static void generateTZDBShortNamesMap() throws IOException {
} else {
var s = line.split("[ \t]+", -1);
rule = s[2];
format = s[3];
format = flipIfNeeded(inVanguard, s[3]);
}
}
}
Expand All @@ -1359,18 +1389,42 @@ private static void generateTZDBShortNamesMap() throws IOException {
tzdbSubstLetters.put(rl[1] + NBSP + (rl[8].equals("0") ? STD : DST),
rl[9].replace(NO_SUBST, ""));
}

// Link line
if (line.startsWith("Link")) {
var ll = line.split("[ \t]+", -1);
tzdbLinks.put(ll[2], ll[1]);
}
}

// Last entry
if (zone != null) {
tzdbShortNamesMap.put(zone, format + NBSP + rule);
}
} catch (IOException ioe) {
throw new UncheckedIOException(ioe);
}
});
}

// Reverse the std/dst FORMAT in Vanguard so that it
// correctly handles negative DST cases, such as "GMT/IST"
// vs. "IST/GMT" case for Europe/Dublin
private static String flipIfNeeded(boolean inVanguard, String format) {
if (inVanguard) {
var stddst = format.split("/");
if (stddst.length == 2) {
return stddst[1] + "/" + stddst[0];
}
}
return format;
}

/*
* Fill the TZDB short names if there is no name provided by the CLDR
*/
private static void fillTZDBShortNames(String tzid, String[] names) {
var val = tzdbShortNamesMap.get(tzid);
var val = tzdbShortNamesMap.get(tzdbLinks.getOrDefault(tzid, tzid));
if (val != null) {
var format = val.split(NBSP)[0];
var rule = val.split(NBSP)[1];
Expand Down
7 changes: 1 addition & 6 deletions make/modules/java.base/Gensrc.gmk
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
Expand All @@ -25,7 +25,6 @@

include GensrcCommon.gmk

include gensrc/GensrcLocaleData.gmk
include gensrc/GensrcCharacterData.gmk
include gensrc/GensrcMisc.gmk
include gensrc/GensrcCharsetMapping.gmk
Expand All @@ -37,10 +36,6 @@ include gensrc/GensrcModuleLoaderMap.gmk
include gensrc/GensrcScopedMemoryAccess.gmk
include gensrc/GensrcRegex.gmk

# GensrcLocaleData.gmk does not set TARGETS, so we must choose which targets
# to include.
TARGETS += $(GENSRC_BASELOCALEDATA)

################################################################################

CLDR_DATA_DIR := $(TOPDIR)/make/data/cldr/common
Expand Down
Loading

0 comments on commit e231f62

Please sign in to comment.