diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml
index acf46c615ce6e9f392bc929f8a4260a3eefcee8e..b7018a5fc95d4149e562979756df2497446b04bb 100644
--- a/.github/workflows/submit.yml
+++ b/.github/workflows/submit.yml
@@ -12,6 +12,10 @@ on:
required: true
default: "Linux additional (hotspot only), Linux x64, Linux x86, Windows aarch64, Windows x64, macOS x64"
+concurrency:
+ group: ${{ github.workflow }}-${{ github.ref }}
+ cancel-in-progress: true
+
jobs:
prerequisites:
name: Prerequisites
@@ -183,7 +187,6 @@ jobs:
--with-conf-name=linux-x64
${{ matrix.flags }}
--with-version-opt=${GITHUB_ACTOR}-${GITHUB_SHA}
- --with-version-build=0
--with-boot-jdk=${HOME}/bootjdk/${BOOT_JDK_VERSION}
--with-jtreg=${HOME}/jtreg
--with-gtest=${GITHUB_WORKSPACE}/gtest
@@ -201,8 +204,8 @@ jobs:
with:
name: transient_jdk-linux-x64${{ matrix.artifact }}_${{ needs.prerequisites.outputs.bundle_id }}
path: |
- jdk/build/linux-x64/bundles/jdk-${{ env.JDK_VERSION }}-internal+0_linux-x64_bin${{ matrix.artifact }}.tar.gz
- jdk/build/linux-x64/bundles/jdk-${{ env.JDK_VERSION }}-internal+0_linux-x64_bin-tests${{ matrix.artifact }}.tar.gz
+ jdk/build/linux-x64/bundles/jdk-${{ env.JDK_VERSION }}-internal_linux-x64_bin${{ matrix.artifact }}.tar.gz
+ jdk/build/linux-x64/bundles/jdk-${{ env.JDK_VERSION }}-internal_linux-x64_bin-tests${{ matrix.artifact }}.tar.gz
linux_x64_test:
name: Linux x64
@@ -308,23 +311,23 @@ jobs:
- name: Unpack jdk
run: |
- mkdir -p "${HOME}/jdk-linux-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_linux-x64_bin${{ matrix.artifact }}"
- tar -xf "${HOME}/jdk-linux-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_linux-x64_bin${{ matrix.artifact }}.tar.gz" -C "${HOME}/jdk-linux-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_linux-x64_bin${{ matrix.artifact }}"
+ mkdir -p "${HOME}/jdk-linux-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_linux-x64_bin${{ matrix.artifact }}"
+ tar -xf "${HOME}/jdk-linux-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_linux-x64_bin${{ matrix.artifact }}.tar.gz" -C "${HOME}/jdk-linux-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_linux-x64_bin${{ matrix.artifact }}"
- name: Unpack tests
run: |
- mkdir -p "${HOME}/jdk-linux-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_linux-x64_bin-tests${{ matrix.artifact }}"
- tar -xf "${HOME}/jdk-linux-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_linux-x64_bin-tests${{ matrix.artifact }}.tar.gz" -C "${HOME}/jdk-linux-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_linux-x64_bin-tests${{ matrix.artifact }}"
+ mkdir -p "${HOME}/jdk-linux-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_linux-x64_bin-tests${{ matrix.artifact }}"
+ tar -xf "${HOME}/jdk-linux-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_linux-x64_bin-tests${{ matrix.artifact }}.tar.gz" -C "${HOME}/jdk-linux-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_linux-x64_bin-tests${{ matrix.artifact }}"
- name: Find root of jdk image dir
run: |
- imageroot=`find ${HOME}/jdk-linux-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_linux-x64_bin${{ matrix.artifact }} -name release -type f`
+ imageroot=`find ${HOME}/jdk-linux-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_linux-x64_bin${{ matrix.artifact }} -name release -type f`
echo "imageroot=`dirname ${imageroot}`" >> $GITHUB_ENV
- name: Run tests
run: >
JDK_IMAGE_DIR=${{ env.imageroot }}
- TEST_IMAGE_DIR=${HOME}/jdk-linux-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_linux-x64_bin-tests${{ matrix.artifact }}
+ TEST_IMAGE_DIR=${HOME}/jdk-linux-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_linux-x64_bin-tests${{ matrix.artifact }}
BOOT_JDK=${HOME}/bootjdk/${BOOT_JDK_VERSION}
JT_HOME=${HOME}/jtreg
make test-prebuilt
@@ -477,12 +480,12 @@ jobs:
- name: Unpack build JDK
run: |
- mkdir -p "${HOME}/jdk-linux-x64/jdk-${{ env.JDK_VERSION }}-internal+0_linux-x64_bin"
- tar -xf "${HOME}/jdk-linux-x64/jdk-${{ env.JDK_VERSION }}-internal+0_linux-x64_bin.tar.gz" -C "${HOME}/jdk-linux-x64/jdk-${{ env.JDK_VERSION }}-internal+0_linux-x64_bin"
+ mkdir -p "${HOME}/jdk-linux-x64/jdk-${{ env.JDK_VERSION }}-internal_linux-x64_bin"
+ tar -xf "${HOME}/jdk-linux-x64/jdk-${{ env.JDK_VERSION }}-internal_linux-x64_bin.tar.gz" -C "${HOME}/jdk-linux-x64/jdk-${{ env.JDK_VERSION }}-internal_linux-x64_bin"
- name: Find root of build JDK image dir
run: |
- build_jdk_root=`find ${HOME}/jdk-linux-x64/jdk-${{ env.JDK_VERSION }}-internal+0_linux-x64_bin -name release -type f`
+ build_jdk_root=`find ${HOME}/jdk-linux-x64/jdk-${{ env.JDK_VERSION }}-internal_linux-x64_bin -name release -type f`
echo "build_jdk_root=`dirname ${build_jdk_root}`" >> $GITHUB_ENV
- name: Update apt
@@ -550,7 +553,6 @@ jobs:
${{ matrix.flags }}
${{ env.cross_flags }}
--with-version-opt=${GITHUB_ACTOR}-${GITHUB_SHA}
- --with-version-build=0
--with-boot-jdk=${HOME}/bootjdk/${BOOT_JDK_VERSION}
--with-build-jdk=${{ env.build_jdk_root }}
--with-default-make-target="hotspot"
@@ -649,7 +651,6 @@ jobs:
--with-target-bits=32
${{ matrix.flags }}
--with-version-opt=${GITHUB_ACTOR}-${GITHUB_SHA}
- --with-version-build=0
--with-boot-jdk=${HOME}/bootjdk/${BOOT_JDK_VERSION}
--with-jtreg=${HOME}/jtreg
--with-gtest=${GITHUB_WORKSPACE}/gtest
@@ -667,8 +668,8 @@ jobs:
with:
name: transient_jdk-linux-x86${{ matrix.artifact }}_${{ needs.prerequisites.outputs.bundle_id }}
path: |
- jdk/build/linux-x86/bundles/jdk-${{ env.JDK_VERSION }}-internal+0_linux-x86_bin${{ matrix.artifact }}.tar.gz
- jdk/build/linux-x86/bundles/jdk-${{ env.JDK_VERSION }}-internal+0_linux-x86_bin-tests${{ matrix.artifact }}.tar.gz
+ jdk/build/linux-x86/bundles/jdk-${{ env.JDK_VERSION }}-internal_linux-x86_bin${{ matrix.artifact }}.tar.gz
+ jdk/build/linux-x86/bundles/jdk-${{ env.JDK_VERSION }}-internal_linux-x86_bin-tests${{ matrix.artifact }}.tar.gz
linux_x86_test:
name: Linux x86
@@ -775,23 +776,23 @@ jobs:
- name: Unpack jdk
run: |
- mkdir -p "${HOME}/jdk-linux-x86${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_linux-x86_bin${{ matrix.artifact }}"
- tar -xf "${HOME}/jdk-linux-x86${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_linux-x86_bin${{ matrix.artifact }}.tar.gz" -C "${HOME}/jdk-linux-x86${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_linux-x86_bin${{ matrix.artifact }}"
+ mkdir -p "${HOME}/jdk-linux-x86${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_linux-x86_bin${{ matrix.artifact }}"
+ tar -xf "${HOME}/jdk-linux-x86${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_linux-x86_bin${{ matrix.artifact }}.tar.gz" -C "${HOME}/jdk-linux-x86${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_linux-x86_bin${{ matrix.artifact }}"
- name: Unpack tests
run: |
- mkdir -p "${HOME}/jdk-linux-x86${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_linux-x86_bin-tests${{ matrix.artifact }}"
- tar -xf "${HOME}/jdk-linux-x86${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_linux-x86_bin-tests${{ matrix.artifact }}.tar.gz" -C "${HOME}/jdk-linux-x86${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_linux-x86_bin-tests${{ matrix.artifact }}"
+ mkdir -p "${HOME}/jdk-linux-x86${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_linux-x86_bin-tests${{ matrix.artifact }}"
+ tar -xf "${HOME}/jdk-linux-x86${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_linux-x86_bin-tests${{ matrix.artifact }}.tar.gz" -C "${HOME}/jdk-linux-x86${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_linux-x86_bin-tests${{ matrix.artifact }}"
- name: Find root of jdk image dir
run: |
- imageroot=`find ${HOME}/jdk-linux-x86${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_linux-x86_bin${{ matrix.artifact }} -name release -type f`
+ imageroot=`find ${HOME}/jdk-linux-x86${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_linux-x86_bin${{ matrix.artifact }} -name release -type f`
echo "imageroot=`dirname ${imageroot}`" >> $GITHUB_ENV
- name: Run tests
run: >
JDK_IMAGE_DIR=${{ env.imageroot }}
- TEST_IMAGE_DIR=${HOME}/jdk-linux-x86${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_linux-x86_bin-tests${{ matrix.artifact }}
+ TEST_IMAGE_DIR=${HOME}/jdk-linux-x86${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_linux-x86_bin-tests${{ matrix.artifact }}
BOOT_JDK=${HOME}/bootjdk/${BOOT_JDK_VERSION}
JT_HOME=${HOME}/jtreg
make test-prebuilt
@@ -927,7 +928,6 @@ jobs:
--openjdk-target=aarch64-unknown-cygwin
${{ matrix.flags }}
--with-version-opt="$env:GITHUB_ACTOR-$env:GITHUB_SHA"
- --with-version-build=0
--with-boot-jdk="$env:BOOT_JDK"
--with-default-make-target="hotspot"
working-directory: jdk
@@ -1039,7 +1039,6 @@ jobs:
--with-msvc-toolset-version=14.28
${{ matrix.flags }}
--with-version-opt="$env:GITHUB_ACTOR-$env:GITHUB_SHA"
- --with-version-build=0
--with-boot-jdk="$env:BOOT_JDK"
--with-jtreg="$env:JT_HOME"
--with-gtest="$env:GTEST"
@@ -1059,9 +1058,9 @@ jobs:
with:
name: transient_jdk-windows-x64${{ matrix.artifact }}_${{ needs.prerequisites.outputs.bundle_id }}
path: |
- jdk/build/windows-x64/bundles/jdk-${{ env.JDK_VERSION }}-internal+0_windows-x64_bin${{ matrix.artifact }}.zip
- jdk/build/windows-x64/bundles/jdk-${{ env.JDK_VERSION }}-internal+0_windows-x64_bin-tests${{ matrix.artifact }}.tar.gz
- jdk/build/windows-x64/bundles/jdk-${{ env.JDK_VERSION }}-internal+0_windows-x64_bin${{ matrix.artifact }}-symbols.tar.gz
+ jdk/build/windows-x64/bundles/jdk-${{ env.JDK_VERSION }}-internal_windows-x64_bin${{ matrix.artifact }}.zip
+ jdk/build/windows-x64/bundles/jdk-${{ env.JDK_VERSION }}-internal_windows-x64_bin-tests${{ matrix.artifact }}.tar.gz
+ jdk/build/windows-x64/bundles/jdk-${{ env.JDK_VERSION }}-internal_windows-x64_bin${{ matrix.artifact }}-symbols.tar.gz
windows_x64_test:
name: Windows x64
@@ -1181,21 +1180,21 @@ jobs:
- name: Unpack jdk
run: |
- mkdir -p "${HOME}/jdk-windows-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_windows-x64_bin${{ matrix.artifact }}"
- tar -xf "${HOME}/jdk-windows-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_windows-x64_bin${{ matrix.artifact }}.zip" -C "${HOME}/jdk-windows-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_windows-x64_bin${{ matrix.artifact }}"
+ mkdir -p "${HOME}/jdk-windows-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_windows-x64_bin${{ matrix.artifact }}"
+ tar -xf "${HOME}/jdk-windows-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_windows-x64_bin${{ matrix.artifact }}.zip" -C "${HOME}/jdk-windows-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_windows-x64_bin${{ matrix.artifact }}"
- name: Unpack symbols
run: |
- mkdir -p "${HOME}/jdk-windows-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_windows-x64_bin${{ matrix.artifact }}-symbols"
- tar -xf "${HOME}/jdk-windows-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_windows-x64_bin${{ matrix.artifact }}-symbols.tar.gz" -C "${HOME}/jdk-windows-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_windows-x64_bin${{ matrix.artifact }}-symbols"
+ mkdir -p "${HOME}/jdk-windows-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_windows-x64_bin${{ matrix.artifact }}-symbols"
+ tar -xf "${HOME}/jdk-windows-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_windows-x64_bin${{ matrix.artifact }}-symbols.tar.gz" -C "${HOME}/jdk-windows-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_windows-x64_bin${{ matrix.artifact }}-symbols"
- name: Unpack tests
run: |
- mkdir -p "${HOME}/jdk-windows-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_windows-x64_bin-tests${{ matrix.artifact }}"
- tar -xf "${HOME}/jdk-windows-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_windows-x64_bin-tests${{ matrix.artifact }}.tar.gz" -C "${HOME}/jdk-windows-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_windows-x64_bin-tests${{ matrix.artifact }}"
+ mkdir -p "${HOME}/jdk-windows-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_windows-x64_bin-tests${{ matrix.artifact }}"
+ tar -xf "${HOME}/jdk-windows-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_windows-x64_bin-tests${{ matrix.artifact }}.tar.gz" -C "${HOME}/jdk-windows-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_windows-x64_bin-tests${{ matrix.artifact }}"
- name: Find root of jdk image dir
- run: echo ("imageroot=" + (Get-ChildItem -Path $HOME/jdk-windows-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_windows-x64_bin${{ matrix.artifact }} -Filter release -Recurse -ErrorAction SilentlyContinue -Force).DirectoryName) | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8
+ run: echo ("imageroot=" + (Get-ChildItem -Path $HOME/jdk-windows-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_windows-x64_bin${{ matrix.artifact }} -Filter release -Recurse -ErrorAction SilentlyContinue -Force).DirectoryName) | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8
- name: Run tests
run: >
@@ -1203,7 +1202,7 @@ jobs:
$env:Path = $env:Path -split ";" -match "C:\\Windows|PowerShell|cygwin" -join ";" ;
$env:JDK_IMAGE_DIR = cygpath "${{ env.imageroot }}" ;
$env:SYMBOLS_IMAGE_DIR = cygpath "${{ env.imageroot }}" ;
- $env:TEST_IMAGE_DIR = cygpath "$HOME/jdk-windows-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_windows-x64_bin-tests${{ matrix.artifact }}" ;
+ $env:TEST_IMAGE_DIR = cygpath "$HOME/jdk-windows-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_windows-x64_bin-tests${{ matrix.artifact }}" ;
$env:BOOT_JDK = cygpath "$HOME/bootjdk/$env:BOOT_JDK_VERSION" ;
$env:JT_HOME = cygpath "$HOME/jtreg" ;
& make test-prebuilt
@@ -1346,7 +1345,6 @@ jobs:
--with-conf-name=macos-x64
${{ matrix.flags }}
--with-version-opt=${GITHUB_ACTOR}-${GITHUB_SHA}
- --with-version-build=0
--with-boot-jdk=${HOME}/bootjdk/${BOOT_JDK_VERSION}/Contents/Home
--with-jtreg=${HOME}/jtreg
--with-gtest=${GITHUB_WORKSPACE}/gtest
@@ -1364,8 +1362,8 @@ jobs:
with:
name: transient_jdk-macos-x64${{ matrix.artifact }}_${{ needs.prerequisites.outputs.bundle_id }}
path: |
- jdk/build/macos-x64/bundles/jdk-${{ env.JDK_VERSION }}-internal+0_macos-x64_bin${{ matrix.artifact }}.tar.gz
- jdk/build/macos-x64/bundles/jdk-${{ env.JDK_VERSION }}-internal+0_macos-x64_bin-tests${{ matrix.artifact }}.tar.gz
+ jdk/build/macos-x64/bundles/jdk-${{ env.JDK_VERSION }}-internal_macos-x64_bin${{ matrix.artifact }}.tar.gz
+ jdk/build/macos-x64/bundles/jdk-${{ env.JDK_VERSION }}-internal_macos-x64_bin-tests${{ matrix.artifact }}.tar.gz
macos_aarch64_build:
name: macOS aarch64
@@ -1449,7 +1447,6 @@ jobs:
--openjdk-target=aarch64-apple-darwin
${{ matrix.flags }}
--with-version-opt=${GITHUB_ACTOR}-${GITHUB_SHA}
- --with-version-build=0
--with-boot-jdk=${HOME}/bootjdk/${BOOT_JDK_VERSION}/Contents/Home
--with-jtreg=${HOME}/jtreg
--with-gtest=${GITHUB_WORKSPACE}/gtest
@@ -1467,8 +1464,8 @@ jobs:
with:
name: transient_jdk-macos-aarch64${{ matrix.artifact }}_${{ needs.prerequisites.outputs.bundle_id }}
path: |
- jdk/build/macos-aarch64/bundles/jdk-${{ env.JDK_VERSION }}-internal+0_macos-aarch64_bin${{ matrix.artifact }}.tar.gz
- jdk/build/macos-aarch64/bundles/jdk-${{ env.JDK_VERSION }}-internal+0_macos-aarch64_bin-tests${{ matrix.artifact }}.tar.gz
+ jdk/build/macos-aarch64/bundles/jdk-${{ env.JDK_VERSION }}-internal_macos-aarch64_bin${{ matrix.artifact }}.tar.gz
+ jdk/build/macos-aarch64/bundles/jdk-${{ env.JDK_VERSION }}-internal_macos-aarch64_bin-tests${{ matrix.artifact }}.tar.gz
macos_x64_test:
@@ -1575,13 +1572,13 @@ jobs:
- name: Unpack jdk
run: |
- mkdir -p "${HOME}/jdk-macos-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_macos-x64_bin${{ matrix.artifact }}"
- tar -xf "${HOME}/jdk-macos-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_macos-x64_bin${{ matrix.artifact }}.tar.gz" -C "${HOME}/jdk-macos-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_macos-x64_bin${{ matrix.artifact }}"
+ mkdir -p "${HOME}/jdk-macos-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_macos-x64_bin${{ matrix.artifact }}"
+ tar -xf "${HOME}/jdk-macos-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_macos-x64_bin${{ matrix.artifact }}.tar.gz" -C "${HOME}/jdk-macos-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_macos-x64_bin${{ matrix.artifact }}"
- name: Unpack tests
run: |
- mkdir -p "${HOME}/jdk-macos-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_macos-x64_bin-tests${{ matrix.artifact }}"
- tar -xf "${HOME}/jdk-macos-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_macos-x64_bin-tests${{ matrix.artifact }}.tar.gz" -C "${HOME}/jdk-macos-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_macos-x64_bin-tests${{ matrix.artifact }}"
+ mkdir -p "${HOME}/jdk-macos-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_macos-x64_bin-tests${{ matrix.artifact }}"
+ tar -xf "${HOME}/jdk-macos-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_macos-x64_bin-tests${{ matrix.artifact }}.tar.gz" -C "${HOME}/jdk-macos-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_macos-x64_bin-tests${{ matrix.artifact }}"
- name: Install dependencies
run: brew install make
@@ -1591,13 +1588,13 @@ jobs:
- name: Find root of jdk image dir
run: |
- imageroot=`find ${HOME}/jdk-macos-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_macos-x64_bin${{ matrix.artifact }} -name release -type f`
+ imageroot=`find ${HOME}/jdk-macos-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_macos-x64_bin${{ matrix.artifact }} -name release -type f`
echo "imageroot=`dirname ${imageroot}`" >> $GITHUB_ENV
- name: Run tests
run: >
JDK_IMAGE_DIR=${{ env.imageroot }}
- TEST_IMAGE_DIR=${HOME}/jdk-macos-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_macos-x64_bin-tests${{ matrix.artifact }}
+ TEST_IMAGE_DIR=${HOME}/jdk-macos-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal_macos-x64_bin-tests${{ matrix.artifact }}
BOOT_JDK=${HOME}/bootjdk/${BOOT_JDK_VERSION}/Contents/Home
JT_HOME=${HOME}/jtreg
gmake test-prebuilt
diff --git a/doc/building.md b/doc/building.md
index 459dbaa4c410109f14246746a217a8a33027284b..9e6687f6b81697c48aa0395c23d469cd732680c6 100644
--- a/doc/building.md
+++ b/doc/building.md
@@ -135,6 +135,14 @@ space is required.
If you do not have access to sufficiently powerful hardware, it is also
possible to use [cross-compiling](#cross-compiling).
+#### Branch Protection
+
+In order to use Branch Protection features in the VM, `--enable-branch-protection`
+must be used. This option requires C++ compiler support (GCC 9.1.0+ or Clang
+10+). The resulting build can be run on both machines with and without support
+for branch protection in hardware. Branch Protection is only supported for
+Linux targets.
+
### Building on 32-bit arm
This is not recommended. Instead, see the section on [Cross-compiling](
diff --git a/doc/hotspot-style.html b/doc/hotspot-style.html
index 5e8f0e9e174a10af5c203e2c18c8ec1610d58254..eb0c8de2ae54bd218b5fd8ef2b7d12cd241cdcf6 100644
--- a/doc/hotspot-style.html
+++ b/doc/hotspot-style.html
@@ -67,7 +67,9 @@
Counterexamples and Updates
Many of the guidelines mentioned here have (sometimes widespread) counterexamples in the HotSpot code base. Finding a counterexample is not sufficient justification for new code to follow the counterexample as a precedent, since readers of your code will rightfully expect your code to follow the greater bulk of precedents documented here.
Occasionally a guideline mentioned here may be just out of synch with the actual HotSpot code base. If you find that a guideline is consistently contradicted by a large number of counterexamples, please bring it up for discussion and possible change. The architectural rule, of course, is "When in Rome do as the Romans". Sometimes in the suburbs of Rome the rules are a little different; these differences can be pointed out here.
-Proposed changes should be discussed on the HotSpot Developers mailing list, and approved by rough consensus of the HotSpot Group Members. The Group Lead determines whether consensus has been reached. Changes are likely to be cautious and incremental, since HotSpot coders have been using these guidelines for years.
+Proposed changes should be discussed on the HotSpot Developers mailing list. Changes are likely to be cautious and incremental, since HotSpot coders have been using these guidelines for years.
+Substantive changes are approved by rough consensus of the HotSpot Group Members. The Group Lead determines whether consensus has been reached.
+Editorial changes (changes that only affect the description of HotSpot style, not its substance) do not require the full consensus gathering process. The normal HotSpot pull request process may be used for editorial changes, with the additional requirement that the requisite reviewers are also HotSpot Group Members.
Factoring and Class Design
diff --git a/doc/hotspot-style.md b/doc/hotspot-style.md
index 57c0c38e2b013fab3d8d0e9e0209a6ab4ad9718f..4efce0301b275b467527473d17a8e72d1ce1f551 100644
--- a/doc/hotspot-style.md
+++ b/doc/hotspot-style.md
@@ -56,12 +56,19 @@ can be pointed out here.
Proposed changes should be discussed on the
[HotSpot Developers](mailto:hotspot-dev@openjdk.java.net) mailing
-list, and approved by
+list. Changes are likely to be cautious and incremental, since HotSpot
+coders have been using these guidelines for years.
+
+Substantive changes are approved by
[rough consensus](https://en.wikipedia.org/wiki/Rough_consensus) of
the [HotSpot Group](https://openjdk.java.net/census#hotspot) Members.
The Group Lead determines whether consensus has been reached.
-Changes are likely to be cautious and incremental, since HotSpot
-coders have been using these guidelines for years.
+
+Editorial changes (changes that only affect the description of HotSpot
+style, not its substance) do not require the full consensus gathering
+process. The normal HotSpot pull request process may be used for
+editorial changes, with the additional requirement that the requisite
+reviewers are also HotSpot Group Members.
## Structure and Formatting
diff --git a/make/Docs.gmk b/make/Docs.gmk
index ef1651eaf4ee0aa8014aac1c25d8f7d210335e82..6ea5c7fb638565192b832ab33725211d43439c71 100644
--- a/make/Docs.gmk
+++ b/make/Docs.gmk
@@ -131,7 +131,7 @@ JAVA_PLATFORM := Java Platform
ifeq ($(IS_DRAFT), true)
DRAFT_MARKER_STR :=
DRAFT $(VERSION_STRING)
- ifeq ($(VERSION_BUILD), 0)
+ ifeq ($(VERSION_BUILD), )
DRAFT_MARKER_TITLE := $(SPACE)[ad-hoc build]
else
DRAFT_MARKER_TITLE := $(SPACE)[build $(VERSION_BUILD)]
diff --git a/make/Hsdis.gmk b/make/Hsdis.gmk
index 02f09b320f095522d29e0e7d7e73438a10f2ee72..6d5bb46e963d12ee814d7bc652eda1d16e7aa620 100644
--- a/make/Hsdis.gmk
+++ b/make/Hsdis.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 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
@@ -36,89 +36,129 @@ include JdkNativeCompilation.gmk
HSDIS_OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/hsdis
+HSDIS_TOOLCHAIN := TOOLCHAIN_DEFAULT
+HSDIS_TOOLCHAIN_CFLAGS := $(CFLAGS_JDKLIB)
+HSDIS_TOOLCHAIN_LDFLAGS := $(LDFLAGS_JDKLIB)
+
ifeq ($(call isTargetOs, windows), true)
INSTALLED_HSDIS_DIR := $(JDK_OUTPUTDIR)/bin
+ IMAGE_HSDIS_DIR := $(JDK_IMAGE_DIR)/bin
+else
+ INSTALLED_HSDIS_DIR := $(JDK_OUTPUTDIR)/lib
+ IMAGE_HSDIS_DIR := $(JDK_IMAGE_DIR)/lib
+endif
+
+ifeq ($(HSDIS_BACKEND), capstone)
+ ifeq ($(call isTargetCpuArch, x86), true)
+ CAPSTONE_ARCH := CS_ARCH_X86
+ CAPSTONE_MODE := CS_MODE_$(OPENJDK_TARGET_CPU_BITS)
+ else ifeq ($(call isTargetCpuArch, aarch64), true)
+ CAPSTONE_ARCH := CS_ARCH_ARM64
+ CAPSTONE_MODE := CS_MODE_ARM
+ else
+ $(error No support for Capstone on this platform)
+ endif
+
+ HSDIS_CFLAGS += -DCAPSTONE_ARCH=$(CAPSTONE_ARCH) \
+ -DCAPSTONE_MODE=$(CAPSTONE_MODE)
+endif
+
+ifeq ($(HSDIS_BACKEND), llvm)
+ # Use C++ instead of C
+ HSDIS_TOOLCHAIN_CFLAGS := $(CXXFLAGS_JDKLIB)
+ HSDIS_TOOLCHAIN := TOOLCHAIN_LINK_CXX
+
+ ifeq ($(call isTargetOs, linux), true)
+ LLVM_OS := pc-linux-gnu
+ else ifeq ($(call isTargetOs, macosx), true)
+ LLVM_OS := apple-darwin
+ else ifeq ($(call isTargetOs, windows), true)
+ LLVM_OS := pc-windows-msvc
+ else
+ $(error No support for LLVM on this platform)
+ endif
+
+ HSDIS_CFLAGS += -DLLVM_DEFAULT_TRIPLET='"$(OPENJDK_TARGET_CPU)-$(LLVM_OS)"'
+endif
- # On windows, we need to "fake" a completely different toolchain using gcc
- # instead of the normal microsoft toolchain. This is quite hacky...
+ifeq ($(HSDIS_BACKEND), binutils)
+ ifeq ($(call isTargetOs, windows), true)
+ # On windows, we need to "fake" a completely different toolchain using gcc
+ # instead of the normal microsoft toolchain. This is quite hacky...
- MINGW_BASE := x86_64-w64-mingw32
+ MINGW_BASE := x86_64-w64-mingw32
- MINGW_SYSROOT = $(shell $(MINGW_BASE)-gcc -print-sysroot)
- ifeq ($(wildcard $(MINGW_SYSROOT)), )
- # Use fallback path
- MINGW_SYSROOT := /usr/$(MINGW_BASE)
+ MINGW_SYSROOT = $(shell $(MINGW_BASE)-gcc -print-sysroot)
ifeq ($(wildcard $(MINGW_SYSROOT)), )
- $(error mingw sysroot not found)
+ # Use fallback path
+ MINGW_SYSROOT := /usr/$(MINGW_BASE)
+ ifeq ($(wildcard $(MINGW_SYSROOT)), )
+ $(error mingw sysroot not found)
+ endif
endif
- endif
- $(eval $(call DefineNativeToolchain, TOOLCHAIN_MINGW, \
- CC := $(MINGW_BASE)-gcc, \
- LD := $(MINGW_BASE)-ld, \
- OBJCOPY := $(MINGW_BASE)-objcopy, \
- RC := $(RC), \
- SYSROOT_CFLAGS := --sysroot=$(MINGW_SYSROOT), \
- SYSROOT_LDFLAGS := --sysroot=$(MINGW_SYSROOT), \
- ))
-
- MINGW_SYSROOT_LIB_PATH := $(MINGW_SYSROOT)/mingw/lib
- ifeq ($(wildcard $(MINGW_SYSROOT_LIB_PATH)), )
- # Try without mingw
- MINGW_SYSROOT_LIB_PATH := $(MINGW_SYSROOT)/lib
+ $(eval $(call DefineNativeToolchain, TOOLCHAIN_MINGW, \
+ CC := $(MINGW_BASE)-gcc, \
+ LD := $(MINGW_BASE)-ld, \
+ OBJCOPY := $(MINGW_BASE)-objcopy, \
+ RC := $(RC), \
+ SYSROOT_CFLAGS := --sysroot=$(MINGW_SYSROOT), \
+ SYSROOT_LDFLAGS := --sysroot=$(MINGW_SYSROOT), \
+ ))
+
+ MINGW_SYSROOT_LIB_PATH := $(MINGW_SYSROOT)/mingw/lib
ifeq ($(wildcard $(MINGW_SYSROOT_LIB_PATH)), )
- $(error mingw sysroot lib path not found)
+ # Try without mingw
+ MINGW_SYSROOT_LIB_PATH := $(MINGW_SYSROOT)/lib
+ ifeq ($(wildcard $(MINGW_SYSROOT_LIB_PATH)), )
+ $(error mingw sysroot lib path not found)
+ endif
endif
- endif
- MINGW_VERSION = $(shell $(MINGW_BASE)-gcc -v 2>&1 | $(GREP) "gcc version" | $(CUT) -d " " -f 3)
- MINGW_GCC_LIB_PATH := /usr/lib/gcc/$(MINGW_BASE)/$(MINGW_VERSION)
- ifeq ($(wildcard $(MINGW_GCC_LIB_PATH)), )
- # Try using only major version number
- MINGW_VERSION_MAJOR := $(firstword $(subst ., , $(MINGW_VERSION)))
- MINGW_GCC_LIB_PATH := /usr/lib/gcc/$(MINGW_BASE)/$(MINGW_VERSION_MAJOR)
+ MINGW_VERSION = $(shell $(MINGW_BASE)-gcc -v 2>&1 | $(GREP) "gcc version" | $(CUT) -d " " -f 3)
+ MINGW_GCC_LIB_PATH := /usr/lib/gcc/$(MINGW_BASE)/$(MINGW_VERSION)
ifeq ($(wildcard $(MINGW_GCC_LIB_PATH)), )
- $(error mingw gcc lib path not found)
+ # Try using only major version number
+ MINGW_VERSION_MAJOR := $(firstword $(subst ., , $(MINGW_VERSION)))
+ MINGW_GCC_LIB_PATH := /usr/lib/gcc/$(MINGW_BASE)/$(MINGW_VERSION_MAJOR)
+ ifeq ($(wildcard $(MINGW_GCC_LIB_PATH)), )
+ $(error mingw gcc lib path not found)
+ endif
endif
- endif
- TOOLCHAIN_TYPE := gcc
- OPENJDK_TARGET_OS := linux
- CC_OUT_OPTION := -o$(SPACE)
- LD_OUT_OPTION := -o$(SPACE)
- GENDEPS_FLAGS := -MMD -MF
- CFLAGS_DEBUG_SYMBOLS := -g
- DISABLED_WARNINGS :=
- DISABLE_WARNING_PREFIX := -Wno-
- CFLAGS_WARNINGS_ARE_ERRORS := -Werror
- SHARED_LIBRARY_FLAGS := -shared
-
- HSDIS_TOOLCHAIN := TOOLCHAIN_MINGW
- HSDIS_TOOLCHAIN_CFLAGS :=
- HSDIS_TOOLCHAIN_LDFLAGS := -L$(MINGW_GCC_LIB_PATH) -L$(MINGW_SYSROOT_LIB_PATH)
- MINGW_DLLCRT := $(MINGW_SYSROOT_LIB_PATH)/dllcrt2.o
- HSDIS_TOOLCHAIN_LIBS := $(MINGW_DLLCRT) -lmingw32 -lgcc -lgcc_eh -lmoldname \
- -lmingwex -lmsvcrt -lpthread -ladvapi32 -lshell32 -luser32 -lkernel32
-else
- INSTALLED_HSDIS_DIR := $(JDK_OUTPUTDIR)/lib
-
- HSDIS_TOOLCHAIN := TOOLCHAIN_DEFAULT
- HSDIS_TOOLCHAIN_CFLAGS := $(CFLAGS_JDKLIB)
- HSDIS_TOOLCHAIN_LDFLAGS := $(LDFLAGS_JDKLIB)
- HSDIS_TOOLCHAIN_LIBS := -ldl
+ TOOLCHAIN_TYPE := gcc
+ OPENJDK_TARGET_OS := linux
+ CC_OUT_OPTION := -o$(SPACE)
+ LD_OUT_OPTION := -o$(SPACE)
+ GENDEPS_FLAGS := -MMD -MF
+ CFLAGS_DEBUG_SYMBOLS := -g
+ DISABLED_WARNINGS :=
+ DISABLE_WARNING_PREFIX := -Wno-
+ CFLAGS_WARNINGS_ARE_ERRORS := -Werror
+ SHARED_LIBRARY_FLAGS := -shared
+
+ HSDIS_TOOLCHAIN := TOOLCHAIN_MINGW
+ HSDIS_TOOLCHAIN_CFLAGS :=
+ HSDIS_TOOLCHAIN_LDFLAGS := -L$(MINGW_GCC_LIB_PATH) -L$(MINGW_SYSROOT_LIB_PATH)
+ MINGW_DLLCRT := $(MINGW_SYSROOT_LIB_PATH)/dllcrt2.o
+ HSDIS_TOOLCHAIN_LIBS := $(MINGW_DLLCRT) -lmingw32 -lgcc -lgcc_eh -lmoldname \
+ -lmingwex -lmsvcrt -lpthread -ladvapi32 -lshell32 -luser32 -lkernel32
+ else
+ HSDIS_TOOLCHAIN_LIBS := -ldl
+ endif
endif
-
$(eval $(call SetupJdkLibrary, BUILD_HSDIS, \
NAME := hsdis, \
- SRC := $(TOPDIR)/src/utils/hsdis, \
+ SRC := $(TOPDIR)/src/utils/hsdis/$(HSDIS_BACKEND), \
+ EXTRA_HEADER_DIRS := $(TOPDIR)/src/utils/hsdis, \
TOOLCHAIN := $(HSDIS_TOOLCHAIN), \
OUTPUT_DIR := $(HSDIS_OUTPUT_DIR), \
OBJECT_DIR := $(HSDIS_OUTPUT_DIR), \
DISABLED_WARNINGS_gcc := undef format-nonliteral sign-compare, \
DISABLED_WARNINGS_clang := undef format-nonliteral, \
CFLAGS := $(HSDIS_TOOLCHAIN_CFLAGS) $(HSDIS_CFLAGS), \
- LDFLAGS := $(HSDIS_TOOLCHAIN_LDFLAGS) $(SHARED_LIBRARY_FLAGS), \
+ LDFLAGS := $(HSDIS_TOOLCHAIN_LDFLAGS) $(HSDIS_LDFLAGS) $(SHARED_LIBRARY_FLAGS), \
LIBS := $(HSDIS_LIBS) $(HSDIS_TOOLCHAIN_LIBS), \
))
@@ -129,13 +169,18 @@ TARGETS += build
INSTALLED_HSDIS_NAME := hsdis-$(OPENJDK_TARGET_CPU_LEGACY_LIB)$(SHARED_LIBRARY_SUFFIX)
INSTALLED_HSDIS := $(INSTALLED_HSDIS_DIR)/$(INSTALLED_HSDIS_NAME)
+INSTALLED_HSDIS_IMAGE := $(IMAGE_HSDIS_DIR)/$(INSTALLED_HSDIS_NAME)
$(INSTALLED_HSDIS): $(BUILD_HSDIS_TARGET)
- $(call LogWarn, NOTE: The resulting build might not be redistributable. Seek legal advice before distibuting.)
+ ifeq ($(HSDIS_BACKEND), binutils)
+ $(call LogWarn, NOTE: The resulting build might not be redistributable. Seek legal advice before distributing.)
+ endif
$(install-file)
+$(INSTALLED_HSDIS_IMAGE): $(INSTALLED_HSDIS)
+ $(install-file)
-install: $(INSTALLED_HSDIS)
+install: $(INSTALLED_HSDIS_IMAGE)
TARGETS += install
diff --git a/make/TestImage.gmk b/make/TestImage.gmk
index 26d10f95d3bc00ae229a9321ce2c7ae04cc76733..b719d6824da3028ddfd78bb2e0e87f0c0dacfd72 100644
--- a/make/TestImage.gmk
+++ b/make/TestImage.gmk
@@ -35,8 +35,8 @@ BUILD_INFO_PROPERTIES := $(TEST_IMAGE_DIR)/build-info.properties
$(BUILD_INFO_PROPERTIES):
$(call MakeTargetDir)
$(ECHO) "# Build info properties for JDK tests" > $@
- $(ECHO) "build.workspace.root=$(call FixPath, $(WORKSPACE_ROOT))" >> $@
- $(ECHO) "build.output.root=$(call FixPath, $(OUTPUTDIR))" >> $@
+ $(ECHO) 'build.workspace.root=$(call FixPath, $(WORKSPACE_ROOT))' >> $@
+ $(ECHO) 'build.output.root=$(call FixPath, $(OUTPUTDIR))' >> $@
README := $(TEST_IMAGE_DIR)/Readme.txt
diff --git a/make/autoconf/compare.sh.in b/make/autoconf/compare.sh.in
index 1c48f800c8a3430cca9137c19ddb74815505b791..542a516ebc4475cc05d3be52c54e8aedece4b5d0 100644
--- a/make/autoconf/compare.sh.in
+++ b/make/autoconf/compare.sh.in
@@ -53,7 +53,7 @@ export LDD="@LDD@"
export LN="@LN@"
export MKDIR="@MKDIR@"
export MV="@MV@"
-export NM="@GNM@"
+export NM="@NM@"
export OBJDUMP="@OBJDUMP@"
export OTOOL="@OTOOL@"
export PRINTF="@PRINTF@"
diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
index ba4cb3e9ac7314ef19cc399e13f7b42fd5f836bb..2d7732e6c66b668cfd90bc611c4a0d90bb868634 100644
--- a/make/autoconf/flags-cflags.m4
+++ b/make/autoconf/flags-cflags.m4
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -496,8 +496,8 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
TOOLCHAIN_CFLAGS_JVM="-qtbtable=full -qtune=balanced \
-qalias=noansi -qstrict -qtls=default -qnortti -qnoeh -qignerrno -qstackprotect"
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
- TOOLCHAIN_CFLAGS_JVM="-nologo -MD -MP"
- TOOLCHAIN_CFLAGS_JDK="-nologo -MD -Zc:wchar_t-"
+ TOOLCHAIN_CFLAGS_JVM="-nologo -MD -Zc:strictStrings -MP"
+ TOOLCHAIN_CFLAGS_JDK="-nologo -MD -Zc:strictStrings -Zc:wchar_t-"
fi
# CFLAGS C language level for JDK sources (hotspot only uses C++)
@@ -782,10 +782,8 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
test "x$ENABLE_REPRODUCIBLE_BUILD" = xtrue; then
# There is a known issue with the pathmap if the mapping is made to the
# empty string. Add a minimal string "s" as prefix to work around this.
- workspace_root_win=`$FIXPATH_BASE print "${WORKSPACE_ROOT%/}"`
# PATHMAP_FLAGS is also added to LDFLAGS in flags-ldflags.m4.
- PATHMAP_FLAGS="-pathmap:${workspace_root_win//\//\\\\}=s \
- -pathmap:${workspace_root_win}=s"
+ PATHMAP_FLAGS="-pathmap:${WORKSPACE_ROOT}=s"
FILE_MACRO_CFLAGS="$PATHMAP_FLAGS"
FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${FILE_MACRO_CFLAGS}],
PREFIX: $3,
@@ -805,17 +803,19 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
fi
AC_SUBST(FILE_MACRO_CFLAGS)
+ FLAGS_SETUP_BRANCH_PROTECTION
+
# EXPORT to API
CFLAGS_JVM_COMMON="$ALWAYS_CFLAGS_JVM $ALWAYS_DEFINES_JVM \
$TOOLCHAIN_CFLAGS_JVM ${$1_TOOLCHAIN_CFLAGS_JVM} \
$OS_CFLAGS $OS_CFLAGS_JVM $CFLAGS_OS_DEF_JVM $DEBUG_CFLAGS_JVM \
$WARNING_CFLAGS $WARNING_CFLAGS_JVM $JVM_PICFLAG $FILE_MACRO_CFLAGS \
- $REPRODUCIBLE_CFLAGS"
+ $REPRODUCIBLE_CFLAGS $BRANCH_PROTECTION_CFLAGS"
CFLAGS_JDK_COMMON="$ALWAYS_CFLAGS_JDK $ALWAYS_DEFINES_JDK $TOOLCHAIN_CFLAGS_JDK \
$OS_CFLAGS $CFLAGS_OS_DEF_JDK $DEBUG_CFLAGS_JDK $DEBUG_OPTIONS_FLAGS_JDK \
$WARNING_CFLAGS $WARNING_CFLAGS_JDK $DEBUG_SYMBOLS_CFLAGS_JDK \
- $FILE_MACRO_CFLAGS $REPRODUCIBLE_CFLAGS"
+ $FILE_MACRO_CFLAGS $REPRODUCIBLE_CFLAGS $BRANCH_PROTECTION_CFLAGS"
# Use ${$2EXTRA_CFLAGS} to block EXTRA_CFLAGS to be added to build flags.
# (Currently we don't have any OPENJDK_BUILD_EXTRA_CFLAGS, but that might
@@ -881,3 +881,24 @@ AC_DEFUN([FLAGS_SETUP_GCC6_COMPILER_FLAGS],
PREFIX: $2, IF_FALSE: [NO_LIFETIME_DSE_CFLAG=""])
$1_GCC6_CFLAGS="${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}"
])
+
+AC_DEFUN_ONCE([FLAGS_SETUP_BRANCH_PROTECTION],
+[
+ # Is branch protection available?
+ BRANCH_PROTECTION_AVAILABLE=false
+ BRANCH_PROTECTION_FLAG="-mbranch-protection=standard"
+
+ if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
+ if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
+ FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${BRANCH_PROTECTION_FLAG}],
+ IF_TRUE: [BRANCH_PROTECTION_AVAILABLE=true])
+ fi
+ fi
+
+ BRANCH_PROTECTION_CFLAGS=""
+ UTIL_ARG_ENABLE(NAME: branch-protection, DEFAULT: false,
+ RESULT: USE_BRANCH_PROTECTION, AVAILABLE: $BRANCH_PROTECTION_AVAILABLE,
+ DESC: [enable branch protection when compiling C/C++],
+ IF_ENABLED: [ BRANCH_PROTECTION_CFLAGS=${BRANCH_PROTECTION_FLAG}])
+ AC_SUBST(BRANCH_PROTECTION_CFLAGS)
+])
diff --git a/make/autoconf/help.m4 b/make/autoconf/help.m4
index 09e82e36c94cd3ba3e1391e3b3703ca3cacb445a..486e78d4fcf99e178100c80553f403aa37ab244e 100644
--- a/make/autoconf/help.m4
+++ b/make/autoconf/help.m4
@@ -117,6 +117,8 @@ apt_help() {
PKGHANDLER_COMMAND="sudo apt-get install ccache" ;;
dtrace)
PKGHANDLER_COMMAND="sudo apt-get install systemtap-sdt-dev" ;;
+ capstone)
+ PKGHANDLER_COMMAND="sudo apt-get install libcapstone-dev" ;;
esac
}
@@ -168,6 +170,8 @@ brew_help() {
PKGHANDLER_COMMAND="brew install freetype" ;;
ccache)
PKGHANDLER_COMMAND="brew install ccache" ;;
+ capstone)
+ PKGHANDLER_COMMAND="brew install capstone" ;;
esac
}
diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
index 0a7145c9116a4f4d90f1e9f354c7b78aef25a7b6..4529f98b1cab0e7a43039de41ed8d9fd9ed689dd 100644
--- a/make/autoconf/jdk-options.m4
+++ b/make/autoconf/jdk-options.m4
@@ -811,7 +811,13 @@ AC_DEFUN([JDKOPT_BUILD_BINUTILS],
AC_DEFUN_ONCE([JDKOPT_SETUP_HSDIS],
[
AC_ARG_WITH([hsdis], [AS_HELP_STRING([--with-hsdis],
- [what hsdis backend to use ('none', 'binutils') @<:@none@:>@])])
+ [what hsdis backend to use ('none', 'capstone', 'llvm', 'binutils') @<:@none@:>@])])
+
+ AC_ARG_WITH(capstone, [AS_HELP_STRING([--with-capstone],
+ [where to find the Capstone files needed for hsdis/capstone])])
+
+ AC_ARG_WITH([llvm], [AS_HELP_STRING([--with-llvm],
+ [where to find the LLVM files needed for hsdis/llvm])])
AC_ARG_WITH([binutils], [AS_HELP_STRING([--with-binutils],
[where to find the binutils files needed for hsdis/binutils])])
@@ -826,6 +832,94 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_HSDIS],
elif test "x$with_hsdis" = xnone || test "x$with_hsdis" = xno || test "x$with_hsdis" = x; then
HSDIS_BACKEND=none
AC_MSG_RESULT(['none', hsdis will not be built])
+ elif test "x$with_hsdis" = xcapstone; then
+ HSDIS_BACKEND=capstone
+ AC_MSG_RESULT(['capstone'])
+
+ if test "x$with_capstone" != x; then
+ AC_MSG_CHECKING([for capstone])
+ CAPSTONE="$with_capstone"
+ AC_MSG_RESULT([$CAPSTONE])
+
+ HSDIS_CFLAGS="-I${CAPSTONE}/include/capstone"
+ if test "x$OPENJDK_TARGET_OS" != xwindows; then
+ HSDIS_LDFLAGS="-L${CAPSTONE}/lib"
+ HSDIS_LIBS="-lcapstone"
+ else
+ HSDIS_LDFLAGS="-nodefaultlib:libcmt.lib"
+ HSDIS_LIBS="${CAPSTONE}/capstone.lib"
+ fi
+ else
+ if test "x$OPENJDK_TARGET_OS" = xwindows; then
+ # There is no way to auto-detect capstone on Windowos
+ AC_MSG_NOTICE([You must specify capstone location using --with-capstone=])
+ AC_MSG_ERROR([Cannot continue])
+ fi
+
+ PKG_CHECK_MODULES(CAPSTONE, capstone, [CAPSTONE_FOUND=yes], [CAPSTONE_FOUND=no])
+ if test "x$CAPSTONE_FOUND" = xyes; then
+ HSDIS_CFLAGS="$CAPSTONE_CFLAGS"
+ HSDIS_LDFLAGS="$CAPSTONE_LDFLAGS"
+ HSDIS_LIBS="$CAPSTONE_LIBS"
+ else
+ HELP_MSG_MISSING_DEPENDENCY([capstone])
+ AC_MSG_NOTICE([Cannot locate capstone which is needed for hsdis/capstone. Try using --with-capstone=. $HELP_MSG])
+ AC_MSG_ERROR([Cannot continue])
+ fi
+ fi
+ elif test "x$with_hsdis" = xllvm; then
+ HSDIS_BACKEND=llvm
+ AC_MSG_RESULT(['llvm'])
+
+ if test "x$with_llvm" != x; then
+ LLVM_DIR="$with_llvm"
+ fi
+
+ if test "x$OPENJDK_TARGET_OS" != xwindows; then
+ if test "x$LLVM_DIR" = x; then
+ # Macs with homebrew can have llvm in different places
+ UTIL_LOOKUP_PROGS(LLVM_CONFIG, llvm-config, [$PATH:/usr/local/opt/llvm/bin:/opt/homebrew/opt/llvm/bin])
+ if test "x$LLVM_CONFIG" = x; then
+ AC_MSG_NOTICE([Cannot locate llvm-config which is needed for hsdis/llvm. Try using --with-llvm=.])
+ AC_MSG_ERROR([Cannot continue])
+ fi
+ else
+ UTIL_LOOKUP_PROGS(LLVM_CONFIG, llvm-config, [$LLVM_DIR/bin])
+ if test "x$LLVM_CONFIG" = x; then
+ AC_MSG_NOTICE([Cannot locate llvm-config in $LLVM_DIR. Check your --with-llvm argument.])
+ AC_MSG_ERROR([Cannot continue])
+ fi
+ fi
+
+ # We need the LLVM flags and libs, and llvm-config provides them for us.
+ HSDIS_CFLAGS=`$LLVM_CONFIG --cflags`
+ HSDIS_LDFLAGS=`$LLVM_CONFIG --ldflags`
+ HSDIS_LIBS=`$LLVM_CONFIG --libs $OPENJDK_TARGET_CPU_ARCH ${OPENJDK_TARGET_CPU_ARCH}disassembler`
+ else
+ if test "x$LLVM_DIR" = x; then
+ AC_MSG_NOTICE([--with-llvm is needed on Windows to point out the LLVM home])
+ AC_MSG_ERROR([Cannot continue])
+ fi
+
+ # Official Windows installation of LLVM do not ship llvm-config, and self-built llvm-config
+ # produced unusable output, so just ignore it on Windows.
+ if ! test -e $LLVM_DIR/include/llvm-c/lto.h; then
+ AC_MSG_NOTICE([$LLVM_DIR does not seem like a valid LLVM home; include dir is missing])
+ AC_MSG_ERROR([Cannot continue])
+ fi
+ if ! test -e $LLVM_DIR/include/llvm-c/Disassembler.h; then
+ AC_MSG_NOTICE([$LLVM_DIR does not point to a complete LLVM installation. ])
+ AC_MSG_NOTICE([The official LLVM distribution is missing crucical files; you need to build LLVM yourself or get all include files elsewhere])
+ AC_MSG_ERROR([Cannot continue])
+ fi
+ if ! test -e $LLVM_DIR/lib/llvm-c.lib; then
+ AC_MSG_NOTICE([$LLVM_DIR does not seem like a valid LLVM home; lib dir is missing])
+ AC_MSG_ERROR([Cannot continue])
+ fi
+ HSDIS_CFLAGS="-I$LLVM_DIR/include"
+ HSDIS_LDFLAGS="-libpath:$LLVM_DIR/lib"
+ HSDIS_LIBS="llvm-c.lib"
+ fi
elif test "x$with_hsdis" = xbinutils; then
HSDIS_BACKEND=binutils
AC_MSG_RESULT(['binutils'])
@@ -853,6 +947,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_HSDIS],
test -e $BINUTILS_DIR/opcodes/libopcodes.a && \
test -e $BINUTILS_DIR/libiberty/libiberty.a; then
HSDIS_CFLAGS="-I$BINUTILS_DIR/include -I$BINUTILS_DIR/bfd -DLIBARCH_$OPENJDK_TARGET_CPU_LEGACY_LIB"
+ HSDIS_LDFLAGS=""
HSDIS_LIBS="$BINUTILS_DIR/bfd/libbfd.a $BINUTILS_DIR/opcodes/libopcodes.a $BINUTILS_DIR/libiberty/libiberty.a $BINUTILS_DIR/zlib/libz.a"
fi
fi
@@ -895,5 +990,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_HSDIS],
AC_SUBST(HSDIS_BACKEND)
AC_SUBST(HSDIS_CFLAGS)
+ AC_SUBST(HSDIS_LDFLAGS)
AC_SUBST(HSDIS_LIBS)
])
diff --git a/make/autoconf/jdk-version.m4 b/make/autoconf/jdk-version.m4
index 5312624d90c5f194d0aa8d553544be8e0fcd59bd..5e64ce9a064f86e2ee6a46e8ec86a108f60f31e4 100644
--- a/make/autoconf/jdk-version.m4
+++ b/make/autoconf/jdk-version.m4
@@ -199,6 +199,10 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
&& test "x$VERSION_BUILD$VERSION_OPT" = x; then
AC_MSG_ERROR([Version string contains + but both 'BUILD' and 'OPT' are missing])
fi
+ if test "x$VERSION_BUILD" = x0; then
+ AC_MSG_WARN([Version build 0 is interpreted as no build number])
+ VERSION_BUILD=
+ fi
# Stop the version part process from setting default values.
# We still allow them to explicitly override though.
NO_DEFAULT_VERSION_PARTS=true
@@ -250,9 +254,10 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
fi
else
if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then
- # Default is to calculate a string like this 'adhoc..'
+ # Default is to calculate a string like this:
+ # 'adhoc..'
# Outer [ ] to quote m4.
- [ basedirname=`$BASENAME "$TOPDIR" | $TR -d -c '[a-z][A-Z][0-9].-'` ]
+ [ basedirname=`$BASENAME "$WORKSPACE_ROOT" | $TR -d -c '[a-z][A-Z][0-9].-'` ]
VERSION_OPT="adhoc.$USERNAME.$basedirname"
fi
fi
@@ -271,13 +276,15 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
VERSION_BUILD=
else
JDKVER_CHECK_AND_SET_NUMBER(VERSION_BUILD, $with_version_build)
+ if test "x$VERSION_BUILD" = "x0"; then
+ AC_MSG_WARN([--with-version-build=0 is interpreted as --without-version-build])
+ VERSION_BUILD=
+ fi
fi
else
if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then
# Default is to not have a build number.
VERSION_BUILD=""
- # FIXME: Until all code can cope with an empty VERSION_BUILD, set it to 0.
- VERSION_BUILD=0
fi
fi
@@ -450,13 +457,22 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
for i in 1 2 3 4 5 6 ; do stripped_version_number=${stripped_version_number%.0} ; done
VERSION_NUMBER=$stripped_version_number
- # The complete version string, with additional build information
- if test "x$VERSION_BUILD$VERSION_OPT" = x; then
- VERSION_STRING=$VERSION_NUMBER${VERSION_PRE:+-$VERSION_PRE}
+ # A build number of "0" is interpreted as "no build number".
+ if test "x$VERSION_BUILD" = x0; then
+ VERSION_BUILD=
+ fi
+
+ # Compute the complete version string, with additional build information
+ version_with_pre=$VERSION_NUMBER${VERSION_PRE:+-$VERSION_PRE}
+ if test "x$VERSION_BUILD" != x || \
+ ( test "x$VERSION_OPT" != x && test "x$VERSION_PRE" = x ); then
+ # As per JEP 223, if build is set, or if opt is set but not pre,
+ # we need a + separator
+ version_with_build=$version_with_pre+$VERSION_BUILD
else
- # If either build or opt is set, we need a + separator
- VERSION_STRING=$VERSION_NUMBER${VERSION_PRE:+-$VERSION_PRE}+$VERSION_BUILD${VERSION_OPT:+-$VERSION_OPT}
+ version_with_build=$version_with_pre
fi
+ VERSION_STRING=$version_with_build${VERSION_OPT:+-$VERSION_OPT}
# The short version string, just VERSION_NUMBER and PRE, if present.
VERSION_SHORT=$VERSION_NUMBER${VERSION_PRE:+-$VERSION_PRE}
diff --git a/make/autoconf/jvm-features.m4 b/make/autoconf/jvm-features.m4
index 70457149edcb0fd053dd71f7d8c773ed44f12ce2..8dfc0d362b9d385649d16d291e0e18d683c8af0e 100644
--- a/make/autoconf/jvm-features.m4
+++ b/make/autoconf/jvm-features.m4
@@ -264,22 +264,6 @@ AC_DEFUN_ONCE([JVM_FEATURES_CHECK_DTRACE],
])
])
-###############################################################################
-# Check if the feature 'jfr' is available on this platform.
-#
-AC_DEFUN_ONCE([JVM_FEATURES_CHECK_JFR],
-[
- JVM_FEATURES_CHECK_AVAILABILITY(jfr, [
- AC_MSG_CHECKING([if platform is supported by JFR])
- if test "x$OPENJDK_TARGET_OS" = xaix; then
- AC_MSG_RESULT([no, $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
- AVAILABLE=false
- else
- AC_MSG_RESULT([yes])
- fi
- ])
-])
-
###############################################################################
# Check if the feature 'jvmci' is available on this platform.
#
@@ -399,18 +383,11 @@ AC_DEFUN_ONCE([JVM_FEATURES_PREPARE_PLATFORM],
JVM_FEATURES_CHECK_CDS
JVM_FEATURES_CHECK_DTRACE
- JVM_FEATURES_CHECK_JFR
JVM_FEATURES_CHECK_JVMCI
JVM_FEATURES_CHECK_SHENANDOAHGC
JVM_FEATURES_CHECK_STATIC_BUILD
JVM_FEATURES_CHECK_ZGC
- # Filter out features by default for all variants on certain platforms.
- # Make sure to just add to JVM_FEATURES_PLATFORM_FILTER, since it could
- # have a value already from custom extensions.
- if test "x$OPENJDK_TARGET_OS" = xaix; then
- JVM_FEATURES_PLATFORM_FILTER="$JVM_FEATURES_PLATFORM_FILTER jfr"
- fi
])
###############################################################################
diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
index a9ddd56bd315e27f03d645dfb1b1b10ea41e2527..59e961c374b1b7c8dbf2b6167466aa7cd377cc2a 100644
--- a/make/autoconf/spec.gmk.in
+++ b/make/autoconf/spec.gmk.in
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -239,7 +239,7 @@ VERSION_DOCS_API_SINCE := @VERSION_DOCS_API_SINCE@
JDK_SOURCE_TARGET_VERSION := @JDK_SOURCE_TARGET_VERSION@
# Convenience CFLAGS settings for passing version information into native programs.
-VERSION_CFLAGS := \
+VERSION_CFLAGS = \
-DVERSION_FEATURE=$(VERSION_FEATURE) \
-DVERSION_INTERIM=$(VERSION_INTERIM) \
-DVERSION_UPDATE=$(VERSION_UPDATE) \
@@ -361,6 +361,7 @@ ALLOW_ABSOLUTE_PATHS_IN_OUTPUT := @ALLOW_ABSOLUTE_PATHS_IN_OUTPUT@
HSDIS_BACKEND := @HSDIS_BACKEND@
HSDIS_CFLAGS := @HSDIS_CFLAGS@
+HSDIS_LDFLAGS := @HSDIS_LDFLAGS@
HSDIS_LIBS := @HSDIS_LIBS@
# The boot jdk to use. This is overridden in bootcycle-spec.gmk. Make sure to keep
@@ -406,6 +407,7 @@ LIBFFI_CFLAGS:=@LIBFFI_CFLAGS@
ENABLE_LIBFFI_BUNDLING:=@ENABLE_LIBFFI_BUNDLING@
LIBFFI_LIB_FILE:=@LIBFFI_LIB_FILE@
FILE_MACRO_CFLAGS := @FILE_MACRO_CFLAGS@
+BRANCH_PROTECTION_CFLAGS := @BRANCH_PROTECTION_CFLAGS@
STATIC_LIBS_CFLAGS := @STATIC_LIBS_CFLAGS@
@@ -419,7 +421,7 @@ GTEST_FRAMEWORK_SRC := @GTEST_FRAMEWORK_SRC@
# Source file for cacerts
CACERTS_FILE=@CACERTS_FILE@
-# Source folder for user provided cacerts PEM files
+# Source folder for user provided cacerts PEM files
CACERTS_SRC=@CACERTS_SRC@
# Enable unlimited crypto policy
@@ -581,7 +583,6 @@ AR := @AR@
ARFLAGS:=@ARFLAGS@
NM:=@NM@
-GNM:=@GNM@
STRIP:=@STRIP@
OBJDUMP:=@OBJDUMP@
CXXFILT:=@CXXFILT@
@@ -929,7 +930,12 @@ JDK_MACOSX_CONTENTS_DIR=$(JDK_MACOSX_BUNDLE_DIR)/$(JDK_MACOSX_CONTENTS_SUBDIR)
JRE_MACOSX_CONTENTS_DIR=$(JRE_MACOSX_BUNDLE_DIR)/$(JRE_MACOSX_CONTENTS_SUBDIR)
# Bundle names
-BASE_NAME := $(VERSION_SHORT)+$(VERSION_BUILD)_$(OPENJDK_TARGET_BUNDLE_PLATFORM)
+ifneq ($(VERSION_BUILD), )
+ BASE_NAME := $(VERSION_SHORT)+$(VERSION_BUILD)_$(OPENJDK_TARGET_BUNDLE_PLATFORM)
+else
+ BASE_NAME := $(VERSION_SHORT)_$(OPENJDK_TARGET_BUNDLE_PLATFORM)
+endif
+
ifeq ($(DEBUG_LEVEL), fastdebug)
DEBUG_PART := -debug
else ifneq ($(DEBUG_LEVEL), release)
diff --git a/make/autoconf/toolchain.m4 b/make/autoconf/toolchain.m4
index 5280520b78bf18dad743c1d03e70deb4c7d52b9a..2288dda7ed632f2b7a22174da401b96451c6101b 100644
--- a/make/autoconf/toolchain.m4
+++ b/make/autoconf/toolchain.m4
@@ -772,8 +772,6 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_EXTRA],
else
UTIL_LOOKUP_TOOLCHAIN_PROGS(NM, nm)
fi
- GNM="$NM"
- AC_SUBST(GNM)
fi
# objcopy is used for moving debug symbols to separate files when
diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index e0041e9185130fb591ae6577c61ae9fe2bc9cc47..5e4c5791859524511c954f8b6bc122f3a1233f90 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -1424,7 +1424,10 @@ var getVersion = function (feature, interim, update, patch, extra1, extra2, extr
* other version inputs
*/
var versionArgs = function(input, common) {
- var args = ["--with-version-build=" + common.build_number];
+ var args = [];
+ if (common.build_number != 0) {
+ args = concat(args, "--with-version-build=" + common.build_number);
+ }
if (input.build_type == "promoted") {
args = concat(args,
"--with-version-pre=" + version_numbers.get("DEFAULT_PROMOTED_VERSION_PRE"),
diff --git a/make/data/publicsuffixlist/VERSION b/make/data/publicsuffixlist/VERSION
index 3367b24a0be6ffa9c2c00af11c65423987ebb9a0..be9290a33fcd47ddc69c378dfb98e9c4591e31c4 100644
--- a/make/data/publicsuffixlist/VERSION
+++ b/make/data/publicsuffixlist/VERSION
@@ -1,2 +1,2 @@
-Github: https://raw.githubusercontent.com/publicsuffix/list/cbbba1d234670453df9c930dfbf510c0474d4301/public_suffix_list.dat
-Date: 2020-04-24
+Github: https://raw.githubusercontent.com/publicsuffix/list/3c213aab32b3c014f171b1673d4ce9b5cd72bf1c/public_suffix_list.dat
+Date: 2021-11-27
diff --git a/make/data/publicsuffixlist/public_suffix_list.dat b/make/data/publicsuffixlist/public_suffix_list.dat
index 27fe1ee51b499d88b45da7b3111b6d3287a9c489..5529554d82df5d9af1a201dd3f160ce0a6cf6e95 100644
--- a/make/data/publicsuffixlist/public_suffix_list.dat
+++ b/make/data/publicsuffixlist/public_suffix_list.dat
@@ -175,17 +175,21 @@ it.ao
// aq : https://en.wikipedia.org/wiki/.aq
aq
-// ar : https://nic.ar/nic-argentina/normativa-vigente
+// ar : https://nic.ar/es/nic-argentina/normativa
ar
+bet.ar
com.ar
+coop.ar
edu.ar
gob.ar
gov.ar
int.ar
mil.ar
musica.ar
+mutual.ar
net.ar
org.ar
+senasa.ar
tur.ar
// arpa : https://en.wikipedia.org/wiki/.arpa
@@ -258,7 +262,7 @@ tas.gov.au
vic.gov.au
wa.gov.au
// 4LDs
-education.tas.edu.au
+// education.tas.edu.au - Removed at the request of the Department of Education Tasmania
schools.nsw.edu.au
// aw : https://en.wikipedia.org/wiki/.aw
@@ -456,6 +460,7 @@ aju.br
am.br
anani.br
aparecida.br
+app.br
arq.br
art.br
ato.br
@@ -463,6 +468,7 @@ b.br
barueri.br
belem.br
bhz.br
+bib.br
bio.br
blog.br
bmd.br
@@ -477,14 +483,19 @@ cnt.br
com.br
contagem.br
coop.br
+coz.br
cri.br
cuiaba.br
curitiba.br
def.br
+des.br
+det.br
+dev.br
ecn.br
eco.br
edu.br
emp.br
+enf.br
eng.br
esp.br
etc.br
@@ -500,6 +511,7 @@ fot.br
foz.br
fst.br
g12.br
+geo.br
ggf.br
goiania.br
gov.br
@@ -543,6 +555,7 @@ jor.br
jus.br
leg.br
lel.br
+log.br
londrina.br
macapa.br
maceio.br
@@ -575,6 +588,7 @@ qsl.br
radio.br
rec.br
recife.br
+rep.br
ribeirao.br
rio.br
riobranco.br
@@ -585,6 +599,7 @@ santamaria.br
santoandre.br
saobernardo.br
saogonca.br
+seg.br
sjc.br
slg.br
slz.br
@@ -592,6 +607,7 @@ sorocaba.br
srv.br
taxi.br
tc.br
+tec.br
teo.br
the.br
tmp.br
@@ -722,7 +738,6 @@ gouv.ci
// cl : https://www.nic.cl
// Confirmed by .CL registry
cl
-aprendemas.cl
co.cl
gob.cl
gov.cl
@@ -827,7 +842,13 @@ gov.cu
inf.cu
// cv : https://en.wikipedia.org/wiki/.cv
+// cv : http://www.dns.cv/tldcv_portal/do?com=DS;5446457100;111;+PAGE(4000018)+K-CAT-CODIGO(RDOM)+RCNT(100); <- registration rules
cv
+com.cv
+edu.cv
+int.cv
+nome.cv
+org.cv
// cw : http://www.una.cw/cw_registry/
// Confirmed by registry 2013-03-26
@@ -895,16 +916,18 @@ org.do
sld.do
web.do
-// dz : https://en.wikipedia.org/wiki/.dz
+// dz : http://www.nic.dz/images/pdf_nic/charte.pdf
dz
+art.dz
+asso.dz
com.dz
+edu.dz
+gov.dz
org.dz
net.dz
-gov.dz
-edu.dz
-asso.dz
pol.dz
-art.dz
+soc.dz
+tm.dz
// ec : http://www.nic.ec/reg/paso1.asp
// Submitted by registry
@@ -1002,6 +1025,10 @@ pro.fj
*.fk
// fm : https://en.wikipedia.org/wiki/.fm
+com.fm
+edu.fm
+net.fm
+org.fm
fm
// fo : https://en.wikipedia.org/wiki/.fo
@@ -1041,6 +1068,8 @@ ga
gb
// gd : https://en.wikipedia.org/wiki/.gd
+edu.gd
+gov.gd
gd
// ge : http://www.nic.net.ge/policy_en.pdf
@@ -1132,7 +1161,7 @@ gov.gr
// gs : https://en.wikipedia.org/wiki/.gs
gs
-// gt : http://www.gt/politicas_de_registro.html
+// gt : https://www.gt/sitio/registration_policy.php?lang=en
gt
com.gt
edu.gt
@@ -1156,6 +1185,7 @@ org.gu
web.gu
// gw : https://en.wikipedia.org/wiki/.gw
+// gw : https://nic.gw/regras/
gw
// gy : https://en.wikipedia.org/wiki/.gy
@@ -3785,7 +3815,7 @@ gov.lc
// li : https://en.wikipedia.org/wiki/.li
li
-// lk : http://www.nic.lk/seclevpr.html
+// lk : https://www.nic.lk/index.php/domain-registration/lk-domain-naming-structure
lk
gov.lk
sch.lk
@@ -4574,15 +4604,17 @@ gob.mx
edu.mx
net.mx
-// my : http://www.mynic.net.my/
+// my : http://www.mynic.my/
+// Available strings: https://mynic.my/resources/domains/buying-a-domain/
my
+biz.my
com.my
-net.my
-org.my
-gov.my
edu.my
+gov.my
mil.my
name.my
+net.my
+org.my
// mz : http://www.uem.mz/
// Submitted by registry
@@ -4679,13 +4711,13 @@ web.ni
// ccTLD for the Netherlands
nl
-// no : http://www.norid.no/regelverk/index.en.html
-// The Norwegian registry has declined to notify us of updates. The web pages
-// referenced below are the official source of the data. There is also an
-// announce mailing list:
-// https://postlister.uninett.no/sympa/info/norid-diskusjon
+// no : https://www.norid.no/en/om-domenenavn/regelverk-for-no/
+// Norid geographical second level domains : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-b/
+// Norid category second level domains : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-c/
+// Norid category second-level domains managed by parties other than Norid : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-d/
+// RSS feed: https://teknisk.norid.no/en/feed/
no
-// Norid generic domains : http://www.norid.no/regelverk/vedlegg-c.en.html
+// Norid category second level domains : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-c/
fhs.no
vgs.no
fylkesbibl.no
@@ -4693,13 +4725,13 @@ folkebibl.no
museum.no
idrett.no
priv.no
-// Non-Norid generic domains : http://www.norid.no/regelverk/vedlegg-d.en.html
+// Norid category second-level domains managed by parties other than Norid : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-d/
mil.no
stat.no
dep.no
kommune.no
herad.no
-// no geographical names : http://www.norid.no/regelverk/vedlegg-b.en.html
+// Norid geographical second level domains : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-b/
// counties
aa.no
ah.no
@@ -5828,7 +5860,7 @@ com.ps
org.ps
net.ps
-// pt : http://online.dns.pt/dns/start_dns
+// pt : https://www.dns.pt/en/domain/pt-terms-and-conditions-registration-rules/
pt
net.pt
gov.pt
@@ -6065,8 +6097,10 @@ biz.ss
com.ss
edu.ss
gov.ss
+me.ss
net.ss
org.ss
+sch.ss
// st : http://www.nic.st/html/policyrules/
st
@@ -6075,7 +6109,6 @@ com.st
consulado.st
edu.st
embaixada.st
-gov.st
mil.st
net.st
org.st
@@ -6180,29 +6213,22 @@ gov.tm
mil.tm
edu.tm
-// tn : https://en.wikipedia.org/wiki/.tn
-// http://whois.ati.tn/
+// tn : http://www.registre.tn/fr/
+// https://whois.ati.tn/
tn
com.tn
ens.tn
fin.tn
gov.tn
ind.tn
+info.tn
intl.tn
+mincom.tn
nat.tn
net.tn
org.tn
-info.tn
perso.tn
tourism.tn
-edunet.tn
-rnrt.tn
-rns.tn
-rnu.tn
-mincom.tn
-agrinet.tn
-defense.tn
-turen.tn
// to : https://en.wikipedia.org/wiki/.to
// Submitted by registry
@@ -6327,7 +6353,6 @@ cv.ua
dn.ua
dnepropetrovsk.ua
dnipropetrovsk.ua
-dominic.ua
donetsk.ua
dp.ua
if.ua
@@ -6693,9 +6718,10 @@ mil.vc
edu.vc
// ve : https://registro.nic.ve/
-// Submitted by registry
+// Submitted by registry nic@nic.ve and nicve@conatel.gob.ve
ve
arts.ve
+bib.ve
co.ve
com.ve
e12.ve
@@ -6707,7 +6733,9 @@ info.ve
int.ve
mil.ve
net.ve
+nom.ve
org.ve
+rar.ve
rec.ve
store.ve
tec.ve
@@ -6786,6 +6814,9 @@ yt
// xn--90ae ("bg", Bulgarian) : BG
бг
+// xn--mgbcpq6gpa1a ("albahrain", Arabic) : BH
+البحرين
+
// xn--90ais ("bel", Belarusian/Russian Cyrillic) : BY
// Operated by .by registry
бел
@@ -6918,12 +6949,15 @@ yt
// xn--80ao21a ("Kaz", Kazakh) : KZ
қаз
+// xn--q7ce6a ("Lao", Lao) : LA
+ລາວ
+
// xn--fzc2c9e2c ("Lanka", Sinhalese-Sinhala) : LK
-// http://nic.lk
+// https://nic.lk
ලංකා
// xn--xkc2al3hye2a ("Ilangai", Tamil) : LK
-// http://nic.lk
+// https://nic.lk
இலங்கை
// xn--mgbc0a9azcg ("Morocco/al-Maghrib", Arabic) : MA
@@ -7043,7 +7077,13 @@ yt
xxx
// ye : http://www.y.net.ye/services/domain_name.htm
-*.ye
+ye
+com.ye
+edu.ye
+gov.ye
+net.ye
+mil.ye
+org.ye
// za : https://www.zadna.org.za/content/page/domain-information/
ac.za
@@ -7092,7 +7132,7 @@ org.zw
// newGTLDs
-// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2020-04-02T18:20:31Z
+// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2021-11-13T15:12:42Z
// This list is auto-generated, don't edit it manually.
// aaa : 2015-02-26 American Automobile Association, Inc.
aaa
@@ -7118,7 +7158,7 @@ abc
// able : 2015-06-25 Able Inc.
able
-// abogado : 2014-04-24 Minds + Machines Group Limited
+// abogado : 2014-04-24 Registry Services, LLC
abogado
// abudhabi : 2015-07-30 Abu Dhabi Systems and Information Centre
@@ -7175,9 +7215,6 @@ agency
// aig : 2014-12-18 American International Group, Inc.
aig
-// aigo : 2015-08-06 aigo Digital Technology Co,Ltd.
-aigo
-
// airbus : 2015-07-30 Airbus S.A.S.
airbus
@@ -7241,7 +7278,7 @@ analytics
// android : 2014-08-07 Charleston Road Registry Inc.
android
-// anquan : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD.
+// anquan : 2015-01-08 Beijing Qihu Keji Co., Ltd.
anquan
// anz : 2015-07-31 Australia and New Zealand Banking Group Limited
@@ -7301,7 +7338,7 @@ audi
// audible : 2015-06-25 Amazon Registry Services, Inc.
audible
-// audio : 2014-03-20 Uniregistry, Corp.
+// audio : 2014-03-20 UNR Corp.
audio
// auspost : 2015-08-13 Australian Postal Corporation
@@ -7310,19 +7347,19 @@ auspost
// author : 2014-12-18 Amazon Registry Services, Inc.
author
-// auto : 2014-11-13 Cars Registry Limited
+// auto : 2014-11-13 XYZ.COM LLC
auto
-// autos : 2014-01-09 DERAutos, LLC
+// autos : 2014-01-09 XYZ.COM LLC
autos
// avianca : 2015-01-08 Avianca Holdings S.A.
avianca
-// aws : 2015-06-25 Amazon Registry Services, Inc.
+// aws : 2015-06-25 AWS Registry LLC
aws
-// axa : 2013-12-19 AXA SA
+// axa : 2013-12-19 AXA Group Operations SAS
axa
// azure : 2014-12-18 Microsoft Corporation
@@ -7397,7 +7434,7 @@ beats
// beauty : 2015-12-03 XYZ.COM LLC
beauty
-// beer : 2014-01-09 Minds + Machines Group Limited
+// beer : 2014-01-09 Registry Services, LLC
beer
// bentley : 2014-12-18 Bentley Motors Limited
@@ -7439,7 +7476,7 @@ bio
// black : 2014-01-16 Afilias Limited
black
-// blackfriday : 2014-01-16 Uniregistry, Corp.
+// blackfriday : 2014-01-16 UNR Corp.
blackfriday
// blockbuster : 2015-07-30 Dish DBS Corporation
@@ -7463,7 +7500,7 @@ bmw
// bnpparibas : 2014-05-29 BNP Paribas
bnpparibas
-// boats : 2014-12-04 DERBoats, LLC
+// boats : 2014-12-04 XYZ.COM LLC
boats
// boehringer : 2015-07-09 Boehringer Ingelheim International GmbH
@@ -7502,7 +7539,7 @@ bot
// boutique : 2013-11-14 Binky Moon, LLC
boutique
-// box : 2015-11-12 .BOX INC.
+// box : 2015-11-12 Intercap Registry Inc.
box
// bradesco : 2014-12-18 Banco Bradesco S.A.
@@ -7514,7 +7551,7 @@ bridgestone
// broadway : 2014-12-22 Celebrate Broadway, Inc.
broadway
-// broker : 2014-12-11 Dotbroker Registry Limited
+// broker : 2014-12-11 Dog Beach, LLC
broker
// brother : 2015-01-29 Brother Industries, Ltd.
@@ -7586,7 +7623,7 @@ capital
// capitalone : 2015-08-06 Capital One Financial Corporation
capitalone
-// car : 2015-01-22 Cars Registry Limited
+// car : 2015-01-22 XYZ.COM LLC
car
// caravan : 2013-12-12 Caravan International, Inc.
@@ -7604,18 +7641,15 @@ career
// careers : 2013-10-02 Binky Moon, LLC
careers
-// cars : 2014-11-13 Cars Registry Limited
+// cars : 2014-11-13 XYZ.COM LLC
cars
-// casa : 2013-11-21 Minds + Machines Group Limited
+// casa : 2013-11-21 Registry Services, LLC
casa
-// case : 2015-09-03 CNH Industrial N.V.
+// case : 2015-09-03 Helium TLDs Ltd
case
-// caseih : 2015-09-03 CNH Industrial N.V.
-caseih
-
// cash : 2014-03-06 Binky Moon, LLC
cash
@@ -7640,9 +7674,6 @@ cbre
// cbs : 2015-08-06 CBS Domains Inc.
cbs
-// ceb : 2015-04-09 The Corporate Executive Board Company
-ceb
-
// center : 2013-11-07 Binky Moon, LLC
center
@@ -7655,7 +7686,7 @@ cern
// cfa : 2014-08-28 CFA Institute
cfa
-// cfd : 2014-12-11 DotCFD Registry Limited
+// cfd : 2014-12-11 ShortDot SA
cfd
// chanel : 2015-04-09 Chanel International B.V.
@@ -7679,7 +7710,7 @@ cheap
// chintai : 2015-06-11 CHINTAI Corporation
chintai
-// christmas : 2013-11-21 Uniregistry, Corp.
+// christmas : 2013-11-21 UNR Corp.
christmas
// chrome : 2014-07-24 Charleston Road Registry Inc.
@@ -7718,7 +7749,7 @@ claims
// cleaning : 2013-12-05 Binky Moon, LLC
cleaning
-// click : 2014-06-05 Uniregistry, Corp.
+// click : 2014-06-05 UNR Corp.
click
// clinic : 2014-03-20 Binky Moon, LLC
@@ -7733,7 +7764,7 @@ clothing
// cloud : 2015-04-16 Aruba PEC S.p.A.
cloud
-// club : 2013-11-08 .CLUB DOMAINS, LLC
+// club : 2013-11-08 Registry Services, LLC
club
// clubmed : 2015-06-25 Club Méditerranée S.A.
@@ -7790,7 +7821,7 @@ contact
// contractors : 2013-09-10 Binky Moon, LLC
contractors
-// cooking : 2013-11-21 Minds + Machines Group Limited
+// cooking : 2013-11-21 Registry Services, LLC
cooking
// cookingchannel : 2015-07-02 Lifestyle Domain Holdings, Inc.
@@ -7823,7 +7854,7 @@ credit
// creditcard : 2014-03-20 Binky Moon, LLC
creditcard
-// creditunion : 2015-01-22 CUNA Performance Resources, LLC
+// creditunion : 2015-01-22 DotCooperation LLC
creditunion
// cricket : 2014-10-09 dot Cricket Limited
@@ -7880,7 +7911,7 @@ day
// dclk : 2014-11-20 Charleston Road Registry Inc.
dclk
-// dds : 2015-05-07 Minds + Machines Group Limited
+// dds : 2015-05-07 Registry Services, LLC
dds
// deal : 2015-06-25 Amazon Registry Services, Inc.
@@ -7919,7 +7950,7 @@ dentist
// desi : 2013-11-14 Desi Networks LLC
desi
-// design : 2014-11-07 Top Level Design, LLC
+// design : 2014-11-07 Registry Services, LLC
design
// dev : 2014-10-16 Charleston Road Registry Inc.
@@ -7931,7 +7962,7 @@ dhl
// diamonds : 2013-09-22 Binky Moon, LLC
diamonds
-// diet : 2014-06-26 Uniregistry, Corp.
+// diet : 2014-06-26 UNR Corp.
diet
// digital : 2014-03-06 Binky Moon, LLC
@@ -7991,7 +8022,7 @@ duck
// dunlop : 2015-07-02 The Goodyear Tire & Rubber Company
dunlop
-// dupont : 2015-06-25 E. I. du Pont de Nemours and Company
+// dupont : 2015-06-25 DuPont Specialty Products USA, LLC
dupont
// durban : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry
@@ -8054,9 +8085,6 @@ esq
// estate : 2013-08-27 Binky Moon, LLC
estate
-// esurance : 2015-07-23 Esurance Insurance Company
-esurance
-
// etisalat : 2015-09-03 Emirates Telecommunications Corporation (trading as Etisalat)
etisalat
@@ -8111,7 +8139,7 @@ farm
// farmers : 2015-07-09 Farmers Insurance Exchange
farmers
-// fashion : 2014-07-03 Minds + Machines Group Limited
+// fashion : 2014-07-03 Registry Services, LLC
fashion
// fast : 2014-12-18 Amazon Registry Services, Inc.
@@ -8162,16 +8190,16 @@ firmdale
// fish : 2013-12-12 Binky Moon, LLC
fish
-// fishing : 2013-11-21 Minds + Machines Group Limited
+// fishing : 2013-11-21 Registry Services, LLC
fishing
-// fit : 2014-11-07 Minds + Machines Group Limited
+// fit : 2014-11-07 Registry Services, LLC
fit
// fitness : 2014-03-06 Binky Moon, LLC
fitness
-// flickr : 2015-04-02 Yahoo! Domain Services Inc.
+// flickr : 2015-04-02 Flickr, Inc.
flickr
// flights : 2013-12-05 Binky Moon, LLC
@@ -8183,7 +8211,7 @@ flir
// florist : 2013-11-07 Binky Moon, LLC
florist
-// flowers : 2014-10-09 Uniregistry, Corp.
+// flowers : 2014-10-09 UNR Corp.
flowers
// fly : 2014-05-08 Charleston Road Registry Inc.
@@ -8204,7 +8232,7 @@ football
// ford : 2014-11-13 Ford Motor Company
ford
-// forex : 2014-12-11 Dotforex Registry Limited
+// forex : 2014-12-11 Dog Beach, LLC
forex
// forsale : 2014-05-22 Dog Beach, LLC
@@ -8243,10 +8271,7 @@ ftr
// fujitsu : 2015-07-30 Fujitsu Limited
fujitsu
-// fujixerox : 2015-07-23 Xerox DNHC LLC
-fujixerox
-
-// fun : 2016-01-14 DotSpace Inc.
+// fun : 2016-01-14 Radix FZC
fun
// fund : 2014-03-20 Binky Moon, LLC
@@ -8273,7 +8298,7 @@ gallo
// gallup : 2015-02-19 Gallup, Inc.
gallup
-// game : 2015-05-28 Uniregistry, Corp.
+// game : 2015-05-28 UNR Corp.
game
// games : 2015-05-28 Dog Beach, LLC
@@ -8282,7 +8307,7 @@ games
// gap : 2015-07-31 The Gap, Inc.
gap
-// garden : 2014-06-26 Minds + Machines Group Limited
+// garden : 2014-06-26 Registry Services, LLC
garden
// gay : 2019-05-23 Top Level Design, LLC
@@ -8411,7 +8436,7 @@ guge
// guide : 2013-09-13 Binky Moon, LLC
guide
-// guitars : 2013-11-14 Uniregistry, Corp.
+// guitars : 2013-11-14 UNR Corp.
guitars
// guru : 2013-08-27 Binky Moon, LLC
@@ -8444,7 +8469,7 @@ health
// healthcare : 2014-06-12 Binky Moon, LLC
healthcare
-// help : 2014-06-26 Uniregistry, Corp.
+// help : 2014-06-26 UNR Corp.
help
// helsinki : 2015-02-05 City of Helsinki
@@ -8459,7 +8484,7 @@ hermes
// hgtv : 2015-07-02 Lifestyle Domain Holdings, Inc.
hgtv
-// hiphop : 2014-03-06 Uniregistry, Corp.
+// hiphop : 2014-03-06 UNR Corp.
hiphop
// hisamitsu : 2015-07-16 Hisamitsu Pharmaceutical Co.,Inc.
@@ -8468,7 +8493,7 @@ hisamitsu
// hitachi : 2014-10-31 Hitachi, Ltd.
hitachi
-// hiv : 2014-03-13 Uniregistry, Corp.
+// hiv : 2014-03-13 UNR Corp.
hiv
// hkt : 2015-05-14 PCCW-HKT DataCom Services Limited
@@ -8489,7 +8514,7 @@ homedepot
// homegoods : 2015-07-16 The TJX Companies, Inc.
homegoods
-// homes : 2014-01-09 DERHomes, LLC
+// homes : 2014-01-09 XYZ.COM LLC
homes
// homesense : 2015-07-16 The TJX Companies, Inc.
@@ -8498,16 +8523,16 @@ homesense
// honda : 2014-12-18 Honda Motor Co., Ltd.
honda
-// horse : 2013-11-21 Minds + Machines Group Limited
+// horse : 2013-11-21 Registry Services, LLC
horse
// hospital : 2016-10-20 Binky Moon, LLC
hospital
-// host : 2014-04-17 DotHost Inc.
+// host : 2014-04-17 Radix FZC
host
-// hosting : 2014-05-29 Uniregistry, Corp.
+// hosting : 2014-05-29 UNR Corp.
hosting
// hot : 2015-08-27 Amazon Registry Services, Inc.
@@ -8597,9 +8622,6 @@ insurance
// insure : 2014-03-20 Binky Moon, LLC
insure
-// intel : 2015-08-06 Intel Corporation
-intel
-
// international : 2013-11-07 Binky Moon, LLC
international
@@ -8630,9 +8652,6 @@ itau
// itv : 2015-07-09 ITV Services Limited
itv
-// iveco : 2015-09-03 CNH Industrial N.V.
-iveco
-
// jaguar : 2014-11-13 Jaguar Land Rover Ltd
jaguar
@@ -8642,9 +8661,6 @@ java
// jcb : 2014-11-20 JCB Co., Ltd.
jcb
-// jcp : 2015-04-23 JCP Media, Inc.
-jcp
-
// jeep : 2015-07-30 FCA US LLC.
jeep
@@ -8681,7 +8697,7 @@ jpmorgan
// jprs : 2014-09-18 Japan Registry Services Co., Ltd.
jprs
-// juegos : 2014-03-20 Uniregistry, Corp.
+// juegos : 2014-03-20 UNR Corp.
juegos
// juniper : 2015-07-30 JUNIPER NETWORKS, INC.
@@ -8708,6 +8724,9 @@ kfh
// kia : 2015-07-09 KIA MOTORS CORPORATION
kia
+// kids : 2021-08-13 DotKids Foundation Limited
+kids
+
// kim : 2013-09-23 Afilias Limited
kim
@@ -8786,13 +8805,13 @@ latino
// latrobe : 2014-06-16 La Trobe University
latrobe
-// law : 2015-01-22 LW TLD Limited
+// law : 2015-01-22 Registry Services, LLC
law
// lawyer : 2014-03-20 Dog Beach, LLC
lawyer
-// lds : 2014-03-20 IRI Domain Management, LLC ("Applicant")
+// lds : 2014-03-20 IRI Domain Management, LLC
lds
// lease : 2014-03-06 Binky Moon, LLC
@@ -8849,7 +8868,7 @@ lincoln
// linde : 2014-12-04 Linde Aktiengesellschaft
linde
-// link : 2013-11-14 Uniregistry, Corp.
+// link : 2013-11-14 UNR Corp.
link
// lipsy : 2015-06-25 Lipsy Ltd
@@ -8867,7 +8886,7 @@ lixil
// llc : 2017-12-14 Afilias Limited
llc
-// llp : 2019-08-26 Dot Registry LLC
+// llp : 2019-08-26 UNR Corp.
llp
// loan : 2014-11-20 dot Loan Limited
@@ -8885,7 +8904,7 @@ locus
// loft : 2015-07-30 Annco, Inc.
loft
-// lol : 2015-01-30 Uniregistry, Corp.
+// lol : 2015-01-30 UNR Corp.
lol
// london : 2013-11-14 Dot London Domains Limited
@@ -8915,10 +8934,7 @@ ltda
// lundbeck : 2015-08-06 H. Lundbeck A/S
lundbeck
-// lupin : 2014-11-07 LUPIN LIMITED
-lupin
-
-// luxe : 2014-01-09 Minds + Machines Group Limited
+// luxe : 2014-01-09 Registry Services, LLC
luxe
// luxury : 2013-10-17 Luxury Partners, LLC
@@ -8957,7 +8973,7 @@ market
// marketing : 2013-11-07 Binky Moon, LLC
marketing
-// markets : 2014-12-11 Dotmarkets Registry Limited
+// markets : 2014-12-11 Dog Beach, LLC
markets
// marriott : 2014-10-09 Marriott Worldwide Corporation
@@ -9005,9 +9021,6 @@ menu
// merckmsd : 2016-07-14 MSD Registry Holdings, Inc.
merckmsd
-// metlife : 2015-05-07 MetLife Services and Solutions, LLC
-metlife
-
// miami : 2013-12-19 Minds + Machines Group Limited
miami
@@ -9047,7 +9060,7 @@ moe
// moi : 2014-12-18 Amazon Registry Services, Inc.
moi
-// mom : 2015-04-16 Uniregistry, Corp.
+// mom : 2015-04-16 UNR Corp.
mom
// monash : 2013-09-30 Monash University
@@ -9059,7 +9072,7 @@ money
// monster : 2015-09-11 XYZ.COM LLC
monster
-// mormon : 2013-12-05 IRI Domain Management, LLC ("Applicant")
+// mormon : 2013-12-05 IRI Domain Management, LLC
mormon
// mortgage : 2014-03-20 Dog Beach, LLC
@@ -9071,7 +9084,7 @@ moscow
// moto : 2015-06-04 Motorola Trademark Holdings, LLC
moto
-// motorcycles : 2014-01-09 DERMotorcycles, LLC
+// motorcycles : 2014-01-09 XYZ.COM LLC
motorcycles
// mov : 2014-01-30 Charleston Road Registry Inc.
@@ -9089,6 +9102,9 @@ mtn
// mtr : 2015-03-12 MTR Corporation Limited
mtr
+// music : 2021-05-04 DotMusic Limited
+music
+
// mutual : 2015-04-02 Northwestern Mutual MU TLD Registry, LLC
mutual
@@ -9098,9 +9114,6 @@ nab
// nagoya : 2013-10-24 GMO Registry, Inc.
nagoya
-// nationwide : 2015-07-23 Nationwide Mutual Insurance Company
-nationwide
-
// natura : 2015-03-12 NATURA COSMÉTICOS S.A.
natura
@@ -9122,15 +9135,12 @@ netflix
// network : 2013-11-14 Binky Moon, LLC
network
-// neustar : 2013-12-05 Registry Services, LLC
+// neustar : 2013-12-05 NeuStar, Inc.
neustar
// new : 2014-01-30 Charleston Road Registry Inc.
new
-// newholland : 2015-09-03 CNH Industrial N.V.
-newholland
-
// news : 2014-12-18 Dog Beach, LLC
news
@@ -9176,7 +9186,7 @@ nokia
// northwesternmutual : 2015-06-18 Northwestern Mutual Registry, LLC
northwesternmutual
-// norton : 2014-12-04 Symantec Corporation
+// norton : 2014-12-04 NortonLifeLock Inc.
norton
// now : 2015-06-25 Amazon Registry Services, Inc.
@@ -9203,7 +9213,7 @@ nyc
// obi : 2014-09-25 OBI Group Holding SE & Co. KGaA
obi
-// observer : 2015-04-30 Top Level Spectrum, Inc.
+// observer : 2015-04-30 Dog Beach, LLC
observer
// off : 2015-07-23 Johnson Shareholdings, Inc.
@@ -9236,15 +9246,12 @@ one
// ong : 2014-03-06 Public Interest Registry
ong
-// onl : 2013-09-16 I-Registry Ltd.
+// onl : 2013-09-16 iRegistry GmbH
onl
-// online : 2015-01-15 DotOnline Inc.
+// online : 2015-01-15 Radix FZC
online
-// onyourside : 2015-07-23 Nationwide Mutual Insurance Company
-onyourside
-
// ooo : 2014-01-09 INFIBEAM AVENUES LIMITED
ooo
@@ -9323,7 +9330,7 @@ philips
// phone : 2016-06-02 Dish DBS Corporation
phone
-// photo : 2013-11-14 Uniregistry, Corp.
+// photo : 2013-11-14 UNR Corp.
photo
// photography : 2013-09-20 Binky Moon, LLC
@@ -9335,7 +9342,7 @@ photos
// physio : 2014-05-01 PhysBiz Pty Ltd
physio
-// pics : 2013-11-14 Uniregistry, Corp.
+// pics : 2013-11-14 UNR Corp.
pics
// pictet : 2014-06-26 Pictet Europe S.A.
@@ -9398,7 +9405,7 @@ pramerica
// praxi : 2013-12-05 Praxi S.p.A.
praxi
-// press : 2014-04-03 DotPress Inc.
+// press : 2014-04-03 Radix FZC
press
// prime : 2015-06-25 Amazon Registry Services, Inc.
@@ -9422,7 +9429,7 @@ promo
// properties : 2013-12-05 Binky Moon, LLC
properties
-// property : 2014-05-22 Uniregistry, Corp.
+// property : 2014-05-22 UNR Corp.
property
// protection : 2015-04-23 XYZ.COM LLC
@@ -9449,9 +9456,6 @@ quebec
// quest : 2015-03-26 XYZ.COM LLC
quest
-// qvc : 2015-07-30 QVC, Inc.
-qvc
-
// racing : 2014-12-04 Premier Registry Limited
racing
@@ -9470,7 +9474,7 @@ realestate
// realtor : 2014-05-29 Real Estate Domains LLC
realtor
-// realty : 2015-03-19 Fegistry, LLC
+// realty : 2015-03-19 Dog Beach, LLC
realty
// recipes : 2013-10-17 Binky Moon, LLC
@@ -9533,7 +9537,7 @@ reviews
// rexroth : 2015-06-18 Robert Bosch GMBH
rexroth
-// rich : 2013-11-21 I-Registry Ltd.
+// rich : 2013-11-21 iRegistry GmbH
rich
// richardli : 2015-05-14 Pacific Century Asset Management (HK) Limited
@@ -9542,9 +9546,6 @@ richardli
// ricoh : 2014-11-20 Ricoh Company, Ltd.
ricoh
-// rightathome : 2015-07-23 Johnson Shareholdings, Inc.
-rightathome
-
// ril : 2015-04-02 Reliance Industries Limited
ril
@@ -9554,16 +9555,13 @@ rio
// rip : 2014-07-10 Dog Beach, LLC
rip
-// rmit : 2015-11-19 Royal Melbourne Institute of Technology
-rmit
-
// rocher : 2014-12-18 Ferrero Trading Lux S.A.
rocher
// rocks : 2013-11-14 Dog Beach, LLC
rocks
-// rodeo : 2013-12-19 Minds + Machines Group Limited
+// rodeo : 2013-12-19 Registry Services, LLC
rodeo
// rogers : 2015-08-06 Rogers Communications Canada Inc.
@@ -9641,7 +9639,7 @@ saxo
// sbi : 2015-03-12 STATE BANK OF INDIA
sbi
-// sbs : 2014-11-07 SPECIAL BROADCASTING SERVICE CORPORATION
+// sbs : 2014-11-07 ShortDot SA
sbs
// sca : 2014-03-13 SVENSKA CELLULOSA AKTIEBOLAGET SCA (publ)
@@ -9674,9 +9672,6 @@ science
// scjohnson : 2015-07-23 Johnson Shareholdings, Inc.
scjohnson
-// scor : 2014-10-31 SCOR SE
-scor
-
// scot : 2014-01-23 Dot Scot Registry Limited
scot
@@ -9716,7 +9711,7 @@ sew
// sex : 2014-11-13 ICM Registry SX LLC
sex
-// sexy : 2013-09-11 Uniregistry, Corp.
+// sexy : 2013-09-11 UNR Corp.
sexy
// sfr : 2015-08-13 Societe Francaise du Radiotelephone - SFR
@@ -9749,7 +9744,7 @@ shop
// shopping : 2016-03-31 Binky Moon, LLC
shopping
-// shouji : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD.
+// shouji : 2015-01-08 Beijing Qihu Keji Co., Ltd.
shouji
// show : 2015-03-05 Binky Moon, LLC
@@ -9758,9 +9753,6 @@ show
// showtime : 2015-08-06 CBS Domains Inc.
showtime
-// shriram : 2014-01-23 Shriram Capital Ltd.
-shriram
-
// silk : 2015-06-25 Amazon Registry Services, Inc.
silk
@@ -9770,7 +9762,7 @@ sina
// singles : 2013-08-27 Binky Moon, LLC
singles
-// site : 2015-01-15 DotSite Inc.
+// site : 2015-01-15 Radix FZC
site
// ski : 2015-04-09 Afilias Limited
@@ -9830,7 +9822,7 @@ soy
// spa : 2019-09-19 Asia Spa and Wellness Promotion Council Limited
spa
-// space : 2014-04-03 DotSpace Inc.
+// space : 2014-04-03 Radix FZC
space
// sport : 2017-11-16 Global Association of International Sports Federations (GAISF)
@@ -9839,9 +9831,6 @@ sport
// spot : 2015-02-26 Amazon Registry Services, Inc.
spot
-// spreadbetting : 2014-12-11 Dotspreadbetting Registry Limited
-spreadbetting
-
// srl : 2015-05-07 InterNetX, Corp
srl
@@ -9872,7 +9861,7 @@ stockholm
// storage : 2014-12-22 XYZ.COM LLC
storage
-// store : 2015-04-09 DotStore Inc.
+// store : 2015-04-09 Radix FZC
store
// stream : 2016-01-08 dot Stream Limited
@@ -9899,7 +9888,7 @@ supply
// support : 2013-10-24 Binky Moon, LLC
support
-// surf : 2014-01-09 Minds + Machines Group Limited
+// surf : 2014-01-09 Registry Services, LLC
surf
// surgery : 2014-03-20 Binky Moon, LLC
@@ -9911,18 +9900,12 @@ suzuki
// swatch : 2015-01-08 The Swatch Group Ltd
swatch
-// swiftcover : 2015-07-23 Swiftcover Insurance Services Limited
-swiftcover
-
// swiss : 2014-10-16 Swiss Confederation
swiss
// sydney : 2014-09-18 State of New South Wales, Department of Premier and Cabinet
sydney
-// symantec : 2014-12-04 Symantec Corporation
-symantec
-
// systems : 2013-11-07 Binky Moon, LLC
systems
@@ -9947,7 +9930,7 @@ tatamotors
// tatar : 2014-04-24 Limited Liability Company "Coordination Center of Regional Domain of Tatarstan Republic"
tatar
-// tattoo : 2013-08-30 Uniregistry, Corp.
+// tattoo : 2013-08-30 UNR Corp.
tattoo
// tax : 2014-03-20 Binky Moon, LLC
@@ -9965,7 +9948,7 @@ tdk
// team : 2015-03-05 Binky Moon, LLC
team
-// tech : 2015-01-30 Personals TLD Inc.
+// tech : 2015-01-30 Radix FZC
tech
// technology : 2013-09-13 Binky Moon, LLC
@@ -9992,7 +9975,7 @@ theatre
// tiaa : 2015-07-23 Teachers Insurance and Annuity Association of America
tiaa
-// tickets : 2015-02-05 Accent Media Limited
+// tickets : 2015-02-05 XYZ.COM LLC
tickets
// tienda : 2013-11-14 Binky Moon, LLC
@@ -10058,7 +10041,7 @@ toys
// trade : 2014-01-23 Elite Registry Limited
trade
-// trading : 2014-12-11 Dottrading Registry Limited
+// trading : 2014-12-11 Dog Beach, LLC
trading
// training : 2013-11-07 Binky Moon, LLC
@@ -10076,7 +10059,7 @@ travelers
// travelersinsurance : 2015-03-26 Travelers TLD, LLC
travelersinsurance
-// trust : 2014-10-16 NCC Group Inc.
+// trust : 2014-10-16 UNR Corp.
trust
// trv : 2015-03-26 Travelers TLD, LLC
@@ -10109,7 +10092,7 @@ unicom
// university : 2014-03-06 Binky Moon, LLC
university
-// uno : 2013-09-11 DotSite Inc.
+// uno : 2013-09-11 Radix FZC
uno
// uol : 2014-05-01 UBN INTERNET LTDA.
@@ -10160,7 +10143,7 @@ villas
// vin : 2015-06-18 Binky Moon, LLC
vin
-// vip : 2015-01-22 Minds + Machines Group Limited
+// vip : 2015-01-22 Registry Services, LLC
vip
// virgin : 2014-09-25 Virgin Enterprises Limited
@@ -10181,7 +10164,7 @@ vivo
// vlaanderen : 2014-02-06 DNS.be vzw
vlaanderen
-// vodka : 2013-12-19 Minds + Machines Group Limited
+// vodka : 2013-12-19 Registry Services, LLC
vodka
// volkswagen : 2015-05-14 Volkswagen Group of America Inc.
@@ -10223,7 +10206,7 @@ wanggou
// watch : 2013-11-14 Binky Moon, LLC
watch
-// watches : 2014-12-22 Richemont DNS Inc.
+// watches : 2014-12-22 Afilias Limited
watches
// weather : 2015-01-08 International Business Machines Corporation
@@ -10238,13 +10221,10 @@ webcam
// weber : 2015-06-04 Saint-Gobain Weber SA
weber
-// website : 2014-04-03 DotWebsite Inc.
+// website : 2014-04-03 Radix FZC
website
-// wed : 2013-10-01 Atgron, Inc.
-wed
-
-// wedding : 2014-04-24 Minds + Machines Group Limited
+// wedding : 2014-04-24 Registry Services, LLC
wedding
// weibo : 2015-03-05 Sina Corporation
@@ -10286,7 +10266,7 @@ wolterskluwer
// woodside : 2015-07-09 Woodside Petroleum Limited
woodside
-// work : 2013-12-19 Minds + Machines Group Limited
+// work : 2013-12-19 Registry Services, LLC
work
// works : 2013-11-14 Binky Moon, LLC
@@ -10313,7 +10293,7 @@ xerox
// xfinity : 2015-07-09 Comcast IP Holdings I, LLC
xfinity
-// xihuan : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD.
+// xihuan : 2015-01-08 Beijing Qihu Keji Co., Ltd.
xihuan
// xin : 2014-12-11 Elegant Leader Limited
@@ -10337,9 +10317,6 @@ xin
// xn--3ds443g : 2013-09-08 TLD REGISTRY LIMITED OY
在线
-// xn--3oq18vl8pn36a : 2015-07-02 Volkswagen (China) Investment Co., Ltd.
-大众汽车
-
// xn--3pxu8k : 2015-01-15 VeriSign Sarl
点看
@@ -10349,7 +10326,7 @@ xin
// xn--45q11c : 2013-11-21 Zodiac Gemini Ltd
八卦
-// xn--4gbrim : 2013-10-04 Fans TLD Limited
+// xn--4gbrim : 2013-10-04 Helium TLDs Ltd
موقع
// xn--55qw42g : 2013-11-08 China Organizational Name Administration Center
@@ -10454,7 +10431,7 @@ xin
// xn--fzys8d69uvgm : 2015-05-14 PCCW Enterprises Limited
電訊盈科
-// xn--g2xx48c : 2015-01-30 Minds + Machines Group Limited
+// xn--g2xx48c : 2015-01-30 Nawang Heli(Xiamen) Network Service Co., LTD.
购物
// xn--gckr3f0f : 2015-02-26 Amazon Registry Services, Inc.
@@ -10490,9 +10467,6 @@ xin
// xn--kcrx77d1x4a : 2014-11-07 Koninklijke Philips N.V.
飞利浦
-// xn--kpu716f : 2014-12-22 Richemont DNS Inc.
-手表
-
// xn--kput3i : 2014-02-13 Beijing RITT-Net Technology Development Co., Ltd
手机
@@ -10547,9 +10521,6 @@ xin
// xn--p1acf : 2013-12-12 Rusnames Limited
рус
-// xn--pbt977c : 2014-12-22 Richemont DNS Inc.
-珠宝
-
// xn--pssy2u : 2015-01-15 VeriSign Sarl
大拿
@@ -10607,10 +10578,10 @@ vermögensberatung
// xyz : 2013-12-05 XYZ.COM LLC
xyz
-// yachts : 2014-01-09 DERYachts, LLC
+// yachts : 2014-01-09 XYZ.COM LLC
yachts
-// yahoo : 2015-04-02 Yahoo! Domain Services Inc.
+// yahoo : 2015-04-02 Oath Inc.
yahoo
// yamaxun : 2014-12-18 Amazon Registry Services, Inc.
@@ -10622,7 +10593,7 @@ yandex
// yodobashi : 2014-11-20 YODOBASHI CAMERA CO.,LTD.
yodobashi
-// yoga : 2014-05-29 Minds + Machines Group Limited
+// yoga : 2014-05-29 Registry Services, LLC
yoga
// yokohama : 2013-12-12 GMO Registry, Inc.
@@ -10634,7 +10605,7 @@ you
// youtube : 2014-05-01 Charleston Road Registry Inc.
youtube
-// yun : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD.
+// yun : 2015-01-08 Beijing Qihu Keji Co., Ltd.
yun
// zappos : 2015-06-25 Amazon Registry Services, Inc.
@@ -10666,11 +10637,25 @@ cc.ua
inf.ua
ltd.ua
+// 611coin : https://611project.org/
+611.to
+
+// Aaron Marais' Gitlab pages: https://lab.aaronleem.co.za
+// Submitted by Aaron Marais
+graphox.us
+
+// accesso Technology Group, plc. : https://accesso.com/
+// Submitted by accesso Team
+*.devcdnaccesso.com
+
// Adobe : https://www.adobe.com/
-// Submitted by Ian Boston
+// Submitted by Ian Boston and Lars Trieloff
adobeaemcloud.com
-adobeaemcloud.net
*.dev.adobeaemcloud.com
+hlx.live
+adobeaemcloud.net
+hlx.page
+hlx3.page
// Agnat sp. z o.o. : https://domena.pl
// Submitted by Przemyslaw Plewa
@@ -10685,6 +10670,10 @@ barsy.ca
*.compute.estate
*.alces.network
+// all-inkl.com : https://all-inkl.com
+// Submitted by Werner Kaltofen
+kasserver.com
+
// Altervista: https://www.altervista.org
// Submitted by Carlo Cannas
altervista.org
@@ -10732,6 +10721,10 @@ us-west-2.elasticbeanstalk.com
*.elb.amazonaws.com
*.elb.amazonaws.com.cn
+// Amazon Global Accelerator : https://aws.amazon.com/global-accelerator/
+// Submitted by Daniel Massaguer
+awsglobalaccelerator.com
+
// Amazon S3 : https://aws.amazon.com/s3/
// Submitted by Luke Wells
s3.amazonaws.com
@@ -10789,10 +10782,6 @@ s3-website.eu-west-2.amazonaws.com
s3-website.eu-west-3.amazonaws.com
s3-website.us-east-2.amazonaws.com
-// Amsterdam Wireless: https://www.amsterdamwireless.nl/
-// Submitted by Imre Jonk
-amsw.nl
-
// Amune : https://amune.org/
// Submitted by Team Amune
t3l3p0rt.net
@@ -10802,6 +10791,19 @@ tele.amune.org
// Submitted by Apigee Security Team
apigee.io
+// Apphud : https://apphud.com
+// Submitted by Alexander Selivanov
+siiites.com
+
+// Appspace : https://www.appspace.com
+// Submitted by Appspace Security Team
+appspacehosted.com
+appspaceusercontent.com
+
+// Appudo UG (haftungsbeschränkt) : https://www.appudo.com
+// Submitted by Alexander Hochbaum
+appudo.net
+
// Aptible : https://www.aptible.com/
// Submitted by Thomas Orozco
on-aptible.com
@@ -10827,15 +10829,27 @@ sweetpepper.org
// Submitted by Vincent Tseng
myasustor.com
+// Atlassian : https://atlassian.com
+// Submitted by Sam Smyth
+cdn.prod.atlassian-dev.net
+
// AVM : https://avm.de
// Submitted by Andreas Weise
myfritz.net
+// AVStack Pte. Ltd. : https://avstack.io
+// Submitted by Jasper Hugo
+onavstack.net
+
// AW AdvisorWebsites.com Software Inc : https://advisorwebsites.com
// Submitted by James Kennedy
*.awdev.ca
*.advisor.ws
+// AZ.pl sp. z.o.o: https://az.pl
+// Submited by Krzysztof Wolski
+ecommerce-shop.pl
+
// b-data GmbH : https://www.b-data.io
// Submitted by Olivier Benz
b-data.io
@@ -10848,9 +10862,17 @@ backplaneapp.io
// Submitted by Petros Angelatos
balena-devices.com
+// University of Banja Luka : https://unibl.org
+// Domains for Republic of Srpska administrative entity.
+// Submitted by Marko Ivanovic
+rs.ba
+
// Banzai Cloud
-// Submitted by Gabor Kozma
+// Submitted by Janos Matyas
+*.banzai.cloud
app.banzaicloud.io
+*.backyards.banzaicloud.io
+
// BetaInABox
// Submitted by Adrian
@@ -10860,14 +10882,30 @@ betainabox.com
// Submitted by Nathan O'Sullivan
bnr.la
+// Bitbucket : http://bitbucket.org
+// Submitted by Andy Ortlieb
+bitbucket.io
+
// Blackbaud, Inc. : https://www.blackbaud.com
// Submitted by Paul Crowder
blackbaudcdn.net
+// Blatech : http://www.blatech.net
+// Submitted by Luke Bratch
+of.je
+
+// Blue Bite, LLC : https://bluebite.com
+// Submitted by Joshua Weiss
+bluebite.io
+
// Boomla : https://boomla.com
// Submitted by Tibor Halter
boomla.net
+// Boutir : https://www.boutir.com
+// Submitted by Eric Ng Ka Ka
+boutir.com
+
// Boxfuse : https://boxfuse.com
// Submitted by Axel Fontaine
boxfuse.io
@@ -10881,6 +10919,10 @@ square7.de
bplaced.net
square7.net
+// Brendly : https://brendly.rs
+// Submitted by Dusan Radovanovic
+shop.brendly.rs
+
// BrowserSafetyMark
// Submitted by Dave Tharp
browsersafetymark.io
@@ -10891,46 +10933,54 @@ uk0.bigv.io
dh.bytemark.co.uk
vm.bytemark.co.uk
+// Caf.js Labs LLC : https://www.cafjs.com
+// Submitted by Antonio Lain
+cafjs.com
+
// callidomus : https://www.callidomus.com/
// Submitted by Marcus Popp
mycd.eu
// Carrd : https://carrd.co
// Submitted by AJ
+drr.ac
+uwu.ai
carrd.co
crd.co
-uwu.ai
+ju.mp
// CentralNic : http://www.centralnic.com/names/domains
// Submitted by registry
ae.org
-ar.com
br.com
cn.com
com.de
com.se
de.com
eu.com
-gb.com
gb.net
-hu.com
hu.net
jp.net
jpn.com
-kr.com
mex.com
-no.com
-qc.com
ru.com
sa.com
se.net
uk.com
uk.net
us.com
-uy.com
za.bz
za.com
+// No longer operated by CentralNic, these entries should be adopted and/or removed by current operators
+// Submitted by Gavin Brown
+ar.com
+hu.com
+kr.com
+no.com
+qc.com
+uy.com
+
// Africa.com Web Solutions Ltd : https://registry.africa.com
// Submitted by Gavin Brown
africa.com
@@ -10942,6 +10992,7 @@ gr.com
// Radix FZC : http://domains.in.net
// Submitted by Gavin Brown
in.net
+web.in
// US REGISTRY LLC : http://us.org
// Submitted by Gavin Brown
@@ -10951,6 +11002,16 @@ us.org
// Submitted by Gavin Brown
co.com
+// Roar Domains LLC : https://roar.basketball/
+// Submitted by Gavin Brown
+aus.basketball
+nz.basketball
+
+// BRS Media : https://brsmedia.com/
+// Submitted by Gavin Brown
+radio.am
+radio.fm
+
// c.la : http://www.c.la/
c.la
@@ -10958,31 +11019,31 @@ c.la
// Submitted by B. Blechschmidt
certmgr.org
-// Citrix : https://citrix.com
-// Submitted by Alex Stoddard
-xenapponazure.com
+// Cityhost LLC : https://cityhost.ua
+// Submitted by Maksym Rivtin
+cx.ua
// Civilized Discourse Construction Kit, Inc. : https://www.discourse.org/
// Submitted by Rishabh Nambiar & Michael Brown
discourse.group
discourse.team
-// ClearVox : http://www.clearvox.nl/
-// Submitted by Leon Rowland
-virtueeldomein.nl
-
// Clever Cloud : https://www.clever-cloud.com/
// Submitted by Quentin Adam
cleverapps.io
// Clerk : https://www.clerk.dev
-// Submitted by Colin Sidoti
+// Submitted by Colin Sidoti
+clerk.app
+clerkstage.app
*.lcl.dev
+*.lclstage.dev
*.stg.dev
+*.stgstage.dev
-// Clic2000 : https://clic2000.fr
-// Submitted by Mathilde Blanchemanche
-clic2000.net
+// ClickRising : https://clickrising.com/
+// Submitted by Umut Gumeli
+clickrising.net
// Cloud66 : https://www.cloud66.com/
// Submitted by Khash Sajadi
@@ -11004,11 +11065,12 @@ cloudcontrolled.com
cloudcontrolapp.com
// Cloudera, Inc. : https://www.cloudera.com/
-// Submitted by Philip Langdale
-cloudera.site
+// Submitted by Kedarnath Waikar
+*.cloudera.site
// Cloudflare, Inc. : https://www.cloudflare.com/
-// Submitted by Jake Riesterer
+// Submitted by Cloudflare Team
+pages.dev
trycloudflare.com
workers.dev
@@ -11049,10 +11111,6 @@ cloudns.pro
cloudns.pw
cloudns.us
-// Cloudeity Inc : https://cloudeity.com
-// Submitted by Stefan Dimitrov
-cloudeity.net
-
// CNPY : https://cnpy.gdn
// Submitted by Angelo Gladding
cnpy.gdn
@@ -11116,6 +11174,12 @@ curv.dev
cyon.link
cyon.site
+// Danger Science Group: https://dangerscience.com/
+// Submitted by Skylar MacDonald
+fnwk.site
+folionetwork.site
+platform0.app
+
// Daplie, Inc : https://daplie.com
// Submitted by AJ ONeal
daplie.me
@@ -11151,18 +11215,41 @@ dyndns.dappnode.io
// Submitted by Paul Biggar
builtwithdark.com
+// DataDetect, LLC. : https://datadetect.com
+// Submitted by Andrew Banchich
+demo.datadetect.com
+instance.datadetect.com
+
// Datawire, Inc : https://www.datawire.io
// Submitted by Richard Li
edgestack.me
+// DDNS5 : https://ddns5.com
+// Submitted by Cameron Elliott
+ddns5.com
+
// Debian : https://www.debian.org/
// Submitted by Peter Palfrader / Debian Sysadmin Team
debian.net
+// Deno Land Inc : https://deno.com/
+// Submitted by Luca Casonato
+deno.dev
+deno-staging.dev
+
// deSEC : https://desec.io/
// Submitted by Peter Thomassen
dedyn.io
+// Diher Solutions : https://diher.solutions
+// Submitted by Didi Hermawan
+*.rss.my.id
+*.diher.solutions
+
+// DNS Africa Ltd https://dns.business
+// Submitted by Calvin Browne
+jozi.biz
+
// DNShome : https://www.dnshome.de/
// Submitted by Norbert Auler
dnshome.de
@@ -11176,6 +11263,10 @@ shop.th
// Submitted by Paul Fang
drayddns.com
+// DreamCommerce : https://shoper.pl/
+// Submitted by Konrad Kotarba
+shoparena.pl
+
// DreamHost : http://www.dreamhost.com/
// Submitted by Andrew Farmer
dreamhosters.com
@@ -11193,6 +11284,13 @@ drud.us
// Submitted by Richard Harper
duckdns.org
+// Bip : https://bip.sh
+// Submitted by Joel Kennedy
+bip.sh
+
+// bitbridge.net : Submitted by Craig Welch, abeliidev@gmail.com
+bitbridge.net
+
// dy.fi : http://dy.fi/
// Submitted by Heikki Hannikainen
dy.fi
@@ -11496,6 +11594,14 @@ ddnss.org
definima.net
definima.io
+// DigitalOcean App Platform : https://www.digitalocean.com/products/app-platform/
+// Submitted by Braxton Huggins
+ondigitalocean.app
+
+// DigitalOcean Spaces : https://www.digitalocean.com/products/spaces/
+// Submitted by Robin H. Johnson
+*.digitaloceanspaces.com
+
// dnstrace.pro : https://dnstrace.pro/
// Submitted by Chris Partridge
bci.dnstrace.pro
@@ -11528,6 +11634,16 @@ dynv6.net
// Submitted by Vladimir Dudr
e4.cz
+// eero : https://eero.com/
+// Submitted by Yue Kang
+eero.online
+eero-stage.online
+
+// Elementor : Elementor Ltd.
+// Submitted by Anton Barkan
+elementor.cloud
+elementor.cool
+
// En root‽ : https://en-root.org
// Submitted by Emmanuel Raviart
en-root.fr
@@ -11535,17 +11651,13 @@ en-root.fr
// Enalean SAS: https://www.enalean.com
// Submitted by Thomas Cottier
mytuleap.com
+tuleap-partners.com
// ECG Robotics, Inc: https://ecgrobotics.org
// Submitted by
onred.one
staging.onred.one
-// Enonic : http://enonic.com/
-// Submitted by Erik Kaareng-Sunde
-enonic.io
-customer.enonic.io
-
// EU.org https://eu.org/
// Submitted by Pierre Beyssac
eu.org
@@ -11605,6 +11717,10 @@ tr.eu.org
uk.eu.org
us.eu.org
+// Eurobyte : https://eurobyte.ru
+// Submitted by Evgeniy Subbotin
+eurodir.ru
+
// Evennode : http://www.evennode.com/
// Submitted by Michal Kralik
eu-1.evennode.com
@@ -11715,6 +11831,7 @@ u.channelsdvr.net
// Fastly Inc. : http://www.fastly.com/
// Submitted by Fastly Security
+edgecompute.app
fastly-terrarium.com
fastlylb.net
map.fastlylb.net
@@ -11728,16 +11845,11 @@ global.ssl.fastly.net
// FASTVPS EESTI OU : https://fastvps.ru/
// Submitted by Likhachev Vasiliy
-fastpanel.direct
fastvps-server.com
-myfast.space
+fastvps.host
myfast.host
fastvps.site
-fastvps.host
-
-// Featherhead : https://featherhead.xyz/
-// Submitted by Simon Menke
-fhapp.xyz
+myfast.space
// Fedora : https://fedoraproject.org/
// submitted by Patrick Uiterwijk
@@ -11749,15 +11861,20 @@ app.os.stg.fedoraproject.org
// FearWorks Media Ltd. : https://fearworksmedia.co.uk
// submitted by Keith Fairley
-conn.uk
-copro.uk
couk.me
ukco.me
+conn.uk
+copro.uk
+hosp.uk
// Fermax : https://fermax.com/
// submitted by Koen Van Isterdael
mydobiss.com
+// FH Muenster : https://www.fh-muenster.de
+// Submitted by Robin Naundorf
+fh-muenster.io
+
// Filegear Inc. : https://www.filegear.com
// Submitted by Jason Zhu
filegear.me
@@ -11772,10 +11889,47 @@ filegear-sg.me
// Submitted by Chris Raynor
firebaseapp.com
+// Firewebkit : https://www.firewebkit.com
+// Submitted by Majid Qureshi
+fireweb.app
+
+// FLAP : https://www.flap.cloud
+// Submitted by Louis Chemineau
+flap.id
+
+// FlashDrive : https://flashdrive.io
+// Submitted by Eric Chan
+onflashdrive.app
+fldrv.com
+
+// fly.io: https://fly.io
+// Submitted by Kurt Mackey
+fly.dev
+edgeapp.net
+shw.io
+
// Flynn : https://flynn.io
// Submitted by Jonathan Rudenberg
flynnhosting.net
+// Forgerock : https://www.forgerock.com
+// Submitted by Roderick Parr
+forgeblocks.com
+id.forgerock.io
+
+// Framer : https://www.framer.com
+// Submitted by Koen Rouwhorst
+framer.app
+framercanvas.com
+
+// Frusky MEDIA&PR : https://www.frusky.de
+// Submitted by Victor Pupynin
+*.frusky.de
+
+// RavPage : https://www.ravpage.co.il
+// Submitted by Roni Horowitz
+ravpage.co.il
+
// Frederik Braun https://frederik-braun.com
// Submitted by Frederik Braun
0e.vc
@@ -11793,6 +11947,14 @@ freeboxos.fr
// Submitted by Daniel Stone
freedesktop.org
+// freemyip.com : https://freemyip.com
+// Submitted by Cadence
+freemyip.com
+
+// FunkFeuer - Verein zur Förderung freier Netze : https://www.funkfeuer.at
+// Submitted by Daniel A. Maierhofer
+wien.funkfeuer.at
+
// Futureweb OG : http://www.futureweb.at
// Submitted by Andreas Schnederle-Wagner
*.futurecms.at
@@ -11816,30 +11978,59 @@ usercontent.jp
// Gentlent, Inc. : https://www.gentlent.com
// Submitted by Tom Klein
gentapps.com
+gentlentapis.com
lab.ms
+cdn-edges.net
+
+// Ghost Foundation : https://ghost.org
+// Submitted by Matt Hanley
+ghost.io
+
+// GignoSystemJapan: http://gsj.bz
+// Submitted by GignoSystemJapan
+gsj.bz
// GitHub, Inc.
// Submitted by Patrick Toomey
-github.io
githubusercontent.com
+githubpreview.dev
+github.io
// GitLab, Inc.
// Submitted by Alex Hanselka
gitlab.io
+// Gitplac.si - https://gitplac.si
+// Submitted by Aljaž Starc
+gitapp.si
+gitpage.si
+
// Glitch, Inc : https://glitch.com
// Submitted by Mads Hartmann
glitch.me
+// Global NOG Alliance : https://nogalliance.org/
+// Submitted by Sander Steffann
+nog.community
+
+// Globe Hosting SRL : https://www.globehosting.com/
+// Submitted by Gavin Brown
+co.ro
+shop.ro
+
// GMO Pepabo, Inc. : https://pepabo.com/
// Submitted by dojineko
lolipop.io
// GOV.UK Platform as a Service : https://www.cloud.service.gov.uk/
-// Submitted by Tom Whitwell
+// Submitted by Tom Whitwell
cloudapps.digital
london.cloudapps.digital
+// GOV.UK Pay : https://www.payments.service.gov.uk/
+// Submitted by Richard Baker
+pymnt.uk
+
// UKHomeOffice : https://www.gov.uk/government/organisations/home-office
// Submitted by Jon Shanks
homeoffice.gov.uk
@@ -11847,7 +12038,6 @@ homeoffice.gov.uk
// GlobeHosting, Inc.
// Submitted by Zoltan Egresi
ro.im
-shop.ro
// GoIP DNS Services : http://www.goip.de
// Submitted by Christian Poulter
@@ -11861,6 +12051,18 @@ web.app
*.0emm.com
appspot.com
*.r.appspot.com
+codespot.com
+googleapis.com
+googlecode.com
+pagespeedmobilizer.com
+publishproxy.com
+withgoogle.com
+withyoutube.com
+*.gateway.dev
+cloud.goog
+translate.goog
+*.usercontent.goog
+cloudfunctions.net
blogspot.ae
blogspot.al
blogspot.am
@@ -11935,24 +12137,20 @@ blogspot.td
blogspot.tw
blogspot.ug
blogspot.vn
-cloudfunctions.net
-cloud.goog
-codespot.com
-googleapis.com
-googlecode.com
-pagespeedmobilizer.com
-publishproxy.com
-withgoogle.com
-withyoutube.com
-// Aaron Marais' Gitlab pages: https://lab.aaronleem.co.za
-// Submitted by Aaron Marais
-graphox.us
+// Goupile : https://goupile.fr
+// Submitted by Niels Martignene
+goupile.fr
// Group 53, LLC : https://www.group53.com
// Submitted by Tyler Todd
awsmppl.com
+// GünstigBestellen : https://günstigbestellen.de
+// Submitted by Furkan Akkoc
+günstigbestellen.de
+günstigliefern.de
+
// Hakaran group: http://hakaran.cz
// Submited by Arseniy Sokolov
fin.ci
@@ -11974,6 +12172,10 @@ hashbang.sh
hasura.app
hasura-app.io
+// Heilbronn University of Applied Sciences - Faculty Informatics (GitLab Pages): https://www.hs-heilbronn.de
+// Submitted by Richard Zowalla
+pages.it.hs-heilbronn.de
+
// Hepforge : https://www.hepforge.org
// Submitted by David Grellscheid
hepforge.org
@@ -11991,20 +12193,29 @@ ravendb.me
development.run
ravendb.run
+// home.pl S.A.: https://home.pl
+// Submited by Krzysztof Wolski
+homesklep.pl
+
+// Hong Kong Productivity Council: https://www.hkpc.org/
+// Submitted by SECaaS Team
+secaas.hk
+
// HOSTBIP REGISTRY : https://www.hostbip.com/
// Submitted by Atanunu Igbunuroghene
-bpl.biz
orx.biz
-ng.city
biz.gl
-ng.ink
col.ng
firm.ng
gen.ng
ltd.ng
ngo.ng
-ng.school
+edu.scot
sch.so
+org.yt
+
+// HostyHosting (hostyhosting.com)
+hostyhosting.io
// Häkkinen.fi
// Submitted by Eero Häkkinen
@@ -12019,6 +12230,19 @@ moonscale.net
// Submitted by Hannu Aronsson
iki.fi
+// Impertrix Solutions :
+// Submitted by Zhixiang Zhao
+impertrixcdn.com
+impertrix.com
+
+// Incsub, LLC: https://incsub.com/
+// Submitted by Aaron Edwards
+smushcdn.com
+wphostedmail.com
+wpmucdn.com
+tempurl.host
+wpmudev.host
+
// Individual Network Berlin e.V. : https://www.in-berlin.de/
// Submitted by Christian Seitz
dyn-berlin.de
@@ -12074,6 +12298,14 @@ to.leg.br
// Submitted by Wolfgang Schwarz
pixolino.com
+// Internet-Pro, LLP: https://netangels.ru/
+// Submited by Vasiliy Sheredeko
+na4u.ru
+
+// iopsys software solutions AB : https://iopsys.eu/
+// Submitted by Roman Azarenko
+iopsys.se
+
// IPiFony Systems, Inc. : https://www.ipifony.com/
// Submitted by Matthew Hardeman
ipifony.net
@@ -12089,6 +12321,92 @@ iserv.dev
// Submitted by Yuji Minagawa
iobb.net
+// Jelastic, Inc. : https://jelastic.com/
+// Submited by Ihor Kolodyuk
+mel.cloudlets.com.au
+cloud.interhostsolutions.be
+users.scale.virtualcloud.com.br
+mycloud.by
+alp1.ae.flow.ch
+appengine.flow.ch
+es-1.axarnet.cloud
+diadem.cloud
+vip.jelastic.cloud
+jele.cloud
+it1.eur.aruba.jenv-aruba.cloud
+it1.jenv-aruba.cloud
+keliweb.cloud
+cs.keliweb.cloud
+oxa.cloud
+tn.oxa.cloud
+uk.oxa.cloud
+primetel.cloud
+uk.primetel.cloud
+ca.reclaim.cloud
+uk.reclaim.cloud
+us.reclaim.cloud
+ch.trendhosting.cloud
+de.trendhosting.cloud
+jele.club
+amscompute.com
+clicketcloud.com
+dopaas.com
+hidora.com
+paas.hosted-by-previder.com
+rag-cloud.hosteur.com
+rag-cloud-ch.hosteur.com
+jcloud.ik-server.com
+jcloud-ver-jpc.ik-server.com
+demo.jelastic.com
+kilatiron.com
+paas.massivegrid.com
+jed.wafaicloud.com
+lon.wafaicloud.com
+ryd.wafaicloud.com
+j.scaleforce.com.cy
+jelastic.dogado.eu
+fi.cloudplatform.fi
+demo.datacenter.fi
+paas.datacenter.fi
+jele.host
+mircloud.host
+paas.beebyte.io
+sekd1.beebyteapp.io
+jele.io
+cloud-fr1.unispace.io
+jc.neen.it
+cloud.jelastic.open.tim.it
+jcloud.kz
+upaas.kazteleport.kz
+cloudjiffy.net
+fra1-de.cloudjiffy.net
+west1-us.cloudjiffy.net
+jls-sto1.elastx.net
+jls-sto2.elastx.net
+jls-sto3.elastx.net
+faststacks.net
+fr-1.paas.massivegrid.net
+lon-1.paas.massivegrid.net
+lon-2.paas.massivegrid.net
+ny-1.paas.massivegrid.net
+ny-2.paas.massivegrid.net
+sg-1.paas.massivegrid.net
+jelastic.saveincloud.net
+nordeste-idc.saveincloud.net
+j.scaleforce.net
+jelastic.tsukaeru.net
+sdscloud.pl
+unicloud.pl
+mircloud.ru
+jelastic.regruhosting.ru
+enscaled.sg
+jele.site
+jelastic.team
+orangecloud.tn
+j.layershift.co.uk
+phx.enscaled.us
+mircloud.us
+
// Jino : https://www.jino.ru
// Submitted by Sergey Ulyashin
myjino.ru
@@ -12097,6 +12415,10 @@ myjino.ru
*.spectrum.myjino.ru
*.vps.myjino.ru
+// Jotelulu S.L. : https://jotelulu.com
+// Submitted by Daniel Fariña
+jotelulu.cloud
+
// Joyent : https://www.joyent.com/
// Submitted by Brian Bennett
*.triton.zone
@@ -12128,10 +12450,20 @@ knightpoint.systems
// Submitted by DisposaBoy
oya.to
+// Katholieke Universiteit Leuven: https://www.kuleuven.be
+// Submitted by Abuse KU Leuven
+kuleuven.cloud
+ezproxy.kuleuven.be
+
// .KRD : http://nic.krd/data/krd/Registration%20Policy.pdf
co.krd
edu.krd
+// Krellian Ltd. : https://krellian.com
+// Submitted by Ben Francis
+krellian.net
+webthings.io
+
// LCube - Professional hosting e.K. : https://www.lcube-webhosting.de
// Submitted by Lars Laehn
git-repos.de
@@ -12162,10 +12494,6 @@ co.technology
// Submitted by Greg Holland
app.lmpm.com
-// Linki Tools UG : https://linki.tools
-// Submitted by Paulo Matos
-linkitools.space
-
// linkyard ldt: https://www.linkyard.ch/
// Submitted by Mario Siegenthaler
linkyard.cloud
@@ -12174,12 +12502,18 @@ linkyard-cloud.ch
// Linode : https://linode.com
// Submitted by
members.linode.com
-nodebalancer.linode.com
+*.nodebalancer.linode.com
+*.linodeobjects.com
+ip.linodeusercontent.com
// LiquidNet Ltd : http://www.liquidnetlimited.com/
// Submitted by Victor Velchev
we.bs
+// localzone.xyz
+// Submitted by Kenny Niehage
+localzone.xyz
+
// Log'in Line : https://www.loginline.com/
// Submitted by Rémi Mach
loginline.app
@@ -12188,6 +12522,14 @@ loginline.io
loginline.services
loginline.site
+// Lokalized : https://lokalized.nl
+// Submitted by Noah Taheij
+servers.run
+
+// Lõhmus Family, The
+// Submitted by Heiki Lõhmus
+lohmus.me
+
// LubMAN UMCS Sp. z o.o : https://lubman.pl/
// Submitted by Ireneusz Maliszewski
krasnik.pl
@@ -12199,7 +12541,6 @@ swidnik.pl
// Lug.org.uk : https://lug.org.uk
// Submitted by Jon Spriggs
-uklugs.org
glug.org.uk
lug.org.uk
lugs.org.uk
@@ -12225,6 +12566,7 @@ barsy.online
barsy.org
barsy.pro
barsy.pub
+barsy.ro
barsy.shop
barsy.site
barsy.support
@@ -12243,6 +12585,34 @@ mayfirst.org
// Submitted by Ilya Zaretskiy
hb.cldmail.ru
+// Mail Transfer Platform : https://www.neupeer.com
+// Submitted by Li Hui
+cn.vu
+
+// Maze Play: https://www.mazeplay.com
+// Submitted by Adam Humpherys
+mazeplay.com
+
+// mcpe.me : https://mcpe.me
+// Submitted by Noa Heyl
+mcpe.me
+
+// McHost : https://mchost.ru
+// Submitted by Evgeniy Subbotin
+mcdir.me
+mcdir.ru
+mcpre.ru
+vps.mcdir.ru
+
+// Mediatech : https://mediatech.by
+// Submitted by Evgeniy Kozhuhovskiy
+mediatech.by
+mediatech.dev
+
+// Medicom Health : https://medicomhealth.com
+// Submitted by Michael Olson
+hra.health
+
// Memset hosting : https://www.memset.com
// Submitted by Tom Whitwell
miniserver.com
@@ -12250,7 +12620,7 @@ memset.net
// MetaCentrum, CESNET z.s.p.o. : https://www.metacentrum.cz/en/
// Submitted by Zdeněk Šustr
-cloud.metacentrum.cz
+*.cloud.metacentrum.cz
custom.metacentrum.cz
// MetaCentrum, CESNET z.s.p.o. : https://www.metacentrum.cz/en/
@@ -12267,11 +12637,29 @@ eu.meteorapp.com
co.pl
// Microsoft Corporation : http://microsoft.com
-// Submitted by Mostafa Elzeiny
+// Submitted by Mitch Webster
*.azurecontainer.io
azurewebsites.net
azure-mobile.net
cloudapp.net
+azurestaticapps.net
+centralus.azurestaticapps.net
+eastasia.azurestaticapps.net
+eastus2.azurestaticapps.net
+westeurope.azurestaticapps.net
+westus2.azurestaticapps.net
+
+// minion.systems : http://minion.systems
+// Submitted by Robert Böttinger
+csx.cc
+
+// Mintere : https://mintere.com/
+// Submitted by Ben Aubin
+mintere.site
+
+// MobileEducation, LLC : https://joinforte.com
+// Submitted by Grayson Martin
+forte.id
// Mozilla Corporation : https://mozilla.com
// Submitted by Ben Francis
@@ -12287,35 +12675,48 @@ net.ru
org.ru
pp.ru
+// Mythic Beasts : https://www.mythic-beasts.com
+// Submitted by Paul Cammish
+hostedpi.com
+customer.mythic-beasts.com
+caracal.mythic-beasts.com
+fentiger.mythic-beasts.com
+lynx.mythic-beasts.com
+ocelot.mythic-beasts.com
+oncilla.mythic-beasts.com
+onza.mythic-beasts.com
+sphinx.mythic-beasts.com
+vs.mythic-beasts.com
+x.mythic-beasts.com
+yali.mythic-beasts.com
+cust.retrosnub.co.uk
+
// Nabu Casa : https://www.nabucasa.com
// Submitted by Paulus Schoutsen
ui.nabu.casa
// Names.of.London : https://names.of.london/
-// Submitted by James Stevens or
+// Submitted by James Stevens or
pony.club
of.fashion
-on.fashion
-of.football
in.london
of.london
+from.marketing
+with.marketing
for.men
+repair.men
and.mom
for.mom
for.one
+under.one
for.sale
-of.work
+that.win
+from.work
to.work
-// NCTU.ME : https://nctu.me/
-// Submitted by Tocknicsu
-nctu.me
-
// Netlify : https://www.netlify.com
// Submitted by Jessica Parsons
-bitballoon.com
netlify.app
-netlify.com
// Neustar Inc.
// Submitted by Trung Tran
@@ -12333,6 +12734,20 @@ nh-serv.co.uk
// Submitted by Jeff Wheelhouse
nfshost.com
+// Noop : https://noop.app
+// Submitted by Nathaniel Schweinberg
+*.developer.app
+noop.app
+
+// Northflank Ltd. : https://northflank.com/
+// Submitted by Marco Suter
+*.northflank.app
+*.code.run
+
+// Noticeable : https://noticeable.io
+// Submitted by Laurent Pellegrino
+noticeable.news
+
// Now-DNS : https://now-dns.com
// Submitted by Steve Russell
dnsking.ch
@@ -12471,60 +12886,6 @@ pcloud.host
// Submitted by Matthew Brown
nyc.mn
-// NymNom : https://nymnom.com/
-// Submitted by NymNom
-nom.ae
-nom.af
-nom.ai
-nom.al
-nym.by
-nom.bz
-nym.bz
-nom.cl
-nym.ec
-nom.gd
-nom.ge
-nom.gl
-nym.gr
-nom.gt
-nym.gy
-nym.hk
-nom.hn
-nym.ie
-nom.im
-nom.ke
-nym.kz
-nym.la
-nym.lc
-nom.li
-nym.li
-nym.lt
-nym.lu
-nom.lv
-nym.me
-nom.mk
-nym.mn
-nym.mx
-nom.nu
-nym.nz
-nym.pe
-nym.pt
-nom.pw
-nom.qa
-nym.ro
-nom.rs
-nom.si
-nym.sk
-nom.st
-nym.su
-nym.sx
-nom.tj
-nym.tw
-nom.ug
-nom.uy
-nom.vc
-nom.vg
-
// Observable, Inc. : https://observablehq.com
// Submitted by Mike Bostock
static.observableusercontent.com
@@ -12533,35 +12894,66 @@ static.observableusercontent.com
// Submitted by Andrew Sampson
cya.gg
+// OMG.LOL :
+// Submitted by Adam Newbold
+omg.lol
+
// Omnibond Systems, LLC. : https://www.omnibond.com
// Submitted by Cole Estep
cloudycluster.net
+// OmniWe Limited: https://omniwe.com
+// Submitted by Vicary Archangel
+omniwe.site
+
+// One.com: https://www.one.com/
+// Submitted by Jacob Bunk Nielsen
+service.one
+
// One Fold Media : http://www.onefoldmedia.com/
// Submitted by Eddie Jones
nid.io
+// Open Social : https://www.getopensocial.com/
+// Submitted by Alexander Varwijk
+opensocial.site
+
// OpenCraft GmbH : http://opencraft.com/
// Submitted by Sven Marnach
opencraft.hosting
+// OpenResearch GmbH: https://openresearch.com/
+// Submitted by Philipp Schmid
+orsites.com
+
// Opera Software, A.S.A.
// Submitted by Yngve Pettersen
operaunite.com
-// Oursky Limited : https://skygear.io/
-// Submited by Skygear Developer
+// Oursky Limited : https://authgear.com/, https://skygear.io/
+// Submited by Authgear Team , Skygear Developer
+authgear-staging.com
+authgearapps.com
skygearapp.com
// OutSystems
// Submitted by Duarte Santos
outsystemscloud.com
+// OVHcloud: https://ovhcloud.com
+// Submitted by Vincent Cassé
+*.webpaas.ovh.net
+*.hosting.ovh.net
+
// OwnProvider GmbH: http://www.ownprovider.com
// Submitted by Jan Moennich
ownprovider.com
own.pm
+// OwO : https://whats-th.is/
+// Submitted by Dean Sheather
+*.owo.codes
+
// OX : http://www.ox.rs
// Submitted by Adam Grand
ox.rs
@@ -12578,6 +12970,21 @@ pgfog.com
// Submitted by Jason Kriss
pagefrontapp.com
+// PageXL : https://pagexl.com
+// Submitted by Yann Guichard
+pagexl.com
+
+// Paywhirl, Inc : https://paywhirl.com/
+// Submitted by Daniel Netzer
+*.paywhirl.com
+
+// pcarrier.ca Software Inc: https://pcarrier.ca/
+// Submitted by Pierre Carrier
+bar0.net
+bar1.net
+bar2.net
+rdv.to
+
// .pl domains (grandfathered)
art.pl
gliwice.pl
@@ -12599,14 +13006,22 @@ mypep.link
// Submitted by Kenneth Van Alstyne
perspecta.cloud
+// PE Ulyanov Kirill Sergeevich : https://airy.host
+// Submitted by Kirill Ulyanov
+lk3.ru
+
// Planet-Work : https://www.planet-work.com/
// Submitted by Frédéric VANNIÈRE
on-web.fr
// Platform.sh : https://platform.sh
// Submitted by Nikola Kotur
-*.platform.sh
+bc.platform.sh
+ent.platform.sh
+eu.platform.sh
+us.platform.sh
*.platformsh.site
+*.tst.site
// Platter: https://platter.dev
// Submitted by Patrick Flor
@@ -12614,6 +13029,12 @@ platter-app.com
platter-app.dev
platterp.us
+// Plesk : https://www.plesk.com/
+// Submitted by Anton Akhtyamov
+pdns.page
+plesk.page
+pleskns.com
+
// Port53 : https://port53.io/
// Submitted by Maximilian Schieder
dyn53.io
@@ -12622,6 +13043,17 @@ dyn53.io
// Submitted by Zulfais
co.bn
+// Postman, Inc : https://postman.com
+// Submitted by Rahul Dhawan
+postman-echo.com
+pstmn.io
+mock.pstmn.io
+httpbin.org
+
+//prequalifyme.today : https://prequalifyme.today
+//Submitted by DeepakTiwari deepak@ivylead.io
+prequalifyme.today
+
// prgmr.com : https://prgmr.com/
// Submitted by Sarah Newman