Skip to content

Commit e7c1b28

Browse files
committed
Correct SPDX license identifier
The original SPDX license identifier was missing the refined details about the GPL-2.0 special clauses. The new identifier includes these details explicitly and more precisely depicts the Eclipse OMR license. For every file in the repository, this commit changes this line in the file header : SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 to : SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception Fixes: #2172 Signed-off-by: Mark Stoodley <mstoodle@ca.ibm.com>
1 parent 47bb8f3 commit e7c1b28

File tree

2,882 files changed

+2937
-2885
lines changed

Some content is hidden

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

2,882 files changed

+2937
-2885
lines changed

.appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# [1] https://www.gnu.org/software/classpath/license.html
1818
# [2] http://openjdk.java.net/legal/assembly-exception.html
1919
#
20-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
20+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2121
###############################################################################
2222

2323
platform: x64

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# [1] https://www.gnu.org/software/classpath/license.html
1818
# [2] http://openjdk.java.net/legal/assembly-exception.html
1919
#
20-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
20+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2121
###############################################################################
2222

2323
build/

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# [1] https://www.gnu.org/software/classpath/license.html
1818
# [2] http://openjdk.java.net/legal/assembly-exception.html
1919
#
20-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
20+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2121
###############################################################################
2222
language: cpp
2323
os:

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# [1] https://www.gnu.org/software/classpath/license.html
1818
# [2] http://openjdk.java.net/legal/assembly-exception.html
1919
#
20-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
20+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2121
###############################################################################
2222

2323
cmake_minimum_required(VERSION 3.2 FATAL_ERROR)

CONTRIBUTING.md

+2-2

GNUmakefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# [1] https://www.gnu.org/software/classpath/license.html
1818
# [2] http://openjdk.java.net/legal/assembly-exception.html
1919
#
20-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
20+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2121
###############################################################################
2222

2323
top_srcdir:=.

INSTALL

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ OpenJDK Assembly Exception [2].
1616
[1] https://www.gnu.org/software/classpath/license.html
1717
[2] http://openjdk.java.net/legal/assembly-exception.html
1818

19-
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020

2121

2222
Building OMR

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ with the GNU Classpath Exception [1] and GNU General Public License, version 2 w
1313
[1] https://www.gnu.org/software/classpath/license.html
1414
[2] http://openjdk.java.net/legal/assembly-exception.html
1515

16-
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
16+
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
1717

1818
Subject to the following notices:
1919

README.md

+1-1

about.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ <h3>License</h3>
2323
<p>
2424
[1] <a href="https://www.gnu.org/software/classpath/license.html">https://www.gnu.org/software/classpath/license.html</a><br>
2525
[2] <a href="http://openjdk.java.net/legal/assembly-exception.html">http://openjdk.java.net/legal/assembly-exception.html</a><br><br>
26-
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
26+
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2727
</p>
2828

2929
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by

asl-v20.text

+1-1
Original file line numberDiff line numberDiff line change
@@ -198,4 +198,4 @@
198198
distributed under the License is distributed on an "AS IS" BASIS,
199199
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200200
See the License for the specific language governing permissions and
201-
limitations under the License.
201+
limitations under the License.

cmake/CheckSourceTree.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
###############################################################################
2121

2222
# Ensure the source tree hasn't been used for building before.

cmake/caches/Appveyor.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
###############################################################################
2121

2222
set(OMR_DDR ON CACHE BOOL "Enable DDR")

cmake/caches/Travis.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
#############################################################################
2121

2222
set(OMR_DDR ON CACHE BOOL "Enable DDR")

cmake/config.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
#############################################################################
2121

2222
set(OMR_WARNINGS_AS_ERRORS ON CACHE BOOL "Treat compile warnings as errors")

cmake/modules/CMakeASM-ZOSInformation.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
#############################################################################
2121

2222
set(CMAKE_ASM-ZOS_SOURCE_FILE_EXTENSIONS s)

cmake/modules/CMakeDetermineASM-ZOSCompiler.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
#############################################################################
2121

2222
set(ASM_DIALECT "-ZOS")

cmake/modules/CMakeTestASM-ZOSCompiler.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
#############################################################################
2121

2222
set(ASM_DIALECT "-ZOS")

cmake/modules/FindDiaSDK.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
#############################################################################
2121

2222
# Find DIA SDK

cmake/modules/FindLibDwarf.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
#############################################################################
2121

2222
# Find libdwarf.

cmake/modules/FindLibElf.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
#############################################################################
2121

2222
# Find libelf

cmake/modules/OmrAssert.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
#############################################################################
2121

2222
# Include once

cmake/modules/OmrCompilerSupport.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
#############################################################################
2121

2222
# Include once

cmake/modules/OmrDetectSystemInformation.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
#############################################################################
2121

2222
# Translate from CMake's view of the system to the OMR view of the system.

cmake/modules/OmrFindFiles.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
#############################################################################
2121

2222
include(OmrAssert)

cmake/modules/OmrHookgen.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
###############################################################################
2121

2222
if(OMR_HOOKGEN_)

cmake/modules/OmrMsvcRuntime.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# [1] https://www.gnu.org/software/classpath/license.html
1818
# [2] http://openjdk.java.net/legal/assembly-exception.html
1919
#
20-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
20+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2121
###############################################################################
2222

2323
# Find the MSVC Runtime libraries.

cmake/modules/OmrPlatform.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
#############################################################################
2121

2222
if(OMR_PLATFORM_)

cmake/modules/OmrSanitizerSupport.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# [1] https://www.gnu.org/software/classpath/license.html
1818
# [2] http://openjdk.java.net/legal/assembly-exception.html
1919
#
20-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
20+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2121
###############################################################################
2222

2323
include(OmrUtility)

cmake/modules/OmrTracegen.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
###############################################################################
2121

2222
if(OMR_TRACEGEN_)

cmake/modules/OmrUtility.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
#############################################################################
2121

2222
# Include once

cmake/modules/platform/arch/arm.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
#############################################################################
2121

2222
list(APPEND OMR_PLATFORM_DEFINITIONS

cmake/modules/platform/arch/ppc.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
###############################################################################
2121

2222
if(OMR_ENV_DATA64)

cmake/modules/platform/arch/s390.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
###############################################################################
2121

2222
list(APPEND OMR_PLATFORM_DEFINITIONS

cmake/modules/platform/arch/x86.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
#############################################################################
2121

2222
if(OMR_ENV_DATA64)

cmake/modules/platform/os/aix.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
###############################################################################
2121

2222
include(OmrAssert)

cmake/modules/platform/os/linux.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
#############################################################################
2121

2222
include(CheckSymbolExists)

cmake/modules/platform/os/osx.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
#############################################################################
2121

2222
list(APPEND OMR_PLATFORM_DEFINITIONS

cmake/modules/platform/os/win.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
#############################################################################
2121

2222
set(OMR_WINVER "0x501")

cmake/modules/platform/os/zos.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
#############################################################################
2121

2222
list(APPEND OMR_PLATFORM_DEFINITIONS

cmake/modules/platform/toolcfg/gnu.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
#############################################################################
2121

2222
set(OMR_WARNING_AS_ERROR_FLAG -Werror)

cmake/modules/platform/toolcfg/msvc.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
#############################################################################
2121

2222
include(OmrUtility)

cmake/modules/platform/toolcfg/verify.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] http://openjdk.java.net/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2020
#############################################################################
2121

2222
omr_assert(WARNING TEST DEFINED OMR_WARNING_AS_ERROR_FLAG)

0 commit comments

Comments
 (0)