mirror of
https://github.com/JetBrains/JetBrainsRuntime.git
synced 2025-12-11 03:49:40 +01:00
Compare commits
22 Commits
jb17-b721
...
jb-jdi-tes
| Author | SHA1 | Date | |
|---|---|---|---|
|
efca7647af | ||
|
|
ae3b4fb15c | ||
|
|
11f2cf63c3 | ||
|
|
485f23c77e | ||
|
|
c98a1dddf6 | ||
|
|
6c9c710e08 | ||
|
|
a9764fa161 | ||
|
|
c70650a44a | ||
|
a0882bf4cc | ||
|
3c5a7e9ffc | ||
|
6c4e2e70be | ||
|
78ff45ee33 | ||
|
b1d5bee8ca | ||
|
c6126d638c | ||
|
245b61c506 | ||
|
|
7c27f9f5dd | ||
|
d517220df6 | ||
|
|
b7cdc097e3 | ||
|
d5bdb76e84 | ||
|
|
ac7f36ce25 | ||
|
|
b25bb17b41 | ||
|
b21e04af5d |
46
.github/actions/config/action.yml
vendored
46
.github/actions/config/action.yml
vendored
@@ -1,46 +0,0 @@
|
||||
#
|
||||
# Copyright (c) 2022, 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
|
||||
# under the terms of the GNU General Public License version 2 only, as
|
||||
# published by the Free Software Foundation. Oracle designates this
|
||||
# particular file as subject to the "Classpath" exception as provided
|
||||
# by Oracle in the LICENSE file that accompanied this code.
|
||||
#
|
||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# version 2 for more details (a copy is included in the LICENSE file that
|
||||
# accompanied this code).
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License version
|
||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
|
||||
name: 'Config'
|
||||
description: 'Read JDK Configuration Variables'
|
||||
inputs:
|
||||
var:
|
||||
description: 'The name of the variable to read'
|
||||
required: true
|
||||
outputs:
|
||||
value:
|
||||
description: 'The value of the configuration variable'
|
||||
value: ${{ steps.read-config.outputs.value }}
|
||||
|
||||
runs:
|
||||
using: composite
|
||||
steps:
|
||||
- name: 'Read configuration variable from repo'
|
||||
id: read-config
|
||||
run: |
|
||||
# Extract value from configuration file
|
||||
value="$(grep -h ${{ inputs.var }}= make/conf/github-actions.conf | cut -d '=' -f 2-)"
|
||||
echo "::set-output name=value::$value"
|
||||
shell: bash
|
||||
80
.github/actions/do-build/action.yml
vendored
80
.github/actions/do-build/action.yml
vendored
@@ -1,80 +0,0 @@
|
||||
#
|
||||
# Copyright (c) 2022, 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
|
||||
# under the terms of the GNU General Public License version 2 only, as
|
||||
# published by the Free Software Foundation. Oracle designates this
|
||||
# particular file as subject to the "Classpath" exception as provided
|
||||
# by Oracle in the LICENSE file that accompanied this code.
|
||||
#
|
||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# version 2 for more details (a copy is included in the LICENSE file that
|
||||
# accompanied this code).
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License version
|
||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
|
||||
name: 'Do build'
|
||||
description: 'Build the JDK using make'
|
||||
inputs:
|
||||
make-target:
|
||||
description: 'Make target(s)'
|
||||
required: true
|
||||
platform:
|
||||
description: 'Platform name'
|
||||
required: true
|
||||
debug-suffix:
|
||||
description: 'File name suffix denoting debug level, possibly empty'
|
||||
required: false
|
||||
|
||||
runs:
|
||||
using: composite
|
||||
steps:
|
||||
- name: 'Build'
|
||||
id: build
|
||||
run: >
|
||||
make LOG=info ${{ inputs.make-target }}
|
||||
|| bash ./.github/scripts/gen-build-failure-report.sh "$GITHUB_STEP_SUMMARY"
|
||||
shell: bash
|
||||
|
||||
- name: 'Check for failure'
|
||||
id: check
|
||||
run: |
|
||||
# Check for failure marker file
|
||||
build_dir="$(ls -d build/*)"
|
||||
if [[ -e $build_dir/build-failure ]]; then
|
||||
# Collect relevant log files
|
||||
mkdir failure-logs
|
||||
cp \
|
||||
$build_dir/spec.gmk \
|
||||
$build_dir/build.log \
|
||||
$build_dir/configure.log \
|
||||
$build_dir/make-support/failure-summary.log \
|
||||
$build_dir/make-support/failure-logs/* \
|
||||
failure-logs/ 2> /dev/null || true
|
||||
echo '::set-output name=failure::true'
|
||||
fi
|
||||
shell: bash
|
||||
|
||||
- name: 'Upload build logs'
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: failure-logs-${{ inputs.platform }}${{ inputs.debug-suffix }}
|
||||
path: failure-logs
|
||||
if: steps.check.outputs.failure == 'true'
|
||||
|
||||
# This is the best way I found to abort the job with an error message
|
||||
- name: 'Notify about build failures'
|
||||
uses: actions/github-script@v6
|
||||
with:
|
||||
script: core.setFailed('Build failed. See summary for details.')
|
||||
if: steps.check.outputs.failure == 'true'
|
||||
109
.github/actions/get-bootjdk/action.yml
vendored
109
.github/actions/get-bootjdk/action.yml
vendored
@@ -1,109 +0,0 @@
|
||||
#
|
||||
# Copyright (c) 2022, 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
|
||||
# under the terms of the GNU General Public License version 2 only, as
|
||||
# published by the Free Software Foundation. Oracle designates this
|
||||
# particular file as subject to the "Classpath" exception as provided
|
||||
# by Oracle in the LICENSE file that accompanied this code.
|
||||
#
|
||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# version 2 for more details (a copy is included in the LICENSE file that
|
||||
# accompanied this code).
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License version
|
||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
|
||||
name: 'Get BootJDK'
|
||||
description: 'Download the BootJDK from cache or source location'
|
||||
inputs:
|
||||
platform:
|
||||
description: 'Platform'
|
||||
required: true
|
||||
outputs:
|
||||
path:
|
||||
description: 'Path to the installed BootJDK'
|
||||
value: ${{ steps.path-name.outputs.path }}
|
||||
|
||||
runs:
|
||||
using: composite
|
||||
steps:
|
||||
- name: 'Determine platform prefix'
|
||||
id: platform-prefix
|
||||
run: |
|
||||
# Convert platform name to upper case
|
||||
platform_prefix="$(echo ${{ inputs.platform }} | tr [a-z-] [A-Z_])"
|
||||
echo "::set-output name=value::$platform_prefix"
|
||||
shell: bash
|
||||
|
||||
- name: 'Get URL configuration'
|
||||
id: url
|
||||
uses: ./.github/actions/config
|
||||
with:
|
||||
var: ${{ steps.platform-prefix.outputs.value}}_BOOT_JDK_URL
|
||||
|
||||
- name: 'Get SHA256 configuration'
|
||||
id: sha256
|
||||
uses: ./.github/actions/config
|
||||
with:
|
||||
var: ${{ steps.platform-prefix.outputs.value}}_BOOT_JDK_SHA256
|
||||
|
||||
- name: 'Get file extension configuration'
|
||||
id: ext
|
||||
uses: ./.github/actions/config
|
||||
with:
|
||||
var: ${{ steps.platform-prefix.outputs.value}}_BOOT_JDK_EXT
|
||||
|
||||
- name: 'Check cache for BootJDK'
|
||||
id: get-cached-bootjdk
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: bootjdk/jdk
|
||||
key: boot-jdk-${{ inputs.platform }}-${{ steps.sha256.outputs.value }}
|
||||
|
||||
# macOS is missing sha256sum
|
||||
- name: 'Install sha256sum'
|
||||
run: |
|
||||
# Run Homebrew installation
|
||||
brew install coreutils
|
||||
shell: bash
|
||||
if: steps.get-cached-bootjdk.outputs.cache-hit != 'true' && runner.os == 'macOS'
|
||||
|
||||
- name: 'Download BootJDK'
|
||||
run: |
|
||||
# Download BootJDK and verify checksum
|
||||
mkdir -p bootjdk/jdk
|
||||
mkdir -p bootjdk/unpacked
|
||||
wget --progress=dot:mega -O bootjdk/jdk.${{ steps.ext.outputs.value }} '${{ steps.url.outputs.value }}'
|
||||
echo '${{ steps.sha256.outputs.value }} bootjdk/jdk.${{ steps.ext.outputs.value }}' | sha256sum -c >/dev/null -
|
||||
shell: bash
|
||||
if: steps.get-cached-bootjdk.outputs.cache-hit != 'true'
|
||||
|
||||
- name: 'Unpack BootJDK'
|
||||
run: |
|
||||
# Unpack the BootJDK and move files to a common location
|
||||
if [[ '${{ steps.ext.outputs.value }}' == 'tar.gz' ]]; then
|
||||
tar -xf bootjdk/jdk.${{ steps.ext.outputs.value }} -C bootjdk/unpacked
|
||||
else
|
||||
unzip -q bootjdk/jdk.${{ steps.ext.outputs.value }} -d bootjdk/unpacked
|
||||
fi
|
||||
jdk_root="$(dirname $(find bootjdk/unpacked -name bin -type d))"
|
||||
mv "$jdk_root"/* bootjdk/jdk/
|
||||
shell: bash
|
||||
if: steps.get-cached-bootjdk.outputs.cache-hit != 'true'
|
||||
|
||||
- name: 'Export path to where BootJDK is installed'
|
||||
id: path-name
|
||||
run: |
|
||||
# Export the path
|
||||
echo '::set-output name=path::bootjdk/jdk'
|
||||
shell: bash
|
||||
109
.github/actions/get-bundles/action.yml
vendored
109
.github/actions/get-bundles/action.yml
vendored
@@ -1,109 +0,0 @@
|
||||
#
|
||||
# Copyright (c) 2022, 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
|
||||
# under the terms of the GNU General Public License version 2 only, as
|
||||
# published by the Free Software Foundation. Oracle designates this
|
||||
# particular file as subject to the "Classpath" exception as provided
|
||||
# by Oracle in the LICENSE file that accompanied this code.
|
||||
#
|
||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# version 2 for more details (a copy is included in the LICENSE file that
|
||||
# accompanied this code).
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License version
|
||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
|
||||
name: 'Get bundles'
|
||||
description: 'Download resulting JDK bundles'
|
||||
inputs:
|
||||
platform:
|
||||
description: 'Platform name'
|
||||
required: true
|
||||
debug-suffix:
|
||||
description: 'File name suffix denoting debug level, possibly empty'
|
||||
required: false
|
||||
outputs:
|
||||
jdk-path:
|
||||
description: 'Path to the installed JDK bundle'
|
||||
value: ${{ steps.path-name.outputs.jdk }}
|
||||
symbols-path:
|
||||
description: 'Path to the installed symbols bundle'
|
||||
value: ${{ steps.path-name.outputs.symbols }}
|
||||
tests-path:
|
||||
description: 'Path to the installed tests bundle'
|
||||
value: ${{ steps.path-name.outputs.tests }}
|
||||
|
||||
runs:
|
||||
using: composite
|
||||
steps:
|
||||
- name: 'Download bundles artifact'
|
||||
id: download-bundles
|
||||
uses: actions/download-artifact@v3
|
||||
with:
|
||||
name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}
|
||||
path: bundles
|
||||
continue-on-error: true
|
||||
|
||||
- name: 'Download bundles artifact (retry)'
|
||||
uses: actions/download-artifact@v3
|
||||
with:
|
||||
name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}
|
||||
path: bundles
|
||||
if: steps.download-bundles.outcome == 'failure'
|
||||
|
||||
- name: 'Unpack bundles'
|
||||
run: |
|
||||
if [[ -e bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.zip ]]; then
|
||||
echo 'Unpacking jdk bundle...'
|
||||
mkdir -p bundles/jdk
|
||||
unzip -q bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.zip -d bundles/jdk
|
||||
fi
|
||||
|
||||
if [[ -e bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz ]]; then
|
||||
echo 'Unpacking jdk bundle...'
|
||||
mkdir -p bundles/jdk
|
||||
tar -xf bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz -C bundles/jdk
|
||||
fi
|
||||
|
||||
if [[ -e bundles/symbols-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz ]]; then
|
||||
echo 'Unpacking symbols bundle...'
|
||||
mkdir -p bundles/symbols
|
||||
tar -xf bundles/symbols-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz -C bundles/symbols
|
||||
fi
|
||||
|
||||
if [[ -e bundles/tests-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz ]]; then
|
||||
echo 'Unpacking tests bundle...'
|
||||
mkdir -p bundles/tests
|
||||
tar -xf bundles/tests-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz -C bundles/tests
|
||||
fi
|
||||
shell: bash
|
||||
|
||||
- name: 'Export paths to where bundles are installed'
|
||||
id: path-name
|
||||
run: |
|
||||
# Export the paths
|
||||
|
||||
jdk_dir="$GITHUB_WORKSPACE/$(dirname $(find bundles/jdk -name bin -type d))"
|
||||
symbols_dir="$GITHUB_WORKSPACE/$(dirname $(find bundles/symbols -name bin -type d))"
|
||||
tests_dir="$GITHUB_WORKSPACE/bundles/tests"
|
||||
|
||||
if [[ '${{ runner.os }}' == 'Windows' ]]; then
|
||||
jdk_dir="$(cygpath $jdk_dir)"
|
||||
symbols_dir="$(cygpath $symbols_dir)"
|
||||
tests_dir="$(cygpath $tests_dir)"
|
||||
fi
|
||||
|
||||
echo "::set-output name=jdk::$jdk_dir"
|
||||
echo "::set-output name=symbols::$symbols_dir"
|
||||
echo "::set-output name=tests::$tests_dir"
|
||||
shell: bash
|
||||
54
.github/actions/get-gtest/action.yml
vendored
54
.github/actions/get-gtest/action.yml
vendored
@@ -1,54 +0,0 @@
|
||||
#
|
||||
# Copyright (c) 2022, 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
|
||||
# under the terms of the GNU General Public License version 2 only, as
|
||||
# published by the Free Software Foundation. Oracle designates this
|
||||
# particular file as subject to the "Classpath" exception as provided
|
||||
# by Oracle in the LICENSE file that accompanied this code.
|
||||
#
|
||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# version 2 for more details (a copy is included in the LICENSE file that
|
||||
# accompanied this code).
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License version
|
||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
|
||||
name: 'Get GTest'
|
||||
description: 'Download GTest source'
|
||||
outputs:
|
||||
path:
|
||||
description: 'Path to the installed GTest'
|
||||
value: ${{ steps.path-name.outputs.path }}
|
||||
|
||||
runs:
|
||||
using: composite
|
||||
steps:
|
||||
- name: 'Get GTest version configuration'
|
||||
id: version
|
||||
uses: ./.github/actions/config
|
||||
with:
|
||||
var: GTEST_VERSION
|
||||
|
||||
- name: 'Checkout GTest source'
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
repository: google/googletest
|
||||
ref: 'release-${{ steps.version.outputs.value }}'
|
||||
path: gtest
|
||||
|
||||
- name: 'Export path to where GTest is installed'
|
||||
id: path-name
|
||||
run: |
|
||||
# Export the path
|
||||
echo '::set-output name=path::gtest'
|
||||
shell: bash
|
||||
72
.github/actions/get-jtreg/action.yml
vendored
72
.github/actions/get-jtreg/action.yml
vendored
@@ -1,72 +0,0 @@
|
||||
#
|
||||
# Copyright (c) 2022, 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
|
||||
# under the terms of the GNU General Public License version 2 only, as
|
||||
# published by the Free Software Foundation. Oracle designates this
|
||||
# particular file as subject to the "Classpath" exception as provided
|
||||
# by Oracle in the LICENSE file that accompanied this code.
|
||||
#
|
||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# version 2 for more details (a copy is included in the LICENSE file that
|
||||
# accompanied this code).
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License version
|
||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
|
||||
name: 'Get JTReg'
|
||||
description: 'Download JTReg from cache or source location'
|
||||
outputs:
|
||||
path:
|
||||
description: 'Path to the installed JTReg'
|
||||
value: ${{ steps.path-name.outputs.path }}
|
||||
|
||||
runs:
|
||||
using: composite
|
||||
steps:
|
||||
- name: 'Get JTReg version configuration'
|
||||
id: version
|
||||
uses: ./.github/actions/config
|
||||
with:
|
||||
var: JTREG_VERSION
|
||||
|
||||
- name: 'Check cache for JTReg'
|
||||
id: get-cached-jtreg
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: jtreg/installed
|
||||
key: jtreg-${{ steps.version.outputs.value }}
|
||||
|
||||
- name: 'Checkout the JTReg source'
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
repository: openjdk/jtreg
|
||||
ref: jtreg-${{ steps.version.outputs.value }}
|
||||
path: jtreg/src
|
||||
if: steps.get-cached-jtreg.outputs.cache-hit != 'true'
|
||||
|
||||
- name: 'Build JTReg'
|
||||
run: |
|
||||
# Build JTReg and move files to the proper locations
|
||||
bash make/build.sh --jdk "$JAVA_HOME_11_X64"
|
||||
mkdir ../installed
|
||||
mv build/images/jtreg/* ../installed
|
||||
working-directory: jtreg/src
|
||||
shell: bash
|
||||
if: steps.get-cached-jtreg.outputs.cache-hit != 'true'
|
||||
|
||||
- name: 'Export path to where JTReg is installed'
|
||||
id: path-name
|
||||
run: |
|
||||
# Export the path
|
||||
echo '::set-output name=path::jtreg/installed'
|
||||
shell: bash
|
||||
44
.github/actions/get-msys2/action.yml
vendored
44
.github/actions/get-msys2/action.yml
vendored
@@ -1,44 +0,0 @@
|
||||
#
|
||||
# Copyright (c) 2022, 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
|
||||
# under the terms of the GNU General Public License version 2 only, as
|
||||
# published by the Free Software Foundation. Oracle designates this
|
||||
# particular file as subject to the "Classpath" exception as provided
|
||||
# by Oracle in the LICENSE file that accompanied this code.
|
||||
#
|
||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# version 2 for more details (a copy is included in the LICENSE file that
|
||||
# accompanied this code).
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License version
|
||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
|
||||
name: 'Get MSYS2'
|
||||
description: 'Download MSYS2 and prepare a Windows host'
|
||||
|
||||
runs:
|
||||
using: composite
|
||||
steps:
|
||||
- name: 'Install MSYS2'
|
||||
uses: msys2/setup-msys2@v2
|
||||
with:
|
||||
install: 'autoconf tar unzip zip make'
|
||||
path-type: minimal
|
||||
location: msys2
|
||||
|
||||
# We can't run bash until this is completed, so stick with pwsh
|
||||
- name: 'Set MSYS2 path'
|
||||
run: |
|
||||
# Prepend msys2/msys64/usr/bin to the PATH
|
||||
echo "$env:GITHUB_WORKSPACE/msys2/msys64/usr/bin" >> $env:GITHUB_PATH
|
||||
shell: pwsh
|
||||
77
.github/actions/upload-bundles/action.yml
vendored
77
.github/actions/upload-bundles/action.yml
vendored
@@ -1,77 +0,0 @@
|
||||
#
|
||||
# Copyright (c) 2022, 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
|
||||
# under the terms of the GNU General Public License version 2 only, as
|
||||
# published by the Free Software Foundation. Oracle designates this
|
||||
# particular file as subject to the "Classpath" exception as provided
|
||||
# by Oracle in the LICENSE file that accompanied this code.
|
||||
#
|
||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# version 2 for more details (a copy is included in the LICENSE file that
|
||||
# accompanied this code).
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License version
|
||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
|
||||
name: 'Upload bundles'
|
||||
description: 'Upload resulting JDK bundles'
|
||||
inputs:
|
||||
platform:
|
||||
description: 'Platform name'
|
||||
required: true
|
||||
debug-suffix:
|
||||
description: 'File name suffix denoting debug level, possibly empty'
|
||||
required: false
|
||||
|
||||
runs:
|
||||
using: composite
|
||||
steps:
|
||||
|
||||
- name: 'Determine bundle names'
|
||||
id: bundles
|
||||
run: |
|
||||
# Rename bundles to consistent names
|
||||
jdk_bundle_zip="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}.zip 2> /dev/null || true)"
|
||||
jdk_bundle_tar_gz="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
|
||||
symbols_bundle="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}-symbols.tar.gz 2> /dev/null || true)"
|
||||
tests_bundle="$(ls build/*/bundles/jdk-*_bin-tests${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
|
||||
|
||||
mkdir bundles
|
||||
|
||||
if [[ "$jdk_bundle_zip" != "" ]]; then
|
||||
mv "$jdk_bundle_zip" "bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.zip"
|
||||
fi
|
||||
if [[ "$jdk_bundle_tar_gz" != "" ]]; then
|
||||
mv "$jdk_bundle_tar_gz" "bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz"
|
||||
fi
|
||||
if [[ "$symbols_bundle" != "" ]]; then
|
||||
mv "$symbols_bundle" "bundles/symbols-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz"
|
||||
fi
|
||||
if [[ "$tests_bundle" != "" ]]; then
|
||||
mv "$tests_bundle" "bundles/tests-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz"
|
||||
fi
|
||||
|
||||
if [[ "$jdk_bundle_zip$jdk_bundle_tar_gz$symbols_bundle$tests_bundle" != "" ]]; then
|
||||
echo '::set-output name=bundles-found::true'
|
||||
else
|
||||
echo '::set-output name=bundles-found::false'
|
||||
fi
|
||||
shell: bash
|
||||
|
||||
- name: 'Upload bundles artifact'
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}
|
||||
path: bundles
|
||||
retention-days: 1
|
||||
if: steps.bundles.outputs.bundles-found == 'true'
|
||||
51
.github/scripts/gen-build-failure-report.sh
vendored
51
.github/scripts/gen-build-failure-report.sh
vendored
@@ -1,51 +0,0 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# Copyright (c) 2022, 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
|
||||
# under the terms of the GNU General Public License version 2 only, as
|
||||
# published by the Free Software Foundation. Oracle designates this
|
||||
# particular file as subject to the "Classpath" exception as provided
|
||||
# by Oracle in the LICENSE file that accompanied this code.
|
||||
#
|
||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# version 2 for more details (a copy is included in the LICENSE file that
|
||||
# accompanied this code).
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License version
|
||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
|
||||
GITHUB_STEP_SUMMARY="$1"
|
||||
BUILD_DIR="$(ls -d build/*)"
|
||||
|
||||
# Send signal to the do-build action that we failed
|
||||
touch "$BUILD_DIR/build-failure"
|
||||
|
||||
(
|
||||
echo '### :boom: Build failure summary'
|
||||
echo ''
|
||||
echo 'The build failed. Here follows the failure summary from the build.'
|
||||
echo '<details><summary><b>View build failure summary</b></summary>'
|
||||
echo ''
|
||||
echo '```'
|
||||
if [[ -f "$BUILD_DIR/make-support/failure-summary.log" ]]; then
|
||||
cat "$BUILD_DIR/make-support/failure-summary.log"
|
||||
else
|
||||
echo "Failure summary ($BUILD_DIR/make-support/failure-summary.log) not found"
|
||||
fi
|
||||
echo '```'
|
||||
echo '</details>'
|
||||
echo ''
|
||||
|
||||
echo ''
|
||||
echo ':arrow_right: To see the entire test log, click the job in the list to the left. To download logs, see the `failure-logs` [artifact above](#artifacts).'
|
||||
) >> $GITHUB_STEP_SUMMARY
|
||||
92
.github/scripts/gen-test-results.sh
vendored
92
.github/scripts/gen-test-results.sh
vendored
@@ -1,92 +0,0 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# Copyright (c) 2022, 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
|
||||
# under the terms of the GNU General Public License version 2 only, as
|
||||
# published by the Free Software Foundation. Oracle designates this
|
||||
# particular file as subject to the "Classpath" exception as provided
|
||||
# by Oracle in the LICENSE file that accompanied this code.
|
||||
#
|
||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# version 2 for more details (a copy is included in the LICENSE file that
|
||||
# accompanied this code).
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License version
|
||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
|
||||
GITHUB_STEP_SUMMARY="$1"
|
||||
|
||||
test_suite_name=$(cat build/run-test-prebuilt/test-support/test-last-ids.txt)
|
||||
results_dir=build/run-test-prebuilt/test-results/$test_suite_name/text
|
||||
report_dir=build/run-test-prebuilt/test-support/$test_suite_name
|
||||
|
||||
failures=$(sed -E -e 's/(.*)\.(java|sh)/\1/' -e '/^#/d' $results_dir/newfailures.txt 2> /dev/null || true)
|
||||
errors=$(sed -E -e 's/(.*)\.(java|sh)/\1/' -e '/^#/d' $results_dir/other_errors.txt 2> /dev/null || true)
|
||||
|
||||
if [[ "$failures" = "" && "$errors" = "" ]]; then
|
||||
# If we have nothing to report, exit this step now
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "### Test output for failed tests" >> $GITHUB_STEP_SUMMARY
|
||||
for test in $failures $errors; do
|
||||
anchor="$(echo "$test" | tr [A-Z/] [a-z_])"
|
||||
base_path="$(echo "$test" | tr '#' '_')"
|
||||
report_file="$report_dir/$base_path.jtr"
|
||||
hs_err_files=$(ls $report_dir/$base_path/hs_err*.log 2> /dev/null || true)
|
||||
echo "#### <a id="$anchor">$test"
|
||||
|
||||
echo '<details><summary>View test results</summary>'
|
||||
echo ''
|
||||
echo '```'
|
||||
if [[ -f "$report_file" ]]; then
|
||||
cat "$report_file"
|
||||
else
|
||||
echo "Error: Result file $report_file not found"
|
||||
fi
|
||||
echo '```'
|
||||
echo '</details>'
|
||||
echo ''
|
||||
|
||||
if [[ "$hs_err_files" != "" ]]; then
|
||||
echo '<details><summary>View HotSpot error log</summary>'
|
||||
echo ''
|
||||
for hs_err in $hs_err_files; do
|
||||
echo '```'
|
||||
echo "$hs_err:"
|
||||
echo ''
|
||||
cat "$hs_err"
|
||||
echo '```'
|
||||
done
|
||||
|
||||
echo '</details>'
|
||||
echo ''
|
||||
fi
|
||||
|
||||
done >> $GITHUB_STEP_SUMMARY
|
||||
|
||||
# With many failures, the summary can easily exceed 1024 kB, the limit set by Github
|
||||
# Trim it down if so.
|
||||
summary_size=$(wc -c < $GITHUB_STEP_SUMMARY)
|
||||
if [[ $summary_size -gt 1000000 ]]; then
|
||||
# Trim to below 1024 kB, and cut off after the last detail group
|
||||
head -c 1000000 $GITHUB_STEP_SUMMARY | tac | sed -n -e '/<\/details>/,$ p' | tac > $GITHUB_STEP_SUMMARY.tmp
|
||||
mv $GITHUB_STEP_SUMMARY.tmp $GITHUB_STEP_SUMMARY
|
||||
(
|
||||
echo ''
|
||||
echo ':x: **WARNING: Summary is too large and has been truncated.**'
|
||||
echo ''
|
||||
) >> $GITHUB_STEP_SUMMARY
|
||||
fi
|
||||
|
||||
echo ':arrow_right: To see the entire test log, click the job in the list to the left.' >> $GITHUB_STEP_SUMMARY
|
||||
69
.github/scripts/gen-test-summary.sh
vendored
69
.github/scripts/gen-test-summary.sh
vendored
@@ -1,69 +0,0 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# Copyright (c) 2022, 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
|
||||
# under the terms of the GNU General Public License version 2 only, as
|
||||
# published by the Free Software Foundation. Oracle designates this
|
||||
# particular file as subject to the "Classpath" exception as provided
|
||||
# by Oracle in the LICENSE file that accompanied this code.
|
||||
#
|
||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# version 2 for more details (a copy is included in the LICENSE file that
|
||||
# accompanied this code).
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License version
|
||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
|
||||
GITHUB_STEP_SUMMARY="$1"
|
||||
|
||||
test_suite_name=$(cat build/run-test-prebuilt/test-support/test-last-ids.txt)
|
||||
results_dir=build/run-test-prebuilt/test-results/$test_suite_name/text
|
||||
|
||||
if [[ ! -f build/run-test-prebuilt/make-support/exit-with-error ]]; then
|
||||
# There were no failures, exit now
|
||||
exit
|
||||
fi
|
||||
|
||||
failures=$(sed -E -e 's/(.*)\.(java|sh)/\1/' -e '/^#/d' $results_dir/newfailures.txt 2> /dev/null || true)
|
||||
errors=$(sed -E -e 's/(.*)\.(java|sh)/\1/' -e '/^#/d' $results_dir/other_errors.txt 2> /dev/null || true)
|
||||
failure_count=$(echo $failures | wc -w || true)
|
||||
error_count=$(echo $errors | wc -w || true)
|
||||
|
||||
if [[ "$failures" = "" && "$errors" = "" ]]; then
|
||||
# We know something went wrong, but not what
|
||||
echo '::set-output name=error-message::Unspecified test suite failure. Please see log for job for details.'
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo '::set-output name=failure::true'
|
||||
echo "::set-output name=error-message::Test run reported $failure_count test failure(s) and $error_count error(s). See summary for details."
|
||||
|
||||
echo '### :boom: Test failures summary' >> $GITHUB_STEP_SUMMARY
|
||||
|
||||
if [[ "$failures" != "" ]]; then
|
||||
echo '' >> $GITHUB_STEP_SUMMARY
|
||||
echo 'These tests reported failure:' >> $GITHUB_STEP_SUMMARY
|
||||
for test in $failures; do
|
||||
anchor="$(echo "$test" | tr [A-Z/] [a-z_])"
|
||||
echo "* [$test](#user-content-$anchor)"
|
||||
done >> $GITHUB_STEP_SUMMARY
|
||||
fi
|
||||
|
||||
if [[ "$errors" != "" ]]; then
|
||||
echo '' >> $GITHUB_STEP_SUMMARY
|
||||
echo 'These tests reported errors:' >> $GITHUB_STEP_SUMMARY
|
||||
for test in $errors; do
|
||||
anchor="$(echo "$test" | tr [A-Z/] [a-z_])"
|
||||
echo "* [$test](#user-content-$anchor)"
|
||||
done >> $GITHUB_STEP_SUMMARY
|
||||
fi
|
||||
154
.github/workflows/build-cross-compile.yml
vendored
154
.github/workflows/build-cross-compile.yml
vendored
@@ -1,154 +0,0 @@
|
||||
#
|
||||
# Copyright (c) 2022, 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
|
||||
# under the terms of the GNU General Public License version 2 only, as
|
||||
# published by the Free Software Foundation. Oracle designates this
|
||||
# particular file as subject to the "Classpath" exception as provided
|
||||
# by Oracle in the LICENSE file that accompanied this code.
|
||||
#
|
||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# version 2 for more details (a copy is included in the LICENSE file that
|
||||
# accompanied this code).
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License version
|
||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
|
||||
name: 'Build (cross-compile)'
|
||||
|
||||
on:
|
||||
workflow_call:
|
||||
inputs:
|
||||
gcc-major-version:
|
||||
required: false
|
||||
type: string
|
||||
default: '10'
|
||||
apt-gcc-version:
|
||||
required: false
|
||||
type: string
|
||||
default: '10.3.0-1ubuntu1~20.04'
|
||||
apt-gcc-cross-suffix:
|
||||
required: false
|
||||
type: string
|
||||
default: 'cross1'
|
||||
|
||||
jobs:
|
||||
build-cross-compile:
|
||||
name: build
|
||||
runs-on: ubuntu-20.04
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
target-cpu:
|
||||
- aarch64
|
||||
- arm
|
||||
- s390x
|
||||
- ppc64le
|
||||
include:
|
||||
- target-cpu: aarch64
|
||||
debian-arch: arm64
|
||||
gnu-arch: aarch64
|
||||
- target-cpu: arm
|
||||
debian-arch: armhf
|
||||
gnu-arch: arm
|
||||
gnu-abi: eabihf
|
||||
- target-cpu: s390x
|
||||
debian-arch: s390x
|
||||
gnu-arch: s390x
|
||||
- target-cpu: ppc64le
|
||||
debian-arch: ppc64el
|
||||
gnu-arch: powerpc64le
|
||||
|
||||
steps:
|
||||
- name: 'Checkout the JDK source'
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: 'Get the BootJDK'
|
||||
id: bootjdk
|
||||
uses: ./.github/actions/get-bootjdk
|
||||
with:
|
||||
platform: linux-x64
|
||||
|
||||
# Use linux-x64 JDK bundle as build JDK
|
||||
- name: 'Get build JDK'
|
||||
id: buildjdk
|
||||
uses: ./.github/actions/get-bundles
|
||||
with:
|
||||
platform: linux-x64
|
||||
|
||||
# Upgrading apt to solve libc6 installation bugs, see JDK-8260460.
|
||||
- name: 'Install toolchain and dependencies'
|
||||
run: |
|
||||
# Install dependencies using apt-get
|
||||
sudo apt-get update
|
||||
sudo apt-get install --only-upgrade apt
|
||||
sudo apt-get install \
|
||||
gcc-${{ inputs.gcc-major-version }}=${{ inputs.apt-gcc-version }} \
|
||||
g++-${{ inputs.gcc-major-version }}=${{ inputs.apt-gcc-version }} \
|
||||
gcc-${{ inputs.gcc-major-version }}-${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}=${{ inputs.apt-gcc-version }}${{ inputs.apt-gcc-cross-suffix }} \
|
||||
g++-${{ inputs.gcc-major-version }}-${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}=${{ inputs.apt-gcc-version }}${{ inputs.apt-gcc-cross-suffix }} \
|
||||
libxrandr-dev libxtst-dev libcups2-dev libasound2-dev
|
||||
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ inputs.gcc-major-version }} 100 --slave /usr/bin/g++ g++ /usr/bin/g++-${{ inputs.gcc-major-version }}
|
||||
|
||||
- name: 'Check cache for sysroot'
|
||||
id: get-cached-sysroot
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: sysroot
|
||||
key: sysroot-${{ matrix.debian-arch }}-${{ hashFiles('./.github/workflows/build-cross-compile.yml') }}
|
||||
|
||||
- name: 'Install sysroot dependencies'
|
||||
run: sudo apt-get install debootstrap qemu-user-static
|
||||
if: steps.get-cached-sysroot.outputs.cache-hit != 'true'
|
||||
|
||||
- name: 'Create sysroot'
|
||||
run: >
|
||||
sudo qemu-debootstrap
|
||||
--arch=${{ matrix.debian-arch }}
|
||||
--verbose
|
||||
--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
|
||||
--resolve-deps
|
||||
buster
|
||||
sysroot
|
||||
https://httpredir.debian.org/debian/
|
||||
if: steps.get-cached-sysroot.outputs.cache-hit != 'true'
|
||||
|
||||
- name: 'Prepare sysroot'
|
||||
run: |
|
||||
# Prepare sysroot and remove unused files to minimize cache
|
||||
sudo chroot sysroot symlinks -cr .
|
||||
sudo chown ${USER} -R sysroot
|
||||
rm -rf sysroot/{dev,proc,run,sys}
|
||||
if: steps.get-cached-sysroot.outputs.cache-hit != 'true'
|
||||
|
||||
- name: 'Configure'
|
||||
run: >
|
||||
bash configure
|
||||
--with-conf-name=linux-${{ matrix.target-cpu }}
|
||||
--with-version-opt=${GITHUB_ACTOR}-${GITHUB_SHA}
|
||||
--with-boot-jdk=${{ steps.bootjdk.outputs.path }}
|
||||
--with-zlib=system
|
||||
--enable-debug
|
||||
--disable-precompiled-headers
|
||||
--openjdk-target=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}
|
||||
--with-sysroot=sysroot
|
||||
--with-build-jdk=${{ steps.buildjdk.outputs.jdk-path }}
|
||||
CC=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-gcc-10
|
||||
CXX=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-g++-10
|
||||
|
||||
- name: 'Build'
|
||||
id: build
|
||||
uses: ./.github/actions/do-build
|
||||
with:
|
||||
make-target: 'hotspot'
|
||||
platform: linux-${{ matrix.target-cpu }}
|
||||
132
.github/workflows/build-linux.yml
vendored
132
.github/workflows/build-linux.yml
vendored
@@ -1,132 +0,0 @@
|
||||
#
|
||||
# Copyright (c) 2022, 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
|
||||
# under the terms of the GNU General Public License version 2 only, as
|
||||
# published by the Free Software Foundation. Oracle designates this
|
||||
# particular file as subject to the "Classpath" exception as provided
|
||||
# by Oracle in the LICENSE file that accompanied this code.
|
||||
#
|
||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# version 2 for more details (a copy is included in the LICENSE file that
|
||||
# accompanied this code).
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License version
|
||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
|
||||
name: 'Build (linux)'
|
||||
|
||||
on:
|
||||
workflow_call:
|
||||
inputs:
|
||||
platform:
|
||||
required: true
|
||||
type: string
|
||||
extra-conf-options:
|
||||
required: false
|
||||
type: string
|
||||
make-target:
|
||||
required: false
|
||||
type: string
|
||||
default: 'product-bundles test-bundles'
|
||||
debug-levels:
|
||||
required: false
|
||||
type: string
|
||||
default: '[ "debug", "release" ]'
|
||||
apt-gcc-version:
|
||||
required: true
|
||||
type: string
|
||||
apt-architecture:
|
||||
required: false
|
||||
type: string
|
||||
apt-extra-packages:
|
||||
required: false
|
||||
type: string
|
||||
|
||||
jobs:
|
||||
build-linux:
|
||||
name: build
|
||||
runs-on: ubuntu-20.04
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
debug-level: ${{ fromJSON(inputs.debug-levels) }}
|
||||
include:
|
||||
- debug-level: debug
|
||||
flags: --with-debug-level=fastdebug
|
||||
suffix: -debug
|
||||
|
||||
steps:
|
||||
- name: 'Checkout the JDK source'
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: 'Get the BootJDK'
|
||||
id: bootjdk
|
||||
uses: ./.github/actions/get-bootjdk
|
||||
with:
|
||||
platform: linux-x64
|
||||
|
||||
- name: 'Get JTReg'
|
||||
id: jtreg
|
||||
uses: ./.github/actions/get-jtreg
|
||||
|
||||
- name: 'Get GTest'
|
||||
id: gtest
|
||||
uses: ./.github/actions/get-gtest
|
||||
|
||||
- name: 'Set architecture'
|
||||
id: arch
|
||||
run: |
|
||||
# Set a proper suffix for packages if using a different architecture
|
||||
if [[ '${{ inputs.apt-architecture }}' != '' ]]; then
|
||||
echo '::set-output name=suffix:::${{ inputs.apt-architecture }}'
|
||||
fi
|
||||
|
||||
# Upgrading apt to solve libc6 installation bugs, see JDK-8260460.
|
||||
- name: 'Install toolchain and dependencies'
|
||||
run: |
|
||||
# Install dependencies using apt-get
|
||||
if [[ '${{ inputs.apt-architecture }}' != '' ]]; then
|
||||
sudo dpkg --add-architecture ${{ inputs.apt-architecture }}
|
||||
fi
|
||||
sudo apt-get update
|
||||
sudo apt-get install --only-upgrade apt
|
||||
sudo apt-get install gcc-${{ inputs.apt-gcc-version }} g++-${{ inputs.apt-gcc-version }} libxrandr-dev${{ steps.arch.outputs.suffix }} libxtst-dev${{ steps.arch.outputs.suffix }} libcups2-dev${{ steps.arch.outputs.suffix }} libasound2-dev${{ steps.arch.outputs.suffix }} ${{ inputs.apt-extra-packages }}
|
||||
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10
|
||||
|
||||
- name: 'Configure'
|
||||
run: >
|
||||
bash configure
|
||||
--with-conf-name=${{ inputs.platform }}
|
||||
${{ matrix.flags }}
|
||||
--with-version-opt=${GITHUB_ACTOR}-${GITHUB_SHA}
|
||||
--with-boot-jdk=${{ steps.bootjdk.outputs.path }}
|
||||
--with-jtreg=${{ steps.jtreg.outputs.path }}
|
||||
--with-gtest=${{ steps.gtest.outputs.path }}
|
||||
--enable-jtreg-failure-handler
|
||||
--with-zlib=system
|
||||
${{ inputs.extra-conf-options }}
|
||||
|
||||
- name: 'Build'
|
||||
id: build
|
||||
uses: ./.github/actions/do-build
|
||||
with:
|
||||
make-target: '${{ inputs.make-target }}'
|
||||
platform: ${{ inputs.platform }}
|
||||
debug-suffix: '${{ matrix.suffix }}'
|
||||
|
||||
- name: 'Upload bundles'
|
||||
uses: ./.github/actions/upload-bundles
|
||||
with:
|
||||
platform: ${{ inputs.platform }}
|
||||
debug-suffix: '${{ matrix.suffix }}'
|
||||
114
.github/workflows/build-macos.yml
vendored
114
.github/workflows/build-macos.yml
vendored
@@ -1,114 +0,0 @@
|
||||
#
|
||||
# Copyright (c) 2022, 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
|
||||
# under the terms of the GNU General Public License version 2 only, as
|
||||
# published by the Free Software Foundation. Oracle designates this
|
||||
# particular file as subject to the "Classpath" exception as provided
|
||||
# by Oracle in the LICENSE file that accompanied this code.
|
||||
#
|
||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# version 2 for more details (a copy is included in the LICENSE file that
|
||||
# accompanied this code).
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License version
|
||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
|
||||
name: 'Build (macos)'
|
||||
|
||||
on:
|
||||
workflow_call:
|
||||
inputs:
|
||||
platform:
|
||||
required: true
|
||||
type: string
|
||||
extra-conf-options:
|
||||
required: false
|
||||
type: string
|
||||
make-target:
|
||||
required: false
|
||||
type: string
|
||||
default: 'product-bundles test-bundles'
|
||||
debug-levels:
|
||||
required: false
|
||||
type: string
|
||||
default: '[ "debug", "release" ]'
|
||||
xcode-toolset-version:
|
||||
required: true
|
||||
type: string
|
||||
|
||||
jobs:
|
||||
build-macos:
|
||||
name: build
|
||||
runs-on: macos-11
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
debug-level: ${{ fromJSON(inputs.debug-levels) }}
|
||||
include:
|
||||
- debug-level: debug
|
||||
flags: --with-debug-level=fastdebug
|
||||
suffix: -debug
|
||||
|
||||
steps:
|
||||
- name: 'Checkout the JDK source'
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: 'Get the BootJDK'
|
||||
id: bootjdk
|
||||
uses: ./.github/actions/get-bootjdk
|
||||
with:
|
||||
platform: macos-x64
|
||||
|
||||
- name: 'Get JTReg'
|
||||
id: jtreg
|
||||
uses: ./.github/actions/get-jtreg
|
||||
|
||||
- name: 'Get GTest'
|
||||
id: gtest
|
||||
uses: ./.github/actions/get-gtest
|
||||
|
||||
- name: 'Install toolchain and dependencies'
|
||||
run: |
|
||||
# Run Homebrew installation and xcode-select
|
||||
brew install make
|
||||
sudo xcode-select --switch /Applications/Xcode_${{ inputs.xcode-toolset-version }}.app/Contents/Developer
|
||||
# This will make GNU make available as 'make' and not only as 'gmake'
|
||||
echo '/usr/local/opt/make/libexec/gnubin' >> $GITHUB_PATH
|
||||
|
||||
- name: 'Configure'
|
||||
run: >
|
||||
bash configure
|
||||
--with-conf-name=${{ inputs.platform }}
|
||||
${{ matrix.flags }}
|
||||
--with-version-opt=${GITHUB_ACTOR}-${GITHUB_SHA}
|
||||
--with-boot-jdk=${{ steps.bootjdk.outputs.path }}
|
||||
--with-jtreg=${{ steps.jtreg.outputs.path }}
|
||||
--with-gtest=${{ steps.gtest.outputs.path }}
|
||||
--enable-jtreg-failure-handler
|
||||
--with-zlib=system
|
||||
${{ inputs.extra-conf-options }}
|
||||
|
||||
- name: 'Build'
|
||||
id: build
|
||||
uses: ./.github/actions/do-build
|
||||
with:
|
||||
make-target: '${{ inputs.make-target }}'
|
||||
platform: ${{ inputs.platform }}
|
||||
debug-suffix: '${{ matrix.suffix }}'
|
||||
|
||||
- name: 'Upload bundles'
|
||||
uses: ./.github/actions/upload-bundles
|
||||
with:
|
||||
platform: ${{ inputs.platform }}
|
||||
debug-suffix: '${{ matrix.suffix }}'
|
||||
131
.github/workflows/build-windows.yml
vendored
131
.github/workflows/build-windows.yml
vendored
@@ -1,131 +0,0 @@
|
||||
#
|
||||
# Copyright (c) 2022, 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
|
||||
# under the terms of the GNU General Public License version 2 only, as
|
||||
# published by the Free Software Foundation. Oracle designates this
|
||||
# particular file as subject to the "Classpath" exception as provided
|
||||
# by Oracle in the LICENSE file that accompanied this code.
|
||||
#
|
||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# version 2 for more details (a copy is included in the LICENSE file that
|
||||
# accompanied this code).
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License version
|
||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
|
||||
name: 'Build (windows)'
|
||||
|
||||
on:
|
||||
workflow_call:
|
||||
inputs:
|
||||
platform:
|
||||
required: true
|
||||
type: string
|
||||
extra-conf-options:
|
||||
required: false
|
||||
type: string
|
||||
make-target:
|
||||
required: false
|
||||
type: string
|
||||
default: 'product-bundles test-bundles'
|
||||
debug-levels:
|
||||
required: false
|
||||
type: string
|
||||
default: '[ "debug", "release" ]'
|
||||
msvc-toolset-version:
|
||||
required: true
|
||||
type: string
|
||||
msvc-toolset-architecture:
|
||||
required: true
|
||||
type: string
|
||||
|
||||
env:
|
||||
# These are needed to make the MSYS2 bash work properly
|
||||
MSYS2_PATH_TYPE: minimal
|
||||
CHERE_INVOKING: 1
|
||||
|
||||
jobs:
|
||||
build-windows:
|
||||
name: build
|
||||
runs-on: windows-2019
|
||||
defaults:
|
||||
run:
|
||||
shell: bash
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
debug-level: ${{ fromJSON(inputs.debug-levels) }}
|
||||
include:
|
||||
- debug-level: debug
|
||||
flags: --with-debug-level=fastdebug
|
||||
suffix: -debug
|
||||
|
||||
steps:
|
||||
- name: 'Checkout the JDK source'
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: 'Get MSYS2'
|
||||
uses: ./.github/actions/get-msys2
|
||||
|
||||
- name: 'Get the BootJDK'
|
||||
id: bootjdk
|
||||
uses: ./.github/actions/get-bootjdk
|
||||
with:
|
||||
platform: windows-x64
|
||||
|
||||
- name: 'Get JTReg'
|
||||
id: jtreg
|
||||
uses: ./.github/actions/get-jtreg
|
||||
|
||||
- name: 'Get GTest'
|
||||
id: gtest
|
||||
uses: ./.github/actions/get-gtest
|
||||
|
||||
- name: 'Install toolchain and dependencies'
|
||||
run: |
|
||||
# Run Visual Studio Installer
|
||||
'/c/Program Files (x86)/Microsoft Visual Studio/Installer/vs_installer.exe' \
|
||||
modify --quiet --installPath 'C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise' \
|
||||
--add Microsoft.VisualStudio.Component.VC.${{ inputs.msvc-toolset-version }}.${{ inputs.msvc-toolset-architecture }}
|
||||
|
||||
- name: 'Configure'
|
||||
run: >
|
||||
bash configure
|
||||
--with-conf-name=${{ inputs.platform }}
|
||||
${{ matrix.flags }}
|
||||
--with-version-opt=${GITHUB_ACTOR}-${GITHUB_SHA}
|
||||
--with-boot-jdk=${{ steps.bootjdk.outputs.path }}
|
||||
--with-jtreg=${{ steps.jtreg.outputs.path }}
|
||||
--with-gtest=${{ steps.gtest.outputs.path }}
|
||||
--enable-jtreg-failure-handler
|
||||
--with-msvc-toolset-version=${{ inputs.msvc-toolset-version }}
|
||||
${{ inputs.extra-conf-options }}
|
||||
env:
|
||||
# We need a minimal PATH on Windows
|
||||
# Set PATH to "", so just GITHUB_PATH is included
|
||||
PATH: ''
|
||||
|
||||
- name: 'Build'
|
||||
id: build
|
||||
uses: ./.github/actions/do-build
|
||||
with:
|
||||
make-target: '${{ inputs.make-target }}'
|
||||
platform: ${{ inputs.platform }}
|
||||
debug-suffix: '${{ matrix.suffix }}'
|
||||
|
||||
- name: 'Upload bundles'
|
||||
uses: ./.github/actions/upload-bundles
|
||||
with:
|
||||
platform: ${{ inputs.platform }}
|
||||
debug-suffix: '${{ matrix.suffix }}'
|
||||
331
.github/workflows/main.yml
vendored
331
.github/workflows/main.yml
vendored
@@ -1,331 +0,0 @@
|
||||
#
|
||||
# Copyright (c) 2022, 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
|
||||
# under the terms of the GNU General Public License version 2 only, as
|
||||
# published by the Free Software Foundation. Oracle designates this
|
||||
# particular file as subject to the "Classpath" exception as provided
|
||||
# by Oracle in the LICENSE file that accompanied this code.
|
||||
#
|
||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# version 2 for more details (a copy is included in the LICENSE file that
|
||||
# accompanied this code).
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License version
|
||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
|
||||
name: 'OpenJDK GHA Sanity Checks'
|
||||
|
||||
on:
|
||||
push:
|
||||
branches-ignore:
|
||||
- master
|
||||
- pr/*
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
platforms:
|
||||
description: 'Platform(s) to execute on (comma separated, e.g. "linux-x64, macos, aarch64")'
|
||||
required: true
|
||||
default: 'linux-x64, linux-x86, linux-x64-variants, linux-cross-compile, macos-x64, macos-aarch64, windows-x64, windows-aarch64'
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
|
||||
###
|
||||
### Determine platforms to include
|
||||
###
|
||||
|
||||
select:
|
||||
name: 'Select platforms'
|
||||
runs-on: ubuntu-20.04
|
||||
outputs:
|
||||
linux-x64: ${{ steps.include.outputs.linux-x64 }}
|
||||
linux-x86: ${{ steps.include.outputs.linux-x86 }}
|
||||
linux-x64-variants: ${{ steps.include.outputs.linux-x64-variants }}
|
||||
linux-cross-compile: ${{ steps.include.outputs.linux-cross-compile }}
|
||||
macos-x64: ${{ steps.include.outputs.macos-x64 }}
|
||||
macos-aarch64: ${{ steps.include.outputs.macos-aarch64 }}
|
||||
windows-x64: ${{ steps.include.outputs.windows-x64 }}
|
||||
windows-aarch64: ${{ steps.include.outputs.windows-aarch64 }}
|
||||
|
||||
steps:
|
||||
# This function must be inlined in main.yml, or we'd be forced to checkout the repo
|
||||
- name: 'Check what jobs to run'
|
||||
id: include
|
||||
run: |
|
||||
# Determine which platform jobs to run
|
||||
|
||||
# Returns 'true' if the input platform list matches any of the platform monikers given as argument,
|
||||
# 'false' otherwise.
|
||||
# arg $1: platform name or names to look for
|
||||
function check_platform() {
|
||||
if [[ '${{ !secrets.JDK_SUBMIT_FILTER || startsWith(github.ref, 'refs/heads/submit/') }}' == 'false' ]]; then
|
||||
# If JDK_SUBMIT_FILTER is set, and this is not a "submit/" branch, don't run anything
|
||||
echo 'false'
|
||||
return
|
||||
fi
|
||||
|
||||
if [[ $GITHUB_EVENT_NAME == workflow_dispatch ]]; then
|
||||
input='${{ github.event.inputs.platforms }}'
|
||||
elif [[ $GITHUB_EVENT_NAME == push ]]; then
|
||||
input='${{ secrets.JDK_SUBMIT_PLATFORMS }}'
|
||||
else
|
||||
echo 'Internal error in GHA'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
normalized_input="$(echo ,$input, | tr -d ' ')"
|
||||
if [[ "$normalized_input" == ",," ]]; then
|
||||
# For an empty input, assume all platforms should run
|
||||
echo 'true'
|
||||
return
|
||||
else
|
||||
# Check for all acceptable platform names
|
||||
for part in $* ; do
|
||||
if echo "$normalized_input" | grep -q -e ",$part," ; then
|
||||
echo 'true'
|
||||
return
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
echo 'false'
|
||||
}
|
||||
|
||||
echo "::set-output name=linux-x64::$(check_platform linux-x64 linux x64)"
|
||||
echo "::set-output name=linux-x86::$(check_platform linux-x86 linux x86)"
|
||||
echo "::set-output name=linux-x64-variants::$(check_platform linux-x64-variants variants)"
|
||||
echo "::set-output name=linux-cross-compile::$(check_platform linux-cross-compile cross-compile)"
|
||||
echo "::set-output name=macos-x64::$(check_platform macos-x64 macos x64)"
|
||||
echo "::set-output name=macos-aarch64::$(check_platform macos-aarch64 macos aarch64)"
|
||||
echo "::set-output name=windows-x64::$(check_platform windows-x64 windows x64)"
|
||||
echo "::set-output name=windows-aarch64::$(check_platform windows-aarch64 windows aarch64)"
|
||||
|
||||
###
|
||||
### Build jobs
|
||||
###
|
||||
|
||||
build-linux-x64:
|
||||
name: linux-x64
|
||||
needs: select
|
||||
uses: ./.github/workflows/build-linux.yml
|
||||
with:
|
||||
platform: linux-x64
|
||||
apt-gcc-version: '10=10.3.0-1ubuntu1~20.04'
|
||||
# The linux-x64 jdk bundle is used as buildjdk for the cross-compile job
|
||||
if: needs.select.outputs.linux-x64 == 'true' || needs.select.outputs.linux-cross-compile == 'true'
|
||||
|
||||
build-linux-x86:
|
||||
name: linux-x86
|
||||
needs: select
|
||||
uses: ./.github/workflows/build-linux.yml
|
||||
with:
|
||||
platform: linux-x86
|
||||
apt-gcc-version: '10-multilib'
|
||||
apt-architecture: 'i386'
|
||||
# Some multilib libraries do not have proper inter-dependencies, so we have to
|
||||
# install their dependencies manually.
|
||||
apt-extra-packages: 'libfreetype6-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386'
|
||||
extra-conf-options: '--with-target-bits=32'
|
||||
if: needs.select.outputs.linux-x86 == 'true'
|
||||
|
||||
build-linux-x64-hs-nopch:
|
||||
name: linux-x64-hs-nopch
|
||||
needs: select
|
||||
uses: ./.github/workflows/build-linux.yml
|
||||
with:
|
||||
platform: linux-x64
|
||||
make-target: 'hotspot'
|
||||
debug-levels: '[ "debug" ]'
|
||||
apt-gcc-version: '10=10.3.0-1ubuntu1~20.04'
|
||||
extra-conf-options: '--disable-precompiled-headers'
|
||||
if: needs.select.outputs.linux-x64-variants == 'true'
|
||||
|
||||
build-linux-x64-hs-zero:
|
||||
name: linux-x64-hs-zero
|
||||
needs: select
|
||||
uses: ./.github/workflows/build-linux.yml
|
||||
with:
|
||||
platform: linux-x64
|
||||
make-target: 'hotspot'
|
||||
debug-levels: '[ "debug" ]'
|
||||
apt-gcc-version: '10=10.3.0-1ubuntu1~20.04'
|
||||
extra-conf-options: '--with-jvm-variants=zero --disable-precompiled-headers'
|
||||
if: needs.select.outputs.linux-x64-variants == 'true'
|
||||
|
||||
build-linux-x64-hs-minimal:
|
||||
name: linux-x64-hs-minimal
|
||||
needs: select
|
||||
uses: ./.github/workflows/build-linux.yml
|
||||
with:
|
||||
platform: linux-x64
|
||||
make-target: 'hotspot'
|
||||
debug-levels: '[ "debug" ]'
|
||||
apt-gcc-version: '10=10.3.0-1ubuntu1~20.04'
|
||||
extra-conf-options: '--with-jvm-variants=minimal --disable-precompiled-headers'
|
||||
if: needs.select.outputs.linux-x64-variants == 'true'
|
||||
|
||||
build-linux-x64-hs-optimized:
|
||||
name: linux-x64-hs-optimized
|
||||
needs: select
|
||||
uses: ./.github/workflows/build-linux.yml
|
||||
with:
|
||||
platform: linux-x64
|
||||
make-target: 'hotspot'
|
||||
# Technically this is not the "debug" level, but we can't inject a new matrix state for just this job
|
||||
debug-levels: '[ "debug" ]'
|
||||
apt-gcc-version: '10=10.3.0-1ubuntu1~20.04'
|
||||
extra-conf-options: '--with-debug-level=optimized --disable-precompiled-headers'
|
||||
if: needs.select.outputs.linux-x64-variants == 'true'
|
||||
|
||||
build-linux-cross-compile:
|
||||
name: linux-cross-compile
|
||||
needs:
|
||||
- select
|
||||
- build-linux-x64
|
||||
uses: ./.github/workflows/build-cross-compile.yml
|
||||
if: needs.select.outputs.linux-cross-compile == 'true'
|
||||
|
||||
build-macos-x64:
|
||||
name: macos-x64
|
||||
needs: select
|
||||
uses: ./.github/workflows/build-macos.yml
|
||||
with:
|
||||
platform: macos-x64
|
||||
xcode-toolset-version: '11.7'
|
||||
if: needs.select.outputs.macos-x64 == 'true'
|
||||
|
||||
build-macos-aarch64:
|
||||
name: macos-aarch64
|
||||
needs: select
|
||||
uses: ./.github/workflows/build-macos.yml
|
||||
with:
|
||||
platform: macos-aarch64
|
||||
xcode-toolset-version: '12.4'
|
||||
extra-conf-options: '--openjdk-target=aarch64-apple-darwin'
|
||||
if: needs.select.outputs.macos-aarch64 == 'true'
|
||||
|
||||
build-windows-x64:
|
||||
name: windows-x64
|
||||
needs: select
|
||||
uses: ./.github/workflows/build-windows.yml
|
||||
with:
|
||||
platform: windows-x64
|
||||
msvc-toolset-version: '14.25'
|
||||
msvc-toolset-architecture: 'x86.x64'
|
||||
if: needs.select.outputs.windows-x64 == 'true'
|
||||
|
||||
build-windows-aarch64:
|
||||
name: windows-aarch64
|
||||
needs: select
|
||||
uses: ./.github/workflows/build-windows.yml
|
||||
with:
|
||||
platform: windows-aarch64
|
||||
msvc-toolset-version: '14.29'
|
||||
msvc-toolset-architecture: 'arm64'
|
||||
make-target: 'hotspot'
|
||||
extra-conf-options: '--openjdk-target=aarch64-unknown-cygwin'
|
||||
if: needs.select.outputs.windows-aarch64 == 'true'
|
||||
|
||||
###
|
||||
### Test jobs
|
||||
###
|
||||
|
||||
test-linux-x64:
|
||||
name: linux-x64
|
||||
needs:
|
||||
- build-linux-x64
|
||||
uses: ./.github/workflows/test.yml
|
||||
with:
|
||||
platform: linux-x64
|
||||
bootjdk-platform: linux-x64
|
||||
runs-on: ubuntu-20.04
|
||||
|
||||
test-linux-x86:
|
||||
name: linux-x86
|
||||
needs:
|
||||
- build-linux-x86
|
||||
uses: ./.github/workflows/test.yml
|
||||
with:
|
||||
platform: linux-x86
|
||||
bootjdk-platform: linux-x64
|
||||
runs-on: ubuntu-20.04
|
||||
|
||||
test-macos-x64:
|
||||
name: macos-x64
|
||||
needs:
|
||||
- build-macos-x64
|
||||
uses: ./.github/workflows/test.yml
|
||||
with:
|
||||
platform: macos-x64
|
||||
bootjdk-platform: macos-x64
|
||||
runs-on: macos-11
|
||||
|
||||
test-windows-x64:
|
||||
name: windows-x64
|
||||
needs:
|
||||
- build-windows-x64
|
||||
uses: ./.github/workflows/test.yml
|
||||
with:
|
||||
platform: windows-x64
|
||||
bootjdk-platform: windows-x64
|
||||
runs-on: windows-2019
|
||||
|
||||
# Remove bundles so they are not misconstrued as binary distributions from the JDK project
|
||||
remove-bundles:
|
||||
name: 'Remove bundle artifacts'
|
||||
runs-on: ubuntu-20.04
|
||||
if: always()
|
||||
needs:
|
||||
- build-linux-x64
|
||||
- build-linux-x86
|
||||
- build-linux-x64-hs-nopch
|
||||
- build-linux-x64-hs-zero
|
||||
- build-linux-x64-hs-minimal
|
||||
- build-linux-x64-hs-optimized
|
||||
- build-linux-cross-compile
|
||||
- build-macos-x64
|
||||
- build-macos-aarch64
|
||||
- build-windows-x64
|
||||
- build-windows-aarch64
|
||||
- test-linux-x64
|
||||
- test-linux-x86
|
||||
- test-macos-x64
|
||||
- test-windows-x64
|
||||
|
||||
steps:
|
||||
# Hack to get hold of the api environment variables that are only defined for actions
|
||||
- name: 'Get API configuration'
|
||||
id: api
|
||||
uses: actions/github-script@v6
|
||||
with:
|
||||
script: 'return { url: process.env["ACTIONS_RUNTIME_URL"], token: process.env["ACTIONS_RUNTIME_TOKEN"] }'
|
||||
|
||||
- name: 'Remove bundle artifacts'
|
||||
run: |
|
||||
# Find and remove all bundle artifacts
|
||||
ALL_ARTIFACT_URLS="$(curl -s \
|
||||
-H 'Accept: application/json;api-version=6.0-preview' \
|
||||
-H 'Authorization: Bearer ${{ fromJson(steps.api.outputs.result).token }}' \
|
||||
'${{ fromJson(steps.api.outputs.result).url }}_apis/pipelines/workflows/${{ github.run_id }}/artifacts?api-version=6.0-preview')"
|
||||
BUNDLE_ARTIFACT_URLS="$(echo "$ALL_ARTIFACT_URLS" | jq -r -c '.value | map(select(.name|startswith("bundles-"))) | .[].url')"
|
||||
for url in $BUNDLE_ARTIFACT_URLS; do
|
||||
echo "Removing $url"
|
||||
curl -s \
|
||||
-H 'Accept: application/json;api-version=6.0-preview' \
|
||||
-H 'Authorization: Bearer ${{ fromJson(steps.api.outputs.result).token }}' \
|
||||
-X DELETE "$url" \
|
||||
|| echo "Failed to remove bundle"
|
||||
done
|
||||
1783
.github/workflows/submit.yml
vendored
Normal file
1783
.github/workflows/submit.yml
vendored
Normal file
File diff suppressed because it is too large
Load Diff
205
.github/workflows/test.yml
vendored
205
.github/workflows/test.yml
vendored
@@ -1,205 +0,0 @@
|
||||
#
|
||||
# Copyright (c) 2022, 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
|
||||
# under the terms of the GNU General Public License version 2 only, as
|
||||
# published by the Free Software Foundation. Oracle designates this
|
||||
# particular file as subject to the "Classpath" exception as provided
|
||||
# by Oracle in the LICENSE file that accompanied this code.
|
||||
#
|
||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# version 2 for more details (a copy is included in the LICENSE file that
|
||||
# accompanied this code).
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License version
|
||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
|
||||
name: 'Run tests'
|
||||
|
||||
on:
|
||||
workflow_call:
|
||||
inputs:
|
||||
platform:
|
||||
required: true
|
||||
type: string
|
||||
bootjdk-platform:
|
||||
required: true
|
||||
type: string
|
||||
runs-on:
|
||||
required: true
|
||||
type: string
|
||||
|
||||
env:
|
||||
# These are needed to make the MSYS2 bash work properly
|
||||
MSYS2_PATH_TYPE: minimal
|
||||
CHERE_INVOKING: 1
|
||||
|
||||
jobs:
|
||||
test:
|
||||
name: test
|
||||
runs-on: ${{ inputs.runs-on }}
|
||||
defaults:
|
||||
run:
|
||||
shell: bash
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
test-name:
|
||||
- 'jdk/tier1 part 1'
|
||||
- 'jdk/tier1 part 2'
|
||||
- 'jdk/tier1 part 3'
|
||||
- 'langtools/tier1'
|
||||
- 'hs/tier1 common'
|
||||
- 'hs/tier1 compiler'
|
||||
- 'hs/tier1 gc'
|
||||
- 'hs/tier1 runtime'
|
||||
- 'hs/tier1 serviceability'
|
||||
|
||||
include:
|
||||
- test-name: 'jdk/tier1 part 1'
|
||||
test-suite: 'test/jdk/:tier1_part1'
|
||||
|
||||
- test-name: 'jdk/tier1 part 2'
|
||||
test-suite: 'test/jdk/:tier1_part2'
|
||||
|
||||
- test-name: 'jdk/tier1 part 3'
|
||||
test-suite: 'test/jdk/:tier1_part3'
|
||||
|
||||
- test-name: 'langtools/tier1'
|
||||
test-suite: 'test/langtools/:tier1'
|
||||
|
||||
- test-name: 'hs/tier1 common'
|
||||
test-suite: 'test/hotspot/jtreg/:tier1_common'
|
||||
debug-suffix: -debug
|
||||
|
||||
- test-name: 'hs/tier1 compiler'
|
||||
test-suite: 'test/hotspot/jtreg/:tier1_compiler'
|
||||
debug-suffix: -debug
|
||||
|
||||
- test-name: 'hs/tier1 gc'
|
||||
test-suite: 'test/hotspot/jtreg/:tier1_gc'
|
||||
debug-suffix: -debug
|
||||
|
||||
- test-name: 'hs/tier1 runtime'
|
||||
test-suite: 'test/hotspot/jtreg/:tier1_runtime'
|
||||
debug-suffix: -debug
|
||||
|
||||
- test-name: 'hs/tier1 serviceability'
|
||||
test-suite: 'test/hotspot/jtreg/:tier1_serviceability'
|
||||
debug-suffix: -debug
|
||||
|
||||
steps:
|
||||
- name: 'Checkout the JDK source'
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: 'Get MSYS2'
|
||||
uses: ./.github/actions/get-msys2
|
||||
if: runner.os == 'Windows'
|
||||
|
||||
- name: 'Get the BootJDK'
|
||||
id: bootjdk
|
||||
uses: ./.github/actions/get-bootjdk
|
||||
with:
|
||||
platform: ${{ inputs.bootjdk-platform }}
|
||||
|
||||
- name: 'Get JTReg'
|
||||
id: jtreg
|
||||
uses: ./.github/actions/get-jtreg
|
||||
|
||||
- name: 'Get bundles'
|
||||
id: bundles
|
||||
uses: ./.github/actions/get-bundles
|
||||
with:
|
||||
platform: ${{ inputs.platform }}
|
||||
debug-suffix: ${{ matrix.debug-suffix }}
|
||||
|
||||
- name: 'Install dependencies'
|
||||
run: |
|
||||
# On macOS we need to install some dependencies for testing
|
||||
brew install make
|
||||
sudo xcode-select --switch /Applications/Xcode_11.7.app/Contents/Developer
|
||||
# This will make GNU make available as 'make' and not only as 'gmake'
|
||||
echo '/usr/local/opt/make/libexec/gnubin' >> $GITHUB_PATH
|
||||
if: runner.os == 'macOS'
|
||||
|
||||
- name: 'Set PATH'
|
||||
id: path
|
||||
run: |
|
||||
# We need a minimal PATH on Windows
|
||||
# Set PATH to "", so just GITHUB_PATH is included
|
||||
if [[ '${{ runner.os }}' == 'Windows' ]]; then
|
||||
echo "::set-output name=value::"
|
||||
else
|
||||
echo "::set-output name=value::$PATH"
|
||||
fi
|
||||
|
||||
- name: 'Run tests'
|
||||
id: run-tests
|
||||
run: >
|
||||
make test-prebuilt
|
||||
TEST='${{ matrix.test-suite }}'
|
||||
BOOT_JDK=${{ steps.bootjdk.outputs.path }}
|
||||
JT_HOME=${{ steps.jtreg.outputs.path }}
|
||||
JDK_IMAGE_DIR=${{ steps.bundles.outputs.jdk-path }}
|
||||
SYMBOLS_IMAGE_DIR=${{ steps.bundles.outputs.symbols-path }}
|
||||
TEST_IMAGE_DIR=${{ steps.bundles.outputs.tests-path }}
|
||||
JTREG='JAVA_OPTIONS=-XX:-CreateCoredumpOnCrash;VERBOSE=fail,error,time;KEYWORDS=!headful'
|
||||
&& bash ./.github/scripts/gen-test-summary.sh "$GITHUB_STEP_SUMMARY"
|
||||
env:
|
||||
PATH: ${{ steps.path.outputs.value }}
|
||||
|
||||
# This is a separate step, since if the markdown from a step gets bigger than
|
||||
# 1024 kB it is skipped, but then the short summary above is still generated
|
||||
- name: 'Generate test report'
|
||||
run: bash ./.github/scripts/gen-test-results.sh "$GITHUB_STEP_SUMMARY"
|
||||
if: always()
|
||||
|
||||
- name: 'Package test results'
|
||||
id: package
|
||||
run: |
|
||||
# Package test-results and relevant parts of test-support
|
||||
mkdir results
|
||||
|
||||
if [[ -d build/run-test-prebuilt/test-results ]]; then
|
||||
cd build/run-test-prebuilt/test-results/
|
||||
zip -r -9 "$GITHUB_WORKSPACE/results/test-results.zip" .
|
||||
cd $GITHUB_WORKSPACE
|
||||
else
|
||||
echo '::warning ::Missing test-results directory'
|
||||
fi
|
||||
|
||||
if [[ -d build/run-test-prebuilt/test-support ]]; then
|
||||
cd build/run-test-prebuilt/test-support/
|
||||
zip -r -9 "$GITHUB_WORKSPACE/results/test-support.zip" . -i *.jtr -i */hs_err*.log -i */replay*.log
|
||||
cd $GITHUB_WORKSPACE
|
||||
else
|
||||
echo '::warning ::Missing test-support directory'
|
||||
fi
|
||||
|
||||
artifact_name="results-${{ inputs.platform }}-$(echo ${{ matrix.test-name }} | tr '/ ' '__')"
|
||||
echo "::set-output name=artifact-name::$artifact_name"
|
||||
if: always()
|
||||
|
||||
- name: 'Upload test results'
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
path: results
|
||||
name: ${{ steps.package.outputs.artifact-name }}
|
||||
if: always()
|
||||
|
||||
# This is the best way I found to abort the job with an error message
|
||||
- name: 'Notify about test failures'
|
||||
uses: actions/github-script@v6
|
||||
with:
|
||||
script: core.setFailed('${{ steps.run-tests.outputs.error-message }}')
|
||||
if: steps.run-tests.outputs.failure == 'true'
|
||||
664
.hgtags
Normal file
664
.hgtags
Normal file
@@ -0,0 +1,664 @@
|
||||
3cc80be736f24704e505ad8ddaa598dec3fa2ed3 jdk-9+181
|
||||
e2b70be325bd10dae4c06f74c46d70d480854916 jdk-9+179
|
||||
5b16a1c3ccffff2a82c88bb7ea894c4ff1c9ebde jdk-9+180
|
||||
43bf6f30fcba031ecf0cc7e511efe3a8179d0f77 jdk-9+176
|
||||
d9f6bc6ba599d0487dc18b2fbdb6c34eedf6f958 jdk-9+177
|
||||
bc9df7dd63ec76f50fafeb4acc44465044662f0a jdk-9+178
|
||||
994036e74ab805bcc09afa0646be17a725bec42f jdk-9+175
|
||||
94680c6d60ecd9ed3ffd1847706efde7eb947afc jdk-9+174
|
||||
6dd7fda42bab7ecf648cafb0a4e9b4ca11b3094f jdk-9+173
|
||||
dad6746278facbbea57dd462cb56fb743dc0a5f0 jdk-9+172
|
||||
643b5f18c2656fe91b69fea85b07b98d5fad394d jdk-9+171
|
||||
898cbe31fbdae2d25d141384fac746cc244a730c jdk-9+170
|
||||
c7efde2b60fc1ec04630be769d9ad60efb39c39c jdk-9+169
|
||||
8fd0a4569191f33c98ee90c2709174a342fefb0d jdk-9+167
|
||||
fcabc74bd44e56c7419d111d59b95669ecb33c55 jdk-9+168
|
||||
d3e973f1809606c67412361041ad197e50fe8cec jdk-9+166
|
||||
3965b747cfe1e6cbd66b8739da5a1ea6ec6985e9 jdk-9+165
|
||||
d16aebbb56d37f12e0c0b0a4fb427db65e1fb1a8 jdk-9+162
|
||||
18c41483a082e097ac2f5f983c1226ed94aa4215 jdk-9+163
|
||||
32db52c675e7d5bc413605d2e89b68b608b19be0 jdk-9+164
|
||||
fd1497902bbe3aa24b21f270ecdcb8de5f7aa9ac jdk-9+159
|
||||
6aa8be0c4e054fe8b3ab016ae00d16d680f92145 jdk-9+160
|
||||
f6883b1a5a6478437cd4181c4bd45328ab24feaf jdk-9+161
|
||||
fa3e76b477829afc4476f0b725cfaa440a6fd917 jdk-9+157
|
||||
b5015f742ba648184bb7fc547197bd33ebfde30d jdk-9+158
|
||||
1cc8dd79fd1cd13d36b385196271a29632c67c3b jdk7-b24
|
||||
bf2517e15f0c0f950e5b3143c4ca11e2df73dcc1 jdk7-b25
|
||||
5ae7db536e3fcf6be78e45b240a9058095e0ed38 jdk7-b26
|
||||
67052ac87fc927d048e62ec54ff42adb230d3f7c jdk7-b27
|
||||
18dc4ba4739a537fd146f77da51db16efce28da2 jdk7-b28
|
||||
bfe4572fd301a6fcd120373cdb2eff5d2da0c72c jdk7-b29
|
||||
bee4731164a06ddece1297ae58db24aca6a1c626 jdk7-b30
|
||||
cd8b8f500face60d1566d850857a7fccadbd383a jdk7-b31
|
||||
a9f1805e3ba9ca520cad199d522c84af5433e85a jdk7-b32
|
||||
6838c1a3296aaa3572364d2ce7d70826cee96286 jdk7-b33
|
||||
90cf935adb353bb0af4b46fb0677e841fd24c000 jdk7-b34
|
||||
6d909d5803e3a22850e6c4e5a75b888742ee7e20 jdk7-b35
|
||||
d718a441936196b93d8bc9f084933af9a4c2a350 jdk7-b36
|
||||
c2036bf76829c03b99108fffab52e20910a9be4f jdk7-b37
|
||||
a2879b2837f5a4c87e9542efe69ef138194af8ff jdk7-b38
|
||||
126f365cec6c3c2c72de934fa1c64b5f082b55b5 jdk7-b39
|
||||
3c53424bbe3bb77e01b468b4b0140deec33e11fc jdk7-b40
|
||||
3cb2a607c347934f8e7e86f840a094c28b08d9ea jdk7-b41
|
||||
caf58ffa084568990cbb3441f9ae188e36b31770 jdk7-b42
|
||||
41bd0a702bc8ec6feebd725a63e7c3227f82ab11 jdk7-b43
|
||||
5843778bda89b1d5ac8e1aa05e26930ac90b3145 jdk7-b44
|
||||
54dffad0bf066791a2793305875250c395011d5f jdk7-b45
|
||||
04b2620edc72de93671646e4720c5992c74ac8b5 jdk7-b46
|
||||
0c4657194eec95c08ba478aee9cfc3c295e41657 jdk7-b47
|
||||
1bf51a4c2627c2f0e0cbcc2cf0421bdb37f1f2b2 jdk7-b48
|
||||
6b84b04a80afe23262377c60913eebfc898f14c4 jdk7-b49
|
||||
5da0e6b9f4f18ef483c977337214b12ee0e1fc8f jdk7-b50
|
||||
a25c5ec5e40e07733d1ff9898a0abe36159288ff jdk7-b51
|
||||
7a90e89e36d103038f8667f6a7daae34ecfa1ad8 jdk7-b52
|
||||
d52186ee770dac57950536cd00ccbfdef360b04c jdk7-b53
|
||||
15096652c4d48dfb9fc0b2cb135304db94c65ba0 jdk7-b54
|
||||
c8b275d62d6b0a980c510e839b70292245863e85 jdk7-b55
|
||||
a8134c4ee2cf451cf9b5e1609f39d83ecd53acc5 jdk7-b56
|
||||
b44f05654c26fcd1f995e712992f9b07ffd7c0c6 jdk7-b57
|
||||
d60a9ce3c3eabf28f5d50ae839d18be04a551bc2 jdk7-b58
|
||||
c33e7d38c9210741dbc285507403a4b20bd802a0 jdk7-b59
|
||||
5a10e4d0b14d7beac53a7b2213ae6864afe1fd3e jdk7-b60
|
||||
dbb955b1ee59b876dd1f133952b557b48b1d7732 jdk7-b61
|
||||
6107cbff3130c747d243c25a7874cd59db5744a8 jdk7-b62
|
||||
dfd8506f74c3731bb169ce93c72612d78ee0413b jdk7-b63
|
||||
d22867c5f1b295a0a2b3b4bc8999a2676f6e20c3 jdk7-b64
|
||||
7d3bf00f3cc4f8125de1842521e7567f37dc84b8 jdk7-b65
|
||||
62109d1b9e7310f29ab51ca6f1d71b899c0ce6b0 jdk7-b66
|
||||
eb24af1404aec8aa140c4cd4d13d2839b150dd41 jdk7-b67
|
||||
bca2225b66d78c4bf4d9801f54cac7715a598650 jdk7-b68
|
||||
1b662b1ed14eb4ae31d5138a36c433b13d941dc5 jdk7-b69
|
||||
207f694795c448c17753eff1a2f50363106960c2 jdk7-b70
|
||||
c5d39b6be65cba0effb5f466ea48fe43764d0e0c jdk7-b71
|
||||
df4bcd06e1d0ab306efa5a44f24a409dc0c0c742 jdk7-b72
|
||||
ce74bd35ce948d629a356e168797f44b593b1578 jdk7-b73
|
||||
4e7661eaa211e186674f6cbefec4aef1144ac2a0 jdk7-b74
|
||||
946518568340c4e511549318f19f47f06b7f5f9b jdk7-b75
|
||||
09e0b33177af2b98a03c9ca19eedf61440bd1cf6 jdk7-b76
|
||||
1d0121b741f029dc4b828e4b36ba6fda92907dd7 jdk7-b77
|
||||
4061c66ba1af1a2e27c2c839ba887407dd3ce050 jdk7-b78
|
||||
e9c98378f6b9256c0595ef2985ca5899f0c0e274 jdk7-b79
|
||||
e6abd38682d237306d6c147c17538ec9e7f8e3a7 jdk7-b80
|
||||
dcc938ac40cc45f1ef454d76020b5db5d943001c jdk7-b81
|
||||
a30062be6d9ca1d48579826f870f85974300004e jdk7-b82
|
||||
34c8199936a1682aa8587857f44cfaf37c2b6381 jdk7-b83
|
||||
b1e55627a6980b9508854ed0c0f21d4f981b4494 jdk7-b84
|
||||
b6f633a93ae0ec4555ff4bf756f5e2150c9bdede jdk7-b85
|
||||
c94d9cc81f495d97817eba9d71b84fc45f7661a5 jdk7-b86
|
||||
b7456c473862048fa70ed8092313a4ef0a55d403 jdk7-b87
|
||||
7077b95d42f6b3942a8751bba033801ff50e5889 jdk7-b88
|
||||
44158f6d3b94c0fa020e33632532473d92d1ea96 jdk7-b89
|
||||
1d1927f9ec097b62c913921e2dfa5dbaf5dc325b jdk7-b90
|
||||
308ad8f68b8dd68e22d73dd490e110059b732422 jdk7-b91
|
||||
ff9031a745d9cc52318f2148e43ca3b07ee08098 jdk7-b92
|
||||
b5dab6a313fdff4c043250e4d9c8f66fd624d27e jdk7-b93
|
||||
8bb281f0f91582104d65d032be22522bfd2d8110 jdk7-b94
|
||||
654298d26561b76dfe3cfcffbbd7078080837300 jdk7-b95
|
||||
d260f892491e040ae385a8e6df59557a7d721abf jdk7-b96
|
||||
7e406ebed9a5968b584f3c3e6b60893b5d6d9741 jdk7-b97
|
||||
db6e660120446c407e2d908d52ec046592b21726 jdk7-b98
|
||||
c4c8a5bc54f66abc68cd185d9294042121922154 jdk7-b99
|
||||
2d6ba7a221915bdf0311acc5641c7f3875cb793e jdk7-b100
|
||||
2548ac036b8fca3326d058d758e6df8355a42469 jdk7-b101
|
||||
88db80c8e49cea352c2900f689600dc410761c1f jdk7-b102
|
||||
64770970865839b0443066370e7d476ef47e90cd jdk7-b103
|
||||
10bc903a228d3a8efdf46fb8c3fcf82a59b88bc5 jdk7-b104
|
||||
1ce7938efb03224ccc8b3cdd7803eb39e889539c jdk7-b105
|
||||
6bdae472f77205046703b685eff2ac4f7a0ecf4e jdk7-b106
|
||||
439de530aac531a360beedba6e2fe51e17292cc0 jdk7-b107
|
||||
044d31b99ef5609389fc771c422e722e5e224228 jdk7-b108
|
||||
e02b4d709e177d08d56130a4bc68061e4bbacc7d jdk7-b109
|
||||
a6442d6bc38a44152e0662688213ce4d2701f42a jdk7-b110
|
||||
69f3edf083477955b5bd2f754252c7504167d8e1 jdk7-b111
|
||||
f960f117f1623629f64203e2b09a92a8f6f14ff5 jdk7-b112
|
||||
1fee41c7ed2b3388970a756a85aa693c0de8407a jdk7-b113
|
||||
750c1ccb2f2d1ddfa95ab6c7f897fdab2f87f7e9 jdk7-b114
|
||||
9cb24917216bc68997154f6e9566c3de62acb2f4 jdk7-b115
|
||||
a4e6aa1f45ad23a6f083ed98d970b5006ea4d292 jdk7-b116
|
||||
228e73f288c543a8c34e2a54227103ae5649e6af jdk7-b117
|
||||
2e876e59938a853934aa738c811b26c452bd9fe8 jdk7-b118
|
||||
4951967a61b4dbbf514828879f57bd1a0d4b420b jdk7-b119
|
||||
8c840d3ab24f8d0f422b991638acb44b6ab1d98c jdk7-b120
|
||||
0ce0a2c3a6926677dc507839a820ab6625541e5a jdk7-b121
|
||||
6f09ea1c034f087916d2a8cf0d22be768400118f jdk7-b122
|
||||
142129d8599d1f56b29387e7f9a5fad53b6d61df jdk7-b123
|
||||
aa894c225b1a517b665ac2a58295217ea2245134 jdk7-b124
|
||||
f658ec2730fa29323c36d23c27e54c7219ef5e16 jdk7-b125
|
||||
f1df068076986679ea1105532a65529d63a89060 jdk7-b126
|
||||
f83cd8bd35c678f94e526990e03dc838d0ec2717 jdk7-b127
|
||||
7da3f5f30855dec6bf3a86529e87dee883b90c72 jdk7-b128
|
||||
6823ea7eb8eb6fab405d7edb7a5c2f690887a2fa jdk7-b129
|
||||
a36beda9b9de91231d92a2c529f21cc218fcf8d5 jdk7-b130
|
||||
d8af56da89bc0fc02a6b6ad78f51157a46d665ab jdk7-b131
|
||||
d61280d36755d1941fb487f554e8b7a6d0bca6a1 jdk7-b132
|
||||
fd444c61e7ed3d92b2a730da7c737b02191b682f jdk7-b133
|
||||
def8e16dd237a47fc067d66d4c616d7baaec6001 jdk7-b134
|
||||
f75a1efb141210901aabe00a834e0fc32bb8b337 jdk7-b135
|
||||
46acf76a533954cfd594bb88fdea79938abfbe20 jdk7-b136
|
||||
d1cf7d4ee16c341f5b8c7e7f1d68a8c412b6c693 jdk7-b137
|
||||
62b8e328f8c8c66c14b0713222116f2add473f3f jdk7-b138
|
||||
955488f34ca418f6cdab843d61c20d2c615637d9 jdk7-b139
|
||||
f4298bc3f4b6baa315643be06966f09684290068 jdk7-b140
|
||||
5d86d0c7692e8f4a58d430d68c03594e2d3403b3 jdk7-b141
|
||||
92bf0655022d4187e9b49c1400f98fb3392a4630 jdk7-b142
|
||||
4a05062d8c4dfa3edec3faf1052af28baba5adff jdk7-b143
|
||||
07a8728ad49ef6dfa469c3a8bf5ab1e9c80bed5c jdk7-b144
|
||||
8294c99e685a1f6d1d37c45cd97854cf74be771e jdk7-b145
|
||||
dca1e8a87e8f756f95b99bac8fe795750d42e1b0 jdk7-b146
|
||||
a2a589fc29543ed32919c78a1810ad93a6fcf5bc jdk7-b147
|
||||
de9223c94f9c710b3eebb599cd3586f36c8b94a9 jdk8-b01
|
||||
1b9d19620eb4606a25b1e28f86d66c8bfa867e06 jdk8-b02
|
||||
6815e85bf96d6d3875954f9777660372cd70d065 jdk8-b03
|
||||
31f5c34d78081572ad9a2401c0bb0c6b9711dd65 jdk8-b04
|
||||
c4f9ea1ecb55ff44e0dd21d2888ead308c86a3aa jdk8-b05
|
||||
429da7734bf491bccde2a752fae97e9f225896dc jdk8-b06
|
||||
bc5710332b294676661103bb20d47d2ea3ba8def jdk8-b07
|
||||
24ee504f80412770c6874836cd9e55b536427b1d jdk8-b08
|
||||
fbf3cabc9e3bb1fcf710941d777cb0400505fbe6 jdk8-b09
|
||||
f651ce87127980c58e3599daba964eba2f3b4026 jdk8-b10
|
||||
cc1f5ce8e504d350e0b0c28c5f84333f8d540132 jdk8-b11
|
||||
86db042b3385c338e17f7664447fdc7d406dd19e jdk8-b12
|
||||
4cc0ef72c812943743ef4765f1100e2fbe2b1a08 jdk8-b13
|
||||
9ffaa48dbfb0f5936c2b789867d0785faec7071d jdk8-b14
|
||||
b5060eae3b32fd9f884a09774338cd8186d7fafa jdk8-b15
|
||||
736a63b854f321c7824b7e47890135f80aee05e3 jdk8-b16
|
||||
f0eccb2946986fb9626efde7d8ed9c8192623f5c jdk8-b17
|
||||
885050364691ac1ac978305c63f3368a197fb04d jdk8-b18
|
||||
0ff7113a0882ec82d642cb9f0297b4e497807ced jdk8-b19
|
||||
6561530ea757c3f3a6fb171c9cc7b3885cdeca85 jdk8-b20
|
||||
b3a426170188f52981cf4573a2f14d487fddab0d jdk8-b21
|
||||
e8f03541af27e38aafb619b96863e17f65ffe53b jdk8-b22
|
||||
498124337041ad53cbaa7eb110f3d7acd6d4eac4 jdk8-b23
|
||||
7d3720d8c595d1519c31e9ff7366203fc2c61350 jdk8-b24
|
||||
0071a6d64113a35ba345bb1580c256de5ce17d3e jdk8-b25
|
||||
6c805d8ed4e5449ea5e4d158c7bdbd7b0b70efd1 jdk8-b26
|
||||
c51754cddc037b9609e202b9ed38363d8683e7a8 jdk8-b27
|
||||
16ba58282d117247f480aae7a79b88141ade52a3 jdk8-b28
|
||||
e070119aa56ee4dc5506c19d2c4d2eecab8ad429 jdk8-b29
|
||||
23da7804aca0c9c4e6e86532a1453125a76d95ee jdk8-b30
|
||||
bac81e9f7d57b75fba5ab31b571f3fe0dc08af69 jdk8-b31
|
||||
2c5208ccb863db936eab523f49450b3fcd230348 jdk8-b32
|
||||
a6e6d42203e6d35f9e8b31eac25b0021b4dd58ad jdk8-b33
|
||||
0ae89825c75c9492e44efb3aca3d9ee3d8a209df jdk8-b34
|
||||
f151d5833912a82cd4f203944da0305c3be83ecc jdk8-b35
|
||||
98ce9816ae089c959ba1e70fba98423a31c4e9fa jdk8-b36
|
||||
b3a91113026c99b0da010d41055719ab0d8938f0 jdk8-b37
|
||||
4cc5610a6dd6227da766ebf9742eb11ff5ded6c0 jdk8-b38
|
||||
35a5397278779a2f8f3013f81586dc8f30cb149d jdk8-b39
|
||||
6e4e654931b976304bf6e7b4d0d6db8f75bac5d9 jdk8-b40
|
||||
c029c972396cea042a0dc67c0f7ccf2fe68007d4 jdk8-b41
|
||||
5c5a64ec0839df5affe9394b99ff338c363acbca jdk8-b42
|
||||
69d8a827cdf9236be9694a46d75c710d71dac7d7 jdk8-b43
|
||||
7e981cb0ad6a194f1fa859f9ad47586db461f269 jdk8-b44
|
||||
9b19b2302c28f4da6d4078f66234abecfed5688a jdk8-b45
|
||||
600c9a1feb01633cbcf2341a43d1d21e6497ecd0 jdk8-b46
|
||||
b820143a6f1ce993c6e6f31db4d64de990f42654 jdk8-b47
|
||||
086271e35b0a419b38e8bda9bebd70693811df0a jdk8-b48
|
||||
cecd7026f30cbd83b0601925a7a5e059aec98138 jdk8-b49
|
||||
38fe5ab028908cf64dd73a43336ba3211577bfc3 jdk8-b50
|
||||
382651d28f2502d371eca751962232c0e535e57a jdk8-b51
|
||||
b67041a6cb508da18d2f5c7687e6a31e08bea4fc jdk8-b52
|
||||
c7aa5cca1c01689a7b1a92411daf83684af05a33 jdk8-b53
|
||||
7c6aa31ff1b2ae48c1c686ebe1aadf0c3da5be15 jdk8-b54
|
||||
319f583f66db47395fa86127dd3ddb729eb7c64f jdk8-b55
|
||||
ffe6bce5a521be40146af2ac03c509b7bac30595 jdk8-b56
|
||||
2c21c080b11b93efb3851e39e1363e45da805943 jdk8-b57
|
||||
479d3302a26d7607ba271d66973e59ebf58825b6 jdk8-b58
|
||||
3bd874584fc01aae92fbc8827e2bd04d8b6ace04 jdk8-b59
|
||||
5e3adc681779037a2d33b7be6f75680619085492 jdk8-b60
|
||||
cdaa6122185f9bf512dcd6600f56bfccc4824e8c jdk8-b61
|
||||
8d9d430b4244b95f5cf1ebe719f834a1ac5d6cd5 jdk8-b62
|
||||
21ee1dd7b809639284900a128b9b656a592ebc7a jdk8-b63
|
||||
70fa4b11f26522e69b51fd652215f60ce350bac3 jdk8-b64
|
||||
a2cf4d4a484378caea2e827ed604b2bbae58bdba jdk8-b65
|
||||
17820b958ae84f7c1cc6719319c8e2232f7a4f1d jdk8-b66
|
||||
76cc9bd3ece407d3a15d3bea537b57927973c5e7 jdk8-b67
|
||||
cb33628d4e8f11e879c371959e5948b66a53376f jdk8-b68
|
||||
adb5171c554e14cd86f618b5584f6e3d693d5889 jdk8-b69
|
||||
0d625373c69e2ad6f546fd88ab50c6c9aad01271 jdk8-b70
|
||||
a41ada2ed4ef735449531c6ebe6cec593d890a1c jdk8-b71
|
||||
6725b3961f987cf40f446d1c11cd324a3bec545f jdk8-b72
|
||||
fe94b40ffd9390f6cffcdf51c0389b0e6dde0c13 jdk8-b73
|
||||
f627eff819628822a0777af8062244352f2a29cf jdk8-b74
|
||||
f1478a6d25fddd311a84dcbfac50824cc1858bdd jdk8-b75
|
||||
f407160c280d1c5b00d314c535441ac26f195fee jdk8-b76
|
||||
d17eb2e13e362085e866d46235314c50cc4661cc jdk8-b77
|
||||
6d3dcd34b5b962ea1ef9eed0dafdee9e812401bc jdk8-b78
|
||||
a1313a8d90d17d363a3b2a645dc4030ec204b168 jdk8-b79
|
||||
3fa21fbf9be7e6b482af43aacb6a09acfa30bdb6 jdk8-b80
|
||||
e41d716405b209d3eddef8bd4240cec2bd34dcca jdk8-b81
|
||||
5e8c55025644730385a6f8fa029ecdb2d2c98a07 jdk8-b82
|
||||
bcebd3fdefc91abb9d7fa0c5af6211b3f8720da6 jdk8-b83
|
||||
d7ad0dfaa41151bd3a9ae46725b0aec3730a9cd0 jdk8-b84
|
||||
1872c12529090e1c1dbf567f02ad7ae6231b8f0c jdk8-b85
|
||||
da9a4c9312816451884aa6db6f18be51a07bff13 jdk8-b86
|
||||
5ebf6c63714de2c9dcf831074086d31daec819df jdk8-b87
|
||||
e517701a4d0e25ae9c7945bca6e1762a8c5d8aa6 jdk8-b88
|
||||
4dec41b3c5e3bb616f0c6f15830d940905aa5d16 jdk8-b89
|
||||
f09ab0c416185e3cba371e81bcb6a16060c90f44 jdk8-b90
|
||||
80b6c3172dc2cfceb022411292d290a967f9c728 jdk8-b91
|
||||
2fd6acba737b01e705e1f7c33588c922a3787f13 jdk8-b92
|
||||
b72ae39e1329fefae50d4690db4fde43f3841a95 jdk8-b93
|
||||
0d804e3b955dce406af6a79ac1cc35c696aff7fb jdk8-b94
|
||||
49fe9c8049132647ad38837a877dd473e6c9b0e5 jdk8-b95
|
||||
ea73f01b9053e7165e7ba80f242bafecbc6af712 jdk8-b96
|
||||
0a85476a0b9cb876d5666d45097dac68bef3fce1 jdk8-b97
|
||||
711eb4aa87de68de78250e0549980936bab53d54 jdk8-b98
|
||||
2d3875b0d18b3ad1c2bebf385a697e309e4005a4 jdk8-b99
|
||||
3d34036aae4ea90b2ca59712d5a69db3221f0875 jdk8-b100
|
||||
edb01c460d4cab21ff0ff13512df7b746efaa0e7 jdk8-b101
|
||||
bbe43d712fe08e650808d774861b256ccb34e500 jdk8-b102
|
||||
30a1d677a20c6a95f98043d8f20ce570304e3818 jdk8-b103
|
||||
b5ed503c26ad38869c247c5e32debec217fd056b jdk8-b104
|
||||
589f4fdc584e373a47cde0162e9eceec9165c381 jdk8-b105
|
||||
514b0b69fb9683ef52062fd962a3e0644431f64d jdk8-b106
|
||||
892889f445755790ae90e61775bfb59ddc6182b5 jdk8-b107
|
||||
74049f7a28b48c14910106a75d9f2504169c352e jdk8-b108
|
||||
af9a674e12a16da1a4bd53e4990ddb1121a21ef1 jdk8-b109
|
||||
b5d2bf482a3ea1cca08c994512804ffbc73de0a1 jdk8-b110
|
||||
b9a0f6c693f347a6f4b9bb994957f4eaa05bdedd jdk8-b111
|
||||
ad67c34f79c28a8e755f4a49f313868619d6702c jdk8-b112
|
||||
4a4dbcf7cb7d3e1a81beaa3b11cd909f69ebc79a jdk8-b113
|
||||
dfa34ab293faad9b543a24646dbb381bc3ab5586 jdk8-b114
|
||||
3dd9732b17034f45d111996d1d50287b05a3998c jdk8-b115
|
||||
aaf663f591aba43ec942263b15ba62759ce26a1e jdk8-b116
|
||||
31b0e03fcad73d7886b306b4c2e57ad270780d0d jdk8-b117
|
||||
f5b521ade7a35cea18df78ee86322207729f5611 jdk8-b118
|
||||
87b743b2263cc53955266411b7797b365a0fb050 jdk8-b119
|
||||
a1ee9743f4ee165eae59389a020f2552f895dac8 jdk8-b120
|
||||
13b877757b0b1c0d5813298df85364f41d7ba6fe jdk9-b00
|
||||
f130ca87de6637acae7d99fcd7a8573eea1cbaed jdk9-b01
|
||||
b32e2219736e42baaf45daf0ad67ed34f6033799 jdk9-b02
|
||||
7f655f31f9bcee618cf832f08176ad8c1ed3fdd3 jdk9-b03
|
||||
099891b1d86f3719e116ac717ffdafc90d037fb7 jdk9-b04
|
||||
dd311791ad6895a3989020dd6c6c46db87972ab8 jdk9-b05
|
||||
85dbdc227c5e11429b4fc4a8ba763f50107edd6e jdk9-b06
|
||||
c826d05f1fb0773f6a28caa763307dd30d90d36e jdk9-b07
|
||||
b47e021195757f8f45582124ea7cad48ccf5f872 jdk9-b08
|
||||
efe7dbc6088691757404e0c8745f894e3ca9c022 jdk9-b09
|
||||
8c0bdeecd7c0f9ce3f3762a51991f755cb3a972c jdk9-b10
|
||||
0809c9a4d36e6291f1c4384604c4bbf29e975722 jdk9-b11
|
||||
0d1f816217dce5e72187f167cc1816080cbeb453 jdk9-b12
|
||||
1a30593dcb9802faec3b6edb24d86ca088594e4e jdk9-b13
|
||||
97932f6ad950ae5a73a9da5c96e6e58503ff646b jdk9-b14
|
||||
74eb0778e4f2dbff6628e718378449fba27c4265 jdk9-b15
|
||||
4a09f5d30be844ac6f714bdb0f63d8c3c08b9a98 jdk9-b16
|
||||
410bccbded9e9cce80f1e13ad221e37ae97a3986 jdk9-b17
|
||||
c5495e25c7258ab5f96a1ae14610887d76d2be63 jdk9-b18
|
||||
2dcf544eb7ed5ac6a3f7813a32e33acea7442405 jdk9-b19
|
||||
89731ae72a761afdf4262e8b9513f302f6563f89 jdk9-b20
|
||||
28dd0c7beb3cad9cf95f17b4b5ad87eb447a4084 jdk9-b21
|
||||
9678e0db8ff6ed845d4c2ee4a3baf7f386a777e5 jdk9-b22
|
||||
39cfdc2dcaf3f195c55398e4e677ab053b07e3d2 jdk9-b23
|
||||
d9ce05f36ffec3e5e8af62a92455c1c66a63c320 jdk9-b24
|
||||
13a5c76976fe48e55c9727c25fae2d2ce7c05da0 jdk9-b25
|
||||
cd6f4557e7fea5799ff3762ed7a80a743e75d5fd jdk9-b26
|
||||
d06a6d3c66c08293b2a9650f3cc01fd55c620e65 jdk9-b27
|
||||
f4269e8f454eb77763ecee228a88ae102a9aef6e jdk9-b28
|
||||
c36c0092693707a8255561433647e8c3cd724ccd jdk9-b29
|
||||
b2287cac7813c70ed7f679d9a46fe774bd4005f8 jdk9-b30
|
||||
9d0e6639a4d71b63507dd94b1a028e963b27e798 jdk9-b31
|
||||
1b1ec4291abc0ba6da7bf79b754f08dd759a4a0c jdk9-b32
|
||||
f0c5e4b732da823bdaa4184133675f384e7cd68d jdk9-b33
|
||||
9618201c5df28a460631577fad1f61e96f775c34 jdk9-b34
|
||||
a137992d750c72f6f944f341aa19b0d0d96afe0c jdk9-b35
|
||||
41df50e7303daf73c0d661ef601c4fe250915de5 jdk9-b36
|
||||
b409bc51bc23cfd51f2bd04ea919ec83535af9d0 jdk9-b37
|
||||
948cceef81ba4cb34bc233e7cc5952951ff04e88 jdk9-b38
|
||||
4e7c4d692e934cb9023af8201e7c2b510e9c4ee1 jdk9-b39
|
||||
82f4cb44b2d7af2352f48568a64b7b6a5ae960cd jdk9-b40
|
||||
9fffb959eb4197ff806e4ac12244761815b4deee jdk9-b41
|
||||
3107be2ba9c6e208a0b86bc7100a141abbc5b5fb jdk9-b42
|
||||
6494b13f88a867026ee316b444d9a4fa589dd6bd jdk9-b43
|
||||
abbfccd659b91a7bb815d5e36fed635dcdd40f31 jdk9-b44
|
||||
bfc24ae2b900187585079bb11e66e459d1e525fe jdk9-b45
|
||||
722378bc599e38d9a1dd484de30f10dfd7b21438 jdk9-b46
|
||||
8327024a99559982b848e9c2191da9c0bf8838fd jdk9-b47
|
||||
b2f9702efbe95527ea3a991474fda23987ff1c5c jdk9-b48
|
||||
5b8db585a33c3cc48e70e688ceee57dd9271dc5d jdk9-b49
|
||||
1550b2f6b63d1411fa84dc7bbc6f04809aedb43f jdk9-b50
|
||||
6efe265424e3f1ea596408a1f71baf2de316c772 jdk9-b51
|
||||
d6224d6021459ac8b3832e822f5acc849fa944af jdk9-b52
|
||||
874d76e4699dfcd61ae1826c9fe0ddc1610ad598 jdk9-b53
|
||||
82cd31c5d6ca8d4c1653f4eb1c09eb2d9a3b2813 jdk9-b54
|
||||
c97e2d1bad9708d379793ba2a4c848eda14c741e jdk9-b55
|
||||
47544495db2d3d2edf0f85862d8715592fdb919f jdk9-b56
|
||||
ddb95d8f169b09544cc17e72a6baaff2400092f5 jdk9-b57
|
||||
f40752db7773ca0c737f2ad88371e35c57fdfed7 jdk9-b58
|
||||
da950f343762a856d69751570a4c07cfa68a415b jdk9-b59
|
||||
38f98cb6b33562a926ec3b79c7b34128be37647d jdk9-b60
|
||||
ac3f5a39d4ff14d70c365e12cf5ec8f2abd52a04 jdk9-b61
|
||||
e7dbbef69d12b6a74dfad331b7188e7f893e8d29 jdk9-b62
|
||||
989253a902c34dcb7564695161c9200a5fbb7412 jdk9-b63
|
||||
8ffdeabc7c2b9a8280bf46cae026ac46b4d31c26 jdk9-b64
|
||||
4915246064b2f89d5f00c96e758686b7fdad36a6 jdk9-b65
|
||||
ff3fc75f3214ad7e03595be1b0d0f38d887b6f0e jdk9-b66
|
||||
56166ce66037952fa21e9f680b31bf8eb47312c0 jdk9-b67
|
||||
5b500c93ce4822d47061cd518ff3f72d9d8cb5b5 jdk9-b68
|
||||
d69c968463f0ae5d0b45de3fc14fe65171b23948 jdk9-b69
|
||||
43d0179ee9de3bfffae3417f09e07eb6d8efc963 jdk9-b70
|
||||
f66c185284727f6e6ffd27e9c45ed2dd9da0a691 jdk9-b71
|
||||
61d2d0629b6dbf4c091dc86151ade1b3ef34fffe jdk9-b72
|
||||
9b3a9d72f07b40c648de79961679f42283af1bb5 jdk9-b73
|
||||
7c577fda1855d03c04546694d514678f596508c9 jdk9-b74
|
||||
f55df5cfe11c97e4b58998b76f5bd00a73cde12d jdk9-b75
|
||||
eeea9adfd1e3d075ef82148c00a4847a1aab4d26 jdk9-b76
|
||||
c25e882cee9622ec75c4e9d60633539a2f0a8809 jdk9-b77
|
||||
c8753d0be1778944dc512ec86a459941ea1ad2c3 jdk9-b78
|
||||
3966bd3b8167419aa05c6718a4af1cf54b1e3c58 jdk9-b79
|
||||
3c9f5bd909ae7187f24622ee4b69f8a5756a9271 jdk9-b80
|
||||
2050b3a0aadcb0e024bf798197421d58e54ec8bf jdk9-b81
|
||||
6521875cb63e1d0121b30af56ebbc36db078c4c6 jdk9-b82
|
||||
f61a63b7d1e52e307abc0bfc751203155d362ec4 jdk9-b83
|
||||
51b2db2fa04c16d767b66113dbf08c5349ce382a jdk9-b84
|
||||
8392405ab038b22e69a3728e17dbdd9e3d3a22ed jdk9-b85
|
||||
7db0663a5e968059fa7c772172187ebd60b6492d jdk9-b86
|
||||
1a52a30674cd28c24d4d388150336121f2e9ddf9 jdk9-b87
|
||||
16b4968f9bb8f34371b42c0ba483d76e91ba84d8 jdk9-b88
|
||||
4a0312f2894bcbe1fd20266c8fda8d983bd2fcf6 jdk9-b89
|
||||
d131f4b8433a79408f935eff9bf92a0664229b60 jdk9-b90
|
||||
8077fd2f055d31e50b46fcf62d9c035bc385a215 jdk9-b91
|
||||
f242d4332f563648426a1b0fa02d8741beba19ef jdk9-b92
|
||||
09206c6513b300e1ac8541f3be012e1a49312104 jdk9-b93
|
||||
25a2cab05cfbe6034b71d9e72d64c65b0572ce63 jdk9-b94
|
||||
5ac6287ec71aafe021cc839d8bc828108d23aaba jdk-9+95
|
||||
139f19d70350238e15e107945cea75082b6380b3 jdk-9+96
|
||||
4edcff1b9a8875eb6380a2165dfec599e8e3f7c0 jdk-9+97
|
||||
d00ad2d9049ac60815f70bff445e95df85648bd2 jdk-9+98
|
||||
f9bcdce2df26678c3fe468130b535c0342c69b89 jdk-9+99
|
||||
4379223f8806626852c46c52d4e7a27a584b406e jdk-9+100
|
||||
80f67512daa15cf37b4825c1c62a675d524d7c49 jdk-9+101
|
||||
2dc4c11fe48831854916d53c3913bdb7d49023ea jdk-9+102
|
||||
4a652e4ca9523422149958673033e0ac740d5e1e jdk-9+103
|
||||
086c682bd8c5f195c324f61e2c61fbcd0226d63b jdk-9+104
|
||||
db483b34fa7148d257a429acddbde9c13687dcae jdk-9+105
|
||||
6c644cca3f3fc2763e2ff7d669849a75d34543ba jdk-9+106
|
||||
1c076468bf7dad5b8f2ee5dcf66e2279caa3e208 jdk-9+107
|
||||
257b579d813201682931d6b42f0445ffe5b4210d jdk-9+108
|
||||
c870cb782aca71093d2584376f27f0cfbfec0e3a jdk-9+109
|
||||
4a95f4b1bd8bfce85dc02a593896749feab96c34 jdk-9+110
|
||||
a6614ff7bf09da74be1d0ef3d9755090d244697a jdk-9+111
|
||||
7359994942f8d8e723b584d66a3a92c2e9e95e5c jdk-9+112
|
||||
6072af7a98be3922f26bdce71b53bb3646cb2ac9 jdk-9+113
|
||||
c84d0cce090e161d736de69e941830adf8c2f87a jdk-9+114
|
||||
8d78fb40648dd221ce4ef19f9d5aa41ee1a3a884 jdk-9+115
|
||||
84aba7335005a3a47751dcf1f37935f97df9f99a jdk-9+116
|
||||
82b8d12a553f5617737c238cec060281d52e351c jdk-9+117
|
||||
7c04fcb12bd4a31570a238e663fa846dfa5ec3b8 jdk-9+118
|
||||
caf97b37ebec84288c112d21d3a60cb628cba1e8 jdk-9+119
|
||||
9330543436402b8f3bd070524846a464d8143557 jdk-9+120
|
||||
18e5cdecb37a2f03ba74f6c8f022858bcbaacf56 jdk-9+121
|
||||
7693aa00e131493ceb42b93305e2f014c9922a3b jdk-9+122
|
||||
d53037a90c441cb528dc41c30827985de0e67c62 jdk-9+123
|
||||
2a5697a98620c4f40e4a1a71478464399b8878de jdk-9+124
|
||||
3aa52182b3ad7c5b3a61cf05a59dd07e4c5884e5 jdk-9+125
|
||||
03e7b2c5ae345be3caf981d76ceb3efe5ff447f8 jdk-9+126
|
||||
8e45018bde9de4ad15b972ae62874bba52dba2d5 jdk-9+127
|
||||
5bf88dce615f6804f9e101a96ffa7c9dfb4fbbbe jdk-9+128
|
||||
e8373543a3f0f60589b7d72b1f9b172721124caf jdk-9+129
|
||||
e613affb88d178dc7c589f1679db113d589bddb4 jdk-9+130
|
||||
4d2a15091124488080d65848b704e25599b2aaeb jdk-9+131
|
||||
2e83d21d78cd9c1d52e6cd2599e9c8aa36ea1f52 jdk-9+132
|
||||
e17429a7e843c4a4ed3651458d0f950970edcbcc jdk-9+133
|
||||
a71210c0d9800eb6925b61ecd6198abd554f90ee jdk-9+134
|
||||
e384420383a5b79fa0012ebcb25d8f83cff7f777 jdk-9+135
|
||||
1b4b5d01aa11edf24b6fadbe3d2f3e411e3b02cd jdk-9+136
|
||||
9cb87c88ed851c0575b8ead753ea238ed5b544e9 jdk-9+137
|
||||
d273dfe9a126d3bffe92072547fef2cd1361b0eb jdk-9+138
|
||||
65477538bec32963dc41153d89c4417eb46c45fc jdk-9+139
|
||||
0875007901f7d364a08220b052f0c81003e9c8c5 jdk-9+140
|
||||
9aadd2163b568d76f8969ad2fb404a63733da359 jdk-9+141
|
||||
df0e03e3ca0ed1307793017dfc1a054c8726131c jdk-9+142
|
||||
d62173b931bf5b6bffc6e80a9060bb2e8b8efc75 jdk-9+143
|
||||
31f5023200d42185b70c4c00ba5672391e4642d0 jdk-9+144
|
||||
3ee4e7827413fa5c5c4fca58597b0ad89e921bfb jdk-9+145
|
||||
581331db696a62dd411926ba7fd437252252a71d jdk-9+146
|
||||
f4e854a77aa38749bd90f722b06974a56e7233d5 jdk-9+147
|
||||
5c71ea43933b6c7e8a85eb1a4eb2213011b95d82 jdk-9+148
|
||||
cf139f925da04c8bd7efd33270a0315d72b338d3 jdk-9+149
|
||||
17469f16fbb406ec9f0dd262ce776ab6efbc38f1 jdk-9+150
|
||||
37b95df0042ae0687324e1f7dc4a2519e230e704 jdk-9+151
|
||||
ab2c8b03c3284fcbdd157551a66f807e3a182d9b jdk-9+152
|
||||
d7034ff7f8e257e81c9f95c7785dd4eaaa3c2afc jdk-9+153
|
||||
8c70d170e62c0c58b5bc3ba666bd140399b98c9c jdk-10+0
|
||||
45b751afd11e6c05991cf4913c5a0ac3304fcc4e jdk-9+154
|
||||
f4aff695ffe05cfdb69d8af25a4ddc6a029754ea jdk-9+155
|
||||
06bce0388880b5ff8e040e4a9d72a3ea11dac321 jdk-9+156
|
||||
74116beae88a8f17a80301aa6c83865c82f10ece jdk-10+1
|
||||
4a79ad46e578112fce68f1af9dd931025cc235cb jdk-10+2
|
||||
d1cab6c7e608479be4ebfad48a25b0ed48600f62 jdk-10+3
|
||||
02253db2ace1422f576f58502fc7831ead77424b jdk-10+4
|
||||
f113ce12fe24fbd24acf02711372d9f1e1c12426 jdk-10+5
|
||||
1407b19a2ddf6baae162f5a1a5b96af473f4d7d1 jdk-10+6
|
||||
30e75693ae99fd8e47fd2f5116527aff1b59aff9 jdk-10+7
|
||||
c42dc7b58b4d4301ea676a76326fd9bbd403d595 jdk-10+8
|
||||
aa5b01f5e5620438fd39efdb2e2f6365a2c7d898 jdk-10+9
|
||||
b0f2b8ff25a2209b2c807785d75f20e5086bbfc2 jdk-10+10
|
||||
036dbf8b381798e5d31065109714d04d97bf98a4 jdk-10+11
|
||||
e6d70017f5b9adbb2ec82d826973d0251800a3c3 jdk-10+12
|
||||
9927a9f16738e240ab7014f0118f41e314ef8f99 jdk-10+13
|
||||
9ef5029b247b4d940080417a287440bbdbab995b jdk-10+14
|
||||
878e216039322cb3f0ecbd0944642a2b4e2593f3 jdk-10+15
|
||||
4bbea012e5676e8025ade2bcfab4d6581e6e9f4b jdk-10+16
|
||||
7db699468b4f84abbcc01647e5a964409737411a jdk-10+17
|
||||
3739654290616e533fc6f51bf9ad69ed47a6abba jdk-10+18
|
||||
14df107500cc3b8ab238c3e4ad2c74e12bfe6067 jdk-10+19
|
||||
4586bc5d28d13d3147b993e6237eaf29a7073bbb jdk-10+20
|
||||
a85884d55ce32799f5c7382b7ea4839052b362a2 jdk-10+21
|
||||
e5357aa85dadacc6562175ff74714fecfb4470cf jdk-10+22
|
||||
22850b3a55240253841b9a425ad60a7fcdb22d47 jdk-10+23
|
||||
3b201865d5c1f244f555cad58da599c9261286d8 jdk-10+24
|
||||
8eb5e3ccee560c28ac9b1df2670adac2b3d36fad jdk-10+25
|
||||
1129253d3bc728a2963ba411ab9dd1adf358fb6b jdk-10+26
|
||||
b87d7b5d5dedc1185e5929470f945b7378cdb3ad jdk-10+27
|
||||
92f08900cb3c0d694e5c529a676c1c9e5909193f jdk-10+28
|
||||
a6e591e12f122768f675428e1e5a838fd0e9c7ec jdk-10+29
|
||||
8fee80b92e65149f7414250fd5e34b6f35d417b4 jdk-10+30
|
||||
e6278add9ff28fab70fe1cc4c1d65f7363dc9445 jdk-10+31
|
||||
a2008587c13fa05fa2dbfcb09fe987576fbedfd1 jdk-10+32
|
||||
bbd692ad4fa300ecca7939ffbe3b1d5e52a28cc6 jdk-10+33
|
||||
89deac44e51517841491ba86ff44aa82a5ca96b3 jdk-10+34
|
||||
d8c634b016c628622c9abbdc6bf50509e5dedbec jdk-10+35
|
||||
0ee20aad71c4f33c426372b4c8bcc1235ce2ec08 jdk-11+0
|
||||
959f2f7cbaa6d2ee45d50029744efb219721576c jdk-10+36
|
||||
4f830b447edf04fb4a52151a5ad44d9bb60723cd jdk-10+37
|
||||
e569e83139fdfbecfeb3cd9014d560917787f158 jdk-10+38
|
||||
5b834ec962366e00d4445352a999a3ac14e26f64 jdk-10+39
|
||||
860326263d1f6a83996d7da0f4c66806ae4aa1eb jdk-10+40
|
||||
3eae36c6baa5f916a3024cf1513e22357e00185d jdk-10+41
|
||||
4b62b815b4f49970b91a952929cf50115c263cb3 jdk-10+42
|
||||
107413b070b92c88bde6230ceb4a19b579781068 jdk-10+43
|
||||
dfa46cfe56346884a61efdc30dc50f7505d66761 jdk-11+1
|
||||
03ae177c26b016353e5ea1cab6ffd051dfa086ca jdk-11+2
|
||||
663f20fc51091bd7f95d18448850ba091207b7bd jdk-10+44
|
||||
4f96cf952e71cb8a127334494faf28880c26181b jdk-10+45
|
||||
1fd4d6068f54561cfc67d54fc9ca84af7212c4f8 jdk-11+3
|
||||
e59941f7247d451fa7df9eaef3fce0f492f8420c jdk-11+4
|
||||
d5c43e9f08fb9a7c74aae0d48daf17f2ad2afaef jdk-11+5
|
||||
3acb379b86725c47e7f33358cb22efa8752ae532 jdk-11+6
|
||||
f7363de371c9a1f668bd0a01b7df3d1ddb9cc58b jdk-11+7
|
||||
755e1b55a4dff510f9639cdb5c5e82549a7e09b3 jdk-11+8
|
||||
0c3e252cea44f06aef570ef464950ab97c669970 jdk-11+9
|
||||
6fa770f9f8ab296e1ce255ec17ccf6d4e1051886 jdk-10+46
|
||||
69d7398038c54774d9395b6810e0cca335edc02c jdk-11+10
|
||||
e1e60f75cd39312a7f59d2a4f91d624e5aecc95e jdk-11+11
|
||||
3ab6ba9f94a9045a526d645af26c933235371d6f jdk-11+12
|
||||
758deedaae8406ae60147486107a54e9864aa7b0 jdk-11+13
|
||||
3595bd343b65f8c37818ebe6a4c343ddeb1a5f88 jdk-11+14
|
||||
a11c1cb542bbd1671d25b85efe7d09b983c48525 jdk-11+15
|
||||
02934b0d661b82b7fe1052a04998d2091352e08d jdk-11+16
|
||||
64e4b1686141e57a681936a8283983341484676e jdk-11+17
|
||||
e1b3def126240d5433902f3cb0e91a4c27f6db50 jdk-11+18
|
||||
36ca515343e00b021dcfc902e986d26ec994a2e5 jdk-11+19
|
||||
95aad0c785e497f1bade3955c4e4a677b629fa9d jdk-12+0
|
||||
9816d7cc655e53ba081f938b656e31971b8f097a jdk-11+20
|
||||
14708e1acdc3974f4539027cbbcfa6d69f83cf51 jdk-11+21
|
||||
00b16d0457e43d23f6ca5ade6b243edce62750a0 jdk-12+1
|
||||
9937ef7499dcd7673714517fd5e450410c14ba4e jdk-11+22
|
||||
69b438908512d3dfef5852c6a843a5778333a309 jdk-12+2
|
||||
1edcf36fe15f79d6228d1a63eb680878e2386480 jdk-11+23
|
||||
990db216e7199b2ba9989d8fa20b657e0ca7d969 jdk-12+3
|
||||
ea900a7dc7d77dee30865c60eabd87fc24b1037c jdk-11+24
|
||||
499b873761d8e8a1cc4aa649daf04cbe98cbce77 jdk-12+4
|
||||
331888ea4a788df801b1edf8836646cd25fc758b jdk-11+25
|
||||
f8696e0ab9b795030429fc3374ec03e378fd9ed7 jdk-12+5
|
||||
945ba9278a272a5477ffb1b3ea1b04174fed8036 jdk-11+26
|
||||
7939b3c4e4088bf4f70ec5bbd8030393b653372f jdk-12+6
|
||||
9d7d74c6f2cbe522e39fa22dc557fdd3f79b32ad jdk-11+27
|
||||
ef57958c7c511162da8d9a75f0b977f0f7ac464e jdk-12+7
|
||||
76072a077ee1d815152d45d1692c4b36c53c5c49 jdk-11+28
|
||||
492b366f8e5784cc4927c2c98f9b8a3f16c067eb jdk-12+8
|
||||
31b159f30fb281016c5f0c103552809aeda84063 jdk-12+9
|
||||
8f594f75e0547d4ca16649cb3501659e3155e81b jdk-12+10
|
||||
f0f5d23449d31f1b3580c8a73313918cafeaefd7 jdk-12+11
|
||||
15094d12a632f452a2064318a4e416d0c7a9ce0c jdk-12+12
|
||||
511a9946f83e3e3c7b9dbe1840367063fb39b4e1 jdk-12+13
|
||||
8897e41b327c0a5601c6ba2bba5d07f15a3ffc91 jdk-12+14
|
||||
8897e41b327c0a5601c6ba2bba5d07f15a3ffc91 jdk-12+14
|
||||
6f04692c7d5137ee34a6bd94c0c8a6c9219cb127 jdk-12+14
|
||||
f8626bcc169813a4b2a15880386b952719d1d6d1 jdk-12+15
|
||||
199658d1ef860cdc17055b4fd3e94b057f292fe9 jdk-12+16
|
||||
eefa65e142af305923d2adcd596fab9c639723a1 jdk-12+17
|
||||
e38473506688e0995e701fc7f77d5a91b438ef93 jdk-12+18
|
||||
dc1f9dec2018a37fedba47d8a2aedef99faaec64 jdk-12+19
|
||||
40098289d5804c3b5e7074bc75501a81e70d9b0d jdk-12+20
|
||||
f8fb0c86f2b3d24294d39c5685a628e1beb14ba7 jdk-12+21
|
||||
732bec44c89e8b93a38296bf690f97b7230c5b6d jdk-12+22
|
||||
eef755718cb24813031a842bbfc716a6cea18e9a jdk-12+23
|
||||
cc4098b3bc10d1c390384289025fea7b0d4b9e93 jdk-13+0
|
||||
7d4397b43fa305806160785a4c7210600d59581a jdk-12+24
|
||||
11033c4ada542f9c9a873314b6ecf60af19e8256 jdk-13+1
|
||||
7496df94b3b79f3da53925d2d137317715f11d97 jdk-12+25
|
||||
50677f43ac3df9a8684222b8893543c60f3aa0bd jdk-13+2
|
||||
de9fd809bb475401aad188eab2264226788aad81 jdk-12+26
|
||||
642346a11059b9f283110dc301a24ed43b76a94e jdk-13+3
|
||||
f15d443f97318e9b40e6f451e327ff69ed4ec361 jdk-12+27
|
||||
a47b8125b7cc9ef59619745c163975fe935b57ed jdk-13+4
|
||||
659b004b6a1bd8c31e766cbdf328d8f8473fd4d7 jdk-12+28
|
||||
e3ed960609927b5fdfd0a797159835cd83a81a31 jdk-13+5
|
||||
44f41693631f9b5ac78ff4d2bfabd6734fe46df2 jdk-12+29
|
||||
b5f05fe4a6f8b3996a000c20078b356d991ca8ec jdk-13+6
|
||||
6c377af36a5c4203f16aed8a5e4c2ecc08fcd8bd jdk-12+30
|
||||
021917019cda1c0c5853255322274f37693a2431 jdk-13+7
|
||||
b5f7bb57de2f797be34f6c75d45c3245ad37ab97 jdk-12+31
|
||||
a535ba736cabc6886acdff36de3a096c46e5ddc5 jdk-13+8
|
||||
4ce47bc1fb92cf94c6e3d1f49d582f02dcb851ab jdk-12+32
|
||||
c081f3ea6b9300265a4a34e38f970b1e3ddaae9f jdk-13+9
|
||||
b67884871b5fff79c5ef3eb8ac74dd48d71ea9b1 jdk-12+33
|
||||
8e069f7b4fabfe05d9f500783e6d56cb0196d25c jdk-13+10
|
||||
21ea4076a275a0f498afa517e9ee1b94a9cf0255 jdk-13+11
|
||||
1d7aec80147a6d92b101a76aef92f3ddc88bedf4 jdk-13+12
|
||||
b67884871b5fff79c5ef3eb8ac74dd48d71ea9b1 jdk-12-ga
|
||||
83cace4142c8563b6a921787db02388e1bc48d01 jdk-13+13
|
||||
46cf212cdccaf4fb064d913b12004007d3322b67 jdk-13+14
|
||||
f855ec13aa2501ae184c8b3e0626a8cec9966116 jdk-13+15
|
||||
9d0ae9508d5337b0dc7cc4684be42888c4023755 jdk-13+16
|
||||
93b702d2a0cb9e32160208f6700aede1f8492773 jdk-13+17
|
||||
bebb82ef3434a25f8142edafec20165f07ac562d jdk-13+18
|
||||
a43d6467317d8f1e160f67aadec37919c9d64443 jdk-13+19
|
||||
6ccc7cd7931e34129f6b7e04988fc9a63958dde0 jdk-13+20
|
||||
f2f11d7f7f4e7128f8aba6ffa576cfa76fbf7d1a jdk-13+21
|
||||
181986c5476468bc2dd4532af49599003ee8af37 jdk-13+22
|
||||
b034d2dee5fc93d42a81b65e58ce3f91e42586ff jdk-13+23
|
||||
7e2238451585029680f126ccbb46d01f2ff5607f jdk-13+24
|
||||
22b3b7983adab54e318f75aeb94471f7a4429c1e jdk-14+0
|
||||
22b3b7983adab54e318f75aeb94471f7a4429c1e jdk-13+25
|
||||
2f4e214781a1d597ed36bf5a36f20928c6c82996 jdk-14+1
|
||||
0692b67f54621991ba7afbf23e55b788f3555e69 jdk-13+26
|
||||
43627549a488b7d0b4df8fad436e36233df89877 jdk-14+2
|
||||
b7f68ddec66f996ae3aad03291d129ca9f02482d jdk-13+27
|
||||
e64383344f144217c36196c3c8a2df8f588a2af3 jdk-14+3
|
||||
1e95931e7d8fa7e3899340a9c7cb28dbea50c10c jdk-13+28
|
||||
19d0b382f0869f72d4381b54fa129f1c74b6e766 jdk-14+4
|
||||
3081f39a3d30d63b112098386ac2bb027c2b7223 jdk-13+29
|
||||
0f1e29c77e50c7da11d83df410026392c4d1a28c jdk-14+5
|
||||
2e63fb0a885fa908a97bbb0da8d7c3de11536aca jdk-13+30
|
||||
443f7359b34d60e7821216ffc60f88b6ffe0ccdd jdk-14+6
|
||||
6a159c6c23ccd0029140ab91653442e412305ce5 jdk-13+31
|
||||
28ab01c067551ef158abaef08e154e1051ca0893 jdk-14+7
|
||||
929f37a9c35d530d4e866f6e832001aeb4cfb371 jdk-13+32
|
||||
c0023e364b6f130cb1e93747b796d8718d544db1 jdk-14+8
|
||||
9c250a7600e12bdb1e611835250af3204d4aa152 jdk-13+33
|
||||
18f189e69b29f8215a3500b875127ed4fb2d977a jdk-14+9
|
||||
ececb6dae777e622abda42c705fd984a42f46b5a jdk-14+10
|
||||
bf4c808a4488025a415f867e54c8b088417e08a0 jdk-14+11
|
||||
8570f22b9b6ac6bec673899b582150865696e425 jdk-14+12
|
||||
fbbe6672ae15deaf350a9e935290a36f57ba9c25 jdk-14+13
|
||||
cddef3bde924f3ff4f17f3d369280cf69d0450e5 jdk-14+14
|
||||
9c250a7600e12bdb1e611835250af3204d4aa152 jdk-13-ga
|
||||
778fc2dcbdaa8981e07e929a2cacef979c72261e jdk-14+15
|
||||
d29f0181ba424a95d881aba5eabf2e393abcc70f jdk-14+16
|
||||
5c83830390baafb76a1fbe33443c57620bd45fb9 jdk-14+17
|
||||
e84d8379815ba0d3e50fb096d28c25894cb50b8c jdk-14+18
|
||||
9b67dd88a9313e982ec5f710a7747161bc8f0c23 jdk-14+19
|
||||
54ffb15c48399dd59922ee22bb592d815307e77c jdk-14+20
|
||||
c16ac7a2eba4e73cb4f7ee9294dd647860eebff0 jdk-14+21
|
||||
83810b7d12e7ff761ad3dd91f323a22dad96f108 jdk-14+22
|
||||
15936b142f86731afa4b1a2c0fe4a01e806c4944 jdk-14+23
|
||||
438337c846fb071900ddb6922bddf8b3e895a514 jdk-14+24
|
||||
17d242844fc9e7d18b3eac97426490a9c246119e jdk-14+25
|
||||
288777cf0702914e5266bc1e5d380eed9032ca41 jdk-14+26
|
||||
2c724dba4c3cf9516b2152e151c9aea66b21b30b jdk-15+0
|
||||
91a3f092682fc715d991a87eb6ec6f28886d2035 jdk-14+27
|
||||
63e17cf29bed191ea21020b4648c9cdf893f80f5 jdk-15+1
|
||||
2069b4bfd23b56b6fc659fba8b75aaaa23debbe0 jdk-14+28
|
||||
f33197adda9ad82fdef46ac0f7dc0126204f35b2 jdk-15+2
|
||||
563fa900fa17c290ae516c7a3a69e8c069dde304 jdk-14+29
|
||||
d05fcdf25717d85e80a3a39a6b719458b22be5fe jdk-15+3
|
||||
d54ce919da90dab361995bb4d87be9851f00537a jdk-14+30
|
||||
bb0a7975b31ded63d594ee8dbfc4d4ead587f79b jdk-15+4
|
||||
decd3d2953b640f1043ee76953ff89238bff92e8 jdk-14+31
|
||||
b97c1773ccafae4a8c16cc6aedb10b2a4f9a07ed jdk-15+5
|
||||
2776da28515e087cc8849acf1e131a65ea7e77b6 jdk-14+32
|
||||
ef7d53b4fccd4a0501b17d974e84f37aa99fa813 jdk-15+6
|
||||
f728b6c7f4910d6bd6070cb4dde8393f4ba95113 jdk-14+33
|
||||
e2bc57500c1b785837982f7ce8af6751387ed73b jdk-15+7
|
||||
a96bc204e3b31ddbf909b20088964112f052927e jdk-14+34
|
||||
c7d4f2849dbfb755fc5860b362a4044ea0c9e082 jdk-15+8
|
||||
4a87bb7ebfd7f6a25ec59a5982fe3607242777f8 jdk-14+35
|
||||
62b5bfef8d618e08e6f3a56cf1fb0e67e89e9cc2 jdk-15+9
|
||||
bc54620a3848c26cff9766e5e2a6e5ddab98ed18 jdk-14+36
|
||||
1bee69801aeea1a34261c93f35bc9de072a98704 jdk-15+10
|
||||
b2dd4028a6de4e40dda8b76109e4b5c6b294f980 jdk-15+11
|
||||
2ec0ff3042630ddbd3587e340fe0dd40391cb6c4 jdk-15+12
|
||||
1c06a8ee8acad4d93c782626a233693a73de0add jdk-15+13
|
||||
1d6ceb13e142665ea833fca01c8c8598e0ddd211 jdk-15+14
|
||||
bc54620a3848c26cff9766e5e2a6e5ddab98ed18 jdk-14-ga
|
||||
82b7c62cf4cc56828a8fb724f57087967232a2a7 jdk-15+15
|
||||
5c7ec21f5d13f6eb5cd32288c69b8be2f9cac256 jdk-15+16
|
||||
dd5198db2e5b1ebcafe065d987c03ba9fcb50fc3 jdk-15+17
|
||||
44aef192b488a48cce12422394691a6b1d16b98e jdk-15+18
|
||||
7cc27caabe6e342151e8baf549beb07a9c755ec2 jdk-15+19
|
||||
46bca5e5e6fb26efd07245d26fe96a9c3260f51e jdk-15+20
|
||||
12b55fad80f30d24b1f8fdb3b947ea6465ef9518 jdk-15+21
|
||||
7223c6d610343fd8323af9d07d501e01fa1a7696 jdk-15+22
|
||||
f143729ca00ec14a98ea5c7f73acba88da97746e jdk-15+23
|
||||
497fd9f9129c4928fd5a876dd55e0daf6298b511 jdk-15+24
|
||||
90b266a84c06f1b3dc0ed8767856793e8c1c357e jdk-15+25
|
||||
0a32396f7a690015d22ca3328ac441a358295d90 jdk-15+26
|
||||
93813843680bbe1b7efbca56c03fd137f20a2c31 jdk-16+0
|
||||
93813843680bbe1b7efbca56c03fd137f20a2c31 jdk-15+27
|
||||
4a485c89d5a08b495961835f5308a96038678aeb jdk-16+1
|
||||
06c9f89459daba98395fad726100feb44f89ba71 jdk-15+28
|
||||
bcbe7b8a77b8971bc221c0be1bd2abb6fb68c2d0 jdk-16+2
|
||||
b58fc60580550a4a587cab729d8fd87223ad6932 jdk-15+29
|
||||
76810b3a88c8c641ae3850a8dfd7c40c984aea9d jdk-16+3
|
||||
6909e4a1f25bfe9a2727026f5845fc1fc44a36aa jdk-15+30
|
||||
e2622818f0bd30e736252eba101fe7d2c27f400b jdk-16+4
|
||||
a32f58c6b8be81877411767de7ba9c4cf087c1b5 jdk-15+31
|
||||
143e258f64af490010eb7e0bacc1cfaeceff0993 jdk-16+5
|
||||
2dad000726b8d5db9f3df647fb4949d88f269dd4 jdk-15+32
|
||||
4a8fd81d64bafa523cddb45f82805536edace106 jdk-16+6
|
||||
6b65f4e7a975628df51ef755b02642075390041d jdk-15+33
|
||||
c3a4a7ea7c304cabdacdc31741eb94c51351668d jdk-16+7
|
||||
b0817631d2f4395508cb10e81c3858a94d9ae4de jdk-15+34
|
||||
0a73d6f3aab48ff6d7e61e47f0bc2d87a054f217 jdk-16+8
|
||||
fd60c3146a024037cdd9be34c645bb793995a7cc jdk-15+35
|
||||
c075a286cc7df767cce28e8057d6ec5051786490 jdk-16+9
|
||||
b01985b4f88f554f97901e53e1ba314681dd9c19 jdk-16+10
|
||||
e3f940bd3c8fcdf4ca704c6eb1ac745d155859d5 jdk-15+36
|
||||
5c18d696c7ce724ca36df13933aa53f50e12b9e0 jdk-16+11
|
||||
fc8e62b399bd93d06e8d13dc3b384c450e853dcd jdk-16+12
|
||||
fd07cdb26fc70243ef23d688b545514f4ddf1c2b jdk-16+13
|
||||
36b29df125dc88f11657ce93b4998aa9ff5f5d41 jdk-16+14
|
||||
@@ -1,7 +1,7 @@
|
||||
[general]
|
||||
project=jdk-updates
|
||||
jbs=JDK
|
||||
version=17.0.5
|
||||
version=17.0.4
|
||||
|
||||
[checks]
|
||||
error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists
|
||||
|
||||
@@ -11,8 +11,7 @@ can be found on the [releases page](https://github.com/JetBrains/JetBrainsRuntim
|
||||
|
||||
| IDE Version | Latest JBR | Date Released |
|
||||
| --- | --- | --- |
|
||||
| 2022.3 | [17.0.5-b653.14](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.5b653.14)| 15-Nov-2022 |
|
||||
| 2022.2 | [17.0.5-b469.71](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.5b469.71)| 14-Nov-2022 |
|
||||
| 2022.2 | [17.0.4-b469.46](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.4b469.46)| 22-Aug-2022 |
|
||||
|
||||
|
||||
## Contents
|
||||
|
||||
@@ -196,7 +196,7 @@
|
||||
<h3 id="windows">Windows</h3>
|
||||
<p>Windows XP is not a supported platform, but all newer Windows should be able to build the JDK.</p>
|
||||
<p>On Windows, it is important that you pay attention to the instructions in the <a href="#special-considerations">Special Considerations</a>.</p>
|
||||
<p>Windows is the only non-POSIX OS supported by the JDK, and as such, requires some extra care. A POSIX support layer is required to build on Windows. Currently, the only supported such layers are Cygwin, Windows Subsystem for Linux (WSL), and MSYS2. (MSYS is no longer supported due to an outdated bash; While OpenJDK can be built with MSYS2, support for it is still experimental, so build failures and unusual errors are not uncommon.)</p>
|
||||
<p>Windows is the only non-POSIX OS supported by the JDK, and as such, requires some extra care. A POSIX support layer is required to build on Windows. Currently, the only supported such layers are Cygwin and Windows Subsystem for Linux (WSL). (Msys is no longer supported due to a too old bash; msys2 would likely be possible to support in a future version but that would require effort to implement.)</p>
|
||||
<p>Internally in the build system, all paths are represented as Unix-style paths, e.g. <code>/cygdrive/c/git/jdk/Makefile</code> rather than <code>C:\git\jdk\Makefile</code>. This rule also applies to input to the build system, e.g. in arguments to <code>configure</code>. So, use <code>--with-msvcr-dll=/cygdrive/c/msvcr100.dll</code> rather than <code>--with-msvcr-dll=c:\msvcr100.dll</code>. For details on this conversion, see the section on <a href="#fixpath">Fixpath</a>.</p>
|
||||
<h4 id="cygwin">Cygwin</h4>
|
||||
<p>A functioning <a href="http://www.cygwin.com/">Cygwin</a> environment is required for building the JDK on Windows. If you have a 64-bit OS, we strongly recommend using the 64-bit version of Cygwin.</p>
|
||||
@@ -279,7 +279,7 @@
|
||||
</tr>
|
||||
<tr class="odd">
|
||||
<td style="text-align: left;">Windows</td>
|
||||
<td style="text-align: left;">Microsoft Visual Studio 2022 update 17.1.0</td>
|
||||
<td style="text-align: left;">Microsoft Visual Studio 2019 update 16.7.2</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
@@ -298,7 +298,7 @@
|
||||
<p>It is advisable to keep an older version of Xcode for building the JDK when updating Xcode. This <a href="http://iosdevelopertips.com/xcode/install-multiple-versions-of-xcode.html">blog page</a> has good suggestions on managing multiple Xcode versions. To use a specific version of Xcode, use <code>xcode-select -s</code> before running <code>configure</code>, or use <code>--with-toolchain-path</code> to point to the version of Xcode to use, e.g. <code>configure --with-toolchain-path=/Applications/Xcode8.app/Contents/Developer/usr/bin</code></p>
|
||||
<p>If you have recently (inadvertently) updated your OS and/or Xcode version, and the JDK can no longer be built, please see the section on <a href="#problems-with-the-build-environment">Problems with the Build Environment</a>, and <a href="#getting-help">Getting Help</a> to find out if there are any recent, non-merged patches available for this update.</p>
|
||||
<h3 id="microsoft-visual-studio">Microsoft Visual Studio</h3>
|
||||
<p>For aarch64 machines running Windows the minimum accepted version is Visual Studio 2019 (16.8 or higher). For all other platforms the minimum accepted version of Visual Studio is 2017. Older versions will not be accepted by <code>configure</code> and will not work. For all platforms the maximum accepted version of Visual Studio is 2019.</p>
|
||||
<p>The minimum accepted version of Visual Studio is 2017. Older versions will not be accepted by <code>configure</code> and will not work. The maximum accepted version of Visual Studio is 2019.</p>
|
||||
<p>If you have multiple versions of Visual Studio installed, <code>configure</code> will by default pick the latest. You can request a specific version to be used by setting <code>--with-toolchain-version</code>, e.g. <code>--with-toolchain-version=2017</code>.</p>
|
||||
<p>If you have Visual Studio installed but <code>configure</code> fails to detect it, it may be because of <a href="#spaces-in-path">spaces in path</a>.</p>
|
||||
<h3 id="ibm-xl-cc">IBM XL C/C++</h3>
|
||||
|
||||
@@ -179,10 +179,10 @@ On Windows, it is important that you pay attention to the instructions in the
|
||||
|
||||
Windows is the only non-POSIX OS supported by the JDK, and as such, requires
|
||||
some extra care. A POSIX support layer is required to build on Windows.
|
||||
Currently, the only supported such layers are Cygwin, Windows Subsystem for
|
||||
Linux (WSL), and MSYS2. (MSYS is no longer supported due to an outdated bash;
|
||||
While OpenJDK can be built with MSYS2, support for it is still experimental, so
|
||||
build failures and unusual errors are not uncommon.)
|
||||
Currently, the only supported such layers are Cygwin and Windows Subsystem for
|
||||
Linux (WSL). (Msys is no longer supported due to a too old bash; msys2 would
|
||||
likely be possible to support in a future version but that would require effort
|
||||
to implement.)
|
||||
|
||||
Internally in the build system, all paths are represented as Unix-style paths,
|
||||
e.g. `/cygdrive/c/git/jdk/Makefile` rather than `C:\git\jdk\Makefile`. This
|
||||
@@ -323,7 +323,7 @@ issues.
|
||||
------------------ -------------------------------------------------------
|
||||
Linux gcc 10.2.0
|
||||
macOS Apple Xcode 10.1 (using clang 10.0.0)
|
||||
Windows Microsoft Visual Studio 2022 update 17.1.0
|
||||
Windows Microsoft Visual Studio 2019 update 16.7.2
|
||||
|
||||
All compilers are expected to be able to compile to the C99 language standard,
|
||||
as some C99 features are used in the source code. Microsoft Visual Studio
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
# image creation reproducible.
|
||||
# NB: this also means there may be no security-related fixes there, need to
|
||||
# move the version to the next manually.
|
||||
FROM alpine:3.14
|
||||
FROM alpine:3.5
|
||||
|
||||
# Install the necessary build tools
|
||||
RUN apk --no-cache add --update bash grep tar zip bzip2 rsync fontconfig build-base \
|
||||
|
||||
@@ -41,9 +41,7 @@ OPENJDK_TAG=$(git log --simplify-by-decoration --decorate=short --pretty=short |
|
||||
VERSION_FEATURE=$(getVersionProp "DEFAULT_VERSION_FEATURE")
|
||||
VERSION_INTERIM=$(getVersionProp "DEFAULT_VERSION_INTERIM")
|
||||
VERSION_UPDATE=$(getVersionProp "DEFAULT_VERSION_UPDATE")
|
||||
VERSION_PATCH=$(getVersionProp "DEFAULT_VERSION_PATCH")
|
||||
[[ $VERSION_UPDATE = 0 ]] && JBSDK_VERSION="$VERSION_FEATURE" || JBSDK_VERSION="${VERSION_FEATURE}.${VERSION_INTERIM}.${VERSION_UPDATE}"
|
||||
[[ $VERSION_PATCH = 0 ]] || JBSDK_VERSION="${VERSION_FEATURE}.${VERSION_INTERIM}.${VERSION_UPDATE}.${VERSION_PATCH}"
|
||||
echo "##teamcity[setParameter name='env.JBSDK_VERSION' value='${JBSDK_VERSION}']"
|
||||
JDK_BUILD_NUMBER=${JDK_BUILD_NUMBER:=$(echo $OPENJDK_TAG | awk -F "-|[+]" '{print $3}')}
|
||||
[ -z $JDK_BUILD_NUMBER ] && JDK_BUILD_NUMBER=1
|
||||
@@ -100,18 +98,11 @@ REPRODUCIBLE_BUILD_OPTS="--enable-reproducible-build
|
||||
|
||||
function zip_native_debug_symbols() {
|
||||
image_bundle_path=$(echo $1 | cut -d"/" -f-4)
|
||||
jdk_name=$(echo $1 | cut -d"/" -f5)
|
||||
jbr_diz_name=$2
|
||||
|
||||
[ -d "dizfiles" ] && rm -rf dizfiles
|
||||
mkdir dizfiles
|
||||
(cd $image_bundle_path && find . -name '*.diz' -exec rsync -R {} ../../../../dizfiles \; )
|
||||
|
||||
rsync_target="../../../../dizfiles"
|
||||
[ -z "$jdk_name" ] && rsync_target=$rsync_target"/"$jbr_diz_name
|
||||
(cd $image_bundle_path && find . -name '*.diz' -exec rsync -R {} $rsync_target \;)
|
||||
[ ! -z "$jdk_name" ] && mv dizfiles/$jdk_name dizfiles/$jbr_diz_name
|
||||
|
||||
(cd dizfiles && find $jbr_diz_name -print0 | COPYFILE_DISABLE=1 \
|
||||
(cd dizfiles && find . -print0 | COPYFILE_DISABLE=1 \
|
||||
tar --no-recursion --null -T - -czf ../"$jbr_diz_name".tar.gz) || do_exit $?
|
||||
}
|
||||
|
||||
|
||||
@@ -63,7 +63,7 @@ function create_image_bundle {
|
||||
|
||||
[ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
|
||||
JBR=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}aarch64-${fastdebug_infix}b${build_number}
|
||||
__root_dir=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}aarch64-${fastdebug_infix:-}b${build_number}
|
||||
__root_dir=${__bundle_name}-${JBSDK_VERSION}-${libc_type_suffix}aarch64-${fastdebug_infix:-}b${build_number%%.*}
|
||||
|
||||
|
||||
echo Running jlink....
|
||||
|
||||
@@ -63,7 +63,7 @@ function create_image_bundle {
|
||||
|
||||
[ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
|
||||
JBR=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}x64-${fastdebug_infix}b${build_number}
|
||||
__root_dir=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}x64-${fastdebug_infix:-}b${build_number}
|
||||
__root_dir=${__bundle_name}-${JBSDK_VERSION}-${libc_type_suffix}x64-${fastdebug_infix:-}b${build_number%%.*}
|
||||
|
||||
echo Running jlink....
|
||||
[ -d "$IMAGES_DIR"/"$__root_dir" ] && rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
|
||||
@@ -93,7 +93,7 @@ function create_image_bundle {
|
||||
[ -f "$JBR".tar.gz ] && rm "$JBR.tar.gz"
|
||||
touch -c -d "@$SOURCE_DATE_EPOCH" "$JBR".tar
|
||||
gzip "$JBR".tar || do_exit $?
|
||||
#rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
|
||||
rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
|
||||
}
|
||||
|
||||
WITH_DEBUG_LEVEL="--with-debug-level=release"
|
||||
|
||||
@@ -52,7 +52,7 @@ function create_image_bundle {
|
||||
|
||||
[ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
|
||||
JBR=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}x86-${fastdebug_infix}b${build_number}
|
||||
__root_dir=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}x86-${fastdebug_infix:-}b${build_number}
|
||||
__root_dir=${__bundle_name}-${JBSDK_VERSION}-${libc_type_suffix}x86-${fastdebug_infix:-}b${build_number%%.*}
|
||||
|
||||
echo Running jlink....
|
||||
[ -d "$IMAGES_DIR"/"$__root_dir" ] && rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
|
||||
|
||||
@@ -29,7 +29,6 @@ BOOT_JDK=${BOOT_JDK:=$(/usr/libexec/java_home -v 16)}
|
||||
|
||||
function do_configure {
|
||||
if [[ "${architecture}" == *aarch64* ]]; then
|
||||
|
||||
sh configure \
|
||||
$WITH_DEBUG_LEVEL \
|
||||
--with-vendor-name="${VENDOR_NAME}" \
|
||||
@@ -44,6 +43,9 @@ function do_configure {
|
||||
--with-macosx-version-max="${MACOSX_VERSION_MAX:="11.00.00"}" \
|
||||
--disable-hotspot-gtest --disable-javac-server --disable-full-docs --disable-manpages \
|
||||
--enable-cds=no \
|
||||
--with-extra-cflags="-F$(pwd)/Frameworks" \
|
||||
--with-extra-cxxflags="-F$(pwd)/Frameworks" \
|
||||
--with-extra-ldflags="-F$(pwd)/Frameworks" \
|
||||
$STATIC_CONF_ARGS \
|
||||
$REPRODUCIBLE_BUILD_OPTS \
|
||||
$WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
|
||||
@@ -82,7 +84,7 @@ function create_image_bundle {
|
||||
|
||||
[ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
|
||||
JBR=${__bundle_name}-${JBSDK_VERSION}-osx-${architecture}-${fastdebug_infix:-}b${build_number}
|
||||
__root_dir=${__bundle_name}-${JBSDK_VERSION}-osx-${architecture}-${fastdebug_infix:-}b${build_number}
|
||||
__root_dir=${__bundle_name}-${JBSDK_VERSION}-${architecture}-${fastdebug_infix:-}b${build_number%%.*}
|
||||
|
||||
JRE_CONTENTS=$tmp/$__root_dir/Contents
|
||||
mkdir -p "$JRE_CONTENTS" || do_exit $?
|
||||
|
||||
@@ -2,27 +2,20 @@
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
TC_PRINT=0
|
||||
# Always print TeamCity service messages if running under TeamCity
|
||||
[[ -n "${TEAMCITY_VERSION:-}" ]] && TC_PRINT=1
|
||||
|
||||
while getopts ":t" o; do
|
||||
case "${o}" in
|
||||
t) TC_PRINT=1 ;;
|
||||
*);;
|
||||
t)
|
||||
t="With Teamcity tests info"
|
||||
TC_PRINT=1
|
||||
;;
|
||||
esac
|
||||
done
|
||||
shift $((OPTIND-1))
|
||||
|
||||
NEWFILEPATH="$1"
|
||||
CONFIGID="$2"
|
||||
BUILDID="$3"
|
||||
TOKEN="$4"
|
||||
|
||||
if [ ! -f "$NEWFILEPATH" ]; then
|
||||
echo "File not found: $NEWFILEPATH"
|
||||
exit 1
|
||||
fi
|
||||
NEWFILEPATH=$1
|
||||
CONFIGID=$2
|
||||
BUILDID=$3
|
||||
TOKEN=$4
|
||||
#
|
||||
# Get the size of new artifact
|
||||
#
|
||||
@@ -36,7 +29,11 @@ case "${unameOut}" in
|
||||
NEWFILESIZE=$(stat -f%z "$NEWFILEPATH")
|
||||
;;
|
||||
CYGWIN*)
|
||||
NEWFILESIZE=$(stat -c%s "$NEWFILEPATH")
|
||||
NEWFILESIZE=$(stat -c%s$4
|
||||
#
|
||||
# Get the size of new artifact
|
||||
#
|
||||
"$NEWFILEPATH")
|
||||
;;
|
||||
MINGW*)
|
||||
NEWFILESIZE=$(stat -c%s "$NEWFILEPATH")
|
||||
@@ -45,13 +42,13 @@ case "${unameOut}" in
|
||||
echo "Unknown machine: ${unameOut}"
|
||||
exit 1
|
||||
esac
|
||||
FILENAME=$(basename "${NEWFILEPATH}")
|
||||
FILENAME=$(basename ${NEWFILEPATH})
|
||||
|
||||
#
|
||||
# Get pattern of artifact name
|
||||
# Base filename pattern: <BUNDLE_TYPE>-<JDK_VERSION>-<OS>-<ARCH>-b<BUILD>.tar.gz: jbr_dcevm-17.0.2-osx-x64-b1234.tar.gz
|
||||
# BUNDLE_TYPE: jbr, jbrsdk, jbr_dcevm, jbrsdk_jcef etc.
|
||||
# OS_ARCH_PATTERN - <os_architecture>: osx-x64, linux-aarch64, linux-musl-x64, windows-x64 etc.
|
||||
# OS_ARCH_PATTERN - <os_architecture>: osx-x64, linux-aarch64, windows-x64 etc.
|
||||
|
||||
BUNDLE_TYPE=jbrsdk
|
||||
OS_ARCH_PATTERN=""
|
||||
@@ -62,37 +59,33 @@ if [[ $FILENAME =~ $re ]]; then
|
||||
BUNDLE_TYPE=${BASH_REMATCH[1]}
|
||||
OS_ARCH_PATTERN=${BASH_REMATCH[2]}
|
||||
FILE_EXTENSION=${BASH_REMATCH[3]}
|
||||
else
|
||||
echo "File name $FILENAME does not match regex $re"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
function test_started_msg() {
|
||||
if [ $TC_PRINT -eq 1 ]; then
|
||||
echo "##teamcity[testStarted name='$1']"
|
||||
fi
|
||||
}
|
||||
if [ $TC_PRINT -eq 1 ]; then
|
||||
testname_file_ext=`echo $FILE_EXTENSION | sed 's/\./_/g'`
|
||||
testname=$BUNDLE_TYPE"_"$OS_ARCH_PATTERN$testname_file_ext
|
||||
echo \#\#teamcity[testStarted name=\'$testname\']
|
||||
fi
|
||||
|
||||
|
||||
echo "BUNDLE_TYPE: " $BUNDLE_TYPE
|
||||
echo "OS_ARCH_PATTERN: " $OS_ARCH_PATTERN
|
||||
echo "FILE_EXTENSION: " $FILE_EXTENSION
|
||||
echo "New size of $FILENAME = $NEWFILESIZE bytes."
|
||||
|
||||
|
||||
function test_failed_msg() {
|
||||
if [ $TC_PRINT -eq 1 ]; then
|
||||
echo "##teamcity[testFailed name='$1' message='$2']"
|
||||
if [ $3 -eq 1 ]; then
|
||||
echo \#\#teamcity[testFailed name=\'$1\' message=\'$2\']
|
||||
fi
|
||||
}
|
||||
|
||||
function test_finished_msg() {
|
||||
if [ $TC_PRINT -eq 1 ]; then
|
||||
echo "##teamcity[testFinished name='$1']"
|
||||
if [ $2 -eq 1 ]; then
|
||||
echo \#\#teamcity[testFinished name=\'$1\']
|
||||
fi
|
||||
}
|
||||
|
||||
test_name="${BUNDLE_TYPE}_${OS_ARCH_PATTERN//\-/_}${FILE_EXTENSION//\./_}"
|
||||
test_started_msg "$test_name"
|
||||
|
||||
echo "BUNDLE_TYPE: $BUNDLE_TYPE"
|
||||
echo "OS_ARCH_PATTERN: $OS_ARCH_PATTERN"
|
||||
echo "FILE_EXTENSION: $FILE_EXTENSION"
|
||||
echo "Size of $FILENAME is $NEWFILESIZE bytes"
|
||||
|
||||
#
|
||||
# Get previous successful build ID
|
||||
# Example:
|
||||
@@ -102,21 +95,20 @@ echo "Size of $FILENAME is $NEWFILESIZE bytes"
|
||||
# expected return value
|
||||
# id="123".number="567"
|
||||
#
|
||||
CURL_RESPONSE=$(curl -sSL --header "Authorization: Bearer $TOKEN" "https://buildserver.labs.intellij.net/app/rest/builds/?locator=buildType:(id:$CONFIGID),status:success,count:1,finishDate:(build:$BUILDID,condition:before)")
|
||||
CURL_RESPONSE=$(curl --header "Authorization: Bearer $TOKEN" "https://buildserver.labs.intellij.net/app/rest/builds/?locator=buildType:(id:$CONFIGID),status:success,count:1,finishDate:(build:$BUILDID,condition:before)")
|
||||
re='id=\"([0-9]+)\".+number=\"([0-9\.]+)\"'
|
||||
|
||||
# ID: Previous successful build id
|
||||
ID=0
|
||||
if [[ $CURL_RESPONSE =~ $re ]]; then
|
||||
ID=${BASH_REMATCH[1]}
|
||||
echo "Previous build ID: $ID"
|
||||
echo "Previous build number: ${BASH_REMATCH[2]}"
|
||||
echo "BUILD Number: ${BASH_REMATCH[2]}"
|
||||
else
|
||||
msg="ERROR: cannot find previous build"
|
||||
echo "$msg"
|
||||
echo "$CURL_RESPONSE"
|
||||
test_failed_msg "$test_name" "$msg"
|
||||
test_finished_msg "$test_name"
|
||||
msg="ERROR: can't find previous build"
|
||||
echo $msg
|
||||
echo $CURL_RESPONSE
|
||||
test_failed_msg $testname $msg $TC_PRINT
|
||||
test_finished_msg $testname $TC_PRINT
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -126,37 +118,36 @@ fi
|
||||
# expected return value
|
||||
# name="jbrsdk_jcef*.tar.gz size="123'
|
||||
#
|
||||
CURL_RESPONSE=$(curl -sSL --header "Authorization: Bearer $TOKEN" "https://buildserver.labs.intellij.net/app/rest/builds/$ID?fields=id,number,artifacts(file(name,size))")
|
||||
echo "Artifacts of the previous build:"
|
||||
echo "$CURL_RESPONSE"
|
||||
CURL_RESPONSE=$(curl --header "Authorization: Bearer $TOKEN" "https://buildserver.labs.intellij.net/app/rest/builds/$ID?fields=id,number,artifacts(file(name,size))")
|
||||
echo "Atrifacts of previous build of $CONFIGID :"
|
||||
echo $CURL_RESPONSE
|
||||
|
||||
# Find binary size (in response) with reg exp
|
||||
re="name=\"(${BUNDLE_TYPE}[^\"]+${OS_ARCH_PATTERN}[^\"]+${FILE_EXTENSION})\" size=\"([0-9]+)\""
|
||||
re='name=\"('$BUNDLE_TYPE'[^\"]+'${OS_ARCH_PATTERN}'[^\"]+'${FILE_EXTENSION}')\" size=\"([0-9]+)\"'
|
||||
|
||||
if [[ $CURL_RESPONSE =~ $re ]]; then
|
||||
prevFileName=${BASH_REMATCH[1]}
|
||||
echo "Previous artifact name: $prevFileName"
|
||||
prevFileSize=${BASH_REMATCH[2]}
|
||||
echo "Previous artifact size: $prevFileSize"
|
||||
OLDFILENAME=${BASH_REMATCH[1]}
|
||||
echo "Prev artifact name: $OLDFILENAME"
|
||||
OLDFILESIZE=${BASH_REMATCH[2]}
|
||||
echo "Prev artifact size = $OLDFILESIZE"
|
||||
|
||||
((allowedSize=prevFileSize+prevFileSize/20)) # use 5% threshold
|
||||
echo "Allowed size: $allowedSize"
|
||||
let allowedSize=OLDFILESIZE+OLDFILESIZE/20 # use 5% threshold
|
||||
echo "Allowed size = $allowedSize"
|
||||
if [[ "$NEWFILESIZE" -gt "$allowedSize" ]]; then
|
||||
msg="ERROR: new size is significantly greater than previous size (need to investigate)"
|
||||
echo "$msg"
|
||||
test_failed_msg "$test_name" "$msg"
|
||||
test_finished_msg "$test_name"
|
||||
msg="ERROR: new size is significally greater than prev size (need to investigate)"
|
||||
echo $msg
|
||||
test_failed_msg $testname $msg $TC_PRINT
|
||||
test_finished_msg $testname $TC_PRINT
|
||||
exit 1
|
||||
else
|
||||
echo "PASSED"
|
||||
test_finished_msg "$test_name"
|
||||
test_finished_msg $testname $TC_PRINT
|
||||
fi
|
||||
else
|
||||
msg="ERROR: cannot find string with size in xml response:"
|
||||
echo "Regex: $re"
|
||||
echo "$msg"
|
||||
echo "$CURL_RESPONSE"
|
||||
test_failed_msg "$test_name" "$msg"
|
||||
test_finished_msg "$test_name"
|
||||
msg="ERROR: can't find string with size in xml response:"
|
||||
echo $msg
|
||||
echo $CURL_RESPONSE
|
||||
test_failed_msg $testname $msg $TC_PRINT
|
||||
test_finished_msg $testname $TC_PRINT
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -61,7 +61,7 @@ function create_image_bundle {
|
||||
fastdebug_infix=''
|
||||
|
||||
[ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
|
||||
__root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-aarch64-${fastdebug_infix}b${build_number}
|
||||
__root_dir=${__bundle_name}-${JBSDK_VERSION}-aarch64-${fastdebug_infix:-}b${build_number%%.*}
|
||||
|
||||
echo Running jlink ...
|
||||
${BUILD_JDK}/bin/jlink \
|
||||
@@ -72,8 +72,9 @@ function create_image_bundle {
|
||||
if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
|
||||
sed 's/JBR/JBRSDK/g' $__root_dir/release > release
|
||||
mv release $__root_dir/release
|
||||
cp $IMAGES_DIR/jdk/lib/src.zip $__root_dir/lib
|
||||
cp $IMAGES_DIR/jdk/bin/*.pdb $__root_dir/bin
|
||||
for dir in $(ls -d $IMAGES_DIR/jdk/*); do
|
||||
rsync -a --exclude demo --exclude sample $dir $__root_dir
|
||||
done
|
||||
copy_jmods "$__modules" "$__modules_path" "$__root_dir"/jmods
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -52,7 +52,7 @@ function create_image_bundle {
|
||||
fastdebug_infix=''
|
||||
|
||||
[ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
|
||||
__root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x64-${fastdebug_infix}b${build_number}
|
||||
__root_dir=${__bundle_name}-${JBSDK_VERSION}-x64-${fastdebug_infix:-}b${build_number%%.*}
|
||||
|
||||
echo Running jlink ...
|
||||
${JSDK}/bin/jlink \
|
||||
@@ -63,8 +63,9 @@ function create_image_bundle {
|
||||
if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
|
||||
sed 's/JBR/JBRSDK/g' $__root_dir/release > release
|
||||
mv release $__root_dir/release
|
||||
cp $IMAGES_DIR/jdk/lib/src.zip $__root_dir/lib
|
||||
cp $IMAGES_DIR/jdk/bin/*.pdb $__root_dir/bin
|
||||
for dir in $(ls -d $IMAGES_DIR/jdk/*); do
|
||||
rsync -a --exclude demo --exclude sample $dir $__root_dir
|
||||
done
|
||||
copy_jmods "$__modules" "$__modules_path" "$__root_dir"/jmods
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -47,7 +47,7 @@ function create_image_bundle {
|
||||
fastdebug_infix=''
|
||||
|
||||
[ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
|
||||
__root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x86-${fastdebug_infix}b${build_number}
|
||||
__root_dir=${__bundle_name}-${JBSDK_VERSION}-x86-${fastdebug_infix:-}b${build_number%%.*}
|
||||
|
||||
echo Running jlink ...
|
||||
${JSDK}/bin/jlink \
|
||||
@@ -58,8 +58,9 @@ function create_image_bundle {
|
||||
if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
|
||||
sed 's/JBR/JBRSDK/g' $__root_dir/release > release
|
||||
mv release $__root_dir/release
|
||||
cp $IMAGES_DIR/jdk/lib/src.zip $__root_dir/lib
|
||||
cp $IMAGES_DIR/jdk/bin/*.pdb $__root_dir/bin
|
||||
for dir in $(ls -d $IMAGES_DIR/jdk/*); do
|
||||
rsync -a --exclude demo --exclude sample $dir $__root_dir
|
||||
done
|
||||
copy_jmods "$__modules" "$__modules_path" "$__root_dir"/jmods
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ function pack_jbr {
|
||||
|
||||
[ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
|
||||
JBR=${__bundle_name}-${JBSDK_VERSION}-windows-aarch64-${fastdebug_infix}b${build_number}
|
||||
__root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-aarch64-${fastdebug_infix}b${build_number}
|
||||
__root_dir=${__bundle_name}-${JBSDK_VERSION}-aarch64-${fastdebug_infix:-}b${build_number%%.*}
|
||||
|
||||
echo Creating $JBR.tar.gz ...
|
||||
chmod -R ug+rwx,o+rx ${BASE_DIR}/$__root_dir
|
||||
|
||||
@@ -26,7 +26,7 @@ function pack_jbr {
|
||||
|
||||
[ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
|
||||
JBR=${__bundle_name}-${JBSDK_VERSION}-windows-x64-${fastdebug_infix}b${build_number}
|
||||
__root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x64-${fastdebug_infix}b${build_number}
|
||||
__root_dir=${__bundle_name}-${JBSDK_VERSION}-x64-${fastdebug_infix:-}b${build_number%%.*}
|
||||
|
||||
echo Creating $JBR.tar.gz ...
|
||||
chmod -R ug+rwx,o+rx ${BASE_DIR}/$__root_dir
|
||||
|
||||
@@ -22,7 +22,7 @@ function pack_jbr {
|
||||
|
||||
[ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
|
||||
JBR=${__bundle_name}-${JBSDK_VERSION}-windows-x86-${fastdebug_infix}b${build_number}
|
||||
__root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x86-${fastdebug_infix}b${build_number}
|
||||
__root_dir=${__bundle_name}-${JBSDK_VERSION}-x86-${fastdebug_infix:-}b${build_number%%.*}
|
||||
|
||||
echo Creating $JBR.tar.gz ...
|
||||
chmod -R ug+rwx,o+rx ${BASE_DIR}/$__root_dir
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 2011, 2021, 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
|
||||
@@ -126,18 +126,16 @@ AC_DEFUN([BOOTJDK_DO_CHECK],
|
||||
AC_DEFUN([BOOTJDK_CHECK_ARGUMENTS],
|
||||
[
|
||||
if test "x$with_boot_jdk" != x; then
|
||||
BOOT_JDK_ARG="$with_boot_jdk"
|
||||
UTIL_FIXUP_PATH(BOOT_JDK_ARG)
|
||||
if test -d "$BOOT_JDK_ARG"; then
|
||||
BOOT_JDK=$BOOT_JDK_ARG
|
||||
if test -d "$with_boot_jdk"; then
|
||||
BOOT_JDK=$with_boot_jdk
|
||||
BOOT_JDK_FOUND=maybe
|
||||
elif test -f "$BOOT_JDK_ARG"; then
|
||||
case "$BOOT_JDK_ARG" in
|
||||
elif test -f "$with_boot_jdk"; then
|
||||
case "$with_boot_jdk" in
|
||||
*.tar.gz )
|
||||
BOOT_JDK_SUPPORT_DIR=$CONFIGURESUPPORT_OUTPUTDIR/boot-jdk
|
||||
$RM -rf $BOOT_JDK_SUPPORT_DIR
|
||||
$MKDIR -p $BOOT_JDK_SUPPORT_DIR
|
||||
$GUNZIP -c $BOOT_JDK_ARG | $TAR xf - -C $BOOT_JDK_SUPPORT_DIR
|
||||
$GUNZIP -c $with_boot_jdk | $TAR xf - -C $BOOT_JDK_SUPPORT_DIR
|
||||
|
||||
# Try to find javac to determine BOOT_JDK path
|
||||
BOOT_JDK_JAVAC_PATH=`$FIND $BOOT_JDK_SUPPORT_DIR | $GREP "/bin/javac"`
|
||||
|
||||
@@ -470,11 +470,9 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
|
||||
ALWAYS_DEFINES_JVM="-D_REENTRANT"
|
||||
ALWAYS_DEFINES_JDK="-D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC"
|
||||
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
|
||||
# Access APIs for Windows 8 and above
|
||||
# see https://docs.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt?view=msvc-170
|
||||
ALWAYS_DEFINES_JDK="-DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0602 -D_CRT_SECURE_NO_DEPRECATE \
|
||||
ALWAYS_DEFINES_JDK="-DWIN32_LEAN_AND_MEAN -D_CRT_SECURE_NO_DEPRECATE \
|
||||
-D_CRT_NONSTDC_NO_DEPRECATE -DWIN32 -DIAL"
|
||||
ALWAYS_DEFINES_JVM="-DNOMINMAX -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0602"
|
||||
ALWAYS_DEFINES_JVM="-DNOMINMAX -DWIN32_LEAN_AND_MEAN"
|
||||
fi
|
||||
|
||||
###############################################################################
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 2011, 2019, 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
|
||||
@@ -217,9 +217,6 @@ AC_DEFUN_ONCE([LIB_SETUP_ZLIB],
|
||||
LIBZ_LIBS=""
|
||||
if test "x$USE_EXTERNAL_LIBZ" = "xfalse"; then
|
||||
LIBZ_CFLAGS="$LIBZ_CFLAGS -I$TOPDIR/src/java.base/share/native/libzip/zlib"
|
||||
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
|
||||
LIBZ_CFLAGS="$LIBZ_CFLAGS -DHAVE_UNISTD_H"
|
||||
fi
|
||||
else
|
||||
LIBZ_LIBS="-lz"
|
||||
fi
|
||||
|
||||
@@ -212,7 +212,7 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_OS],
|
||||
VAR_OS=windows
|
||||
VAR_OS_ENV=windows.wsl
|
||||
;;
|
||||
*msys* | *mingw*)
|
||||
*msys*)
|
||||
VAR_OS=windows
|
||||
VAR_OS_ENV=windows.msys2
|
||||
;;
|
||||
|
||||
@@ -44,7 +44,6 @@ endif
|
||||
|
||||
LAUNCHER_SRC := $(TOPDIR)/src/java.base/share/native/launcher
|
||||
LAUNCHER_CFLAGS += -I$(TOPDIR)/src/java.base/share/native/launcher \
|
||||
-I$(TOPDIR)/src/java.desktop/share/native/include \
|
||||
-I$(TOPDIR)/src/java.base/share/native/libjli \
|
||||
-I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjli \
|
||||
-I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libjli \
|
||||
@@ -197,11 +196,9 @@ endef
|
||||
################################################################################
|
||||
# Create man pages for jmod to pick up. There should be a one-to-one
|
||||
# relationship between executables and man pages (even if this is not always
|
||||
# the case), so piggyback man page generation on the launcher compilation. This
|
||||
# file may be included from other places as well, so only process man pages
|
||||
# when called from <module>/Launcher.gmk.
|
||||
# the case), so piggyback man page generation on the launcher compilation.
|
||||
|
||||
ifeq ($(call isTargetOsType, unix)+$(MAKEFILE_PREFIX), true+Launcher)
|
||||
ifeq ($(call isTargetOsType, unix), true)
|
||||
# Only build manpages on unix systems.
|
||||
# We assume all our man pages should reside in section 1.
|
||||
|
||||
@@ -245,9 +242,9 @@ ifeq ($(call isTargetOsType, unix)+$(MAKEFILE_PREFIX), true+Launcher)
|
||||
FILTER := $(PANDOC_TROFF_MANPAGE_FILTER), \
|
||||
POST_PROCESS := $(MAN_POST_PROCESS), \
|
||||
REPLACEMENTS := \
|
||||
@@COPYRIGHT_YEAR@@ => $(COPYRIGHT_YEAR) ; \
|
||||
@@VERSION_SHORT@@ => $(VERSION_SHORT) ; \
|
||||
@@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION), \
|
||||
@@COPYRIGHT_YEAR@@ => $(COPYRIGHT_YEAR) ; \
|
||||
@@VERSION_SHORT@@ => $(VERSION_SHORT) ; \
|
||||
@@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION), \
|
||||
EXTRA_DEPS := $(PANDOC_TROFF_MANPAGE_FILTER) \
|
||||
$(PANDOC_TROFF_MANPAGE_FILTER_SOURCE), \
|
||||
))
|
||||
|
||||
@@ -1049,7 +1049,7 @@ var getJibProfilesDependencies = function (input, common) {
|
||||
var devkit_platform_revisions = {
|
||||
linux_x64: "gcc10.3.0-OL6.4+1.0",
|
||||
macosx: "Xcode12.4+1.0",
|
||||
windows_x64: "VS2022-17.1.0+1.0",
|
||||
windows_x64: "VS2019-16.9.3+1.0",
|
||||
linux_aarch64: "gcc10.3.0-OL7.6+1.0",
|
||||
linux_arm: "gcc8.2.0-Fedora27+1.0",
|
||||
linux_ppc64le: "gcc8.2.0-Fedora27+1.0",
|
||||
|
||||
@@ -23,19 +23,21 @@
|
||||
# questions.
|
||||
#
|
||||
|
||||
# Versions and download locations for dependencies used by GitHub Actions (GHA)
|
||||
# Versions and download locations for dependencies used by pre-submit testing.
|
||||
|
||||
BOOT_JDK_VERSION=17
|
||||
JTREG_VERSION=6
|
||||
JTREG_BUILD=1
|
||||
GTEST_VERSION=1.8.1
|
||||
JTREG_VERSION=6.1+2
|
||||
|
||||
LINUX_X64_BOOT_JDK_EXT=tar.gz
|
||||
LINUX_X64_BOOT_JDK_FILENAME=openjdk-17.0.2_linux-x64_bin.tar.gz
|
||||
LINUX_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz
|
||||
LINUX_X64_BOOT_JDK_SHA256=288f34e3ba8a4838605636485d0365ce23e57d5f2f68997ac4c2e4c01967cd48
|
||||
|
||||
WINDOWS_X64_BOOT_JDK_EXT=zip
|
||||
WINDOWS_X64_BOOT_JDK_FILENAME=openjdk-17.0.2_windows-x64_bin.zip
|
||||
WINDOWS_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_x64_windows_hotspot_17.0.2_8.zip
|
||||
WINDOWS_X64_BOOT_JDK_SHA256=d083479ca927dce2f586f779373d895e8bf668c632505740279390384edf03fa
|
||||
|
||||
MACOS_X64_BOOT_JDK_EXT=tar.gz
|
||||
MACOS_X64_BOOT_JDK_FILENAME=openjdk-17.0.2_macos-x64_bin.tar.gz
|
||||
MACOS_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_x64_mac_hotspot_17.0.2_8.tar.gz
|
||||
MACOS_X64_BOOT_JDK_SHA256=3630e21a571b7180876bf08f85d0aac0bdbb3267b2ae9bd242f4933b21f9be32
|
||||
@@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 2011, 2020, 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
|
||||
@@ -28,12 +28,12 @@
|
||||
|
||||
DEFAULT_VERSION_FEATURE=17
|
||||
DEFAULT_VERSION_INTERIM=0
|
||||
DEFAULT_VERSION_UPDATE=5
|
||||
DEFAULT_VERSION_UPDATE=4
|
||||
DEFAULT_VERSION_PATCH=0
|
||||
DEFAULT_VERSION_EXTRA1=0
|
||||
DEFAULT_VERSION_EXTRA2=0
|
||||
DEFAULT_VERSION_EXTRA3=0
|
||||
DEFAULT_VERSION_DATE=2022-10-18
|
||||
DEFAULT_VERSION_DATE=2022-07-19
|
||||
DEFAULT_VERSION_CLASSFILE_MAJOR=61 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
|
||||
DEFAULT_VERSION_CLASSFILE_MINOR=0
|
||||
DEFAULT_VERSION_DOCS_API_SINCE=11
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 2000, 2020, 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
|
||||
@@ -32,7 +32,7 @@ formatVersion=3
|
||||
# Version of the currency code information in this class.
|
||||
# It is a serial number that accompanies with each amendment.
|
||||
|
||||
dataVersion=172
|
||||
dataVersion=170
|
||||
|
||||
# List of all valid ISO 4217 currency codes.
|
||||
# To ensure compatibility, do not remove codes.
|
||||
@@ -51,7 +51,7 @@ all=ADP020-AED784-AFA004-AFN971-ALL008-AMD051-ANG532-AOA973-ARS032-ATS040-AUD036
|
||||
MTL470-MUR480-MVR462-MWK454-MXN484-MXV979-MYR458-MZM508-MZN943-NAD516-NGN566-\
|
||||
NIO558-NLG528-NOK578-NPR524-NZD554-OMR512-PAB590-PEN604-PGK598-PHP608-\
|
||||
PKR586-PLN985-PTE620-PYG600-QAR634-ROL642-RON946-RSD941-RUB643-RUR810-RWF646-SAR682-\
|
||||
SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLE925-SLL694-SOS706-\
|
||||
SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLL694-SOS706-\
|
||||
SRD968-SRG740-SSP728-STD678-STN930-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\
|
||||
TPE626-TRL792-TRY949-TTD780-TWD901-TZS834-UAH980-UGX800-USD840-USN997-USS998-UYI940-\
|
||||
UYU858-UZS860-VEB862-VED926-VEF937-VES928-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\
|
||||
@@ -317,8 +317,6 @@ KI=AUD
|
||||
KP=KPW
|
||||
# KOREA (THE REPUBLIC OF)
|
||||
KR=KRW
|
||||
# KOSOVO - Not in ISO 3166/4217
|
||||
XK=EUR
|
||||
# KUWAIT
|
||||
KW=KWD
|
||||
# KYRGYZSTAN
|
||||
@@ -484,7 +482,7 @@ CS=CSD
|
||||
# SEYCHELLES
|
||||
SC=SCR
|
||||
# SIERRA LEONE
|
||||
SL=SLE
|
||||
SL=SLL
|
||||
# SINGAPORE
|
||||
SG=SGD
|
||||
# SLOVAKIA
|
||||
|
||||
@@ -21,4 +21,4 @@
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
tzdata2022c
|
||||
tzdata2022a
|
||||
|
||||
@@ -182,7 +182,6 @@ Link Africa/Abidjan Africa/Freetown # Sierra Leone
|
||||
Link Africa/Abidjan Africa/Lome # Togo
|
||||
Link Africa/Abidjan Africa/Nouakchott # Mauritania
|
||||
Link Africa/Abidjan Africa/Ouagadougou # Burkina Faso
|
||||
Link Africa/Abidjan Atlantic/Reykjavik # Iceland
|
||||
Link Africa/Abidjan Atlantic/St_Helena # St Helena
|
||||
|
||||
# Djibouti
|
||||
@@ -193,7 +192,7 @@ Link Africa/Abidjan Atlantic/St_Helena # St Helena
|
||||
# Egypt
|
||||
|
||||
# Milne says Cairo used 2:05:08.9, the local mean time of the Abbasizeh
|
||||
# observatory. Milne also says that the official time for
|
||||
# observatory; round to nearest. Milne also says that the official time for
|
||||
# Egypt was mean noon at the Great Pyramid, 2:04:30.5, but apparently this
|
||||
# did not apply to Cairo, Alexandria, or Port Said.
|
||||
|
||||
@@ -378,7 +377,6 @@ Rule Egypt 2014 only - Jul 31 24:00 1:00 S
|
||||
Rule Egypt 2014 only - Sep lastThu 24:00 0 -
|
||||
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
#STDOFF 2:05:08.9
|
||||
Zone Africa/Cairo 2:05:09 - LMT 1900 Oct
|
||||
2:00 Egypt EE%sT
|
||||
|
||||
@@ -432,7 +430,7 @@ Zone Africa/Bissau -1:02:20 - LMT 1912 Jan 1 1:00u
|
||||
# At midnight on 30 June 1928 the clocks throughout Kenya was put forward
|
||||
# half an hour by the Alteration of Time Ordinance, 1928.
|
||||
# https://gazettes.africa/archive/ke/1928/ke-government-gazette-dated-1928-05-11-no-28.pdf
|
||||
# [Ordinance No. 11 of 1928, The Official Gazette, 1928-06-26, p 813]
|
||||
# [Ordinance No. 11 of 1928, The Offical Gazette, 1928-06-26, p 813]
|
||||
# https://books.google.com/books?id=2S0S6os32ZUC&pg=PA813
|
||||
#
|
||||
# The 1928 ordinance was repealed by the Alteration of Time (repeal) Ordinance,
|
||||
@@ -1335,9 +1333,21 @@ Link Africa/Lagos Africa/Niamey # Niger
|
||||
Link Africa/Lagos Africa/Porto-Novo # Benin
|
||||
|
||||
# Réunion
|
||||
# See Asia/Dubai.
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Indian/Reunion 3:41:52 - LMT 1911 Jun # Saint-Denis
|
||||
4:00 - +04
|
||||
#
|
||||
# The Crozet Islands also observe Réunion time; see the 'antarctica' file.
|
||||
# Scattered Islands (Îles Éparses) administered from Réunion are as follows.
|
||||
# The following information about them is taken from
|
||||
# Îles Éparses (<http://www.outre-mer.gouv.fr/domtom/ile.htm>, 1997-07-22,
|
||||
# in French; no longer available as of 1999-08-17).
|
||||
# We have no info about their time zone histories.
|
||||
#
|
||||
# Bassas da India - uninhabited
|
||||
# Europa Island - inhabited from 1905 to 1910 by two families
|
||||
# Glorioso Is - inhabited until at least 1958
|
||||
# Juan de Nova - uninhabited
|
||||
# Tromelin - inhabited until at least 1958
|
||||
|
||||
# Rwanda
|
||||
# See Africa/Maputo.
|
||||
@@ -1369,10 +1379,9 @@ Link Africa/Lagos Africa/Porto-Novo # Benin
|
||||
# From Michael Deckers (2018-12-30):
|
||||
# https://www.legis-palop.org/download.jsp?idFile=102818
|
||||
# ... [The legal time of the country, which coincides with universal
|
||||
# coordinated time, will be reinstituted at 2 o'clock on day 1 of January, 2019.]
|
||||
# coordinated time, will be restituted at 2 o'clock on day 1 of January, 2019.]
|
||||
|
||||
Zone Africa/Sao_Tome 0:26:56 - LMT 1884
|
||||
#STDOFF -0:36:44.68
|
||||
-0:36:45 - LMT 1912 Jan 1 00:00u # Lisbon MT
|
||||
0:00 - GMT 2018 Jan 1 01:00
|
||||
1:00 - WAT 2019 Jan 1 02:00
|
||||
@@ -1382,7 +1391,28 @@ Zone Africa/Sao_Tome 0:26:56 - LMT 1884
|
||||
# See Africa/Abidjan.
|
||||
|
||||
# Seychelles
|
||||
# See Asia/Dubai.
|
||||
|
||||
# From P Chan (2020-11-27):
|
||||
# Standard Time was adopted on 1907-01-01.
|
||||
#
|
||||
# Standard Time Ordinance (Chapter 237)
|
||||
# The Laws of Seychelles in Force on the 31st December, 1971, Vol. 6, p 571
|
||||
# https://books.google.com/books?id=efE-AQAAIAAJ&pg=PA571
|
||||
#
|
||||
# From Tim Parenti (2020-12-05):
|
||||
# A footnote on https://books.google.com/books?id=DYdDAQAAMAAJ&pg=PA1689
|
||||
# confirms that Ordinance No. 9 of 1906 "was brought into force on the 1st
|
||||
# January, 1907."
|
||||
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Indian/Mahe 3:41:48 - LMT 1907 Jan 1 # Victoria
|
||||
4:00 - +04
|
||||
# From Paul Eggert (2001-05-30):
|
||||
# Aldabra, Farquhar, and Desroches, originally dependencies of the
|
||||
# Seychelles, were transferred to the British Indian Ocean Territory
|
||||
# in 1965 and returned to Seychelles control in 1976. We don't know
|
||||
# whether this affected their time zone, so omit this for now.
|
||||
# Possibly the islands were uninhabited.
|
||||
|
||||
# Sierra Leone
|
||||
# See Africa/Abidjan.
|
||||
|
||||
@@ -180,7 +180,9 @@ Zone Antarctica/Mawson 0 - -00 1954 Feb 13
|
||||
# St Paul Island - near Amsterdam, uninhabited
|
||||
# fishing stations operated variously 1819/1931
|
||||
#
|
||||
# Kerguelen - see Indian/Maldives.
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Indian/Kerguelen 0 - -00 1950 # Port-aux-Français
|
||||
5:00 - +05
|
||||
#
|
||||
# year-round base in the main continent
|
||||
# Dumont d'Urville - see Pacific/Port_Moresby.
|
||||
@@ -263,7 +265,31 @@ Zone Antarctica/Troll 0 - -00 2005 Feb 12
|
||||
# year-round from 1960/61 to 1992
|
||||
|
||||
# Vostok, since 1957-12-16, temporarily closed 1994-02/1994-11
|
||||
# See Asia/Urumqi.
|
||||
# From Craig Mundell (1994-12-15):
|
||||
# http://quest.arc.nasa.gov/antarctica/QA/computers/Directions,Time,ZIP
|
||||
# Vostok, which is one of the Russian stations, is set on the same
|
||||
# time as Moscow, Russia.
|
||||
#
|
||||
# From Lee Hotz (2001-03-08):
|
||||
# I queried the folks at Columbia who spent the summer at Vostok and this is
|
||||
# what they had to say about time there:
|
||||
# "in the US Camp (East Camp) we have been on New Zealand (McMurdo)
|
||||
# time, which is 12 hours ahead of GMT. The Russian Station Vostok was
|
||||
# 6 hours behind that (although only 2 miles away, i.e. 6 hours ahead
|
||||
# of GMT). This is a time zone I think two hours east of Moscow. The
|
||||
# natural time zone is in between the two: 8 hours ahead of GMT."
|
||||
#
|
||||
# From Paul Eggert (2001-05-04):
|
||||
# This seems to be hopelessly confusing, so I asked Lee Hotz about it
|
||||
# in person. He said that some Antarctic locations set their local
|
||||
# time so that noon is the warmest part of the day, and that this
|
||||
# changes during the year and does not necessarily correspond to mean
|
||||
# solar noon. So the Vostok time might have been whatever the clocks
|
||||
# happened to be during their visit. So we still don't really know what time
|
||||
# it is at Vostok. But we'll guess +06.
|
||||
#
|
||||
Zone Antarctica/Vostok 0 - -00 1957 Dec 16
|
||||
6:00 - +06
|
||||
|
||||
# S Africa - year-round bases
|
||||
# Marion Island, -4653+03752
|
||||
|
||||
@@ -278,7 +278,10 @@ Zone Indian/Chagos 4:49:40 - LMT 1907
|
||||
6:00 - +06
|
||||
|
||||
# Brunei
|
||||
# See Asia/Kuching.
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Asia/Brunei 7:39:40 - LMT 1926 Mar # Bandar Seri Begawan
|
||||
7:30 - +0730 1933
|
||||
8:00 - +08
|
||||
|
||||
# Burma / Myanmar
|
||||
|
||||
@@ -296,7 +299,6 @@ Zone Asia/Yangon 6:24:47 - LMT 1880 # or Rangoon
|
||||
6:30 - +0630 1942 May
|
||||
9:00 - +09 1945 May 3
|
||||
6:30 - +0630
|
||||
Link Asia/Yangon Indian/Cocos
|
||||
|
||||
# Cambodia
|
||||
# See Asia/Bangkok.
|
||||
@@ -365,9 +367,12 @@ Rule Shang 1919 only - Sep 30 24:00 0 S
|
||||
# in the city at the time for people who use different time standard to adjust
|
||||
# their clock to their preferred time.
|
||||
#
|
||||
# a. For the 1940 May 31 spring forward, the essay [says] ... "Hong
|
||||
# Kong government implemented the spring forward in the same time on
|
||||
# the same date as Shanghai".
|
||||
# a. For the 1940 May 31 spring forward, the essay claim that it was
|
||||
# coordinared between the international settlement authority and the French
|
||||
# concession authority and have gathered support from Hong Kong and Xiamen,
|
||||
# that it would spring forward an hour from May 31 "midnight", and the essay
|
||||
# claim "Hong Kong government implemented the spring forward in the same time
|
||||
# on the same date as Shanghai".
|
||||
#
|
||||
# b. For the 1940 fall back, it was said that they initially intended to do
|
||||
# so on September 30 00:59 at night, however they postponed it to October 12
|
||||
@@ -563,7 +568,7 @@ Rule PRC 1987 1991 - Apr Sun>=11 2:00 1:00 D
|
||||
# Zhongyuan Time ("Central plain Time") UT +08
|
||||
# Now part of Asia/Shanghai.
|
||||
# most of China
|
||||
# Milne gives 8:05:43.2 for Xujiahui Observatory time....
|
||||
# Milne gives 8:05:43.2 for Xujiahui Observatory time; round to nearest.
|
||||
# Guo says Shanghai switched to UT +08 "from the end of the 19th century".
|
||||
#
|
||||
# Long-shu Time (probably as Long and Shu were two names of the area) UT +07
|
||||
@@ -682,7 +687,6 @@ Rule PRC 1987 1991 - Apr Sun>=11 2:00 1:00 D
|
||||
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
# Beijing time, used throughout China; represented by Shanghai.
|
||||
#STDOFF 8:05:43.2
|
||||
Zone Asia/Shanghai 8:05:43 - LMT 1901
|
||||
8:00 Shang C%sT 1949 May 28
|
||||
8:00 PRC C%sT
|
||||
@@ -690,12 +694,11 @@ Zone Asia/Shanghai 8:05:43 - LMT 1901
|
||||
# / Wulumuqi. (Please use Asia/Shanghai if you prefer Beijing time.)
|
||||
Zone Asia/Urumqi 5:50:20 - LMT 1928
|
||||
6:00 - +06
|
||||
Link Asia/Urumqi Antarctica/Vostok
|
||||
|
||||
|
||||
# Hong Kong
|
||||
|
||||
# Milne gives 7:36:41.7.
|
||||
# Milne gives 7:36:41.7; round this.
|
||||
|
||||
# From Lee Yiu Chung (2009-10-24):
|
||||
# I found there are some mistakes for the...DST rule for Hong
|
||||
@@ -879,8 +882,7 @@ Rule HK 1973 only - Dec 30 3:30 1:00 S
|
||||
Rule HK 1979 only - May 13 3:30 1:00 S
|
||||
Rule HK 1979 only - Oct 21 3:30 0 -
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
#STDOFF 7:36:41.7
|
||||
Zone Asia/Hong_Kong 7:36:42 - LMT 1904 Oct 29 17:00u
|
||||
Zone Asia/Hong_Kong 7:36:42 - LMT 1904 Oct 30 0:36:42
|
||||
8:00 - HKT 1941 Jun 15 3:00
|
||||
8:00 1:00 HKST 1941 Oct 1 4:00
|
||||
8:00 0:30 HKWT 1941 Dec 25
|
||||
@@ -1355,7 +1357,7 @@ Zone Asia/Kolkata 5:53:28 - LMT 1854 Jun 28 # Kolkata
|
||||
#
|
||||
# From Paul Eggert (2014-09-06):
|
||||
# The 1876 Report of the Secretary of the [US] Navy, p 306 says that Batavia
|
||||
# civil time was 7:07:12.5.
|
||||
# civil time was 7:07:12.5; round to even for Jakarta.
|
||||
#
|
||||
# From Gwillim Law (2001-05-28), overriding Shanks & Pottenger:
|
||||
# http://www.sumatera-inc.com/go_to_invest/about_indonesia.asp#standtime
|
||||
@@ -1391,11 +1393,10 @@ Zone Asia/Kolkata 5:53:28 - LMT 1854 Jun 28 # Kolkata
|
||||
#
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
# Java, Sumatra
|
||||
#STDOFF 7:07:12.5
|
||||
Zone Asia/Jakarta 7:07:12 - LMT 1867 Aug 10
|
||||
# Shanks & Pottenger say the next transition was at 1924 Jan 1 0:13,
|
||||
# but this must be a typo.
|
||||
7:07:12 - BMT 1923 Dec 31 16:40u # Batavia
|
||||
7:07:12 - BMT 1923 Dec 31 23:47:12 # Batavia
|
||||
7:20 - +0720 1932 Nov
|
||||
7:30 - +0730 1942 Mar 23
|
||||
9:00 - +09 1945 Sep 23
|
||||
@@ -1427,111 +1428,6 @@ Zone Asia/Jayapura 9:22:48 - LMT 1932 Nov
|
||||
|
||||
# Iran
|
||||
|
||||
# From Roozbeh Pournader (2022-05-30):
|
||||
# Here's an order from the Cabinet to the rest of the government to switch to
|
||||
# Tehran time, which is mentioned to be already at +03:30:
|
||||
# https://qavanin.ir/Law/TreeText/180138
|
||||
# Just in case that goes away, I also saved a copy at archive.org:
|
||||
# https://web.archive.org/web/20220530111940/https://qavanin.ir/Law/TreeText/180138
|
||||
# Here's my translation:
|
||||
#
|
||||
# "Circular on Matching the Hours of Governmental and Official Circles
|
||||
# in Provinces
|
||||
# Approved 1314/03/22 [=1935-06-13]
|
||||
# According to the ruling of the Honorable Cabinet, it is ordered that from
|
||||
# now on in all internal provinces of the country, governmental and official
|
||||
# circles set their time to match Tehran time (three hours and half before
|
||||
# Greenwich)....
|
||||
#
|
||||
# I still haven't found out when Tehran itself switched to +03:30....
|
||||
#
|
||||
# From Paul Eggert (2022-06-05):
|
||||
# Although the above says Tehran was at +03:30 before 1935-06-13, we don't
|
||||
# know when it switched to +03:30. For now, use 1935-06-13 as the switch date.
|
||||
# Although most likely wrong, we have no better info.
|
||||
|
||||
# From Roozbeh Pournader (2022-06-01):
|
||||
# This is from Kayhan newspaper, one of the major Iranian newspapers, from
|
||||
# March 20, 1978, page 2:
|
||||
#
|
||||
# "Pull the clocks 60 minutes forward
|
||||
# As we informed before, from the fourth day of the month Farvardin of the
|
||||
# new year [=1978-03-24], clocks will be pulled forward, and people's daily
|
||||
# work and life program will start one hour earlier than the current program.
|
||||
# On the 1st day of the month Farvardin of this year [=1977-03-21], they had
|
||||
# pulled the clocks forward by one hour, but in the month of Mehr
|
||||
# [=1977-09-23], the clocks were pulled back by 30 minutes.
|
||||
# In this way, from the 4th day of the month Farvardin, clocks will be ahead
|
||||
# of the previous years by one hour and a half.
|
||||
# According to the new program, during the night of 4th of Farvardin, when
|
||||
# the midnight, meaning 24 o'clock is announced, the hands of the clock must
|
||||
# be pulled forward by one hour and thus consider midnight 1 o'clock in the
|
||||
# forenoon."
|
||||
#
|
||||
# This implies that in September 1977, when the daylight savings time was
|
||||
# done with, Iran didn't go back to +03:30, but immediately to +04:00.
|
||||
#
|
||||
#
|
||||
# This is from the major Iranian newspaper Ettela'at, dated [1978-08-03]...,
|
||||
# page 32. It looks like they decided to get the clocks back to +4:00
|
||||
# just in time for Ramadan that year:
|
||||
#
|
||||
# "Tomorrow Night, Pull the Clocks Back by One Hour
|
||||
# At 1 o'clock in the forenoon of Saturday 14 Mordad [=1978-08-05], the
|
||||
# clocks will be pulled one hour back and instead of 1 o'clock in the
|
||||
# forenoon, Radio Iran will announce 24 o'clock.
|
||||
# This decision was made in the Cabinet of Ministers meeting of 25 Tir
|
||||
# [=1978-07-16], [...]
|
||||
# At the beginning of the year 2537 [=March 1978: Iran was using a different
|
||||
# year number for a few years then, based on the Coronation of Cyrus the
|
||||
# Great], the country's official time was pulled forward by one hour and now
|
||||
# the official time is one hour and a half ahead compared to last year,
|
||||
# because in Farvardin of last year [=March 1977], the official time was
|
||||
# pulled forward one hour and this continued until the second half of last
|
||||
# year [=September 1977] until in the second half of last year the official
|
||||
# time was pulled back half an hour and that half hour still remains."
|
||||
#
|
||||
# This matches the time of the true noon published in the newspapers, as they
|
||||
# clearly go from +05:00 to +04:00 after that date (which happened during a
|
||||
# long weekend in Iran).
|
||||
|
||||
# From Roozbeh Pournader (2022-05-31):
|
||||
# [Movahedi S. Cultural preconceptions of time: Can we use operational time
|
||||
# to meddle in God's Time? Comp Stud Soc Hist. 1985;27(3):385-400]
|
||||
# https://www.jstor.org/stable/178704
|
||||
# Here's the quotes from the paper:
|
||||
# 1. '"Iran's official time keeper moved the clock one hour forward as from
|
||||
# March 22, 1977 (Farvardin 2, 2536) to make maximum use of daylight and save
|
||||
# in energy consumption. Thus Iran joined such other countries as Britain in
|
||||
# observing what is known as 'daylight saving.' The proposal was originally
|
||||
# put forward by the Ministry of Energy, in no way having any influence on
|
||||
# observing religious ceremonies. Moving time one hour forward in summer
|
||||
# means that at 11:00 o'clock on March 21, the official time was set as
|
||||
# midnight March 22. Then September 24 will actually begin one hour later
|
||||
# than the end of September 23 [...]." Iran's time base thus continued to be
|
||||
# Greenwich Mean Time plus three and one-half hours (plus four and one-half
|
||||
# hours in summer).'
|
||||
#
|
||||
# The article sources this from Iran Almanac and Book of Facts, 1977, Tehran:
|
||||
# Echo of Iran, which is on Google Books at
|
||||
# https://www.google.com/books/edition/Iran_Almanac_and_Book_of_Facts/9ybVAAAAMAAJ.
|
||||
# (I confirmed it by searching for snippets.)
|
||||
#
|
||||
# 2. "After the fall of the shah, the revolutionary government returned to
|
||||
# daylight-saving time (DST) on 26 May 1979."
|
||||
#
|
||||
# This seems to have been announced just one day in advance, on 25 May 1979.
|
||||
#
|
||||
# The change in 1977 clearly seems to be the first daylight savings effort in
|
||||
# Iran. But the article doesn't mention what happened in 1978 (which was
|
||||
# still during the shah's government), or how things continued in 1979
|
||||
# onwards (which was during the Islamic Republic).
|
||||
|
||||
# From Francis Santoni (2022-06-01):
|
||||
# for Iran and 1977 the effective change is only 20 October
|
||||
# (UIT No. 143 17.XI.1977) and not 23 September (UIT No. 141 13.IX.1977).
|
||||
# UIT is the Operational Bulletin of International Telecommunication Union.
|
||||
|
||||
# From Roozbeh Pournader (2003-03-15):
|
||||
# This is an English translation of what I just found (originally in Persian).
|
||||
# The Gregorian dates in brackets are mine:
|
||||
@@ -1566,12 +1462,65 @@ Zone Asia/Jayapura 9:22:48 - LMT 1932 Nov
|
||||
# leap year calculation involved. There has never been any serious
|
||||
# plan to change that law....
|
||||
#
|
||||
# From Paul Eggert (2022-06-30):
|
||||
# Go with Pournader for 1935 through spring 1979, and for timestamps
|
||||
# after August 1991; go with with Shanks & Pottenger for other timestamps.
|
||||
# Go with Santoni's citation of the UIT for fall 1977, as 20 October 1977
|
||||
# is 28 Mehr 1356, consistent with the "Mehr" in Pournader's source.
|
||||
# Assume that the UIT's "1930" is UTC, i.e., 24:00 local time.
|
||||
# From Paul Eggert (2018-11-30):
|
||||
# Go with Shanks & Pottenger before Sept. 1991, and with Pournader thereafter.
|
||||
# I used the following code in GNU Emacs 26.1 to generate the "Rule Iran"
|
||||
# lines from 2008 through 2087. Emacs 26.1 uses Ed Reingold's
|
||||
# cal-persia implementation of Birashk's approximation, which in the
|
||||
# 2008-2087 range disagrees with the astronomical Persian calendar
|
||||
# for Persian years 1404 (Gregorian 2025) and 1437 (Gregorian 2058), so
|
||||
# the following code special-cases those years. See Table 15.1, page 264, of:
|
||||
# Edward M. Reingold and Nachum Dershowitz, Calendrical Calculations:
|
||||
# The Ultimate Edition, Cambridge University Press (2018).
|
||||
# https://www.cambridge.org/fr/academic/subjects/computer-science/computing-general-interest/calendrical-calculations-ultimate-edition-4th-edition
|
||||
# Page 258, footnote 2, of this book says there is some dispute over what will
|
||||
# happen in 2091 (and some other years after that), so this code
|
||||
# stops in 2087, as 2088 and 2089 agree with the "max" rule below.
|
||||
# (cl-loop
|
||||
# initially (require 'cal-persia)
|
||||
# with first-persian-year = 1387
|
||||
# with last-persian-year = 1466
|
||||
# ;; Exceptional years in the above range,
|
||||
# ;; from Reingold & Dershowitz Table 15.1, page 264:
|
||||
# with exceptional-persian-years = '(1404 1437)
|
||||
# with range-start = nil
|
||||
# for persian-year from first-persian-year to last-persian-year
|
||||
# do
|
||||
# (let*
|
||||
# ((exceptional-year-offset
|
||||
# (if (member persian-year exceptional-persian-years) 1 0))
|
||||
# (beg-dst-absolute
|
||||
# (+ (calendar-persian-to-absolute (list 1 1 persian-year))
|
||||
# exceptional-year-offset))
|
||||
# (end-dst-absolute
|
||||
# (+ (calendar-persian-to-absolute (list 6 30 persian-year))
|
||||
# exceptional-year-offset))
|
||||
# (next-year-beg-dst-absolute
|
||||
# (+ (calendar-persian-to-absolute (list 1 1 (1+ persian-year)))
|
||||
# (if (member (1+ persian-year) exceptional-persian-years) 1 0)))
|
||||
# (beg-dst (calendar-gregorian-from-absolute beg-dst-absolute))
|
||||
# (end-dst (calendar-gregorian-from-absolute end-dst-absolute))
|
||||
# (next-year-beg-dst (calendar-gregorian-from-absolute
|
||||
# next-year-beg-dst-absolute))
|
||||
# (year (calendar-extract-year beg-dst))
|
||||
# (range-end (if range-start year "only")))
|
||||
# (setq range-start (or range-start year))
|
||||
# (when (or (/= (calendar-extract-day beg-dst)
|
||||
# (calendar-extract-day next-year-beg-dst))
|
||||
# (= persian-year last-persian-year))
|
||||
# (insert
|
||||
# (format
|
||||
# "Rule\tIran\t%d\t%s\t-\t%s\t%2d\t24:00\t1:00\t-\n"
|
||||
# range-start range-end
|
||||
# (calendar-month-name (calendar-extract-month beg-dst) t)
|
||||
# (calendar-extract-day beg-dst)))
|
||||
# (insert
|
||||
# (format
|
||||
# "Rule\tIran\t%d\t%s\t-\t%s\t%2d\t24:00\t0\t-\n"
|
||||
# range-start range-end
|
||||
# (calendar-month-name (calendar-extract-month end-dst) t)
|
||||
# (calendar-extract-day end-dst)))
|
||||
# (setq range-start nil))))
|
||||
#
|
||||
# From Oscar van Vlijmen (2005-03-30), writing about future
|
||||
# discrepancies between cal-persia and the Iranian calendar:
|
||||
@@ -1605,23 +1554,10 @@ Zone Asia/Jayapura 9:22:48 - LMT 1932 Nov
|
||||
# be changed back to its previous state on the 24 hours of the
|
||||
# thirtieth day of Shahrivar.
|
||||
#
|
||||
# From Ali Mirjamali (2022-05-10):
|
||||
# Official IR News Agency announcement: irna.ir/xjJ3TT
|
||||
# ...
|
||||
# Highlights: DST will be cancelled for the next Iranian year 1402
|
||||
# (i.e 2023-March-21) and forthcoming years.
|
||||
#
|
||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
||||
# Work around a bug in zic 2022a and earlier.
|
||||
Rule Iran 1910 only - Jan 1 00:00 0 -
|
||||
#
|
||||
Rule Iran 1977 only - Mar 21 23:00 1:00 -
|
||||
Rule Iran 1977 only - Oct 20 24:00 0 -
|
||||
Rule Iran 1978 only - Mar 24 24:00 1:00 -
|
||||
Rule Iran 1978 only - Aug 5 01:00 0 -
|
||||
Rule Iran 1979 only - May 26 24:00 1:00 -
|
||||
Rule Iran 1978 1980 - Mar 20 24:00 1:00 -
|
||||
Rule Iran 1978 only - Oct 20 24:00 0 -
|
||||
Rule Iran 1979 only - Sep 18 24:00 0 -
|
||||
Rule Iran 1980 only - Mar 20 24:00 1:00 -
|
||||
Rule Iran 1980 only - Sep 22 24:00 0 -
|
||||
Rule Iran 1991 only - May 2 24:00 1:00 -
|
||||
Rule Iran 1992 1995 - Mar 21 24:00 1:00 -
|
||||
@@ -1652,13 +1588,85 @@ Rule Iran 2017 2019 - Mar 21 24:00 1:00 -
|
||||
Rule Iran 2017 2019 - Sep 21 24:00 0 -
|
||||
Rule Iran 2020 only - Mar 20 24:00 1:00 -
|
||||
Rule Iran 2020 only - Sep 20 24:00 0 -
|
||||
Rule Iran 2021 2022 - Mar 21 24:00 1:00 -
|
||||
Rule Iran 2021 2022 - Sep 21 24:00 0 -
|
||||
Rule Iran 2021 2023 - Mar 21 24:00 1:00 -
|
||||
Rule Iran 2021 2023 - Sep 21 24:00 0 -
|
||||
Rule Iran 2024 only - Mar 20 24:00 1:00 -
|
||||
Rule Iran 2024 only - Sep 20 24:00 0 -
|
||||
Rule Iran 2025 2027 - Mar 21 24:00 1:00 -
|
||||
Rule Iran 2025 2027 - Sep 21 24:00 0 -
|
||||
Rule Iran 2028 2029 - Mar 20 24:00 1:00 -
|
||||
Rule Iran 2028 2029 - Sep 20 24:00 0 -
|
||||
Rule Iran 2030 2031 - Mar 21 24:00 1:00 -
|
||||
Rule Iran 2030 2031 - Sep 21 24:00 0 -
|
||||
Rule Iran 2032 2033 - Mar 20 24:00 1:00 -
|
||||
Rule Iran 2032 2033 - Sep 20 24:00 0 -
|
||||
Rule Iran 2034 2035 - Mar 21 24:00 1:00 -
|
||||
Rule Iran 2034 2035 - Sep 21 24:00 0 -
|
||||
Rule Iran 2036 2037 - Mar 20 24:00 1:00 -
|
||||
Rule Iran 2036 2037 - Sep 20 24:00 0 -
|
||||
Rule Iran 2038 2039 - Mar 21 24:00 1:00 -
|
||||
Rule Iran 2038 2039 - Sep 21 24:00 0 -
|
||||
Rule Iran 2040 2041 - Mar 20 24:00 1:00 -
|
||||
Rule Iran 2040 2041 - Sep 20 24:00 0 -
|
||||
Rule Iran 2042 2043 - Mar 21 24:00 1:00 -
|
||||
Rule Iran 2042 2043 - Sep 21 24:00 0 -
|
||||
Rule Iran 2044 2045 - Mar 20 24:00 1:00 -
|
||||
Rule Iran 2044 2045 - Sep 20 24:00 0 -
|
||||
Rule Iran 2046 2047 - Mar 21 24:00 1:00 -
|
||||
Rule Iran 2046 2047 - Sep 21 24:00 0 -
|
||||
Rule Iran 2048 2049 - Mar 20 24:00 1:00 -
|
||||
Rule Iran 2048 2049 - Sep 20 24:00 0 -
|
||||
Rule Iran 2050 2051 - Mar 21 24:00 1:00 -
|
||||
Rule Iran 2050 2051 - Sep 21 24:00 0 -
|
||||
Rule Iran 2052 2053 - Mar 20 24:00 1:00 -
|
||||
Rule Iran 2052 2053 - Sep 20 24:00 0 -
|
||||
Rule Iran 2054 2055 - Mar 21 24:00 1:00 -
|
||||
Rule Iran 2054 2055 - Sep 21 24:00 0 -
|
||||
Rule Iran 2056 2057 - Mar 20 24:00 1:00 -
|
||||
Rule Iran 2056 2057 - Sep 20 24:00 0 -
|
||||
Rule Iran 2058 2059 - Mar 21 24:00 1:00 -
|
||||
Rule Iran 2058 2059 - Sep 21 24:00 0 -
|
||||
Rule Iran 2060 2062 - Mar 20 24:00 1:00 -
|
||||
Rule Iran 2060 2062 - Sep 20 24:00 0 -
|
||||
Rule Iran 2063 only - Mar 21 24:00 1:00 -
|
||||
Rule Iran 2063 only - Sep 21 24:00 0 -
|
||||
Rule Iran 2064 2066 - Mar 20 24:00 1:00 -
|
||||
Rule Iran 2064 2066 - Sep 20 24:00 0 -
|
||||
Rule Iran 2067 only - Mar 21 24:00 1:00 -
|
||||
Rule Iran 2067 only - Sep 21 24:00 0 -
|
||||
Rule Iran 2068 2070 - Mar 20 24:00 1:00 -
|
||||
Rule Iran 2068 2070 - Sep 20 24:00 0 -
|
||||
Rule Iran 2071 only - Mar 21 24:00 1:00 -
|
||||
Rule Iran 2071 only - Sep 21 24:00 0 -
|
||||
Rule Iran 2072 2074 - Mar 20 24:00 1:00 -
|
||||
Rule Iran 2072 2074 - Sep 20 24:00 0 -
|
||||
Rule Iran 2075 only - Mar 21 24:00 1:00 -
|
||||
Rule Iran 2075 only - Sep 21 24:00 0 -
|
||||
Rule Iran 2076 2078 - Mar 20 24:00 1:00 -
|
||||
Rule Iran 2076 2078 - Sep 20 24:00 0 -
|
||||
Rule Iran 2079 only - Mar 21 24:00 1:00 -
|
||||
Rule Iran 2079 only - Sep 21 24:00 0 -
|
||||
Rule Iran 2080 2082 - Mar 20 24:00 1:00 -
|
||||
Rule Iran 2080 2082 - Sep 20 24:00 0 -
|
||||
Rule Iran 2083 only - Mar 21 24:00 1:00 -
|
||||
Rule Iran 2083 only - Sep 21 24:00 0 -
|
||||
Rule Iran 2084 2086 - Mar 20 24:00 1:00 -
|
||||
Rule Iran 2084 2086 - Sep 20 24:00 0 -
|
||||
Rule Iran 2087 only - Mar 21 24:00 1:00 -
|
||||
Rule Iran 2087 only - Sep 21 24:00 0 -
|
||||
#
|
||||
# The following rules are approximations starting in the year 2088.
|
||||
# These are the best post-2088 approximations available, given the
|
||||
# restrictions of a single rule using ordinary Gregorian dates.
|
||||
# At some point this table will need to be extended, though quite
|
||||
# possibly Iran will change the rules first.
|
||||
Rule Iran 2088 max - Mar 20 24:00 1:00 -
|
||||
Rule Iran 2088 max - Sep 20 24:00 0 -
|
||||
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Asia/Tehran 3:25:44 - LMT 1916
|
||||
3:25:44 - TMT 1935 Jun 13 # Tehran Mean Time
|
||||
3:30 Iran +0330/+0430 1977 Oct 20 24:00
|
||||
3:25:44 - TMT 1946 # Tehran Mean Time
|
||||
3:30 - +0330 1977 Nov
|
||||
4:00 Iran +04/+05 1979
|
||||
3:30 Iran +0330/+0430
|
||||
|
||||
@@ -2480,9 +2488,9 @@ Zone Asia/Amman 2:23:44 - LMT 1931
|
||||
# the third time belt (before 1930 this means +03).
|
||||
|
||||
# From Alexander Konzurovski (2018-12-20):
|
||||
# (Asia/Qyzylorda) is changing its time zone from UTC+6 to UTC+5
|
||||
# effective December 21st, 2018....
|
||||
# http://adilet.zan.kz/rus/docs/P1800000817 (russian language).
|
||||
# Qyzyolrda Region (Asia/Qyzylorda) is changing its time zone from
|
||||
# UTC+6 to UTC+5 effective December 21st, 2018. The legal document is
|
||||
# located here: http://adilet.zan.kz/rus/docs/P1800000817 (russian language).
|
||||
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
#
|
||||
@@ -2759,8 +2767,20 @@ Zone Asia/Beirut 2:22:00 - LMT 1880
|
||||
Rule NBorneo 1935 1941 - Sep 14 0:00 0:20 -
|
||||
Rule NBorneo 1935 1941 - Dec 14 0:00 0 -
|
||||
#
|
||||
# For peninsular Malaysia see Asia/Singapore.
|
||||
#
|
||||
# peninsular Malaysia
|
||||
# taken from Mok Ly Yng (2003-10-30)
|
||||
# https://web.archive.org/web/20190822231045/http://www.math.nus.edu.sg/~mathelmr/teaching/timezone.html
|
||||
# This agrees with Singapore since 1905-06-01.
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Asia/Kuala_Lumpur 6:46:46 - LMT 1901 Jan 1
|
||||
6:55:25 - SMT 1905 Jun 1 # Singapore M.T.
|
||||
7:00 - +07 1933 Jan 1
|
||||
7:00 0:20 +0720 1936 Jan 1
|
||||
7:20 - +0720 1941 Sep 1
|
||||
7:30 - +0730 1942 Feb 16
|
||||
9:00 - +09 1945 Sep 12
|
||||
7:30 - +0730 1982 Jan 1
|
||||
8:00 - +08
|
||||
# Sabah & Sarawak
|
||||
# From Paul Eggert (2014-08-12):
|
||||
# The data entries here are mostly from Shanks & Pottenger, but the 1942, 1945
|
||||
@@ -2771,14 +2791,12 @@ Zone Asia/Kuching 7:21:20 - LMT 1926 Mar
|
||||
8:00 NBorneo +08/+0820 1942 Feb 16
|
||||
9:00 - +09 1945 Sep 12
|
||||
8:00 - +08
|
||||
Link Asia/Kuching Asia/Brunei
|
||||
|
||||
# Maldives
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Indian/Maldives 4:54:00 - LMT 1880 # Malé
|
||||
4:54:00 - MMT 1960 # Malé Mean Time
|
||||
5:00 - +05
|
||||
Link Indian/Maldives Indian/Kerguelen
|
||||
|
||||
# Mongolia
|
||||
|
||||
@@ -3613,7 +3631,6 @@ Zone Asia/Singapore 6:55:25 - LMT 1901 Jan 1
|
||||
9:00 - +09 1945 Sep 12
|
||||
7:30 - +0730 1982 Jan 1
|
||||
8:00 - +08
|
||||
Link Asia/Singapore Asia/Kuala_Lumpur
|
||||
|
||||
# Spratly Is
|
||||
# no information
|
||||
@@ -3848,7 +3865,7 @@ Zone Asia/Damascus 2:25:12 - LMT 1920 # Dimashq
|
||||
Zone Asia/Dushanbe 4:35:12 - LMT 1924 May 2
|
||||
5:00 - +05 1930 Jun 21
|
||||
6:00 RussiaAsia +06/+07 1991 Mar 31 2:00s
|
||||
5:00 1:00 +06 1991 Sep 9 2:00s
|
||||
5:00 1:00 +05/+06 1991 Sep 9 2:00s
|
||||
5:00 - +05
|
||||
|
||||
# Thailand
|
||||
@@ -3858,7 +3875,6 @@ Zone Asia/Bangkok 6:42:04 - LMT 1880
|
||||
7:00 - +07
|
||||
Link Asia/Bangkok Asia/Phnom_Penh # Cambodia
|
||||
Link Asia/Bangkok Asia/Vientiane # Laos
|
||||
Link Asia/Bangkok Indian/Christmas
|
||||
|
||||
# Turkmenistan
|
||||
# From Shanks & Pottenger.
|
||||
@@ -3874,8 +3890,6 @@ Zone Asia/Ashgabat 3:53:32 - LMT 1924 May 2 # or Ashkhabad
|
||||
Zone Asia/Dubai 3:41:12 - LMT 1920
|
||||
4:00 - +04
|
||||
Link Asia/Dubai Asia/Muscat # Oman
|
||||
Link Asia/Dubai Indian/Mahe
|
||||
Link Asia/Dubai Indian/Reunion
|
||||
|
||||
# Uzbekistan
|
||||
# Byalokoz 1919 says Uzbekistan was 4:27:53.
|
||||
@@ -3887,8 +3901,7 @@ Zone Asia/Samarkand 4:27:53 - LMT 1924 May 2
|
||||
6:00 - +06 1982 Apr 1
|
||||
5:00 RussiaAsia +05/+06 1992
|
||||
5:00 - +05
|
||||
# Milne says Tashkent was 4:37:10.8.
|
||||
#STDOFF 4:37:10.8
|
||||
# Milne says Tashkent was 4:37:10.8; round to nearest.
|
||||
Zone Asia/Tashkent 4:37:11 - LMT 1924 May 2
|
||||
5:00 - +05 1930 Jun 21
|
||||
6:00 RussiaAsia +06/+07 1991 Mar 31 2:00
|
||||
@@ -3907,7 +3920,7 @@ Zone Asia/Tashkent 4:37:11 - LMT 1924 May 2
|
||||
# The English-language name of Vietnam's most populous city is "Ho Chi Minh
|
||||
# City"; use Ho_Chi_Minh below to avoid a name of more than 14 characters.
|
||||
|
||||
# From Paul Eggert (2022-07-27) after a 2014 heads-up from Trần Ngọc Quân:
|
||||
# From Paul Eggert (2014-10-21) after a heads-up from Trần Ngọc Quân:
|
||||
# Trần Tiến Bình's authoritative book "Lịch Việt Nam: thế kỷ XX-XXI (1901-2100)"
|
||||
# (Nhà xuất bản Văn Hoá - Thông Tin, Hanoi, 2005), pp 49-50,
|
||||
# is quoted verbatim in:
|
||||
@@ -3919,8 +3932,8 @@ Zone Asia/Tashkent 4:37:11 - LMT 1924 May 2
|
||||
# The 1906 transition was effective July 1 and standardized Indochina to
|
||||
# Phù Liễn Observatory, legally 104° 17' 17" east of Paris.
|
||||
# It's unclear whether this meant legal Paris Mean Time (00:09:21) or
|
||||
# the Paris Meridian; for now guess the former and round the exact
|
||||
# 07:06:30.1333... to 07:06:30.13 as the legal spec used 66 2/3 ms precision.
|
||||
# the Paris Meridian (2° 20' 14.03" E); the former yields 07:06:30.1333...
|
||||
# and the latter 07:06:29.333... so either way it rounds to 07:06:30,
|
||||
# which is used below even though the modern-day Phù Liễn Observatory
|
||||
# is closer to 07:06:31. Abbreviate Phù Liễn Mean Time as PLMT.
|
||||
#
|
||||
@@ -3947,8 +3960,7 @@ Zone Asia/Tashkent 4:37:11 - LMT 1924 May 2
|
||||
# NXB Thuận Hoá, Huế, 1995.
|
||||
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
#STDOFF 7:06:30.13
|
||||
Zone Asia/Ho_Chi_Minh 7:06:30 - LMT 1906 Jul 1
|
||||
Zone Asia/Ho_Chi_Minh 7:06:40 - LMT 1906 Jul 1
|
||||
7:06:30 - PLMT 1911 May 1 # Phù Liễn MT
|
||||
7:00 - +07 1942 Dec 31 23:00
|
||||
8:00 - +08 1945 Mar 14 23:00
|
||||
|
||||
@@ -275,10 +275,16 @@ Zone Antarctica/Macquarie 0 - -00 1899 Nov
|
||||
10:00 AT AE%sT
|
||||
|
||||
# Christmas
|
||||
# See Asia/Bangkok.
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Indian/Christmas 7:02:52 - LMT 1895 Feb
|
||||
7:00 - +07
|
||||
|
||||
# Cocos (Keeling) Is
|
||||
# See Asia/Yangon.
|
||||
# These islands were ruled by the Ross family from about 1830 to 1978.
|
||||
# We don't know when standard time was introduced; for now, we guess 1900.
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Indian/Cocos 6:27:40 - LMT 1900
|
||||
6:30 - +0630
|
||||
|
||||
|
||||
# Fiji
|
||||
@@ -495,11 +501,6 @@ Link Pacific/Guam Pacific/Saipan # N Mariana Is
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Pacific/Tarawa 11:32:04 - LMT 1901 # Bairiki
|
||||
12:00 - +12
|
||||
Link Pacific/Tarawa Pacific/Funafuti
|
||||
Link Pacific/Tarawa Pacific/Majuro
|
||||
Link Pacific/Tarawa Pacific/Wake
|
||||
Link Pacific/Tarawa Pacific/Wallis
|
||||
|
||||
Zone Pacific/Kanton 0 - -00 1937 Aug 31
|
||||
-12:00 - -12 1979 Oct
|
||||
-11:00 - -11 1994 Dec 31
|
||||
@@ -513,8 +514,15 @@ Zone Pacific/Kiritimati -10:29:20 - LMT 1901
|
||||
# See Pacific/Guam.
|
||||
|
||||
# Marshall Is
|
||||
# See Pacific/Tarawa for most locations.
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Pacific/Majuro 11:24:48 - LMT 1901
|
||||
11:00 - +11 1914 Oct
|
||||
9:00 - +09 1919 Feb 1
|
||||
11:00 - +11 1937
|
||||
10:00 - +10 1941 Apr 1
|
||||
9:00 - +09 1944 Jan 30
|
||||
11:00 - +11 1969 Oct
|
||||
12:00 - +12
|
||||
Zone Pacific/Kwajalein 11:09:20 - LMT 1901
|
||||
11:00 - +11 1937
|
||||
10:00 - +10 1941 Apr 1
|
||||
@@ -524,9 +532,22 @@ Zone Pacific/Kwajalein 11:09:20 - LMT 1901
|
||||
12:00 - +12
|
||||
|
||||
# Micronesia
|
||||
# For Chuuk and Yap see Pacific/Port_Moresby.
|
||||
# For Pohnpei see Pacific/Guadalcanal.
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Pacific/Chuuk -13:52:52 - LMT 1844 Dec 31
|
||||
10:07:08 - LMT 1901
|
||||
10:00 - +10 1914 Oct
|
||||
9:00 - +09 1919 Feb 1
|
||||
10:00 - +10 1941 Apr 1
|
||||
9:00 - +09 1945 Aug
|
||||
10:00 - +10
|
||||
Zone Pacific/Pohnpei -13:27:08 - LMT 1844 Dec 31 # Kolonia
|
||||
10:32:52 - LMT 1901
|
||||
11:00 - +11 1914 Oct
|
||||
9:00 - +09 1919 Feb 1
|
||||
11:00 - +11 1937
|
||||
10:00 - +10 1941 Apr 1
|
||||
9:00 - +09 1945 Aug
|
||||
11:00 - +11
|
||||
Zone Pacific/Kosrae -13:08:04 - LMT 1844 Dec 31
|
||||
10:51:56 - LMT 1901
|
||||
11:00 - +11 1914 Oct
|
||||
@@ -596,12 +617,12 @@ Rule Chatham 2008 max - Apr Sun>=1 2:45s 0 -
|
||||
Zone Pacific/Auckland 11:39:04 - LMT 1868 Nov 2
|
||||
11:30 NZ NZ%sT 1946 Jan 1
|
||||
12:00 NZ NZ%sT
|
||||
Link Pacific/Auckland Antarctica/McMurdo
|
||||
|
||||
Zone Pacific/Chatham 12:13:48 - LMT 1868 Nov 2
|
||||
12:15 - +1215 1946 Jan 1
|
||||
12:45 Chatham +1245/+1345
|
||||
|
||||
Link Pacific/Auckland Antarctica/McMurdo
|
||||
|
||||
# Auckland Is
|
||||
# uninhabited; Māori and Moriori, colonial settlers, pastoralists, sealers,
|
||||
# and scientific personnel have wintered
|
||||
@@ -660,7 +681,7 @@ Zone Pacific/Rarotonga 13:20:56 - LMT 1899 Dec 26 # Avarua
|
||||
|
||||
|
||||
# Niue
|
||||
# See Pacific/Rarotonga comments for 1952 transition.
|
||||
# See Pacific/Raratonga comments for 1952 transition.
|
||||
#
|
||||
# From Tim Parenti (2021-09-13):
|
||||
# Consecutive contemporaneous editions of The Air Almanac listed -11:20 for
|
||||
@@ -696,7 +717,6 @@ Zone Pacific/Port_Moresby 9:48:40 - LMT 1880
|
||||
9:48:32 - PMMT 1895 # Port Moresby Mean Time
|
||||
10:00 - +10
|
||||
Link Pacific/Port_Moresby Antarctica/DumontDUrville
|
||||
Link Pacific/Port_Moresby Pacific/Chuuk
|
||||
#
|
||||
# From Paul Eggert (2014-10-13):
|
||||
# Base the Bougainville entry on the Arawa-Kieta region, which appears to have
|
||||
@@ -824,7 +844,6 @@ Zone Pacific/Apia 12:33:04 - LMT 1892 Jul 5
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Pacific/Guadalcanal 10:39:48 - LMT 1912 Oct # Honiara
|
||||
11:00 - +11
|
||||
Link Pacific/Guadalcanal Pacific/Pohnpei
|
||||
|
||||
# Tokelau
|
||||
#
|
||||
@@ -865,7 +884,9 @@ Zone Pacific/Tongatapu 12:19:12 - LMT 1945 Sep 10
|
||||
13:00 Tonga +13/+14
|
||||
|
||||
# Tuvalu
|
||||
# See Pacific/Tarawa.
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Pacific/Funafuti 11:56:52 - LMT 1901
|
||||
12:00 - +12
|
||||
|
||||
|
||||
# US minor outlying islands
|
||||
@@ -924,7 +945,9 @@ Zone Pacific/Tongatapu 12:19:12 - LMT 1945 Sep 10
|
||||
# uninhabited since World War II; was probably like Pacific/Kiritimati
|
||||
|
||||
# Wake
|
||||
# See Pacific/Tarawa.
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Pacific/Wake 11:06:28 - LMT 1901
|
||||
12:00 - +12
|
||||
|
||||
|
||||
# Vanuatu
|
||||
@@ -963,7 +986,9 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila
|
||||
11:00 Vanuatu +11/+12
|
||||
|
||||
# Wallis and Futuna
|
||||
# See Pacific/Tarawa.
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Pacific/Wallis 12:15:20 - LMT 1901
|
||||
12:00 - +12
|
||||
|
||||
###############################################################################
|
||||
|
||||
@@ -1281,7 +1306,6 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila
|
||||
# to have the extra hour of sunshine removed from their area." See:
|
||||
# Daylight saving coming to WA in 2019. Guardian Express. 2018-04-01.
|
||||
# https://www.communitynews.com.au/guardian-express/news/exclusive-daylight-savings-coming-wa-summer-2018/
|
||||
# [The article ends with "Today's date is April 1."]
|
||||
|
||||
# Queensland
|
||||
|
||||
@@ -1825,12 +1849,16 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila
|
||||
# "In Marshall Islands, Friday is followed by Sunday", NY Times. 1993-08-22.
|
||||
# https://www.nytimes.com/1993/08/22/world/in-marshall-islands-friday-is-followed-by-sunday.html
|
||||
|
||||
# From Paul Eggert (2022-03-31):
|
||||
# Phake Nick (2018-10-27) noted <https://wiki.suikawiki.org/n/南洋群島の標準時>'s
|
||||
# citation of a 1993 AP article published in the New York Times saying
|
||||
# Kwajalein synchronized its day with the US mainland about 40 years earlier.
|
||||
# However the AP article is vague and possibly wrong about this. The article
|
||||
# says the earlier switch was "about 40 years ago when the United States
|
||||
# From Phake Nick (2018-10-27):
|
||||
# <https://wiki.suikawiki.org/n/南洋群島の標準時> ... pointed out that
|
||||
# currently tzdata say Pacific/Kwajalein switched from GMT+11 to GMT-12 in
|
||||
# 1969 October without explanation, however an 1993 article from NYT say it
|
||||
# synchorized its day with US mainland about 40 years ago and thus the switch
|
||||
# should occur at around 1950s instead.
|
||||
#
|
||||
# From Paul Eggert (2018-11-18):
|
||||
# The NYT (actually, AP) article is vague and possibly wrong about this.
|
||||
# The article says the earlier switch was "40 years ago when the United States
|
||||
# Army established a missile test range here". However, the Kwajalein Test
|
||||
# Center was established on 1960-10-01 and was run by the US Navy. It was
|
||||
# transferred to the US Army on 1964-07-01. See "Seize the High Ground"
|
||||
@@ -1877,6 +1905,13 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila
|
||||
# Like the Ladrones (see Guam commentary), assume the Spanish East Indies
|
||||
# kept American time until the Philippines switched at the end of 1844.
|
||||
|
||||
# Alan Eugene Davis writes (1996-03-16),
|
||||
# "I am certain, having lived there for the past decade, that 'Truk'
|
||||
# (now properly known as Chuuk) ... is in the time zone GMT+10."
|
||||
#
|
||||
# Shanks & Pottenger write that Truk switched from UT +10 to +11
|
||||
# on 1978-10-01; ignore this for now.
|
||||
|
||||
# From Paul Eggert (1999-10-29):
|
||||
# The Federated States of Micronesia Visitors Board writes in
|
||||
# The Federated States of Micronesia - Visitor Information (1999-01-26)
|
||||
@@ -2207,7 +2242,7 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila
|
||||
# through the third Sunday in January at 03:00, like Fiji, for now.
|
||||
|
||||
# From David Wade (2017-10-18):
|
||||
# In August government was dissolved by the King. The current prime minister
|
||||
# In August government was disolved by the King. The current prime minister
|
||||
# continued in office in care taker mode. It is easy to see that few
|
||||
# decisions will be made until elections 16th November.
|
||||
#
|
||||
@@ -2215,6 +2250,26 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila
|
||||
# For now, guess that DST is discontinued. That's what the IATA is guessing.
|
||||
|
||||
|
||||
# Wake
|
||||
|
||||
# From Vernice Anderson, Personal Secretary to Philip Jessup,
|
||||
# US Ambassador At Large (oral history interview, 1971-02-02):
|
||||
#
|
||||
# Saturday, the 14th [of October, 1950] - ... The time was all the
|
||||
# more confusing at that point, because we had crossed the
|
||||
# International Date Line, thus getting two Sundays. Furthermore, we
|
||||
# discovered that Wake Island had two hours of daylight saving time
|
||||
# making calculation of time in Washington difficult if not almost
|
||||
# impossible.
|
||||
#
|
||||
# https://www.trumanlibrary.org/oralhist/andrsonv.htm
|
||||
|
||||
# From Paul Eggert (2003-03-23):
|
||||
# We have no other report of DST in Wake Island, so omit this info for now.
|
||||
|
||||
# See also the commentary for Micronesia.
|
||||
|
||||
|
||||
###############################################################################
|
||||
|
||||
# The International Date Line
|
||||
|
||||
@@ -27,15 +27,10 @@
|
||||
# 2009-05-17 by Arthur David Olson.
|
||||
|
||||
# This file provides links from old or merged timezone names to current ones.
|
||||
# Many names changed in late 1993, and many merged names moved here
|
||||
# in the period from 2013 through 2022. Several of these names are
|
||||
# Many names changed in late 1993. Several of these names are
|
||||
# also present in the file 'backzone', which has data important only
|
||||
# for pre-1970 timestamps and so is out of scope for tzdb proper.
|
||||
|
||||
# Although this file is optional and tzdb will work if you omit it by
|
||||
# building with 'make BACKWARD=', in practice downstream users
|
||||
# typically use this file for backward compatibility.
|
||||
|
||||
# Link TARGET LINK-NAME
|
||||
Link Africa/Nairobi Africa/Asmera
|
||||
Link Africa/Abidjan Africa/Timbuktu
|
||||
@@ -76,7 +71,7 @@ Link Asia/Thimphu Asia/Thimbu
|
||||
Link Asia/Makassar Asia/Ujung_Pandang
|
||||
Link Asia/Ulaanbaatar Asia/Ulan_Bator
|
||||
Link Atlantic/Faroe Atlantic/Faeroe
|
||||
Link Europe/Berlin Atlantic/Jan_Mayen
|
||||
Link Europe/Oslo Atlantic/Jan_Mayen
|
||||
Link Australia/Sydney Australia/ACT
|
||||
Link Australia/Sydney Australia/Canberra
|
||||
Link Australia/Hobart Australia/Currie
|
||||
@@ -111,7 +106,6 @@ Link Africa/Cairo Egypt
|
||||
Link Europe/Dublin Eire
|
||||
Link Etc/UTC Etc/UCT
|
||||
Link Europe/London Europe/Belfast
|
||||
Link Europe/Kyiv Europe/Kiev
|
||||
Link Europe/Chisinau Europe/Tiraspol
|
||||
Link Europe/London GB
|
||||
Link Europe/London GB-Eire
|
||||
@@ -120,7 +114,7 @@ Link Etc/GMT GMT-0
|
||||
Link Etc/GMT GMT0
|
||||
Link Etc/GMT Greenwich
|
||||
Link Asia/Hong_Kong Hongkong
|
||||
Link Africa/Abidjan Iceland
|
||||
Link Atlantic/Reykjavik Iceland
|
||||
Link Asia/Tehran Iran
|
||||
Link Asia/Jerusalem Israel
|
||||
Link America/Jamaica Jamaica
|
||||
@@ -136,10 +130,10 @@ Link America/Denver Navajo
|
||||
Link Asia/Shanghai PRC
|
||||
Link Pacific/Kanton Pacific/Enderbury
|
||||
Link Pacific/Honolulu Pacific/Johnston
|
||||
Link Pacific/Guadalcanal Pacific/Ponape
|
||||
Link Pacific/Pohnpei Pacific/Ponape
|
||||
Link Pacific/Pago_Pago Pacific/Samoa
|
||||
Link Pacific/Port_Moresby Pacific/Truk
|
||||
Link Pacific/Port_Moresby Pacific/Yap
|
||||
Link Pacific/Chuuk Pacific/Truk
|
||||
Link Pacific/Chuuk Pacific/Yap
|
||||
Link Europe/Warsaw Poland
|
||||
Link Europe/Lisbon Portugal
|
||||
Link Asia/Taipei ROC
|
||||
|
||||
@@ -40,16 +40,12 @@
|
||||
# behind GMT but uses the completely misleading abbreviation "GMT".
|
||||
|
||||
Zone Etc/GMT 0 - GMT
|
||||
|
||||
# The following zone is used by tzcode functions like gmtime,
|
||||
# which load the "UTC" file to handle seconds properly.
|
||||
Zone Etc/UTC 0 - UTC
|
||||
|
||||
# The following link uses older naming conventions,
|
||||
# but it belongs here, not in the file 'backward',
|
||||
# as it is needed for tzcode releases through 2022a,
|
||||
# where functions like gmtime load "GMT" instead of the "Etc/UTC".
|
||||
# We want this to work even on installations that omit 'backward'.
|
||||
# as functions like gmtime load the "GMT" file to handle leap seconds properly.
|
||||
# We want this to work even on installations that omit the other older names.
|
||||
Link Etc/GMT GMT
|
||||
|
||||
Link Etc/UTC Etc/Universal
|
||||
|
||||
@@ -326,7 +326,8 @@
|
||||
# UT-00:25:22 and cites the International Telegraph Bureau. As it is
|
||||
# not clear that there was any practical significance to the change
|
||||
# from UT-00:25:22 to UT-00:25:21.1 in civil timekeeping, omit this
|
||||
# transition for now and just use the latter value.
|
||||
# transition for now and just use the latter value, omitting its
|
||||
# fraction since our format cannot represent fractions.
|
||||
|
||||
# "Countess Markievicz ... claimed that the [1916] abolition of Dublin Mean Time
|
||||
# was among various actions undertaken by the 'English' government that
|
||||
@@ -522,7 +523,7 @@ Rule GB-Eire 1990 1995 - Oct Sun>=22 1:00u 0 GMT
|
||||
# Use Europe/London for Jersey, Guernsey, and the Isle of Man.
|
||||
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Europe/London -0:01:15 - LMT 1847 Dec 1
|
||||
Zone Europe/London -0:01:15 - LMT 1847 Dec 1 0:00s
|
||||
0:00 GB-Eire %s 1968 Oct 27
|
||||
1:00 - BST 1971 Oct 31 2:00u
|
||||
0:00 GB-Eire %s 1996
|
||||
@@ -560,8 +561,7 @@ Rule Eire 1990 1995 - Oct Sun>=22 1:00u -1:00 -
|
||||
Rule Eire 1996 max - Oct lastSun 1:00u -1:00 -
|
||||
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
#STDOFF -0:25:21.1
|
||||
Zone Europe/Dublin -0:25:21 - LMT 1880 Aug 2
|
||||
Zone Europe/Dublin -0:25:00 - LMT 1880 Aug 2
|
||||
-0:25:21 - DMT 1916 May 21 2:00s
|
||||
-0:25:21 1:00 IST 1916 Oct 1 2:00s
|
||||
0:00 GB-Eire %s 1921 Dec 6 # independence
|
||||
@@ -984,8 +984,6 @@ Zone Europe/Brussels 0:17:30 - LMT 1880
|
||||
1:00 C-Eur CE%sT 1944 Sep 3
|
||||
1:00 Belgium CE%sT 1977
|
||||
1:00 EU CE%sT
|
||||
Link Europe/Brussels Europe/Amsterdam
|
||||
Link Europe/Brussels Europe/Luxembourg
|
||||
|
||||
# Bosnia and Herzegovina
|
||||
# See Europe/Belgrade.
|
||||
@@ -1048,12 +1046,62 @@ Zone Europe/Prague 0:57:44 - LMT 1850
|
||||
# End of rearguard section.
|
||||
1:00 Czech CE%sT 1979
|
||||
1:00 EU CE%sT
|
||||
Link Europe/Prague Europe/Bratislava
|
||||
|
||||
# Use Europe/Prague also for Slovakia.
|
||||
|
||||
# Denmark, Faroe Islands, and Greenland
|
||||
# For Denmark see Europe/Berlin.
|
||||
|
||||
# From Jesper Nørgaard Welen (2005-04-26):
|
||||
# the law [introducing standard time] was in effect from 1894-01-01....
|
||||
# The page https://www.retsinformation.dk/eli/lta/1893/83
|
||||
# confirms this, and states that the law was put forth 1893-03-29.
|
||||
#
|
||||
# The EU [actually, EEC and Euratom] treaty with effect from 1973:
|
||||
# https://www.retsinformation.dk/eli/lta/1972/21100
|
||||
#
|
||||
# This provoked a new law from 1974 to make possible summer time changes
|
||||
# in subsequent decrees with the law
|
||||
# https://www.retsinformation.dk/eli/lta/1974/223
|
||||
#
|
||||
# It seems however that no decree was set forward until 1980. I have
|
||||
# not found any decree, but in another related law, the effecting DST
|
||||
# changes are stated explicitly to be from 1980-04-06 at 02:00 to
|
||||
# 1980-09-28 at 02:00. If this is true, this differs slightly from
|
||||
# the EU rule in that DST runs to 02:00, not 03:00. We don't know
|
||||
# when Denmark began using the EU rule correctly, but we have only
|
||||
# confirmation of the 1980-time, so I presume it was correct in 1981:
|
||||
# The law is about the management of the extra hour, concerning
|
||||
# working hours reported and effect on obligatory-rest rules (which
|
||||
# was suspended on that night):
|
||||
# https://web.archive.org/web/20140104053304/https://www.retsinformation.dk/Forms/R0710.aspx?id=60267
|
||||
|
||||
# From Jesper Nørgaard Welen (2005-06-11):
|
||||
# The Herning Folkeblad (1980-09-26) reported that the night between
|
||||
# Saturday and Sunday the clock is set back from three to two.
|
||||
|
||||
# From Paul Eggert (2005-06-11):
|
||||
# Hence the "02:00" of the 1980 law refers to standard time, not
|
||||
# wall-clock time, and so the EU rules were in effect in 1980.
|
||||
|
||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
||||
Rule Denmark 1916 only - May 14 23:00 1:00 S
|
||||
Rule Denmark 1916 only - Sep 30 23:00 0 -
|
||||
Rule Denmark 1940 only - May 15 0:00 1:00 S
|
||||
Rule Denmark 1945 only - Apr 2 2:00s 1:00 S
|
||||
Rule Denmark 1945 only - Aug 15 2:00s 0 -
|
||||
Rule Denmark 1946 only - May 1 2:00s 1:00 S
|
||||
Rule Denmark 1946 only - Sep 1 2:00s 0 -
|
||||
Rule Denmark 1947 only - May 4 2:00s 1:00 S
|
||||
Rule Denmark 1947 only - Aug 10 2:00s 0 -
|
||||
Rule Denmark 1948 only - May 9 2:00s 1:00 S
|
||||
Rule Denmark 1948 only - Aug 8 2:00s 0 -
|
||||
#
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Europe/Copenhagen 0:50:20 - LMT 1890
|
||||
0:50:20 - CMT 1894 Jan 1 # Copenhagen MT
|
||||
1:00 Denmark CE%sT 1942 Nov 2 2:00s
|
||||
1:00 C-Eur CE%sT 1945 Apr 2 2:00
|
||||
1:00 Denmark CE%sT 1980
|
||||
1:00 EU CE%sT
|
||||
Zone Atlantic/Faroe -0:27:04 - LMT 1908 Jan 11 # Tórshavn
|
||||
0:00 - WET 1981
|
||||
0:00 EU WE%sT
|
||||
@@ -1273,10 +1321,10 @@ Rule Finland 1942 only - Oct 4 1:00 0 -
|
||||
Rule Finland 1981 1982 - Mar lastSun 2:00 1:00 S
|
||||
Rule Finland 1981 1982 - Sep lastSun 3:00 0 -
|
||||
|
||||
# Milne says Helsinki (Helsingfors) time was 1:39:49.2 (official document).
|
||||
# Milne says Helsinki (Helsingfors) time was 1:39:49.2 (official document);
|
||||
# round to nearest.
|
||||
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
#STDOFF 1:39:49.2
|
||||
Zone Europe/Helsinki 1:39:49 - LMT 1878 May 31
|
||||
1:39:49 - HMT 1921 May # Helsinki Mean Time
|
||||
2:00 Finland EE%sT 1983
|
||||
@@ -1423,7 +1471,6 @@ Zone Europe/Paris 0:09:21 - LMT 1891 Mar 16
|
||||
0:00 France WE%sT 1945 Sep 16 3:00
|
||||
1:00 France CE%sT 1977
|
||||
1:00 EU CE%sT
|
||||
Link Europe/Paris Europe/Monaco
|
||||
|
||||
# Germany
|
||||
|
||||
@@ -1467,11 +1514,21 @@ Zone Europe/Berlin 0:53:28 - LMT 1893 Apr
|
||||
1:00 SovietZone CE%sT 1946
|
||||
1:00 Germany CE%sT 1980
|
||||
1:00 EU CE%sT
|
||||
Link Europe/Berlin Arctic/Longyearbyen
|
||||
Link Europe/Berlin Europe/Copenhagen
|
||||
Link Europe/Berlin Europe/Oslo
|
||||
Link Europe/Berlin Europe/Stockholm
|
||||
|
||||
# From Tobias Conradi (2011-09-12):
|
||||
# Büsingen <http://www.buesingen.de>, surrounded by the Swiss canton
|
||||
# Schaffhausen, did not start observing DST in 1980 as the rest of DE
|
||||
# (West Germany at that time) and DD (East Germany at that time) did.
|
||||
# DD merged into DE, the area is currently covered by code DE in ISO 3166-1,
|
||||
# which in turn is covered by the zone Europe/Berlin.
|
||||
#
|
||||
# Source for the time in Büsingen 1980:
|
||||
# http://www.srf.ch/player/video?id=c012c029-03b7-4c2b-9164-aa5902cd58d3
|
||||
|
||||
# From Arthur David Olson (2012-03-03):
|
||||
# Büsingen and Zurich have shared clocks since 1970.
|
||||
|
||||
Link Europe/Zurich Europe/Busingen
|
||||
|
||||
# Georgia
|
||||
# Please see the "asia" file for Asia/Tbilisi.
|
||||
@@ -1480,7 +1537,7 @@ Link Europe/Berlin Europe/Stockholm
|
||||
|
||||
# Gibraltar
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Europe/Gibraltar -0:21:24 - LMT 1880 Aug 2
|
||||
Zone Europe/Gibraltar -0:21:24 - LMT 1880 Aug 2 0:00s
|
||||
0:00 GB-Eire %s 1957 Apr 14 2:00
|
||||
1:00 - CET 1982
|
||||
1:00 EU CE%sT
|
||||
@@ -1591,7 +1648,62 @@ Zone Europe/Budapest 1:16:20 - LMT 1890 Nov 1
|
||||
1:00 EU CE%sT
|
||||
|
||||
# Iceland
|
||||
# See Africa/Abidjan.
|
||||
#
|
||||
# From Adam David (1993-11-06):
|
||||
# The name of the timezone in Iceland for system / mail / news purposes is GMT.
|
||||
#
|
||||
# (1993-12-05):
|
||||
# This material is paraphrased from the 1988 edition of the University of
|
||||
# Iceland Almanak.
|
||||
#
|
||||
# From January 1st, 1908 the whole of Iceland was standardised at 1 hour
|
||||
# behind GMT. Previously, local mean solar time was used in different parts
|
||||
# of Iceland, the almanak had been based on Reykjavík mean solar time which
|
||||
# was 1 hour and 28 minutes behind GMT.
|
||||
#
|
||||
# "first day of winter" referred to [below] means the first day of the 26 weeks
|
||||
# of winter, according to the old icelandic calendar that dates back to the
|
||||
# time the norsemen first settled Iceland. The first day of winter is always
|
||||
# Saturday, but is not dependent on the Julian or Gregorian calendars.
|
||||
#
|
||||
# (1993-12-10):
|
||||
# I have a reference from the Oxford Icelandic-English dictionary for the
|
||||
# beginning of winter, which ties it to the ecclesiastical calendar (and thus
|
||||
# to the julian/gregorian calendar) over the period in question.
|
||||
# the winter begins on the Saturday next before St. Luke's day
|
||||
# (old style), or on St. Luke's day, if a Saturday.
|
||||
# St. Luke's day ought to be traceable from ecclesiastical sources. "old style"
|
||||
# might be a reference to the Julian calendar as opposed to Gregorian, or it
|
||||
# might mean something else (???).
|
||||
#
|
||||
# From Paul Eggert (2014-11-22):
|
||||
# The information below is taken from the 1988 Almanak; see
|
||||
# http://www.almanak.hi.is/klukkan.html
|
||||
#
|
||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
||||
Rule Iceland 1917 1919 - Feb 19 23:00 1:00 -
|
||||
Rule Iceland 1917 only - Oct 21 1:00 0 -
|
||||
Rule Iceland 1918 1919 - Nov 16 1:00 0 -
|
||||
Rule Iceland 1921 only - Mar 19 23:00 1:00 -
|
||||
Rule Iceland 1921 only - Jun 23 1:00 0 -
|
||||
Rule Iceland 1939 only - Apr 29 23:00 1:00 -
|
||||
Rule Iceland 1939 only - Oct 29 2:00 0 -
|
||||
Rule Iceland 1940 only - Feb 25 2:00 1:00 -
|
||||
Rule Iceland 1940 1941 - Nov Sun>=2 1:00s 0 -
|
||||
Rule Iceland 1941 1942 - Mar Sun>=2 1:00s 1:00 -
|
||||
# 1943-1946 - first Sunday in March until first Sunday in winter
|
||||
Rule Iceland 1943 1946 - Mar Sun>=1 1:00s 1:00 -
|
||||
Rule Iceland 1942 1948 - Oct Sun>=22 1:00s 0 -
|
||||
# 1947-1967 - first Sunday in April until first Sunday in winter
|
||||
Rule Iceland 1947 1967 - Apr Sun>=1 1:00s 1:00 -
|
||||
# 1949 and 1967 Oct transitions delayed by 1 week
|
||||
Rule Iceland 1949 only - Oct 30 1:00s 0 -
|
||||
Rule Iceland 1950 1966 - Oct Sun>=22 1:00s 0 -
|
||||
Rule Iceland 1967 only - Oct 29 1:00s 0 -
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Atlantic/Reykjavik -1:28 - LMT 1908
|
||||
-1:00 Iceland -01/+00 1968 Apr 7 1:00s
|
||||
0:00 - GMT
|
||||
|
||||
# Italy
|
||||
#
|
||||
@@ -1707,19 +1819,19 @@ Rule Italy 1978 only - Oct 1 0:00s 0 -
|
||||
Rule Italy 1979 only - Sep 30 0:00s 0 -
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Europe/Rome 0:49:56 - LMT 1866 Dec 12
|
||||
0:49:56 - RMT 1893 Oct 31 23:00u # Rome Mean
|
||||
0:49:56 - RMT 1893 Oct 31 23:49:56 # Rome Mean
|
||||
1:00 Italy CE%sT 1943 Sep 10
|
||||
1:00 C-Eur CE%sT 1944 Jun 4
|
||||
1:00 Italy CE%sT 1980
|
||||
1:00 EU CE%sT
|
||||
Link Europe/Rome Europe/Vatican
|
||||
Link Europe/Rome Europe/San_Marino
|
||||
|
||||
|
||||
# Kosovo
|
||||
# See Europe/Belgrade.
|
||||
|
||||
|
||||
Link Europe/Rome Europe/Vatican
|
||||
Link Europe/Rome Europe/San_Marino
|
||||
|
||||
# Latvia
|
||||
|
||||
# From Liene Kanepe (1998-09-17):
|
||||
@@ -1803,7 +1915,16 @@ Zone Europe/Riga 1:36:34 - LMT 1880
|
||||
2:00 EU EE%sT
|
||||
|
||||
# Liechtenstein
|
||||
# See Europe/Zurich.
|
||||
|
||||
# From Paul Eggert (2013-09-09):
|
||||
# Shanks & Pottenger say Vaduz is like Zurich.
|
||||
|
||||
# From Alois Treindl (2019-07-04):
|
||||
# I was able to access the online archive of the Vaduz paper Vaterland ...
|
||||
# I could confirm from the paper that Liechtenstein did in fact follow
|
||||
# the same DST in 1941 and 1942 as Switzerland did.
|
||||
|
||||
Link Europe/Zurich Europe/Vaduz
|
||||
|
||||
|
||||
# Lithuania
|
||||
@@ -1859,7 +1980,40 @@ Zone Europe/Vilnius 1:41:16 - LMT 1880
|
||||
2:00 EU EE%sT
|
||||
|
||||
# Luxembourg
|
||||
# See Europe/Brussels.
|
||||
# Whitman disagrees with most of these dates in minor ways;
|
||||
# go with Shanks & Pottenger.
|
||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
||||
Rule Lux 1916 only - May 14 23:00 1:00 S
|
||||
Rule Lux 1916 only - Oct 1 1:00 0 -
|
||||
Rule Lux 1917 only - Apr 28 23:00 1:00 S
|
||||
Rule Lux 1917 only - Sep 17 1:00 0 -
|
||||
Rule Lux 1918 only - Apr Mon>=15 2:00s 1:00 S
|
||||
Rule Lux 1918 only - Sep Mon>=15 2:00s 0 -
|
||||
Rule Lux 1919 only - Mar 1 23:00 1:00 S
|
||||
Rule Lux 1919 only - Oct 5 3:00 0 -
|
||||
Rule Lux 1920 only - Feb 14 23:00 1:00 S
|
||||
Rule Lux 1920 only - Oct 24 2:00 0 -
|
||||
Rule Lux 1921 only - Mar 14 23:00 1:00 S
|
||||
Rule Lux 1921 only - Oct 26 2:00 0 -
|
||||
Rule Lux 1922 only - Mar 25 23:00 1:00 S
|
||||
Rule Lux 1922 only - Oct Sun>=2 1:00 0 -
|
||||
Rule Lux 1923 only - Apr 21 23:00 1:00 S
|
||||
Rule Lux 1923 only - Oct Sun>=2 2:00 0 -
|
||||
Rule Lux 1924 only - Mar 29 23:00 1:00 S
|
||||
Rule Lux 1924 1928 - Oct Sun>=2 1:00 0 -
|
||||
Rule Lux 1925 only - Apr 5 23:00 1:00 S
|
||||
Rule Lux 1926 only - Apr 17 23:00 1:00 S
|
||||
Rule Lux 1927 only - Apr 9 23:00 1:00 S
|
||||
Rule Lux 1928 only - Apr 14 23:00 1:00 S
|
||||
Rule Lux 1929 only - Apr 20 23:00 1:00 S
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Europe/Luxembourg 0:24:36 - LMT 1904 Jun
|
||||
1:00 Lux CE%sT 1918 Nov 25
|
||||
0:00 Lux WE%sT 1929 Oct 6 2:00s
|
||||
0:00 Belgium WE%sT 1940 May 14 3:00
|
||||
1:00 C-Eur WE%sT 1944 Sep 18 3:00
|
||||
1:00 Belgium CE%sT 1977
|
||||
1:00 EU CE%sT
|
||||
|
||||
# North Macedonia
|
||||
# See Europe/Belgrade.
|
||||
@@ -1878,7 +2032,7 @@ Rule Malta 1975 1979 - Apr Sun>=15 2:00 1:00 S
|
||||
Rule Malta 1975 1980 - Sep Sun>=15 2:00 0 -
|
||||
Rule Malta 1980 only - Mar 31 2:00 1:00 S
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Europe/Malta 0:58:04 - LMT 1893 Nov 2 # Valletta
|
||||
Zone Europe/Malta 0:58:04 - LMT 1893 Nov 2 0:00s # Valletta
|
||||
1:00 Italy CE%sT 1973 Mar 31
|
||||
1:00 Malta CE%sT 1981
|
||||
1:00 EU CE%sT
|
||||
@@ -1960,16 +2114,126 @@ Zone Europe/Chisinau 1:55:20 - LMT 1880
|
||||
2:00 Moldova EE%sT
|
||||
|
||||
# Monaco
|
||||
# See Europe/Paris.
|
||||
#
|
||||
# From Michael Deckers (2020-06-12):
|
||||
# In the "Journal de Monaco" of 1892-05-24, online at
|
||||
# https://journaldemonaco.gouv.mc/var/jdm/storage/original/application/b1c67c12c5af11b41ea888fb048e4fe8.pdf
|
||||
# we read: ...
|
||||
# [In virtue of a Sovereign Ordinance of the May 13 of the current [year],
|
||||
# legal time in the Principality will be set to, from the date of June 1,
|
||||
# 1892 onwards, to the meridian of Paris, as in France.]
|
||||
# In the "Journal de Monaco" of 1911-03-28, online at
|
||||
# https://journaldemonaco.gouv.mc/var/jdm/storage/original/application/de74ffb7db53d4f599059fe8f0ed482a.pdf
|
||||
# we read an ordinance of 1911-03-16: ...
|
||||
# [Legal time in the Principality will be set, from the date of promulgation
|
||||
# of the present ordinance, to legal time in France.... Consequently, legal
|
||||
# time will be retarded by 9 minutes and 21 seconds.]
|
||||
#
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Europe/Monaco 0:29:32 - LMT 1892 Jun 1
|
||||
0:09:21 - PMT 1911 Mar 29 # Paris Mean Time
|
||||
0:00 France WE%sT 1945 Sep 16 3:00
|
||||
1:00 France CE%sT 1977
|
||||
1:00 EU CE%sT
|
||||
|
||||
# Montenegro
|
||||
# See Europe/Belgrade.
|
||||
|
||||
# Netherlands
|
||||
# See Europe/Brussels.
|
||||
|
||||
# Howse writes that the Netherlands' railways used GMT between 1892 and 1940,
|
||||
# but for other purposes the Netherlands used Amsterdam mean time.
|
||||
|
||||
# However, Robert H. van Gent writes (2001-04-01):
|
||||
# Howse's statement is only correct up to 1909. From 1909-05-01 (00:00:00
|
||||
# Amsterdam mean time) onwards, the whole of the Netherlands (including
|
||||
# the Dutch railways) was required by law to observe Amsterdam mean time
|
||||
# (19 minutes 32.13 seconds ahead of GMT). This had already been the
|
||||
# common practice (except for the railways) for many decades but it was
|
||||
# not until 1909 when the Dutch government finally defined this by law.
|
||||
# On 1937-07-01 this was changed to 20 minutes (exactly) ahead of GMT and
|
||||
# was generally known as Dutch Time ("Nederlandse Tijd").
|
||||
#
|
||||
# (2001-04-08):
|
||||
# 1892-05-01 was the date when the Dutch railways were by law required to
|
||||
# observe GMT while the remainder of the Netherlands adhered to the common
|
||||
# practice of following Amsterdam mean time.
|
||||
#
|
||||
# (2001-04-09):
|
||||
# In 1835 the authorities of the province of North Holland requested the
|
||||
# municipal authorities of the towns and cities in the province to observe
|
||||
# Amsterdam mean time but I do not know in how many cases this request was
|
||||
# actually followed.
|
||||
#
|
||||
# From 1852 onwards the Dutch telegraph offices were by law required to
|
||||
# observe Amsterdam mean time. As the time signals from the observatory of
|
||||
# Leiden were also distributed by the telegraph system, I assume that most
|
||||
# places linked up with the telegraph (and railway) system automatically
|
||||
# adopted Amsterdam mean time.
|
||||
#
|
||||
# Although the early Dutch railway companies initially observed a variety
|
||||
# of times, most of them had adopted Amsterdam mean time by 1858 but it
|
||||
# was not until 1866 when they were all required by law to observe
|
||||
# Amsterdam mean time.
|
||||
|
||||
# The data entries before 1945 are taken from
|
||||
# https://www.staff.science.uu.nl/~gent0113/wettijd/wettijd.htm
|
||||
|
||||
# From Paul Eggert (2021-05-09):
|
||||
# I invented the abbreviations AMT for Amsterdam Mean Time and NST for
|
||||
# Netherlands Summer Time, used in the Netherlands from 1835 to 1937.
|
||||
|
||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
||||
Rule Neth 1916 only - May 1 0:00 1:00 NST # Netherlands Summer Time
|
||||
Rule Neth 1916 only - Oct 1 0:00 0 AMT # Amsterdam Mean Time
|
||||
Rule Neth 1917 only - Apr 16 2:00s 1:00 NST
|
||||
Rule Neth 1917 only - Sep 17 2:00s 0 AMT
|
||||
Rule Neth 1918 1921 - Apr Mon>=1 2:00s 1:00 NST
|
||||
Rule Neth 1918 1921 - Sep lastMon 2:00s 0 AMT
|
||||
Rule Neth 1922 only - Mar lastSun 2:00s 1:00 NST
|
||||
Rule Neth 1922 1936 - Oct Sun>=2 2:00s 0 AMT
|
||||
Rule Neth 1923 only - Jun Fri>=1 2:00s 1:00 NST
|
||||
Rule Neth 1924 only - Mar lastSun 2:00s 1:00 NST
|
||||
Rule Neth 1925 only - Jun Fri>=1 2:00s 1:00 NST
|
||||
# From 1926 through 1939 DST began 05-15, except that it was delayed by a week
|
||||
# in years when 05-15 fell in the Pentecost weekend.
|
||||
Rule Neth 1926 1931 - May 15 2:00s 1:00 NST
|
||||
Rule Neth 1932 only - May 22 2:00s 1:00 NST
|
||||
Rule Neth 1933 1936 - May 15 2:00s 1:00 NST
|
||||
Rule Neth 1937 only - May 22 2:00s 1:00 NST
|
||||
Rule Neth 1937 only - Jul 1 0:00 1:00 S
|
||||
Rule Neth 1937 1939 - Oct Sun>=2 2:00s 0 -
|
||||
Rule Neth 1938 1939 - May 15 2:00s 1:00 S
|
||||
Rule Neth 1945 only - Apr 2 2:00s 1:00 S
|
||||
Rule Neth 1945 only - Sep 16 2:00s 0 -
|
||||
#
|
||||
# Amsterdam Mean Time was +00:19:32.13, but the .13 is omitted
|
||||
# below because the current format requires STDOFF to be an integer.
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Europe/Amsterdam 0:19:32 - LMT 1835
|
||||
0:19:32 Neth %s 1937 Jul 1
|
||||
0:20 Neth +0020/+0120 1940 May 16 0:00
|
||||
1:00 C-Eur CE%sT 1945 Apr 2 2:00
|
||||
1:00 Neth CE%sT 1977
|
||||
1:00 EU CE%sT
|
||||
|
||||
# Norway
|
||||
# See Europe/Berlin.
|
||||
# http://met.no/met/met_lex/q_u/sommertid.html (2004-01) agrees with Shanks &
|
||||
# Pottenger.
|
||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
||||
Rule Norway 1916 only - May 22 1:00 1:00 S
|
||||
Rule Norway 1916 only - Sep 30 0:00 0 -
|
||||
Rule Norway 1945 only - Apr 2 2:00s 1:00 S
|
||||
Rule Norway 1945 only - Oct 1 2:00s 0 -
|
||||
Rule Norway 1959 1964 - Mar Sun>=15 2:00s 1:00 S
|
||||
Rule Norway 1959 1965 - Sep Sun>=15 2:00s 0 -
|
||||
Rule Norway 1965 only - Apr 25 2:00s 1:00 S
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Europe/Oslo 0:43:00 - LMT 1895 Jan 1
|
||||
1:00 Norway CE%sT 1940 Aug 10 23:00
|
||||
1:00 C-Eur CE%sT 1945 Apr 2 2:00
|
||||
1:00 Norway CE%sT 1980
|
||||
1:00 EU CE%sT
|
||||
|
||||
# Svalbard & Jan Mayen
|
||||
|
||||
@@ -2016,9 +2280,9 @@ Zone Europe/Chisinau 1:55:20 - LMT 1880
|
||||
# the German armed forces at the Svalbard weather station code-named
|
||||
# Haudegen did not surrender to the Allies until September 1945.
|
||||
#
|
||||
# All these events predate our cutoff date of 1970, so use Europe/Berlin
|
||||
# All these events predate our cutoff date of 1970, so use Europe/Oslo
|
||||
# for these regions.
|
||||
|
||||
Link Europe/Oslo Arctic/Longyearbyen
|
||||
|
||||
# Poland
|
||||
|
||||
@@ -2072,6 +2336,7 @@ Zone Europe/Warsaw 1:24:00 - LMT 1880
|
||||
# According to a Portuguese decree (1911-05-26)
|
||||
# https://dre.pt/application/dir/pdf1sdip/1911/05/12500/23132313.pdf
|
||||
# Lisbon was at -0:36:44.68, but switched to GMT on 1912-01-01 at 00:00.
|
||||
# Round the old offset to -0:36:45. This agrees with Willett....
|
||||
#
|
||||
# From Michael Deckers (2018-02-15):
|
||||
# article 5 [of the 1911 decree; Deckers's translation] ...:
|
||||
@@ -2158,7 +2423,6 @@ Rule Port 1981 1982 - Mar lastSun 1:00s 1:00 S
|
||||
Rule Port 1983 only - Mar lastSun 2:00s 1:00 S
|
||||
#
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
#STDOFF -0:36:44.68
|
||||
Zone Europe/Lisbon -0:36:45 - LMT 1884
|
||||
-0:36:45 - LMT 1912 Jan 1 0:00u # Lisbon MT
|
||||
0:00 Port WE%sT 1966 Apr 3 2:00
|
||||
@@ -2167,13 +2431,9 @@ Zone Europe/Lisbon -0:36:45 - LMT 1884
|
||||
0:00 W-Eur WE%sT 1992 Sep 27 1:00s
|
||||
1:00 EU CE%sT 1996 Mar 31 1:00u
|
||||
0:00 EU WE%sT
|
||||
# This Zone can be simplified once we assume zic %z.
|
||||
Zone Atlantic/Azores -1:42:40 - LMT 1884 # Ponta Delgada
|
||||
-1:54:32 - HMT 1912 Jan 1 2:00u # Horta MT
|
||||
# Vanguard section, for zic and other parsers that support %z.
|
||||
# -2:00 Port %z 1966 Apr 3 2:00
|
||||
# -1:00 Port %z 1983 Sep 25 1:00s
|
||||
# -1:00 W-Eur %z 1992 Sep 27 1:00s
|
||||
# Rearguard section, for parsers lacking %z; see ziguard.awk.
|
||||
-2:00 Port -02/-01 1942 Apr 25 22:00s
|
||||
-2:00 Port +00 1942 Aug 15 22:00s
|
||||
-2:00 Port -02/-01 1943 Apr 17 22:00s
|
||||
@@ -2185,14 +2445,11 @@ Zone Atlantic/Azores -1:42:40 - LMT 1884 # Ponta Delgada
|
||||
-2:00 Port -02/-01 1966 Apr 3 2:00
|
||||
-1:00 Port -01/+00 1983 Sep 25 1:00s
|
||||
-1:00 W-Eur -01/+00 1992 Sep 27 1:00s
|
||||
# End of rearguard section.
|
||||
0:00 EU WE%sT 1993 Mar 28 1:00u
|
||||
-1:00 EU -01/+00
|
||||
# This Zone can be simplified once we assume zic %z.
|
||||
Zone Atlantic/Madeira -1:07:36 - LMT 1884 # Funchal
|
||||
-1:07:36 - FMT 1912 Jan 1 1:00u # Funchal MT
|
||||
# Vanguard section, for zic and other parsers that support %z.
|
||||
# -1:00 Port %z 1966 Apr 3 2:00
|
||||
# Rearguard section, for parsers lacking %z; see ziguard.awk.
|
||||
-1:00 Port -01/+00 1942 Apr 25 22:00s
|
||||
-1:00 Port +01 1942 Aug 15 22:00s
|
||||
-1:00 Port -01/+00 1943 Apr 17 22:00s
|
||||
@@ -2202,7 +2459,6 @@ Zone Atlantic/Madeira -1:07:36 - LMT 1884 # Funchal
|
||||
-1:00 Port -01/+00 1945 Apr 21 22:00s
|
||||
-1:00 Port +01 1945 Aug 25 22:00s
|
||||
-1:00 Port -01/+00 1966 Apr 3 2:00
|
||||
# End of rearguard section.
|
||||
0:00 Port WE%sT 1983 Sep 25 1:00s
|
||||
0:00 EU WE%sT
|
||||
|
||||
@@ -2621,19 +2877,20 @@ Zone Europe/Simferopol 2:16:24 - LMT 1880
|
||||
2:00 - EET 1992 Mar 20
|
||||
# Central Crimea used Moscow time 1994/1997.
|
||||
#
|
||||
# From Paul Eggert (2022-07-21):
|
||||
# The _Economist_ (1994-05-28, p 45) reported that central Crimea switched
|
||||
# from Kyiv to Moscow time sometime after the January 1994 elections.
|
||||
# From Paul Eggert (2006-03-22):
|
||||
# The _Economist_ (1994-05-28, p 45) reports that central Crimea switched
|
||||
# from Kiev to Moscow time sometime after the January 1994 elections.
|
||||
# Shanks (1999) says "date of change uncertain", but implies that it happened
|
||||
# sometime between the 1994 DST switches. Shanks & Pottenger simply say
|
||||
# 1994-09-25 03:00, but that can't be right. For now, guess it
|
||||
# changed in May. This change evidently didn't last long; see below.
|
||||
# changed in May.
|
||||
2:00 C-Eur EE%sT 1994 May
|
||||
# From IATA SSIM (1994/1997), which also said that Kerch is still like Kyiv.
|
||||
3:00 C-Eur MSK/MSD 1996 Mar 31 0:00s
|
||||
# From IATA SSIM (1994/1997), which also says that Kerch is still like Kiev.
|
||||
3:00 E-Eur MSK/MSD 1996 Mar 31 0:00s
|
||||
3:00 1:00 MSD 1996 Oct 27 3:00s
|
||||
# IATA SSIM (1997-09) said Crimea switched to EET/EEST.
|
||||
# IATA SSIM (1997-09) says Crimea switched to EET/EEST.
|
||||
# Assume it happened in March by not changing the clocks.
|
||||
3:00 Russia MSK/MSD 1997
|
||||
3:00 - MSK 1997 Mar lastSun 1:00u
|
||||
# From Alexander Krivenyshev (2014-03-17):
|
||||
# time change at 2:00 (2am) on March 30, 2014
|
||||
@@ -2802,12 +3059,11 @@ Zone Europe/Ulyanovsk 3:13:36 - LMT 1919 Jul 1 0:00u
|
||||
# Note: Effective 2005-12-01, (59) Perm Oblast and (81) Komi-Permyak
|
||||
# Autonomous Okrug merged to form (90, RU-PER) Perm Krai.
|
||||
|
||||
# Milne says Yekaterinburg was 4:02:32.9.
|
||||
# Milne says Yekaterinburg was 4:02:32.9; round to nearest.
|
||||
# Byalokoz 1919 says its provincial time was based on Perm, at 3:45:05.
|
||||
# Assume it switched on 1916-07-03, the time of the new standard.
|
||||
# The 1919 and 1930 transitions are from Shanks.
|
||||
|
||||
#STDOFF 4:02:32.9
|
||||
Zone Asia/Yekaterinburg 4:02:33 - LMT 1916 Jul 3
|
||||
3:45:05 - PMT 1919 Jul 15 4:00
|
||||
4:00 - +04 1930 Jun 21
|
||||
@@ -3119,8 +3375,8 @@ Zone Asia/Vladivostok 8:47:31 - LMT 1922 Nov 15
|
||||
# 14-28 **** Tomponsky District
|
||||
# 14-30 **** Ust-Maysky District
|
||||
|
||||
# From Arthur David Olson (2022-03-21):
|
||||
# Tomponsky and Ust-Maysky switched from Vladivostok time to Yakutsk time
|
||||
# From Arthur David Olson (2012-05-09):
|
||||
# Tomponskij and Ust'-Majskij switched from Vladivostok time to Yakutsk time
|
||||
# in 2011.
|
||||
|
||||
# From Paul Eggert (2012-11-25):
|
||||
@@ -3245,8 +3501,8 @@ Zone Asia/Srednekolymsk 10:14:52 - LMT 1924 May 2
|
||||
# Asia/Ust-Nera covers parts of (14, RU-SA) Sakha (Yakutia) Republic:
|
||||
# 14-22 **** Oymyakonsky District
|
||||
|
||||
# From Arthur David Olson (2022-03-21):
|
||||
# Oymyakonsky and the Kuril Islands switched from
|
||||
# From Arthur David Olson (2012-05-09):
|
||||
# Ojmyakonskij [and the Kuril Islands] switched from
|
||||
# Magadan time to Vladivostok time in 2011.
|
||||
#
|
||||
# From Tim Parenti (2014-07-06), per Alexander Krivenyshev (2014-07-02):
|
||||
@@ -3320,7 +3576,7 @@ Link Europe/Belgrade Europe/Skopje # North Macedonia
|
||||
Link Europe/Belgrade Europe/Zagreb # Croatia
|
||||
|
||||
# Slovakia
|
||||
# See Europe/Prague.
|
||||
Link Europe/Prague Europe/Bratislava
|
||||
|
||||
# Slovenia
|
||||
# See Europe/Belgrade.
|
||||
@@ -3409,7 +3665,7 @@ Rule SpainAfrica 1977 only - Sep 28 0:00 0 -
|
||||
Rule SpainAfrica 1978 only - Jun 1 0:00 1:00 S
|
||||
Rule SpainAfrica 1978 only - Aug 4 0:00 0 -
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Europe/Madrid -0:14:44 - LMT 1901 Jan 1 0:00u
|
||||
Zone Europe/Madrid -0:14:44 - LMT 1900 Dec 31 23:45:16
|
||||
0:00 Spain WE%sT 1940 Mar 16 23:00
|
||||
1:00 Spain CE%sT 1979
|
||||
1:00 EU CE%sT
|
||||
@@ -3431,7 +3687,61 @@ Zone Atlantic/Canary -1:01:36 - LMT 1922 Mar # Las Palmas de Gran C.
|
||||
# Ignore this for now, as the Canaries are part of the EU.
|
||||
|
||||
# Sweden
|
||||
# See Europe/Berlin.
|
||||
|
||||
# From Ivan Nilsson (2001-04-13), superseding Shanks & Pottenger:
|
||||
#
|
||||
# The law "Svensk författningssamling 1878, no 14" about standard time in 1879:
|
||||
# From the beginning of 1879 (that is 01-01 00:00) the time for all
|
||||
# places in the country is "the mean solar time for the meridian at
|
||||
# three degrees, or twelve minutes of time, to the west of the
|
||||
# meridian of the Observatory of Stockholm". The law is dated 1878-05-31.
|
||||
#
|
||||
# The observatory at that time had the meridian 18° 03' 30"
|
||||
# eastern longitude = 01:12:14 in time. Less 12 minutes gives the
|
||||
# national standard time as 01:00:14 ahead of GMT....
|
||||
#
|
||||
# About the beginning of CET in Sweden. The lawtext ("Svensk
|
||||
# författningssamling 1899, no 44") states, that "from the beginning
|
||||
# of 1900... ... the same as the mean solar time for the meridian at
|
||||
# the distance of one hour of time from the meridian of the English
|
||||
# observatory at Greenwich, or at 12 minutes 14 seconds to the west
|
||||
# from the meridian of the Observatory of Stockholm". The law is dated
|
||||
# 1899-06-16. In short: At 1900-01-01 00:00:00 the new standard time
|
||||
# in Sweden is 01:00:00 ahead of GMT.
|
||||
#
|
||||
# 1916: The lawtext ("Svensk författningssamling 1916, no 124") states
|
||||
# that "1916-05-15 is considered to begin one hour earlier". It is
|
||||
# pretty obvious that at 05-14 23:00 the clocks are set to 05-15 00:00....
|
||||
# Further the law says, that "1916-09-30 is considered to end one hour later".
|
||||
#
|
||||
# The laws regulating [DST] are available on the site of the Swedish
|
||||
# Parliament beginning with 1985 - the laws regulating 1980/1984 are
|
||||
# not available on the site (to my knowledge they are only available
|
||||
# in Swedish): <http://www.riksdagen.se/english/work/sfst.asp> (type
|
||||
# "sommartid" without the quotes in the field "Fritext" and then click
|
||||
# the Sök-button).
|
||||
#
|
||||
# (2001-05-13):
|
||||
#
|
||||
# I have now found a newspaper stating that at 1916-10-01 01:00
|
||||
# summertime the church-clocks etc were set back one hour to show
|
||||
# 1916-10-01 00:00 standard time. The article also reports that some
|
||||
# people thought the switch to standard time would take place already
|
||||
# at 1916-10-01 00:00 summer time, but they had to wait for another
|
||||
# hour before the event took place.
|
||||
#
|
||||
# Source: The newspaper "Dagens Nyheter", 1916-10-01, page 7 upper left.
|
||||
|
||||
# An extra-special abbreviation style is SET for Swedish Time (svensk
|
||||
# normaltid) 1879-1899, 3° west of the Stockholm Observatory.
|
||||
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Europe/Stockholm 1:12:12 - LMT 1879 Jan 1
|
||||
1:00:14 - SET 1900 Jan 1 # Swedish Time
|
||||
1:00 - CET 1916 May 14 23:00
|
||||
1:00 1:00 CEST 1916 Oct 1 1:00
|
||||
1:00 - CET 1980
|
||||
1:00 EU CE%sT
|
||||
|
||||
# Switzerland
|
||||
# From Howse:
|
||||
@@ -3525,19 +3835,6 @@ Zone Atlantic/Canary -1:01:36 - LMT 1922 Mar # Las Palmas de Gran C.
|
||||
# 1853-07-16, though it probably occurred at some other date in Zurich, and
|
||||
# legal civil time probably changed at still some other transition date.
|
||||
|
||||
# From Tobias Conradi (2011-09-12):
|
||||
# Büsingen <http://www.buesingen.de>, surrounded by the Swiss canton
|
||||
# Schaffhausen, did not start observing DST in 1980 as the rest of DE
|
||||
# (West Germany at that time) and DD (East Germany at that time) did.
|
||||
# DD merged into DE, the area is currently covered by code DE in ISO 3166-1,
|
||||
# which in turn is covered by the zone Europe/Berlin.
|
||||
#
|
||||
# Source for the time in Büsingen 1980:
|
||||
# http://www.srf.ch/player/video?id=c012c029-03b7-4c2b-9164-aa5902cd58d3
|
||||
#
|
||||
# From Arthur David Olson (2012-03-03):
|
||||
# Büsingen and Zurich have shared clocks since 1970.
|
||||
|
||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
||||
Rule Swiss 1941 1942 - May Mon>=1 1:00 1:00 S
|
||||
Rule Swiss 1941 1942 - Oct Mon>=1 2:00 0 -
|
||||
@@ -3546,9 +3843,6 @@ Zone Europe/Zurich 0:34:08 - LMT 1853 Jul 16 # See above comment.
|
||||
0:29:46 - BMT 1894 Jun # Bern Mean Time
|
||||
1:00 Swiss CE%sT 1981
|
||||
1:00 EU CE%sT
|
||||
Link Europe/Zurich Europe/Busingen
|
||||
Link Europe/Zurich Europe/Vaduz
|
||||
|
||||
|
||||
# Turkey
|
||||
|
||||
@@ -3757,7 +4051,7 @@ Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents.
|
||||
|
||||
# Ukraine
|
||||
#
|
||||
# From Alois Treindl (2014-03-01):
|
||||
# From Alois Triendl (2014-03-01):
|
||||
# REGULATION A N O V A on March 20, 1992 N 139 ... means that from
|
||||
# 1992 on, Ukraine had DST with begin time at 02:00 am, on last Sunday
|
||||
# in March, and end time 03:00 am, last Sunday in September....
|
||||
@@ -3817,7 +4111,7 @@ Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents.
|
||||
# The law documents themselves are at
|
||||
# http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484
|
||||
|
||||
# From Vladimir in Moscow via Alois Treindl re Kyiv time 1991/2 (2014-02-28):
|
||||
# From Vladimir in Moscow via Alois Treindl re Kiev time 1991/2 (2014-02-28):
|
||||
# First in Ukraine they changed Time zone from UTC+3 to UTC+2 with DST:
|
||||
# 03 25 1990 02:00 -03.00 1 Time Zone 3 with DST
|
||||
# 07 01 1990 02:00 -02.00 1 Time Zone 2 with DST
|
||||
@@ -3845,23 +4139,23 @@ Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents.
|
||||
# * Ukrainian Government's Resolution of 20.03.1992, No. 139.
|
||||
# http://www.uazakon.com/documents/date_8u/pg_grcasa.htm
|
||||
|
||||
# From Paul Eggert (2022-04-12):
|
||||
# From Paul Eggert (2018-10-03):
|
||||
# As is usual in tzdb, Ukrainian zones use the most common English spellings.
|
||||
# In particular, tzdb's name Europe/Kyiv uses the most common spelling in
|
||||
# English for Ukraine's capital. Although tzdb's former name was Europe/Kiev,
|
||||
# "Kyiv" is now more common due to widespread reporting of the current conflict.
|
||||
# Conversely, tzdb continues to use the names Europe/Uzhgorod and
|
||||
# Europe/Zaporozhye; this is similar to tzdb's use of Europe/Prague, which is
|
||||
# certainly wrong as a transliteration of the Czech "Praha".
|
||||
# English-language spelling of Ukrainian names is in flux, and
|
||||
# some day "Uzhhorod" or "Zaporizhzhia" may become substantially more
|
||||
# common in English; in the meantime, do not change these
|
||||
# English spellings as that means less disruption for our users.
|
||||
# For example, tzdb uses Europe/Kiev, as "Kiev" is the most common spelling in
|
||||
# English for Ukraine's capital, even though it is certainly wrong as a
|
||||
# transliteration of the Ukrainian "Київ". This is similar to tzdb's use of
|
||||
# Europe/Prague, which is certainly wrong as a transliteration of the Czech
|
||||
# "Praha". ("Kiev" came from old Slavic via Russian to English, and "Prague"
|
||||
# came from old Slavic via French to English, so the two cases have something
|
||||
# in common.) Admittedly English-language spelling of Ukrainian names is
|
||||
# controversial, and some day "Kyiv" may become substantially more popular in
|
||||
# English; in the meantime, stick with the traditional English "Kiev" as that
|
||||
# means less disruption for our users.
|
||||
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
# This represents most of Ukraine. See above for the spelling of "Kyiv".
|
||||
Zone Europe/Kyiv 2:02:04 - LMT 1880
|
||||
2:02:04 - KMT 1924 May 2 # Kyiv Mean Time
|
||||
# This represents most of Ukraine. See above for the spelling of "Kiev".
|
||||
Zone Europe/Kiev 2:02:04 - LMT 1880
|
||||
2:02:04 - KMT 1924 May 2 # Kiev Mean Time
|
||||
2:00 - EET 1930 Jun 21
|
||||
3:00 - MSK 1941 Sep 20
|
||||
1:00 C-Eur CE%sT 1943 Nov 6
|
||||
@@ -3884,7 +4178,7 @@ Zone Europe/Uzhgorod 1:29:12 - LMT 1890 Oct
|
||||
2:00 C-Eur EE%sT 1996 May 13
|
||||
2:00 EU EE%sT
|
||||
# Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.
|
||||
# "Zaporizhzhia" is the transliteration of the Ukrainian name, but
|
||||
# "Zaporizhia" is the transliteration of the Ukrainian name, but
|
||||
# "Zaporozh'ye" is more common in English. Use the common English
|
||||
# spelling, except omit the apostrophe as it is not allowed in
|
||||
# portable Posix file names.
|
||||
|
||||
@@ -95,11 +95,11 @@ Leap 2016 Dec 31 23:59:60 + S
|
||||
# Any additional leap seconds will come after this.
|
||||
# This Expires line is commented out for now,
|
||||
# so that pre-2020a zic implementations do not reject this file.
|
||||
#Expires 2023 Jun 28 00:00:00
|
||||
#Expires 2022 Dec 28 00:00:00
|
||||
|
||||
# POSIX timestamps for the data in this file:
|
||||
#updated 1467936000 (2016-07-08 00:00:00 UTC)
|
||||
#expires 1687910400 (2023-06-28 00:00:00 UTC)
|
||||
#expires 1672185600 (2022-12-28 00:00:00 UTC)
|
||||
|
||||
# Updated through IERS Bulletin C64
|
||||
# File expires on: 28 June 2023
|
||||
# Updated through IERS Bulletin C63
|
||||
# File expires on: 28 December 2022
|
||||
|
||||
@@ -367,7 +367,8 @@ Zone PST8PDT -8:00 US P%sT
|
||||
# From Paul Eggert (2014-09-06):
|
||||
# Monthly Notices of the Royal Astronomical Society 44, 4 (1884-02-08), 208
|
||||
# says that New York City Hall time was 3 minutes 58.4 seconds fast of
|
||||
# Eastern time (i.e., -4:56:01.6) just before the 1883 switch.
|
||||
# Eastern time (i.e., -4:56:01.6) just before the 1883 switch. Round to the
|
||||
# nearest second.
|
||||
|
||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER
|
||||
Rule NYC 1920 only - Mar lastSun 2:00 1:00 D
|
||||
@@ -376,8 +377,7 @@ Rule NYC 1921 1966 - Apr lastSun 2:00 1:00 D
|
||||
Rule NYC 1921 1954 - Sep lastSun 2:00 0 S
|
||||
Rule NYC 1955 1966 - Oct lastSun 2:00 0 S
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
#STDOFF -4:56:01.6
|
||||
Zone America/New_York -4:56:02 - LMT 1883 Nov 18 17:00u
|
||||
Zone America/New_York -4:56:02 - LMT 1883 Nov 18 12:03:58
|
||||
-5:00 US E%sT 1920
|
||||
-5:00 NYC E%sT 1942
|
||||
-5:00 US E%sT 1946
|
||||
@@ -2841,7 +2841,7 @@ Zone America/Tijuana -7:48:04 - LMT 1922 Jan 1 0:11:56
|
||||
|
||||
# Barbados
|
||||
|
||||
# For 1899 Milne gives -3:58:29.2.
|
||||
# For 1899 Milne gives -3:58:29.2; round that.
|
||||
|
||||
# From P Chan (2020-12-09 and 2020-12-11):
|
||||
# Standard time of GMT-4 was adopted in 1911.
|
||||
@@ -2885,7 +2885,6 @@ Rule Barb 1978 1980 - Apr Sun>=15 2:00 1:00 D
|
||||
Rule Barb 1979 only - Sep 30 2:00 0 S
|
||||
Rule Barb 1980 only - Sep 25 2:00 0 S
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
#STDOFF -3:58:29.2
|
||||
Zone America/Barbados -3:58:29 - LMT 1911 Aug 28 # Bridgetown
|
||||
-4:00 Barb A%sT 1944
|
||||
-4:00 Barb AST/-0330 1945
|
||||
@@ -2946,10 +2945,10 @@ Zone America/Belize -5:52:48 - LMT 1912 Apr 1
|
||||
|
||||
# Bermuda
|
||||
|
||||
# From Paul Eggert (2022-07-27):
|
||||
# From Paul Eggert (2020-11-24):
|
||||
# For 1899 Milne gives -4:19:18.3 as the meridian of the clock tower,
|
||||
# Bermuda dockyard, Ireland I. This agrees with standard offset given in the
|
||||
# Daylight Saving Act, 1917 cited below.
|
||||
# Daylight Saving Act, 1917 cited below. Round that to the nearest second.
|
||||
# It is not known when this time became standard for Bermuda; guess 1890.
|
||||
# The transition to -04 was specified by:
|
||||
# 1930: The Time Zone Act, 1929 (1929: No. 39) [1929-11-08]
|
||||
@@ -3044,7 +3043,6 @@ Rule Bermuda 1956 only - May Sun>=22 2:00 1:00 D
|
||||
Rule Bermuda 1956 only - Oct lastSun 2:00 0 S
|
||||
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
#STDOFF -4:19:18.3
|
||||
Zone Atlantic/Bermuda -4:19:18 - LMT 1890 # Hamilton
|
||||
-4:19:18 Bermuda BMT/BST 1930 Jan 1 2:00
|
||||
-4:00 Bermuda A%sT 1974 Apr 28 2:00
|
||||
@@ -3059,7 +3057,7 @@ Zone Atlantic/Bermuda -4:19:18 - LMT 1890 # Hamilton
|
||||
|
||||
# Costa Rica
|
||||
|
||||
# Milne gives -5:36:13.3 as San José mean time.
|
||||
# Milne gives -5:36:13.3 as San José mean time; round to nearest.
|
||||
|
||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
||||
Rule CR 1979 1980 - Feb lastSun 0:00 1:00 D
|
||||
@@ -3071,7 +3069,6 @@ Rule CR 1991 only - Jul 1 0:00 0 S
|
||||
Rule CR 1992 only - Mar 15 0:00 0 S
|
||||
# There are too many San Josés elsewhere, so we'll use 'Costa Rica'.
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
#STDOFF -5:36:13.3
|
||||
Zone America/Costa_Rica -5:36:13 - LMT 1890 # San José
|
||||
-5:36:13 - SJMT 1921 Jan 15 # San José Mean Time
|
||||
-6:00 CR C%sT
|
||||
@@ -3494,7 +3491,7 @@ Zone America/Tegucigalpa -5:48:52 - LMT 1921 Apr
|
||||
# Jamaica
|
||||
# Shanks & Pottenger give -5:07:12, but Milne records -5:07:10.41 from an
|
||||
# unspecified official document, and says "This time is used throughout the
|
||||
# island". Go with Milne.
|
||||
# island". Go with Milne. Round to the nearest second as required by zic.
|
||||
#
|
||||
# Shanks & Pottenger give April 28 for the 1974 spring-forward transition, but
|
||||
# Lance Neita writes that Prime Minister Michael Manley decreed it January 5.
|
||||
@@ -3507,7 +3504,6 @@ Zone America/Tegucigalpa -5:48:52 - LMT 1921 Apr
|
||||
# http://www.jamaicaobserver.com/columns/The-politician-in-all-of-us_17573647
|
||||
#
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
#STDOFF -5:07:10.41
|
||||
Zone America/Jamaica -5:07:10 - LMT 1890 # Kingston
|
||||
-5:07:10 - KMT 1912 Feb # Kingston Mean Time
|
||||
-5:00 - EST 1974
|
||||
@@ -3705,7 +3701,6 @@ Zone America/Miquelon -3:44:40 - LMT 1911 May 15 # St Pierre
|
||||
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone America/Grand_Turk -4:44:32 - LMT 1890
|
||||
#STDOFF -5:07:10.41
|
||||
-5:07:10 - KMT 1912 Feb # Kingston Mean Time
|
||||
-5:00 - EST 1979
|
||||
-5:00 US E%sT 2015 Mar 8 2:00
|
||||
|
||||
@@ -423,7 +423,6 @@ Rule Arg 2008 only - Oct Sun>=15 0:00 1:00 -
|
||||
#
|
||||
# Buenos Aires (BA), Capital Federal (CF),
|
||||
Zone America/Argentina/Buenos_Aires -3:53:48 - LMT 1894 Oct 31
|
||||
#STDOFF -4:16:48.25
|
||||
-4:16:48 - CMT 1920 May # Córdoba Mean Time
|
||||
-4:00 - -04 1930 Dec
|
||||
-4:00 Arg -04/-03 1969 Oct 5
|
||||
@@ -441,7 +440,6 @@ Zone America/Argentina/Buenos_Aires -3:53:48 - LMT 1894 Oct 31
|
||||
# - Santiago del Estero switched to -4:00 on 1991-04-01,
|
||||
# then to -3:00 on 1991-04-26.
|
||||
#
|
||||
#STDOFF -4:16:48.25
|
||||
Zone America/Argentina/Cordoba -4:16:48 - LMT 1894 Oct 31
|
||||
-4:16:48 - CMT 1920 May
|
||||
-4:00 - -04 1930 Dec
|
||||
@@ -454,7 +452,6 @@ Zone America/Argentina/Cordoba -4:16:48 - LMT 1894 Oct 31
|
||||
#
|
||||
# Salta (SA), La Pampa (LP), Neuquén (NQ), Rio Negro (RN)
|
||||
Zone America/Argentina/Salta -4:21:40 - LMT 1894 Oct 31
|
||||
#STDOFF -4:16:48.25
|
||||
-4:16:48 - CMT 1920 May
|
||||
-4:00 - -04 1930 Dec
|
||||
-4:00 Arg -04/-03 1969 Oct 5
|
||||
@@ -467,7 +464,6 @@ Zone America/Argentina/Salta -4:21:40 - LMT 1894 Oct 31
|
||||
#
|
||||
# Tucumán (TM)
|
||||
Zone America/Argentina/Tucuman -4:20:52 - LMT 1894 Oct 31
|
||||
#STDOFF -4:16:48.25
|
||||
-4:16:48 - CMT 1920 May
|
||||
-4:00 - -04 1930 Dec
|
||||
-4:00 Arg -04/-03 1969 Oct 5
|
||||
@@ -481,7 +477,6 @@ Zone America/Argentina/Tucuman -4:20:52 - LMT 1894 Oct 31
|
||||
#
|
||||
# La Rioja (LR)
|
||||
Zone America/Argentina/La_Rioja -4:27:24 - LMT 1894 Oct 31
|
||||
#STDOFF -4:16:48.25
|
||||
-4:16:48 - CMT 1920 May
|
||||
-4:00 - -04 1930 Dec
|
||||
-4:00 Arg -04/-03 1969 Oct 5
|
||||
@@ -496,7 +491,6 @@ Zone America/Argentina/La_Rioja -4:27:24 - LMT 1894 Oct 31
|
||||
#
|
||||
# San Juan (SJ)
|
||||
Zone America/Argentina/San_Juan -4:34:04 - LMT 1894 Oct 31
|
||||
#STDOFF -4:16:48.25
|
||||
-4:16:48 - CMT 1920 May
|
||||
-4:00 - -04 1930 Dec
|
||||
-4:00 Arg -04/-03 1969 Oct 5
|
||||
@@ -511,7 +505,6 @@ Zone America/Argentina/San_Juan -4:34:04 - LMT 1894 Oct 31
|
||||
#
|
||||
# Jujuy (JY)
|
||||
Zone America/Argentina/Jujuy -4:21:12 - LMT 1894 Oct 31
|
||||
#STDOFF -4:16:48.25
|
||||
-4:16:48 - CMT 1920 May
|
||||
-4:00 - -04 1930 Dec
|
||||
-4:00 Arg -04/-03 1969 Oct 5
|
||||
@@ -527,7 +520,6 @@ Zone America/Argentina/Jujuy -4:21:12 - LMT 1894 Oct 31
|
||||
#
|
||||
# Catamarca (CT), Chubut (CH)
|
||||
Zone America/Argentina/Catamarca -4:23:08 - LMT 1894 Oct 31
|
||||
#STDOFF -4:16:48.25
|
||||
-4:16:48 - CMT 1920 May
|
||||
-4:00 - -04 1930 Dec
|
||||
-4:00 Arg -04/-03 1969 Oct 5
|
||||
@@ -542,7 +534,6 @@ Zone America/Argentina/Catamarca -4:23:08 - LMT 1894 Oct 31
|
||||
#
|
||||
# Mendoza (MZ)
|
||||
Zone America/Argentina/Mendoza -4:35:16 - LMT 1894 Oct 31
|
||||
#STDOFF -4:16:48.25
|
||||
-4:16:48 - CMT 1920 May
|
||||
-4:00 - -04 1930 Dec
|
||||
-4:00 Arg -04/-03 1969 Oct 5
|
||||
@@ -565,7 +556,6 @@ Rule SanLuis 2008 2009 - Mar Sun>=8 0:00 0 -
|
||||
Rule SanLuis 2007 2008 - Oct Sun>=8 0:00 1:00 -
|
||||
|
||||
Zone America/Argentina/San_Luis -4:25:24 - LMT 1894 Oct 31
|
||||
#STDOFF -4:16:48.25
|
||||
-4:16:48 - CMT 1920 May
|
||||
-4:00 - -04 1930 Dec
|
||||
-4:00 Arg -04/-03 1969 Oct 5
|
||||
@@ -584,7 +574,6 @@ Zone America/Argentina/San_Luis -4:25:24 - LMT 1894 Oct 31
|
||||
#
|
||||
# Santa Cruz (SC)
|
||||
Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 Oct 31
|
||||
#STDOFF -4:16:48.25
|
||||
-4:16:48 - CMT 1920 May
|
||||
-4:00 - -04 1930 Dec
|
||||
-4:00 Arg -04/-03 1969 Oct 5
|
||||
@@ -597,7 +586,6 @@ Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 Oct 31
|
||||
#
|
||||
# Tierra del Fuego, Antártida e Islas del Atlántico Sur (TF)
|
||||
Zone America/Argentina/Ushuaia -4:33:12 - LMT 1894 Oct 31
|
||||
#STDOFF -4:16:48.25
|
||||
-4:16:48 - CMT 1920 May
|
||||
-4:00 - -04 1930 Dec
|
||||
-4:00 Arg -04/-03 1969 Oct 5
|
||||
@@ -680,7 +668,7 @@ Zone America/La_Paz -4:32:36 - LMT 1890
|
||||
|
||||
# From Rodrigo Severo (2004-10-04):
|
||||
# It's just the biannual change made necessary by the much hyped, supposedly
|
||||
# modern Brazilian ... voting machines which, apparently, can't deal
|
||||
# modern Brazilian eletronic voting machines which, apparently, can't deal
|
||||
# with a time change between the first and the second rounds of the elections.
|
||||
|
||||
# From Steffen Thorsen (2007-09-20):
|
||||
@@ -1176,7 +1164,7 @@ Zone America/Rio_Branco -4:31:12 - LMT 1914
|
||||
# this is known to work for DST transitions starting in 2008 and
|
||||
# may well be true for earlier transitions.
|
||||
|
||||
# From Tim Parenti (2022-07-06):
|
||||
# From Tim Parenti (2022-03-15):
|
||||
# For a brief period of roughly six weeks in 1946, DST was only observed on an
|
||||
# emergency basis in specific regions of central Chile; namely, "the national
|
||||
# territory between the provinces of Coquimbo and Concepción, inclusive".
|
||||
@@ -1194,14 +1182,7 @@ Zone America/Rio_Branco -4:31:12 - LMT 1914
|
||||
# Law Number 8,522, promulgated 1946-08-27, reunified Chilean clocks at their
|
||||
# new "Summer Time" of -04, reckoned as that of "the meridian of the
|
||||
# Astronomical Observatory of Lo Espejo, advanced by 42 minutes and 45
|
||||
# seconds". Although this law specified the new Summer Time to start on 1
|
||||
# September each year, a special "transitional article" started it a few days
|
||||
# early, as soon as the law took effect. As the law was to take force "from
|
||||
# the date of its publication in the 'Diario Oficial', which happened the
|
||||
# following day, presume the change took place in Santiago and its environs
|
||||
# from 24:00 -03 to 23:00 -04 on Wednesday 1946-08-28. Although this was a
|
||||
# no-op for wall clocks in the north and south of the country, put their formal
|
||||
# start to DST an hour later when they reached 24:00 -04.
|
||||
# seconds".
|
||||
# https://www.diariooficial.interior.gob.cl/versiones-anteriores/do-h/19460828/#page/1
|
||||
# After a brief "Winter Time" stint at -05 beginning 1947-04-01, Law Number
|
||||
# 8,777, promulgated 1947-05-17, established year-round -04 "from 23:00 on the
|
||||
@@ -1321,19 +1302,11 @@ Zone America/Rio_Branco -4:31:12 - LMT 1914
|
||||
# So we extend the new rules on Saturdays at 24:00 mainland time indefinitely.
|
||||
# From Juan Correa (2019-02-04):
|
||||
# http://www.diariooficial.interior.gob.cl/publicaciones/2018/11/23/42212/01/1498738.pdf
|
||||
|
||||
# From Juan Correa (2022-04-02):
|
||||
# I found there was a decree published last Thursday that will keep
|
||||
# Magallanes region to UTC -3 "indefinitely". The decree is available at
|
||||
# https://www.diariooficial.interior.gob.cl/publicaciones/2022/03/31/43217-B/01/2108910.pdf
|
||||
|
||||
# From Juan Correa (2022-08-09):
|
||||
# the Internal Affairs Ministry (Ministerio del Interior) informed DST
|
||||
# for America/Santiago will start on midnight of September 11th;
|
||||
# and will end on April 1st, 2023. Magallanes region (America/Punta_Arenas)
|
||||
# will keep UTC -3 "indefinitely"... This is because on September 4th
|
||||
# we will have a voting whether to approve a new Constitution....
|
||||
# https://www.interior.gob.cl/noticias/2022/08/09/comunicado-el-proximo-sabado-10-de-septiembre-los-relojes-se-deben-adelantar-una-hora/
|
||||
# From Paul Eggert (2019-09-01):
|
||||
# The above says the Magallanes exception expires 2022-04-02 at 24:00,
|
||||
# so in theory, they will revert to -04/-03 after that.
|
||||
# For now, assume that they will not revert,
|
||||
# since they have extended the expiration date once already.
|
||||
|
||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
||||
Rule Chile 1927 1931 - Sep 1 0:00 1:00 -
|
||||
@@ -1371,9 +1344,7 @@ Rule Chile 2012 2014 - Sep Sun>=2 4:00u 1:00 -
|
||||
Rule Chile 2016 2018 - May Sun>=9 3:00u 0 -
|
||||
Rule Chile 2016 2018 - Aug Sun>=9 4:00u 1:00 -
|
||||
Rule Chile 2019 max - Apr Sun>=2 3:00u 0 -
|
||||
Rule Chile 2019 2021 - Sep Sun>=2 4:00u 1:00 -
|
||||
Rule Chile 2022 only - Sep Sun>=9 4:00u 1:00 -
|
||||
Rule Chile 2023 max - Sep Sun>=2 4:00u 1:00 -
|
||||
Rule Chile 2019 max - Sep Sun>=2 4:00u 1:00 -
|
||||
# IATA SSIM anomalies: (1992-02) says 1992-03-14;
|
||||
# (1996-09) says 1998-03-08. Ignore these.
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
@@ -1386,9 +1357,9 @@ Zone America/Santiago -4:42:45 - LMT 1890
|
||||
-5:00 Chile -05/-04 1932 Sep 1
|
||||
-4:00 - -04 1942 Jun 1
|
||||
-5:00 - -05 1942 Aug 1
|
||||
-4:00 - -04 1946 Jul 14 24:00
|
||||
-4:00 1:00 -03 1946 Aug 28 24:00 # central CL
|
||||
-5:00 1:00 -04 1947 Mar 31 24:00
|
||||
-4:00 - -04 1946 Jul 15
|
||||
-4:00 1:00 -03 1946 Sep 1 # central Chile
|
||||
-4:00 - -04 1947 Apr 1
|
||||
-5:00 - -05 1947 May 21 23:00
|
||||
-4:00 Chile -04/-03
|
||||
Zone America/Punta_Arenas -4:43:40 - LMT 1890
|
||||
@@ -1400,8 +1371,7 @@ Zone America/Punta_Arenas -4:43:40 - LMT 1890
|
||||
-5:00 Chile -05/-04 1932 Sep 1
|
||||
-4:00 - -04 1942 Jun 1
|
||||
-5:00 - -05 1942 Aug 1
|
||||
-4:00 - -04 1946 Aug 28 24:00
|
||||
-5:00 1:00 -04 1947 Mar 31 24:00
|
||||
-4:00 - -04 1947 Apr 1
|
||||
-5:00 - -05 1947 May 21 23:00
|
||||
-4:00 Chile -04/-03 2016 Dec 4
|
||||
-3:00 - -03
|
||||
@@ -1435,14 +1405,13 @@ Zone Antarctica/Palmer 0 - -00 1965
|
||||
|
||||
# Colombia
|
||||
|
||||
# Milne gives 4:56:16.4 for Bogotá time in 1899. He writes,
|
||||
# Milne gives 4:56:16.4 for Bogotá time in 1899; round to nearest. He writes,
|
||||
# "A variation of fifteen minutes in the public clocks of Bogota is not rare."
|
||||
|
||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
||||
Rule CO 1992 only - May 3 0:00 1:00 -
|
||||
Rule CO 1993 only - Apr 4 0:00 0 -
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
#STDOFF -4:56:16.4
|
||||
Zone America/Bogota -4:56:16 - LMT 1884 Mar 13
|
||||
-4:56:16 - BMT 1914 Nov 23 # Bogotá Mean Time
|
||||
-5:00 CO -05/-04
|
||||
|
||||
@@ -153,7 +153,7 @@ CA +690650-1050310 America/Cambridge_Bay Mountain - NU (west)
|
||||
CA +6227-11421 America/Yellowknife Mountain - NT (central)
|
||||
CA +682059-1334300 America/Inuvik Mountain - NT (west)
|
||||
CA +4906-11631 America/Creston MST - BC (Creston)
|
||||
CA +5546-12014 America/Dawson_Creek MST - BC (Dawson Cr, Ft St John)
|
||||
CA +5946-12014 America/Dawson_Creek MST - BC (Dawson Cr, Ft St John)
|
||||
CA +5848-12242 America/Fort_Nelson MST - BC (Ft Nelson)
|
||||
CA +6043-13503 America/Whitehorse MST - Yukon (east)
|
||||
CA +6404-13925 America/Dawson MST - Yukon (west)
|
||||
@@ -423,7 +423,7 @@ TT +1039-06131 America/Port_of_Spain
|
||||
TV -0831+17913 Pacific/Funafuti
|
||||
TW +2503+12130 Asia/Taipei
|
||||
TZ -0648+03917 Africa/Dar_es_Salaam
|
||||
UA +5026+03031 Europe/Kyiv Ukraine (most areas)
|
||||
UA +5026+03031 Europe/Kiev Ukraine (most areas)
|
||||
UA +4837+02218 Europe/Uzhgorod Transcarpathia
|
||||
UA +4750+03510 Europe/Zaporozhye Zaporozhye and east Lugansk
|
||||
UG +0019+03225 Africa/Kampala
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 2019, 2020, 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
|
||||
@@ -28,19 +28,14 @@
|
||||
# suitable for building OpenJDK and OracleJDK. Needs to run in Cygwin or WSL.
|
||||
# erik.joelsson@oracle.com
|
||||
|
||||
usage_and_exit() {
|
||||
echo "Usage: createWindowsDevkit.sh <2019 | 2022>"
|
||||
exit 1
|
||||
}
|
||||
|
||||
if [ ! $# = 1 ]; then
|
||||
usage_and_exit
|
||||
fi
|
||||
|
||||
VS_VERSION="$1"
|
||||
|
||||
VS_VERSION="2019"
|
||||
VS_VERSION_NUM_NODOT="160"
|
||||
VS_DLL_VERSION="140"
|
||||
SDK_VERSION="10"
|
||||
SDK_FULL_VERSION="10.0.17763.0"
|
||||
MSVC_DIR="Microsoft.VC142.CRT"
|
||||
MSVC_FULL_VERSION="14.12.27508"
|
||||
REDIST_FULL_VERSION="14.20.27508"
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname $0)" > /dev/null && pwd)"
|
||||
BUILD_DIR="${SCRIPT_DIR}/../../build/devkit"
|
||||
@@ -71,33 +66,13 @@ fi
|
||||
|
||||
# Work around the insanely named ProgramFiles(x86) env variable
|
||||
PROGRAMFILES_X86="$($WINDOWS_PATH_TO_UNIX_PATH "$(cmd.exe /c set | sed -n 's/^ProgramFiles(x86)=//p' | tr -d '\r')")"
|
||||
PROGRAMFILES="$($WINDOWS_PATH_TO_UNIX_PATH "$PROGRAMFILES")"
|
||||
|
||||
case $VS_VERSION in
|
||||
2019)
|
||||
MSVC_PROGRAMFILES_DIR="${PROGRAMFILES_X86}"
|
||||
MSVC_CRT_DIR="Microsoft.VC142.CRT"
|
||||
VS_VERSION_NUM_NODOT="160"
|
||||
;;
|
||||
|
||||
2022)
|
||||
MSVC_PROGRAMFILES_DIR="${PROGRAMFILES}"
|
||||
MSVC_CRT_DIR="Microsoft.VC143.CRT"
|
||||
VS_VERSION_NUM_NODOT="170"
|
||||
;;
|
||||
*)
|
||||
echo "Unexpected VS version: $VS_VERSION"
|
||||
usage_and_exit
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
# Find Visual Studio installation dir
|
||||
VSNNNCOMNTOOLS=`cmd.exe /c echo %VS${VS_VERSION_NUM_NODOT}COMNTOOLS% | tr -d '\r'`
|
||||
if [ -d "$VSNNNCOMNTOOLS" ]; then
|
||||
VS_INSTALL_DIR="$($WINDOWS_PATH_TO_UNIX_PATH "$VSNNNCOMNTOOLS/../..")"
|
||||
else
|
||||
VS_INSTALL_DIR="${MSVC_PROGRAMFILES_DIR}/Microsoft Visual Studio/$VS_VERSION"
|
||||
VS_INSTALL_DIR="${PROGRAMFILES_X86}/Microsoft Visual Studio/2019"
|
||||
VS_INSTALL_DIR="$(ls -d "${VS_INSTALL_DIR}/"{Community,Professional,Enterprise} 2>/dev/null | head -n1)"
|
||||
fi
|
||||
echo "VS_INSTALL_DIR: $VS_INSTALL_DIR"
|
||||
@@ -126,9 +101,9 @@ DEVKIT_BUNDLE="${DEVKIT_ROOT}.tar.gz"
|
||||
|
||||
echo "Creating devkit in $DEVKIT_ROOT"
|
||||
|
||||
MSVCR_DLL=${MSVC_CRT_DIR}/vcruntime${VS_DLL_VERSION}.dll
|
||||
VCRUNTIME_1_DLL=${MSVC_CRT_DIR}/vcruntime${VS_DLL_VERSION}_1.dll
|
||||
MSVCP_DLL=${MSVC_CRT_DIR}/msvcp${VS_DLL_VERSION}.dll
|
||||
MSVCR_DLL=${MSVC_DIR}/vcruntime${VS_DLL_VERSION}.dll
|
||||
VCRUNTIME_1_DLL=${MSVC_DIR}/vcruntime${VS_DLL_VERSION}_1.dll
|
||||
MSVCP_DLL=${MSVC_DIR}/msvcp${VS_DLL_VERSION}.dll
|
||||
|
||||
################################################################################
|
||||
# Copy Visual Studio files
|
||||
@@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 2011, 2020, 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
|
||||
@@ -135,7 +135,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBZIP, \
|
||||
$(LIBZ_CFLAGS), \
|
||||
CFLAGS_unix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \
|
||||
DISABLED_WARNINGS_gcc := unused-function implicit-fallthrough, \
|
||||
DISABLED_WARNINGS_clang := format-nonliteral, \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
LIBS_unix := -ljvm -ljava $(LIBZ_LIBS), \
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 2011, 2021, 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
|
||||
@@ -298,7 +298,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBLCMS, \
|
||||
HEADERS_FROM_SRC := $(LIBLCMS_HEADERS_FROM_SRC), \
|
||||
DISABLED_WARNINGS_gcc := format-nonliteral type-limits \
|
||||
misleading-indentation undef unused-function stringop-truncation, \
|
||||
DISABLED_WARNINGS_clang := unused-but-set-parameter tautological-compare format-nonliteral undef, \
|
||||
DISABLED_WARNINGS_clang := tautological-compare format-nonliteral undef, \
|
||||
DISABLED_WARNINGS_microsoft := 4819, \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
@@ -369,7 +369,6 @@ ifeq ($(call isTargetOs, windows macosx), false)
|
||||
common/awt/debug \
|
||||
common/font \
|
||||
common/java2d/opengl \
|
||||
include \
|
||||
#
|
||||
|
||||
LIBAWT_HEADLESS_CFLAGS := $(CUPS_CFLAGS) $(FONTCONFIG_CFLAGS) $(X_CFLAGS) \
|
||||
@@ -479,7 +478,6 @@ LIBFONTMANAGER_EXTRA_HEADER_DIRS := \
|
||||
libawt/java2d \
|
||||
libawt/java2d/pipe \
|
||||
libawt/java2d/loops \
|
||||
include \
|
||||
#
|
||||
|
||||
LIBFONTMANAGER_CFLAGS += $(LIBFREETYPE_CFLAGS)
|
||||
@@ -661,8 +659,6 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
|
||||
common/awt/systemscale \
|
||||
#
|
||||
|
||||
LIBSPLASHSCREEN_HEADER_DIRS += include
|
||||
|
||||
ifeq ($(USE_EXTERNAL_LIBGIF), false)
|
||||
LIBSPLASHSCREEN_HEADER_DIRS += libsplashscreen/giflib
|
||||
else
|
||||
@@ -687,7 +683,6 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
|
||||
|
||||
ifeq ($(USE_EXTERNAL_LIBZ), false)
|
||||
LIBSPLASHSCREEN_EXTRA_SRC += java.base:libzip/zlib
|
||||
LIBZ_DISABLED_WARNINGS_CLANG := format-nonliteral
|
||||
endif
|
||||
|
||||
ifeq ($(call isTargetOs, macosx), true)
|
||||
@@ -757,7 +752,7 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
|
||||
maybe-uninitialized shift-negative-value implicit-fallthrough \
|
||||
unused-function, \
|
||||
DISABLED_WARNINGS_clang := incompatible-pointer-types sign-compare \
|
||||
deprecated-declarations null-pointer-subtraction $(LIBZ_DISABLED_WARNINGS_CLANG), \
|
||||
deprecated-declarations, \
|
||||
DISABLED_WARNINGS_microsoft := 4018 4244 4267, \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 2018, 2020, 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
|
||||
@@ -24,7 +24,6 @@
|
||||
#
|
||||
|
||||
include LibCommon.gmk
|
||||
include LauncherCommon.gmk
|
||||
|
||||
################################################################################
|
||||
|
||||
@@ -76,8 +75,6 @@ $(eval $(call SetupJdkExecutable, BUILD_JPACKAGE_APPLAUNCHEREXE, \
|
||||
LIBS_macosx := $(LIBCXX) -framework Cocoa, \
|
||||
LIBS_windows := $(LIBCXX), \
|
||||
LIBS_linux := -ldl, \
|
||||
MANIFEST := $(JAVA_MANIFEST), \
|
||||
MANIFEST_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS) \
|
||||
))
|
||||
|
||||
JPACKAGE_TARGETS += $(BUILD_JPACKAGE_APPLAUNCHEREXE)
|
||||
@@ -95,9 +92,9 @@ ifeq ($(call isTargetOs, linux), true)
|
||||
JPACKAGE_LIBAPPLAUNCHER_INCLUDES := $(addprefix -I, $(JPACKAGE_LIBAPPLAUNCHER_SRC))
|
||||
|
||||
$(eval $(call SetupJdkLibrary, BUILD_JPACKAGE_LIBAPPLAUNCHER, \
|
||||
NAME := jpackageapplauncheraux, \
|
||||
NAME := jpackageapplauncher, \
|
||||
OUTPUT_DIR := $(JPACKAGE_OUTPUT_DIR), \
|
||||
SYMBOLS_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjpackageapplauncheraux, \
|
||||
SYMBOLS_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjpackageapplauncher, \
|
||||
SRC := $(JPACKAGE_LIBAPPLAUNCHER_SRC), \
|
||||
EXCLUDE_FILES := LinuxLauncher.c LinuxPackage.c, \
|
||||
TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
|
||||
@@ -178,8 +175,6 @@ ifeq ($(call isTargetOs, windows), true)
|
||||
LDFLAGS := $(BUILD_JPACKAGE_APPLAUNCHEREXE_LDFLAGS), \
|
||||
LIBS := $(BUILD_JPACKAGE_APPLAUNCHEREXE_LIBS), \
|
||||
LIBS_windows := $(BUILD_JPACKAGE_APPLAUNCHEREXE_LIBS_windows), \
|
||||
MANIFEST := $(JAVA_MANIFEST), \
|
||||
MANIFEST_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS) \
|
||||
))
|
||||
|
||||
JPACKAGE_TARGETS += $(BUILD_JPACKAGE_APPLAUNCHERWEXE)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 2020, 2021, 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
|
||||
@@ -28,14 +28,6 @@
|
||||
# available, or extract values automatically from the environment if missing.
|
||||
# This is robust, but slower.
|
||||
function setup() {
|
||||
|
||||
# Make regexp tests case insensitive
|
||||
shopt -s nocasematch
|
||||
# Prohibit msys2 from meddling with paths
|
||||
export MSYS2_ARG_CONV_EXCL="*"
|
||||
# Make sure WSL gets a copy of the path
|
||||
export WSLENV=PATH/l
|
||||
|
||||
while getopts "e:p:r:t:c:qmi" opt; do
|
||||
case "$opt" in
|
||||
e) PATHTOOL="$OPTARG" ;;
|
||||
@@ -95,6 +87,13 @@ function setup() {
|
||||
wintemp_win="$($CMD /q /c echo %TEMP% 2>/dev/null | tr -d \\n\\r)"
|
||||
WINTEMP="$($PATHTOOL -u "$wintemp_win")"
|
||||
fi
|
||||
|
||||
# Make regexp tests case insensitive
|
||||
shopt -s nocasematch
|
||||
# Prohibit msys2 from meddling with paths
|
||||
export MSYS2_ARG_CONV_EXCL="*"
|
||||
# Make sure WSL gets a copy of the path
|
||||
export WSLENV=PATH/l
|
||||
}
|
||||
|
||||
# Cleanup handling
|
||||
@@ -299,19 +298,6 @@ function convert_path() {
|
||||
if [[ $arg =~ ^([^/]*|-[^:=]*[:=]|.*file://|/[a-zA-Z:]{1,3}:?)($DRIVEPREFIX/)([a-z])(/[^/]+.*$) ]] ; then
|
||||
prefix="${BASH_REMATCH[1]}"
|
||||
winpath="${BASH_REMATCH[3]}:${BASH_REMATCH[4]}"
|
||||
|
||||
# If the thing in its entirety points to an existing path, use that instead of thinking
|
||||
# we have a prefix. This can only happen if the top-level directory has a single-letter name.
|
||||
if [[ ${#prefix} -eq 2 && "${prefix:0:1}" == "/" ]]; then
|
||||
possiblepath="${BASH_REMATCH[1]}/${BASH_REMATCH[3]}${BASH_REMATCH[4]}"
|
||||
if [[ -e "$possiblepath" || -e "$(dirname $possiblepath)" || -e "$(echo $possiblepath | cut -d / -f 1-5)" ]] ; then
|
||||
prefix=
|
||||
drivepart="${possiblepath:1:1}"
|
||||
pathpart="${possiblepath:2}"
|
||||
winpath="$drivepart:$pathpart"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Change slash to backslash (or vice versa if mixed mode)
|
||||
if [[ $MIXEDMODE != true ]]; then
|
||||
winpath="${winpath//'/'/'\'}"
|
||||
|
||||
@@ -15060,10 +15060,10 @@ instruct overflowAddL_reg_imm(rFlagsReg cr, iRegL op1, immLAddSub op2)
|
||||
%{
|
||||
match(Set cr (OverflowAddL op1 op2));
|
||||
|
||||
format %{ "adds zr, $op1, $op2\t# overflow check long" %}
|
||||
format %{ "cmn $op1, $op2\t# overflow check long" %}
|
||||
ins_cost(INSN_COST);
|
||||
ins_encode %{
|
||||
__ adds(zr, $op1$$Register, $op2$$constant);
|
||||
__ cmn($op1$$Register, $op2$$constant);
|
||||
%}
|
||||
|
||||
ins_pipe(icmp_reg_imm);
|
||||
|
||||
@@ -350,9 +350,13 @@ frame frame::sender_for_entry_frame(RegisterMap* map) const {
|
||||
assert(jfa->last_Java_sp() > sp(), "must be above this frame on stack");
|
||||
// Since we are walking the stack now this nested anchor is obviously walkable
|
||||
// even if it wasn't when it was stacked.
|
||||
jfa->make_walkable();
|
||||
if (!jfa->walkable()) {
|
||||
// Capture _last_Java_pc (if needed) and mark anchor walkable.
|
||||
jfa->capture_last_Java_pc();
|
||||
}
|
||||
map->clear();
|
||||
assert(map->include_argument_oops(), "should be set by clear");
|
||||
vmassert(jfa->last_Java_pc() != NULL, "not walkable");
|
||||
frame fr(jfa->last_Java_sp(), jfa->last_Java_fp(), jfa->last_Java_pc());
|
||||
|
||||
return fr;
|
||||
@@ -813,14 +817,20 @@ frame::frame(void* sp, void* fp, void* pc) {
|
||||
void frame::pd_ps() {}
|
||||
#endif
|
||||
|
||||
void JavaFrameAnchor::make_walkable() {
|
||||
void JavaFrameAnchor::make_walkable(JavaThread* thread) {
|
||||
// last frame set?
|
||||
if (last_Java_sp() == NULL) return;
|
||||
// already walkable?
|
||||
if (walkable()) return;
|
||||
vmassert(Thread::current() == (Thread*)thread, "not current thread");
|
||||
vmassert(last_Java_sp() != NULL, "not called from Java code?");
|
||||
vmassert(last_Java_pc() == NULL, "already walkable");
|
||||
_last_Java_pc = (address)_last_Java_sp[-1];
|
||||
capture_last_Java_pc();
|
||||
vmassert(walkable(), "something went wrong");
|
||||
}
|
||||
|
||||
void JavaFrameAnchor::capture_last_Java_pc() {
|
||||
vmassert(_last_Java_sp != NULL, "no last frame set");
|
||||
vmassert(_last_Java_pc == NULL, "already walkable");
|
||||
_last_Java_pc = (address)_last_Java_sp[-1];
|
||||
}
|
||||
|
||||
@@ -144,12 +144,10 @@ inline intptr_t* frame::id(void) const { return unextended_sp(); }
|
||||
inline bool frame::is_older(intptr_t* id) const { assert(this->id() != NULL && id != NULL, "NULL frame id");
|
||||
return this->id() > id ; }
|
||||
|
||||
|
||||
|
||||
inline intptr_t* frame::link() const { return (intptr_t*) *(intptr_t **)addr_at(link_offset); }
|
||||
|
||||
inline intptr_t* frame::link_or_null() const {
|
||||
intptr_t** ptr = (intptr_t **)addr_at(link_offset);
|
||||
return os::is_readable_pointer(ptr) ? *ptr : NULL;
|
||||
}
|
||||
|
||||
inline intptr_t* frame::unextended_sp() const { return _unextended_sp; }
|
||||
|
||||
|
||||
@@ -65,8 +65,8 @@ public:
|
||||
}
|
||||
|
||||
bool walkable(void) { return _last_Java_sp != NULL && _last_Java_pc != NULL; }
|
||||
|
||||
void make_walkable();
|
||||
void make_walkable(JavaThread* thread);
|
||||
void capture_last_Java_pc(void);
|
||||
|
||||
intptr_t* last_Java_sp(void) const { return _last_Java_sp; }
|
||||
|
||||
|
||||
@@ -721,23 +721,8 @@ address MacroAssembler::trampoline_call(Address entry, CodeBuffer* cbuf) {
|
||||
|| entry.rspec().type() == relocInfo::static_call_type
|
||||
|| entry.rspec().type() == relocInfo::virtual_call_type, "wrong reloc type");
|
||||
|
||||
bool need_trampoline = far_branches();
|
||||
if (!need_trampoline && entry.rspec().type() == relocInfo::runtime_call_type && !CodeCache::contains(entry.target())) {
|
||||
// If it is a runtime call of an address outside small CodeCache,
|
||||
// we need to check whether it is in range.
|
||||
address target = entry.target();
|
||||
assert(target < CodeCache::low_bound() || target >= CodeCache::high_bound(), "target is inside CodeCache");
|
||||
// Case 1: -------T-------L====CodeCache====H-------
|
||||
// ^-------longest branch---|
|
||||
// Case 2: -------L====CodeCache====H-------T-------
|
||||
// |-------longest branch ---^
|
||||
address longest_branch_start = (target < CodeCache::low_bound()) ? CodeCache::high_bound() - NativeInstruction::instruction_size
|
||||
: CodeCache::low_bound();
|
||||
need_trampoline = !reachable_from_branch_at(longest_branch_start, target);
|
||||
}
|
||||
|
||||
// We need a trampoline if branches are far.
|
||||
if (need_trampoline) {
|
||||
if (far_branches()) {
|
||||
bool in_scratch_emit_size = false;
|
||||
#ifdef COMPILER2
|
||||
// We don't want to emit a trampoline if C2 is generating dummy
|
||||
@@ -758,7 +743,7 @@ address MacroAssembler::trampoline_call(Address entry, CodeBuffer* cbuf) {
|
||||
|
||||
if (cbuf) cbuf->set_insts_mark();
|
||||
relocate(entry.rspec());
|
||||
if (!need_trampoline) {
|
||||
if (!far_branches()) {
|
||||
bl(entry.target());
|
||||
} else {
|
||||
bl(pc());
|
||||
@@ -2285,13 +2270,11 @@ void MacroAssembler::unimplemented(const char* what) {
|
||||
|
||||
// If a constant does not fit in an immediate field, generate some
|
||||
// number of MOV instructions and then perform the operation.
|
||||
void MacroAssembler::wrap_add_sub_imm_insn(Register Rd, Register Rn, uint64_t imm,
|
||||
void MacroAssembler::wrap_add_sub_imm_insn(Register Rd, Register Rn, unsigned imm,
|
||||
add_sub_imm_insn insn1,
|
||||
add_sub_reg_insn insn2,
|
||||
bool is32) {
|
||||
add_sub_reg_insn insn2) {
|
||||
assert(Rd != zr, "Rd = zr and not setting flags?");
|
||||
bool fits = operand_valid_for_add_sub_immediate(is32 ? (int32_t)imm : imm);
|
||||
if (fits) {
|
||||
if (operand_valid_for_add_sub_immediate((int)imm)) {
|
||||
(this->*insn1)(Rd, Rn, imm);
|
||||
} else {
|
||||
if (uabs(imm) < (1 << 24)) {
|
||||
@@ -2299,7 +2282,7 @@ void MacroAssembler::wrap_add_sub_imm_insn(Register Rd, Register Rn, uint64_t im
|
||||
(this->*insn1)(Rd, Rd, imm & ((1 << 12)-1));
|
||||
} else {
|
||||
assert_different_registers(Rd, Rn);
|
||||
mov(Rd, imm);
|
||||
mov(Rd, (uint64_t)imm);
|
||||
(this->*insn2)(Rd, Rn, Rd, LSL, 0);
|
||||
}
|
||||
}
|
||||
@@ -2307,17 +2290,15 @@ void MacroAssembler::wrap_add_sub_imm_insn(Register Rd, Register Rn, uint64_t im
|
||||
|
||||
// Seperate vsn which sets the flags. Optimisations are more restricted
|
||||
// because we must set the flags correctly.
|
||||
void MacroAssembler::wrap_adds_subs_imm_insn(Register Rd, Register Rn, uint64_t imm,
|
||||
add_sub_imm_insn insn1,
|
||||
add_sub_reg_insn insn2,
|
||||
bool is32) {
|
||||
bool fits = operand_valid_for_add_sub_immediate(is32 ? (int32_t)imm : imm);
|
||||
if (fits) {
|
||||
void MacroAssembler::wrap_adds_subs_imm_insn(Register Rd, Register Rn, unsigned imm,
|
||||
add_sub_imm_insn insn1,
|
||||
add_sub_reg_insn insn2) {
|
||||
if (operand_valid_for_add_sub_immediate((int)imm)) {
|
||||
(this->*insn1)(Rd, Rn, imm);
|
||||
} else {
|
||||
assert_different_registers(Rd, Rn);
|
||||
assert(Rd != zr, "overflow in immediate operand");
|
||||
mov(Rd, imm);
|
||||
mov(Rd, (uint64_t)imm);
|
||||
(this->*insn2)(Rd, Rn, Rd, LSL, 0);
|
||||
}
|
||||
}
|
||||
@@ -3361,7 +3342,7 @@ void MacroAssembler::kernel_crc32_using_crc32(Register crc, Register buf,
|
||||
crc32x(crc, crc, tmp2);
|
||||
crc32x(crc, crc, tmp3);
|
||||
br(Assembler::GE, CRC_by32_loop);
|
||||
cmn(len, (u1)32);
|
||||
cmn(len, 32);
|
||||
br(Assembler::NE, CRC_less32);
|
||||
b(L_exit);
|
||||
|
||||
@@ -3424,7 +3405,7 @@ void MacroAssembler::kernel_crc32_using_crc32(Register crc, Register buf,
|
||||
|
||||
sub(len, len, 64);
|
||||
add(buf, buf, 8);
|
||||
cmn(len, (u1)128);
|
||||
cmn(len, 128);
|
||||
br(Assembler::NE, CRC_less64);
|
||||
BIND(L_exit);
|
||||
mvnw(crc, crc);
|
||||
@@ -3658,7 +3639,7 @@ void MacroAssembler::kernel_crc32c_using_crc32c(Register crc, Register buf,
|
||||
crc32cx(crc, crc, tmp2);
|
||||
crc32cx(crc, crc, tmp3);
|
||||
br(Assembler::GE, CRC_by32_loop);
|
||||
cmn(len, (u1)32);
|
||||
cmn(len, 32);
|
||||
br(Assembler::NE, CRC_less32);
|
||||
b(L_exit);
|
||||
|
||||
@@ -3721,7 +3702,7 @@ void MacroAssembler::kernel_crc32c_using_crc32c(Register crc, Register buf,
|
||||
|
||||
sub(len, len, 64);
|
||||
add(buf, buf, 8);
|
||||
cmn(len, (u1)128);
|
||||
cmn(len, 128);
|
||||
br(Assembler::NE, CRC_less64);
|
||||
BIND(L_exit);
|
||||
}
|
||||
|
||||
@@ -206,11 +206,8 @@ class MacroAssembler: public Assembler {
|
||||
inline void cmp(Register Rd, unsigned char imm8) { subs(zr, Rd, imm8); }
|
||||
inline void cmp(Register Rd, unsigned imm) = delete;
|
||||
|
||||
template<class T>
|
||||
inline void cmnw(Register Rd, T imm) { addsw(zr, Rd, imm); }
|
||||
|
||||
inline void cmn(Register Rd, unsigned char imm8) { adds(zr, Rd, imm8); }
|
||||
inline void cmn(Register Rd, unsigned imm) = delete;
|
||||
inline void cmnw(Register Rd, unsigned imm) { addsw(zr, Rd, imm); }
|
||||
inline void cmn(Register Rd, unsigned imm) { adds(zr, Rd, imm); }
|
||||
|
||||
void cset(Register Rd, Assembler::Condition cond) {
|
||||
csinc(Rd, zr, zr, ~cond);
|
||||
@@ -228,7 +225,7 @@ class MacroAssembler: public Assembler {
|
||||
|
||||
inline void movw(Register Rd, Register Rn) {
|
||||
if (Rd == sp || Rn == sp) {
|
||||
Assembler::addw(Rd, Rn, 0U);
|
||||
addw(Rd, Rn, 0U);
|
||||
} else {
|
||||
orrw(Rd, zr, Rn);
|
||||
}
|
||||
@@ -237,7 +234,7 @@ class MacroAssembler: public Assembler {
|
||||
assert(Rd != r31_sp && Rn != r31_sp, "should be");
|
||||
if (Rd == Rn) {
|
||||
} else if (Rd == sp || Rn == sp) {
|
||||
Assembler::add(Rd, Rn, 0U);
|
||||
add(Rd, Rn, 0U);
|
||||
} else {
|
||||
orr(Rd, zr, Rn);
|
||||
}
|
||||
@@ -1136,17 +1133,17 @@ public:
|
||||
|
||||
// If a constant does not fit in an immediate field, generate some
|
||||
// number of MOV instructions and then perform the operation
|
||||
void wrap_add_sub_imm_insn(Register Rd, Register Rn, uint64_t imm,
|
||||
void wrap_add_sub_imm_insn(Register Rd, Register Rn, unsigned imm,
|
||||
add_sub_imm_insn insn1,
|
||||
add_sub_reg_insn insn2, bool is32);
|
||||
add_sub_reg_insn insn2);
|
||||
// Seperate vsn which sets the flags
|
||||
void wrap_adds_subs_imm_insn(Register Rd, Register Rn, uint64_t imm,
|
||||
add_sub_imm_insn insn1,
|
||||
add_sub_reg_insn insn2, bool is32);
|
||||
void wrap_adds_subs_imm_insn(Register Rd, Register Rn, unsigned imm,
|
||||
add_sub_imm_insn insn1,
|
||||
add_sub_reg_insn insn2);
|
||||
|
||||
#define WRAP(INSN, is32) \
|
||||
void INSN(Register Rd, Register Rn, uint64_t imm) { \
|
||||
wrap_add_sub_imm_insn(Rd, Rn, imm, &Assembler::INSN, &Assembler::INSN, is32); \
|
||||
#define WRAP(INSN) \
|
||||
void INSN(Register Rd, Register Rn, unsigned imm) { \
|
||||
wrap_add_sub_imm_insn(Rd, Rn, imm, &Assembler::INSN, &Assembler::INSN); \
|
||||
} \
|
||||
\
|
||||
void INSN(Register Rd, Register Rn, Register Rm, \
|
||||
@@ -1163,12 +1160,12 @@ public:
|
||||
Assembler::INSN(Rd, Rn, Rm, option, amount); \
|
||||
}
|
||||
|
||||
WRAP(add, false) WRAP(addw, true) WRAP(sub, false) WRAP(subw, true)
|
||||
WRAP(add) WRAP(addw) WRAP(sub) WRAP(subw)
|
||||
|
||||
#undef WRAP
|
||||
#define WRAP(INSN, is32) \
|
||||
void INSN(Register Rd, Register Rn, uint64_t imm) { \
|
||||
wrap_adds_subs_imm_insn(Rd, Rn, imm, &Assembler::INSN, &Assembler::INSN, is32); \
|
||||
#define WRAP(INSN) \
|
||||
void INSN(Register Rd, Register Rn, unsigned imm) { \
|
||||
wrap_adds_subs_imm_insn(Rd, Rn, imm, &Assembler::INSN, &Assembler::INSN); \
|
||||
} \
|
||||
\
|
||||
void INSN(Register Rd, Register Rn, Register Rm, \
|
||||
@@ -1185,7 +1182,7 @@ public:
|
||||
Assembler::INSN(Rd, Rn, Rm, option, amount); \
|
||||
}
|
||||
|
||||
WRAP(adds, false) WRAP(addsw, true) WRAP(subs, false) WRAP(subsw, true)
|
||||
WRAP(adds) WRAP(addsw) WRAP(subs) WRAP(subsw)
|
||||
|
||||
void add(Register Rd, Register Rn, RegisterOrConstant increment);
|
||||
void addw(Register Rd, Register Rn, RegisterOrConstant increment);
|
||||
|
||||
@@ -6619,7 +6619,7 @@ class StubGenerator: public StubCodeGenerator {
|
||||
assert(is_even(framesize/2), "sp not 16-byte aligned");
|
||||
|
||||
// lr and fp are already in place
|
||||
__ sub(sp, rfp, ((uint64_t)framesize-4) << LogBytesPerInt); // prolog
|
||||
__ sub(sp, rfp, ((unsigned)framesize-4) << LogBytesPerInt); // prolog
|
||||
|
||||
int frame_complete = __ pc() - start;
|
||||
|
||||
|
||||
@@ -124,12 +124,8 @@ inline intptr_t* frame::id(void) const { return unextended_sp(); }
|
||||
inline bool frame::is_older(intptr_t* id) const { assert(this->id() != NULL && id != NULL, "NULL frame id");
|
||||
return this->id() > id ; }
|
||||
|
||||
inline intptr_t* frame::link() const { return (intptr_t*) *(intptr_t **)addr_at(link_offset); }
|
||||
|
||||
inline intptr_t* frame::link_or_null() const {
|
||||
intptr_t** ptr = (intptr_t **)addr_at(link_offset);
|
||||
return os::is_readable_pointer(ptr) ? *ptr : NULL;
|
||||
}
|
||||
inline intptr_t* frame::link() const { return (intptr_t*) *(intptr_t **)addr_at(link_offset); }
|
||||
|
||||
inline intptr_t* frame::unextended_sp() const { return _unextended_sp; }
|
||||
|
||||
|
||||
@@ -65,7 +65,7 @@ public:
|
||||
// Always walkable
|
||||
bool walkable(void) { return true; }
|
||||
// Never any thing to do since we are always walkable and can find address of return addresses
|
||||
void make_walkable() { }
|
||||
void make_walkable(JavaThread* thread) { }
|
||||
|
||||
intptr_t* last_Java_sp(void) const { return _last_Java_sp; }
|
||||
|
||||
|
||||
@@ -117,10 +117,6 @@ inline intptr_t* frame::link() const {
|
||||
return (intptr_t*)callers_abi()->callers_sp;
|
||||
}
|
||||
|
||||
inline intptr_t* frame::link_or_null() const {
|
||||
return link();
|
||||
}
|
||||
|
||||
inline intptr_t* frame::real_fp() const {
|
||||
return fp();
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2021, 2022 SAP SE. All rights reserved.
|
||||
* Copyright (c) 2021 SAP SE. 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
|
||||
@@ -400,40 +400,36 @@ OptoReg::Name ZBarrierSetAssembler::refine_register(const Node* node, OptoReg::N
|
||||
#define __ _masm->
|
||||
|
||||
class ZSaveLiveRegisters {
|
||||
|
||||
private:
|
||||
MacroAssembler* _masm;
|
||||
RegMask _reg_mask;
|
||||
Register _result_reg;
|
||||
int _frame_size;
|
||||
|
||||
public:
|
||||
ZSaveLiveRegisters(MacroAssembler *masm, ZLoadBarrierStubC2 *stub)
|
||||
: _masm(masm), _reg_mask(stub->live()), _result_reg(stub->ref()) {
|
||||
|
||||
const int register_save_size = iterate_over_register_mask(ACTION_COUNT_ONLY) * BytesPerWord;
|
||||
_frame_size = align_up(register_save_size, frame::alignment_in_bytes)
|
||||
+ frame::abi_reg_args_size;
|
||||
const int total_regs_amount = iterate_over_register_mask(ACTION_SAVE);
|
||||
|
||||
__ save_LR_CR(R0);
|
||||
__ push_frame(_frame_size, R0);
|
||||
|
||||
iterate_over_register_mask(ACTION_SAVE, _frame_size);
|
||||
__ push_frame_reg_args(total_regs_amount * BytesPerWord, R0);
|
||||
}
|
||||
|
||||
~ZSaveLiveRegisters() {
|
||||
iterate_over_register_mask(ACTION_RESTORE, _frame_size);
|
||||
|
||||
__ addi(R1_SP, R1_SP, _frame_size);
|
||||
__ pop_frame();
|
||||
__ restore_LR_CR(R0);
|
||||
|
||||
iterate_over_register_mask(ACTION_RESTORE);
|
||||
}
|
||||
|
||||
private:
|
||||
enum IterationAction : int {
|
||||
ACTION_SAVE,
|
||||
ACTION_RESTORE,
|
||||
ACTION_COUNT_ONLY
|
||||
ACTION_SAVE = 0,
|
||||
ACTION_RESTORE = 1
|
||||
};
|
||||
|
||||
int iterate_over_register_mask(IterationAction action, int offset = 0) {
|
||||
int iterate_over_register_mask(IterationAction action) {
|
||||
int reg_save_index = 0;
|
||||
RegMaskIterator live_regs_iterator(_reg_mask);
|
||||
|
||||
@@ -458,11 +454,11 @@ class ZSaveLiveRegisters {
|
||||
reg_save_index++;
|
||||
|
||||
if (action == ACTION_SAVE) {
|
||||
_masm->std(std_reg, offset - reg_save_index * BytesPerWord, R1_SP);
|
||||
_masm->std(std_reg, (intptr_t) -reg_save_index * BytesPerWord, R1_SP);
|
||||
} else if (action == ACTION_RESTORE) {
|
||||
_masm->ld(std_reg, offset - reg_save_index * BytesPerWord, R1_SP);
|
||||
_masm->ld(std_reg, (intptr_t) -reg_save_index * BytesPerWord, R1_SP);
|
||||
} else {
|
||||
assert(action == ACTION_COUNT_ONLY, "Sanity");
|
||||
fatal("Sanity");
|
||||
}
|
||||
}
|
||||
} else if (vm_reg->is_FloatRegister()) {
|
||||
@@ -471,34 +467,19 @@ class ZSaveLiveRegisters {
|
||||
reg_save_index++;
|
||||
|
||||
if (action == ACTION_SAVE) {
|
||||
_masm->stfd(fp_reg, offset - reg_save_index * BytesPerWord, R1_SP);
|
||||
_masm->stfd(fp_reg, (intptr_t) -reg_save_index * BytesPerWord, R1_SP);
|
||||
} else if (action == ACTION_RESTORE) {
|
||||
_masm->lfd(fp_reg, offset - reg_save_index * BytesPerWord, R1_SP);
|
||||
_masm->lfd(fp_reg, (intptr_t) -reg_save_index * BytesPerWord, R1_SP);
|
||||
} else {
|
||||
assert(action == ACTION_COUNT_ONLY, "Sanity");
|
||||
fatal("Sanity");
|
||||
}
|
||||
}
|
||||
} else if (vm_reg->is_ConditionRegister()) {
|
||||
// NOP. Conditions registers are covered by save_LR_CR
|
||||
} else if (vm_reg->is_VectorSRegister()) {
|
||||
assert(SuperwordUseVSX, "or should not reach here");
|
||||
VectorSRegister vs_reg = vm_reg->as_VectorSRegister();
|
||||
if (vs_reg->encoding() >= VSR32->encoding() && vs_reg->encoding() <= VSR51->encoding()) {
|
||||
reg_save_index += 2;
|
||||
|
||||
Register spill_addr = R0;
|
||||
if (action == ACTION_SAVE) {
|
||||
_masm->addi(spill_addr, R1_SP, offset - reg_save_index * BytesPerWord);
|
||||
_masm->stxvd2x(vs_reg, spill_addr);
|
||||
} else if (action == ACTION_RESTORE) {
|
||||
_masm->addi(spill_addr, R1_SP, offset - reg_save_index * BytesPerWord);
|
||||
_masm->lxvd2x(vs_reg, spill_addr);
|
||||
} else {
|
||||
assert(action == ACTION_COUNT_ONLY, "Sanity");
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (vm_reg->is_SpecialRegister()) {
|
||||
if (vm_reg->is_VectorRegister()) {
|
||||
fatal("Vector registers are unsupported. Found register %s", vm_reg->name());
|
||||
} else if (vm_reg->is_SpecialRegister()) {
|
||||
fatal("Special registers are unsupported. Found register %s", vm_reg->name());
|
||||
} else {
|
||||
fatal("Register type is not known");
|
||||
@@ -514,6 +495,7 @@ class ZSaveLiveRegisters {
|
||||
#define __ _masm->
|
||||
|
||||
class ZSetupArguments {
|
||||
private:
|
||||
MacroAssembler* const _masm;
|
||||
const Register _ref;
|
||||
const Address _ref_addr;
|
||||
|
||||
@@ -67,7 +67,7 @@ public:
|
||||
// Always walkable.
|
||||
bool walkable(void) { return true; }
|
||||
// Never any thing to do since we are always walkable and can find address of return addresses.
|
||||
void make_walkable() { }
|
||||
void make_walkable(JavaThread* thread) { }
|
||||
|
||||
intptr_t* last_Java_sp(void) const { return _last_Java_sp; }
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
//
|
||||
// Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
|
||||
// Copyright (c) 2012, 2022 SAP SE. All rights reserved.
|
||||
// Copyright (c) 2012, 2021 SAP SE. 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
|
||||
@@ -257,72 +257,70 @@ register %{
|
||||
// ----------------------------
|
||||
// Vector-Scalar Registers
|
||||
// ----------------------------
|
||||
// 1st 32 VSRs are aliases for the FPRs which are already defined above.
|
||||
reg_def VSR0 ( SOC, SOC, Op_VecX, 0, VMRegImpl::Bad());
|
||||
reg_def VSR1 ( SOC, SOC, Op_VecX, 1, VMRegImpl::Bad());
|
||||
reg_def VSR2 ( SOC, SOC, Op_VecX, 2, VMRegImpl::Bad());
|
||||
reg_def VSR3 ( SOC, SOC, Op_VecX, 3, VMRegImpl::Bad());
|
||||
reg_def VSR4 ( SOC, SOC, Op_VecX, 4, VMRegImpl::Bad());
|
||||
reg_def VSR5 ( SOC, SOC, Op_VecX, 5, VMRegImpl::Bad());
|
||||
reg_def VSR6 ( SOC, SOC, Op_VecX, 6, VMRegImpl::Bad());
|
||||
reg_def VSR7 ( SOC, SOC, Op_VecX, 7, VMRegImpl::Bad());
|
||||
reg_def VSR8 ( SOC, SOC, Op_VecX, 8, VMRegImpl::Bad());
|
||||
reg_def VSR9 ( SOC, SOC, Op_VecX, 9, VMRegImpl::Bad());
|
||||
reg_def VSR10 ( SOC, SOC, Op_VecX, 10, VMRegImpl::Bad());
|
||||
reg_def VSR11 ( SOC, SOC, Op_VecX, 11, VMRegImpl::Bad());
|
||||
reg_def VSR12 ( SOC, SOC, Op_VecX, 12, VMRegImpl::Bad());
|
||||
reg_def VSR13 ( SOC, SOC, Op_VecX, 13, VMRegImpl::Bad());
|
||||
reg_def VSR14 ( SOC, SOE, Op_VecX, 14, VMRegImpl::Bad());
|
||||
reg_def VSR15 ( SOC, SOE, Op_VecX, 15, VMRegImpl::Bad());
|
||||
reg_def VSR16 ( SOC, SOE, Op_VecX, 16, VMRegImpl::Bad());
|
||||
reg_def VSR17 ( SOC, SOE, Op_VecX, 17, VMRegImpl::Bad());
|
||||
reg_def VSR18 ( SOC, SOE, Op_VecX, 18, VMRegImpl::Bad());
|
||||
reg_def VSR19 ( SOC, SOE, Op_VecX, 19, VMRegImpl::Bad());
|
||||
reg_def VSR20 ( SOC, SOE, Op_VecX, 20, VMRegImpl::Bad());
|
||||
reg_def VSR21 ( SOC, SOE, Op_VecX, 21, VMRegImpl::Bad());
|
||||
reg_def VSR22 ( SOC, SOE, Op_VecX, 22, VMRegImpl::Bad());
|
||||
reg_def VSR23 ( SOC, SOE, Op_VecX, 23, VMRegImpl::Bad());
|
||||
reg_def VSR24 ( SOC, SOE, Op_VecX, 24, VMRegImpl::Bad());
|
||||
reg_def VSR25 ( SOC, SOE, Op_VecX, 25, VMRegImpl::Bad());
|
||||
reg_def VSR26 ( SOC, SOE, Op_VecX, 26, VMRegImpl::Bad());
|
||||
reg_def VSR27 ( SOC, SOE, Op_VecX, 27, VMRegImpl::Bad());
|
||||
reg_def VSR28 ( SOC, SOE, Op_VecX, 28, VMRegImpl::Bad());
|
||||
reg_def VSR29 ( SOC, SOE, Op_VecX, 29, VMRegImpl::Bad());
|
||||
reg_def VSR30 ( SOC, SOE, Op_VecX, 30, VMRegImpl::Bad());
|
||||
reg_def VSR31 ( SOC, SOE, Op_VecX, 31, VMRegImpl::Bad());
|
||||
// 2nd 32 VSRs are aliases for the VRs which are only defined here.
|
||||
reg_def VSR32 ( SOC, SOC, Op_VecX, 32, VSR32->as_VMReg());
|
||||
reg_def VSR33 ( SOC, SOC, Op_VecX, 33, VSR33->as_VMReg());
|
||||
reg_def VSR34 ( SOC, SOC, Op_VecX, 34, VSR34->as_VMReg());
|
||||
reg_def VSR35 ( SOC, SOC, Op_VecX, 35, VSR35->as_VMReg());
|
||||
reg_def VSR36 ( SOC, SOC, Op_VecX, 36, VSR36->as_VMReg());
|
||||
reg_def VSR37 ( SOC, SOC, Op_VecX, 37, VSR37->as_VMReg());
|
||||
reg_def VSR38 ( SOC, SOC, Op_VecX, 38, VSR38->as_VMReg());
|
||||
reg_def VSR39 ( SOC, SOC, Op_VecX, 39, VSR39->as_VMReg());
|
||||
reg_def VSR40 ( SOC, SOC, Op_VecX, 40, VSR40->as_VMReg());
|
||||
reg_def VSR41 ( SOC, SOC, Op_VecX, 41, VSR41->as_VMReg());
|
||||
reg_def VSR42 ( SOC, SOC, Op_VecX, 42, VSR42->as_VMReg());
|
||||
reg_def VSR43 ( SOC, SOC, Op_VecX, 43, VSR43->as_VMReg());
|
||||
reg_def VSR44 ( SOC, SOC, Op_VecX, 44, VSR44->as_VMReg());
|
||||
reg_def VSR45 ( SOC, SOC, Op_VecX, 45, VSR45->as_VMReg());
|
||||
reg_def VSR46 ( SOC, SOC, Op_VecX, 46, VSR46->as_VMReg());
|
||||
reg_def VSR47 ( SOC, SOC, Op_VecX, 47, VSR47->as_VMReg());
|
||||
reg_def VSR48 ( SOC, SOC, Op_VecX, 48, VSR48->as_VMReg());
|
||||
reg_def VSR49 ( SOC, SOC, Op_VecX, 49, VSR49->as_VMReg());
|
||||
reg_def VSR50 ( SOC, SOC, Op_VecX, 50, VSR50->as_VMReg());
|
||||
reg_def VSR51 ( SOC, SOC, Op_VecX, 51, VSR51->as_VMReg());
|
||||
reg_def VSR52 ( SOC, SOE, Op_VecX, 52, VSR52->as_VMReg());
|
||||
reg_def VSR53 ( SOC, SOE, Op_VecX, 53, VSR53->as_VMReg());
|
||||
reg_def VSR54 ( SOC, SOE, Op_VecX, 54, VSR54->as_VMReg());
|
||||
reg_def VSR55 ( SOC, SOE, Op_VecX, 55, VSR55->as_VMReg());
|
||||
reg_def VSR56 ( SOC, SOE, Op_VecX, 56, VSR56->as_VMReg());
|
||||
reg_def VSR57 ( SOC, SOE, Op_VecX, 57, VSR57->as_VMReg());
|
||||
reg_def VSR58 ( SOC, SOE, Op_VecX, 58, VSR58->as_VMReg());
|
||||
reg_def VSR59 ( SOC, SOE, Op_VecX, 59, VSR59->as_VMReg());
|
||||
reg_def VSR60 ( SOC, SOE, Op_VecX, 60, VSR60->as_VMReg());
|
||||
reg_def VSR61 ( SOC, SOE, Op_VecX, 61, VSR61->as_VMReg());
|
||||
reg_def VSR62 ( SOC, SOE, Op_VecX, 62, VSR62->as_VMReg());
|
||||
reg_def VSR63 ( SOC, SOE, Op_VecX, 63, VSR63->as_VMReg());
|
||||
reg_def VSR0 ( SOC, SOC, Op_VecX, 0, NULL);
|
||||
reg_def VSR1 ( SOC, SOC, Op_VecX, 1, NULL);
|
||||
reg_def VSR2 ( SOC, SOC, Op_VecX, 2, NULL);
|
||||
reg_def VSR3 ( SOC, SOC, Op_VecX, 3, NULL);
|
||||
reg_def VSR4 ( SOC, SOC, Op_VecX, 4, NULL);
|
||||
reg_def VSR5 ( SOC, SOC, Op_VecX, 5, NULL);
|
||||
reg_def VSR6 ( SOC, SOC, Op_VecX, 6, NULL);
|
||||
reg_def VSR7 ( SOC, SOC, Op_VecX, 7, NULL);
|
||||
reg_def VSR8 ( SOC, SOC, Op_VecX, 8, NULL);
|
||||
reg_def VSR9 ( SOC, SOC, Op_VecX, 9, NULL);
|
||||
reg_def VSR10 ( SOC, SOC, Op_VecX, 10, NULL);
|
||||
reg_def VSR11 ( SOC, SOC, Op_VecX, 11, NULL);
|
||||
reg_def VSR12 ( SOC, SOC, Op_VecX, 12, NULL);
|
||||
reg_def VSR13 ( SOC, SOC, Op_VecX, 13, NULL);
|
||||
reg_def VSR14 ( SOC, SOC, Op_VecX, 14, NULL);
|
||||
reg_def VSR15 ( SOC, SOC, Op_VecX, 15, NULL);
|
||||
reg_def VSR16 ( SOC, SOC, Op_VecX, 16, NULL);
|
||||
reg_def VSR17 ( SOC, SOC, Op_VecX, 17, NULL);
|
||||
reg_def VSR18 ( SOC, SOC, Op_VecX, 18, NULL);
|
||||
reg_def VSR19 ( SOC, SOC, Op_VecX, 19, NULL);
|
||||
reg_def VSR20 ( SOC, SOC, Op_VecX, 20, NULL);
|
||||
reg_def VSR21 ( SOC, SOC, Op_VecX, 21, NULL);
|
||||
reg_def VSR22 ( SOC, SOC, Op_VecX, 22, NULL);
|
||||
reg_def VSR23 ( SOC, SOC, Op_VecX, 23, NULL);
|
||||
reg_def VSR24 ( SOC, SOC, Op_VecX, 24, NULL);
|
||||
reg_def VSR25 ( SOC, SOC, Op_VecX, 25, NULL);
|
||||
reg_def VSR26 ( SOC, SOC, Op_VecX, 26, NULL);
|
||||
reg_def VSR27 ( SOC, SOC, Op_VecX, 27, NULL);
|
||||
reg_def VSR28 ( SOC, SOC, Op_VecX, 28, NULL);
|
||||
reg_def VSR29 ( SOC, SOC, Op_VecX, 29, NULL);
|
||||
reg_def VSR30 ( SOC, SOC, Op_VecX, 30, NULL);
|
||||
reg_def VSR31 ( SOC, SOC, Op_VecX, 31, NULL);
|
||||
reg_def VSR32 ( SOC, SOC, Op_VecX, 32, NULL);
|
||||
reg_def VSR33 ( SOC, SOC, Op_VecX, 33, NULL);
|
||||
reg_def VSR34 ( SOC, SOC, Op_VecX, 34, NULL);
|
||||
reg_def VSR35 ( SOC, SOC, Op_VecX, 35, NULL);
|
||||
reg_def VSR36 ( SOC, SOC, Op_VecX, 36, NULL);
|
||||
reg_def VSR37 ( SOC, SOC, Op_VecX, 37, NULL);
|
||||
reg_def VSR38 ( SOC, SOC, Op_VecX, 38, NULL);
|
||||
reg_def VSR39 ( SOC, SOC, Op_VecX, 39, NULL);
|
||||
reg_def VSR40 ( SOC, SOC, Op_VecX, 40, NULL);
|
||||
reg_def VSR41 ( SOC, SOC, Op_VecX, 41, NULL);
|
||||
reg_def VSR42 ( SOC, SOC, Op_VecX, 42, NULL);
|
||||
reg_def VSR43 ( SOC, SOC, Op_VecX, 43, NULL);
|
||||
reg_def VSR44 ( SOC, SOC, Op_VecX, 44, NULL);
|
||||
reg_def VSR45 ( SOC, SOC, Op_VecX, 45, NULL);
|
||||
reg_def VSR46 ( SOC, SOC, Op_VecX, 46, NULL);
|
||||
reg_def VSR47 ( SOC, SOC, Op_VecX, 47, NULL);
|
||||
reg_def VSR48 ( SOC, SOC, Op_VecX, 48, NULL);
|
||||
reg_def VSR49 ( SOC, SOC, Op_VecX, 49, NULL);
|
||||
reg_def VSR50 ( SOC, SOC, Op_VecX, 50, NULL);
|
||||
reg_def VSR51 ( SOC, SOC, Op_VecX, 51, NULL);
|
||||
reg_def VSR52 ( SOC, SOC, Op_VecX, 52, NULL);
|
||||
reg_def VSR53 ( SOC, SOC, Op_VecX, 53, NULL);
|
||||
reg_def VSR54 ( SOC, SOC, Op_VecX, 54, NULL);
|
||||
reg_def VSR55 ( SOC, SOC, Op_VecX, 55, NULL);
|
||||
reg_def VSR56 ( SOC, SOC, Op_VecX, 56, NULL);
|
||||
reg_def VSR57 ( SOC, SOC, Op_VecX, 57, NULL);
|
||||
reg_def VSR58 ( SOC, SOC, Op_VecX, 58, NULL);
|
||||
reg_def VSR59 ( SOC, SOC, Op_VecX, 59, NULL);
|
||||
reg_def VSR60 ( SOC, SOC, Op_VecX, 60, NULL);
|
||||
reg_def VSR61 ( SOC, SOC, Op_VecX, 61, NULL);
|
||||
reg_def VSR62 ( SOC, SOC, Op_VecX, 62, NULL);
|
||||
reg_def VSR63 ( SOC, SOC, Op_VecX, 63, NULL);
|
||||
|
||||
// ----------------------------
|
||||
// Specify priority of register selection within phases of register
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2012, 2022 SAP SE. All rights reserved.
|
||||
* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2012, 2018 SAP SE. 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
|
||||
@@ -69,11 +69,7 @@ typedef VMRegImpl* VMReg;
|
||||
// v14-v19 Volatile scratch registers
|
||||
// v20-v31 Non-volatile registers
|
||||
// vrsave Non-volatile 32-bit register
|
||||
//
|
||||
// ----------------------------------------------
|
||||
// On processors with VSX feature:
|
||||
// vs0-31 Alias for f0-f31 (64 bit, see above)
|
||||
// vs32-63 Alias for v0-31 (128 bit, see above)
|
||||
|
||||
|
||||
// Use Register as shortcut
|
||||
class RegisterImpl;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2012, 2022 SAP SE. All rights reserved.
|
||||
* Copyright (c) 2012, 2020 SAP SE. 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
|
||||
@@ -44,14 +44,8 @@ void VMRegImpl::set_regName() {
|
||||
if (reg->encoding() < FloatRegisterImpl::number_of_registers-1)
|
||||
freg = freg->successor();
|
||||
}
|
||||
|
||||
VectorSRegister vsreg = ::as_VectorSRegister(0);
|
||||
for ( ; i < ConcreteRegisterImpl::max_vsr; ) {
|
||||
regName[i++] = vsreg->name();
|
||||
}
|
||||
|
||||
for ( ; i < ConcreteRegisterImpl::number_of_registers; ) {
|
||||
regName[i++] = "NON-GPR-FPR-VSR";
|
||||
for ( ; i < ConcreteRegisterImpl::number_of_registers; i++) {
|
||||
regName[i] = "NON-GPR-FPR";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2012, 2022 SAP SE. All rights reserved.
|
||||
* Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2012, 2021 SAP SE. 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
|
||||
@@ -35,7 +35,7 @@ inline bool is_FloatRegister() {
|
||||
value() < ConcreteRegisterImpl::max_fpr;
|
||||
}
|
||||
|
||||
inline bool is_VectorSRegister() {
|
||||
inline bool is_VectorRegister() {
|
||||
return value() >= ConcreteRegisterImpl::max_fpr &&
|
||||
value() < ConcreteRegisterImpl::max_vsr;
|
||||
}
|
||||
@@ -60,11 +60,6 @@ inline FloatRegister as_FloatRegister() {
|
||||
return ::as_FloatRegister((value() - ConcreteRegisterImpl::max_gpr) >> 1);
|
||||
}
|
||||
|
||||
inline VectorSRegister as_VectorSRegister() {
|
||||
assert(is_VectorSRegister(), "must be");
|
||||
return ::as_VectorSRegister(value() - ConcreteRegisterImpl::max_fpr);
|
||||
}
|
||||
|
||||
inline bool is_concrete() {
|
||||
assert(is_reg(), "must be");
|
||||
return is_even(value());
|
||||
|
||||
@@ -155,10 +155,6 @@ inline intptr_t* frame::link() const {
|
||||
return (intptr_t*) callers_abi()->callers_sp;
|
||||
}
|
||||
|
||||
inline intptr_t* frame::link_or_null() const {
|
||||
return link();
|
||||
}
|
||||
|
||||
inline intptr_t** frame::interpreter_frame_locals_addr() const {
|
||||
return (intptr_t**) &(ijava_state()->locals);
|
||||
}
|
||||
|
||||
@@ -72,7 +72,7 @@
|
||||
|
||||
// We don't have to flush registers, so the stack is always walkable.
|
||||
inline bool walkable(void) { return true; }
|
||||
inline void make_walkable() { }
|
||||
inline void make_walkable(JavaThread* thread) { }
|
||||
|
||||
public:
|
||||
|
||||
|
||||
@@ -341,9 +341,13 @@ frame frame::sender_for_entry_frame(RegisterMap* map) const {
|
||||
assert(jfa->last_Java_sp() > sp(), "must be above this frame on stack");
|
||||
// Since we are walking the stack now this nested anchor is obviously walkable
|
||||
// even if it wasn't when it was stacked.
|
||||
jfa->make_walkable();
|
||||
if (!jfa->walkable()) {
|
||||
// Capture _last_Java_pc (if needed) and mark anchor walkable.
|
||||
jfa->capture_last_Java_pc();
|
||||
}
|
||||
map->clear();
|
||||
assert(map->include_argument_oops(), "should be set by clear");
|
||||
vmassert(jfa->last_Java_pc() != NULL, "not walkable");
|
||||
frame fr(jfa->last_Java_sp(), jfa->last_Java_fp(), jfa->last_Java_pc());
|
||||
|
||||
return fr;
|
||||
@@ -373,9 +377,13 @@ frame frame::sender_for_optimized_entry_frame(RegisterMap* map) const {
|
||||
assert(jfa->last_Java_sp() > sp(), "must be above this frame on stack");
|
||||
// Since we are walking the stack now this nested anchor is obviously walkable
|
||||
// even if it wasn't when it was stacked.
|
||||
jfa->make_walkable();
|
||||
if (!jfa->walkable()) {
|
||||
// Capture _last_Java_pc (if needed) and mark anchor walkable.
|
||||
jfa->capture_last_Java_pc();
|
||||
}
|
||||
map->clear();
|
||||
assert(map->include_argument_oops(), "should be set by clear");
|
||||
vmassert(jfa->last_Java_pc() != NULL, "not walkable");
|
||||
frame fr(jfa->last_Java_sp(), jfa->last_Java_fp(), jfa->last_Java_pc());
|
||||
|
||||
return fr;
|
||||
@@ -713,12 +721,20 @@ frame::frame(void* sp, void* fp, void* pc) {
|
||||
void frame::pd_ps() {}
|
||||
#endif
|
||||
|
||||
void JavaFrameAnchor::make_walkable() {
|
||||
void JavaFrameAnchor::make_walkable(JavaThread* thread) {
|
||||
// last frame set?
|
||||
if (last_Java_sp() == NULL) return;
|
||||
// already walkable?
|
||||
if (walkable()) return;
|
||||
vmassert(Thread::current() == (Thread*)thread, "not current thread");
|
||||
vmassert(last_Java_sp() != NULL, "not called from Java code?");
|
||||
vmassert(last_Java_pc() == NULL, "already walkable");
|
||||
_last_Java_pc = (address)_last_Java_sp[-1];
|
||||
capture_last_Java_pc();
|
||||
vmassert(walkable(), "something went wrong");
|
||||
}
|
||||
|
||||
void JavaFrameAnchor::capture_last_Java_pc() {
|
||||
vmassert(_last_Java_sp != NULL, "no last frame set");
|
||||
vmassert(_last_Java_pc == NULL, "already walkable");
|
||||
_last_Java_pc = (address)_last_Java_sp[-1];
|
||||
}
|
||||
|
||||
@@ -138,12 +138,9 @@ inline intptr_t* frame::id(void) const { return unextended_sp(); }
|
||||
inline bool frame::is_older(intptr_t* id) const { assert(this->id() != NULL && id != NULL, "NULL frame id");
|
||||
return this->id() > id ; }
|
||||
|
||||
inline intptr_t* frame::link() const { return (intptr_t*) *(intptr_t **)addr_at(link_offset); }
|
||||
|
||||
inline intptr_t* frame::link_or_null() const {
|
||||
intptr_t** ptr = (intptr_t **)addr_at(link_offset);
|
||||
return os::is_readable_pointer(ptr) ? *ptr : NULL;
|
||||
}
|
||||
|
||||
inline intptr_t* frame::link() const { return (intptr_t*) *(intptr_t **)addr_at(link_offset); }
|
||||
|
||||
inline intptr_t* frame::unextended_sp() const { return _unextended_sp; }
|
||||
|
||||
|
||||
@@ -1123,7 +1123,7 @@ void InterpreterMacroAssembler::remove_activation(
|
||||
|
||||
bind(loop);
|
||||
// check if current entry is used
|
||||
cmpptr(Address(rmon, BasicObjectLock::obj_offset_in_bytes()), (int32_t) NULL_WORD);
|
||||
cmpptr(Address(rmon, BasicObjectLock::obj_offset_in_bytes()), (int32_t) NULL);
|
||||
jcc(Assembler::notEqual, exception);
|
||||
|
||||
addptr(rmon, entry_size); // otherwise advance to next entry
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2003, 2019, 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
|
||||
@@ -348,10 +348,10 @@ class SlowSignatureHandler
|
||||
intptr_t *from_addr = (intptr_t*)(_from + Interpreter::local_offset_in_bytes(0));
|
||||
_from -= Interpreter::stackElementSize;
|
||||
if (_num_args < Argument::n_int_register_parameters_c-1) {
|
||||
*_reg_args++ = (*from_addr == 0) ? NULL_WORD : (intptr_t) from_addr;
|
||||
*_reg_args++ = (*from_addr == 0) ? NULL : (intptr_t) from_addr;
|
||||
_num_args++;
|
||||
} else {
|
||||
*_to++ = (*from_addr == 0) ? NULL_WORD : (intptr_t) from_addr;
|
||||
*_to++ = (*from_addr == 0) ? NULL : (intptr_t) from_addr;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -443,10 +443,10 @@ class SlowSignatureHandler
|
||||
_from -= Interpreter::stackElementSize;
|
||||
|
||||
if (_num_int_args < Argument::n_int_register_parameters_c-1) {
|
||||
*_int_args++ = (*from_addr == 0) ? NULL_WORD : (intptr_t)from_addr;
|
||||
*_int_args++ = (*from_addr == 0) ? NULL : (intptr_t)from_addr;
|
||||
_num_int_args++;
|
||||
} else {
|
||||
*_to++ = (*from_addr == 0) ? NULL_WORD : (intptr_t) from_addr;
|
||||
*_to++ = (*from_addr == 0) ? NULL : (intptr_t) from_addr;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -63,7 +63,8 @@ public:
|
||||
}
|
||||
|
||||
bool walkable(void) { return _last_Java_sp != NULL && _last_Java_pc != NULL; }
|
||||
void make_walkable();
|
||||
void make_walkable(JavaThread* thread);
|
||||
void capture_last_Java_pc(void);
|
||||
|
||||
intptr_t* last_Java_sp(void) const { return _last_Java_sp; }
|
||||
|
||||
|
||||
@@ -5269,28 +5269,10 @@ void MacroAssembler::clear_mem(Register base, int cnt, Register rtmp, XMMRegiste
|
||||
|
||||
int vector64_count = (cnt & (~0x7)) >> 3;
|
||||
cnt = cnt & 0x7;
|
||||
const int fill64_per_loop = 4;
|
||||
const int max_unrolled_fill64 = 8;
|
||||
|
||||
// 64 byte initialization loop.
|
||||
vpxor(xtmp, xtmp, xtmp, use64byteVector ? AVX_512bit : AVX_256bit);
|
||||
int start64 = 0;
|
||||
if (vector64_count > max_unrolled_fill64) {
|
||||
Label LOOP;
|
||||
Register index = rtmp;
|
||||
|
||||
start64 = vector64_count - (vector64_count % fill64_per_loop);
|
||||
|
||||
movl(index, 0);
|
||||
BIND(LOOP);
|
||||
for (int i = 0; i < fill64_per_loop; i++) {
|
||||
fill64(Address(base, index, Address::times_1, i * 64), xtmp, use64byteVector);
|
||||
}
|
||||
addl(index, fill64_per_loop * 64);
|
||||
cmpl(index, start64 * 64);
|
||||
jccb(Assembler::less, LOOP);
|
||||
}
|
||||
for (int i = start64; i < vector64_count; i++) {
|
||||
for (int i = 0; i < vector64_count; i++) {
|
||||
fill64_avx(base, i * 64, xtmp, use64byteVector);
|
||||
}
|
||||
|
||||
@@ -8477,27 +8459,21 @@ void MacroAssembler::fill32_masked_avx(uint shift, Register dst, int disp,
|
||||
evmovdqu(type[shift], mask, Address(dst, disp), xmm, Assembler::AVX_256bit);
|
||||
}
|
||||
|
||||
void MacroAssembler::fill32(Address dst, XMMRegister xmm) {
|
||||
assert(MaxVectorSize >= 32, "vector length should be >= 32");
|
||||
vmovdqu(dst, xmm);
|
||||
}
|
||||
|
||||
void MacroAssembler::fill32_avx(Register dst, int disp, XMMRegister xmm) {
|
||||
fill32(Address(dst, disp), xmm);
|
||||
}
|
||||
|
||||
void MacroAssembler::fill64(Address dst, XMMRegister xmm, bool use64byteVector) {
|
||||
assert(MaxVectorSize >= 32, "vector length should be >= 32");
|
||||
if (!use64byteVector) {
|
||||
fill32(dst, xmm);
|
||||
fill32(dst.plus_disp(32), xmm);
|
||||
} else {
|
||||
evmovdquq(dst, xmm, Assembler::AVX_512bit);
|
||||
}
|
||||
vmovdqu(Address(dst, disp), xmm);
|
||||
}
|
||||
|
||||
void MacroAssembler::fill64_avx(Register dst, int disp, XMMRegister xmm, bool use64byteVector) {
|
||||
fill64(Address(dst, disp), xmm, use64byteVector);
|
||||
assert(MaxVectorSize >= 32, "vector length should be >= 32");
|
||||
BasicType type[] = {T_BYTE, T_SHORT, T_INT, T_LONG};
|
||||
if (!use64byteVector) {
|
||||
fill32_avx(dst, disp, xmm);
|
||||
fill32_avx(dst, disp + 32, xmm);
|
||||
} else {
|
||||
evmovdquq(Address(dst, disp), xmm, Assembler::AVX_512bit);
|
||||
}
|
||||
}
|
||||
|
||||
#endif //COMPILER2_OR_JVMCI
|
||||
|
||||
@@ -1860,12 +1860,8 @@ public:
|
||||
XMMRegister xmm, KRegister mask, Register length,
|
||||
Register temp);
|
||||
|
||||
void fill32(Address dst, XMMRegister xmm);
|
||||
|
||||
void fill32_avx(Register dst, int disp, XMMRegister xmm);
|
||||
|
||||
void fill64(Address dst, XMMRegister xmm, bool use64byteVector = false);
|
||||
|
||||
void fill64_avx(Register dst, int dis, XMMRegister xmm, bool use64byteVector = false);
|
||||
|
||||
#ifdef _LP64
|
||||
|
||||
@@ -150,8 +150,8 @@ class RegisterSaver {
|
||||
};
|
||||
|
||||
public:
|
||||
static OopMap* save_live_registers(MacroAssembler* masm, int additional_frame_words, int* total_frame_words, bool save_wide_vectors);
|
||||
static void restore_live_registers(MacroAssembler* masm, bool restore_wide_vectors = false);
|
||||
static OopMap* save_live_registers(MacroAssembler* masm, int additional_frame_words, int* total_frame_words, bool save_vectors);
|
||||
static void restore_live_registers(MacroAssembler* masm, bool restore_vectors = false);
|
||||
|
||||
// Offsets into the register save area
|
||||
// Used by deoptimization when it is managing result register
|
||||
@@ -168,19 +168,19 @@ class RegisterSaver {
|
||||
static void restore_result_registers(MacroAssembler* masm);
|
||||
};
|
||||
|
||||
OopMap* RegisterSaver::save_live_registers(MacroAssembler* masm, int additional_frame_words, int* total_frame_words, bool save_wide_vectors) {
|
||||
OopMap* RegisterSaver::save_live_registers(MacroAssembler* masm, int additional_frame_words, int* total_frame_words, bool save_vectors) {
|
||||
int off = 0;
|
||||
int num_xmm_regs = XMMRegisterImpl::number_of_registers;
|
||||
if (UseAVX < 3) {
|
||||
num_xmm_regs = num_xmm_regs/2;
|
||||
}
|
||||
#if COMPILER2_OR_JVMCI
|
||||
if (save_wide_vectors && UseAVX == 0) {
|
||||
save_wide_vectors = false; // vectors larger than 16 byte long are supported only with AVX
|
||||
if (save_vectors && UseAVX == 0) {
|
||||
save_vectors = false; // vectors larger than 16 byte long are supported only with AVX
|
||||
}
|
||||
assert(!save_wide_vectors || MaxVectorSize <= 64, "Only up to 64 byte long vectors are supported");
|
||||
assert(!save_vectors || MaxVectorSize <= 64, "Only up to 64 byte long vectors are supported");
|
||||
#else
|
||||
save_wide_vectors = false; // vectors are generated only by C2 and JVMCI
|
||||
save_vectors = false; // vectors are generated only by C2 and JVMCI
|
||||
#endif
|
||||
|
||||
// Always make the frame size 16-byte aligned, both vector and non vector stacks are always allocated
|
||||
@@ -201,7 +201,7 @@ OopMap* RegisterSaver::save_live_registers(MacroAssembler* masm, int additional_
|
||||
__ push_CPU_state(); // Push a multiple of 16 bytes
|
||||
|
||||
// push cpu state handles this on EVEX enabled targets
|
||||
if (save_wide_vectors) {
|
||||
if (save_vectors) {
|
||||
// Save upper half of YMM registers(0..15)
|
||||
int base_addr = XSAVE_AREA_YMM_BEGIN;
|
||||
for (int n = 0; n < 16; n++) {
|
||||
@@ -230,12 +230,11 @@ OopMap* RegisterSaver::save_live_registers(MacroAssembler* masm, int additional_
|
||||
}
|
||||
} else {
|
||||
if (VM_Version::supports_evex()) {
|
||||
// Save upper bank of XMM registers(16..31) for scalar or 16-byte vector usage
|
||||
// Save upper bank of ZMM registers(16..31) for double/float usage
|
||||
int base_addr = XSAVE_AREA_UPPERBANK;
|
||||
off = 0;
|
||||
int vector_len = VM_Version::supports_avx512vl() ? Assembler::AVX_128bit : Assembler::AVX_512bit;
|
||||
for (int n = 16; n < num_xmm_regs; n++) {
|
||||
__ evmovdqul(Address(rsp, base_addr+(off++*64)), as_XMMRegister(n), vector_len);
|
||||
__ movsd(Address(rsp, base_addr+(off++*64)), as_XMMRegister(n));
|
||||
}
|
||||
#if COMPILER2_OR_JVMCI
|
||||
base_addr = XSAVE_AREA_OPMASK_BEGIN;
|
||||
@@ -299,7 +298,7 @@ OopMap* RegisterSaver::save_live_registers(MacroAssembler* masm, int additional_
|
||||
}
|
||||
|
||||
#if COMPILER2_OR_JVMCI
|
||||
if (save_wide_vectors) {
|
||||
if (save_vectors) {
|
||||
// Save upper half of YMM registers(0..15)
|
||||
off = ymm0_off;
|
||||
delta = ymm1_off - ymm0_off;
|
||||
@@ -362,7 +361,7 @@ OopMap* RegisterSaver::save_live_registers(MacroAssembler* masm, int additional_
|
||||
return map;
|
||||
}
|
||||
|
||||
void RegisterSaver::restore_live_registers(MacroAssembler* masm, bool restore_wide_vectors) {
|
||||
void RegisterSaver::restore_live_registers(MacroAssembler* masm, bool restore_vectors) {
|
||||
int num_xmm_regs = XMMRegisterImpl::number_of_registers;
|
||||
if (UseAVX < 3) {
|
||||
num_xmm_regs = num_xmm_regs/2;
|
||||
@@ -373,18 +372,18 @@ void RegisterSaver::restore_live_registers(MacroAssembler* masm, bool restore_wi
|
||||
}
|
||||
|
||||
#if COMPILER2_OR_JVMCI
|
||||
if (restore_wide_vectors) {
|
||||
if (restore_vectors) {
|
||||
assert(UseAVX > 0, "Vectors larger than 16 byte long are supported only with AVX");
|
||||
assert(MaxVectorSize <= 64, "Only up to 64 byte long vectors are supported");
|
||||
}
|
||||
#else
|
||||
assert(!restore_wide_vectors, "vectors are generated only by C2");
|
||||
assert(!restore_vectors, "vectors are generated only by C2");
|
||||
#endif
|
||||
|
||||
__ vzeroupper();
|
||||
|
||||
// On EVEX enabled targets everything is handled in pop fpu state
|
||||
if (restore_wide_vectors) {
|
||||
if (restore_vectors) {
|
||||
// Restore upper half of YMM registers (0..15)
|
||||
int base_addr = XSAVE_AREA_YMM_BEGIN;
|
||||
for (int n = 0; n < 16; n++) {
|
||||
@@ -413,12 +412,11 @@ void RegisterSaver::restore_live_registers(MacroAssembler* masm, bool restore_wi
|
||||
}
|
||||
} else {
|
||||
if (VM_Version::supports_evex()) {
|
||||
// Restore upper bank of XMM registers(16..31) for scalar or 16-byte vector usage
|
||||
// Restore upper bank of ZMM registers(16..31) for double/float usage
|
||||
int base_addr = XSAVE_AREA_UPPERBANK;
|
||||
int off = 0;
|
||||
int vector_len = VM_Version::supports_avx512vl() ? Assembler::AVX_128bit : Assembler::AVX_512bit;
|
||||
for (int n = 16; n < num_xmm_regs; n++) {
|
||||
__ evmovdqul(as_XMMRegister(n), Address(rsp, base_addr+(off++*64)), vector_len);
|
||||
__ movsd(as_XMMRegister(n), Address(rsp, base_addr+(off++*64)));
|
||||
}
|
||||
#if COMPILER2_OR_JVMCI
|
||||
base_addr = XSAVE_AREA_OPMASK_BEGIN;
|
||||
@@ -2503,7 +2501,7 @@ void SharedRuntime::generate_deopt_blob() {
|
||||
// Prolog for non exception case!
|
||||
|
||||
// Save everything in sight.
|
||||
map = RegisterSaver::save_live_registers(masm, 0, &frame_size_in_words, /*save_wide_vectors*/ true);
|
||||
map = RegisterSaver::save_live_registers(masm, 0, &frame_size_in_words, /*save_vectors*/ true);
|
||||
|
||||
// Normal deoptimization. Save exec mode for unpack_frames.
|
||||
__ movl(r14, Deoptimization::Unpack_deopt); // callee-saved
|
||||
@@ -2521,7 +2519,7 @@ void SharedRuntime::generate_deopt_blob() {
|
||||
// return address is the pc describes what bci to do re-execute at
|
||||
|
||||
// No need to update map as each call to save_live_registers will produce identical oopmap
|
||||
(void) RegisterSaver::save_live_registers(masm, 0, &frame_size_in_words, /*save_wide_vectors*/ true);
|
||||
(void) RegisterSaver::save_live_registers(masm, 0, &frame_size_in_words, /*save_vectors*/ true);
|
||||
|
||||
__ movl(r14, Deoptimization::Unpack_reexecute); // callee-saved
|
||||
__ jmp(cont);
|
||||
@@ -2540,7 +2538,7 @@ void SharedRuntime::generate_deopt_blob() {
|
||||
uncommon_trap_offset = __ pc() - start;
|
||||
|
||||
// Save everything in sight.
|
||||
RegisterSaver::save_live_registers(masm, 0, &frame_size_in_words, /*save_wide_vectors*/ true);
|
||||
RegisterSaver::save_live_registers(masm, 0, &frame_size_in_words, /*save_vectors*/ true);
|
||||
// fetch_unroll_info needs to call last_java_frame()
|
||||
__ set_last_Java_frame(noreg, noreg, NULL);
|
||||
|
||||
@@ -2587,7 +2585,7 @@ void SharedRuntime::generate_deopt_blob() {
|
||||
__ push(0);
|
||||
|
||||
// Save everything in sight.
|
||||
map = RegisterSaver::save_live_registers(masm, 0, &frame_size_in_words, /*save_wide_vectors*/ true);
|
||||
map = RegisterSaver::save_live_registers(masm, 0, &frame_size_in_words, /*save_vectors*/ true);
|
||||
|
||||
// Now it is safe to overwrite any register
|
||||
|
||||
@@ -3018,7 +3016,7 @@ SafepointBlob* SharedRuntime::generate_handler_blob(address call_ptr, int poll_t
|
||||
address call_pc = NULL;
|
||||
int frame_size_in_words;
|
||||
bool cause_return = (poll_type == POLL_AT_RETURN);
|
||||
bool save_wide_vectors = (poll_type == POLL_AT_VECTOR_LOOP);
|
||||
bool save_vectors = (poll_type == POLL_AT_VECTOR_LOOP);
|
||||
|
||||
if (UseRTMLocking) {
|
||||
// Abort RTM transaction before calling runtime
|
||||
@@ -3033,7 +3031,7 @@ SafepointBlob* SharedRuntime::generate_handler_blob(address call_ptr, int poll_t
|
||||
}
|
||||
|
||||
// Save registers, fpu state, and flags
|
||||
map = RegisterSaver::save_live_registers(masm, 0, &frame_size_in_words, save_wide_vectors);
|
||||
map = RegisterSaver::save_live_registers(masm, 0, &frame_size_in_words, save_vectors);
|
||||
|
||||
// The following is basically a call_VM. However, we need the precise
|
||||
// address of the call in order to generate an oopmap. Hence, we do all the
|
||||
@@ -3072,7 +3070,7 @@ SafepointBlob* SharedRuntime::generate_handler_blob(address call_ptr, int poll_t
|
||||
|
||||
// Exception pending
|
||||
|
||||
RegisterSaver::restore_live_registers(masm, save_wide_vectors);
|
||||
RegisterSaver::restore_live_registers(masm, save_vectors);
|
||||
|
||||
__ jump(RuntimeAddress(StubRoutines::forward_exception_entry()));
|
||||
|
||||
@@ -3145,7 +3143,7 @@ SafepointBlob* SharedRuntime::generate_handler_blob(address call_ptr, int poll_t
|
||||
|
||||
__ bind(no_adjust);
|
||||
// Normal exit, restore registers and exit.
|
||||
RegisterSaver::restore_live_registers(masm, save_wide_vectors);
|
||||
RegisterSaver::restore_live_registers(masm, save_vectors);
|
||||
__ ret(0);
|
||||
|
||||
#ifdef ASSERT
|
||||
@@ -3185,7 +3183,7 @@ RuntimeStub* SharedRuntime::generate_resolve_blob(address destination, const cha
|
||||
int start = __ offset();
|
||||
|
||||
// No need to save vector registers since they are caller-saved anyway.
|
||||
map = RegisterSaver::save_live_registers(masm, 0, &frame_size_in_words, /*save_wide_vectors*/ false);
|
||||
map = RegisterSaver::save_live_registers(masm, 0, &frame_size_in_words, /*save_vectors*/ false);
|
||||
|
||||
int frame_complete = __ offset();
|
||||
|
||||
|
||||
@@ -517,7 +517,7 @@ class StubGenerator: public StubCodeGenerator {
|
||||
// make sure this code is only executed if there is a pending exception
|
||||
{
|
||||
Label L;
|
||||
__ cmpptr(Address(r15_thread, Thread::pending_exception_offset()), (int32_t) NULL_WORD);
|
||||
__ cmpptr(Address(r15_thread, Thread::pending_exception_offset()), (int32_t) NULL);
|
||||
__ jcc(Assembler::notEqual, L);
|
||||
__ stop("StubRoutines::forward exception: no pending exception (1)");
|
||||
__ bind(L);
|
||||
|
||||
@@ -82,11 +82,6 @@ inline intptr_t* frame::link() const {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
inline intptr_t* frame::link_or_null() const {
|
||||
ShouldNotCallThis();
|
||||
return NULL;
|
||||
}
|
||||
|
||||
inline interpreterState frame::get_interpreterState() const {
|
||||
return zero_interpreterframe()->interpreter_state();
|
||||
}
|
||||
|
||||
@@ -73,7 +73,7 @@
|
||||
return true;
|
||||
}
|
||||
|
||||
void make_walkable() {
|
||||
void make_walkable(JavaThread* thread) {
|
||||
// nothing to do
|
||||
}
|
||||
|
||||
|
||||
@@ -1161,7 +1161,7 @@ void *os::dll_load(const char *filename, char *ebuf, int ebuflen) {
|
||||
// RTLD_LAZY is currently not implemented. The dl is loaded immediately with all its dependants.
|
||||
void * result= ::dlopen(filename, RTLD_LAZY);
|
||||
if (result != NULL) {
|
||||
Events::log_dll_message(NULL, "Loaded shared library %s", filename);
|
||||
Events::log(NULL, "Loaded shared library %s", filename);
|
||||
// Reload dll cache. Don't do this in signal handling.
|
||||
LoadedLibraries::reload();
|
||||
log_info(os)("shared library load of %s was successful", filename);
|
||||
@@ -1176,7 +1176,7 @@ void *os::dll_load(const char *filename, char *ebuf, int ebuflen) {
|
||||
snprintf(ebuf, ebuflen - 1, "%s, LIBPATH=%s, LD_LIBRARY_PATH=%s : %s",
|
||||
filename, ::getenv("LIBPATH"), ::getenv("LD_LIBRARY_PATH"), error_report);
|
||||
}
|
||||
Events::log_dll_message(NULL, "Loading shared library %s failed, %s", filename, error_report);
|
||||
Events::log(NULL, "Loading shared library %s failed, %s", filename, error_report);
|
||||
log_info(os)("shared library load of %s failed, %s", filename, error_report);
|
||||
}
|
||||
return NULL;
|
||||
@@ -1186,6 +1186,15 @@ void * os::dll_load_utf8(const char *filename, char *ebuf, int ebuflen) {
|
||||
return os::dll_load(filename, ebuf, ebuflen);
|
||||
}
|
||||
|
||||
void* os::dll_lookup(void* handle, const char* name) {
|
||||
void* res = dlsym(handle, name);
|
||||
return res;
|
||||
}
|
||||
|
||||
void* os::get_default_process_handle() {
|
||||
return (void*)::dlopen(NULL, RTLD_LAZY);
|
||||
}
|
||||
|
||||
void os::print_dll_info(outputStream *st) {
|
||||
st->print_cr("Dynamic libraries:");
|
||||
LoadedLibraries::print(st);
|
||||
@@ -2204,6 +2213,13 @@ char* os::pd_attempt_reserve_memory_at(char* requested_addr, size_t bytes, bool
|
||||
return addr;
|
||||
}
|
||||
|
||||
// Sleep forever; naked call to OS-specific sleep; use with CAUTION
|
||||
void os::infinite_sleep() {
|
||||
while (true) { // sleep forever ...
|
||||
::sleep(100); // ... 100 seconds at a time
|
||||
}
|
||||
}
|
||||
|
||||
// Used to convert frequent JVM_Yield() to nops
|
||||
bool os::dont_yield() {
|
||||
return DontYieldALot;
|
||||
@@ -2539,6 +2555,47 @@ os::os_exception_wrapper(java_call_t f, JavaValue* value, const methodHandle& me
|
||||
f(value, method, args, thread);
|
||||
}
|
||||
|
||||
void os::print_statistics() {
|
||||
}
|
||||
|
||||
bool os::message_box(const char* title, const char* message) {
|
||||
int i;
|
||||
fdStream err(defaultStream::error_fd());
|
||||
for (i = 0; i < 78; i++) err.print_raw("=");
|
||||
err.cr();
|
||||
err.print_raw_cr(title);
|
||||
for (i = 0; i < 78; i++) err.print_raw("-");
|
||||
err.cr();
|
||||
err.print_raw_cr(message);
|
||||
for (i = 0; i < 78; i++) err.print_raw("=");
|
||||
err.cr();
|
||||
|
||||
char buf[16];
|
||||
// Prevent process from exiting upon "read error" without consuming all CPU
|
||||
while (::read(0, buf, sizeof(buf)) <= 0) { ::sleep(100); }
|
||||
|
||||
return buf[0] == 'y' || buf[0] == 'Y';
|
||||
}
|
||||
|
||||
// Is a (classpath) directory empty?
|
||||
bool os::dir_is_empty(const char* path) {
|
||||
DIR *dir = NULL;
|
||||
struct dirent *ptr;
|
||||
|
||||
dir = opendir(path);
|
||||
if (dir == NULL) return true;
|
||||
|
||||
/* Scan the directory */
|
||||
bool result = true;
|
||||
while (result && (ptr = readdir(dir)) != NULL) {
|
||||
if (strcmp(ptr->d_name, ".") != 0 && strcmp(ptr->d_name, "..") != 0) {
|
||||
result = false;
|
||||
}
|
||||
}
|
||||
closedir(dir);
|
||||
return result;
|
||||
}
|
||||
|
||||
// This code originates from JDK's sysOpen and open64_w
|
||||
// from src/solaris/hpi/src/system_md.c
|
||||
|
||||
|
||||
@@ -1050,7 +1050,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
|
||||
|
||||
void * result= ::dlopen(filename, RTLD_LAZY);
|
||||
if (result != NULL) {
|
||||
Events::log_dll_message(NULL, "Loaded shared library %s", filename);
|
||||
Events::log(NULL, "Loaded shared library %s", filename);
|
||||
// Successful loading
|
||||
log_info(os)("shared library load of %s was successful", filename);
|
||||
return result;
|
||||
@@ -1065,7 +1065,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
|
||||
::strncpy(ebuf, error_report, ebuflen-1);
|
||||
ebuf[ebuflen-1]='\0';
|
||||
}
|
||||
Events::log_dll_message(NULL, "Loading shared library %s failed, %s", filename, error_report);
|
||||
Events::log(NULL, "Loading shared library %s failed, %s", filename, error_report);
|
||||
log_info(os)("shared library load of %s failed, %s", filename, error_report);
|
||||
|
||||
return NULL;
|
||||
@@ -1079,7 +1079,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
|
||||
log_info(os)("attempting shared library load of %s", filename);
|
||||
void * result= ::dlopen(filename, RTLD_LAZY);
|
||||
if (result != NULL) {
|
||||
Events::log_dll_message(NULL, "Loaded shared library %s", filename);
|
||||
Events::log(NULL, "Loaded shared library %s", filename);
|
||||
// Successful loading
|
||||
log_info(os)("shared library load of %s was successful", filename);
|
||||
return result;
|
||||
@@ -1096,7 +1096,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
|
||||
::strncpy(ebuf, error_report, ebuflen-1);
|
||||
ebuf[ebuflen-1]='\0';
|
||||
}
|
||||
Events::log_dll_message(NULL, "Loading shared library %s failed, %s", filename, error_report);
|
||||
Events::log(NULL, "Loading shared library %s failed, %s", filename, error_report);
|
||||
log_info(os)("shared library load of %s failed, %s", filename, error_report);
|
||||
|
||||
int diag_msg_max_length=ebuflen-strlen(ebuf);
|
||||
@@ -1260,6 +1260,22 @@ void * os::dll_load_utf8(const char *filename, char *ebuf, int ebuflen) {
|
||||
return os::dll_load(filename, ebuf, ebuflen);
|
||||
}
|
||||
|
||||
void* os::get_default_process_handle() {
|
||||
#ifdef __APPLE__
|
||||
// MacOS X needs to use RTLD_FIRST instead of RTLD_LAZY
|
||||
// to avoid finding unexpected symbols on second (or later)
|
||||
// loads of a library.
|
||||
return (void*)::dlopen(NULL, RTLD_FIRST);
|
||||
#else
|
||||
return (void*)::dlopen(NULL, RTLD_LAZY);
|
||||
#endif
|
||||
}
|
||||
|
||||
// XXX: Do we need a lock around this as per Linux?
|
||||
void* os::dll_lookup(void* handle, const char* name) {
|
||||
return dlsym(handle, name);
|
||||
}
|
||||
|
||||
int _print_dll_info_cb(const char * name, address base_address, address top_address, void * param) {
|
||||
outputStream * out = (outputStream *) param;
|
||||
out->print_cr(INTPTR_FORMAT " \t%s", (intptr_t)base_address, name);
|
||||
@@ -1862,6 +1878,13 @@ char* os::pd_attempt_reserve_memory_at(char* requested_addr, size_t bytes, bool
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// Sleep forever; naked call to OS-specific sleep; use with CAUTION
|
||||
void os::infinite_sleep() {
|
||||
while (true) { // sleep forever ...
|
||||
::sleep(100); // ... 100 seconds at a time
|
||||
}
|
||||
}
|
||||
|
||||
// Used to convert frequent JVM_Yield() to nops
|
||||
bool os::dont_yield() {
|
||||
return DontYieldALot;
|
||||
@@ -2240,6 +2263,28 @@ void os::os_exception_wrapper(java_call_t f, JavaValue* value,
|
||||
f(value, method, args, thread);
|
||||
}
|
||||
|
||||
void os::print_statistics() {
|
||||
}
|
||||
|
||||
bool os::message_box(const char* title, const char* message) {
|
||||
int i;
|
||||
fdStream err(defaultStream::error_fd());
|
||||
for (i = 0; i < 78; i++) err.print_raw("=");
|
||||
err.cr();
|
||||
err.print_raw_cr(title);
|
||||
for (i = 0; i < 78; i++) err.print_raw("-");
|
||||
err.cr();
|
||||
err.print_raw_cr(message);
|
||||
for (i = 0; i < 78; i++) err.print_raw("=");
|
||||
err.cr();
|
||||
|
||||
char buf[16];
|
||||
// Prevent process from exiting upon "read error" without consuming all CPU
|
||||
while (::read(0, buf, sizeof(buf)) <= 0) { ::sleep(100); }
|
||||
|
||||
return buf[0] == 'y' || buf[0] == 'Y';
|
||||
}
|
||||
|
||||
static inline struct timespec get_mtime(const char* filename) {
|
||||
struct stat st;
|
||||
int ret = os::stat(filename, &st);
|
||||
@@ -2261,6 +2306,25 @@ int os::compare_file_modified_times(const char* file1, const char* file2) {
|
||||
return diff;
|
||||
}
|
||||
|
||||
// Is a (classpath) directory empty?
|
||||
bool os::dir_is_empty(const char* path) {
|
||||
DIR *dir = NULL;
|
||||
struct dirent *ptr;
|
||||
|
||||
dir = opendir(path);
|
||||
if (dir == NULL) return true;
|
||||
|
||||
// Scan the directory
|
||||
bool result = true;
|
||||
while (result && (ptr = readdir(dir)) != NULL) {
|
||||
if (strcmp(ptr->d_name, ".") != 0 && strcmp(ptr->d_name, "..") != 0) {
|
||||
result = false;
|
||||
}
|
||||
}
|
||||
closedir(dir);
|
||||
return result;
|
||||
}
|
||||
|
||||
// This code originates from JDK's sysOpen and open64_w
|
||||
// from src/solaris/hpi/src/system_md.c
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2019, 2021, 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
|
||||
@@ -260,13 +260,7 @@ bool CgroupSubsystemFactory::determine_type(CgroupInfo* cg_infos,
|
||||
}
|
||||
}
|
||||
if (is_cgroupsV2) {
|
||||
// On some systems we have mixed cgroups v1 and cgroups v2 controllers (e.g. freezer on cg1 and
|
||||
// all relevant controllers on cg2). Only set the cgroup path when we see a hierarchy id of 0.
|
||||
if (hierarchy_id != 0) {
|
||||
continue;
|
||||
}
|
||||
for (int i = 0; i < CG_INFO_LENGTH; i++) {
|
||||
assert(cg_infos[i]._cgroup_path == NULL, "cgroup path must only be set once");
|
||||
cg_infos[i]._cgroup_path = os::strdup(cgroup_path);
|
||||
}
|
||||
}
|
||||
@@ -501,10 +495,7 @@ int CgroupSubsystem::active_processor_count() {
|
||||
cpu_count = limit_count = os::Linux::active_processor_count();
|
||||
int quota = cpu_quota();
|
||||
int period = cpu_period();
|
||||
|
||||
// It's not a good idea to use cpu_shares() to limit the number
|
||||
// of CPUs used by the JVM. See JDK-8281181.
|
||||
int share = UseContainerCpuShares ? cpu_shares() : -1;
|
||||
int share = cpu_shares();
|
||||
|
||||
if (quota > -1 && period > 0) {
|
||||
quota_count = ceilf((float)quota / (float)period);
|
||||
|
||||
@@ -136,39 +136,19 @@ jlong CgroupV1Subsystem::memory_and_swap_limit_in_bytes() {
|
||||
const char* matchline = "hierarchical_memsw_limit";
|
||||
const char* format = "%s " JULONG_FORMAT;
|
||||
GET_CONTAINER_INFO_LINE(julong, _memory->controller(), "/memory.stat", matchline,
|
||||
"Hierarchical Memory and Swap Limit is : " JULONG_FORMAT, format, hier_memswlimit)
|
||||
if (hier_memswlimit >= _unlimited_memory) {
|
||||
"Hierarchical Memory and Swap Limit is : " JULONG_FORMAT, format, hier_memlimit)
|
||||
if (hier_memlimit >= _unlimited_memory) {
|
||||
log_trace(os, container)("Hierarchical Memory and Swap Limit is: Unlimited");
|
||||
} else {
|
||||
jlong swappiness = read_mem_swappiness();
|
||||
if (swappiness == 0) {
|
||||
const char* matchmemline = "hierarchical_memory_limit";
|
||||
GET_CONTAINER_INFO_LINE(julong, _memory->controller(), "/memory.stat", matchmemline,
|
||||
"Hierarchical Memory Limit is : " JULONG_FORMAT, format, hier_memlimit)
|
||||
log_trace(os, container)("Memory and Swap Limit has been reset to " JULONG_FORMAT " because swappiness is 0", hier_memlimit);
|
||||
return (jlong)hier_memlimit;
|
||||
}
|
||||
return (jlong)hier_memswlimit;
|
||||
return (jlong)hier_memlimit;
|
||||
}
|
||||
}
|
||||
return (jlong)-1;
|
||||
} else {
|
||||
jlong swappiness = read_mem_swappiness();
|
||||
if (swappiness == 0) {
|
||||
jlong memlimit = read_memory_limit_in_bytes();
|
||||
log_trace(os, container)("Memory and Swap Limit has been reset to " JULONG_FORMAT " because swappiness is 0", memlimit);
|
||||
return memlimit;
|
||||
}
|
||||
return (jlong)memswlimit;
|
||||
}
|
||||
}
|
||||
|
||||
jlong CgroupV1Subsystem::read_mem_swappiness() {
|
||||
GET_CONTAINER_INFO(julong, _memory->controller(), "/memory.swappiness",
|
||||
"Swappiness is: " JULONG_FORMAT, JULONG_FORMAT, swappiness);
|
||||
return swappiness;
|
||||
}
|
||||
|
||||
jlong CgroupV1Subsystem::memory_soft_limit_in_bytes() {
|
||||
GET_CONTAINER_INFO(julong, _memory->controller(), "/memory.soft_limit_in_bytes",
|
||||
"Memory Soft Limit is: " JULONG_FORMAT, JULONG_FORMAT, memsoftlimit);
|
||||
|
||||
@@ -108,8 +108,6 @@ class CgroupV1Subsystem: public CgroupSubsystem {
|
||||
|
||||
char * pids_max_val();
|
||||
|
||||
jlong read_mem_swappiness();
|
||||
|
||||
public:
|
||||
CgroupV1Subsystem(CgroupV1Controller* cpuset,
|
||||
CgroupV1Controller* cpu,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2005, 2020, 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
|
||||
@@ -59,10 +59,6 @@
|
||||
product(bool, UseContainerSupport, true, \
|
||||
"Enable detection and runtime container configuration support") \
|
||||
\
|
||||
product(bool, UseContainerCpuShares, false, \
|
||||
"Include CPU shares in the CPU availability" \
|
||||
" calculation.") \
|
||||
\
|
||||
product(bool, PreferContainerQuotaForCPUCount, true, \
|
||||
"Calculate the container CPU availability based on the value" \
|
||||
" of quotas (if set), when true. Otherwise, use the CPU" \
|
||||
|
||||
@@ -1822,10 +1822,10 @@ void * os::Linux::dlopen_helper(const char *filename, char *ebuf,
|
||||
::strncpy(ebuf, error_report, ebuflen-1);
|
||||
ebuf[ebuflen-1]='\0';
|
||||
}
|
||||
Events::log_dll_message(NULL, "Loading shared library %s failed, %s", filename, error_report);
|
||||
Events::log(NULL, "Loading shared library %s failed, %s", filename, error_report);
|
||||
log_info(os)("shared library load of %s failed, %s", filename, error_report);
|
||||
} else {
|
||||
Events::log_dll_message(NULL, "Loaded shared library %s", filename);
|
||||
Events::log(NULL, "Loaded shared library %s", filename);
|
||||
log_info(os)("shared library load of %s was successful", filename);
|
||||
}
|
||||
return result;
|
||||
@@ -1861,16 +1861,13 @@ void * os::Linux::dll_load_in_vmthread(const char *filename, char *ebuf,
|
||||
return result;
|
||||
}
|
||||
|
||||
const char* os::Linux::dll_path(void* lib) {
|
||||
struct link_map *lmap;
|
||||
const char* l_path = NULL;
|
||||
assert(lib != NULL, "dll_path parameter must not be NULL");
|
||||
void* os::dll_lookup(void* handle, const char* name) {
|
||||
void* res = dlsym(handle, name);
|
||||
return res;
|
||||
}
|
||||
|
||||
int res_dli = ::dlinfo(lib, RTLD_DI_LINKMAP, &lmap);
|
||||
if (res_dli == 0) {
|
||||
l_path = lmap->l_name;
|
||||
}
|
||||
return l_path;
|
||||
void* os::get_default_process_handle() {
|
||||
return (void*)::dlopen(NULL, RTLD_LAZY);
|
||||
}
|
||||
|
||||
static bool _print_ascii_file(const char* filename, outputStream* st, const char* hdr = NULL) {
|
||||
@@ -4258,6 +4255,13 @@ char* os::pd_attempt_reserve_memory_at(char* requested_addr, size_t bytes, bool
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// Sleep forever; naked call to OS-specific sleep; use with CAUTION
|
||||
void os::infinite_sleep() {
|
||||
while (true) { // sleep forever ...
|
||||
::sleep(100); // ... 100 seconds at a time
|
||||
}
|
||||
}
|
||||
|
||||
// Used to convert frequent JVM_Yield() to nops
|
||||
bool os::dont_yield() {
|
||||
return DontYieldALot;
|
||||
@@ -4685,8 +4689,7 @@ static int _cpu_count(const cpu_set_t* cpus) {
|
||||
// dynamic check - see 6515172 for details.
|
||||
// If anything goes wrong we fallback to returning the number of online
|
||||
// processors - which can be greater than the number available to the process.
|
||||
static int get_active_processor_count() {
|
||||
// Note: keep this function, with its CPU_xx macros, *outside* the os namespace (see JDK-8289477).
|
||||
int os::Linux::active_processor_count() {
|
||||
cpu_set_t cpus; // can represent at most 1024 (CPU_SETSIZE) processors
|
||||
cpu_set_t* cpus_p = &cpus;
|
||||
int cpus_size = sizeof(cpu_set_t);
|
||||
@@ -4758,10 +4761,6 @@ static int get_active_processor_count() {
|
||||
return cpu_count;
|
||||
}
|
||||
|
||||
int os::Linux::active_processor_count() {
|
||||
return get_active_processor_count();
|
||||
}
|
||||
|
||||
// Determine the active processor count from one of
|
||||
// three different sources:
|
||||
//
|
||||
@@ -4909,6 +4908,47 @@ os::os_exception_wrapper(java_call_t f, JavaValue* value, const methodHandle& me
|
||||
f(value, method, args, thread);
|
||||
}
|
||||
|
||||
void os::print_statistics() {
|
||||
}
|
||||
|
||||
bool os::message_box(const char* title, const char* message) {
|
||||
int i;
|
||||
fdStream err(defaultStream::error_fd());
|
||||
for (i = 0; i < 78; i++) err.print_raw("=");
|
||||
err.cr();
|
||||
err.print_raw_cr(title);
|
||||
for (i = 0; i < 78; i++) err.print_raw("-");
|
||||
err.cr();
|
||||
err.print_raw_cr(message);
|
||||
for (i = 0; i < 78; i++) err.print_raw("=");
|
||||
err.cr();
|
||||
|
||||
char buf[16];
|
||||
// Prevent process from exiting upon "read error" without consuming all CPU
|
||||
while (::read(0, buf, sizeof(buf)) <= 0) { ::sleep(100); }
|
||||
|
||||
return buf[0] == 'y' || buf[0] == 'Y';
|
||||
}
|
||||
|
||||
// Is a (classpath) directory empty?
|
||||
bool os::dir_is_empty(const char* path) {
|
||||
DIR *dir = NULL;
|
||||
struct dirent *ptr;
|
||||
|
||||
dir = opendir(path);
|
||||
if (dir == NULL) return true;
|
||||
|
||||
// Scan the directory
|
||||
bool result = true;
|
||||
while (result && (ptr = readdir(dir)) != NULL) {
|
||||
if (strcmp(ptr->d_name, ".") != 0 && strcmp(ptr->d_name, "..") != 0) {
|
||||
result = false;
|
||||
}
|
||||
}
|
||||
closedir(dir);
|
||||
return result;
|
||||
}
|
||||
|
||||
// This code originates from JDK's sysOpen and open64_w
|
||||
// from src/solaris/hpi/src/system_md.c
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1999, 2021, 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
|
||||
@@ -120,7 +120,6 @@ class Linux {
|
||||
static bool _stack_is_executable;
|
||||
static void *dlopen_helper(const char *name, char *ebuf, int ebuflen);
|
||||
static void *dll_load_in_vmthread(const char *name, char *ebuf, int ebuflen);
|
||||
static const char *dll_path(void* lib);
|
||||
|
||||
static void init_thread_fpu_state();
|
||||
static int get_fpu_control_word();
|
||||
|
||||
@@ -45,7 +45,6 @@
|
||||
#include "runtime/orderAccess.hpp"
|
||||
#include "runtime/perfMemory.hpp"
|
||||
#include "utilities/align.hpp"
|
||||
#include "utilities/defaultStream.hpp"
|
||||
#include "utilities/events.hpp"
|
||||
#include "utilities/formatBuffer.hpp"
|
||||
#include "utilities/macros.hpp"
|
||||
@@ -237,25 +236,6 @@ int os::create_file_for_heap(const char* dir) {
|
||||
return fd;
|
||||
}
|
||||
|
||||
// Is a (classpath) directory empty?
|
||||
bool os::dir_is_empty(const char* path) {
|
||||
DIR *dir = NULL;
|
||||
struct dirent *ptr;
|
||||
|
||||
dir = ::opendir(path);
|
||||
if (dir == NULL) return true;
|
||||
|
||||
// Scan the directory
|
||||
bool result = true;
|
||||
while (result && (ptr = ::readdir(dir)) != NULL) {
|
||||
if (strcmp(ptr->d_name, ".") != 0 && strcmp(ptr->d_name, "..") != 0) {
|
||||
result = false;
|
||||
}
|
||||
}
|
||||
::closedir(dir);
|
||||
return result;
|
||||
}
|
||||
|
||||
static char* reserve_mmapped_memory(size_t bytes, char* requested_addr) {
|
||||
char * addr;
|
||||
int flags = MAP_PRIVATE NOT_AIX( | MAP_NORESERVE ) | MAP_ANONYMOUS;
|
||||
@@ -653,42 +633,8 @@ bool os::has_allocatable_memory_limit(size_t* limit) {
|
||||
#endif
|
||||
}
|
||||
|
||||
void* os::get_default_process_handle() {
|
||||
#ifdef __APPLE__
|
||||
// MacOS X needs to use RTLD_FIRST instead of RTLD_LAZY
|
||||
// to avoid finding unexpected symbols on second (or later)
|
||||
// loads of a library.
|
||||
return (void*)::dlopen(NULL, RTLD_FIRST);
|
||||
#else
|
||||
return (void*)::dlopen(NULL, RTLD_LAZY);
|
||||
#endif
|
||||
}
|
||||
|
||||
void* os::dll_lookup(void* handle, const char* name) {
|
||||
return dlsym(handle, name);
|
||||
}
|
||||
|
||||
void os::dll_unload(void *lib) {
|
||||
const char* l_path = LINUX_ONLY(os::Linux::dll_path(lib))
|
||||
NOT_LINUX("<not available>");
|
||||
if (l_path == NULL) l_path = "<not available>";
|
||||
int res = ::dlclose(lib);
|
||||
|
||||
if (res == 0) {
|
||||
Events::log_dll_message(NULL, "Unloaded shared library \"%s\" [" INTPTR_FORMAT "]",
|
||||
l_path, p2i(lib));
|
||||
log_info(os)("Unloaded shared library \"%s\" [" INTPTR_FORMAT "]", l_path, p2i(lib));
|
||||
} else {
|
||||
const char* error_report = ::dlerror();
|
||||
if (error_report == NULL) {
|
||||
error_report = "dlerror returned no error description";
|
||||
}
|
||||
|
||||
Events::log_dll_message(NULL, "Attempt to unload shared library \"%s\" [" INTPTR_FORMAT "] failed, %s",
|
||||
l_path, p2i(lib), error_report);
|
||||
log_info(os)("Attempt to unload shared library \"%s\" [" INTPTR_FORMAT "] failed, %s",
|
||||
l_path, p2i(lib), error_report);
|
||||
}
|
||||
::dlclose(lib);
|
||||
}
|
||||
|
||||
jlong os::lseek(int fd, jlong offset, int whence) {
|
||||
@@ -825,12 +771,6 @@ char* os::build_agent_function_name(const char *sym_name, const char *lib_name,
|
||||
return agent_entry_name;
|
||||
}
|
||||
|
||||
// Sleep forever; naked call to OS-specific sleep; use with CAUTION
|
||||
void os::infinite_sleep() {
|
||||
while (true) { // sleep forever ...
|
||||
::sleep(100); // ... 100 seconds at a time
|
||||
}
|
||||
}
|
||||
|
||||
void os::naked_short_nanosleep(jlong ns) {
|
||||
struct timespec req;
|
||||
@@ -1996,25 +1936,6 @@ int os::fork_and_exec(const char* cmd, bool prefer_vfork) {
|
||||
}
|
||||
}
|
||||
|
||||
bool os::message_box(const char* title, const char* message) {
|
||||
int i;
|
||||
fdStream err(defaultStream::error_fd());
|
||||
for (i = 0; i < 78; i++) err.print_raw("=");
|
||||
err.cr();
|
||||
err.print_raw_cr(title);
|
||||
for (i = 0; i < 78; i++) err.print_raw("-");
|
||||
err.cr();
|
||||
err.print_raw_cr(message);
|
||||
for (i = 0; i < 78; i++) err.print_raw("=");
|
||||
err.cr();
|
||||
|
||||
char buf[16];
|
||||
// Prevent process from exiting upon "read error" without consuming all CPU
|
||||
while (::read(0, buf, sizeof(buf)) <= 0) { ::sleep(100); }
|
||||
|
||||
return buf[0] == 'y' || buf[0] == 'Y';
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// runtime exit support
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user