From 4e4c71a092c1b17d70ffa55a81edd8dd69ea2c92 Mon Sep 17 00:00:00 2001 From: "Keith W. Campbell" Date: Thu, 18 May 2023 10:16:18 -0400 Subject: [PATCH] Correct SPDX license identifiers * "GPL-2.0" should have been "GPL-2.0-only" * "OpenJDK-assembly-exception-1.0" replaces "Assembly-exception" Signed-off-by: Keith W. Campbell --- .gitignore | 2 +- CMakeLists.txt | 2 +- CODEOWNERS | 2 +- CONTRIBUTING.md | 4 ++-- GNUmakefile | 2 +- INSTALL | 2 +- LICENSE | 2 +- README.md | 2 +- about.html | 2 +- azure-pipelines.yml | 2 +- buildenv/docker/doBuild.sh | 2 +- buildenv/docker/x86_64/ubuntu20/Dockerfile | 2 +- buildenv/jenkins/README.md | 2 +- buildenv/jenkins/omrbuild.groovy | 2 +- buildenv/jenkins/refRepoUpdater.groovy | 2 +- cmake/CheckSourceTree.cmake | 2 +- cmake/caches/GcApi.cmake | 2 +- cmake/caches/Travis.cmake | 2 +- cmake/caches/Windows.cmake | 2 +- cmake/config.cmake | 2 +- cmake/modules/FindDiaSDK.cmake | 2 +- cmake/modules/FindLibDwarf.cmake | 2 +- cmake/modules/FindLibElf.cmake | 2 +- cmake/modules/FindLibZ.cmake | 2 +- cmake/modules/FindOmrCuda.cmake | 2 +- cmake/modules/OmrAssert.cmake | 2 +- cmake/modules/OmrCompilerSupport.cmake | 2 +- cmake/modules/OmrCrossCompile.cmake | 2 +- cmake/modules/OmrDDRSupport.cmake | 2 +- cmake/modules/OmrDetectSystemInformation.cmake | 2 +- cmake/modules/OmrFindFiles.cmake | 2 +- cmake/modules/OmrHookgen.cmake | 2 +- cmake/modules/OmrMetalC.cmake | 2 +- cmake/modules/OmrMsvcRuntime.cmake | 2 +- cmake/modules/OmrOption.cmake | 2 +- cmake/modules/OmrPlatform.cmake | 2 +- cmake/modules/OmrSanitizerSupport.cmake | 2 +- cmake/modules/OmrTargetSupport.cmake | 2 +- cmake/modules/OmrTest.cmake | 2 +- cmake/modules/OmrTracegen.cmake | 2 +- cmake/modules/OmrUtility.cmake | 2 +- cmake/modules/ddr/DDRSetStub.cmake.in | 2 +- cmake/modules/ddr/GenerateStub.cmake | 2 +- cmake/modules/ddr/cmake_ddr.awk | 2 +- cmake/modules/platform/arch/aarch64.cmake | 2 +- cmake/modules/platform/arch/arm.cmake | 2 +- cmake/modules/platform/arch/ppc.cmake | 2 +- cmake/modules/platform/arch/riscv.cmake | 2 +- cmake/modules/platform/arch/s390.cmake | 2 +- cmake/modules/platform/arch/x86.cmake | 2 +- cmake/modules/platform/os/aix.cmake | 2 +- cmake/modules/platform/os/bsd.cmake | 2 +- cmake/modules/platform/os/linux.cmake | 2 +- cmake/modules/platform/os/osx.cmake | 2 +- cmake/modules/platform/os/win.cmake | 2 +- cmake/modules/platform/os/zos.cmake | 2 +- cmake/modules/platform/toolcfg/gnu.cmake | 2 +- cmake/modules/platform/toolcfg/gnu_exports.exp.in | 2 +- cmake/modules/platform/toolcfg/msvc.cmake | 2 +- cmake/modules/platform/toolcfg/msvc_exports.def.in | 2 +- cmake/modules/platform/toolcfg/verify.cmake | 2 +- cmake/modules/platform/toolcfg/xlc.cmake | 2 +- cmake/modules/platform/toolcfg/xlc_exports.exp.in | 2 +- cmake/modules/platform/toolcfg/zos_rename_exports.cmake | 2 +- cmake/toolchains/aarch64-linux-cross.cmake | 2 +- cmake/toolchains/riscv64-linux-cross.cmake | 2 +- cmake/versions.cmake | 2 +- compiler/CMakeLists.txt | 2 +- compiler/README.md | 2 +- compiler/aarch64/CMakeLists.txt | 2 +- compiler/aarch64/codegen/ARM64BinaryEncoding.cpp | 2 +- compiler/aarch64/codegen/ARM64ConditionCode.hpp | 2 +- compiler/aarch64/codegen/ARM64Debug.cpp | 2 +- compiler/aarch64/codegen/ARM64HelperCallSnippet.cpp | 2 +- compiler/aarch64/codegen/ARM64HelperCallSnippet.hpp | 2 +- compiler/aarch64/codegen/ARM64Instruction.cpp | 2 +- compiler/aarch64/codegen/ARM64Instruction.hpp | 2 +- compiler/aarch64/codegen/ARM64OutOfLineCodeSection.cpp | 2 +- compiler/aarch64/codegen/ARM64OutOfLineCodeSection.hpp | 2 +- compiler/aarch64/codegen/ARM64ShiftCode.hpp | 2 +- compiler/aarch64/codegen/ARM64SystemLinkage.cpp | 2 +- compiler/aarch64/codegen/ARM64SystemLinkage.hpp | 2 +- compiler/aarch64/codegen/BinaryEvaluator.cpp | 2 +- compiler/aarch64/codegen/ConstantDataSnippet.cpp | 2 +- compiler/aarch64/codegen/ConstantDataSnippet.hpp | 2 +- compiler/aarch64/codegen/ControlFlowEvaluator.cpp | 2 +- compiler/aarch64/codegen/FPTreeEvaluator.cpp | 2 +- compiler/aarch64/codegen/GenerateInstructions.cpp | 2 +- compiler/aarch64/codegen/GenerateInstructions.hpp | 2 +- compiler/aarch64/codegen/InstOpCode.hpp | 2 +- compiler/aarch64/codegen/Instruction.hpp | 2 +- compiler/aarch64/codegen/Linkage.hpp | 2 +- compiler/aarch64/codegen/MemoryReference.hpp | 2 +- compiler/aarch64/codegen/OMRCodeGenerator.cpp | 2 +- compiler/aarch64/codegen/OMRCodeGenerator.hpp | 2 +- compiler/aarch64/codegen/OMRInstOpCode.enum | 2 +- compiler/aarch64/codegen/OMRInstOpCode.hpp | 2 +- compiler/aarch64/codegen/OMRInstruction.cpp | 2 +- compiler/aarch64/codegen/OMRInstruction.hpp | 2 +- compiler/aarch64/codegen/OMRInstructionDelegate.cpp | 2 +- compiler/aarch64/codegen/OMRInstructionDelegate.hpp | 2 +- compiler/aarch64/codegen/OMRInstructionKindEnum.hpp | 2 +- compiler/aarch64/codegen/OMRLinkage.cpp | 2 +- compiler/aarch64/codegen/OMRLinkage.hpp | 2 +- compiler/aarch64/codegen/OMRLinkage_inlines.hpp | 2 +- compiler/aarch64/codegen/OMRMachine.cpp | 2 +- compiler/aarch64/codegen/OMRMachine.hpp | 2 +- compiler/aarch64/codegen/OMRMemoryReference.cpp | 2 +- compiler/aarch64/codegen/OMRMemoryReference.hpp | 2 +- compiler/aarch64/codegen/OMRRealRegister.cpp | 2 +- compiler/aarch64/codegen/OMRRealRegister.hpp | 2 +- compiler/aarch64/codegen/OMRRegister.hpp | 2 +- compiler/aarch64/codegen/OMRRegisterDependency.cpp | 2 +- compiler/aarch64/codegen/OMRRegisterDependency.hpp | 2 +- compiler/aarch64/codegen/OMRSnippet.cpp | 2 +- compiler/aarch64/codegen/OMRSnippet.hpp | 2 +- compiler/aarch64/codegen/OMRTreeEvaluator.cpp | 2 +- compiler/aarch64/codegen/OMRTreeEvaluator.hpp | 2 +- compiler/aarch64/codegen/OpBinary.cpp | 2 +- compiler/aarch64/codegen/PseudoRegisterEnum.hpp | 2 +- compiler/aarch64/codegen/RealRegisterEnum.hpp | 2 +- compiler/aarch64/codegen/RealRegisterMaskEnum.hpp | 2 +- compiler/aarch64/codegen/RegisterDependency.hpp | 2 +- compiler/aarch64/codegen/TreeEvaluatorTable.hpp | 2 +- compiler/aarch64/codegen/UnaryEvaluator.cpp | 2 +- compiler/aarch64/env/ARM64ProcessorEnum.hpp | 2 +- compiler/aarch64/env/OMRCPU.cpp | 2 +- compiler/aarch64/env/OMRCPU.hpp | 2 +- compiler/aarch64/env/OMRDebugEnv.cpp | 2 +- compiler/aarch64/env/OMRDebugEnv.hpp | 2 +- compiler/aarch64/env/OMREnvironment.hpp | 2 +- compiler/aarch64/runtime/ARM64arrayCopy.spp | 2 +- compiler/aarch64/runtime/CodeSync.cpp | 2 +- compiler/aarch64/runtime/VirtualGuardRuntime.cpp | 2 +- compiler/aarch64/runtime/arm64asmdefs.inc | 2 +- compiler/arm/codegen/ARMBinaryEncoding.cpp | 2 +- compiler/arm/codegen/ARMConditionCode.hpp | 2 +- compiler/arm/codegen/ARMDebug.cpp | 2 +- compiler/arm/codegen/ARMDisassem.cpp | 2 +- compiler/arm/codegen/ARMDisassem.hpp | 2 +- compiler/arm/codegen/ARMGenerateInstructions.cpp | 2 +- compiler/arm/codegen/ARMInstruction.hpp | 2 +- compiler/arm/codegen/ARMOperand2.cpp | 2 +- compiler/arm/codegen/ARMOperand2.hpp | 2 +- compiler/arm/codegen/ARMOutOfLineCodeSection.cpp | 2 +- compiler/arm/codegen/ARMOutOfLineCodeSection.hpp | 2 +- compiler/arm/codegen/ARMSystemLinkage.cpp | 2 +- compiler/arm/codegen/ARMSystemLinkage.hpp | 2 +- compiler/arm/codegen/BinaryCommutativeAnalyser.cpp | 2 +- compiler/arm/codegen/BinaryCommutativeAnalyser.hpp | 2 +- compiler/arm/codegen/BinaryEvaluator.cpp | 2 +- compiler/arm/codegen/ConstantDataSnippet.cpp | 2 +- compiler/arm/codegen/ConstantDataSnippet.hpp | 2 +- compiler/arm/codegen/ControlFlowEvaluator.cpp | 2 +- compiler/arm/codegen/FPTreeEvaluator.cpp | 2 +- compiler/arm/codegen/FPTreeEvaluator.hpp | 2 +- compiler/arm/codegen/GenerateInstructions.hpp | 2 +- compiler/arm/codegen/InstOpCode.hpp | 2 +- compiler/arm/codegen/Instruction.hpp | 2 +- compiler/arm/codegen/Linkage.hpp | 2 +- compiler/arm/codegen/MemoryReference.hpp | 2 +- compiler/arm/codegen/OMRCodeGenerator.cpp | 2 +- compiler/arm/codegen/OMRCodeGenerator.hpp | 2 +- compiler/arm/codegen/OMRInstOpCode.cpp | 2 +- compiler/arm/codegen/OMRInstOpCode.enum | 2 +- compiler/arm/codegen/OMRInstOpCode.hpp | 2 +- compiler/arm/codegen/OMRInstOpCodeProperties.hpp | 2 +- compiler/arm/codegen/OMRInstruction.cpp | 2 +- compiler/arm/codegen/OMRInstruction.hpp | 2 +- compiler/arm/codegen/OMRInstructionDelegate.cpp | 2 +- compiler/arm/codegen/OMRInstructionDelegate.hpp | 2 +- compiler/arm/codegen/OMRInstructionKindEnum.hpp | 2 +- compiler/arm/codegen/OMRLinkage.cpp | 2 +- compiler/arm/codegen/OMRLinkage.hpp | 2 +- compiler/arm/codegen/OMRLinkage_inlines.hpp | 2 +- compiler/arm/codegen/OMRMachine.cpp | 2 +- compiler/arm/codegen/OMRMachine.hpp | 2 +- compiler/arm/codegen/OMRMemoryReference.cpp | 2 +- compiler/arm/codegen/OMRMemoryReference.hpp | 2 +- compiler/arm/codegen/OMRRealRegister.cpp | 2 +- compiler/arm/codegen/OMRRealRegister.hpp | 2 +- compiler/arm/codegen/OMRRegister.hpp | 2 +- compiler/arm/codegen/OMRRegisterDependency.cpp | 2 +- compiler/arm/codegen/OMRRegisterDependency.hpp | 2 +- compiler/arm/codegen/OMRRegisterDependencyStruct.hpp | 2 +- compiler/arm/codegen/OMRSnippet.cpp | 2 +- compiler/arm/codegen/OMRSnippet.hpp | 2 +- compiler/arm/codegen/OMRTreeEvaluator.cpp | 2 +- compiler/arm/codegen/OMRTreeEvaluator.hpp | 2 +- compiler/arm/codegen/PseudoRegisterEnum.hpp | 2 +- compiler/arm/codegen/RealRegister.hpp | 2 +- compiler/arm/codegen/RealRegisterEnum.hpp | 2 +- compiler/arm/codegen/RealRegisterMaskEnum.hpp | 2 +- compiler/arm/codegen/RegisterDependency.hpp | 2 +- compiler/arm/codegen/StackCheckFailureSnippet.cpp | 2 +- compiler/arm/codegen/StackCheckFailureSnippet.hpp | 2 +- compiler/arm/codegen/SubtractAnalyser.cpp | 2 +- compiler/arm/codegen/SubtractAnalyser.hpp | 2 +- compiler/arm/codegen/TreeEvaluatorTable.hpp | 2 +- compiler/arm/codegen/UnaryEvaluator.cpp | 2 +- compiler/arm/env/ARMProcessorEnum.hpp | 2 +- compiler/arm/env/OMRCPU.cpp | 2 +- compiler/arm/env/OMRCPU.hpp | 2 +- compiler/arm/env/OMRCompilerEnv.cpp | 2 +- compiler/arm/env/OMRCompilerEnv.hpp | 2 +- compiler/arm/env/OMRDebugEnv.hpp | 2 +- compiler/arm/env/OMREnvironment.hpp | 2 +- compiler/arm/runtime/CodeSync.cpp | 2 +- compiler/arm/runtime/FlushICache.armasm | 2 +- compiler/arm/runtime/VirtualGuardRuntime.cpp | 2 +- compiler/codegen/AheadOfTimeCompile.hpp | 2 +- compiler/codegen/Analyser.cpp | 2 +- compiler/codegen/Analyser.hpp | 2 +- compiler/codegen/BackingStore.hpp | 2 +- compiler/codegen/CCData.cpp | 2 +- compiler/codegen/CCData.hpp | 2 +- compiler/codegen/CCData_inlines.hpp | 2 +- compiler/codegen/CMakeLists.txt | 2 +- compiler/codegen/CodeGenGC.cpp | 2 +- compiler/codegen/CodeGenPhase.hpp | 2 +- compiler/codegen/CodeGenPhaseEnum.hpp | 2 +- compiler/codegen/CodeGenPhaseFunctionTable.hpp | 2 +- compiler/codegen/CodeGenPhaseToPerform.hpp | 2 +- compiler/codegen/CodeGenPrep.cpp | 2 +- compiler/codegen/CodeGenRA.cpp | 2 +- compiler/codegen/CodeGenerator.hpp | 2 +- compiler/codegen/CodeGeneratorUtils.hpp | 2 +- compiler/codegen/CodeGenerator_inlines.hpp | 2 +- compiler/codegen/ELFGenerator.cpp | 2 +- compiler/codegen/ELFGenerator.hpp | 2 +- compiler/codegen/ELFRelocationResolver.hpp | 2 +- compiler/codegen/GCRegisterMap.hpp | 2 +- compiler/codegen/GCStackAtlas.hpp | 2 +- compiler/codegen/GCStackMap.hpp | 2 +- compiler/codegen/InstOpCode.enum | 2 +- compiler/codegen/InstructionDelegate.hpp | 2 +- compiler/codegen/InstructionFlagEnum.hpp | 2 +- compiler/codegen/InstructionKindEnum.hpp | 2 +- compiler/codegen/Instruction_inlines.hpp | 2 +- compiler/codegen/LinkageConventions.enum | 2 +- compiler/codegen/LinkageConventionsEnum.hpp | 2 +- compiler/codegen/Linkage_inlines.hpp | 2 +- compiler/codegen/LiveReference.hpp | 2 +- compiler/codegen/LiveRegister.cpp | 2 +- compiler/codegen/LiveRegister.hpp | 2 +- compiler/codegen/Machine.hpp | 2 +- compiler/codegen/Machine_inlines.hpp | 2 +- compiler/codegen/MemoryReference.hpp | 2 +- compiler/codegen/NodeEvaluation.cpp | 2 +- compiler/codegen/OMRAheadOfTimeCompile.cpp | 2 +- compiler/codegen/OMRAheadOfTimeCompile.hpp | 2 +- compiler/codegen/OMRCodeGenPhase.cpp | 2 +- compiler/codegen/OMRCodeGenPhase.hpp | 2 +- compiler/codegen/OMRCodeGenPhaseEnum.hpp | 2 +- compiler/codegen/OMRCodeGenPhaseFunctionTable.hpp | 2 +- compiler/codegen/OMRCodeGenerator.cpp | 2 +- compiler/codegen/OMRCodeGenerator.hpp | 2 +- compiler/codegen/OMRCodeGeneratorUtils.hpp | 2 +- compiler/codegen/OMRCodeGenerator_inlines.hpp | 2 +- compiler/codegen/OMRELFRelocationResolver.cpp | 2 +- compiler/codegen/OMRELFRelocationResolver.hpp | 2 +- compiler/codegen/OMRGCRegisterMap.cpp | 2 +- compiler/codegen/OMRGCRegisterMap.hpp | 2 +- compiler/codegen/OMRGCStackAtlas.cpp | 2 +- compiler/codegen/OMRGCStackAtlas.hpp | 2 +- compiler/codegen/OMRInstOpCode.cpp | 2 +- compiler/codegen/OMRInstOpCode.enum | 2 +- compiler/codegen/OMRInstOpCode.hpp | 2 +- compiler/codegen/OMRInstruction.cpp | 2 +- compiler/codegen/OMRInstruction.hpp | 2 +- compiler/codegen/OMRInstructionDelegate.hpp | 2 +- compiler/codegen/OMRInstructionFlagEnum.hpp | 2 +- compiler/codegen/OMRInstruction_inlines.hpp | 2 +- compiler/codegen/OMRLinkage.cpp | 2 +- compiler/codegen/OMRLinkage.hpp | 2 +- compiler/codegen/OMRLinkageConventions.enum | 2 +- compiler/codegen/OMRLinkage_inlines.hpp | 2 +- compiler/codegen/OMRMachine.cpp | 2 +- compiler/codegen/OMRMachine.hpp | 2 +- compiler/codegen/OMRMachine_inlines.hpp | 2 +- compiler/codegen/OMRMemoryReference.cpp | 2 +- compiler/codegen/OMRMemoryReference.hpp | 2 +- compiler/codegen/OMRPeephole.cpp | 2 +- compiler/codegen/OMRPeephole.hpp | 2 +- compiler/codegen/OMRRealRegister.cpp | 2 +- compiler/codegen/OMRRealRegister.hpp | 2 +- compiler/codegen/OMRRecognizedMethodsEnum.hpp | 2 +- compiler/codegen/OMRRegister.cpp | 2 +- compiler/codegen/OMRRegister.hpp | 2 +- compiler/codegen/OMRRegisterDependency.cpp | 2 +- compiler/codegen/OMRRegisterDependency.hpp | 2 +- compiler/codegen/OMRRegisterDependencyStruct.hpp | 2 +- compiler/codegen/OMRRegisterPair.cpp | 2 +- compiler/codegen/OMRRegisterPair.hpp | 2 +- compiler/codegen/OMRSnippet.cpp | 2 +- compiler/codegen/OMRSnippet.hpp | 2 +- compiler/codegen/OMRSnippetGCMap.cpp | 2 +- compiler/codegen/OMRSnippetGCMap.hpp | 2 +- compiler/codegen/OMRTreeEvaluator.cpp | 2 +- compiler/codegen/OMRTreeEvaluator.hpp | 2 +- compiler/codegen/OMRUnresolvedDataSnippet.cpp | 2 +- compiler/codegen/OMRUnresolvedDataSnippet.hpp | 2 +- compiler/codegen/OutOfLineCodeSection.cpp | 2 +- compiler/codegen/OutOfLineCodeSection.hpp | 2 +- compiler/codegen/Peephole.hpp | 2 +- compiler/codegen/PreInstructionSelection.cpp | 2 +- compiler/codegen/RealRegister.hpp | 2 +- compiler/codegen/RecognizedMethods.hpp | 2 +- compiler/codegen/Register.hpp | 2 +- compiler/codegen/RegisterConstants.hpp | 2 +- compiler/codegen/RegisterDependency.hpp | 2 +- compiler/codegen/RegisterDependencyStruct.hpp | 2 +- compiler/codegen/RegisterIterator.cpp | 2 +- compiler/codegen/RegisterIterator.hpp | 2 +- compiler/codegen/RegisterPair.hpp | 2 +- compiler/codegen/RegisterPressureSimulatorInner.hpp | 2 +- compiler/codegen/RegisterRematerializationInfo.hpp | 2 +- compiler/codegen/RegisterUsage.hpp | 2 +- compiler/codegen/Relocation.cpp | 2 +- compiler/codegen/Relocation.hpp | 2 +- compiler/codegen/ScratchRegisterManager.cpp | 2 +- compiler/codegen/ScratchRegisterManager.hpp | 2 +- compiler/codegen/Snippet.hpp | 2 +- compiler/codegen/SnippetGCMap.hpp | 2 +- compiler/codegen/StaticRelocation.hpp | 2 +- compiler/codegen/StorageInfo.cpp | 2 +- compiler/codegen/StorageInfo.hpp | 2 +- compiler/codegen/TableOfConstants.hpp | 2 +- compiler/codegen/TreeEvaluator.hpp | 2 +- compiler/codegen/UnresolvedDataSnippet.hpp | 2 +- compiler/codegen/UnresolvedDataSnippet_inlines.hpp | 2 +- compiler/compile/AliasBuilder.hpp | 2 +- compiler/compile/CMakeLists.txt | 2 +- compiler/compile/Compilation.hpp | 2 +- compiler/compile/CompilationException.hpp | 2 +- compiler/compile/CompilationTypes.hpp | 2 +- compiler/compile/Compilation_inlines.hpp | 2 +- compiler/compile/InlineBlock.hpp | 2 +- compiler/compile/Method.hpp | 2 +- compiler/compile/NonHelperSymbols.enum | 2 +- compiler/compile/OMRAliasBuilder.cpp | 2 +- compiler/compile/OMRAliasBuilder.hpp | 2 +- compiler/compile/OMRCompilation.cpp | 2 +- compiler/compile/OMRCompilation.hpp | 2 +- compiler/compile/OMRCompilation_inlines.hpp | 2 +- compiler/compile/OMRMethod.cpp | 2 +- compiler/compile/OMRMethod.hpp | 2 +- compiler/compile/OMRNonHelperSymbols.enum | 2 +- compiler/compile/OMRSymbolReferenceTable.cpp | 2 +- compiler/compile/OMRSymbolReferenceTable.hpp | 2 +- compiler/compile/OSRData.cpp | 2 +- compiler/compile/OSRData.hpp | 2 +- compiler/compile/ResolvedMethod.cpp | 2 +- compiler/compile/ResolvedMethod.hpp | 2 +- compiler/compile/SymbolReferenceTable.hpp | 2 +- compiler/compile/TLSCompilationManager.cpp | 2 +- compiler/compile/TLSCompilationManager.hpp | 2 +- compiler/compile/VirtualGuard.cpp | 2 +- compiler/compile/VirtualGuard.hpp | 2 +- compiler/control/CMakeLists.txt | 2 +- compiler/control/CompilationController.cpp | 2 +- compiler/control/CompilationController.hpp | 2 +- compiler/control/CompilationStrategy.hpp | 2 +- compiler/control/CompileMethod.cpp | 2 +- compiler/control/CompileMethod.hpp | 2 +- compiler/control/OMRCompilationStrategy.cpp | 2 +- compiler/control/OMRCompilationStrategy.hpp | 2 +- compiler/control/OMROptions.cpp | 2 +- compiler/control/OMROptions.hpp | 2 +- compiler/control/OMROptions_inlines.hpp | 2 +- compiler/control/OMRRecompilation.cpp | 2 +- compiler/control/OMRRecompilation.hpp | 2 +- compiler/control/OptimizationPlan.cpp | 2 +- compiler/control/OptimizationPlan.hpp | 2 +- compiler/control/Options.hpp | 2 +- compiler/control/OptionsUtil.hpp | 2 +- compiler/control/Options_inlines.hpp | 2 +- compiler/control/Recompilation.hpp | 2 +- compiler/cs2/allocator.h | 2 +- compiler/cs2/arrayof.h | 2 +- compiler/cs2/bitmanip.h | 2 +- compiler/cs2/bitvectr.h | 2 +- compiler/cs2/cs2.h | 2 +- compiler/cs2/hashtab.h | 2 +- compiler/cs2/listof.h | 2 +- compiler/cs2/llistof.h | 2 +- compiler/cs2/sparsrbit.h | 2 +- compiler/cs2/timer.h | 2 +- compiler/cs2/windows_api.h | 2 +- compiler/env/ArithEnv.hpp | 2 +- compiler/env/CMakeLists.txt | 2 +- compiler/env/CPU.hpp | 2 +- compiler/env/ClassEnv.hpp | 2 +- compiler/env/CompileTimeProfiler.hpp | 2 +- compiler/env/CompilerEnv.hpp | 2 +- compiler/env/DebugEnv.hpp | 2 +- compiler/env/DebugSegmentProvider.cpp | 2 +- compiler/env/DebugSegmentProvider.hpp | 2 +- compiler/env/Environment.hpp | 2 +- compiler/env/ExceptionTable.cpp | 2 +- compiler/env/ExceptionTable.hpp | 2 +- compiler/env/FEBase.cpp | 2 +- compiler/env/FEBase.hpp | 2 +- compiler/env/FEBase_t.hpp | 2 +- compiler/env/FilePointer.hpp | 2 +- compiler/env/FilePointerDecl.hpp | 2 +- compiler/env/FrontEnd.cpp | 2 +- compiler/env/FrontEnd.hpp | 2 +- compiler/env/Globals.cpp | 2 +- compiler/env/HeuristicRegion.hpp | 2 +- compiler/env/IO.hpp | 2 +- compiler/env/JitConfig.cpp | 2 +- compiler/env/JitConfig.hpp | 2 +- compiler/env/KnownObjectTable.hpp | 2 +- compiler/env/MemorySegment.hpp | 2 +- compiler/env/OMRArithEnv.cpp | 2 +- compiler/env/OMRArithEnv.hpp | 2 +- compiler/env/OMRCPU.cpp | 2 +- compiler/env/OMRCPU.hpp | 2 +- compiler/env/OMRClassEnv.cpp | 2 +- compiler/env/OMRClassEnv.hpp | 2 +- compiler/env/OMRCompilerEnv.cpp | 2 +- compiler/env/OMRCompilerEnv.hpp | 2 +- compiler/env/OMRDebugEnv.cpp | 2 +- compiler/env/OMRDebugEnv.hpp | 2 +- compiler/env/OMREnvironment.hpp | 2 +- compiler/env/OMRIO.cpp | 2 +- compiler/env/OMRIO.hpp | 2 +- compiler/env/OMRKnownObjectTable.cpp | 2 +- compiler/env/OMRKnownObjectTable.hpp | 2 +- compiler/env/OMRMemory.hpp | 2 +- compiler/env/OMRObjectModel.cpp | 2 +- compiler/env/OMRObjectModel.hpp | 2 +- compiler/env/OMRPersistentInfo.cpp | 2 +- compiler/env/OMRPersistentInfo.hpp | 2 +- compiler/env/OMRVMAccessCriticalSection.hpp | 2 +- compiler/env/OMRVMEnv.cpp | 2 +- compiler/env/OMRVMEnv.hpp | 2 +- compiler/env/OMRVMMethodEnv.cpp | 2 +- compiler/env/OMRVMMethodEnv.hpp | 2 +- compiler/env/ObjectModel.hpp | 2 +- compiler/env/PersistentAllocator.cpp | 2 +- compiler/env/PersistentAllocator.hpp | 2 +- compiler/env/PersistentAllocatorKit.hpp | 2 +- compiler/env/PersistentInfo.hpp | 2 +- compiler/env/ProcessorInfo.hpp | 2 +- compiler/env/Processors.hpp | 2 +- compiler/env/RawAllocator.hpp | 2 +- compiler/env/Region.cpp | 2 +- compiler/env/Region.hpp | 2 +- compiler/env/RegionProfiler.hpp | 2 +- compiler/env/SegmentAllocator.cpp | 2 +- compiler/env/SegmentAllocator.hpp | 2 +- compiler/env/SegmentPool.cpp | 2 +- compiler/env/SegmentPool.hpp | 2 +- compiler/env/SegmentProvider.cpp | 2 +- compiler/env/SegmentProvider.hpp | 2 +- compiler/env/StackMemoryRegion.cpp | 2 +- compiler/env/StackMemoryRegion.hpp | 2 +- compiler/env/SystemSegmentProvider.cpp | 2 +- compiler/env/SystemSegmentProvider.hpp | 2 +- compiler/env/TRMemory.cpp | 2 +- compiler/env/TRMemory.hpp | 2 +- compiler/env/TRPersistentMemory.cpp | 2 +- compiler/env/TypeLayout.hpp | 2 +- compiler/env/TypedAllocator.hpp | 2 +- compiler/env/VMAccessCriticalSection.hpp | 2 +- compiler/env/VMEnv.hpp | 2 +- compiler/env/VMMethodEnv.hpp | 2 +- compiler/env/VerboseLog.cpp | 2 +- compiler/env/VerboseLog.hpp | 2 +- compiler/env/defines.h | 2 +- compiler/env/jittypes.h | 2 +- compiler/il/AliasSetInterface.hpp | 2 +- compiler/il/Aliases.cpp | 2 +- compiler/il/AutomaticSymbol.hpp | 2 +- compiler/il/Block.hpp | 2 +- compiler/il/Block_inlines.hpp | 2 +- compiler/il/CMakeLists.txt | 2 +- compiler/il/DataTypes.hpp | 2 +- compiler/il/DataTypesEnum.hpp | 2 +- compiler/il/DataTypes_inlines.hpp | 2 +- compiler/il/IL.hpp | 2 +- compiler/il/ILHelpers.hpp | 2 +- compiler/il/ILOpCodeProperties.hpp | 2 +- compiler/il/ILOpCodes.hpp | 2 +- compiler/il/ILOpCodesEnum.hpp | 2 +- compiler/il/ILOps.hpp | 2 +- compiler/il/ILProps.hpp | 2 +- compiler/il/LabelSymbol.hpp | 2 +- compiler/il/MethodSymbol.hpp | 2 +- compiler/il/Node.hpp | 2 +- compiler/il/NodeExtension.hpp | 2 +- compiler/il/NodePool.cpp | 2 +- compiler/il/NodePool.hpp | 2 +- compiler/il/NodeUnions.hpp | 2 +- compiler/il/NodeUtils.cpp | 2 +- compiler/il/NodeUtils.hpp | 2 +- compiler/il/Node_inlines.hpp | 2 +- compiler/il/OMRAutomaticSymbol.cpp | 2 +- compiler/il/OMRAutomaticSymbol.hpp | 2 +- compiler/il/OMRBlock.cpp | 2 +- compiler/il/OMRBlock.hpp | 2 +- compiler/il/OMRBlock_inlines.hpp | 2 +- compiler/il/OMRDataTypes.cpp | 2 +- compiler/il/OMRDataTypes.hpp | 2 +- compiler/il/OMRDataTypes_inlines.hpp | 2 +- compiler/il/OMRIL.cpp | 2 +- compiler/il/OMRIL.hpp | 2 +- compiler/il/OMRILOpCodeProperties.hpp | 2 +- compiler/il/OMRILOpCodesEnum.hpp | 2 +- compiler/il/OMRILOps.cpp | 2 +- compiler/il/OMRILOps.hpp | 2 +- compiler/il/OMRILProps.hpp | 2 +- compiler/il/OMRLabelSymbol.cpp | 2 +- compiler/il/OMRLabelSymbol.hpp | 2 +- compiler/il/OMRMethodSymbol.cpp | 2 +- compiler/il/OMRMethodSymbol.hpp | 2 +- compiler/il/OMRNode.cpp | 2 +- compiler/il/OMRNode.hpp | 2 +- compiler/il/OMRNode_inlines.hpp | 2 +- compiler/il/OMROpcodes.enum | 2 +- compiler/il/OMRParameterSymbol.cpp | 2 +- compiler/il/OMRParameterSymbol.hpp | 2 +- compiler/il/OMRRegisterMappedSymbol.cpp | 2 +- compiler/il/OMRRegisterMappedSymbol.hpp | 2 +- compiler/il/OMRResolvedMethodSymbol.cpp | 2 +- compiler/il/OMRResolvedMethodSymbol.hpp | 2 +- compiler/il/OMRStaticSymbol.cpp | 2 +- compiler/il/OMRStaticSymbol.hpp | 2 +- compiler/il/OMRSymbol.cpp | 2 +- compiler/il/OMRSymbol.hpp | 2 +- compiler/il/OMRSymbolReference.cpp | 2 +- compiler/il/OMRSymbolReference.hpp | 2 +- compiler/il/OMRSymbol_inlines.hpp | 2 +- compiler/il/OMRTreeTop.cpp | 2 +- compiler/il/OMRTreeTop.hpp | 2 +- compiler/il/OMRTreeTop_inlines.hpp | 2 +- compiler/il/Opcodes.enum | 2 +- compiler/il/ParameterSymbol.hpp | 2 +- compiler/il/RegisterMappedSymbol.hpp | 2 +- compiler/il/ResolvedMethodSymbol.hpp | 2 +- compiler/il/StaticSymbol.hpp | 2 +- compiler/il/Symbol.hpp | 2 +- compiler/il/SymbolReference.hpp | 2 +- compiler/il/Symbol_inlines.hpp | 2 +- compiler/il/TreeTop.hpp | 2 +- compiler/il/TreeTop_inlines.hpp | 2 +- compiler/il/VectorOperations.enum | 2 +- compiler/ilgen/ByteCodeIterator.hpp | 2 +- compiler/ilgen/ByteCodeIteratorWithState.hpp | 2 +- compiler/ilgen/BytecodeBuilder.hpp | 2 +- compiler/ilgen/CMakeLists.txt | 2 +- compiler/ilgen/IlBuilder.hpp | 2 +- compiler/ilgen/IlGen.hpp | 2 +- compiler/ilgen/IlGenRequest.cpp | 2 +- compiler/ilgen/IlGenRequest.hpp | 2 +- compiler/ilgen/IlGeneratorMethodDetails.hpp | 2 +- compiler/ilgen/IlGeneratorMethodDetails_inlines.hpp | 2 +- compiler/ilgen/IlInjector.cpp | 2 +- compiler/ilgen/IlInjector.hpp | 2 +- compiler/ilgen/IlReference.hpp | 2 +- compiler/ilgen/IlType.hpp | 2 +- compiler/ilgen/IlValue.hpp | 2 +- compiler/ilgen/JitBuilderRecorder.hpp | 2 +- compiler/ilgen/JitBuilderRecorderBinaryBuffer.hpp | 2 +- compiler/ilgen/JitBuilderRecorderBinaryFile.hpp | 2 +- compiler/ilgen/JitBuilderRecorderTextFile.hpp | 2 +- compiler/ilgen/MethodBuilder.hpp | 2 +- compiler/ilgen/OMRBytecodeBuilder.cpp | 2 +- compiler/ilgen/OMRBytecodeBuilder.hpp | 2 +- compiler/ilgen/OMRIlBuilder.cpp | 2 +- compiler/ilgen/OMRIlBuilder.hpp | 2 +- compiler/ilgen/OMRIlGenRequest.hpp | 2 +- compiler/ilgen/OMRIlGeneratorMethodDetails.hpp | 2 +- compiler/ilgen/OMRIlGeneratorMethodDetails_inlines.hpp | 2 +- compiler/ilgen/OMRIlReference.hpp | 2 +- compiler/ilgen/OMRIlType.cpp | 2 +- compiler/ilgen/OMRIlType.hpp | 2 +- compiler/ilgen/OMRIlValue.cpp | 2 +- compiler/ilgen/OMRIlValue.hpp | 2 +- compiler/ilgen/OMRJitBuilderRecorder.cpp | 2 +- compiler/ilgen/OMRJitBuilderRecorder.hpp | 2 +- compiler/ilgen/OMRJitBuilderRecorderBinaryBuffer.cpp | 2 +- compiler/ilgen/OMRJitBuilderRecorderBinaryBuffer.hpp | 2 +- compiler/ilgen/OMRJitBuilderRecorderBinaryFile.cpp | 2 +- compiler/ilgen/OMRJitBuilderRecorderBinaryFile.hpp | 2 +- compiler/ilgen/OMRJitBuilderRecorderTextFile.cpp | 2 +- compiler/ilgen/OMRJitBuilderRecorderTextFile.hpp | 2 +- compiler/ilgen/OMRMethodBuilder.cpp | 2 +- compiler/ilgen/OMRMethodBuilder.hpp | 2 +- compiler/ilgen/OMRThunkBuilder.cpp | 2 +- compiler/ilgen/OMRThunkBuilder.hpp | 2 +- compiler/ilgen/OMRTypeDictionary.cpp | 2 +- compiler/ilgen/OMRTypeDictionary.hpp | 2 +- compiler/ilgen/OMRVirtualMachineOperandArray.cpp | 2 +- compiler/ilgen/OMRVirtualMachineOperandArray.hpp | 2 +- compiler/ilgen/OMRVirtualMachineOperandStack.cpp | 2 +- compiler/ilgen/OMRVirtualMachineOperandStack.hpp | 2 +- compiler/ilgen/OMRVirtualMachineRegister.cpp | 2 +- compiler/ilgen/OMRVirtualMachineRegister.hpp | 2 +- compiler/ilgen/OMRVirtualMachineRegisterInStruct.cpp | 2 +- compiler/ilgen/OMRVirtualMachineRegisterInStruct.hpp | 2 +- compiler/ilgen/OMRVirtualMachineState.cpp | 2 +- compiler/ilgen/OMRVirtualMachineState.hpp | 2 +- compiler/ilgen/StatementNames.hpp | 2 +- compiler/ilgen/ThunkBuilder.hpp | 2 +- compiler/ilgen/TypeDictionary.hpp | 2 +- compiler/ilgen/VirtualMachineOperandArray.hpp | 2 +- compiler/ilgen/VirtualMachineOperandStack.hpp | 2 +- compiler/ilgen/VirtualMachineRegister.hpp | 2 +- compiler/ilgen/VirtualMachineRegisterInStruct.hpp | 2 +- compiler/ilgen/VirtualMachineState.hpp | 2 +- compiler/infra/Annotations.hpp | 2 +- compiler/infra/Arith.hpp | 2 +- compiler/infra/Array.hpp | 2 +- compiler/infra/Assert.cpp | 2 +- compiler/infra/Assert.hpp | 2 +- compiler/infra/Bit.hpp | 2 +- compiler/infra/BitVector.cpp | 2 +- compiler/infra/BitVector.hpp | 2 +- compiler/infra/CMakeLists.txt | 2 +- compiler/infra/Cfg.hpp | 2 +- compiler/infra/CfgEdge.hpp | 2 +- compiler/infra/CfgNode.hpp | 2 +- compiler/infra/Checklist.cpp | 2 +- compiler/infra/Checklist.hpp | 2 +- compiler/infra/CriticalSection.hpp | 2 +- compiler/infra/Flags.hpp | 2 +- compiler/infra/HashTab.cpp | 2 +- compiler/infra/HashTab.hpp | 2 +- compiler/infra/HedgeTree.hpp | 2 +- compiler/infra/IGBase.cpp | 2 +- compiler/infra/IGBase.hpp | 2 +- compiler/infra/IGNode.cpp | 2 +- compiler/infra/IGNode.hpp | 2 +- compiler/infra/ILTraverser.cpp | 2 +- compiler/infra/ILTraverser.hpp | 2 +- compiler/infra/ILWalk.cpp | 2 +- compiler/infra/ILWalk.hpp | 2 +- compiler/infra/InterferenceGraph.cpp | 2 +- compiler/infra/InterferenceGraph.hpp | 2 +- compiler/infra/Link.hpp | 2 +- compiler/infra/List.hpp | 2 +- compiler/infra/Monitor.hpp | 2 +- compiler/infra/MonitorTable.hpp | 2 +- compiler/infra/OMRCfg.cpp | 2 +- compiler/infra/OMRCfg.hpp | 2 +- compiler/infra/OMRMonitor.cpp | 2 +- compiler/infra/OMRMonitor.hpp | 2 +- compiler/infra/OMRMonitorTable.cpp | 2 +- compiler/infra/OMRMonitorTable.hpp | 2 +- compiler/infra/Random.cpp | 2 +- compiler/infra/Random.hpp | 2 +- compiler/infra/ReferenceWrapper.hpp | 2 +- compiler/infra/STLUtils.cpp | 2 +- compiler/infra/STLUtils.hpp | 2 +- compiler/infra/SideTable.hpp | 2 +- compiler/infra/SimpleRegex.cpp | 2 +- compiler/infra/SimpleRegex.hpp | 2 +- compiler/infra/Stack.hpp | 2 +- compiler/infra/Statistics.hpp | 2 +- compiler/infra/String.cpp | 2 +- compiler/infra/String.hpp | 2 +- compiler/infra/TRCfgEdge.hpp | 2 +- compiler/infra/TRCfgNode.hpp | 2 +- compiler/infra/TRlist.hpp | 2 +- compiler/infra/ThreadLocal.hpp | 2 +- compiler/infra/Timer.cpp | 2 +- compiler/infra/Timer.hpp | 2 +- compiler/infra/TreeServices.cpp | 2 +- compiler/infra/TreeServices.hpp | 2 +- compiler/infra/TrilDumper.cpp | 2 +- compiler/infra/TrilDumper.hpp | 2 +- compiler/infra/Uncopyable.hpp | 2 +- compiler/infra/deque.hpp | 2 +- compiler/infra/forward_list.hpp | 2 +- compiler/infra/vector.hpp | 2 +- compiler/objectfmt/FunctionCallData.hpp | 2 +- compiler/objectfmt/JitCodeRWXObjectFormat.hpp | 2 +- compiler/objectfmt/JitCodeRXObjectFormat.hpp | 2 +- compiler/objectfmt/OMRFunctionCallData.hpp | 2 +- compiler/objectfmt/OMRJitCodeRWXObjectFormat.hpp | 2 +- compiler/objectfmt/OMRJitCodeRXObjectFormat.hpp | 2 +- compiler/objectfmt/OMRObjectFormat.hpp | 2 +- compiler/objectfmt/ObjectFormat.hpp | 2 +- compiler/optimizer/AsyncCheckInsertion.cpp | 2 +- compiler/optimizer/AsyncCheckInsertion.hpp | 2 +- compiler/optimizer/BackwardBitVectorAnalysis.cpp | 2 +- .../optimizer/BackwardIntersectionBitVectorAnalysis.cpp | 2 +- compiler/optimizer/BackwardUnionBitVectorAnalysis.cpp | 2 +- compiler/optimizer/BitVectorAnalysis.cpp | 2 +- compiler/optimizer/CFGSimplifier.hpp | 2 +- compiler/optimizer/CMakeLists.txt | 2 +- compiler/optimizer/CallInfo.hpp | 2 +- compiler/optimizer/CatchBlockRemover.cpp | 2 +- compiler/optimizer/CatchBlockRemover.hpp | 2 +- compiler/optimizer/CompactLocals.cpp | 2 +- compiler/optimizer/CompactLocals.hpp | 2 +- compiler/optimizer/CopyPropagation.cpp | 2 +- compiler/optimizer/CopyPropagation.hpp | 2 +- compiler/optimizer/DataFlowAnalysis.cpp | 2 +- compiler/optimizer/DataFlowAnalysis.enum | 2 +- compiler/optimizer/DataFlowAnalysis.hpp | 2 +- compiler/optimizer/DeadStoreElimination.cpp | 2 +- compiler/optimizer/DeadStoreElimination.hpp | 2 +- compiler/optimizer/DeadTreesElimination.cpp | 2 +- compiler/optimizer/DeadTreesElimination.hpp | 2 +- compiler/optimizer/DebuggingCounters.cpp | 2 +- compiler/optimizer/DebuggingCounters.hpp | 2 +- compiler/optimizer/Delayedness.cpp | 2 +- compiler/optimizer/DominatorVerifier.cpp | 2 +- compiler/optimizer/DominatorVerifier.hpp | 2 +- compiler/optimizer/Dominators.cpp | 2 +- compiler/optimizer/Dominators.hpp | 2 +- compiler/optimizer/DominatorsChk.cpp | 2 +- compiler/optimizer/DominatorsChk.hpp | 2 +- compiler/optimizer/Earliestness.cpp | 2 +- compiler/optimizer/ExpressionsSimplification.cpp | 2 +- compiler/optimizer/ExpressionsSimplification.hpp | 2 +- compiler/optimizer/FEInliner.cpp | 2 +- compiler/optimizer/FieldPrivatizer.cpp | 2 +- compiler/optimizer/FieldPrivatizer.hpp | 2 +- compiler/optimizer/GeneralLoopUnroller.cpp | 2 +- compiler/optimizer/GeneralLoopUnroller.hpp | 2 +- compiler/optimizer/GlobalAnticipatability.cpp | 2 +- compiler/optimizer/GlobalRegister.hpp | 2 +- compiler/optimizer/GlobalRegisterAllocator.cpp | 2 +- compiler/optimizer/GlobalRegisterAllocator.hpp | 2 +- compiler/optimizer/GlobalRegister_inlines.hpp | 2 +- compiler/optimizer/GlobalValuePropagation.hpp | 2 +- compiler/optimizer/InductionVariable.cpp | 2 +- compiler/optimizer/InductionVariable.hpp | 2 +- compiler/optimizer/Inliner.cpp | 2 +- compiler/optimizer/Inliner.hpp | 2 +- compiler/optimizer/InlinerFailureReason.hpp | 2 +- compiler/optimizer/IntersectionBitVectorAnalysis.cpp | 2 +- compiler/optimizer/IsolatedStoreElimination.cpp | 2 +- compiler/optimizer/IsolatedStoreElimination.hpp | 2 +- compiler/optimizer/Isolatedness.cpp | 2 +- compiler/optimizer/Latestness.cpp | 2 +- compiler/optimizer/LiveOnAllPaths.cpp | 2 +- compiler/optimizer/LiveVariableInformation.cpp | 2 +- compiler/optimizer/Liveness.cpp | 2 +- compiler/optimizer/LoadExtensions.cpp | 2 +- compiler/optimizer/LoadExtensions.hpp | 2 +- compiler/optimizer/LocalAnalysis.cpp | 2 +- compiler/optimizer/LocalAnalysis.hpp | 2 +- compiler/optimizer/LocalAnticipatability.cpp | 2 +- compiler/optimizer/LocalCSE.hpp | 2 +- compiler/optimizer/LocalDeadStoreElimination.cpp | 2 +- compiler/optimizer/LocalDeadStoreElimination.hpp | 2 +- compiler/optimizer/LocalLiveRangeReducer.cpp | 2 +- compiler/optimizer/LocalLiveRangeReducer.hpp | 2 +- compiler/optimizer/LocalOpts.cpp | 2 +- compiler/optimizer/LocalOpts.hpp | 2 +- compiler/optimizer/LocalReordering.cpp | 2 +- compiler/optimizer/LocalReordering.hpp | 2 +- compiler/optimizer/LocalTransparency.cpp | 2 +- compiler/optimizer/LocalValuePropagation.hpp | 2 +- compiler/optimizer/LoopCanonicalizer.cpp | 2 +- compiler/optimizer/LoopCanonicalizer.hpp | 2 +- compiler/optimizer/LoopReducer.cpp | 2 +- compiler/optimizer/LoopReducer.hpp | 2 +- compiler/optimizer/LoopReplicator.cpp | 2 +- compiler/optimizer/LoopReplicator.hpp | 2 +- compiler/optimizer/LoopVersioner.cpp | 2 +- compiler/optimizer/LoopVersioner.hpp | 2 +- compiler/optimizer/OMRCFGSimplifier.cpp | 2 +- compiler/optimizer/OMRCFGSimplifier.hpp | 2 +- compiler/optimizer/OMRDataFlowAnalysis.enum | 2 +- compiler/optimizer/OMRGlobalRegister.cpp | 2 +- compiler/optimizer/OMRGlobalRegister.hpp | 2 +- compiler/optimizer/OMRGlobalRegister_inlines.hpp | 2 +- compiler/optimizer/OMRLocalCSE.cpp | 2 +- compiler/optimizer/OMRLocalCSE.hpp | 2 +- compiler/optimizer/OMROptimization.cpp | 2 +- compiler/optimizer/OMROptimization.hpp | 2 +- compiler/optimizer/OMROptimizationGroups.enum | 2 +- compiler/optimizer/OMROptimizationManager.cpp | 2 +- compiler/optimizer/OMROptimizationManager.hpp | 2 +- compiler/optimizer/OMROptimizationManager_inlines.hpp | 2 +- compiler/optimizer/OMROptimization_inlines.hpp | 2 +- compiler/optimizer/OMROptimizations.enum | 2 +- compiler/optimizer/OMROptimizer.cpp | 2 +- compiler/optimizer/OMROptimizer.hpp | 2 +- compiler/optimizer/OMROptimizer_inlines.hpp | 2 +- compiler/optimizer/OMRRecognizedCallTransformer.cpp | 2 +- compiler/optimizer/OMRRecognizedCallTransformer.hpp | 2 +- compiler/optimizer/OMRRegisterCandidate.cpp | 2 +- compiler/optimizer/OMRRegisterCandidate.hpp | 2 +- compiler/optimizer/OMRSimplifier.cpp | 2 +- compiler/optimizer/OMRSimplifier.hpp | 2 +- compiler/optimizer/OMRSimplifierHandlers.cpp | 2 +- compiler/optimizer/OMRSimplifierHandlers.hpp | 2 +- compiler/optimizer/OMRSimplifierHelpers.cpp | 2 +- compiler/optimizer/OMRSimplifierHelpers.hpp | 2 +- compiler/optimizer/OMRSimplifierTable.enum | 2 +- compiler/optimizer/OMRTransformUtil.cpp | 2 +- compiler/optimizer/OMRTransformUtil.hpp | 2 +- compiler/optimizer/OMRValuePropagation.cpp | 2 +- compiler/optimizer/OMRValuePropagation.hpp | 2 +- compiler/optimizer/OSRDefAnalysis.cpp | 2 +- compiler/optimizer/OSRDefAnalysis.hpp | 2 +- compiler/optimizer/Optimization.hpp | 2 +- compiler/optimizer/OptimizationData.hpp | 2 +- compiler/optimizer/OptimizationGroups.enum | 2 +- compiler/optimizer/OptimizationManager.hpp | 2 +- compiler/optimizer/OptimizationManager_inlines.hpp | 2 +- compiler/optimizer/OptimizationPolicy.hpp | 2 +- compiler/optimizer/OptimizationStrategies.hpp | 2 +- compiler/optimizer/OptimizationUtil.hpp | 2 +- compiler/optimizer/Optimization_inlines.hpp | 2 +- compiler/optimizer/Optimizations.enum | 2 +- compiler/optimizer/Optimizations.hpp | 2 +- compiler/optimizer/Optimizer.hpp | 2 +- compiler/optimizer/Optimizer_inlines.hpp | 2 +- compiler/optimizer/OrderBlocks.cpp | 2 +- compiler/optimizer/OrderBlocks.hpp | 2 +- compiler/optimizer/PartialRedundancy.cpp | 2 +- compiler/optimizer/PartialRedundancy.hpp | 2 +- compiler/optimizer/PreExistence.cpp | 2 +- compiler/optimizer/PreExistence.hpp | 2 +- compiler/optimizer/Reachability.cpp | 2 +- compiler/optimizer/Reachability.hpp | 2 +- compiler/optimizer/ReachingDefinitions.cpp | 2 +- compiler/optimizer/RecognizedCallTransformer.hpp | 2 +- compiler/optimizer/RedundantAsyncCheckRemoval.cpp | 2 +- compiler/optimizer/RedundantAsyncCheckRemoval.hpp | 2 +- compiler/optimizer/RegDepCopyRemoval.cpp | 2 +- compiler/optimizer/RegDepCopyRemoval.hpp | 2 +- compiler/optimizer/RegisterCandidate.hpp | 2 +- compiler/optimizer/RematTools.cpp | 2 +- compiler/optimizer/RematTools.hpp | 2 +- compiler/optimizer/ReorderIndexExpr.cpp | 2 +- compiler/optimizer/ReorderIndexExpr.hpp | 2 +- compiler/optimizer/SelectOpt.hpp | 2 +- compiler/optimizer/Simplifier.hpp | 2 +- compiler/optimizer/SimplifierHandlers.hpp | 2 +- compiler/optimizer/SimplifierTable.enum | 2 +- compiler/optimizer/SimplifierTable.hpp | 2 +- compiler/optimizer/SinkStores.cpp | 2 +- compiler/optimizer/SinkStores.hpp | 2 +- compiler/optimizer/StripMiner.cpp | 2 +- compiler/optimizer/StripMiner.hpp | 2 +- compiler/optimizer/StructuralAnalysis.cpp | 2 +- compiler/optimizer/StructuralAnalysis.hpp | 2 +- compiler/optimizer/Structure.cpp | 2 +- compiler/optimizer/Structure.hpp | 2 +- compiler/optimizer/SwitchAnalyzer.cpp | 2 +- compiler/optimizer/SwitchAnalyzer.hpp | 2 +- compiler/optimizer/TransformUtil.hpp | 2 +- compiler/optimizer/TranslateTable.cpp | 2 +- compiler/optimizer/TranslateTable.hpp | 2 +- compiler/optimizer/TrivialDeadBlockRemover.cpp | 2 +- compiler/optimizer/TrivialDeadBlockRemover.hpp | 2 +- compiler/optimizer/UnionBitVectorAnalysis.cpp | 2 +- compiler/optimizer/UseDefInfo.cpp | 2 +- compiler/optimizer/UseDefInfo.hpp | 2 +- compiler/optimizer/VPConstraint.cpp | 2 +- compiler/optimizer/VPConstraint.hpp | 2 +- compiler/optimizer/VPHandlers.cpp | 2 +- compiler/optimizer/VPHandlersCommon.cpp | 2 +- compiler/optimizer/ValueNumberInfo.cpp | 2 +- compiler/optimizer/ValueNumberInfo.hpp | 2 +- compiler/optimizer/ValuePropagation.hpp | 2 +- compiler/optimizer/ValuePropagationCommon.cpp | 2 +- compiler/optimizer/ValuePropagationTable.hpp | 2 +- compiler/optimizer/VirtualGuardCoalescer.cpp | 2 +- compiler/optimizer/VirtualGuardCoalescer.hpp | 2 +- compiler/optimizer/VirtualGuardHeadMerger.cpp | 2 +- compiler/optimizer/VirtualGuardHeadMerger.hpp | 2 +- compiler/optimizer/abstractinterpreter/AbsOpArray.cpp | 2 +- compiler/optimizer/abstractinterpreter/AbsOpArray.hpp | 2 +- compiler/optimizer/abstractinterpreter/AbsOpStack.cpp | 2 +- compiler/optimizer/abstractinterpreter/AbsOpStack.hpp | 2 +- compiler/optimizer/abstractinterpreter/AbsValue.cpp | 2 +- compiler/optimizer/abstractinterpreter/AbsValue.hpp | 2 +- compiler/p/CMakeLists.txt | 2 +- compiler/p/codegen/BinaryEvaluator.cpp | 2 +- compiler/p/codegen/ConstantDataSnippet.hpp | 2 +- compiler/p/codegen/ControlFlowEvaluator.cpp | 2 +- compiler/p/codegen/FPTreeEvaluator.cpp | 2 +- compiler/p/codegen/GenerateInstructions.cpp | 2 +- compiler/p/codegen/GenerateInstructions.hpp | 2 +- compiler/p/codegen/GenerateOMRInstructions.hpp | 2 +- compiler/p/codegen/InstOpCode.hpp | 2 +- compiler/p/codegen/Instruction.hpp | 2 +- compiler/p/codegen/Linkage.hpp | 2 +- compiler/p/codegen/LoadStoreHandler.hpp | 2 +- compiler/p/codegen/MemoryReference.hpp | 2 +- compiler/p/codegen/OMRAheadOfTimeCompile.hpp | 2 +- compiler/p/codegen/OMRCodeGenerator.cpp | 2 +- compiler/p/codegen/OMRCodeGenerator.hpp | 2 +- compiler/p/codegen/OMRConstantDataSnippet.cpp | 2 +- compiler/p/codegen/OMRConstantDataSnippet.hpp | 2 +- compiler/p/codegen/OMRInstOpCode.cpp | 2 +- compiler/p/codegen/OMRInstOpCode.enum | 2 +- compiler/p/codegen/OMRInstOpCode.hpp | 2 +- compiler/p/codegen/OMRInstOpCodeProperties.hpp | 2 +- compiler/p/codegen/OMRInstruction.cpp | 2 +- compiler/p/codegen/OMRInstruction.hpp | 2 +- compiler/p/codegen/OMRInstructionDelegate.cpp | 2 +- compiler/p/codegen/OMRInstructionDelegate.hpp | 2 +- compiler/p/codegen/OMRInstructionKindEnum.hpp | 2 +- compiler/p/codegen/OMRLinkage.cpp | 2 +- compiler/p/codegen/OMRLinkage.hpp | 2 +- compiler/p/codegen/OMRLinkage_inlines.hpp | 2 +- compiler/p/codegen/OMRLoadStoreHandler.cpp | 2 +- compiler/p/codegen/OMRLoadStoreHandler.hpp | 2 +- compiler/p/codegen/OMRMachine.cpp | 2 +- compiler/p/codegen/OMRMachine.hpp | 2 +- compiler/p/codegen/OMRMemoryReference.cpp | 2 +- compiler/p/codegen/OMRMemoryReference.hpp | 2 +- compiler/p/codegen/OMRPeephole.cpp | 2 +- compiler/p/codegen/OMRPeephole.hpp | 2 +- compiler/p/codegen/OMRRealRegister.cpp | 2 +- compiler/p/codegen/OMRRealRegister.hpp | 2 +- compiler/p/codegen/OMRRegister.hpp | 2 +- compiler/p/codegen/OMRRegisterDependency.cpp | 2 +- compiler/p/codegen/OMRRegisterDependency.hpp | 2 +- compiler/p/codegen/OMRRegisterDependencyStruct.hpp | 2 +- compiler/p/codegen/OMRSnippet.cpp | 2 +- compiler/p/codegen/OMRSnippet.hpp | 2 +- compiler/p/codegen/OMRTreeEvaluator.cpp | 2 +- compiler/p/codegen/OMRTreeEvaluator.hpp | 2 +- compiler/p/codegen/PPCAOTRelocation.cpp | 2 +- compiler/p/codegen/PPCAOTRelocation.hpp | 2 +- compiler/p/codegen/PPCBinaryEncoding.cpp | 2 +- compiler/p/codegen/PPCCRBackingStore.hpp | 2 +- compiler/p/codegen/PPCDebug.cpp | 2 +- compiler/p/codegen/PPCEvaluator.hpp | 2 +- compiler/p/codegen/PPCHelperCallSnippet.cpp | 2 +- compiler/p/codegen/PPCHelperCallSnippet.hpp | 2 +- compiler/p/codegen/PPCInstruction.cpp | 2 +- compiler/p/codegen/PPCInstruction.hpp | 2 +- compiler/p/codegen/PPCOpsDefines.hpp | 2 +- compiler/p/codegen/PPCOutOfLineCodeSection.cpp | 2 +- compiler/p/codegen/PPCOutOfLineCodeSection.hpp | 2 +- compiler/p/codegen/PPCSystemLinkage.cpp | 2 +- compiler/p/codegen/PPCSystemLinkage.hpp | 2 +- compiler/p/codegen/PPCTableOfConstants.cpp | 2 +- compiler/p/codegen/PPCTableOfConstants.hpp | 2 +- compiler/p/codegen/PseudoRegisterEnum.hpp | 2 +- compiler/p/codegen/RealRegisterEnum.hpp | 2 +- compiler/p/codegen/RealRegisterMaskEnum.hpp | 2 +- compiler/p/codegen/RegisterDependency.hpp | 2 +- compiler/p/codegen/TreeEvaluatorTable.hpp | 2 +- compiler/p/codegen/TreeEvaluatorVMX.cpp | 2 +- compiler/p/codegen/UnaryEvaluator.cpp | 2 +- compiler/p/env/OMRCPU.cpp | 2 +- compiler/p/env/OMRCPU.hpp | 2 +- compiler/p/env/OMRDebugEnv.cpp | 2 +- compiler/p/env/OMRDebugEnv.hpp | 2 +- compiler/p/env/PPCProcessorEnum.hpp | 2 +- compiler/p/runtime/CodeCacheConfig.hpp | 2 +- compiler/p/runtime/OMRCodeCacheConfig.cpp | 2 +- compiler/p/runtime/OMRCodeCacheConfig.hpp | 2 +- compiler/p/runtime/PPCArrayCopy.inc | 2 +- compiler/p/runtime/PPCAsmUtil.inc | 2 +- compiler/p/runtime/PPCCodeSync.inc | 2 +- compiler/p/runtime/VirtualGuardRuntime.spp | 2 +- compiler/p/runtime/ppcasmdefines.inc | 2 +- compiler/ras/CFGChecker.cpp | 2 +- compiler/ras/CFGChecker.hpp | 2 +- compiler/ras/CMakeLists.txt | 2 +- compiler/ras/CallStack.cpp | 2 +- compiler/ras/CallStack.hpp | 2 +- compiler/ras/CallStackIterator.hpp | 2 +- compiler/ras/Debug.cpp | 2 +- compiler/ras/Debug.hpp | 2 +- compiler/ras/DebugCounter.cpp | 2 +- compiler/ras/DebugCounter.hpp | 2 +- compiler/ras/DebugCounter.md | 2 +- compiler/ras/Delimiter.hpp | 2 +- compiler/ras/ILValidationRules.cpp | 2 +- compiler/ras/ILValidationRules.hpp | 2 +- compiler/ras/ILValidationStrategies.hpp | 2 +- compiler/ras/ILValidationUtils.cpp | 2 +- compiler/ras/ILValidationUtils.hpp | 2 +- compiler/ras/ILValidator.cpp | 2 +- compiler/ras/ILValidator.hpp | 2 +- compiler/ras/IgnoreLocale.cpp | 2 +- compiler/ras/IgnoreLocale.hpp | 2 +- compiler/ras/IlVerifier.hpp | 2 +- compiler/ras/IlVerifierHelpers.hpp | 2 +- compiler/ras/LimitFile.cpp | 2 +- compiler/ras/LogTracer.cpp | 2 +- compiler/ras/LogTracer.hpp | 2 +- compiler/ras/OptionsDebug.cpp | 2 +- compiler/ras/Tree.cpp | 2 +- compiler/riscv/CMakeLists.txt | 2 +- compiler/riscv/codegen/BinaryEvaluator.cpp | 2 +- compiler/riscv/codegen/ControlFlowEvaluator.cpp | 2 +- compiler/riscv/codegen/FPTreeEvaluator.cpp | 2 +- compiler/riscv/codegen/GenerateInstructions.cpp | 2 +- compiler/riscv/codegen/GenerateInstructions.hpp | 2 +- compiler/riscv/codegen/InstOpCode.hpp | 2 +- compiler/riscv/codegen/Instruction.hpp | 2 +- compiler/riscv/codegen/Linkage.hpp | 2 +- compiler/riscv/codegen/MemoryReference.hpp | 2 +- compiler/riscv/codegen/OMRCodeGenerator.cpp | 2 +- compiler/riscv/codegen/OMRCodeGenerator.hpp | 2 +- compiler/riscv/codegen/OMRInstOpCode.enum | 2 +- compiler/riscv/codegen/OMRInstOpCode.hpp | 2 +- compiler/riscv/codegen/OMRInstruction.cpp | 2 +- compiler/riscv/codegen/OMRInstruction.hpp | 2 +- compiler/riscv/codegen/OMRInstructionDelegate.cpp | 2 +- compiler/riscv/codegen/OMRInstructionDelegate.hpp | 2 +- compiler/riscv/codegen/OMRInstructionKindEnum.hpp | 2 +- compiler/riscv/codegen/OMRLinkage.cpp | 2 +- compiler/riscv/codegen/OMRLinkage.hpp | 2 +- compiler/riscv/codegen/OMRMachine.cpp | 2 +- compiler/riscv/codegen/OMRMachine.hpp | 2 +- compiler/riscv/codegen/OMRMemoryReference.cpp | 2 +- compiler/riscv/codegen/OMRMemoryReference.hpp | 2 +- compiler/riscv/codegen/OMRRealRegister.cpp | 2 +- compiler/riscv/codegen/OMRRealRegister.hpp | 2 +- compiler/riscv/codegen/OMRRegister.hpp | 2 +- compiler/riscv/codegen/OMRRegisterDependency.cpp | 2 +- compiler/riscv/codegen/OMRRegisterDependency.hpp | 2 +- compiler/riscv/codegen/OMRSnippet.cpp | 2 +- compiler/riscv/codegen/OMRSnippet.hpp | 2 +- compiler/riscv/codegen/OMRTreeEvaluator.cpp | 2 +- compiler/riscv/codegen/OMRTreeEvaluator.hpp | 2 +- compiler/riscv/codegen/OpBinary.cpp | 2 +- compiler/riscv/codegen/PseudoRegisterEnum.hpp | 2 +- compiler/riscv/codegen/RVDebug.cpp | 2 +- compiler/riscv/codegen/RVHelperCallSnippet.cpp | 2 +- compiler/riscv/codegen/RVHelperCallSnippet.hpp | 2 +- compiler/riscv/codegen/RVInstruction.cpp | 2 +- compiler/riscv/codegen/RVInstruction.hpp | 2 +- compiler/riscv/codegen/RVInstructionUtils.hpp | 2 +- compiler/riscv/codegen/RVOutOfLineCodeSection.cpp | 2 +- compiler/riscv/codegen/RVOutOfLineCodeSection.hpp | 2 +- compiler/riscv/codegen/RVSystemLinkage.cpp | 2 +- compiler/riscv/codegen/RVSystemLinkage.hpp | 2 +- compiler/riscv/codegen/RealRegister.hpp | 2 +- compiler/riscv/codegen/RealRegisterEnum.hpp | 2 +- compiler/riscv/codegen/RealRegisterMaskEnum.hpp | 2 +- compiler/riscv/codegen/RegisterDependency.hpp | 2 +- compiler/riscv/codegen/TreeEvaluatorTable.hpp | 2 +- compiler/riscv/codegen/UnaryEvaluator.cpp | 2 +- compiler/riscv/env/OMRCPU.cpp | 2 +- compiler/riscv/env/OMRCPU.hpp | 2 +- compiler/riscv/env/OMRDebugEnv.cpp | 2 +- compiler/riscv/env/OMRDebugEnv.hpp | 2 +- compiler/riscv/env/OMREnvironment.hpp | 2 +- compiler/riscv/env/RVProcessorEnum.hpp | 2 +- compiler/riscv/runtime/CodeSync.cpp | 2 +- compiler/riscv/runtime/CodeSync.hpp | 2 +- compiler/riscv/runtime/VirtualGuardRuntime.cpp | 2 +- compiler/runtime/CMakeLists.txt | 2 +- compiler/runtime/CodeCache.hpp | 2 +- compiler/runtime/CodeCacheConfig.hpp | 2 +- compiler/runtime/CodeCacheExceptions.hpp | 2 +- compiler/runtime/CodeCacheManager.hpp | 2 +- compiler/runtime/CodeCacheMemorySegment.hpp | 2 +- compiler/runtime/CodeCacheTypes.cpp | 2 +- compiler/runtime/CodeCacheTypes.hpp | 2 +- compiler/runtime/CodeMetaData.hpp | 2 +- compiler/runtime/CodeMetaDataManager.hpp | 2 +- compiler/runtime/CodeMetaDataManager_inlines.hpp | 2 +- compiler/runtime/CodeMetaDataPOD.hpp | 2 +- compiler/runtime/MethodExceptionData.hpp | 2 +- compiler/runtime/OMRCodeCache.cpp | 2 +- compiler/runtime/OMRCodeCache.hpp | 2 +- compiler/runtime/OMRCodeCacheConfig.cpp | 2 +- compiler/runtime/OMRCodeCacheConfig.hpp | 2 +- compiler/runtime/OMRCodeCacheManager.cpp | 2 +- compiler/runtime/OMRCodeCacheManager.hpp | 2 +- compiler/runtime/OMRCodeCacheMemorySegment.cpp | 2 +- compiler/runtime/OMRCodeCacheMemorySegment.hpp | 2 +- compiler/runtime/OMRCodeMetaData.cpp | 2 +- compiler/runtime/OMRCodeMetaData.hpp | 2 +- compiler/runtime/OMRCodeMetaDataManager.cpp | 2 +- compiler/runtime/OMRCodeMetaDataManager.hpp | 2 +- compiler/runtime/OMRCodeMetaDataManager_inlines.hpp | 2 +- compiler/runtime/OMRCodeMetaDataPOD.hpp | 2 +- compiler/runtime/OMRRuntimeAssumptions.cpp | 2 +- compiler/runtime/OMRRuntimeAssumptions.hpp | 2 +- compiler/runtime/Runtime.cpp | 2 +- compiler/runtime/Runtime.hpp | 2 +- compiler/runtime/Trampoline.cpp | 2 +- compiler/x/CMakeLists.txt | 2 +- compiler/x/amd64/codegen/AMD64SystemLinkage.cpp | 2 +- compiler/x/amd64/codegen/AMD64SystemLinkage.hpp | 2 +- compiler/x/amd64/codegen/MemoryReference.hpp | 2 +- compiler/x/amd64/codegen/OMRCodeGenerator.cpp | 2 +- compiler/x/amd64/codegen/OMRCodeGenerator.hpp | 2 +- compiler/x/amd64/codegen/OMRELFRelocationResolver.cpp | 2 +- compiler/x/amd64/codegen/OMRELFRelocationResolver.hpp | 2 +- compiler/x/amd64/codegen/OMRMachine.cpp | 2 +- compiler/x/amd64/codegen/OMRMachine.hpp | 2 +- compiler/x/amd64/codegen/OMRMemoryReference.cpp | 2 +- compiler/x/amd64/codegen/OMRMemoryReference.hpp | 2 +- compiler/x/amd64/codegen/OMRRealRegister.cpp | 2 +- compiler/x/amd64/codegen/OMRRealRegister.hpp | 2 +- compiler/x/amd64/codegen/OMRTreeEvaluator.cpp | 2 +- compiler/x/amd64/codegen/OMRTreeEvaluator.hpp | 2 +- compiler/x/amd64/codegen/PseudoRegisterEnum.hpp | 2 +- compiler/x/amd64/codegen/RealRegisterEnum.hpp | 2 +- compiler/x/amd64/codegen/RealRegisterMaskEnum.hpp | 2 +- compiler/x/amd64/codegen/TreeEvaluatorTable.hpp | 2 +- compiler/x/amd64/objectfmt/OMRJitCodeRWXObjectFormat.cpp | 2 +- compiler/x/amd64/objectfmt/OMRJitCodeRWXObjectFormat.hpp | 2 +- compiler/x/amd64/objectfmt/OMRJitCodeRXObjectFormat.cpp | 2 +- compiler/x/amd64/objectfmt/OMRJitCodeRXObjectFormat.hpp | 2 +- compiler/x/codegen/BinaryCommutativeAnalyser.cpp | 2 +- compiler/x/codegen/BinaryCommutativeAnalyser.hpp | 2 +- compiler/x/codegen/BinaryEvaluator.cpp | 2 +- compiler/x/codegen/CompareAnalyser.cpp | 2 +- compiler/x/codegen/CompareAnalyser.hpp | 2 +- compiler/x/codegen/ConstantDataSnippet.hpp | 2 +- compiler/x/codegen/ControlFlowEvaluator.cpp | 2 +- compiler/x/codegen/DataSnippet.cpp | 2 +- compiler/x/codegen/DataSnippet.hpp | 2 +- compiler/x/codegen/DivideCheckSnippet.cpp | 2 +- compiler/x/codegen/DivideCheckSnippet.hpp | 2 +- compiler/x/codegen/FPBinaryArithmeticAnalyser.cpp | 2 +- compiler/x/codegen/FPBinaryArithmeticAnalyser.hpp | 2 +- compiler/x/codegen/FPCompareAnalyser.cpp | 2 +- compiler/x/codegen/FPCompareAnalyser.hpp | 2 +- compiler/x/codegen/FPTreeEvaluator.cpp | 2 +- compiler/x/codegen/FPTreeEvaluator.hpp | 2 +- compiler/x/codegen/HelperCallSnippet.cpp | 2 +- compiler/x/codegen/HelperCallSnippet.hpp | 2 +- compiler/x/codegen/IA32LinkageUtils.cpp | 2 +- compiler/x/codegen/IA32LinkageUtils.hpp | 2 +- compiler/x/codegen/InstOpCode.hpp | 2 +- compiler/x/codegen/Instruction.hpp | 2 +- compiler/x/codegen/IntegerMultiplyDecomposer.cpp | 2 +- compiler/x/codegen/IntegerMultiplyDecomposer.hpp | 2 +- compiler/x/codegen/Linkage.hpp | 2 +- compiler/x/codegen/MemoryReference.hpp | 2 +- compiler/x/codegen/OMRCodeGenerator.cpp | 2 +- compiler/x/codegen/OMRCodeGenerator.hpp | 2 +- compiler/x/codegen/OMRInstOpCode.cpp | 2 +- compiler/x/codegen/OMRInstOpCode.enum | 2 +- compiler/x/codegen/OMRInstOpCode.hpp | 2 +- compiler/x/codegen/OMRInstOpCodeProperties.hpp | 2 +- compiler/x/codegen/OMRInstruction.cpp | 2 +- compiler/x/codegen/OMRInstruction.hpp | 2 +- compiler/x/codegen/OMRInstructionDelegate.cpp | 2 +- compiler/x/codegen/OMRInstructionDelegate.hpp | 2 +- compiler/x/codegen/OMRInstructionKindEnum.hpp | 2 +- compiler/x/codegen/OMRLinkage.cpp | 2 +- compiler/x/codegen/OMRLinkage.hpp | 2 +- compiler/x/codegen/OMRLinkage_inlines.hpp | 2 +- compiler/x/codegen/OMRMachine.cpp | 2 +- compiler/x/codegen/OMRMachine.hpp | 2 +- compiler/x/codegen/OMRMemoryReference.cpp | 2 +- compiler/x/codegen/OMRMemoryReference.hpp | 2 +- compiler/x/codegen/OMRRealRegister.cpp | 2 +- compiler/x/codegen/OMRRealRegister.hpp | 2 +- compiler/x/codegen/OMRRegister.cpp | 2 +- compiler/x/codegen/OMRRegister.hpp | 2 +- compiler/x/codegen/OMRRegisterDependency.cpp | 2 +- compiler/x/codegen/OMRRegisterDependency.hpp | 2 +- compiler/x/codegen/OMRRegisterDependencyStruct.hpp | 2 +- compiler/x/codegen/OMRSnippet.cpp | 2 +- compiler/x/codegen/OMRSnippet.hpp | 2 +- compiler/x/codegen/OMRTreeEvaluator.cpp | 2 +- compiler/x/codegen/OMRTreeEvaluator.hpp | 2 +- compiler/x/codegen/OMRX86Instruction.cpp | 2 +- compiler/x/codegen/OMRX86Instruction.hpp | 2 +- compiler/x/codegen/OutlinedInstructions.cpp | 2 +- compiler/x/codegen/OutlinedInstructions.hpp | 2 +- compiler/x/codegen/RealRegister.hpp | 2 +- compiler/x/codegen/RegisterDependency.hpp | 2 +- compiler/x/codegen/RegisterRematerialization.cpp | 2 +- compiler/x/codegen/RegisterRematerialization.hpp | 2 +- compiler/x/codegen/RestartSnippet.hpp | 2 +- compiler/x/codegen/SIMDTreeEvaluator.cpp | 2 +- compiler/x/codegen/SubtractAnalyser.cpp | 2 +- compiler/x/codegen/SubtractAnalyser.hpp | 2 +- compiler/x/codegen/UnaryEvaluator.cpp | 2 +- compiler/x/codegen/X86BinaryEncoding.cpp | 2 +- compiler/x/codegen/X86Debug.cpp | 2 +- compiler/x/codegen/X86FPConversionSnippet.cpp | 2 +- compiler/x/codegen/X86FPConversionSnippet.hpp | 2 +- compiler/x/codegen/X86Instruction.hpp | 2 +- compiler/x/codegen/X86LinkageProperties.hpp | 2 +- compiler/x/codegen/X86Ops.ins | 2 +- compiler/x/codegen/X86Register.hpp | 2 +- compiler/x/codegen/X86SystemLinkage.cpp | 2 +- compiler/x/codegen/X86SystemLinkage.hpp | 2 +- compiler/x/codegen/XMMBinaryArithmeticAnalyser.cpp | 2 +- compiler/x/env/OMRCPU.cpp | 2 +- compiler/x/env/OMRCPU.hpp | 2 +- compiler/x/env/OMRDebugEnv.cpp | 2 +- compiler/x/env/OMRDebugEnv.hpp | 2 +- compiler/x/env/X86ProcessorEnum.hpp | 2 +- compiler/x/i386/codegen/IA32SystemLinkage.cpp | 2 +- compiler/x/i386/codegen/IA32SystemLinkage.hpp | 2 +- compiler/x/i386/codegen/OMRCodeGenerator.cpp | 2 +- compiler/x/i386/codegen/OMRCodeGenerator.hpp | 2 +- compiler/x/i386/codegen/OMRMachine.cpp | 2 +- compiler/x/i386/codegen/OMRMachine.hpp | 2 +- compiler/x/i386/codegen/OMRRealRegister.cpp | 2 +- compiler/x/i386/codegen/OMRRealRegister.hpp | 2 +- compiler/x/i386/codegen/OMRTreeEvaluator.cpp | 2 +- compiler/x/i386/codegen/OMRTreeEvaluator.hpp | 2 +- compiler/x/i386/codegen/PseudoRegisterEnum.hpp | 2 +- compiler/x/i386/codegen/RealRegisterEnum.hpp | 2 +- compiler/x/i386/codegen/RealRegisterMaskEnum.hpp | 2 +- compiler/x/i386/codegen/TreeEvaluatorTable.hpp | 2 +- compiler/x/objectfmt/FunctionCallData.hpp | 2 +- compiler/x/objectfmt/OMRFunctionCallData.hpp | 2 +- compiler/x/objectfmt/OMRJitCodeRWXObjectFormat.hpp | 2 +- compiler/x/objectfmt/OMRJitCodeRXObjectFormat.hpp | 2 +- compiler/x/runtime/VirtualGuardRuntime.cpp | 2 +- compiler/x/runtime/X86Runtime.hpp | 2 +- compiler/z/CMakeLists.txt | 2 +- compiler/z/codegen/BinaryAnalyser.cpp | 2 +- compiler/z/codegen/BinaryAnalyser.hpp | 2 +- compiler/z/codegen/BinaryCommutativeAnalyser.cpp | 2 +- compiler/z/codegen/BinaryCommutativeAnalyser.hpp | 2 +- compiler/z/codegen/BinaryEvaluator.cpp | 2 +- compiler/z/codegen/CallSnippet.cpp | 2 +- compiler/z/codegen/CallSnippet.hpp | 2 +- compiler/z/codegen/CodeGenPhaseToPerform.hpp | 2 +- compiler/z/codegen/CompareAnalyser.cpp | 2 +- compiler/z/codegen/CompareAnalyser.hpp | 2 +- compiler/z/codegen/ConstantDataSnippet.cpp | 2 +- compiler/z/codegen/ConstantDataSnippet.hpp | 2 +- compiler/z/codegen/ControlFlowEvaluator.cpp | 2 +- compiler/z/codegen/EndianConversion.hpp | 2 +- compiler/z/codegen/FPTreeEvaluator.cpp | 2 +- compiler/z/codegen/InstOpCode.cpp | 2 +- compiler/z/codegen/InstOpCode.hpp | 2 +- compiler/z/codegen/InstOpCodeTables.cpp | 2 +- compiler/z/codegen/Instruction.hpp | 2 +- compiler/z/codegen/Linkage.hpp | 2 +- compiler/z/codegen/MemoryReference.hpp | 2 +- compiler/z/codegen/OMRCodeGenPhase.cpp | 2 +- compiler/z/codegen/OMRCodeGenPhase.hpp | 2 +- compiler/z/codegen/OMRCodeGenPhaseEnum.hpp | 2 +- compiler/z/codegen/OMRCodeGenPhaseFunctionTable.hpp | 2 +- compiler/z/codegen/OMRCodeGenerator.cpp | 2 +- compiler/z/codegen/OMRCodeGenerator.hpp | 2 +- compiler/z/codegen/OMRCodeGenerator_inlines.hpp | 2 +- compiler/z/codegen/OMRInstOpCode.enum | 2 +- compiler/z/codegen/OMRInstOpCode.hpp | 2 +- compiler/z/codegen/OMRInstOpCodeProperties.hpp | 2 +- compiler/z/codegen/OMRInstruction.cpp | 2 +- compiler/z/codegen/OMRInstruction.hpp | 2 +- compiler/z/codegen/OMRInstructionDelegate.cpp | 2 +- compiler/z/codegen/OMRInstructionDelegate.hpp | 2 +- compiler/z/codegen/OMRInstructionKindEnum.hpp | 2 +- compiler/z/codegen/OMRLinkage.cpp | 2 +- compiler/z/codegen/OMRLinkage.hpp | 2 +- compiler/z/codegen/OMRLinkage_inlines.hpp | 2 +- compiler/z/codegen/OMRMachine.cpp | 2 +- compiler/z/codegen/OMRMachine.hpp | 2 +- compiler/z/codegen/OMRMemoryReference.cpp | 2 +- compiler/z/codegen/OMRMemoryReference.hpp | 2 +- compiler/z/codegen/OMRPeephole.cpp | 2 +- compiler/z/codegen/OMRPeephole.hpp | 2 +- compiler/z/codegen/OMRRealRegister.cpp | 2 +- compiler/z/codegen/OMRRealRegister.hpp | 2 +- compiler/z/codegen/OMRRegister.cpp | 2 +- compiler/z/codegen/OMRRegister.hpp | 2 +- compiler/z/codegen/OMRRegisterDependency.cpp | 2 +- compiler/z/codegen/OMRRegisterDependency.hpp | 2 +- compiler/z/codegen/OMRRegisterDependencyStruct.hpp | 2 +- compiler/z/codegen/OMRSnippet.cpp | 2 +- compiler/z/codegen/OMRSnippet.hpp | 2 +- compiler/z/codegen/OMRTreeEvaluator.cpp | 2 +- compiler/z/codegen/OMRTreeEvaluator.hpp | 2 +- compiler/z/codegen/OpMemToMem.cpp | 2 +- compiler/z/codegen/OpMemToMem.hpp | 2 +- compiler/z/codegen/PseudoRegisterEnum.hpp | 2 +- compiler/z/codegen/RealRegisterEnum.hpp | 2 +- compiler/z/codegen/RealRegisterMaskEnum.hpp | 2 +- compiler/z/codegen/RegisterDependency.hpp | 2 +- compiler/z/codegen/S390BranchCondNames.cpp | 2 +- compiler/z/codegen/S390Debug.cpp | 2 +- compiler/z/codegen/S390Evaluator.hpp | 2 +- compiler/z/codegen/S390GenerateInstructions.cpp | 2 +- compiler/z/codegen/S390GenerateInstructions.hpp | 2 +- compiler/z/codegen/S390HelperCallSnippet.cpp | 2 +- compiler/z/codegen/S390HelperCallSnippet.hpp | 2 +- compiler/z/codegen/S390Instruction.cpp | 2 +- compiler/z/codegen/S390Instruction.hpp | 2 +- compiler/z/codegen/S390OutOfLineCodeSection.cpp | 2 +- compiler/z/codegen/S390OutOfLineCodeSection.hpp | 2 +- compiler/z/codegen/S390Snippets.cpp | 2 +- compiler/z/codegen/S390Snippets.hpp | 2 +- compiler/z/codegen/SystemLinkage.cpp | 2 +- compiler/z/codegen/SystemLinkage.hpp | 2 +- compiler/z/codegen/SystemLinkageLinux.cpp | 2 +- compiler/z/codegen/SystemLinkageLinux.hpp | 2 +- compiler/z/codegen/SystemLinkagezOS.cpp | 2 +- compiler/z/codegen/SystemLinkagezOS.hpp | 2 +- compiler/z/codegen/TreeEvaluatorTable.hpp | 2 +- compiler/z/codegen/UnaryEvaluator.cpp | 2 +- compiler/z/codegen/snippet/PPA1Snippet.cpp | 2 +- compiler/z/codegen/snippet/PPA1Snippet.hpp | 2 +- compiler/z/codegen/snippet/PPA2Snippet.cpp | 2 +- compiler/z/codegen/snippet/PPA2Snippet.hpp | 2 +- compiler/z/env/OMRCPU.cpp | 2 +- compiler/z/env/OMRCPU.hpp | 2 +- compiler/z/env/OMRDebugEnv.cpp | 2 +- compiler/z/env/OMRDebugEnv.hpp | 2 +- compiler/z/env/S390ProcessorEnum.hpp | 2 +- compiler/z/objectfmt/FunctionCallData.hpp | 2 +- compiler/z/objectfmt/OMRFunctionCallData.hpp | 2 +- compiler/z/objectfmt/OMRJitCodeRWXObjectFormat.cpp | 2 +- compiler/z/objectfmt/OMRJitCodeRWXObjectFormat.hpp | 2 +- compiler/z/objectfmt/OMRJitCodeRXObjectFormat.cpp | 2 +- compiler/z/objectfmt/OMRJitCodeRXObjectFormat.hpp | 2 +- compiler/z/runtime/VirtualGuardRuntime.cpp | 2 +- configure | 2 +- configure.ac | 2 +- ddr/CMakeLists.txt | 2 +- ddr/Makefile | 2 +- ddr/include/ddr/blobgen/genBlob.hpp | 2 +- ddr/include/ddr/blobgen/java/genBinaryBlob.hpp | 2 +- ddr/include/ddr/blobgen/java/genSuperset.hpp | 2 +- ddr/include/ddr/config.hpp | 2 +- ddr/include/ddr/error.hpp | 2 +- ddr/include/ddr/ir/ClassType.hpp | 2 +- ddr/include/ddr/ir/ClassUDT.hpp | 2 +- ddr/include/ddr/ir/EnumMember.hpp | 2 +- ddr/include/ddr/ir/EnumUDT.hpp | 2 +- ddr/include/ddr/ir/Field.hpp | 2 +- ddr/include/ddr/ir/Macro.hpp | 2 +- ddr/include/ddr/ir/Members.hpp | 2 +- ddr/include/ddr/ir/Modifiers.hpp | 2 +- ddr/include/ddr/ir/NamespaceUDT.hpp | 2 +- ddr/include/ddr/ir/Symbol_IR.hpp | 2 +- ddr/include/ddr/ir/TextFile.hpp | 2 +- ddr/include/ddr/ir/Type.hpp | 2 +- ddr/include/ddr/ir/TypePrinter.hpp | 2 +- ddr/include/ddr/ir/TypeVisitor.hpp | 2 +- ddr/include/ddr/ir/TypedefUDT.hpp | 2 +- ddr/include/ddr/ir/UDT.hpp | 2 +- ddr/include/ddr/ir/UnionUDT.hpp | 2 +- ddr/include/ddr/macros/MacroInfo.hpp | 2 +- ddr/include/ddr/macros/MacroTool.hpp | 2 +- ddr/include/ddr/scanner/Scanner.hpp | 2 +- ddr/include/ddr/scanner/dwarf/AixSymbolTableParser.hpp | 2 +- ddr/include/ddr/scanner/dwarf/DwarfFunctions.hpp | 2 +- ddr/include/ddr/scanner/dwarf/DwarfScanner.hpp | 2 +- ddr/include/ddr/scanner/pdb/PdbScanner.hpp | 2 +- ddr/include/ddr/std/sstream.hpp | 2 +- ddr/include/ddr/std/string.hpp | 2 +- ddr/include/ddr/std/unordered_map.hpp | 2 +- ddr/lib/CMakeLists.txt | 2 +- ddr/lib/Makefile | 2 +- ddr/lib/ddr-blobgen/CMakeLists.txt | 2 +- ddr/lib/ddr-blobgen/Makefile | 2 +- ddr/lib/ddr-blobgen/java/genBinaryBlob.cpp | 2 +- ddr/lib/ddr-blobgen/java/genBlobJava.cpp | 2 +- ddr/lib/ddr-blobgen/java/genSuperset.cpp | 2 +- ddr/lib/ddr-ir/CMakeLists.txt | 2 +- ddr/lib/ddr-ir/ClassType.cpp | 2 +- ddr/lib/ddr-ir/ClassUDT.cpp | 2 +- ddr/lib/ddr-ir/EnumMember.cpp | 2 +- ddr/lib/ddr-ir/EnumUDT.cpp | 2 +- ddr/lib/ddr-ir/Field.cpp | 2 +- ddr/lib/ddr-ir/Macro.cpp | 2 +- ddr/lib/ddr-ir/Makefile | 2 +- ddr/lib/ddr-ir/Members.cpp | 2 +- ddr/lib/ddr-ir/Modifiers.cpp | 2 +- ddr/lib/ddr-ir/NamespaceUDT.cpp | 2 +- ddr/lib/ddr-ir/Symbol_IR.cpp | 2 +- ddr/lib/ddr-ir/TextFile.cpp | 2 +- ddr/lib/ddr-ir/Type.cpp | 2 +- ddr/lib/ddr-ir/TypePrinter.cpp | 2 +- ddr/lib/ddr-ir/TypedefUDT.cpp | 2 +- ddr/lib/ddr-ir/UDT.cpp | 2 +- ddr/lib/ddr-ir/UnionUDT.cpp | 2 +- ddr/lib/ddr-macros/CMakeLists.txt | 2 +- ddr/lib/ddr-macros/MacroInfo.cpp | 2 +- ddr/lib/ddr-macros/MacroTool.cpp | 2 +- ddr/lib/ddr-macros/Makefile | 2 +- ddr/lib/ddr-scanner/CMakeLists.txt | 2 +- ddr/lib/ddr-scanner/Makefile | 2 +- ddr/lib/ddr-scanner/Scanner.cpp | 2 +- ddr/lib/ddr-scanner/dwarf/AixSymbolTableParser.cpp | 2 +- ddr/lib/ddr-scanner/dwarf/DwarfFunctions.cpp | 2 +- ddr/lib/ddr-scanner/dwarf/DwarfParser.cpp | 2 +- ddr/lib/ddr-scanner/dwarf/DwarfScanner.cpp | 2 +- ddr/lib/ddr-scanner/pdb/PdbScanner.cpp | 2 +- ddr/test/CMakeLists.txt | 2 +- ddr/test/makefile | 2 +- ddr/test/map_to_type/map_to_type.hpp | 2 +- ddr/test/sample1.cpp | 2 +- ddr/test/sample2.cpp | 2 +- ddr/test/sample3.cpp | 2 +- ddr/test/sample4.c | 2 +- ddr/test/test.cpp | 2 +- ddr/test/testHeader.h | 2 +- ddr/test/test_subdir/testFileInSubDir.cpp | 2 +- ddr/test/test_subdir/testHeaderInSubDir.hpp | 2 +- ddr/tools/CMakeLists.txt | 2 +- ddr/tools/Makefile | 2 +- ddr/tools/blob_reader/CMakeLists.txt | 2 +- ddr/tools/blob_reader/Makefile | 2 +- ddr/tools/blob_reader/blob_reader.cpp | 2 +- ddr/tools/ddrgen/CMakeLists.txt | 2 +- ddr/tools/ddrgen/Makefile | 2 +- ddr/tools/ddrgen/ddrgen.cpp | 2 +- ddr/tools/getmacros | 2 +- ddr_artifacts.mk | 2 +- doc/BuildingWithCMake.md | 2 +- doc/CodingStandard.md | 2 +- doc/GitCrashCourse.md | 2 +- doc/GuideForCommitters.md | 2 +- doc/SupportedC++Features.md | 2 +- doc/compiler/CompilerOptions.md | 2 +- doc/compiler/Contributing.md | 2 +- doc/compiler/ProblemDetermination.md | 2 +- doc/compiler/README.md | 2 +- doc/compiler/debug/DebugCounters.md | 3 +-- doc/compiler/extensible_classes/Extensible_Classes.md | 2 +- .../extensible_classes/Extensible_Classes_in_OMR.md | 2 +- doc/compiler/il/ExtendingTrees.md | 2 +- doc/compiler/il/GlRegDeps.md | 2 +- doc/compiler/il/ILOpcodes.md | 2 +- doc/compiler/il/IntroToTrees.md | 2 +- doc/compiler/il/MainlineAndOutOfLineCode.md | 2 +- doc/compiler/il/Node.md | 2 +- doc/compiler/il/SymbolsSymrefsAliasing.md | 2 +- doc/compiler/optimizer/Inliner.md | 2 +- doc/compiler/osr/OSR.md | 2 +- doc/compiler/regular_expression/Regular_Expression.md | 2 +- doc/compiler/runtime/CodeMetaData.md | 2 +- doc/compiler/runtime/ELFGenerator.md | 2 +- doc/compiler/tril/TrilLanguageReference.md | 2 +- doc/compiler/x/OpCodeEncoding.md | 2 +- doc/ddr.md | 2 +- doc/ddr/DDR.md | 2 +- doc/diagnostics/CallingConventions.md | 2 +- example/CMakeLists.txt | 2 +- example/gcmain.cpp | 2 +- example/glue/ArrayletObjectModel.hpp | 2 +- example/glue/CMakeLists.txt | 2 +- example/glue/CollectorLanguageInterfaceImpl.cpp | 2 +- example/glue/CollectorLanguageInterfaceImpl.hpp | 2 +- example/glue/CompactDelegate.hpp | 2 +- example/glue/CompactSchemeFixupObject.cpp | 2 +- example/glue/CompactSchemeFixupObject.hpp | 2 +- example/glue/ConcurrentMarkingDelegate.cpp | 2 +- example/glue/ConcurrentMarkingDelegate.hpp | 2 +- example/glue/ConfigurationDelegate.hpp | 2 +- example/glue/ContractslotScanner.hpp | 2 +- example/glue/EnvironmentDelegate.cpp | 2 +- example/glue/EnvironmentDelegate.hpp | 2 +- example/glue/FrequentObjectsStats.cpp | 2 +- example/glue/FrequentObjectsStats.hpp | 2 +- example/glue/GlobalCollectorDelegate.cpp | 2 +- example/glue/GlobalCollectorDelegate.hpp | 2 +- example/glue/HeapWalkerDelegate.hpp | 2 +- example/glue/LanguageSegregatedAllocationCache.hpp | 2 +- example/glue/LanguageThreadLocalHeap.hpp | 2 +- example/glue/LanguageVMGlue.c | 2 +- example/glue/MarkingDelegate.cpp | 2 +- example/glue/MarkingDelegate.hpp | 2 +- example/glue/MixedObjectModel.hpp | 2 +- example/glue/MixedObjectScanner.hpp | 2 +- example/glue/Object.hpp | 3 +-- example/glue/ObjectAllocationModel.hpp | 2 +- example/glue/ObjectIterator.cpp | 2 +- example/glue/ObjectIterator.hpp | 2 +- example/glue/ObjectModel.hpp | 2 +- example/glue/ObjectModelDelegate.cpp | 2 +- example/glue/ObjectModelDelegate.hpp | 2 +- example/glue/ObjectScannerState.hpp | 2 +- example/glue/Profiling.c | 2 +- example/glue/ScavengerBackOutScanner.hpp | 2 +- example/glue/ScavengerDelegate.cpp | 2 +- example/glue/ScavengerDelegate.hpp | 2 +- example/glue/ScavengerRootScanner.hpp | 2 +- example/glue/StartupManagerImpl.cpp | 2 +- example/glue/StartupManagerImpl.hpp | 2 +- example/glue/UtilGlue.c | 2 +- example/glue/VerboseManagerImpl.cpp | 2 +- example/glue/VerboseManagerImpl.hpp | 2 +- example/glue/configure_includes/configure_aix_ppc.mk | 2 +- example/glue/configure_includes/configure_common.mk | 2 +- example/glue/configure_includes/configure_linux_390.mk | 2 +- .../glue/configure_includes/configure_linux_aarch64.mk | 2 +- example/glue/configure_includes/configure_linux_arm.mk | 2 +- example/glue/configure_includes/configure_linux_ppc.mk | 2 +- example/glue/configure_includes/configure_linux_riscv.mk | 2 +- example/glue/configure_includes/configure_linux_x86.mk | 2 +- example/glue/configure_includes/configure_osx.mk | 2 +- example/glue/configure_includes/configure_win_x86.mk | 2 +- example/glue/configure_includes/configure_zos_390.mk | 2 +- example/glue/objectdescription.h | 2 +- example/glue/omrExampleVM.cpp | 2 +- example/glue/omrExampleVM.hpp | 2 +- example/glue/sizeclasses.h | 2 +- example/makefile | 2 +- fvtest/CMakeLists.txt | 2 +- fvtest/algotest/CMakeLists.txt | 2 +- fvtest/algotest/algoTest.cpp | 2 +- fvtest/algotest/algorithm_test_internal.h | 2 +- fvtest/algotest/avltest.c | 2 +- fvtest/algotest/avltest.lst | 2 +- fvtest/algotest/hashtabletest.c | 2 +- fvtest/algotest/hooksample.hdf | 2 +- fvtest/algotest/hooktest.c | 2 +- fvtest/algotest/main.cpp | 2 +- fvtest/algotest/makefile | 2 +- fvtest/algotest/pooltest.c | 2 +- fvtest/compilertest/CMakeLists.txt | 2 +- fvtest/compilertest/Jit.hpp | 2 +- fvtest/compilertest/Makefile | 2 +- fvtest/compilertest/README.md | 2 +- fvtest/compilertest/build/IWYU_Mappings.imp | 2 +- fvtest/compilertest/build/Makefile | 2 +- fvtest/compilertest/build/files/common.mk | 2 +- fvtest/compilertest/build/files/host/arm.mk | 2 +- fvtest/compilertest/build/files/host/p.mk | 2 +- fvtest/compilertest/build/files/host/x.mk | 2 +- fvtest/compilertest/build/files/host/z.mk | 2 +- fvtest/compilertest/build/files/target/amd64.mk | 2 +- fvtest/compilertest/build/files/target/arm.mk | 2 +- fvtest/compilertest/build/files/target/i386.mk | 2 +- fvtest/compilertest/build/files/target/p.mk | 2 +- fvtest/compilertest/build/files/target/x.mk | 2 +- fvtest/compilertest/build/files/target/z.mk | 2 +- fvtest/compilertest/build/platform/common.mk | 2 +- .../compilertest/build/platform/host/amd64-linux-gcc.mk | 2 +- .../build/platform/host/amd64-linux64-clang.mk | 2 +- .../compilertest/build/platform/host/amd64-linux64-gcc.mk | 2 +- .../compilertest/build/platform/host/amd64-osx-clang.mk | 2 +- fvtest/compilertest/build/platform/host/ia32-linux-gcc.mk | 2 +- .../compilertest/build/platform/host/ppc64-linux64-gcc.mk | 2 +- .../build/platform/host/ppc64le-linux64-gcc.mk | 2 +- .../compilertest/build/platform/host/s390-linux-clang.mk | 2 +- fvtest/compilertest/build/platform/host/s390-linux-gcc.mk | 2 +- .../build/platform/host/s390-linux64-clang.mk | 2 +- .../compilertest/build/platform/host/s390-linux64-gcc.mk | 2 +- fvtest/compilertest/build/platform/target/all.mk | 2 +- fvtest/compilertest/build/rules/common.mk | 2 +- fvtest/compilertest/build/rules/gnu/common.mk | 2 +- fvtest/compilertest/build/rules/gnu/filetypes.mk | 2 +- fvtest/compilertest/build/toolcfg/common.mk | 2 +- fvtest/compilertest/build/toolcfg/gnu/common.mk | 2 +- fvtest/compilertest/build/toolcfg/host/32.mk | 2 +- fvtest/compilertest/build/toolcfg/host/64.mk | 2 +- fvtest/compilertest/build/toolcfg/host/aix.mk | 2 +- fvtest/compilertest/build/toolcfg/host/arm.mk | 2 +- fvtest/compilertest/build/toolcfg/host/linux.mk | 2 +- fvtest/compilertest/build/toolcfg/host/osx.mk | 2 +- fvtest/compilertest/build/toolcfg/host/p.mk | 2 +- fvtest/compilertest/build/toolcfg/host/win.mk | 2 +- fvtest/compilertest/build/toolcfg/host/x.mk | 2 +- fvtest/compilertest/build/toolcfg/host/z.mk | 2 +- fvtest/compilertest/build/toolcfg/host/zos.mk | 2 +- fvtest/compilertest/build/toolcfg/target/32.mk | 2 +- fvtest/compilertest/build/toolcfg/target/64.mk | 2 +- fvtest/compilertest/build/toolcfg/target/arm.mk | 2 +- fvtest/compilertest/build/toolcfg/target/p.mk | 2 +- fvtest/compilertest/build/toolcfg/target/x.mk | 2 +- fvtest/compilertest/build/toolcfg/target/z.mk | 2 +- fvtest/compilertest/compile/Method.hpp | 2 +- fvtest/compilertest/compile/ResolvedMethod.cpp | 2 +- fvtest/compilertest/compile/ResolvedMethod.hpp | 2 +- fvtest/compilertest/control/TestJit.cpp | 2 +- fvtest/compilertest/env/ConcreteFE.hpp | 2 +- fvtest/compilertest/env/FrontEnd.cpp | 2 +- fvtest/compilertest/env/FrontEnd.hpp | 2 +- fvtest/compilertest/env/ObjectModel.hpp | 2 +- fvtest/compilertest/env/TestObjectModel.hpp | 2 +- fvtest/compilertest/ilgen/IlBuilder.hpp | 2 +- fvtest/compilertest/ilgen/IlGeneratorMethodDetails.hpp | 2 +- fvtest/compilertest/ilgen/IlInjector.cpp | 2 +- fvtest/compilertest/ilgen/IlInjector.hpp | 2 +- fvtest/compilertest/ilgen/MethodBuilder.hpp | 2 +- fvtest/compilertest/ilgen/MethodInfo.hpp | 2 +- fvtest/compilertest/ilgen/TestIlBuilder.hpp | 2 +- .../compilertest/ilgen/TestIlGeneratorMethodDetails.cpp | 2 +- .../compilertest/ilgen/TestIlGeneratorMethodDetails.hpp | 2 +- fvtest/compilertest/ilgen/TestMethodBuilder.hpp | 2 +- fvtest/compilertest/iwyu.mk | 2 +- fvtest/compilertest/linter.mk | 2 +- fvtest/compilertest/p/codegen/Evaluator.cpp | 2 +- fvtest/compilertest/p/runtime/AsmUtil.spp | 2 +- fvtest/compilertest/p/runtime/CodeDispatch.spp | 2 +- fvtest/compilertest/p/runtime/CodeSync.cpp | 2 +- fvtest/compilertest/runtime/CodeCacheManager.hpp | 2 +- fvtest/compilertest/runtime/StackAtlasPOD.hpp | 2 +- fvtest/compilertest/runtime/TestCodeCacheManager.cpp | 2 +- fvtest/compilertest/runtime/TestCodeCacheManager.hpp | 2 +- fvtest/compilertest/runtime/TestJitConfig.hpp | 2 +- fvtest/compilertest/testjit.mk | 2 +- fvtest/compilertest/tests/BuilderTest.cpp | 2 +- fvtest/compilertest/tests/BuilderTest.hpp | 2 +- fvtest/compilertest/tests/FooBarTest.cpp | 2 +- fvtest/compilertest/tests/FooBarTest.hpp | 2 +- fvtest/compilertest/tests/LimitFileTest.cpp | 2 +- fvtest/compilertest/tests/LimitFileTest.hpp | 2 +- fvtest/compilertest/tests/LogFileTest.cpp | 2 +- fvtest/compilertest/tests/LogFileTest.hpp | 2 +- fvtest/compilertest/tests/OMRTestEnv.cpp | 2 +- fvtest/compilertest/tests/OMRTestEnv.hpp | 2 +- fvtest/compilertest/tests/OpCodesTest.cpp | 2 +- fvtest/compilertest/tests/OpCodesTest.hpp | 2 +- fvtest/compilertest/tests/OptTestDriver.cpp | 2 +- fvtest/compilertest/tests/OptTestDriver.hpp | 2 +- fvtest/compilertest/tests/OptionSetTest.cpp | 2 +- fvtest/compilertest/tests/OptionSetTest.hpp | 2 +- fvtest/compilertest/tests/PPCOpCodesTest.cpp | 2 +- fvtest/compilertest/tests/PPCOpCodesTest.hpp | 2 +- fvtest/compilertest/tests/Qux2Test.cpp | 2 +- fvtest/compilertest/tests/Qux2Test.hpp | 2 +- fvtest/compilertest/tests/S390OpCodesTest.cpp | 2 +- fvtest/compilertest/tests/S390OpCodesTest.hpp | 2 +- fvtest/compilertest/tests/SimplifierFoldAndTest.cpp | 2 +- fvtest/compilertest/tests/SingleBitContainerTest.cpp | 2 +- fvtest/compilertest/tests/TestDriver.cpp | 2 +- fvtest/compilertest/tests/TestDriver.hpp | 2 +- fvtest/compilertest/tests/X86OpCodesTest.cpp | 2 +- fvtest/compilertest/tests/X86OpCodesTest.hpp | 2 +- fvtest/compilertest/tests/injectors/BarIlInjector.cpp | 2 +- fvtest/compilertest/tests/injectors/BarIlInjector.hpp | 2 +- .../compilertest/tests/injectors/BinaryOpIlInjector.cpp | 2 +- .../compilertest/tests/injectors/BinaryOpIlInjector.hpp | 2 +- fvtest/compilertest/tests/injectors/CallIlInjector.cpp | 2 +- fvtest/compilertest/tests/injectors/CallIlInjector.hpp | 2 +- .../tests/injectors/ChildlessUnaryOpIlInjector.cpp | 2 +- .../tests/injectors/ChildlessUnaryOpIlInjector.hpp | 2 +- .../tests/injectors/CmpBranchOpIlInjector.cpp | 2 +- .../tests/injectors/CmpBranchOpIlInjector.hpp | 2 +- fvtest/compilertest/tests/injectors/FooIlInjector.cpp | 2 +- fvtest/compilertest/tests/injectors/FooIlInjector.hpp | 2 +- .../tests/injectors/IndirectLoadIlInjector.cpp | 2 +- .../tests/injectors/IndirectLoadIlInjector.hpp | 2 +- .../tests/injectors/IndirectStoreIlInjector.cpp | 2 +- .../tests/injectors/IndirectStoreIlInjector.hpp | 2 +- fvtest/compilertest/tests/injectors/OpIlInjector.cpp | 2 +- fvtest/compilertest/tests/injectors/OpIlInjector.hpp | 2 +- fvtest/compilertest/tests/injectors/Qux2IlInjector.cpp | 2 +- fvtest/compilertest/tests/injectors/Qux2IlInjector.hpp | 2 +- .../compilertest/tests/injectors/SelectOpIlInjector.cpp | 2 +- .../compilertest/tests/injectors/SelectOpIlInjector.hpp | 2 +- fvtest/compilertest/tests/injectors/StoreOpIlInjector.cpp | 2 +- fvtest/compilertest/tests/injectors/StoreOpIlInjector.hpp | 2 +- fvtest/compilertest/tests/injectors/UnaryOpIlInjector.cpp | 2 +- fvtest/compilertest/tests/injectors/UnaryOpIlInjector.hpp | 2 +- fvtest/compilertest/tests/main.cpp | 2 +- fvtest/compilertest/x/codegen/Evaluator.cpp | 2 +- fvtest/compilertest/z/codegen/Evaluator.cpp | 2 +- fvtest/compilertriltest/ArithmeticTest.cpp | 2 +- fvtest/compilertriltest/ArrayTest.cpp | 2 +- fvtest/compilertriltest/BitPermuteTest.cpp | 2 +- fvtest/compilertriltest/CMakeLists.txt | 2 +- fvtest/compilertriltest/CallTest.cpp | 2 +- fvtest/compilertriltest/CompareTest.cpp | 2 +- fvtest/compilertriltest/ILValidatorTest.cpp | 2 +- fvtest/compilertriltest/IfxcmpgeReductionTest.cpp | 2 +- fvtest/compilertriltest/JitTest.cpp | 2 +- fvtest/compilertriltest/JitTest.hpp | 2 +- fvtest/compilertriltest/JitTestUtilitiesTest.cpp | 2 +- fvtest/compilertriltest/LinkageTest.cpp | 2 +- fvtest/compilertriltest/LogicalTest.cpp | 2 +- fvtest/compilertriltest/LongAndAsRotateTest.cpp | 2 +- fvtest/compilertriltest/MaxMinTest.cpp | 2 +- fvtest/compilertriltest/MinimalTest.cpp | 2 +- fvtest/compilertriltest/MockStrategyTest.cpp | 2 +- fvtest/compilertriltest/OpCodeTest.hpp | 2 +- fvtest/compilertriltest/SelectTest.cpp | 2 +- fvtest/compilertriltest/SharedVerifiers.hpp | 2 +- fvtest/compilertriltest/ShiftAndRotateTest.cpp | 2 +- fvtest/compilertriltest/SimplifierFoldAbsNegTest.cpp | 2 +- fvtest/compilertriltest/SimplifierFoldAndTest.cpp | 2 +- fvtest/compilertriltest/TypeConversionTest.cpp | 2 +- fvtest/compilertriltest/VectorTest.cpp | 2 +- fvtest/compilertriltest/main.cpp | 2 +- fvtest/compilerunittest/CCData.cpp | 2 +- fvtest/compilerunittest/CMakeLists.txt | 2 +- fvtest/compilerunittest/CodeGenTest.cpp | 2 +- fvtest/compilerunittest/CodeGenTest.hpp | 2 +- fvtest/compilerunittest/CompilerUnitTest.hpp | 2 +- fvtest/compilerunittest/aarch64/BinaryEncoder.cpp | 2 +- .../abstractinterpreter/AbsInterpreterTest.cpp | 2 +- .../abstractinterpreter/AbsInterpreterTest.hpp | 2 +- fvtest/compilerunittest/main.cpp | 2 +- fvtest/compilerunittest/p/BinaryEncoder.cpp | 2 +- fvtest/compilerunittest/p/MemoryReferenceExpansion.cpp | 2 +- fvtest/compilerunittest/p/Peephole.cpp | 2 +- fvtest/compilerunittest/p/Util.hpp | 2 +- fvtest/compilerunittest/x/BinaryEncoder.cpp | 2 +- fvtest/coretest/CMakeLists.txt | 2 +- fvtest/coretest/TestBytes.cpp | 2 +- fvtest/coretest/TestIntrusiveList.cpp | 2 +- fvtest/coretest/TestTypeTraits.cpp | 2 +- fvtest/coretest/main.cpp | 3 +-- fvtest/gc_api_test/CMakeLists.txt | 2 +- fvtest/gc_api_test/main.cpp | 3 +-- fvtest/gctest/CMakeLists.txt | 2 +- fvtest/gctest/GCConfigObjectTable.cpp | 2 +- fvtest/gctest/GCConfigObjectTable.hpp | 2 +- fvtest/gctest/GCConfigTest.cpp | 2 +- fvtest/gctest/GCConfigTest.hpp | 2 +- fvtest/gctest/StartupManagerTestExample.cpp | 2 +- fvtest/gctest/StartupManagerTestExample.hpp | 2 +- fvtest/gctest/TestHeapRegionStateTable.cpp | 2 +- fvtest/gctest/configuration/gencon_GC_backout_config.xml | 2 +- fvtest/gctest/configuration/gencon_GC_config.xml | 2 +- fvtest/gctest/configuration/global_GC_config.xml | 2 +- fvtest/gctest/configuration/optavgpause_GC_config.xml | 2 +- fvtest/gctest/configuration/sample_GC_config.xml | 2 +- .../gctest/configuration/scavenger_GC_backout_config.xml | 2 +- fvtest/gctest/configuration/scavenger_GC_config.xml | 2 +- fvtest/gctest/configuration/test_system_gc.xml | 2 +- fvtest/gctest/gcTestHelpers.cpp | 2 +- fvtest/gctest/gcTestHelpers.hpp | 2 +- fvtest/gctest/main.cpp | 2 +- fvtest/gctest/makefile | 2 +- fvtest/jitbuildertest/AnonymousTest.cpp | 2 +- fvtest/jitbuildertest/CMakeLists.txt | 2 +- fvtest/jitbuildertest/CallReturnTest.cpp | 2 +- fvtest/jitbuildertest/ControlFlowTest.cpp | 2 +- fvtest/jitbuildertest/ConvertBitsTest.cpp | 2 +- fvtest/jitbuildertest/FieldAddressTest.cpp | 2 +- fvtest/jitbuildertest/FieldNameTest.cpp | 2 +- fvtest/jitbuildertest/GlobalTest.cpp | 2 +- fvtest/jitbuildertest/IfThenElseTest.cpp | 2 +- fvtest/jitbuildertest/JBTestUtil.hpp | 2 +- fvtest/jitbuildertest/Makefile | 2 +- fvtest/jitbuildertest/NegateTest.cpp | 2 +- fvtest/jitbuildertest/SelectTest.cpp | 2 +- fvtest/jitbuildertest/SystemLinkageTest.cpp | 2 +- fvtest/jitbuildertest/UnionTest.cpp | 2 +- fvtest/jitbuildertest/UnsignedDivRemTest.cpp | 2 +- fvtest/jitbuildertest/WorklistTest.cpp | 2 +- fvtest/jitbuildertest/main.cpp | 2 +- fvtest/jitbuildertest/selftest.cpp | 2 +- fvtest/lljbtest/CMakeLists.txt | 2 +- fvtest/lljbtest/add.cpp | 2 +- fvtest/lljbtest/arrays.cpp | 2 +- fvtest/lljbtest/conditional.cpp | 2 +- fvtest/lljbtest/div.cpp | 2 +- fvtest/lljbtest/doubles.cpp | 2 +- fvtest/lljbtest/floats.cpp | 2 +- fvtest/lljbtest/function_call.cpp | 2 +- fvtest/lljbtest/lljb_run.cpp | 2 +- fvtest/lljbtest/loops.cpp | 2 +- fvtest/lljbtest/mandelbrot.cpp | 2 +- fvtest/lljbtest/md5.cpp | 2 +- fvtest/lljbtest/mul.cpp | 2 +- fvtest/lljbtest/print_string.cpp | 2 +- fvtest/lljbtest/structs.cpp | 2 +- fvtest/lljbtest/sub.cpp | 2 +- fvtest/lljbtest/ternary.cpp | 2 +- fvtest/lljbtest/time.cpp | 2 +- fvtest/lljbtest/unions.cpp | 2 +- fvtest/omrGtestGlue/CMakeLists.txt | 2 +- fvtest/omrGtestGlue/argmain.cpp | 2 +- fvtest/omrGtestGlue/iconvInitialization.cpp | 2 +- fvtest/omrGtestGlue/makefile | 2 +- fvtest/omrGtestGlue/omrGtest.cpp | 2 +- fvtest/omrGtestGlue/omrTest.h | 2 +- fvtest/omrtest.mk | 2 +- fvtest/porttest/CMakeLists.txt | 2 +- fvtest/porttest/aixbaddep/aixbaddep.exportlist | 2 +- fvtest/porttest/aixbaddep/dummy.imp | 2 +- fvtest/porttest/aixbaddep/makefile | 2 +- fvtest/porttest/aixbaddep/sltest.c | 2 +- fvtest/porttest/cudaBasic.cpp | 2 +- fvtest/porttest/cudaError.cpp | 2 +- fvtest/porttest/cudaEvent.cpp | 2 +- fvtest/porttest/cudaInvalid.cpp | 2 +- fvtest/porttest/cudaLaunch.cpp | 2 +- fvtest/porttest/cudaLink.cpp | 2 +- fvtest/porttest/cudaMemory.cpp | 2 +- fvtest/porttest/cudaModule.cpp | 2 +- fvtest/porttest/cudaPeer.cpp | 2 +- fvtest/porttest/cudaProperty.cpp | 2 +- fvtest/porttest/cudaPtx.cpp | 2 +- fvtest/porttest/cudaStream.cpp | 2 +- fvtest/porttest/cudaTests.cpp | 2 +- fvtest/porttest/cudaTests.hpp | 2 +- fvtest/porttest/fileTest.cpp | 2 +- fvtest/porttest/heapTest.cpp | 2 +- fvtest/porttest/hypervisorTest.cpp | 2 +- fvtest/porttest/main.cpp | 2 +- fvtest/porttest/makefile | 2 +- fvtest/porttest/memTest.cpp | 2 +- fvtest/porttest/omrdumpTest.cpp | 2 +- fvtest/porttest/omrerrorTest.cpp | 2 +- fvtest/porttest/omrfileTest.cpp | 2 +- fvtest/porttest/omrfileTest.h | 2 +- fvtest/porttest/omrfilestreamTest.cpp | 2 +- fvtest/porttest/omrheapTest.cpp | 2 +- fvtest/porttest/omrintrospectTest.cpp | 2 +- fvtest/porttest/omrmemTest.cpp | 2 +- fvtest/porttest/omrmmapTest.cpp | 2 +- fvtest/porttest/omrportTest.cpp | 2 +- fvtest/porttest/omrsignalExtendedTest.cpp | 2 +- fvtest/porttest/omrsignalTest.cpp | 2 +- fvtest/porttest/omrslTest.cpp | 2 +- fvtest/porttest/omrsockTest.cpp | 2 +- fvtest/porttest/omrstrTest.cpp | 2 +- fvtest/porttest/omrtimeTest.cpp | 2 +- fvtest/porttest/omrttyExtendedTest.cpp | 2 +- fvtest/porttest/omrttyTest.cpp | 2 +- fvtest/porttest/omrvmemTest.cpp | 2 +- fvtest/porttest/portTestHelpers.hpp | 2 +- fvtest/porttest/si.cpp | 2 +- fvtest/porttest/si_numcpusTest.cpp | 2 +- fvtest/porttest/sltestlib/makefile | 2 +- fvtest/porttest/sltestlib/sltest.c | 2 +- fvtest/porttest/sltestlib/sltestlib.exportlist | 2 +- fvtest/porttest/sltestlib31/sltest.cpp | 2 +- fvtest/porttest/sltestlib31/sltestlib31.exportlist | 2 +- fvtest/porttest/testHelpers.cpp | 2 +- fvtest/porttest/testHelpers.hpp | 2 +- fvtest/porttest/testProcessHelpers.cpp | 2 +- fvtest/porttest/testProcessHelpers.hpp | 2 +- fvtest/rastest/CMakeLists.txt | 2 +- fvtest/rastest/agentNegativeTest.cpp | 2 +- fvtest/rastest/agentTest.cpp | 2 +- fvtest/rastest/bindthreadagent.c | 2 +- fvtest/rastest/bindthreadagent.mk | 2 +- fvtest/rastest/cpuLoadAgent.c | 2 +- fvtest/rastest/cpuLoadAgent.mk | 2 +- fvtest/rastest/invalidAgentMissingOnLoad.c | 2 +- fvtest/rastest/invalidAgentMissingOnLoad.def | 2 +- fvtest/rastest/invalidAgentMissingOnLoad.exportlist | 2 +- fvtest/rastest/invalidAgentMissingOnLoad.mk | 2 +- fvtest/rastest/invalidAgentMissingOnUnload.c | 2 +- fvtest/rastest/invalidAgentMissingOnUnload.def | 2 +- fvtest/rastest/invalidAgentMissingOnUnload.exportlist | 2 +- fvtest/rastest/invalidAgentMissingOnUnload.mk | 2 +- fvtest/rastest/invalidAgentReturnError.c | 2 +- fvtest/rastest/invalidAgentReturnError.mk | 2 +- fvtest/rastest/main.cpp | 2 +- fvtest/rastest/makefile | 2 +- fvtest/rastest/memoryCategoriesTest.cpp | 2 +- fvtest/rastest/memorycategoriesagent.c | 2 +- fvtest/rastest/memorycategoriesagent.mk | 2 +- fvtest/rastest/methodDictionaryTest.cpp | 2 +- fvtest/rastest/omr_test.tdf | 2 +- fvtest/rastest/omragent.def | 2 +- fvtest/rastest/omragent.exportlist | 2 +- fvtest/rastest/omrrastest.mk | 2 +- fvtest/rastest/omrsubscribertest.mk | 2 +- fvtest/rastest/omrtraceoptiontest.mk | 2 +- fvtest/rastest/rasTestHelpers.cpp | 2 +- fvtest/rastest/rasTestHelpers.hpp | 2 +- fvtest/rastest/rastest_include.mk | 2 +- fvtest/rastest/sampleSubscriber.c | 2 +- fvtest/rastest/sampleSubscriber.mk | 2 +- fvtest/rastest/subscriberAgent.c | 2 +- fvtest/rastest/subscriberAgent.mk | 2 +- fvtest/rastest/subscriberAgentWithJ9thread.c | 2 +- fvtest/rastest/subscriberAgentWithJ9thread.mk | 2 +- fvtest/rastest/subscriberForkTest.cpp | 2 +- fvtest/rastest/subscriberTest.cpp | 2 +- fvtest/rastest/traceLifecycleTest.cpp | 2 +- fvtest/rastest/traceLogTest.cpp | 2 +- fvtest/rastest/traceNotStartedAgent.c | 2 +- fvtest/rastest/traceNotStartedAgent.mk | 2 +- fvtest/rastest/traceOptionAgent.c | 2 +- fvtest/rastest/traceOptionAgent.mk | 2 +- fvtest/rastest/traceOptionTest.cpp | 2 +- fvtest/rastest/traceRecordHelpers.cpp | 2 +- fvtest/rastest/traceTest.cpp | 2 +- fvtest/rastest/traceagent.c | 2 +- fvtest/rastest/traceagent.mk | 2 +- fvtest/sigtest/CMakeLists.txt | 2 +- fvtest/sigtest/main.cpp | 2 +- fvtest/sigtest/makefile | 2 +- fvtest/sigtest/sigTest.cpp | 2 +- fvtest/sigtest/sigTestHelpers.cpp | 2 +- fvtest/sigtest/sigTestHelpers.hpp | 2 +- fvtest/threadextendedtest/CMakeLists.txt | 2 +- fvtest/threadextendedtest/makefile | 2 +- fvtest/threadextendedtest/processTimeTest.cpp | 2 +- fvtest/threadextendedtest/threadCpuTimeTest.cpp | 2 +- fvtest/threadextendedtest/threadExtendedTestHelpers.cpp | 2 +- fvtest/threadextendedtest/threadExtendedTestHelpers.hpp | 2 +- fvtest/threadextendedtest/threadExtendedTestMain.cpp | 2 +- fvtest/threadextendedtest/timeBaseTest.cpp | 2 +- fvtest/threadtest/CEnterExit.cpp | 2 +- fvtest/threadtest/CEnterExit.hpp | 2 +- fvtest/threadtest/CEnterExitLooper.hpp | 2 +- fvtest/threadtest/CMakeLists.txt | 2 +- fvtest/threadtest/CMonitor.cpp | 2 +- fvtest/threadtest/CMonitor.hpp | 2 +- fvtest/threadtest/CNotifier.hpp | 2 +- fvtest/threadtest/CThread.cpp | 2 +- fvtest/threadtest/CThread.hpp | 2 +- fvtest/threadtest/CWaitNotifyLooper.hpp | 2 +- fvtest/threadtest/CWaiter.hpp | 2 +- fvtest/threadtest/abortTest.cpp | 2 +- fvtest/threadtest/createTest.cpp | 2 +- fvtest/threadtest/createTestHelper.h | 2 +- fvtest/threadtest/forkResetRWMutexTest.cpp | 2 +- fvtest/threadtest/forkResetTest.cpp | 2 +- fvtest/threadtest/joinTest.cpp | 2 +- fvtest/threadtest/keyDestructorTest.cpp | 2 +- fvtest/threadtest/lockedMonitorCountTest.cpp | 2 +- fvtest/threadtest/main.cpp | 2 +- fvtest/threadtest/makefile | 2 +- fvtest/threadtest/ospriority.cpp | 2 +- fvtest/threadtest/priorityInterruptTest.cpp | 2 +- fvtest/threadtest/rwMutexTest.cpp | 2 +- fvtest/threadtest/sanityTest.cpp | 2 +- fvtest/threadtest/sanityTestHelper.cpp | 2 +- fvtest/threadtest/sanityTestHelper.hpp | 2 +- fvtest/threadtest/testHelper.hpp | 2 +- fvtest/threadtest/threadTestHelp.cpp | 2 +- fvtest/threadtest/threadTestHelp.h | 2 +- fvtest/threadtest/threadTestLib.hpp | 2 +- fvtest/tril/CMakeLists.txt | 2 +- fvtest/tril/README.md | 2 +- fvtest/tril/examples/CMakeLists.txt | 2 +- fvtest/tril/examples/incordec/CMakeLists.txt | 2 +- fvtest/tril/examples/incordec/incordec.tril | 2 +- fvtest/tril/examples/incordec/main.cpp | 2 +- fvtest/tril/examples/mandelbrot/CMakeLists.txt | 2 +- fvtest/tril/examples/mandelbrot/main.cpp | 2 +- fvtest/tril/examples/mandelbrot/mandelbrot.tril | 2 +- fvtest/tril/test/ASTTest.cpp | 2 +- fvtest/tril/test/CMakeLists.txt | 2 +- fvtest/tril/test/CompileTest.cpp | 2 +- fvtest/tril/test/IlGenTest.cpp | 2 +- fvtest/tril/test/JitTest.hpp | 2 +- fvtest/tril/test/MethodInfoTest.cpp | 2 +- fvtest/tril/test/ParserTest.cpp | 2 +- fvtest/tril/test/main.cpp | 2 +- fvtest/tril/tril/CMakeLists.txt | 2 +- fvtest/tril/tril/CallConverter.cpp | 2 +- fvtest/tril/tril/CallConverter.hpp | 2 +- fvtest/tril/tril/GenericNodeConverter.cpp | 2 +- fvtest/tril/tril/GenericNodeConverter.hpp | 2 +- fvtest/tril/tril/ast.cpp | 2 +- fvtest/tril/tril/ast.h | 2 +- fvtest/tril/tril/ast.hpp | 2 +- fvtest/tril/tril/compiler.cpp | 2 +- fvtest/tril/tril/compiler_util.hpp | 2 +- fvtest/tril/tril/converter.hpp | 2 +- fvtest/tril/tril/default_compiler.hpp | 2 +- fvtest/tril/tril/ilgen.cpp | 2 +- fvtest/tril/tril/ilgen.hpp | 2 +- fvtest/tril/tril/method_compiler.hpp | 2 +- fvtest/tril/tril/method_info.hpp | 2 +- fvtest/tril/tril/parser.cpp | 2 +- fvtest/tril/tril/simple_compiler.cpp | 2 +- fvtest/tril/tril/simple_compiler.hpp | 2 +- fvtest/tril/tril/state.hpp | 2 +- fvtest/util/CMakeLists.txt | 2 +- fvtest/util/makefile | 2 +- fvtest/util/omrTestHelpers.h | 2 +- fvtest/util/printerrorhelper.cpp | 2 +- fvtest/util/testEnvironment.hpp | 2 +- fvtest/util/testvmhelper.cpp | 2 +- fvtest/utiltest/CMakeLists.txt | 2 +- fvtest/utiltest/main.cpp | 2 +- fvtest/utiltest/makefile | 2 +- fvtest/vmtest/CMakeLists.txt | 2 +- fvtest/vmtest/main.cpp | 2 +- fvtest/vmtest/makefile | 2 +- fvtest/vmtest/vmForkTest.cpp | 2 +- gc/CMakeLists.txt | 2 +- gc/api/CMakeLists.txt | 2 +- gc/base/AddressOrderedListPopulator.cpp | 2 +- gc/base/AddressOrderedListPopulator.hpp | 2 +- gc/base/AllocateDescription.hpp | 2 +- gc/base/AllocateInitialization.hpp | 2 +- gc/base/AllocationContext.cpp | 2 +- gc/base/AllocationContext.hpp | 2 +- gc/base/AllocationInterfaceGeneric.cpp | 2 +- gc/base/AllocationInterfaceGeneric.hpp | 2 +- gc/base/ArrayObjectModel.hpp | 2 +- gc/base/AtomicOperations.hpp | 2 +- gc/base/Base.hpp | 2 +- gc/base/BaseNonVirtual.hpp | 2 +- gc/base/BaseVirtual.cpp | 2 +- gc/base/BaseVirtual.hpp | 2 +- gc/base/Bits.hpp | 2 +- gc/base/BumpAllocatedListPopulator.cpp | 2 +- gc/base/BumpAllocatedListPopulator.hpp | 2 +- gc/base/CardCleaner.hpp | 2 +- gc/base/CardTable.cpp | 2 +- gc/base/CardTable.hpp | 2 +- gc/base/Collector.cpp | 2 +- gc/base/Collector.hpp | 2 +- gc/base/CollectorLanguageInterface.hpp | 2 +- gc/base/ConcurrentSafepointCallback.hpp | 2 +- gc/base/Configuration.cpp | 2 +- gc/base/Configuration.hpp | 2 +- gc/base/CopyScanCache.hpp | 2 +- gc/base/CycleState.hpp | 2 +- gc/base/Debug.hpp | 2 +- gc/base/EmptyListPopulator.cpp | 2 +- gc/base/EmptyListPopulator.hpp | 2 +- gc/base/EnvironmentBase.cpp | 2 +- gc/base/EnvironmentBase.hpp | 2 +- gc/base/Forge.cpp | 2 +- gc/base/Forge.hpp | 2 +- gc/base/GCCode.cpp | 2 +- gc/base/GCCode.hpp | 2 +- gc/base/GCExtensionsBase.cpp | 2 +- gc/base/GCExtensionsBase.hpp | 2 +- gc/base/GlobalAllocationManager.cpp | 2 +- gc/base/GlobalAllocationManager.hpp | 2 +- gc/base/GlobalCollector.cpp | 2 +- gc/base/GlobalCollector.hpp | 2 +- gc/base/Heap.cpp | 2 +- gc/base/Heap.hpp | 2 +- gc/base/HeapLinkedFreeHeader.hpp | 2 +- gc/base/HeapMap.cpp | 2 +- gc/base/HeapMap.hpp | 2 +- gc/base/HeapMapIterator.cpp | 2 +- gc/base/HeapMapIterator.hpp | 2 +- gc/base/HeapMapWordIterator.hpp | 2 +- gc/base/HeapMemorySubSpaceIterator.cpp | 2 +- gc/base/HeapMemorySubSpaceIterator.hpp | 2 +- gc/base/HeapRegionDescriptor.cpp | 2 +- gc/base/HeapRegionDescriptor.hpp | 2 +- gc/base/HeapRegionIterator.cpp | 2 +- gc/base/HeapRegionIterator.hpp | 2 +- gc/base/HeapRegionList.hpp | 2 +- gc/base/HeapRegionManager.cpp | 2 +- gc/base/HeapRegionManager.hpp | 2 +- gc/base/HeapRegionManagerTarok.cpp | 2 +- gc/base/HeapRegionManagerTarok.hpp | 2 +- gc/base/HeapSplit.cpp | 2 +- gc/base/HeapSplit.hpp | 2 +- gc/base/HeapVirtualMemory.cpp | 2 +- gc/base/HeapVirtualMemory.hpp | 2 +- gc/base/IndexableObjectScanner.hpp | 2 +- gc/base/InitializationParameters.hpp | 2 +- gc/base/LightweightNonReentrantLock.cpp | 2 +- gc/base/LightweightNonReentrantLock.hpp | 2 +- gc/base/LightweightNonReentrantRWLock.cpp | 2 +- gc/base/LightweightNonReentrantRWLock.hpp | 2 +- gc/base/Lock.hpp | 2 +- gc/base/MainGCThread.cpp | 2 +- gc/base/MainGCThread.hpp | 2 +- gc/base/MarkMap.cpp | 2 +- gc/base/MarkMap.hpp | 2 +- gc/base/MarkMapSegmentChunkIterator.cpp | 2 +- gc/base/MarkMapSegmentChunkIterator.hpp | 2 +- gc/base/MarkedObjectPopulator.cpp | 2 +- gc/base/MarkedObjectPopulator.hpp | 2 +- gc/base/MarkingScheme.cpp | 2 +- gc/base/MarkingScheme.hpp | 2 +- gc/base/Math.cpp | 2 +- gc/base/Math.hpp | 2 +- gc/base/MemcheckWrapper.cpp | 2 +- gc/base/MemcheckWrapper.hpp | 2 +- gc/base/MemoryHandle.hpp | 2 +- gc/base/MemoryManager.cpp | 2 +- gc/base/MemoryManager.hpp | 2 +- gc/base/MemoryPool.cpp | 2 +- gc/base/MemoryPool.hpp | 2 +- gc/base/MemoryPoolAddressOrderedList.cpp | 2 +- gc/base/MemoryPoolAddressOrderedList.hpp | 2 +- gc/base/MemoryPoolAddressOrderedListBase.cpp | 2 +- gc/base/MemoryPoolAddressOrderedListBase.hpp | 2 +- gc/base/MemoryPoolBumpPointer.cpp | 2 +- gc/base/MemoryPoolBumpPointer.hpp | 2 +- gc/base/MemoryPoolLargeObjects.cpp | 2 +- gc/base/MemoryPoolLargeObjects.hpp | 2 +- gc/base/MemoryPoolSplitAddressOrderedList.cpp | 2 +- gc/base/MemoryPoolSplitAddressOrderedList.hpp | 2 +- gc/base/MemoryPoolSplitAddressOrderedListBase.cpp | 2 +- gc/base/MemoryPoolSplitAddressOrderedListBase.hpp | 2 +- gc/base/MemorySpace.cpp | 2 +- gc/base/MemorySpace.hpp | 2 +- gc/base/MemorySubSpace.cpp | 2 +- gc/base/MemorySubSpace.hpp | 2 +- gc/base/MemorySubSpaceChildIterator.cpp | 2 +- gc/base/MemorySubSpaceChildIterator.hpp | 2 +- gc/base/MemorySubSpaceFlat.cpp | 2 +- gc/base/MemorySubSpaceFlat.hpp | 2 +- gc/base/MemorySubSpaceGenerational.cpp | 2 +- gc/base/MemorySubSpaceGenerational.hpp | 2 +- gc/base/MemorySubSpaceGeneric.cpp | 2 +- gc/base/MemorySubSpaceGeneric.hpp | 2 +- gc/base/MemorySubSpacePoolIterator.cpp | 2 +- gc/base/MemorySubSpacePoolIterator.hpp | 2 +- gc/base/MemorySubSpaceRegionIterator.cpp | 2 +- gc/base/MemorySubSpaceRegionIterator.hpp | 2 +- gc/base/MemorySubSpaceSemiSpace.cpp | 2 +- gc/base/MemorySubSpaceSemiSpace.hpp | 2 +- gc/base/MemorySubSpaceUniSpace.cpp | 2 +- gc/base/MemorySubSpaceUniSpace.hpp | 2 +- gc/base/ModronAssertions.cpp | 2 +- gc/base/ModronAssertions.h | 2 +- gc/base/NUMAManager.cpp | 2 +- gc/base/NUMAManager.hpp | 2 +- gc/base/NonVirtualMemory.cpp | 2 +- gc/base/NonVirtualMemory.hpp | 2 +- gc/base/OMRVMInterface.cpp | 2 +- gc/base/OMRVMInterface.hpp | 2 +- gc/base/OMRVMThreadInterface.cpp | 2 +- gc/base/OMRVMThreadInterface.hpp | 2 +- gc/base/ObjectAllocationInterface.cpp | 2 +- gc/base/ObjectAllocationInterface.hpp | 2 +- gc/base/ObjectHeapBufferedIterator.cpp | 2 +- gc/base/ObjectHeapBufferedIterator.hpp | 2 +- gc/base/ObjectHeapBufferedIteratorPopulator.hpp | 2 +- gc/base/ObjectHeapIteratorAddressOrderedList.cpp | 2 +- gc/base/ObjectHeapIteratorAddressOrderedList.hpp | 2 +- gc/base/ObjectMap.cpp | 2 +- gc/base/ObjectMap.hpp | 2 +- gc/base/ObjectModelBase.hpp | 2 +- gc/base/ObjectScanner.hpp | 2 +- gc/base/Packet.cpp | 2 +- gc/base/Packet.hpp | 2 +- gc/base/PacketList.cpp | 2 +- gc/base/PacketList.hpp | 2 +- gc/base/ParallelDispatcher.cpp | 2 +- gc/base/ParallelDispatcher.hpp | 2 +- gc/base/ParallelHeapWalker.cpp | 2 +- gc/base/ParallelHeapWalker.hpp | 2 +- gc/base/ParallelMarkTask.cpp | 2 +- gc/base/ParallelMarkTask.hpp | 2 +- gc/base/ParallelObjectHeapIterator.cpp | 2 +- gc/base/ParallelObjectHeapIterator.hpp | 2 +- gc/base/ParallelSweepChunk.hpp | 2 +- gc/base/ParallelTask.cpp | 2 +- gc/base/ParallelTask.hpp | 2 +- gc/base/PhysicalArena.cpp | 2 +- gc/base/PhysicalArena.hpp | 2 +- gc/base/PhysicalArenaRegionBased.cpp | 2 +- gc/base/PhysicalArenaRegionBased.hpp | 2 +- gc/base/PhysicalArenaVirtualMemory.cpp | 2 +- gc/base/PhysicalArenaVirtualMemory.hpp | 2 +- gc/base/PhysicalSubArena.cpp | 2 +- gc/base/PhysicalSubArena.hpp | 2 +- gc/base/PhysicalSubArenaRegionBased.cpp | 2 +- gc/base/PhysicalSubArenaRegionBased.hpp | 2 +- gc/base/PhysicalSubArenaVirtualMemory.cpp | 2 +- gc/base/PhysicalSubArenaVirtualMemory.hpp | 2 +- gc/base/PhysicalSubArenaVirtualMemoryFlat.cpp | 2 +- gc/base/PhysicalSubArenaVirtualMemoryFlat.hpp | 2 +- gc/base/ReferenceChainWalkerMarkMap.cpp | 2 +- gc/base/ReferenceChainWalkerMarkMap.hpp | 2 +- gc/base/RegionPool.cpp | 2 +- gc/base/RegionPool.hpp | 2 +- gc/base/RegionPoolGeneric.cpp | 2 +- gc/base/RegionPoolGeneric.hpp | 2 +- gc/base/SlotObject.hpp | 2 +- gc/base/SparseAddressOrderedFixedSizeDataPool.cpp | 2 +- gc/base/SparseAddressOrderedFixedSizeDataPool.hpp | 2 +- gc/base/SparseHeapLinkedFreeHeader.hpp | 2 +- gc/base/SparseVirtualMemory.cpp | 2 +- gc/base/SparseVirtualMemory.hpp | 2 +- gc/base/StartupManager.cpp | 2 +- gc/base/StartupManager.hpp | 2 +- gc/base/SweepHeapSectioning.cpp | 2 +- gc/base/SweepHeapSectioning.hpp | 2 +- gc/base/SweepPoolManager.cpp | 2 +- gc/base/SweepPoolManager.hpp | 2 +- gc/base/SweepPoolManagerAddressOrderedList.cpp | 2 +- gc/base/SweepPoolManagerAddressOrderedList.hpp | 2 +- gc/base/SweepPoolManagerAddressOrderedListBase.cpp | 2 +- gc/base/SweepPoolManagerAddressOrderedListBase.hpp | 2 +- gc/base/SweepPoolManagerHybrid.cpp | 2 +- gc/base/SweepPoolManagerHybrid.hpp | 2 +- gc/base/SweepPoolManagerSplitAddressOrderedList.cpp | 2 +- gc/base/SweepPoolManagerSplitAddressOrderedList.hpp | 2 +- gc/base/SweepPoolState.cpp | 2 +- gc/base/SweepPoolState.hpp | 2 +- gc/base/TLHAllocationInterface.cpp | 2 +- gc/base/TLHAllocationInterface.hpp | 2 +- gc/base/TLHAllocationSupport.cpp | 2 +- gc/base/TLHAllocationSupport.hpp | 2 +- gc/base/Task.cpp | 2 +- gc/base/Task.hpp | 2 +- gc/base/Validator.hpp | 2 +- gc/base/VirtualMemory.cpp | 2 +- gc/base/VirtualMemory.hpp | 2 +- gc/base/WorkPacketOverflow.cpp | 2 +- gc/base/WorkPacketOverflow.hpp | 2 +- gc/base/WorkPackets.cpp | 2 +- gc/base/WorkPackets.hpp | 2 +- gc/base/WorkStack.cpp | 2 +- gc/base/WorkStack.hpp | 2 +- gc/base/gcspinlock.cpp | 2 +- gc/base/gcspinlock.h | 2 +- gc/base/gcutils.cpp | 2 +- gc/base/gcutils.h | 2 +- gc/base/j9mm.tdf | 2 +- gc/base/makefile | 2 +- gc/base/modronapicore.cpp | 2 +- gc/base/modronapicore.hpp | 2 +- gc/base/modronbase.h | 2 +- gc/base/modronopt.h | 2 +- gc/base/omrmm.tdf | 2 +- gc/base/omrmmprivate.hdf | 2 +- gc/base/segregated/AllocationContextSegregated.cpp | 2 +- gc/base/segregated/AllocationContextSegregated.hpp | 2 +- gc/base/segregated/ConfigurationSegregated.cpp | 2 +- gc/base/segregated/ConfigurationSegregated.hpp | 2 +- gc/base/segregated/FreeHeapRegionList.hpp | 2 +- gc/base/segregated/GlobalAllocationManagerSegregated.cpp | 2 +- gc/base/segregated/GlobalAllocationManagerSegregated.hpp | 2 +- gc/base/segregated/HeapRegionDescriptorSegregated.cpp | 2 +- gc/base/segregated/HeapRegionDescriptorSegregated.hpp | 2 +- gc/base/segregated/HeapRegionQueue.hpp | 2 +- gc/base/segregated/LockingFreeHeapRegionList.cpp | 2 +- gc/base/segregated/LockingFreeHeapRegionList.hpp | 2 +- gc/base/segregated/LockingHeapRegionQueue.cpp | 2 +- gc/base/segregated/LockingHeapRegionQueue.hpp | 2 +- gc/base/segregated/MemoryPoolAggregatedCellList.cpp | 2 +- gc/base/segregated/MemoryPoolAggregatedCellList.hpp | 2 +- gc/base/segregated/MemoryPoolSegregated.cpp | 2 +- gc/base/segregated/MemoryPoolSegregated.hpp | 2 +- gc/base/segregated/MemorySubSpaceSegregated.cpp | 2 +- gc/base/segregated/MemorySubSpaceSegregated.hpp | 2 +- gc/base/segregated/ObjectHeapIteratorSegregated.cpp | 2 +- gc/base/segregated/ObjectHeapIteratorSegregated.hpp | 2 +- gc/base/segregated/OverflowSegregated.cpp | 2 +- gc/base/segregated/OverflowSegregated.hpp | 2 +- gc/base/segregated/RegionPoolSegregated.cpp | 2 +- gc/base/segregated/RegionPoolSegregated.hpp | 2 +- gc/base/segregated/SegregatedAllocationInterface.cpp | 2 +- gc/base/segregated/SegregatedAllocationInterface.hpp | 2 +- gc/base/segregated/SegregatedAllocationTracker.cpp | 2 +- gc/base/segregated/SegregatedAllocationTracker.hpp | 2 +- gc/base/segregated/SegregatedGC.cpp | 2 +- gc/base/segregated/SegregatedGC.hpp | 2 +- gc/base/segregated/SegregatedListPopulator.cpp | 2 +- gc/base/segregated/SegregatedListPopulator.hpp | 2 +- gc/base/segregated/SegregatedMarkingScheme.cpp | 2 +- gc/base/segregated/SegregatedMarkingScheme.hpp | 2 +- gc/base/segregated/SegregatedSweepTask.cpp | 2 +- gc/base/segregated/SegregatedSweepTask.hpp | 2 +- gc/base/segregated/SizeClasses.cpp | 2 +- gc/base/segregated/SizeClasses.hpp | 2 +- gc/base/segregated/SweepSchemeSegregated.cpp | 2 +- gc/base/segregated/SweepSchemeSegregated.hpp | 2 +- gc/base/segregated/WorkPacketsSegregated.cpp | 2 +- gc/base/segregated/WorkPacketsSegregated.hpp | 2 +- gc/base/standard/CardCleanerForMarking.hpp | 2 +- gc/base/standard/CompactFixHeapForWalkTask.cpp | 2 +- gc/base/standard/CompactFixHeapForWalkTask.hpp | 2 +- gc/base/standard/CompactScheme.cpp | 2 +- gc/base/standard/CompactScheme.hpp | 2 +- gc/base/standard/ConcurrentCardTable.cpp | 2 +- gc/base/standard/ConcurrentCardTable.hpp | 2 +- gc/base/standard/ConcurrentCardTableForWC.cpp | 2 +- gc/base/standard/ConcurrentCardTableForWC.hpp | 2 +- gc/base/standard/ConcurrentClearNewMarkBitsTask.cpp | 2 +- gc/base/standard/ConcurrentClearNewMarkBitsTask.hpp | 2 +- gc/base/standard/ConcurrentCompleteTracingTask.cpp | 2 +- gc/base/standard/ConcurrentCompleteTracingTask.hpp | 2 +- gc/base/standard/ConcurrentFinalCleanCardsTask.cpp | 2 +- gc/base/standard/ConcurrentFinalCleanCardsTask.hpp | 2 +- gc/base/standard/ConcurrentGC.cpp | 2 +- gc/base/standard/ConcurrentGC.hpp | 2 +- gc/base/standard/ConcurrentGCIncrementalUpdate.cpp | 2 +- gc/base/standard/ConcurrentGCIncrementalUpdate.hpp | 2 +- gc/base/standard/ConcurrentGCSATB.cpp | 2 +- gc/base/standard/ConcurrentGCSATB.hpp | 2 +- gc/base/standard/ConcurrentOverflow.cpp | 2 +- gc/base/standard/ConcurrentOverflow.hpp | 2 +- gc/base/standard/ConcurrentPrepareCardTableTask.cpp | 2 +- gc/base/standard/ConcurrentPrepareCardTableTask.hpp | 2 +- gc/base/standard/ConcurrentSafepointCallback.cpp | 2 +- gc/base/standard/ConcurrentScanRememberedSetTask.cpp | 2 +- gc/base/standard/ConcurrentScanRememberedSetTask.hpp | 2 +- gc/base/standard/ConcurrentScavengeTask.cpp | 2 +- gc/base/standard/ConcurrentScavengeTask.hpp | 2 +- gc/base/standard/ConcurrentSweepScheme.cpp | 2 +- gc/base/standard/ConcurrentSweepScheme.hpp | 2 +- gc/base/standard/ConfigurationFlat.cpp | 2 +- gc/base/standard/ConfigurationFlat.hpp | 2 +- gc/base/standard/ConfigurationGenerational.cpp | 2 +- gc/base/standard/ConfigurationGenerational.hpp | 2 +- gc/base/standard/ConfigurationStandard.cpp | 2 +- gc/base/standard/ConfigurationStandard.hpp | 2 +- gc/base/standard/CopyScanCacheChunk.cpp | 2 +- gc/base/standard/CopyScanCacheChunk.hpp | 2 +- gc/base/standard/CopyScanCacheChunkInHeap.cpp | 2 +- gc/base/standard/CopyScanCacheChunkInHeap.hpp | 2 +- gc/base/standard/CopyScanCacheList.cpp | 2 +- gc/base/standard/CopyScanCacheList.hpp | 2 +- gc/base/standard/CopyScanCacheStandard.hpp | 2 +- gc/base/standard/EnvironmentStandard.cpp | 2 +- gc/base/standard/EnvironmentStandard.hpp | 2 +- gc/base/standard/HeapMemoryPoolIterator.cpp | 2 +- gc/base/standard/HeapMemoryPoolIterator.hpp | 2 +- gc/base/standard/HeapRegionDescriptorStandard.cpp | 2 +- gc/base/standard/HeapRegionDescriptorStandard.hpp | 2 +- gc/base/standard/HeapRegionIteratorStandard.hpp | 2 +- gc/base/standard/HeapRegionManagerStandard.cpp | 2 +- gc/base/standard/HeapRegionManagerStandard.hpp | 2 +- gc/base/standard/HeapWalker.cpp | 2 +- gc/base/standard/HeapWalker.hpp | 2 +- gc/base/standard/MemorySubSpaceRegionIteratorStandard.hpp | 2 +- gc/base/standard/OverflowStandard.cpp | 2 +- gc/base/standard/OverflowStandard.hpp | 2 +- gc/base/standard/ParallelCompactTask.cpp | 2 +- gc/base/standard/ParallelCompactTask.hpp | 2 +- gc/base/standard/ParallelGlobalGC.cpp | 2 +- gc/base/standard/ParallelGlobalGC.hpp | 2 +- gc/base/standard/ParallelScavengeTask.cpp | 2 +- gc/base/standard/ParallelScavengeTask.hpp | 2 +- gc/base/standard/ParallelSweepScheme.cpp | 2 +- gc/base/standard/ParallelSweepScheme.hpp | 2 +- .../standard/PhysicalSubArenaVirtualMemorySemiSpace.cpp | 2 +- .../standard/PhysicalSubArenaVirtualMemorySemiSpace.hpp | 2 +- gc/base/standard/RSOverflow.cpp | 2 +- gc/base/standard/RSOverflow.hpp | 2 +- gc/base/standard/RememberedSetSATB.cpp | 2 +- gc/base/standard/RememberedSetSATB.hpp | 2 +- gc/base/standard/Scavenger.cpp | 2 +- gc/base/standard/Scavenger.hpp | 2 +- gc/base/standard/SpinLimiter.hpp | 2 +- gc/base/standard/StandardWriteBarrier.hpp | 2 +- gc/base/standard/SweepHeapSectioningSegmented.cpp | 2 +- gc/base/standard/SweepHeapSectioningSegmented.hpp | 2 +- gc/base/standard/WorkPacketsConcurrent.cpp | 2 +- gc/base/standard/WorkPacketsConcurrent.hpp | 2 +- gc/base/standard/WorkPacketsSATB.cpp | 2 +- gc/base/standard/WorkPacketsSATB.hpp | 2 +- gc/base/standard/WorkPacketsStandard.cpp | 2 +- gc/base/standard/WorkPacketsStandard.hpp | 2 +- gc/base/standard/makefile | 2 +- gc/base/vlhgc/HeapRegionStateTable.cpp | 2 +- gc/base/vlhgc/HeapRegionStateTable.hpp | 2 +- gc/include/MemorySpacesAPI.h | 2 +- gc/include/RootScannerTypes.h | 2 +- gc/include/mmhook_common.h | 2 +- gc/include/omrgc.h | 2 +- gc/include/omrmm.hdf | 2 +- gc/include/omrmodroncore.h | 2 +- gc/startup/makefile | 2 +- gc/startup/mminitcore.cpp | 2 +- gc/startup/mminitcore.h | 2 +- gc/startup/omrgcalloc.cpp | 2 +- gc/startup/omrgcstartup.cpp | 2 +- gc/startup/omrgcstartup.hpp | 2 +- gc/stats/AllocationFailureStats.hpp | 2 +- gc/stats/AllocationStats.cpp | 2 +- gc/stats/AllocationStats.hpp | 2 +- gc/stats/CardCleaningStats.cpp | 2 +- gc/stats/CardCleaningStats.hpp | 2 +- gc/stats/ClassUnloadStats.cpp | 2 +- gc/stats/ClassUnloadStats.hpp | 2 +- gc/stats/CollectionStatistics.hpp | 2 +- gc/stats/CollectionStatisticsStandard.hpp | 2 +- gc/stats/CollectionStatisticsVLHGC.hpp | 2 +- gc/stats/CompactStats.cpp | 2 +- gc/stats/CompactStats.hpp | 2 +- gc/stats/CompactVLHGCStats.hpp | 2 +- gc/stats/ConcurrentCardTableStats.hpp | 2 +- gc/stats/ConcurrentGCStats.cpp | 2 +- gc/stats/ConcurrentGCStats.hpp | 2 +- gc/stats/ConcurrentGMPStats.hpp | 2 +- gc/stats/ConcurrentMarkPhaseStats.hpp | 2 +- gc/stats/ConcurrentPhaseStatsBase.hpp | 2 +- gc/stats/ConcurrentSweepStats.hpp | 2 +- gc/stats/CopyForwardStatsCore.hpp | 2 +- gc/stats/ExcessiveGCStats.hpp | 2 +- gc/stats/FreeEntrySizeClassStats.cpp | 2 +- gc/stats/FreeEntrySizeClassStats.hpp | 2 +- gc/stats/GlobalGCStats.hpp | 2 +- gc/stats/GlobalVLHGCStats.hpp | 2 +- gc/stats/HeapMemorySnapshot.hpp | 2 +- gc/stats/HeapResizeStats.cpp | 2 +- gc/stats/HeapResizeStats.hpp | 2 +- gc/stats/HeapStats.hpp | 2 +- gc/stats/InterRegionRememberedSetStats.hpp | 2 +- gc/stats/LargeObjectAllocateStats.cpp | 2 +- gc/stats/LargeObjectAllocateStats.hpp | 2 +- gc/stats/MarkStats.cpp | 2 +- gc/stats/MarkStats.hpp | 2 +- gc/stats/MarkVLHGCStatsCore.hpp | 2 +- gc/stats/MetronomeStats.cpp | 2 +- gc/stats/MetronomeStats.hpp | 2 +- gc/stats/PercolateStats.hpp | 2 +- gc/stats/ReferenceStats.hpp | 2 +- gc/stats/RootScannerStats.cpp | 2 +- gc/stats/RootScannerStats.hpp | 2 +- gc/stats/ScavengerCopyScanRatio.cpp | 2 +- gc/stats/ScavengerCopyScanRatio.hpp | 2 +- gc/stats/ScavengerStats.cpp | 2 +- gc/stats/ScavengerStats.hpp | 2 +- gc/stats/SweepStats.cpp | 2 +- gc/stats/SweepStats.hpp | 2 +- gc/stats/SweepVLHGCStats.hpp | 2 +- gc/stats/WorkPacketStats.hpp | 2 +- gc/stats/makefile | 2 +- gc/structs/ForwardedHeader.cpp | 2 +- gc/structs/ForwardedHeader.hpp | 2 +- gc/structs/HashTableIterator.cpp | 2 +- gc/structs/HashTableIterator.hpp | 2 +- gc/structs/OMRVMThreadListIterator.cpp | 2 +- gc/structs/OMRVMThreadListIterator.hpp | 2 +- gc/structs/ObjectHeapIterator.hpp | 2 +- gc/structs/ObjectIteratorState.hpp | 2 +- gc/structs/PoolIterator.cpp | 2 +- gc/structs/PoolIterator.hpp | 2 +- gc/structs/SublistFragment.cpp | 2 +- gc/structs/SublistFragment.hpp | 2 +- gc/structs/SublistIterator.cpp | 2 +- gc/structs/SublistIterator.hpp | 2 +- gc/structs/SublistPool.cpp | 2 +- gc/structs/SublistPool.hpp | 2 +- gc/structs/SublistPuddle.cpp | 2 +- gc/structs/SublistPuddle.hpp | 2 +- gc/structs/SublistSlotIterator.cpp | 2 +- gc/structs/SublistSlotIterator.hpp | 2 +- gc/structs/makefile | 2 +- gc/verbose/VerboseBuffer.cpp | 2 +- gc/verbose/VerboseBuffer.hpp | 2 +- gc/verbose/VerboseHandlerOutput.cpp | 2 +- gc/verbose/VerboseHandlerOutput.hpp | 2 +- gc/verbose/VerboseManager.cpp | 2 +- gc/verbose/VerboseManager.hpp | 2 +- gc/verbose/VerboseManagerBase.hpp | 2 +- gc/verbose/VerboseWriter.cpp | 2 +- gc/verbose/VerboseWriter.hpp | 2 +- gc/verbose/VerboseWriterChain.cpp | 2 +- gc/verbose/VerboseWriterChain.hpp | 2 +- gc/verbose/VerboseWriterFileLogging.cpp | 2 +- gc/verbose/VerboseWriterFileLogging.hpp | 2 +- gc/verbose/VerboseWriterFileLoggingBuffered.cpp | 2 +- gc/verbose/VerboseWriterFileLoggingBuffered.hpp | 2 +- gc/verbose/VerboseWriterFileLoggingSynchronous.cpp | 2 +- gc/verbose/VerboseWriterFileLoggingSynchronous.hpp | 2 +- gc/verbose/VerboseWriterHook.cpp | 2 +- gc/verbose/VerboseWriterHook.hpp | 2 +- gc/verbose/VerboseWriterStreamOutput.cpp | 2 +- gc/verbose/VerboseWriterStreamOutput.hpp | 2 +- .../handler_standard/VerboseHandlerOutputStandard.cpp | 2 +- .../handler_standard/VerboseHandlerOutputStandard.hpp | 2 +- gc/verbose/handler_standard/makefile | 2 +- gc/verbose/j9vgc.tdf | 2 +- gc/verbose/makefile | 2 +- gc/verbose/schema.xsd | 2 +- include_core/AtomicSupport.hpp | 2 +- include_core/OMR/Bytes.hpp | 2 +- include_core/OMR/IntrusiveList.hpp | 2 +- include_core/OMR/TypeTraits.hpp | 2 +- include_core/OMR_Agent.hpp | 2 +- include_core/OMR_Base.hpp | 2 +- include_core/OMR_BaseNonVirtual.hpp | 2 +- include_core/OMR_BaseVirtual.hpp | 2 +- include_core/OMR_Runtime.hpp | 2 +- include_core/OMR_RuntimeConfiguration.hpp | 2 +- include_core/OMR_VM.hpp | 2 +- include_core/OMR_VMConfiguration.hpp | 2 +- include_core/OMR_VMThread.hpp | 2 +- include_core/avl_api.h | 2 +- include_core/avlsup.h | 2 +- include_core/edcwccwi.h | 2 +- include_core/fltconst.h | 2 +- include_core/hashtable_api.h | 2 +- include_core/hookable_api.h | 2 +- include_core/j9nongenerated.h | 2 +- include_core/j9pool.h | 2 +- include_core/leconditionhandler.h | 2 +- include_core/omr.h | 2 +- include_core/omragent.h | 2 +- include_core/omragent_internal.h | 2 +- include_core/omravl.h | 2 +- include_core/omravldefines.h | 2 +- include_core/omrceetbck.h | 2 +- include_core/omrcfg.cmake.h.in | 2 +- include_core/omrcfg.h.in | 2 +- include_core/omrcomp.h | 2 +- include_core/omrcuda.h | 2 +- include_core/omrformatconsts.h | 2 +- include_core/omrgcconsts.h | 2 +- include_core/omrhashtable.h | 2 +- include_core/omrhookable.h | 2 +- include_core/omriarv64.h | 2 +- include_core/omrintrospect_common.h | 2 +- include_core/omrlinkedlist.h | 2 +- include_core/omrmemcategories.h | 2 +- include_core/omrmutex.h | 2 +- include_core/omrpool.h | 2 +- include_core/omrport.h | 2 +- include_core/omrporterror.h | 2 +- include_core/omrportsock.h | 2 +- include_core/omrportsocktypes.h | 2 +- include_core/omrprofiler.h | 2 +- include_core/omrrasinit.h | 2 +- include_core/omrshchelp.h | 2 +- include_core/omrsig.h | 2 +- include_core/omrsrp.h | 2 +- include_core/omrstdarg.h | 2 +- include_core/omrthread.h | 2 +- include_core/omrthread_generated.h | 2 +- include_core/omrtrace.h | 2 +- include_core/omrtraceformat.h | 2 +- include_core/omrutil.h | 2 +- include_core/omrutilbase.h | 2 +- include_core/omrversionstrings.cmake.h.in | 2 +- include_core/omrversionstrings.h.in | 2 +- include_core/omrvm.h | 2 +- include_core/pool_api.h | 2 +- include_core/ranking.h | 2 +- include_core/spacesaving.h | 2 +- include_core/thrdsup.h | 2 +- include_core/thread_api.h | 2 +- include_core/thrtypes.h | 2 +- include_core/unix/omrmutex.h | 2 +- include_core/unix/thrdsup.h | 2 +- include_core/unix/zos/edcwccwi.h | 2 +- include_core/unix/zos/leconditionhandler.h | 2 +- include_core/unix/zos/omrceetbck.h | 2 +- include_core/unix/zos/omriarv64.h | 2 +- include_core/ute_core.h | 2 +- include_core/ute_dataformat.h | 2 +- include_core/ute_module.h | 2 +- include_core/win/omrmutex.h | 2 +- include_core/win/thrdsup.h | 2 +- install-sh | 2 +- jitbuilder/CMakeLists.txt | 2 +- jitbuilder/Makefile | 2 +- jitbuilder/apigen/cppgen.py | 4 ++-- jitbuilder/apigen/extras/cpp/Macros.hpp | 2 +- .../apigen/extras/cpp/TypeDictionaryExtrasInsideClass.hpp | 2 +- .../extras/cpp/TypeDictionaryExtrasOutsideClass.hpp | 2 +- jitbuilder/apigen/genutils.py | 2 +- jitbuilder/apigen/run_tests.py | 2 +- jitbuilder/apigen/schema/LICENSE.md | 2 +- jitbuilder/apigen/schema/api-class.schema.json | 2 +- jitbuilder/apigen/schema/api-field.schema.json | 2 +- jitbuilder/apigen/schema/api-service.schema.json | 2 +- jitbuilder/apigen/schema/api-type.schema.json | 2 +- jitbuilder/apigen/schema/api.schema.json | 2 +- jitbuilder/apigen/test/apidescriptiontests.py | 2 +- jitbuilder/apigen/test/cppgentests.py | 2 +- jitbuilder/apigen/test/genutilstests.py | 2 +- jitbuilder/build/files/common.mk | 2 +- jitbuilder/build/files/host/aarch64.mk | 2 +- jitbuilder/build/files/host/arm.mk | 2 +- jitbuilder/build/files/host/p.mk | 2 +- jitbuilder/build/files/host/x.mk | 2 +- jitbuilder/build/files/host/z.mk | 2 +- jitbuilder/build/files/target/aarch64.mk | 2 +- jitbuilder/build/files/target/amd64.mk | 2 +- jitbuilder/build/files/target/arm.mk | 2 +- jitbuilder/build/files/target/i386.mk | 2 +- jitbuilder/build/files/target/p.mk | 2 +- jitbuilder/build/files/target/x.mk | 2 +- jitbuilder/build/files/target/z.mk | 2 +- jitbuilder/build/platform/common.mk | 2 +- jitbuilder/build/platform/host/aarch64-linux-gcc.mk | 2 +- jitbuilder/build/platform/host/amd64-linux-gcc.mk | 2 +- jitbuilder/build/platform/host/amd64-linux64-clang.mk | 2 +- jitbuilder/build/platform/host/amd64-linux64-gcc.mk | 2 +- jitbuilder/build/platform/host/amd64-osx-clang.mk | 2 +- jitbuilder/build/platform/host/arm-linux-gcc.mk | 2 +- jitbuilder/build/platform/host/ia32-linux-gcc.mk | 2 +- jitbuilder/build/platform/host/ppc64-linux64-gcc.mk | 2 +- jitbuilder/build/platform/host/ppc64le-linux64-gcc.mk | 2 +- jitbuilder/build/platform/host/s390-linux-gcc.mk | 2 +- jitbuilder/build/platform/host/s390-linux64-gcc.mk | 2 +- jitbuilder/build/platform/target/all.mk | 2 +- jitbuilder/build/rules/common.mk | 2 +- jitbuilder/build/rules/gnu/common.mk | 2 +- jitbuilder/build/rules/gnu/filetypes.mk | 2 +- jitbuilder/build/toolcfg/common.mk | 2 +- jitbuilder/build/toolcfg/gnu/common.mk | 2 +- jitbuilder/build/toolcfg/host/32.mk | 2 +- jitbuilder/build/toolcfg/host/64.mk | 2 +- jitbuilder/build/toolcfg/host/aarch64.mk | 2 +- jitbuilder/build/toolcfg/host/aix.mk | 2 +- jitbuilder/build/toolcfg/host/arm.mk | 2 +- jitbuilder/build/toolcfg/host/linux.mk | 2 +- jitbuilder/build/toolcfg/host/osx.mk | 2 +- jitbuilder/build/toolcfg/host/p.mk | 2 +- jitbuilder/build/toolcfg/host/win.mk | 2 +- jitbuilder/build/toolcfg/host/x.mk | 2 +- jitbuilder/build/toolcfg/host/z.mk | 2 +- jitbuilder/build/toolcfg/host/zos.mk | 2 +- jitbuilder/build/toolcfg/target/32.mk | 2 +- jitbuilder/build/toolcfg/target/64.mk | 2 +- jitbuilder/build/toolcfg/target/aarch64.mk | 2 +- jitbuilder/build/toolcfg/target/arm.mk | 2 +- jitbuilder/build/toolcfg/target/p.mk | 2 +- jitbuilder/build/toolcfg/target/x.mk | 2 +- jitbuilder/build/toolcfg/target/z.mk | 2 +- jitbuilder/compile/Method.hpp | 2 +- jitbuilder/compile/ResolvedMethod.cpp | 2 +- jitbuilder/compile/ResolvedMethod.hpp | 2 +- jitbuilder/control/Jit.cpp | 2 +- jitbuilder/env/ConcreteFE.hpp | 2 +- jitbuilder/env/FrontEnd.cpp | 2 +- jitbuilder/env/FrontEnd.hpp | 2 +- jitbuilder/env/JBObjectModel.hpp | 2 +- jitbuilder/env/ObjectModel.hpp | 2 +- jitbuilder/ilgen/IlGeneratorMethodDetails.hpp | 2 +- jitbuilder/ilgen/JBIlGeneratorMethodDetails.cpp | 2 +- jitbuilder/ilgen/JBIlGeneratorMethodDetails.hpp | 2 +- jitbuilder/linter.mk | 2 +- jitbuilder/lljb/CMakeLists.txt | 2 +- jitbuilder/lljb/README.md | 2 +- jitbuilder/lljb/include/lljb/Compiler.hpp | 2 +- jitbuilder/lljb/include/lljb/IRVisitor.hpp | 2 +- jitbuilder/lljb/include/lljb/MethodBuilder.hpp | 2 +- jitbuilder/lljb/include/lljb/Module.hpp | 2 +- jitbuilder/lljb/src/Compiler.cpp | 2 +- jitbuilder/lljb/src/IRVisitor.cpp | 2 +- jitbuilder/lljb/src/MethodBuilder.cpp | 2 +- jitbuilder/lljb/src/Module.cpp | 2 +- jitbuilder/optimizer/JBOptimizer.cpp | 2 +- jitbuilder/optimizer/JBOptimizer.hpp | 2 +- jitbuilder/optimizer/Optimizer.hpp | 2 +- jitbuilder/p/codegen/Evaluator.cpp | 2 +- jitbuilder/p/runtime/AsmUtil.spp | 2 +- jitbuilder/p/runtime/CodeDispatch.spp | 2 +- jitbuilder/p/runtime/CodeSync.cpp | 2 +- jitbuilder/release/.gitignore | 2 +- jitbuilder/release/CMakeLists.txt | 2 +- jitbuilder/release/Dockerfile-JitBuilder-x86_64 | 2 +- jitbuilder/release/LICENSE | 2 +- jitbuilder/release/README.md | 2 +- jitbuilder/release/cpp/Makefile | 2 +- jitbuilder/release/cpp/samples/AtomicOperations.cpp | 2 +- jitbuilder/release/cpp/samples/AtomicOperations.hpp | 2 +- jitbuilder/release/cpp/samples/Call.cpp | 2 +- jitbuilder/release/cpp/samples/Call.hpp | 2 +- jitbuilder/release/cpp/samples/Conditionals.cpp | 2 +- jitbuilder/release/cpp/samples/Conditionals.hpp | 2 +- jitbuilder/release/cpp/samples/ConstString.cpp | 2 +- jitbuilder/release/cpp/samples/ConstString.hpp | 2 +- jitbuilder/release/cpp/samples/DotProduct.cpp | 2 +- jitbuilder/release/cpp/samples/DotProduct.hpp | 2 +- jitbuilder/release/cpp/samples/FieldAddress.cpp | 2 +- jitbuilder/release/cpp/samples/FieldAddress.hpp | 2 +- jitbuilder/release/cpp/samples/InliningRecFib.cpp | 2 +- jitbuilder/release/cpp/samples/InliningRecFib.hpp | 2 +- jitbuilder/release/cpp/samples/IsSupportedType.cpp | 2 +- jitbuilder/release/cpp/samples/IterativeFib.cpp | 2 +- jitbuilder/release/cpp/samples/IterativeFib.hpp | 2 +- jitbuilder/release/cpp/samples/LinkedList.cpp | 2 +- jitbuilder/release/cpp/samples/LinkedList.hpp | 2 +- jitbuilder/release/cpp/samples/LocalArray.cpp | 2 +- jitbuilder/release/cpp/samples/LocalArray.hpp | 2 +- jitbuilder/release/cpp/samples/Mandelbrot.cpp | 2 +- jitbuilder/release/cpp/samples/Mandelbrot.hpp | 2 +- jitbuilder/release/cpp/samples/MatMult.cpp | 2 +- jitbuilder/release/cpp/samples/MatMult.hpp | 2 +- jitbuilder/release/cpp/samples/NestedLoop.cpp | 2 +- jitbuilder/release/cpp/samples/NestedLoop.hpp | 2 +- jitbuilder/release/cpp/samples/OperandArrayTests.cpp | 2 +- jitbuilder/release/cpp/samples/OperandArrayTests.hpp | 2 +- jitbuilder/release/cpp/samples/OperandStackTests.cpp | 2 +- jitbuilder/release/cpp/samples/OperandStackTests.hpp | 2 +- jitbuilder/release/cpp/samples/Pointer.cpp | 2 +- jitbuilder/release/cpp/samples/Pointer.hpp | 2 +- jitbuilder/release/cpp/samples/Pow2.cpp | 2 +- jitbuilder/release/cpp/samples/Pow2.hpp | 2 +- jitbuilder/release/cpp/samples/Power.cpp | 2 +- jitbuilder/release/cpp/samples/Power.hpp | 2 +- jitbuilder/release/cpp/samples/RecursiveFib.cpp | 2 +- jitbuilder/release/cpp/samples/RecursiveFib.hpp | 2 +- jitbuilder/release/cpp/samples/Simple.cpp | 2 +- jitbuilder/release/cpp/samples/Simple.hpp | 2 +- jitbuilder/release/cpp/samples/StructArray.cpp | 2 +- jitbuilder/release/cpp/samples/StructArray.hpp | 2 +- jitbuilder/release/cpp/samples/Switch.cpp | 2 +- jitbuilder/release/cpp/samples/Switch.hpp | 2 +- jitbuilder/release/cpp/samples/TableSwitch.cpp | 2 +- jitbuilder/release/cpp/samples/TableSwitch.hpp | 2 +- jitbuilder/release/cpp/samples/Thunk.cpp | 2 +- jitbuilder/release/cpp/samples/ToIlType.cpp | 2 +- .../release/cpp/samples/TransactionalOperations.cpp | 2 +- .../release/cpp/samples/TransactionalOperations.hpp | 2 +- jitbuilder/release/cpp/samples/Union.cpp | 2 +- jitbuilder/release/cpp/samples/Union.hpp | 2 +- jitbuilder/release/cpp/samples/UseCall.c | 2 +- jitbuilder/release/cpp/samples/UseIncrement.c | 2 +- jitbuilder/release/cpp/samples/VMRegister.cpp | 2 +- jitbuilder/release/cpp/samples/VMRegister.hpp | 2 +- jitbuilder/release/cpp/samples/Worklist.cpp | 2 +- jitbuilder/release/cpp/samples/Worklist.hpp | 2 +- jitbuilder/runtime/CodeCacheManager.hpp | 2 +- jitbuilder/runtime/JBCodeCacheManager.cpp | 2 +- jitbuilder/runtime/JBCodeCacheManager.hpp | 2 +- jitbuilder/runtime/JBJitConfig.cpp | 2 +- jitbuilder/runtime/JBJitConfig.hpp | 2 +- jitbuilder/runtime/StackAtlasPOD.hpp | 2 +- jitbuilder/x/codegen/Evaluator.cpp | 2 +- jitbuilder/z/codegen/Evaluator.cpp | 2 +- lib/dummy.txt | 2 +- longabout.html | 2 +- nls/portnls.h | 2 +- omr.rc.in | 2 +- omr/CMakeLists.txt | 2 +- omr/OMR_Agent.cpp | 2 +- omr/OMR_MethodDictionary.cpp | 2 +- omr/OMR_MethodDictionary.hpp | 2 +- omr/OMR_Profiler.cpp | 2 +- omr/OMR_Runtime.cpp | 2 +- omr/OMR_TI.cpp | 2 +- omr/OMR_TIMemorySize.cpp | 2 +- omr/OMR_VM.cpp | 2 +- omr/OMR_VMThread.cpp | 2 +- omr/makefile | 2 +- omr/omrti.tdf | 2 +- omr/omrvm.tdf | 2 +- omr/startup/CMakeLists.txt | 2 +- omr/startup/makefile | 2 +- omr/startup/omrrasinit.c | 2 +- omr/startup/omrtrcinit.c | 2 +- omr/startup/omrvmstartup.cpp | 2 +- omr_glue_static_lib/makefile | 2 +- omr_static_lib/makefile | 2 +- omrmakefiles/confighelpers.m4 | 2 +- omrmakefiles/configure.mk.in | 2 +- omrmakefiles/generate-exports.sh | 2 +- omrmakefiles/jitinclude.mk | 2 +- omrmakefiles/omr_defs.mk | 2 +- omrmakefiles/omrconf.sh | 2 +- omrmakefiles/rules.aix.mk | 2 +- omrmakefiles/rules.linux.mk | 2 +- omrmakefiles/rules.mk | 2 +- omrmakefiles/rules.osx.mk | 2 +- omrmakefiles/rules.win.mk | 2 +- omrmakefiles/rules.zos.mk | 2 +- omrmakefiles/rules.ztpf.mk | 2 +- omrmakefiles/winexe.manifest | 2 +- omrsigcompat/CMakeLists.txt | 2 +- omrsigcompat/makefile | 2 +- omrsigcompat/omrsig.cpp | 2 +- omrsigcompat/omrsig_internal.hpp | 2 +- omrtrace/CMakeLists.txt | 2 +- omrtrace/makefile | 2 +- omrtrace/omrtrace_internal.h | 2 +- omrtrace/omrtraceapi.cpp | 2 +- omrtrace/omrtracecomponent.cpp | 2 +- omrtrace/omrtraceformatter.cpp | 2 +- omrtrace/omrtracelog.cpp | 2 +- omrtrace/omrtracemain.cpp | 2 +- omrtrace/omrtracemisc.cpp | 2 +- omrtrace/omrtraceoptions.cpp | 2 +- omrtrace/omrtracepublish.cpp | 2 +- omrtrace/omrtracewrappers.cpp | 2 +- .../21645_core.20150126.202455.11862202.0001.xml | 2 +- .../24404_core.20140723.091737.5812.0002.xml | 2 +- perftest/gctest/makefile | 2 +- perftest/gctest/verboseGCLogParser.cpp | 2 +- perftest/omrperftest.mk | 2 +- port/CMakeLists.txt | 2 +- port/aix/omrgetsp.s | 2 +- port/aix/omrintrospect.h | 2 +- port/aix/omrosbacktrace_impl.c | 2 +- port/aix/omrosdump_helpers.c | 2 +- port/aix/omrosdump_helpers.h | 2 +- port/aix/omrsignal_context.c | 2 +- port/aix/omrsignal_context.h | 2 +- port/aix/omrsl.c | 2 +- port/aix/omrtime.c | 2 +- port/aix/omrvmem.c | 2 +- port/aix/rt_divu64.s | 2 +- port/aix/rt_time.s | 2 +- port/aix64/rt_divu64.s | 2 +- port/aix64/rt_time.s | 2 +- port/common/j9nls.c | 2 +- port/common/j9nlshelpers.c | 2 +- port/common/omrcpu.c | 2 +- port/common/omrcuda.cpp | 2 +- port/common/omrerror.c | 2 +- port/common/omrerrorhelpers.c | 2 +- port/common/omrexit.c | 2 +- port/common/omrfile.c | 2 +- port/common/omrfile_blockingasync.c | 2 +- port/common/omrfilestream.c | 2 +- port/common/omrfilestreamtext.c | 2 +- port/common/omrfiletext.c | 2 +- port/common/omrgetasid.c | 2 +- port/common/omrgetasid.h | 2 +- port/common/omrgetjobid.c | 2 +- port/common/omrgetjobid.h | 2 +- port/common/omrgetjobname.c | 2 +- port/common/omrgetjobname.h | 2 +- port/common/omrgetsysname.c | 2 +- port/common/omrgetsysname.h | 2 +- port/common/omrheap.c | 2 +- port/common/omrintrospect.c | 2 +- port/common/omrintrospect_common.c | 2 +- port/common/omrmem.c | 2 +- port/common/omrmem32helpers.c | 2 +- port/common/omrmem32helpers.h | 2 +- port/common/omrmem32struct.h | 2 +- port/common/omrmemcategories.c | 2 +- port/common/omrmemtag.c | 2 +- port/common/omrmemtag_checks.c | 2 +- port/common/omrmemtag_checks.h | 2 +- port/common/omrmmap.c | 2 +- port/common/omrnlshelpers.h | 2 +- port/common/omrosbacktrace.c | 2 +- port/common/omrosbacktrace_impl.c | 2 +- port/common/omrosdump.c | 2 +- port/common/omrport.c | 2 +- port/common/omrport.tdf | 2 +- port/common/omrportcontrol.c | 2 +- port/common/omrportptb.c | 2 +- port/common/omrsignal.c | 2 +- port/common/omrsl.c | 2 +- port/common/omrsl.h | 2 +- port/common/omrsock.c | 2 +- port/common/omrsockptb.c | 2 +- port/common/omrsockptb.h | 2 +- port/common/omrstr.c | 2 +- port/common/omrsysinfo.c | 2 +- port/common/omrsysinfo_helpers.c | 2 +- port/common/omrsysinfo_helpers.h | 2 +- port/common/omrsyslog.c | 2 +- port/common/omrtime.c | 2 +- port/common/omrtlshelpers.c | 2 +- port/common/omrtty.c | 2 +- port/common/omrvmem.c | 2 +- port/include/omrportasserts.h | 2 +- port/include/omrportpg.h | 2 +- port/include/omrportptb.h | 2 +- port/include/omrvmem.h | 2 +- port/iseries/rt_time.s | 2 +- port/iseries64/rt_time.s | 2 +- port/linux/omrosbacktrace_impl.c | 2 +- port/linux/omrosdump_helpers.c | 2 +- port/linux/omrosdump_helpers.h | 2 +- port/linux/omrvmem.c | 2 +- port/linux386/omrsignal_context.c | 2 +- port/linux386/omrsignal_context.h | 2 +- port/linuxaarch64/omrsignal_context.c | 2 +- port/linuxaarch64/omrsignal_context.h | 2 +- port/linuxamd64/omrsignal_context.c | 2 +- port/linuxamd64/omrsignal_context.h | 2 +- port/linuxarm/omrsignal_context.c | 2 +- port/linuxarm/omrsignal_context.h | 2 +- port/linuxppc/omrsignal_context.c | 2 +- port/linuxppc/omrsignal_context.h | 2 +- port/linuxppc64/omrrttime.s | 2 +- port/linuxppc64/omrtime.c | 2 +- port/linuxppc64le/omrrttime.s | 2 +- port/linuxriscv64/omrsignal_context.c | 2 +- port/linuxriscv64/omrsignal_context.h | 2 +- port/linuxs390/omrgetstfle.s | 2 +- port/linuxs390/omrrttime.s | 2 +- port/linuxs390/omrsignal_context.c | 2 +- port/linuxs390/omrsignal_context.h | 2 +- port/linuxs390/omrsysinfo_helpers.h | 2 +- port/linuxs390/omrtime.c | 2 +- port/linuxs39064/omrrttime.s | 2 +- port/makefile | 2 +- port/omrportpriv.h | 2 +- port/osx/omrintrospect.c | 2 +- port/osx/omrosbacktrace_impl.c | 2 +- port/osx/omrosdump.c | 2 +- port/osx/omrosdump_helpers.c | 2 +- port/osx/omrosdump_helpers.h | 2 +- port/osx/omrsignal_context.c | 2 +- port/osx/omrsignal_context.h | 2 +- port/osx/omrvmem.c | 2 +- port/port.exportlist | 2 +- port/port_objects.mk | 2 +- port/unix/auxv.c | 2 +- port/unix/j9nlshelpers.c | 2 +- port/unix/omrcpu.c | 2 +- port/unix/omrerrorhelpers.c | 2 +- port/unix/omrfile.c | 2 +- port/unix/omrfiletext.c | 2 +- port/unix/omriconvhelpers.c | 2 +- port/unix/omrintrospect.c | 2 +- port/unix/omrmem.c | 2 +- port/unix/omrmmap.c | 2 +- port/unix/omrosdump.c | 2 +- port/unix/omrportptb.c | 2 +- port/unix/omrsharedhelper.c | 2 +- port/unix/omrsharedhelper.h | 2 +- port/unix/omrshmem.c | 2 +- port/unix/omrshmem.h | 2 +- port/unix/omrshsem.c | 2 +- port/unix/omrshsem.h | 2 +- port/unix/omrshsem_deprecated.c | 2 +- port/unix/omrshsemun.h | 2 +- port/unix/omrsignal.c | 2 +- port/unix/omrsl.c | 2 +- port/unix/omrsock.c | 2 +- port/unix/omrsysinfo.c | 2 +- port/unix/omrsyslog.c | 2 +- port/unix/omrsysv_ipcwrappers.c | 2 +- port/unix/omrsysv_ipcwrappers.h | 2 +- port/unix/omrtime.c | 2 +- port/unix/omrtty.c | 2 +- port/unix/protect_helpers.c | 2 +- port/unix_include/auxv.h | 2 +- port/unix_include/omrcgroup.h | 2 +- port/unix_include/omriconvhelpers.h | 2 +- port/unix_include/omrintrospect.h | 2 +- port/unix_include/omrmmap.h | 2 +- port/unix_include/omrnlshelpers.h | 2 +- port/unix_include/omrportpg.h | 2 +- port/unix_include/omrportptb.h | 2 +- port/unix_include/omrsock.h | 2 +- port/unix_include/protect_helpers.h | 2 +- port/win32/j9nlshelpers.c | 2 +- port/win32/omrcpu.c | 2 +- port/win32/omrerrorhelpers.c | 2 +- port/win32/omrfile.c | 2 +- port/win32/omrfile_blockingasync.c | 2 +- port/win32/omrfilehelpers.c | 2 +- port/win32/omrfilestream.c | 2 +- port/win32/omrfiletext.c | 2 +- port/win32/omrintrospect.c | 2 +- port/win32/omrmem.c | 2 +- port/win32/omrmmap.c | 2 +- port/win32/omrosbacktrace_impl.c | 2 +- port/win32/omrosdump.c | 2 +- port/win32/omrportptb.c | 2 +- port/win32/omrsignal.c | 2 +- port/win32/omrsl.c | 2 +- port/win32/omrsock.c | 2 +- port/win32/omrsysinfo.c | 2 +- port/win32/omrsyslog.c | 2 +- port/win32/omrsyslogmessages.mc | 2 +- port/win32/omrtime.c | 2 +- port/win32/omrtty.c | 2 +- port/win32/omrvmem.c | 2 +- port/win32/protect_helpers.c | 2 +- port/win32_include/omrfilehelpers.h | 2 +- port/win32_include/omriconvhelpers.h | 2 +- port/win32_include/omrintrospect.h | 2 +- port/win32_include/omrnlshelpers.h | 2 +- port/win32_include/omrportpg.h | 2 +- port/win32_include/omrportptb.h | 2 +- port/win32_include/omrsignal.h | 2 +- port/win32_include/protect_helpers.h | 2 +- port/win64amd/omrsignal.c | 2 +- port/win64amd/omrsignal.h | 2 +- port/zos390/omr__le_api.h | 2 +- port/zos390/omrceeocb.h | 2 +- port/zos390/omrcel4ro31.c | 2 +- port/zos390/omrcel4ro31.h | 2 +- port/zos390/omrgenerate_ieat_dump.s | 4 ++-- port/zos390/omrget_large_2gb_pages_supported.s | 6 +++--- port/zos390/omrget_large_pageable_pages_supported.s | 6 +++--- port/zos390/omrget_large_pages_supported.s | 6 +++--- port/zos390/omrgetasid.c | 2 +- port/zos390/omrgetjobid.c | 2 +- port/zos390/omrgetjobname.c | 2 +- port/zos390/omrgetstfle31.s | 6 +++--- port/zos390/omrgetstfle64.s | 8 ++++---- port/zos390/omrgetsysname.c | 2 +- port/zos390/omrgetuserid.c | 2 +- port/zos390/omrgetuserid.h | 2 +- port/zos390/omriarv64.c | 2 +- port/zos390/omrintrospect.c | 2 +- port/zos390/omrintrospect.h | 2 +- port/zos390/omript_ttoken64.s | 6 +++--- port/zos390/omrjobname.s | 8 ++++---- port/zos390/omrlpdat.mc | 2 +- port/zos390/omrosbacktrace_impl.c | 2 +- port/zos390/omrosdump.c | 2 +- port/zos390/omrpgser_release.s | 6 +++--- port/zos390/omrportpg.h | 2 +- port/zos390/omrrttime.s | 6 +++--- port/zos390/omrsignal_ceehdlr.c | 2 +- port/zos390/omrsignal_ceehdlr.h | 2 +- port/zos390/omrsignal_context.c | 2 +- port/zos390/omrsignal_context.h | 2 +- port/zos390/omrsignal_context_ceehdlr.c | 2 +- port/zos390/omrsignal_context_ceehdlr.h | 2 +- port/zos390/omrsimap.h | 2 +- port/zos390/omrsl.c | 2 +- port/zos390/omrstorage.c | 2 +- port/zos390/omrsysinfo_get_number_CPUs.s | 6 +++--- port/zos390/omrsysinfo_helpers.c | 2 +- port/zos390/omrsysinfo_helpers.h | 2 +- port/zos390/omrsyslog.c | 2 +- port/zos390/omrtime.c | 2 +- port/zos390/omrtty.c | 2 +- port/zos390/omruserid.s | 8 ++++---- port/zos390/omrvmem.c | 2 +- port/zos390/omrvmem_support_above_bar.s | 6 +++--- port/zos390/omrvmem_support_below_bar_31.s | 6 +++--- port/zos390/omrvmem_support_below_bar_64.s | 6 +++--- port/zos390/omrwto.s | 6 +++--- port/zos390/omrzfs.c | 2 +- port/zos390/omrzfs.h | 2 +- port/ztpf/omrintrospect.c | 2 +- port/ztpf/omrloadfpc.s | 2 +- port/ztpf/omrmmap.c | 2 +- port/ztpf/omrosbacktrace_impl.c | 2 +- port/ztpf/omrosdump.c | 2 +- port/ztpf/omrosdump_helpers.c | 2 +- port/ztpf/omrosdump_helpers.h | 2 +- port/ztpf/omrsignal.c | 2 +- port/ztpf/omrsignal.h | 2 +- port/ztpf/omrsignal_context.c | 2 +- port/ztpf/omrsignal_context.h | 2 +- port/ztpf/omrsysinfo_helpers.h | 2 +- port/ztpf/omrvmem.c | 2 +- port/ztpf/safe_storage.h | 2 +- run_configure.mk | 2 +- scripts/commit-msg | 2 +- sharedcache/CMakeLists.txt | 2 +- third_party/CMakeLists.txt | 2 +- third_party/pugixml-1.5/CMakeLists.txt | 2 +- third_party/pugixml-1.5/makefile | 2 +- thread/CMakeLists.txt | 2 +- thread/aix/omrthreadnuma.c | 2 +- thread/aix/priority.c | 2 +- thread/aix/rasthrsup.c | 2 +- thread/common/j9sem.c | 2 +- thread/common/omrthread.c | 2 +- thread/common/omrthreadattr.c | 2 +- thread/common/omrthreadattr.h | 2 +- thread/common/omrthreaddebug.c | 2 +- thread/common/omrthreaderror.c | 2 +- thread/common/omrthreadinspect.c | 2 +- thread/common/omrthreadinspect.h | 2 +- thread/common/omrthreadjlm.c | 2 +- thread/common/omrthreadmem.cpp | 2 +- thread/common/omrthreadnuma.c | 2 +- thread/common/omrthreadpriority.c | 2 +- thread/common/omrthreadtls.c | 2 +- thread/common/rasthrsup.c | 2 +- thread/common/rwmutex.c | 2 +- thread/common/thread_internal.h | 2 +- thread/common/threaddef.h | 2 +- thread/common/threadhelpers.cpp | 2 +- thread/common/thrprof.c | 2 +- thread/exports.cmake | 2 +- thread/j9thr.tdf | 2 +- thread/linux/omrthreadnuma.c | 2 +- thread/linux/priority.c | 2 +- thread/makefile | 2 +- thread/omrthreadinspect.c | 2 +- thread/omrthreadinspect.h | 2 +- thread/osx/priority.c | 2 +- thread/thread_include.mk | 2 +- thread/unix/omrthreadattr.c | 2 +- thread/unix/omrthreaddebug.c | 2 +- thread/unix/rasthrsup.c | 2 +- thread/unix/thrcreate.c | 2 +- thread/unix/thrdsup.c | 2 +- thread/unix/unixpriority.c | 2 +- thread/unix/unixpriority.h | 2 +- thread/unix/unixthreadattr.h | 2 +- thread/win32/dllmain.c | 2 +- thread/win32/omrthreadnuma.c | 2 +- thread/win32/priority.c | 2 +- thread/win32/rasthrsup.c | 2 +- thread/win32/thrcreate.c | 2 +- thread/win32/thrdsup.c | 2 +- thread/zos390/omrgetthent.h | 2 +- thread/zos390/omrthreadattr.c | 2 +- thread/zos390/priority.c | 2 +- thread/zos390/rasthrsup.c | 2 +- thread/zos390/thrcputime.s | 4 ++-- tools/CMakeLists.txt | 2 +- tools/compiler/OMRChecker/Makefile | 2 +- tools/compiler/OMRChecker/OMRChecker.cpp | 2 +- tools/compiler/OMRChecker/OMRChecker.hpp | 2 +- tools/compiler/OMRChecker/README.md | 2 +- tools/compiler/OMRChecker/smartmake.sh | 2 +- tools/compiler/OMRChecker/test.py | 2 +- tools/compiler/OMRChecker/testing/__init__.py | 2 +- tools/compiler/OMRChecker/testing/gen_data.py | 2 +- .../OMRChecker/testing/input/bad/doubleExtension.cpp | 2 +- .../testing/input/bad/functionCallUsingCStyleCast.cpp | 2 +- .../testing/input/bad/functionCallUsingExplicitThis.cpp | 2 +- .../testing/input/bad/functionCallUsingImplicitThis.cpp | 2 +- .../input/bad/functionCallUsingReinterpretCast.cpp | 2 +- .../testing/input/bad/oneNonExtBetweenTwoExt.cpp | 2 +- ...staticFunctionCallOnConcreteWithoutScopeResolution.cpp | 2 +- .../testing/input/bad/twoExtExtendOneNonExt.cpp | 2 +- .../bad/unmarkedInheritsFromMarkedInDifferentProject.cpp | 2 +- .../OMRChecker/testing/input/good/extExtendsNonExt.cpp | 2 +- .../input/good/functionCallUsingScopeResolution.cpp | 2 +- .../testing/input/good/functionCallUsingSelf.cpp | 2 +- .../testing/input/good/functionCallUsingStaticCast.cpp | 2 +- .../testing/input/good/selflessCallsInMostDerived.cpp | 2 +- .../testing/input/good/simpleThreeLevelHierarchy.cpp | 2 +- .../staticFunctionCallOnAbstractUsingScopeResolution.cpp | 2 +- .../staticFunctionCallOnConcreteUsingScopeResolution.cpp | 2 +- .../staticFunctionCallOnNonExtWithoutScopeResolution.cpp | 2 +- .../good/staticNonMemberFunctionCallWithNamespace.cpp | 2 +- .../good/staticNonMemberFunctionCallWithoutNamespace.cpp | 2 +- tools/compiler/OMRChecker/testing/tool.py | 2 +- tools/compiler/OMRChecker/testing/tooltester.py | 2 +- tools/compiler/OMRRewriter/Makefile | 2 +- tools/compiler/OMRRewriter/OMRRewriter.cpp | 2 +- tools/compiler/OMRRewriter/test.py | 2 +- tools/compiler/OMRRewriter/testing/__init__.py | 2 +- tools/compiler/OMRRewriter/testing/gen_data.py | 2 +- .../input/bad_with_fix/functionCallUsingCStyleCast.cpp | 2 +- .../bad_with_fix/functionCallUsingCStyleCast.cpp.fixed | 2 +- .../functionCallUsingCStyleCastWithMacros.cpp | 2 +- .../functionCallUsingCStyleCastWithMacros.cpp.fixed | 2 +- .../input/bad_with_fix/functionCallUsingExplicitThis.cpp | 2 +- .../bad_with_fix/functionCallUsingExplicitThis.cpp.fixed | 2 +- .../functionCallUsingExplicitThisMacroInParen.cpp | 2 +- .../functionCallUsingExplicitThisMacroInParen.cpp.fixed | 2 +- .../input/bad_with_fix/functionCallUsingImplicitThis.cpp | 2 +- .../bad_with_fix/functionCallUsingImplicitThis.cpp.fixed | 2 +- .../bad_with_fix/functionCallUsingReinterpretCast.cpp | 2 +- .../functionCallUsingReinterpretCast.cpp.fixed | 2 +- .../functionCallUsingReinterpretCastWithMacros.cpp | 2 +- .../functionCallUsingReinterpretCastWithMacros.cpp.fixed | 2 +- ...staticFunctionCallOnConcreteWithoutScopeResolution.cpp | 2 +- ...FunctionCallOnConcreteWithoutScopeResolution.cpp.fixed | 2 +- .../functionCallUsingExplicitThisMacro.cpp | 2 +- .../input/good_can_fix/functionCallUsingStaticCast.cpp | 2 +- .../good_can_fix/functionCallUsingStaticCast.cpp.fixed | 2 +- .../functionCallUsingStaticCastWithMacros.cpp | 2 +- .../functionCallUsingStaticCastWithMacros.cpp.fixed | 2 +- .../testing/input/good_no_fix/extExtendsNonExt.cpp | 2 +- .../good_no_fix/functionCallUsingScopeResolution.cpp | 2 +- .../testing/input/good_no_fix/functionCallUsingSelf.cpp | 2 +- .../input/good_no_fix/simpleThreeLevelHierarchy.cpp | 2 +- .../staticFunctionCallOnAbstractUsingScopeResolution.cpp | 2 +- .../staticFunctionCallOnConcreteUsingScopeResolution.cpp | 2 +- .../staticFunctionCallOnNonExtWithoutScopeResolution.cpp | 2 +- .../staticNonMemberFunctionCallWithNamespace.cpp | 2 +- .../staticNonMemberFunctionCallWithoutNamespace.cpp | 2 +- tools/compiler/OMRRewriter/testing/tool.py | 2 +- tools/compiler/OMRRewriter/testing/tooltester.py | 2 +- tools/compiler/scripts/armasm2gas.sed | 2 +- tools/compiler/scripts/generateVersion.pl | 2 +- tools/compiler/scripts/guess-platform.sh | 2 +- tools/compiler/scripts/masm2gas.pl | 2 +- tools/compiler/scripts/s390m4check.pl | 2 +- tools/configure | 2 +- tools/configure.ac | 2 +- tools/hookgen/CMakeLists.txt | 2 +- tools/hookgen/HookGen.cpp | 2 +- tools/hookgen/HookGen.hpp | 2 +- tools/hookgen/main.cpp | 2 +- tools/hookgen/makefile | 2 +- tools/toolconfigure.mk.in | 2 +- tools/tracegen/ArgParser.cpp | 2 +- tools/tracegen/ArgParser.hpp | 2 +- tools/tracegen/CFileWriter.cpp | 2 +- tools/tracegen/CFileWriter.hpp | 2 +- tools/tracegen/CMakeLists.txt | 2 +- tools/tracegen/DATFileWriter.cpp | 2 +- tools/tracegen/DATFileWriter.hpp | 2 +- tools/tracegen/EventTypes.hpp | 2 +- tools/tracegen/FileReader.cpp | 2 +- tools/tracegen/FileReader.hpp | 2 +- tools/tracegen/FileUtils.cpp | 2 +- tools/tracegen/FileUtils.hpp | 2 +- tools/tracegen/Port.cpp | 2 +- tools/tracegen/Port.hpp | 2 +- tools/tracegen/StringUtils.cpp | 2 +- tools/tracegen/StringUtils.hpp | 2 +- tools/tracegen/TDFParser.cpp | 2 +- tools/tracegen/TDFParser.hpp | 2 +- tools/tracegen/TDFTypes.hpp | 2 +- tools/tracegen/TraceGen.cpp | 2 +- tools/tracegen/TraceGen.hpp | 2 +- tools/tracegen/TraceHeaderWriter.cpp | 2 +- tools/tracegen/TraceHeaderWriter.hpp | 2 +- tools/tracegen/main.cpp | 2 +- tools/tracegen/makefile | 2 +- tools/tracemerge/CMakeLists.txt | 2 +- tools/tracemerge/DATMerge.cpp | 2 +- tools/tracemerge/DATMerge.hpp | 2 +- tools/tracemerge/main.cpp | 2 +- tools/tracemerge/makefile | 2 +- util/CMakeLists.txt | 2 +- util/a2e/CMakeLists.txt | 2 +- util/a2e/atoe.c | 2 +- util/a2e/atoe_utils.c | 2 +- util/a2e/headers/_Ccsid.h | 2 +- util/a2e/headers/arpa/inet.h | 2 +- util/a2e/headers/atoe.h | 2 +- util/a2e/headers/ctype.h | 2 +- util/a2e/headers/dirent.h | 2 +- util/a2e/headers/dll.h | 2 +- util/a2e/headers/fcntl.h | 2 +- util/a2e/headers/grp.h | 2 +- util/a2e/headers/langinfo.h | 2 +- util/a2e/headers/locale.h | 2 +- util/a2e/headers/netdb.h | 2 +- util/a2e/headers/old-stdio.h | 2 +- util/a2e/headers/old-stdlib.h | 2 +- util/a2e/headers/prefixpath.h | 2 +- util/a2e/headers/pwd.h | 2 +- util/a2e/headers/spawn.h | 2 +- util/a2e/headers/stdio.h | 2 +- util/a2e/headers/stdlib.h | 2 +- util/a2e/headers/string.h | 2 +- util/a2e/headers/strings.h | 2 +- util/a2e/headers/sys/ipc.h | 2 +- util/a2e/headers/sys/stat.h | 2 +- util/a2e/headers/sys/time.h | 2 +- util/a2e/headers/sys/utsname.h | 2 +- util/a2e/headers/time.h | 2 +- util/a2e/headers/unistd.h | 2 +- util/a2e/makefile | 2 +- util/a2e/sysTranslate.c | 2 +- util/avl/CMakeLists.txt | 2 +- util/avl/avl.tdf | 2 +- util/avl/avlsup.c | 2 +- util/avl/makefile | 2 +- util/hashtable/CMakeLists.txt | 2 +- util/hashtable/hash.c | 2 +- util/hashtable/hashtable.c | 2 +- util/hashtable/hashtable.tdf | 2 +- util/hashtable/hashtable_internal.h | 2 +- util/hashtable/makefile | 2 +- util/hookable/CMakeLists.txt | 2 +- util/hookable/hookable.cpp | 2 +- util/hookable/hookable.exportlist | 2 +- util/hookable/hookable_include.mk | 2 +- util/hookable/hookable_internal.h | 2 +- util/hookable/j9hook.tdf | 2 +- util/hookable/makefile | 2 +- util/main_function/CMakeLists.txt | 2 +- util/main_function/main_function.cpp | 2 +- util/omrutil/AtomicFunctions.cpp | 2 +- util/omrutil/CMakeLists.txt | 2 +- util/omrutil/argscan.c | 2 +- util/omrutil/detectVMDirectory.c | 2 +- util/omrutil/gettimebase.c | 2 +- util/omrutil/j9memclr.cpp | 2 +- util/omrutil/makefile | 2 +- util/omrutil/omrcrc32.c | 2 +- util/omrutil/poolForPort.c | 2 +- util/omrutil/primeNumberHelper.c | 2 +- util/omrutil/ranking.c | 2 +- util/omrutil/spacesaving.c | 2 +- util/omrutil/stricmp.c | 2 +- util/omrutil/threadhelp.c | 2 +- util/omrutil/thrname_core.c | 2 +- util/omrutil/unix/aix/32/cas8help.s | 2 +- util/omrutil/unix/linux/ppc/32/cas8help.s | 2 +- util/omrutil/unix/linux/ppc/64le/gettoc.s | 2 +- util/omrutil/unix/linux/riscv/32/cas32helper.s | 2 +- util/omrutil/unix/linux/riscv/64/cas64helper.s | 2 +- util/omrutil/unix/linux/s390/31/j9memclrz10_31.s | 2 +- util/omrutil/unix/linux/s390/64/j9memclrz10_64.s | 2 +- util/omrutil/unix/linux/s390/archinfo.c | 2 +- util/omrutil/unix/zos/31/j9memclrz10_31.s | 4 ++-- util/omrutil/unix/zos/31/omrceetbck.s | 4 ++-- util/omrutil/unix/zos/31/zbarrier.s | 4 ++-- util/omrutil/unix/zos/64/j9memclrz10_64.s | 4 ++-- .../zos/64/omrget_userExtendedPrivateAreaMemoryType.s | 4 ++-- util/omrutil/unix/zos/64/zbarrier.s | 4 ++-- util/omrutil/unix/zos/getpsw.s | 4 ++-- util/omrutil/unix/zos/getstoragekey.c | 2 +- util/omrutil/unix/zos/omrgetdsa.s | 6 +++--- util/omrutil/unix/zos/zosversion.c | 2 +- util/omrutil/utf8decode.c | 2 +- util/omrutil/utf8encode.c | 2 +- util/omrutil/util.tdf | 2 +- util/omrutil/utilcore.tdf | 2 +- util/omrutil/wildcard.c | 2 +- util/omrutil/win/omrgetdbghelp.c | 2 +- util/omrutil/xlphelp.c | 2 +- util/omrutil/xml.c | 2 +- util/pool/CMakeLists.txt | 2 +- util/pool/makefile | 2 +- util/pool/pool.c | 2 +- util/pool/pool.tdf | 2 +- util/pool/pool_cap.c | 2 +- util/pool/pool_internal.h | 2 +- 3263 files changed, 3309 insertions(+), 3313 deletions(-) diff --git a/.gitignore b/.gitignore index 2c7dce41eeb..4e9768fbf91 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### build/ diff --git a/CMakeLists.txt b/CMakeLists.txt index e6eb238b96f..2f85b199139 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # TODO: OMR_RTTI flag diff --git a/CODEOWNERS b/CODEOWNERS index 45f4d800aad..3d23f1c2439 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # Global project leads/owners diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3897cb462de..b69369314fe 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Contributing to Eclipse OMR @@ -389,6 +389,6 @@ The template for the copyright notice and dual-license is as follows: * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ ``` diff --git a/GNUmakefile b/GNUmakefile index ed90852c0c7..eaac008523a 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### top_srcdir := . diff --git a/INSTALL b/INSTALL index d455cd41641..cc0ce078c5c 100644 --- a/INSTALL +++ b/INSTALL @@ -16,7 +16,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 Building OMR diff --git a/LICENSE b/LICENSE index 9dc8babfdc3..a68bfb8d5fc 100644 --- a/LICENSE +++ b/LICENSE @@ -13,7 +13,7 @@ with the GNU Classpath Exception [1] and GNU General Public License, version 2 w [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 Subject to the following notices: diff --git a/README.md b/README.md index 198074a47c8..80a8288e5c5 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OMR diff --git a/about.html b/about.html index 64bea9cbf39..bdccf36d901 100644 --- a/about.html +++ b/about.html @@ -23,7 +23,7 @@

License

[1] https://www.gnu.org/software/classpath/license.html
[2] https://openjdk.org/legal/assembly-exception.html

-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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0

If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3fce63a69a5..63c09c397ff 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### trigger: diff --git a/buildenv/docker/doBuild.sh b/buildenv/docker/doBuild.sh index bae8dd0b80f..21e1b1fd4ec 100644 --- a/buildenv/docker/doBuild.sh +++ b/buildenv/docker/doBuild.sh @@ -18,7 +18,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 cd $OMRDIR diff --git a/buildenv/docker/x86_64/ubuntu20/Dockerfile b/buildenv/docker/x86_64/ubuntu20/Dockerfile index 7c21b367bc9..1f31211dd8d 100644 --- a/buildenv/docker/x86_64/ubuntu20/Dockerfile +++ b/buildenv/docker/x86_64/ubuntu20/Dockerfile @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # Create the OMR build environment with Ubuntu 20.04. diff --git a/buildenv/jenkins/README.md b/buildenv/jenkins/README.md index 5be693af3a5..a2a55836515 100644 --- a/buildenv/jenkins/README.md +++ b/buildenv/jenkins/README.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> [Eclipse OMR Jenkins Builds](https://ci.eclipse.org/omr/) diff --git a/buildenv/jenkins/omrbuild.groovy b/buildenv/jenkins/omrbuild.groovy index c0d0437fdef..899bd71ae54 100644 --- a/buildenv/jenkins/omrbuild.groovy +++ b/buildenv/jenkins/omrbuild.groovy @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ defaultCompile = 'make -j4' diff --git a/buildenv/jenkins/refRepoUpdater.groovy b/buildenv/jenkins/refRepoUpdater.groovy index 537491ef2ed..57fc06118d1 100644 --- a/buildenv/jenkins/refRepoUpdater.groovy +++ b/buildenv/jenkins/refRepoUpdater.groovy @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ LABEL = (params.LABEL) ? params.LABEL : '!zOS&&!master&&!proxy' diff --git a/cmake/CheckSourceTree.cmake b/cmake/CheckSourceTree.cmake index 14cd7dbb1eb..83884894428 100644 --- a/cmake/CheckSourceTree.cmake +++ b/cmake/CheckSourceTree.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # Ensure the source tree hasn't been used for building before. diff --git a/cmake/caches/GcApi.cmake b/cmake/caches/GcApi.cmake index 3a34d19fd2b..1e456d8c322 100644 --- a/cmake/caches/GcApi.cmake +++ b/cmake/caches/GcApi.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# # A cache for enabling the extended GC APIs diff --git a/cmake/caches/Travis.cmake b/cmake/caches/Travis.cmake index 49f9500155f..0fecd91543b 100644 --- a/cmake/caches/Travis.cmake +++ b/cmake/caches/Travis.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# set(OMR_COMPILER ON CACHE BOOL "") diff --git a/cmake/caches/Windows.cmake b/cmake/caches/Windows.cmake index 3134a27200b..6f85d0ab47a 100644 --- a/cmake/caches/Windows.cmake +++ b/cmake/caches/Windows.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### set(OMR_COMPILER ON CACHE BOOL "") diff --git a/cmake/config.cmake b/cmake/config.cmake index b569bd08359..9eee30088eb 100644 --- a/cmake/config.cmake +++ b/cmake/config.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# set(OMR_WARNINGS_AS_ERRORS ON CACHE BOOL "Treat compile warnings as errors") diff --git a/cmake/modules/FindDiaSDK.cmake b/cmake/modules/FindDiaSDK.cmake index 8208cbee646..732f410d36f 100644 --- a/cmake/modules/FindDiaSDK.cmake +++ b/cmake/modules/FindDiaSDK.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# # Find DIA SDK diff --git a/cmake/modules/FindLibDwarf.cmake b/cmake/modules/FindLibDwarf.cmake index 59773d3d527..3992e0eb175 100644 --- a/cmake/modules/FindLibDwarf.cmake +++ b/cmake/modules/FindLibDwarf.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# # Find libdwarf. diff --git a/cmake/modules/FindLibElf.cmake b/cmake/modules/FindLibElf.cmake index c10f1987835..a873f16e93e 100644 --- a/cmake/modules/FindLibElf.cmake +++ b/cmake/modules/FindLibElf.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# # Find libelf diff --git a/cmake/modules/FindLibZ.cmake b/cmake/modules/FindLibZ.cmake index c70754ceedc..d68e2961df1 100644 --- a/cmake/modules/FindLibZ.cmake +++ b/cmake/modules/FindLibZ.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# # Find libz diff --git a/cmake/modules/FindOmrCuda.cmake b/cmake/modules/FindOmrCuda.cmake index 31e6cb778ec..485a6bea84b 100644 --- a/cmake/modules/FindOmrCuda.cmake +++ b/cmake/modules/FindOmrCuda.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# # This module locates a minimal set of cuda headers, required by the OMR_OPT_CUDA flag. diff --git a/cmake/modules/OmrAssert.cmake b/cmake/modules/OmrAssert.cmake index 6a361b2e722..6ee48a42fd2 100644 --- a/cmake/modules/OmrAssert.cmake +++ b/cmake/modules/OmrAssert.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# # Include once diff --git a/cmake/modules/OmrCompilerSupport.cmake b/cmake/modules/OmrCompilerSupport.cmake index 9c9cd7fe532..a74b1e2cca8 100644 --- a/cmake/modules/OmrCompilerSupport.cmake +++ b/cmake/modules/OmrCompilerSupport.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# # Include once diff --git a/cmake/modules/OmrCrossCompile.cmake b/cmake/modules/OmrCrossCompile.cmake index af9ad586aec..828cc0aaeec 100644 --- a/cmake/modules/OmrCrossCompile.cmake +++ b/cmake/modules/OmrCrossCompile.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# if(OMR_CROSS_COMPILE_) diff --git a/cmake/modules/OmrDDRSupport.cmake b/cmake/modules/OmrDDRSupport.cmake index 1281dfe555b..d09bd3dfa0a 100644 --- a/cmake/modules/OmrDDRSupport.cmake +++ b/cmake/modules/OmrDDRSupport.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# if(_OMR_DDR_SUPPORT) diff --git a/cmake/modules/OmrDetectSystemInformation.cmake b/cmake/modules/OmrDetectSystemInformation.cmake index 1529a4ab5fc..00ed7612258 100644 --- a/cmake/modules/OmrDetectSystemInformation.cmake +++ b/cmake/modules/OmrDetectSystemInformation.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# include(CheckSymbolExists) diff --git a/cmake/modules/OmrFindFiles.cmake b/cmake/modules/OmrFindFiles.cmake index 590eeb884f4..73481b3541f 100644 --- a/cmake/modules/OmrFindFiles.cmake +++ b/cmake/modules/OmrFindFiles.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# include(OmrAssert) diff --git a/cmake/modules/OmrHookgen.cmake b/cmake/modules/OmrHookgen.cmake index 857451a73ae..bea370c90cf 100644 --- a/cmake/modules/OmrHookgen.cmake +++ b/cmake/modules/OmrHookgen.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### if(OMR_HOOKGEN_) diff --git a/cmake/modules/OmrMetalC.cmake b/cmake/modules/OmrMetalC.cmake index ff60efc3b54..03ecfaf0e5c 100644 --- a/cmake/modules/OmrMetalC.cmake +++ b/cmake/modules/OmrMetalC.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # Include once. diff --git a/cmake/modules/OmrMsvcRuntime.cmake b/cmake/modules/OmrMsvcRuntime.cmake index 64b93340969..d71b735a976 100644 --- a/cmake/modules/OmrMsvcRuntime.cmake +++ b/cmake/modules/OmrMsvcRuntime.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # Find the MSVC Runtime libraries. diff --git a/cmake/modules/OmrOption.cmake b/cmake/modules/OmrOption.cmake index 922ace35eb3..e2c3e9c4a03 100644 --- a/cmake/modules/OmrOption.cmake +++ b/cmake/modules/OmrOption.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# #[==========[ .rst diff --git a/cmake/modules/OmrPlatform.cmake b/cmake/modules/OmrPlatform.cmake index 4287686f6a2..6c2b098d869 100644 --- a/cmake/modules/OmrPlatform.cmake +++ b/cmake/modules/OmrPlatform.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# if(OMR_PLATFORM_) diff --git a/cmake/modules/OmrSanitizerSupport.cmake b/cmake/modules/OmrSanitizerSupport.cmake index 5f06329fcf8..9aa401648f9 100644 --- a/cmake/modules/OmrSanitizerSupport.cmake +++ b/cmake/modules/OmrSanitizerSupport.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### include(OmrUtility) diff --git a/cmake/modules/OmrTargetSupport.cmake b/cmake/modules/OmrTargetSupport.cmake index 4a10d16831f..05e3f7aacc0 100644 --- a/cmake/modules/OmrTargetSupport.cmake +++ b/cmake/modules/OmrTargetSupport.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# if(OMR_TARGET_SUPPORT) diff --git a/cmake/modules/OmrTest.cmake b/cmake/modules/OmrTest.cmake index 9e3d1f3a5a0..b5a1be7ce79 100644 --- a/cmake/modules/OmrTest.cmake +++ b/cmake/modules/OmrTest.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### if(OMR_TEST_) diff --git a/cmake/modules/OmrTracegen.cmake b/cmake/modules/OmrTracegen.cmake index 6a41f523172..b8ac5df06ac 100644 --- a/cmake/modules/OmrTracegen.cmake +++ b/cmake/modules/OmrTracegen.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### if(OMR_TRACEGEN_) diff --git a/cmake/modules/OmrUtility.cmake b/cmake/modules/OmrUtility.cmake index 49c2a9b6958..9d7312816c9 100644 --- a/cmake/modules/OmrUtility.cmake +++ b/cmake/modules/OmrUtility.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# # Include once diff --git a/cmake/modules/ddr/DDRSetStub.cmake.in b/cmake/modules/ddr/DDRSetStub.cmake.in index 8a59c4b43d1..71e3bd1dc21 100644 --- a/cmake/modules/ddr/DDRSetStub.cmake.in +++ b/cmake/modules/ddr/DDRSetStub.cmake.in @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# cmake_minimum_required(VERSION 3.3 FATAL_ERROR) diff --git a/cmake/modules/ddr/GenerateStub.cmake b/cmake/modules/ddr/GenerateStub.cmake index b833d434392..00c83cfd4ce 100644 --- a/cmake/modules/ddr/GenerateStub.cmake +++ b/cmake/modules/ddr/GenerateStub.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# if(NOT input_file) diff --git a/cmake/modules/ddr/cmake_ddr.awk b/cmake/modules/ddr/cmake_ddr.awk index 9c061143931..8fe24005b48 100644 --- a/cmake/modules/ddr/cmake_ddr.awk +++ b/cmake/modules/ddr/cmake_ddr.awk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# function get_basename() { diff --git a/cmake/modules/platform/arch/aarch64.cmake b/cmake/modules/platform/arch/aarch64.cmake index 1d69cdf6fcb..f1eb7401d88 100644 --- a/cmake/modules/platform/arch/aarch64.cmake +++ b/cmake/modules/platform/arch/aarch64.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# list(APPEND OMR_PLATFORM_DEFINITIONS diff --git a/cmake/modules/platform/arch/arm.cmake b/cmake/modules/platform/arch/arm.cmake index 57c91ac0620..fdb955f43ae 100644 --- a/cmake/modules/platform/arch/arm.cmake +++ b/cmake/modules/platform/arch/arm.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# list(APPEND OMR_PLATFORM_DEFINITIONS diff --git a/cmake/modules/platform/arch/ppc.cmake b/cmake/modules/platform/arch/ppc.cmake index f0e97309b4d..2790cee0e60 100644 --- a/cmake/modules/platform/arch/ppc.cmake +++ b/cmake/modules/platform/arch/ppc.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### if(OMR_ENV_DATA64) diff --git a/cmake/modules/platform/arch/riscv.cmake b/cmake/modules/platform/arch/riscv.cmake index f03bb51ea82..097a153b3bf 100644 --- a/cmake/modules/platform/arch/riscv.cmake +++ b/cmake/modules/platform/arch/riscv.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### if(OMR_ENV_DATA64) diff --git a/cmake/modules/platform/arch/s390.cmake b/cmake/modules/platform/arch/s390.cmake index bda5ef6c900..e095dfb490e 100644 --- a/cmake/modules/platform/arch/s390.cmake +++ b/cmake/modules/platform/arch/s390.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # Testarossa build variables. Longer term the distinction between TR and the rest diff --git a/cmake/modules/platform/arch/x86.cmake b/cmake/modules/platform/arch/x86.cmake index 73b094611bc..85cd5ae30d4 100644 --- a/cmake/modules/platform/arch/x86.cmake +++ b/cmake/modules/platform/arch/x86.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# if(OMR_ENV_DATA64) diff --git a/cmake/modules/platform/os/aix.cmake b/cmake/modules/platform/os/aix.cmake index 76baeb008bd..21c0b0d6860 100644 --- a/cmake/modules/platform/os/aix.cmake +++ b/cmake/modules/platform/os/aix.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### include(OmrAssert) diff --git a/cmake/modules/platform/os/bsd.cmake b/cmake/modules/platform/os/bsd.cmake index e0b540090e6..798ef6bacbb 100644 --- a/cmake/modules/platform/os/bsd.cmake +++ b/cmake/modules/platform/os/bsd.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# set(OMR_PLATFORM_DEFINITIONS diff --git a/cmake/modules/platform/os/linux.cmake b/cmake/modules/platform/os/linux.cmake index fe1621e1c2c..59bb60e9421 100644 --- a/cmake/modules/platform/os/linux.cmake +++ b/cmake/modules/platform/os/linux.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# include(CheckSymbolExists) diff --git a/cmake/modules/platform/os/osx.cmake b/cmake/modules/platform/os/osx.cmake index d02bf392be2..70f9cf639ce 100644 --- a/cmake/modules/platform/os/osx.cmake +++ b/cmake/modules/platform/os/osx.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# list(APPEND OMR_PLATFORM_DEFINITIONS diff --git a/cmake/modules/platform/os/win.cmake b/cmake/modules/platform/os/win.cmake index 2be353172f2..6e6fd43f7c7 100644 --- a/cmake/modules/platform/os/win.cmake +++ b/cmake/modules/platform/os/win.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# list(APPEND OMR_PLATFORM_DEFINITIONS diff --git a/cmake/modules/platform/os/zos.cmake b/cmake/modules/platform/os/zos.cmake index 9ff4a0b6cf0..7cfd04d191f 100644 --- a/cmake/modules/platform/os/zos.cmake +++ b/cmake/modules/platform/os/zos.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# list(APPEND OMR_PLATFORM_DEFINITIONS diff --git a/cmake/modules/platform/toolcfg/gnu.cmake b/cmake/modules/platform/toolcfg/gnu.cmake index b87155a9141..9688d0ddbaa 100644 --- a/cmake/modules/platform/toolcfg/gnu.cmake +++ b/cmake/modules/platform/toolcfg/gnu.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# set(OMR_C_WARNINGS_AS_ERROR_FLAG -Werror) diff --git a/cmake/modules/platform/toolcfg/gnu_exports.exp.in b/cmake/modules/platform/toolcfg/gnu_exports.exp.in index 9f6e1553a00..ce7c5c4e27d 100644 --- a/cmake/modules/platform/toolcfg/gnu_exports.exp.in +++ b/cmake/modules/platform/toolcfg/gnu_exports.exp.in @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ { diff --git a/cmake/modules/platform/toolcfg/msvc.cmake b/cmake/modules/platform/toolcfg/msvc.cmake index ca1d77d7e39..8b7efdef2e0 100644 --- a/cmake/modules/platform/toolcfg/msvc.cmake +++ b/cmake/modules/platform/toolcfg/msvc.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# include(OmrUtility) diff --git a/cmake/modules/platform/toolcfg/msvc_exports.def.in b/cmake/modules/platform/toolcfg/msvc_exports.def.in index a402ae50f36..e7e49b99335 100644 --- a/cmake/modules/platform/toolcfg/msvc_exports.def.in +++ b/cmake/modules/platform/toolcfg/msvc_exports.def.in @@ -16,7 +16,7 @@ ; [1] https://www.gnu.org/software/classpath/license.html ; [2] https://openjdk.org/legal/assembly-exception.html ; -; 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 +; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; EXPORTS diff --git a/cmake/modules/platform/toolcfg/verify.cmake b/cmake/modules/platform/toolcfg/verify.cmake index c7758f63933..ed4dd553b71 100644 --- a/cmake/modules/platform/toolcfg/verify.cmake +++ b/cmake/modules/platform/toolcfg/verify.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# omr_assert(WARNING TEST DEFINED OMR_C_WARNINGS_AS_ERROR_FLAG) diff --git a/cmake/modules/platform/toolcfg/xlc.cmake b/cmake/modules/platform/toolcfg/xlc.cmake index 8a926d6f442..4011bd10ae3 100644 --- a/cmake/modules/platform/toolcfg/xlc.cmake +++ b/cmake/modules/platform/toolcfg/xlc.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### if(CMAKE_C_COMPILER_IS_XLCLANG) diff --git a/cmake/modules/platform/toolcfg/xlc_exports.exp.in b/cmake/modules/platform/toolcfg/xlc_exports.exp.in index 853d775c0a6..a92c9bedf67 100644 --- a/cmake/modules/platform/toolcfg/xlc_exports.exp.in +++ b/cmake/modules/platform/toolcfg/xlc_exports.exp.in @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* 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 +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ***************************************************************************** $, diff --git a/cmake/modules/platform/toolcfg/zos_rename_exports.cmake b/cmake/modules/platform/toolcfg/zos_rename_exports.cmake index ad36c4a74f6..52bb7e4102c 100644 --- a/cmake/modules/platform/toolcfg/zos_rename_exports.cmake +++ b/cmake/modules/platform/toolcfg/zos_rename_exports.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# # Inputs: diff --git a/cmake/toolchains/aarch64-linux-cross.cmake b/cmake/toolchains/aarch64-linux-cross.cmake index d4b4b7b8477..ef47de382a8 100644 --- a/cmake/toolchains/aarch64-linux-cross.cmake +++ b/cmake/toolchains/aarch64-linux-cross.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# SET(CMAKE_SYSTEM_PROCESSOR aarch64) diff --git a/cmake/toolchains/riscv64-linux-cross.cmake b/cmake/toolchains/riscv64-linux-cross.cmake index 098065155e1..34b86adb216 100644 --- a/cmake/toolchains/riscv64-linux-cross.cmake +++ b/cmake/toolchains/riscv64-linux-cross.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# SET(CMAKE_SYSTEM_PROCESSOR riscv64) diff --git a/cmake/versions.cmake b/cmake/versions.cmake index a3ba50aa9ef..29a73f1060c 100644 --- a/cmake/versions.cmake +++ b/cmake/versions.cmake @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# set(OMR_VERSION_MAJOR 0) diff --git a/compiler/CMakeLists.txt b/compiler/CMakeLists.txt index ebe02230419..7e4d96771de 100644 --- a/compiler/CMakeLists.txt +++ b/compiler/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### include(OmrCompilerSupport) diff --git a/compiler/README.md b/compiler/README.md index 44297c4e2f5..ae979b4aab6 100644 --- a/compiler/README.md +++ b/compiler/README.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OMR Compiler Technology diff --git a/compiler/aarch64/CMakeLists.txt b/compiler/aarch64/CMakeLists.txt index 819f2e27cc1..e107a6e2a61 100644 --- a/compiler/aarch64/CMakeLists.txt +++ b/compiler/aarch64/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### compiler_library(aarch64 diff --git a/compiler/aarch64/codegen/ARM64BinaryEncoding.cpp b/compiler/aarch64/codegen/ARM64BinaryEncoding.cpp index 5c872d0037f..5f935bee5f1 100644 --- a/compiler/aarch64/codegen/ARM64BinaryEncoding.cpp +++ b/compiler/aarch64/codegen/ARM64BinaryEncoding.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/aarch64/codegen/ARM64ConditionCode.hpp b/compiler/aarch64/codegen/ARM64ConditionCode.hpp index 3a8df90725a..890c77308a4 100644 --- a/compiler/aarch64/codegen/ARM64ConditionCode.hpp +++ b/compiler/aarch64/codegen/ARM64ConditionCode.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARM64CONDITIONCODE_INCL diff --git a/compiler/aarch64/codegen/ARM64Debug.cpp b/compiler/aarch64/codegen/ARM64Debug.cpp index 82e7c2f27e3..dd79db0880d 100644 --- a/compiler/aarch64/codegen/ARM64Debug.cpp +++ b/compiler/aarch64/codegen/ARM64Debug.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/aarch64/codegen/ARM64HelperCallSnippet.cpp b/compiler/aarch64/codegen/ARM64HelperCallSnippet.cpp index f640f7207ef..2ea273e3c0e 100644 --- a/compiler/aarch64/codegen/ARM64HelperCallSnippet.cpp +++ b/compiler/aarch64/codegen/ARM64HelperCallSnippet.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/ARM64HelperCallSnippet.hpp" diff --git a/compiler/aarch64/codegen/ARM64HelperCallSnippet.hpp b/compiler/aarch64/codegen/ARM64HelperCallSnippet.hpp index e16dea9ceee..abc3dfe6529 100644 --- a/compiler/aarch64/codegen/ARM64HelperCallSnippet.hpp +++ b/compiler/aarch64/codegen/ARM64HelperCallSnippet.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARM64HELPERCALLSNIPPET_INCL diff --git a/compiler/aarch64/codegen/ARM64Instruction.cpp b/compiler/aarch64/codegen/ARM64Instruction.cpp index 0adb2974207..9f46b9a0061 100644 --- a/compiler/aarch64/codegen/ARM64Instruction.cpp +++ b/compiler/aarch64/codegen/ARM64Instruction.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/ARM64Instruction.hpp" diff --git a/compiler/aarch64/codegen/ARM64Instruction.hpp b/compiler/aarch64/codegen/ARM64Instruction.hpp index 643ec1358bf..d6e9abf7b87 100644 --- a/compiler/aarch64/codegen/ARM64Instruction.hpp +++ b/compiler/aarch64/codegen/ARM64Instruction.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARM64INSTRUCTION_INCL diff --git a/compiler/aarch64/codegen/ARM64OutOfLineCodeSection.cpp b/compiler/aarch64/codegen/ARM64OutOfLineCodeSection.cpp index c460ed35376..514a40235f7 100644 --- a/compiler/aarch64/codegen/ARM64OutOfLineCodeSection.cpp +++ b/compiler/aarch64/codegen/ARM64OutOfLineCodeSection.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/ARM64OutOfLineCodeSection.hpp" diff --git a/compiler/aarch64/codegen/ARM64OutOfLineCodeSection.hpp b/compiler/aarch64/codegen/ARM64OutOfLineCodeSection.hpp index e97c6bf7474..88c71262fd8 100644 --- a/compiler/aarch64/codegen/ARM64OutOfLineCodeSection.hpp +++ b/compiler/aarch64/codegen/ARM64OutOfLineCodeSection.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARM64OUTOFLINECODESECTION_INCL diff --git a/compiler/aarch64/codegen/ARM64ShiftCode.hpp b/compiler/aarch64/codegen/ARM64ShiftCode.hpp index 3970159fbdf..0820d4ab02b 100644 --- a/compiler/aarch64/codegen/ARM64ShiftCode.hpp +++ b/compiler/aarch64/codegen/ARM64ShiftCode.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARM64SHIFTCODE_INCL diff --git a/compiler/aarch64/codegen/ARM64SystemLinkage.cpp b/compiler/aarch64/codegen/ARM64SystemLinkage.cpp index bc6d0b1c1bf..bc81f2d3e9c 100644 --- a/compiler/aarch64/codegen/ARM64SystemLinkage.cpp +++ b/compiler/aarch64/codegen/ARM64SystemLinkage.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/aarch64/codegen/ARM64SystemLinkage.hpp b/compiler/aarch64/codegen/ARM64SystemLinkage.hpp index 297b4b14452..1accb9bfc81 100644 --- a/compiler/aarch64/codegen/ARM64SystemLinkage.hpp +++ b/compiler/aarch64/codegen/ARM64SystemLinkage.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM64_SYSTEMLINKAGE_INCL diff --git a/compiler/aarch64/codegen/BinaryEvaluator.cpp b/compiler/aarch64/codegen/BinaryEvaluator.cpp index a350766deee..ec35be101c6 100644 --- a/compiler/aarch64/codegen/BinaryEvaluator.cpp +++ b/compiler/aarch64/codegen/BinaryEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/ARM64Instruction.hpp" diff --git a/compiler/aarch64/codegen/ConstantDataSnippet.cpp b/compiler/aarch64/codegen/ConstantDataSnippet.cpp index 5af1e15a03d..c372698b832 100644 --- a/compiler/aarch64/codegen/ConstantDataSnippet.cpp +++ b/compiler/aarch64/codegen/ConstantDataSnippet.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "aarch64/codegen/ConstantDataSnippet.hpp" diff --git a/compiler/aarch64/codegen/ConstantDataSnippet.hpp b/compiler/aarch64/codegen/ConstantDataSnippet.hpp index 9db8266b703..936a2ec073a 100644 --- a/compiler/aarch64/codegen/ConstantDataSnippet.hpp +++ b/compiler/aarch64/codegen/ConstantDataSnippet.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARM64CONSTANTDATASNIPPET_INCL diff --git a/compiler/aarch64/codegen/ControlFlowEvaluator.cpp b/compiler/aarch64/codegen/ControlFlowEvaluator.cpp index 4ba2dad730d..dd534d34e0c 100644 --- a/compiler/aarch64/codegen/ControlFlowEvaluator.cpp +++ b/compiler/aarch64/codegen/ControlFlowEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/ARM64ConditionCode.hpp" diff --git a/compiler/aarch64/codegen/FPTreeEvaluator.cpp b/compiler/aarch64/codegen/FPTreeEvaluator.cpp index 80dc90cfae3..309c3f34269 100644 --- a/compiler/aarch64/codegen/FPTreeEvaluator.cpp +++ b/compiler/aarch64/codegen/FPTreeEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CodeGenerator.hpp" diff --git a/compiler/aarch64/codegen/GenerateInstructions.cpp b/compiler/aarch64/codegen/GenerateInstructions.cpp index e2cdf6eb131..b27aa9ab369 100644 --- a/compiler/aarch64/codegen/GenerateInstructions.cpp +++ b/compiler/aarch64/codegen/GenerateInstructions.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "aarch64/codegen/GenerateInstructions.hpp" diff --git a/compiler/aarch64/codegen/GenerateInstructions.hpp b/compiler/aarch64/codegen/GenerateInstructions.hpp index fa0ee38301b..b5004aac577 100644 --- a/compiler/aarch64/codegen/GenerateInstructions.hpp +++ b/compiler/aarch64/codegen/GenerateInstructions.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef GENERATE_INSTRUCTIONS_INCL diff --git a/compiler/aarch64/codegen/InstOpCode.hpp b/compiler/aarch64/codegen/InstOpCode.hpp index 0f8650c982b..21eabc17469 100644 --- a/compiler/aarch64/codegen/InstOpCode.hpp +++ b/compiler/aarch64/codegen/InstOpCode.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_ARM64_INSTOPCODE_INCL diff --git a/compiler/aarch64/codegen/Instruction.hpp b/compiler/aarch64/codegen/Instruction.hpp index 3da724e98e6..3b14bd12460 100644 --- a/compiler/aarch64/codegen/Instruction.hpp +++ b/compiler/aarch64/codegen/Instruction.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_INSTRUCTION_INCL diff --git a/compiler/aarch64/codegen/Linkage.hpp b/compiler/aarch64/codegen/Linkage.hpp index fc963e05b18..6fb40c3e507 100644 --- a/compiler/aarch64/codegen/Linkage.hpp +++ b/compiler/aarch64/codegen/Linkage.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_LINKAGE_INCL diff --git a/compiler/aarch64/codegen/MemoryReference.hpp b/compiler/aarch64/codegen/MemoryReference.hpp index fcd9fbf7f44..21cb2d4b1c7 100644 --- a/compiler/aarch64/codegen/MemoryReference.hpp +++ b/compiler/aarch64/codegen/MemoryReference.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_MEMORYREFERENCE_INCL diff --git a/compiler/aarch64/codegen/OMRCodeGenerator.cpp b/compiler/aarch64/codegen/OMRCodeGenerator.cpp index 66674e4a396..de3bb9d0219 100644 --- a/compiler/aarch64/codegen/OMRCodeGenerator.cpp +++ b/compiler/aarch64/codegen/OMRCodeGenerator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/aarch64/codegen/OMRCodeGenerator.hpp b/compiler/aarch64/codegen/OMRCodeGenerator.hpp index c710899f155..2d2f09374b7 100644 --- a/compiler/aarch64/codegen/OMRCodeGenerator.hpp +++ b/compiler/aarch64/codegen/OMRCodeGenerator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM64_CODEGENERATOR_INCL diff --git a/compiler/aarch64/codegen/OMRInstOpCode.enum b/compiler/aarch64/codegen/OMRInstOpCode.enum index c2b1a912b75..2447aaab261 100644 --- a/compiler/aarch64/codegen/OMRInstOpCode.enum +++ b/compiler/aarch64/codegen/OMRInstOpCode.enum @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/aarch64/codegen/OMRInstOpCode.hpp b/compiler/aarch64/codegen/OMRInstOpCode.hpp index 8a0e0e2df4d..e1655a77c6d 100644 --- a/compiler/aarch64/codegen/OMRInstOpCode.hpp +++ b/compiler/aarch64/codegen/OMRInstOpCode.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM64_INSTOPCODE_INCL diff --git a/compiler/aarch64/codegen/OMRInstruction.cpp b/compiler/aarch64/codegen/OMRInstruction.cpp index 66107f211bd..ff0257c7f17 100644 --- a/compiler/aarch64/codegen/OMRInstruction.cpp +++ b/compiler/aarch64/codegen/OMRInstruction.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/aarch64/codegen/OMRInstruction.hpp b/compiler/aarch64/codegen/OMRInstruction.hpp index e9171a55a97..a4de528365c 100644 --- a/compiler/aarch64/codegen/OMRInstruction.hpp +++ b/compiler/aarch64/codegen/OMRInstruction.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM64_INSTRUCTION_INCL diff --git a/compiler/aarch64/codegen/OMRInstructionDelegate.cpp b/compiler/aarch64/codegen/OMRInstructionDelegate.cpp index b6194e1f13b..40178f00cbf 100644 --- a/compiler/aarch64/codegen/OMRInstructionDelegate.cpp +++ b/compiler/aarch64/codegen/OMRInstructionDelegate.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/InstructionDelegate.hpp" diff --git a/compiler/aarch64/codegen/OMRInstructionDelegate.hpp b/compiler/aarch64/codegen/OMRInstructionDelegate.hpp index 91a9e45e337..838e2cafa5c 100644 --- a/compiler/aarch64/codegen/OMRInstructionDelegate.hpp +++ b/compiler/aarch64/codegen/OMRInstructionDelegate.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM64_INSTRUCTIONDELEGATE_INCL diff --git a/compiler/aarch64/codegen/OMRInstructionKindEnum.hpp b/compiler/aarch64/codegen/OMRInstructionKindEnum.hpp index ab9a8baa280..f812766002e 100644 --- a/compiler/aarch64/codegen/OMRInstructionKindEnum.hpp +++ b/compiler/aarch64/codegen/OMRInstructionKindEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/aarch64/codegen/OMRLinkage.cpp b/compiler/aarch64/codegen/OMRLinkage.cpp index ffde0094206..584e399d452 100644 --- a/compiler/aarch64/codegen/OMRLinkage.cpp +++ b/compiler/aarch64/codegen/OMRLinkage.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/aarch64/codegen/OMRLinkage.hpp b/compiler/aarch64/codegen/OMRLinkage.hpp index d2bf079d2ae..363397c6955 100644 --- a/compiler/aarch64/codegen/OMRLinkage.hpp +++ b/compiler/aarch64/codegen/OMRLinkage.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM64_LINKAGE_INCL diff --git a/compiler/aarch64/codegen/OMRLinkage_inlines.hpp b/compiler/aarch64/codegen/OMRLinkage_inlines.hpp index 2978bd45754..53130f5dda5 100644 --- a/compiler/aarch64/codegen/OMRLinkage_inlines.hpp +++ b/compiler/aarch64/codegen/OMRLinkage_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM64_LINKAGE_INLINES_INCL diff --git a/compiler/aarch64/codegen/OMRMachine.cpp b/compiler/aarch64/codegen/OMRMachine.cpp index 892a103be4a..0a466ed7198 100644 --- a/compiler/aarch64/codegen/OMRMachine.cpp +++ b/compiler/aarch64/codegen/OMRMachine.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/aarch64/codegen/OMRMachine.hpp b/compiler/aarch64/codegen/OMRMachine.hpp index 5dffcf534f2..bb48b4675e3 100644 --- a/compiler/aarch64/codegen/OMRMachine.hpp +++ b/compiler/aarch64/codegen/OMRMachine.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM64_MACHINE_INCL diff --git a/compiler/aarch64/codegen/OMRMemoryReference.cpp b/compiler/aarch64/codegen/OMRMemoryReference.cpp index 1077c39c30c..c4b0962c3fd 100644 --- a/compiler/aarch64/codegen/OMRMemoryReference.cpp +++ b/compiler/aarch64/codegen/OMRMemoryReference.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/MemoryReference.hpp" diff --git a/compiler/aarch64/codegen/OMRMemoryReference.hpp b/compiler/aarch64/codegen/OMRMemoryReference.hpp index 1086b8a34bb..a379c73247f 100644 --- a/compiler/aarch64/codegen/OMRMemoryReference.hpp +++ b/compiler/aarch64/codegen/OMRMemoryReference.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM64_MEMORY_REFERENCE_INCL diff --git a/compiler/aarch64/codegen/OMRRealRegister.cpp b/compiler/aarch64/codegen/OMRRealRegister.cpp index 0733feed89d..9f808914b10 100644 --- a/compiler/aarch64/codegen/OMRRealRegister.cpp +++ b/compiler/aarch64/codegen/OMRRealRegister.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CodeGenerator.hpp" diff --git a/compiler/aarch64/codegen/OMRRealRegister.hpp b/compiler/aarch64/codegen/OMRRealRegister.hpp index ab1b1e39435..9b65c63b6b9 100644 --- a/compiler/aarch64/codegen/OMRRealRegister.hpp +++ b/compiler/aarch64/codegen/OMRRealRegister.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM64_REAL_REGISTER_INCL diff --git a/compiler/aarch64/codegen/OMRRegister.hpp b/compiler/aarch64/codegen/OMRRegister.hpp index ad2b87bae15..2e7fb728267 100644 --- a/compiler/aarch64/codegen/OMRRegister.hpp +++ b/compiler/aarch64/codegen/OMRRegister.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM64_REGISTER_INCL diff --git a/compiler/aarch64/codegen/OMRRegisterDependency.cpp b/compiler/aarch64/codegen/OMRRegisterDependency.cpp index 0c5d6372afa..95203a220de 100644 --- a/compiler/aarch64/codegen/OMRRegisterDependency.cpp +++ b/compiler/aarch64/codegen/OMRRegisterDependency.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/aarch64/codegen/OMRRegisterDependency.hpp b/compiler/aarch64/codegen/OMRRegisterDependency.hpp index 3ffa4cd4352..19693e405d7 100644 --- a/compiler/aarch64/codegen/OMRRegisterDependency.hpp +++ b/compiler/aarch64/codegen/OMRRegisterDependency.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM64_REGISTER_DEPENDENCY_INCL diff --git a/compiler/aarch64/codegen/OMRSnippet.cpp b/compiler/aarch64/codegen/OMRSnippet.cpp index ba2b4d6b018..debcb30c071 100644 --- a/compiler/aarch64/codegen/OMRSnippet.cpp +++ b/compiler/aarch64/codegen/OMRSnippet.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/Snippet.hpp" diff --git a/compiler/aarch64/codegen/OMRSnippet.hpp b/compiler/aarch64/codegen/OMRSnippet.hpp index aa16ca018e3..876c66f15a4 100644 --- a/compiler/aarch64/codegen/OMRSnippet.hpp +++ b/compiler/aarch64/codegen/OMRSnippet.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM64_SNIPPET_INCL diff --git a/compiler/aarch64/codegen/OMRTreeEvaluator.cpp b/compiler/aarch64/codegen/OMRTreeEvaluator.cpp index 1aec8c3614e..31e4fb6c864 100644 --- a/compiler/aarch64/codegen/OMRTreeEvaluator.cpp +++ b/compiler/aarch64/codegen/OMRTreeEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/aarch64/codegen/OMRTreeEvaluator.hpp b/compiler/aarch64/codegen/OMRTreeEvaluator.hpp index 49c3d4b9065..bcfa8927d71 100644 --- a/compiler/aarch64/codegen/OMRTreeEvaluator.hpp +++ b/compiler/aarch64/codegen/OMRTreeEvaluator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM64_TREE_EVALUATOR_INCL #define OMR_ARM64_TREE_EVALUATOR_INCL diff --git a/compiler/aarch64/codegen/OpBinary.cpp b/compiler/aarch64/codegen/OpBinary.cpp index 534821ff9a1..1bd7ddc9c02 100644 --- a/compiler/aarch64/codegen/OpBinary.cpp +++ b/compiler/aarch64/codegen/OpBinary.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/InstOpCode.hpp" diff --git a/compiler/aarch64/codegen/PseudoRegisterEnum.hpp b/compiler/aarch64/codegen/PseudoRegisterEnum.hpp index 649f0023b8d..1b6a3193fe7 100644 --- a/compiler/aarch64/codegen/PseudoRegisterEnum.hpp +++ b/compiler/aarch64/codegen/PseudoRegisterEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/aarch64/codegen/RealRegisterEnum.hpp b/compiler/aarch64/codegen/RealRegisterEnum.hpp index 17ee90a8f7b..8a1d15180c1 100644 --- a/compiler/aarch64/codegen/RealRegisterEnum.hpp +++ b/compiler/aarch64/codegen/RealRegisterEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/aarch64/codegen/RealRegisterMaskEnum.hpp b/compiler/aarch64/codegen/RealRegisterMaskEnum.hpp index 62502ad3b9e..6aa5b919510 100644 --- a/compiler/aarch64/codegen/RealRegisterMaskEnum.hpp +++ b/compiler/aarch64/codegen/RealRegisterMaskEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/aarch64/codegen/RegisterDependency.hpp b/compiler/aarch64/codegen/RegisterDependency.hpp index 9974ee0cb66..87c7161c873 100644 --- a/compiler/aarch64/codegen/RegisterDependency.hpp +++ b/compiler/aarch64/codegen/RegisterDependency.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_REGISTER_DEPENDENCY_INCL diff --git a/compiler/aarch64/codegen/TreeEvaluatorTable.hpp b/compiler/aarch64/codegen/TreeEvaluatorTable.hpp index d7ab6c4181c..fba18f2b6f2 100644 --- a/compiler/aarch64/codegen/TreeEvaluatorTable.hpp +++ b/compiler/aarch64/codegen/TreeEvaluatorTable.hpp @@ -16,6 +16,6 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "aarch64/codegen/OMRTreeEvaluatorTable.hpp" diff --git a/compiler/aarch64/codegen/UnaryEvaluator.cpp b/compiler/aarch64/codegen/UnaryEvaluator.cpp index 32b231485d7..f29bfe1bca5 100644 --- a/compiler/aarch64/codegen/UnaryEvaluator.cpp +++ b/compiler/aarch64/codegen/UnaryEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CodeGenerator.hpp" diff --git a/compiler/aarch64/env/ARM64ProcessorEnum.hpp b/compiler/aarch64/env/ARM64ProcessorEnum.hpp index 5c919e6ce79..1b4dc32ee17 100644 --- a/compiler/aarch64/env/ARM64ProcessorEnum.hpp +++ b/compiler/aarch64/env/ARM64ProcessorEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/aarch64/env/OMRCPU.cpp b/compiler/aarch64/env/OMRCPU.cpp index 724b4c5a7b4..e93f66375d5 100644 --- a/compiler/aarch64/env/OMRCPU.cpp +++ b/compiler/aarch64/env/OMRCPU.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/CPU.hpp" diff --git a/compiler/aarch64/env/OMRCPU.hpp b/compiler/aarch64/env/OMRCPU.hpp index 833db2585d8..647573d43bc 100644 --- a/compiler/aarch64/env/OMRCPU.hpp +++ b/compiler/aarch64/env/OMRCPU.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM64_CPU_INCL diff --git a/compiler/aarch64/env/OMRDebugEnv.cpp b/compiler/aarch64/env/OMRDebugEnv.cpp index aa92a7c968b..c608155b38e 100644 --- a/compiler/aarch64/env/OMRDebugEnv.cpp +++ b/compiler/aarch64/env/OMRDebugEnv.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/DebugEnv.hpp" diff --git a/compiler/aarch64/env/OMRDebugEnv.hpp b/compiler/aarch64/env/OMRDebugEnv.hpp index b45a840fd22..d20ba134015 100644 --- a/compiler/aarch64/env/OMRDebugEnv.hpp +++ b/compiler/aarch64/env/OMRDebugEnv.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM64_DEBUG_ENV_INCL diff --git a/compiler/aarch64/env/OMREnvironment.hpp b/compiler/aarch64/env/OMREnvironment.hpp index 2eae5e56607..8c76d1d36e9 100644 --- a/compiler/aarch64/env/OMREnvironment.hpp +++ b/compiler/aarch64/env/OMREnvironment.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM64_ENVIRONMENT_INCL diff --git a/compiler/aarch64/runtime/ARM64arrayCopy.spp b/compiler/aarch64/runtime/ARM64arrayCopy.spp index fdc1f4555db..eee6a63bb49 100644 --- a/compiler/aarch64/runtime/ARM64arrayCopy.spp +++ b/compiler/aarch64/runtime/ARM64arrayCopy.spp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ .file "ARM64arrayCopy.s" diff --git a/compiler/aarch64/runtime/CodeSync.cpp b/compiler/aarch64/runtime/CodeSync.cpp index 437c4f63454..86c5de0f49b 100644 --- a/compiler/aarch64/runtime/CodeSync.cpp +++ b/compiler/aarch64/runtime/CodeSync.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(__clang__) && defined(__APPLE__) diff --git a/compiler/aarch64/runtime/VirtualGuardRuntime.cpp b/compiler/aarch64/runtime/VirtualGuardRuntime.cpp index 2af068421df..5add381a48e 100644 --- a/compiler/aarch64/runtime/VirtualGuardRuntime.cpp +++ b/compiler/aarch64/runtime/VirtualGuardRuntime.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/aarch64/runtime/arm64asmdefs.inc b/compiler/aarch64/runtime/arm64asmdefs.inc index 92f4079e127..4fb814f3ca9 100644 --- a/compiler/aarch64/runtime/arm64asmdefs.inc +++ b/compiler/aarch64/runtime/arm64asmdefs.inc @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(LINUX) diff --git a/compiler/arm/codegen/ARMBinaryEncoding.cpp b/compiler/arm/codegen/ARMBinaryEncoding.cpp index 23d985b6e9e..21d78e03170 100644 --- a/compiler/arm/codegen/ARMBinaryEncoding.cpp +++ b/compiler/arm/codegen/ARMBinaryEncoding.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/arm/codegen/ARMConditionCode.hpp b/compiler/arm/codegen/ARMConditionCode.hpp index 613289160be..a8aa575caec 100644 --- a/compiler/arm/codegen/ARMConditionCode.hpp +++ b/compiler/arm/codegen/ARMConditionCode.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARMCONDITIONCODE_INCL diff --git a/compiler/arm/codegen/ARMDebug.cpp b/compiler/arm/codegen/ARMDebug.cpp index a724292d748..656779cc897 100644 --- a/compiler/arm/codegen/ARMDebug.cpp +++ b/compiler/arm/codegen/ARMDebug.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(TR_TARGET_ARM) diff --git a/compiler/arm/codegen/ARMDisassem.cpp b/compiler/arm/codegen/ARMDisassem.cpp index 738d65d7221..e991a9a3824 100644 --- a/compiler/arm/codegen/ARMDisassem.cpp +++ b/compiler/arm/codegen/ARMDisassem.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /******************************************************************************/ diff --git a/compiler/arm/codegen/ARMDisassem.hpp b/compiler/arm/codegen/ARMDisassem.hpp index 23cc662187b..3c1586c4e3d 100644 --- a/compiler/arm/codegen/ARMDisassem.hpp +++ b/compiler/arm/codegen/ARMDisassem.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef INCL_ARMDISASSEM diff --git a/compiler/arm/codegen/ARMGenerateInstructions.cpp b/compiler/arm/codegen/ARMGenerateInstructions.cpp index ef711abe73e..7c04baeeffc 100644 --- a/compiler/arm/codegen/ARMGenerateInstructions.cpp +++ b/compiler/arm/codegen/ARMGenerateInstructions.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/ARMInstruction.hpp" diff --git a/compiler/arm/codegen/ARMInstruction.hpp b/compiler/arm/codegen/ARMInstruction.hpp index c8e3fdfc9c6..16fcc2c0bf2 100644 --- a/compiler/arm/codegen/ARMInstruction.hpp +++ b/compiler/arm/codegen/ARMInstruction.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARMINSTRUCTION_INCL diff --git a/compiler/arm/codegen/ARMOperand2.cpp b/compiler/arm/codegen/ARMOperand2.cpp index 8517b2ad783..7fec4a49023 100644 --- a/compiler/arm/codegen/ARMOperand2.cpp +++ b/compiler/arm/codegen/ARMOperand2.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "il/TreeTop.hpp" diff --git a/compiler/arm/codegen/ARMOperand2.hpp b/compiler/arm/codegen/ARMOperand2.hpp index 176baceb35b..7b3449c4c4a 100644 --- a/compiler/arm/codegen/ARMOperand2.hpp +++ b/compiler/arm/codegen/ARMOperand2.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARMOPERAND2_INCL diff --git a/compiler/arm/codegen/ARMOutOfLineCodeSection.cpp b/compiler/arm/codegen/ARMOutOfLineCodeSection.cpp index 34ecb8cc2a1..16508232e69 100644 --- a/compiler/arm/codegen/ARMOutOfLineCodeSection.cpp +++ b/compiler/arm/codegen/ARMOutOfLineCodeSection.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/ARMOutOfLineCodeSection.hpp" diff --git a/compiler/arm/codegen/ARMOutOfLineCodeSection.hpp b/compiler/arm/codegen/ARMOutOfLineCodeSection.hpp index ab088fb5bfb..ce14c993190 100644 --- a/compiler/arm/codegen/ARMOutOfLineCodeSection.hpp +++ b/compiler/arm/codegen/ARMOutOfLineCodeSection.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARMOUTOFLINECODESECTION_INCL diff --git a/compiler/arm/codegen/ARMSystemLinkage.cpp b/compiler/arm/codegen/ARMSystemLinkage.cpp index 7d50aaa74d2..45f94bd122b 100644 --- a/compiler/arm/codegen/ARMSystemLinkage.cpp +++ b/compiler/arm/codegen/ARMSystemLinkage.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/CompilerEnv.hpp" diff --git a/compiler/arm/codegen/ARMSystemLinkage.hpp b/compiler/arm/codegen/ARMSystemLinkage.hpp index 8c13342edd9..980e8c839b3 100644 --- a/compiler/arm/codegen/ARMSystemLinkage.hpp +++ b/compiler/arm/codegen/ARMSystemLinkage.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARM_SYSTEMLINKAGE_INCL diff --git a/compiler/arm/codegen/BinaryCommutativeAnalyser.cpp b/compiler/arm/codegen/BinaryCommutativeAnalyser.cpp index 138eb5b52c3..5e6fd8a2987 100644 --- a/compiler/arm/codegen/BinaryCommutativeAnalyser.cpp +++ b/compiler/arm/codegen/BinaryCommutativeAnalyser.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/arm/codegen/BinaryCommutativeAnalyser.hpp b/compiler/arm/codegen/BinaryCommutativeAnalyser.hpp index 320fcb4c7ff..521d2deeed6 100644 --- a/compiler/arm/codegen/BinaryCommutativeAnalyser.hpp +++ b/compiler/arm/codegen/BinaryCommutativeAnalyser.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/arm/codegen/BinaryEvaluator.cpp b/compiler/arm/codegen/BinaryEvaluator.cpp index 91041365755..1656b581daf 100644 --- a/compiler/arm/codegen/BinaryEvaluator.cpp +++ b/compiler/arm/codegen/BinaryEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/AheadOfTimeCompile.hpp" diff --git a/compiler/arm/codegen/ConstantDataSnippet.cpp b/compiler/arm/codegen/ConstantDataSnippet.cpp index 9ba63be95b2..3101df2bd7a 100644 --- a/compiler/arm/codegen/ConstantDataSnippet.cpp +++ b/compiler/arm/codegen/ConstantDataSnippet.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "arm/codegen/ConstantDataSnippet.hpp" diff --git a/compiler/arm/codegen/ConstantDataSnippet.hpp b/compiler/arm/codegen/ConstantDataSnippet.hpp index 0c031695211..446bea04228 100644 --- a/compiler/arm/codegen/ConstantDataSnippet.hpp +++ b/compiler/arm/codegen/ConstantDataSnippet.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARMCONSTANTDATASNIPPET_INCL diff --git a/compiler/arm/codegen/ControlFlowEvaluator.cpp b/compiler/arm/codegen/ControlFlowEvaluator.cpp index a047b753e05..034a1e2aa4e 100644 --- a/compiler/arm/codegen/ControlFlowEvaluator.cpp +++ b/compiler/arm/codegen/ControlFlowEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "arm/codegen/ARMInstruction.hpp" diff --git a/compiler/arm/codegen/FPTreeEvaluator.cpp b/compiler/arm/codegen/FPTreeEvaluator.cpp index 407d736ca0f..6c51e2d6be1 100644 --- a/compiler/arm/codegen/FPTreeEvaluator.cpp +++ b/compiler/arm/codegen/FPTreeEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "arm/codegen/ARMInstruction.hpp" diff --git a/compiler/arm/codegen/FPTreeEvaluator.hpp b/compiler/arm/codegen/FPTreeEvaluator.hpp index 32c044e29e7..cefd67ba751 100644 --- a/compiler/arm/codegen/FPTreeEvaluator.hpp +++ b/compiler/arm/codegen/FPTreeEvaluator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef IA32FPTREEEVALUATOR_INCL diff --git a/compiler/arm/codegen/GenerateInstructions.hpp b/compiler/arm/codegen/GenerateInstructions.hpp index ff51ed77dc0..bca8edb531f 100644 --- a/compiler/arm/codegen/GenerateInstructions.hpp +++ b/compiler/arm/codegen/GenerateInstructions.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef GENERATE_INSTRUCTIONS_INCL diff --git a/compiler/arm/codegen/InstOpCode.hpp b/compiler/arm/codegen/InstOpCode.hpp index 6f9c687deca..21d68118681 100644 --- a/compiler/arm/codegen/InstOpCode.hpp +++ b/compiler/arm/codegen/InstOpCode.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_ARM_INSTOPCODE_INCL diff --git a/compiler/arm/codegen/Instruction.hpp b/compiler/arm/codegen/Instruction.hpp index ae69fc680bd..03006b0d5aa 100644 --- a/compiler/arm/codegen/Instruction.hpp +++ b/compiler/arm/codegen/Instruction.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_INSTRUCTION_INCL diff --git a/compiler/arm/codegen/Linkage.hpp b/compiler/arm/codegen/Linkage.hpp index 0ea128fc2f2..362b58ac5eb 100644 --- a/compiler/arm/codegen/Linkage.hpp +++ b/compiler/arm/codegen/Linkage.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_LINKAGE_INCL diff --git a/compiler/arm/codegen/MemoryReference.hpp b/compiler/arm/codegen/MemoryReference.hpp index d112156d2b6..dc1ebe7701a 100644 --- a/compiler/arm/codegen/MemoryReference.hpp +++ b/compiler/arm/codegen/MemoryReference.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_MEMORYREFERENCE_INCL diff --git a/compiler/arm/codegen/OMRCodeGenerator.cpp b/compiler/arm/codegen/OMRCodeGenerator.cpp index 29a6d28772f..d4f43910974 100644 --- a/compiler/arm/codegen/OMRCodeGenerator.cpp +++ b/compiler/arm/codegen/OMRCodeGenerator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/arm/codegen/OMRCodeGenerator.hpp b/compiler/arm/codegen/OMRCodeGenerator.hpp index 43a03e67dec..215129b7476 100644 --- a/compiler/arm/codegen/OMRCodeGenerator.hpp +++ b/compiler/arm/codegen/OMRCodeGenerator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM_CODEGENERATOR_INCL diff --git a/compiler/arm/codegen/OMRInstOpCode.cpp b/compiler/arm/codegen/OMRInstOpCode.cpp index 8761732f169..51c20bd7d07 100644 --- a/compiler/arm/codegen/OMRInstOpCode.cpp +++ b/compiler/arm/codegen/OMRInstOpCode.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/OMRInstOpCode.hpp" diff --git a/compiler/arm/codegen/OMRInstOpCode.enum b/compiler/arm/codegen/OMRInstOpCode.enum index 46e0fdd75f5..b4dec4bbfcf 100644 --- a/compiler/arm/codegen/OMRInstOpCode.enum +++ b/compiler/arm/codegen/OMRInstOpCode.enum @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/arm/codegen/OMRInstOpCode.hpp b/compiler/arm/codegen/OMRInstOpCode.hpp index 5fcf6893992..9511622e533 100644 --- a/compiler/arm/codegen/OMRInstOpCode.hpp +++ b/compiler/arm/codegen/OMRInstOpCode.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM_INSTOPCODE_INCL diff --git a/compiler/arm/codegen/OMRInstOpCodeProperties.hpp b/compiler/arm/codegen/OMRInstOpCodeProperties.hpp index 6a65714510e..bd880f7196a 100644 --- a/compiler/arm/codegen/OMRInstOpCodeProperties.hpp +++ b/compiler/arm/codegen/OMRInstOpCodeProperties.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/arm/codegen/OMRInstruction.cpp b/compiler/arm/codegen/OMRInstruction.cpp index dab5fe8aabf..68a3599b8e8 100644 --- a/compiler/arm/codegen/OMRInstruction.cpp +++ b/compiler/arm/codegen/OMRInstruction.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/Compilation.hpp" diff --git a/compiler/arm/codegen/OMRInstruction.hpp b/compiler/arm/codegen/OMRInstruction.hpp index 9009ead130b..ac0a4eb8e4f 100644 --- a/compiler/arm/codegen/OMRInstruction.hpp +++ b/compiler/arm/codegen/OMRInstruction.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM_INSTRUCTION_INCL diff --git a/compiler/arm/codegen/OMRInstructionDelegate.cpp b/compiler/arm/codegen/OMRInstructionDelegate.cpp index b6194e1f13b..40178f00cbf 100644 --- a/compiler/arm/codegen/OMRInstructionDelegate.cpp +++ b/compiler/arm/codegen/OMRInstructionDelegate.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/InstructionDelegate.hpp" diff --git a/compiler/arm/codegen/OMRInstructionDelegate.hpp b/compiler/arm/codegen/OMRInstructionDelegate.hpp index 821b9ab6111..1511aa89210 100644 --- a/compiler/arm/codegen/OMRInstructionDelegate.hpp +++ b/compiler/arm/codegen/OMRInstructionDelegate.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM_INSTRUCTIONDELEGATE_INCL diff --git a/compiler/arm/codegen/OMRInstructionKindEnum.hpp b/compiler/arm/codegen/OMRInstructionKindEnum.hpp index 98a6a6697a1..224bf1bfc4f 100644 --- a/compiler/arm/codegen/OMRInstructionKindEnum.hpp +++ b/compiler/arm/codegen/OMRInstructionKindEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/arm/codegen/OMRLinkage.cpp b/compiler/arm/codegen/OMRLinkage.cpp index 2dae12e0447..0795d1c0cd4 100644 --- a/compiler/arm/codegen/OMRLinkage.cpp +++ b/compiler/arm/codegen/OMRLinkage.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "arm/codegen/Linkage.hpp" diff --git a/compiler/arm/codegen/OMRLinkage.hpp b/compiler/arm/codegen/OMRLinkage.hpp index 7e584237113..70ff61338e4 100644 --- a/compiler/arm/codegen/OMRLinkage.hpp +++ b/compiler/arm/codegen/OMRLinkage.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM_LINKAGE_INCL diff --git a/compiler/arm/codegen/OMRLinkage_inlines.hpp b/compiler/arm/codegen/OMRLinkage_inlines.hpp index 6105ce8a84a..0f96d064acc 100644 --- a/compiler/arm/codegen/OMRLinkage_inlines.hpp +++ b/compiler/arm/codegen/OMRLinkage_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM_LINKAGE_INLINES_INCL diff --git a/compiler/arm/codegen/OMRMachine.cpp b/compiler/arm/codegen/OMRMachine.cpp index 7a64468df6d..6e59d9d3f5a 100644 --- a/compiler/arm/codegen/OMRMachine.cpp +++ b/compiler/arm/codegen/OMRMachine.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/arm/codegen/OMRMachine.hpp b/compiler/arm/codegen/OMRMachine.hpp index 62629d9ee1c..19cf46c4371 100644 --- a/compiler/arm/codegen/OMRMachine.hpp +++ b/compiler/arm/codegen/OMRMachine.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM_MACHINE_INCL diff --git a/compiler/arm/codegen/OMRMemoryReference.cpp b/compiler/arm/codegen/OMRMemoryReference.cpp index b75723d0428..cdae8a41ad1 100644 --- a/compiler/arm/codegen/OMRMemoryReference.cpp +++ b/compiler/arm/codegen/OMRMemoryReference.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/arm/codegen/OMRMemoryReference.hpp b/compiler/arm/codegen/OMRMemoryReference.hpp index d95067f54f1..6f1a5b926d4 100644 --- a/compiler/arm/codegen/OMRMemoryReference.hpp +++ b/compiler/arm/codegen/OMRMemoryReference.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM_MEMORY_REFERENCE_INCL diff --git a/compiler/arm/codegen/OMRRealRegister.cpp b/compiler/arm/codegen/OMRRealRegister.cpp index 8cf73e22f4e..2606618cdc0 100644 --- a/compiler/arm/codegen/OMRRealRegister.cpp +++ b/compiler/arm/codegen/OMRRealRegister.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/RealRegister.hpp" diff --git a/compiler/arm/codegen/OMRRealRegister.hpp b/compiler/arm/codegen/OMRRealRegister.hpp index 6a093154d5a..efdbc8aa2c7 100644 --- a/compiler/arm/codegen/OMRRealRegister.hpp +++ b/compiler/arm/codegen/OMRRealRegister.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM_REAL_REGISTER_INCL diff --git a/compiler/arm/codegen/OMRRegister.hpp b/compiler/arm/codegen/OMRRegister.hpp index c38b24cd1d4..4fdf1facedc 100644 --- a/compiler/arm/codegen/OMRRegister.hpp +++ b/compiler/arm/codegen/OMRRegister.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM_REGISTER_INCL diff --git a/compiler/arm/codegen/OMRRegisterDependency.cpp b/compiler/arm/codegen/OMRRegisterDependency.cpp index fd3d46b7eb1..fc924401107 100644 --- a/compiler/arm/codegen/OMRRegisterDependency.cpp +++ b/compiler/arm/codegen/OMRRegisterDependency.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/arm/codegen/OMRRegisterDependency.hpp b/compiler/arm/codegen/OMRRegisterDependency.hpp index 3b6777ef5db..80f7179fb12 100644 --- a/compiler/arm/codegen/OMRRegisterDependency.hpp +++ b/compiler/arm/codegen/OMRRegisterDependency.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM_REGISTER_DEPENDENCY_INCL diff --git a/compiler/arm/codegen/OMRRegisterDependencyStruct.hpp b/compiler/arm/codegen/OMRRegisterDependencyStruct.hpp index 01a050f0d94..41be47d51b6 100644 --- a/compiler/arm/codegen/OMRRegisterDependencyStruct.hpp +++ b/compiler/arm/codegen/OMRRegisterDependencyStruct.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM_REGISTER_DEPENDENCY_STRUCT_INCL diff --git a/compiler/arm/codegen/OMRSnippet.cpp b/compiler/arm/codegen/OMRSnippet.cpp index ec59bf4498e..6b5ea76290c 100644 --- a/compiler/arm/codegen/OMRSnippet.cpp +++ b/compiler/arm/codegen/OMRSnippet.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/Snippet.hpp" diff --git a/compiler/arm/codegen/OMRSnippet.hpp b/compiler/arm/codegen/OMRSnippet.hpp index 7781ce49ade..97119ab5ec8 100644 --- a/compiler/arm/codegen/OMRSnippet.hpp +++ b/compiler/arm/codegen/OMRSnippet.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM_SNIPPET_INCL diff --git a/compiler/arm/codegen/OMRTreeEvaluator.cpp b/compiler/arm/codegen/OMRTreeEvaluator.cpp index d680ae34821..6cf9908c136 100644 --- a/compiler/arm/codegen/OMRTreeEvaluator.cpp +++ b/compiler/arm/codegen/OMRTreeEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/arm/codegen/OMRTreeEvaluator.hpp b/compiler/arm/codegen/OMRTreeEvaluator.hpp index 8433c4e0ee6..e22252ac82e 100644 --- a/compiler/arm/codegen/OMRTreeEvaluator.hpp +++ b/compiler/arm/codegen/OMRTreeEvaluator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM_TREE_EVALUATOR_INCL diff --git a/compiler/arm/codegen/PseudoRegisterEnum.hpp b/compiler/arm/codegen/PseudoRegisterEnum.hpp index 649f0023b8d..1b6a3193fe7 100644 --- a/compiler/arm/codegen/PseudoRegisterEnum.hpp +++ b/compiler/arm/codegen/PseudoRegisterEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/arm/codegen/RealRegister.hpp b/compiler/arm/codegen/RealRegister.hpp index 16e09a64319..a1ac807157f 100644 --- a/compiler/arm/codegen/RealRegister.hpp +++ b/compiler/arm/codegen/RealRegister.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_REAL_REGISTER_INCL diff --git a/compiler/arm/codegen/RealRegisterEnum.hpp b/compiler/arm/codegen/RealRegisterEnum.hpp index 14c08a72afe..979ac87c58a 100644 --- a/compiler/arm/codegen/RealRegisterEnum.hpp +++ b/compiler/arm/codegen/RealRegisterEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/arm/codegen/RealRegisterMaskEnum.hpp b/compiler/arm/codegen/RealRegisterMaskEnum.hpp index 4d3a67bde9a..e682cff9db9 100644 --- a/compiler/arm/codegen/RealRegisterMaskEnum.hpp +++ b/compiler/arm/codegen/RealRegisterMaskEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/arm/codegen/RegisterDependency.hpp b/compiler/arm/codegen/RegisterDependency.hpp index 38e05276cef..fba654737c2 100644 --- a/compiler/arm/codegen/RegisterDependency.hpp +++ b/compiler/arm/codegen/RegisterDependency.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_REGISTER_DEPENDENCY_INCL diff --git a/compiler/arm/codegen/StackCheckFailureSnippet.cpp b/compiler/arm/codegen/StackCheckFailureSnippet.cpp index c45344413bd..f3c8342fae2 100644 --- a/compiler/arm/codegen/StackCheckFailureSnippet.cpp +++ b/compiler/arm/codegen/StackCheckFailureSnippet.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "il/LabelSymbol.hpp" diff --git a/compiler/arm/codegen/StackCheckFailureSnippet.hpp b/compiler/arm/codegen/StackCheckFailureSnippet.hpp index 39daf49cc6f..f7eeeb64ee7 100644 --- a/compiler/arm/codegen/StackCheckFailureSnippet.hpp +++ b/compiler/arm/codegen/StackCheckFailureSnippet.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARMSTACKCHECKFAILURESNIPPET_INCL diff --git a/compiler/arm/codegen/SubtractAnalyser.cpp b/compiler/arm/codegen/SubtractAnalyser.cpp index a979cb156f8..7ef7abf9ba7 100644 --- a/compiler/arm/codegen/SubtractAnalyser.cpp +++ b/compiler/arm/codegen/SubtractAnalyser.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/SubtractAnalyser.hpp" diff --git a/compiler/arm/codegen/SubtractAnalyser.hpp b/compiler/arm/codegen/SubtractAnalyser.hpp index 4df061afccc..53e9cfa78e2 100644 --- a/compiler/arm/codegen/SubtractAnalyser.hpp +++ b/compiler/arm/codegen/SubtractAnalyser.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARMSUBTRACTANALYSER_INCL diff --git a/compiler/arm/codegen/TreeEvaluatorTable.hpp b/compiler/arm/codegen/TreeEvaluatorTable.hpp index 2f4998b48df..ca852245e71 100644 --- a/compiler/arm/codegen/TreeEvaluatorTable.hpp +++ b/compiler/arm/codegen/TreeEvaluatorTable.hpp @@ -16,6 +16,6 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "arm/codegen/OMRTreeEvaluatorTable.hpp" diff --git a/compiler/arm/codegen/UnaryEvaluator.cpp b/compiler/arm/codegen/UnaryEvaluator.cpp index a31219db1eb..5f720c71e90 100644 --- a/compiler/arm/codegen/UnaryEvaluator.cpp +++ b/compiler/arm/codegen/UnaryEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "arm/codegen/ARMInstruction.hpp" diff --git a/compiler/arm/env/ARMProcessorEnum.hpp b/compiler/arm/env/ARMProcessorEnum.hpp index a54d93c56ac..c9dbe3c7d4d 100644 --- a/compiler/arm/env/ARMProcessorEnum.hpp +++ b/compiler/arm/env/ARMProcessorEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/arm/env/OMRCPU.cpp b/compiler/arm/env/OMRCPU.cpp index fbdda7bb4ba..a1be641aeb1 100644 --- a/compiler/arm/env/OMRCPU.cpp +++ b/compiler/arm/env/OMRCPU.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/CPU.hpp" diff --git a/compiler/arm/env/OMRCPU.hpp b/compiler/arm/env/OMRCPU.hpp index 72f97dc0d70..ea01a4c4894 100644 --- a/compiler/arm/env/OMRCPU.hpp +++ b/compiler/arm/env/OMRCPU.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM_CPU_INCL diff --git a/compiler/arm/env/OMRCompilerEnv.cpp b/compiler/arm/env/OMRCompilerEnv.cpp index b163414dbc9..3a922cea68d 100644 --- a/compiler/arm/env/OMRCompilerEnv.cpp +++ b/compiler/arm/env/OMRCompilerEnv.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/CompilerEnv.hpp" diff --git a/compiler/arm/env/OMRCompilerEnv.hpp b/compiler/arm/env/OMRCompilerEnv.hpp index 7adc46a7f5f..af414391ae0 100644 --- a/compiler/arm/env/OMRCompilerEnv.hpp +++ b/compiler/arm/env/OMRCompilerEnv.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM_COMPILER_ENV_INCL diff --git a/compiler/arm/env/OMRDebugEnv.hpp b/compiler/arm/env/OMRDebugEnv.hpp index 2983aa1d044..2caf1a60567 100644 --- a/compiler/arm/env/OMRDebugEnv.hpp +++ b/compiler/arm/env/OMRDebugEnv.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM_DEBUG_ENV_INCL diff --git a/compiler/arm/env/OMREnvironment.hpp b/compiler/arm/env/OMREnvironment.hpp index ea04559ecfc..b4e4cd27744 100644 --- a/compiler/arm/env/OMREnvironment.hpp +++ b/compiler/arm/env/OMREnvironment.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARM_ENVIRONMENT_INCL diff --git a/compiler/arm/runtime/CodeSync.cpp b/compiler/arm/runtime/CodeSync.cpp index 273fccbb026..6cec80523ec 100644 --- a/compiler/arm/runtime/CodeSync.cpp +++ b/compiler/arm/runtime/CodeSync.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ extern "C" diff --git a/compiler/arm/runtime/FlushICache.armasm b/compiler/arm/runtime/FlushICache.armasm index 8eef5ca8370..9aeb55b3d78 100644 --- a/compiler/arm/runtime/FlushICache.armasm +++ b/compiler/arm/runtime/FlushICache.armasm @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ AREA CodeSync_c, CODE, READONLY diff --git a/compiler/arm/runtime/VirtualGuardRuntime.cpp b/compiler/arm/runtime/VirtualGuardRuntime.cpp index 453175410f9..5b9c5e3bef3 100644 --- a/compiler/arm/runtime/VirtualGuardRuntime.cpp +++ b/compiler/arm/runtime/VirtualGuardRuntime.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/ARMInstruction.hpp" diff --git a/compiler/codegen/AheadOfTimeCompile.hpp b/compiler/codegen/AheadOfTimeCompile.hpp index 2710ecd6d65..83d19244706 100644 --- a/compiler/codegen/AheadOfTimeCompile.hpp +++ b/compiler/codegen/AheadOfTimeCompile.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_AHEADOFTIMECOMPILE_INCL diff --git a/compiler/codegen/Analyser.cpp b/compiler/codegen/Analyser.cpp index 10617013a65..90de9a191f6 100644 --- a/compiler/codegen/Analyser.cpp +++ b/compiler/codegen/Analyser.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/Analyser.hpp" diff --git a/compiler/codegen/Analyser.hpp b/compiler/codegen/Analyser.hpp index a81b0f47d74..6659ad33035 100644 --- a/compiler/codegen/Analyser.hpp +++ b/compiler/codegen/Analyser.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ANALYSER_INCL diff --git a/compiler/codegen/BackingStore.hpp b/compiler/codegen/BackingStore.hpp index f86cc025a58..3024463cdc9 100644 --- a/compiler/codegen/BackingStore.hpp +++ b/compiler/codegen/BackingStore.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef BACKINGSTORE_INCL diff --git a/compiler/codegen/CCData.cpp b/compiler/codegen/CCData.cpp index 5746cda192f..cf6add07215 100644 --- a/compiler/codegen/CCData.cpp +++ b/compiler/codegen/CCData.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omrcomp.h" diff --git a/compiler/codegen/CCData.hpp b/compiler/codegen/CCData.hpp index 1a72ef324f8..487bc4c0e9f 100644 --- a/compiler/codegen/CCData.hpp +++ b/compiler/codegen/CCData.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_CCDATA_INCL diff --git a/compiler/codegen/CCData_inlines.hpp b/compiler/codegen/CCData_inlines.hpp index a9aa64ee398..6cf4a416c43 100644 --- a/compiler/codegen/CCData_inlines.hpp +++ b/compiler/codegen/CCData_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_CCDATA_INLINES_INCL diff --git a/compiler/codegen/CMakeLists.txt b/compiler/codegen/CMakeLists.txt index 9d2248c25b5..bbfbda23977 100644 --- a/compiler/codegen/CMakeLists.txt +++ b/compiler/codegen/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# compiler_library(codegen diff --git a/compiler/codegen/CodeGenGC.cpp b/compiler/codegen/CodeGenGC.cpp index 8a1b15f1ae6..08c663fbb6d 100644 --- a/compiler/codegen/CodeGenGC.cpp +++ b/compiler/codegen/CodeGenGC.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CodeGenerator.hpp" // IWYU pragma: keep diff --git a/compiler/codegen/CodeGenPhase.hpp b/compiler/codegen/CodeGenPhase.hpp index 5faa2d7a5b2..1d9d72e2444 100644 --- a/compiler/codegen/CodeGenPhase.hpp +++ b/compiler/codegen/CodeGenPhase.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_CODEGENPHASE_INCL diff --git a/compiler/codegen/CodeGenPhaseEnum.hpp b/compiler/codegen/CodeGenPhaseEnum.hpp index 098dff4d841..134bf79e183 100644 --- a/compiler/codegen/CodeGenPhaseEnum.hpp +++ b/compiler/codegen/CodeGenPhaseEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // This file includes the most specialized version of the Enums for the OMR Project diff --git a/compiler/codegen/CodeGenPhaseFunctionTable.hpp b/compiler/codegen/CodeGenPhaseFunctionTable.hpp index 04e1269a528..f543f9663c9 100644 --- a/compiler/codegen/CodeGenPhaseFunctionTable.hpp +++ b/compiler/codegen/CodeGenPhaseFunctionTable.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // This file contains the most specialized version of the FunctionTable for diff --git a/compiler/codegen/CodeGenPhaseToPerform.hpp b/compiler/codegen/CodeGenPhaseToPerform.hpp index 6783b5b4f6a..0b95cefe8dc 100644 --- a/compiler/codegen/CodeGenPhaseToPerform.hpp +++ b/compiler/codegen/CodeGenPhaseToPerform.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/codegen/CodeGenPrep.cpp b/compiler/codegen/CodeGenPrep.cpp index d1b3be92595..02155a1a6c2 100644 --- a/compiler/codegen/CodeGenPrep.cpp +++ b/compiler/codegen/CodeGenPrep.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/compiler/codegen/CodeGenRA.cpp b/compiler/codegen/CodeGenRA.cpp index 95e31e4cca5..45aae60177b 100644 --- a/compiler/codegen/CodeGenRA.cpp +++ b/compiler/codegen/CodeGenRA.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CodeGenerator.hpp" diff --git a/compiler/codegen/CodeGenerator.hpp b/compiler/codegen/CodeGenerator.hpp index a2f66fb132b..a7a4d8416db 100644 --- a/compiler/codegen/CodeGenerator.hpp +++ b/compiler/codegen/CodeGenerator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_CODEGENERATOR_INCL diff --git a/compiler/codegen/CodeGeneratorUtils.hpp b/compiler/codegen/CodeGeneratorUtils.hpp index 3d2207644f8..9ad1f21a52a 100644 --- a/compiler/codegen/CodeGeneratorUtils.hpp +++ b/compiler/codegen/CodeGeneratorUtils.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CODEGENERATOR_UTILS_INCL diff --git a/compiler/codegen/CodeGenerator_inlines.hpp b/compiler/codegen/CodeGenerator_inlines.hpp index 5b07b4106ea..10ffcafb79a 100644 --- a/compiler/codegen/CodeGenerator_inlines.hpp +++ b/compiler/codegen/CodeGenerator_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CODEGENERATOR_INLINES_INCL diff --git a/compiler/codegen/ELFGenerator.cpp b/compiler/codegen/ELFGenerator.cpp index 95692566b1e..0b91c24a3bb 100644 --- a/compiler/codegen/ELFGenerator.cpp +++ b/compiler/codegen/ELFGenerator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/ELFGenerator.hpp" diff --git a/compiler/codegen/ELFGenerator.hpp b/compiler/codegen/ELFGenerator.hpp index 2bc4cdbaaed..7585973e0df 100644 --- a/compiler/codegen/ELFGenerator.hpp +++ b/compiler/codegen/ELFGenerator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ELFGENERATOR_HPP diff --git a/compiler/codegen/ELFRelocationResolver.hpp b/compiler/codegen/ELFRelocationResolver.hpp index c0e656a5869..0b0ffcd7a59 100644 --- a/compiler/codegen/ELFRelocationResolver.hpp +++ b/compiler/codegen/ELFRelocationResolver.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_ELFRELOCATIONRESOLVER_INCL diff --git a/compiler/codegen/GCRegisterMap.hpp b/compiler/codegen/GCRegisterMap.hpp index 2bb06485274..24f70695947 100644 --- a/compiler/codegen/GCRegisterMap.hpp +++ b/compiler/codegen/GCRegisterMap.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_GCREGISTERMAP_INCL diff --git a/compiler/codegen/GCStackAtlas.hpp b/compiler/codegen/GCStackAtlas.hpp index 0c656be77f8..05b6ce85c15 100644 --- a/compiler/codegen/GCStackAtlas.hpp +++ b/compiler/codegen/GCStackAtlas.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_GCSTACKATLAS_INCL diff --git a/compiler/codegen/GCStackMap.hpp b/compiler/codegen/GCStackMap.hpp index 6ca7ade15e0..27ffdbfb8fa 100644 --- a/compiler/codegen/GCStackMap.hpp +++ b/compiler/codegen/GCStackMap.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef GCSTACKMAP_INCL diff --git a/compiler/codegen/InstOpCode.enum b/compiler/codegen/InstOpCode.enum index 9b3edb50adc..521ddef53f2 100644 --- a/compiler/codegen/InstOpCode.enum +++ b/compiler/codegen/InstOpCode.enum @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/codegen/InstructionDelegate.hpp b/compiler/codegen/InstructionDelegate.hpp index b1d7edd3398..f3fe4306d5c 100644 --- a/compiler/codegen/InstructionDelegate.hpp +++ b/compiler/codegen/InstructionDelegate.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_INSTRUCTIONDELEGATE_INCL diff --git a/compiler/codegen/InstructionFlagEnum.hpp b/compiler/codegen/InstructionFlagEnum.hpp index 19681f0a91b..66704c4bb0c 100644 --- a/compiler/codegen/InstructionFlagEnum.hpp +++ b/compiler/codegen/InstructionFlagEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/OMRInstructionFlagEnum.hpp" diff --git a/compiler/codegen/InstructionKindEnum.hpp b/compiler/codegen/InstructionKindEnum.hpp index c22e6c8055b..565a3886015 100644 --- a/compiler/codegen/InstructionKindEnum.hpp +++ b/compiler/codegen/InstructionKindEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/OMRInstructionKindEnum.hpp" diff --git a/compiler/codegen/Instruction_inlines.hpp b/compiler/codegen/Instruction_inlines.hpp index eed544a83b1..359877064a6 100644 --- a/compiler/codegen/Instruction_inlines.hpp +++ b/compiler/codegen/Instruction_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef INSTRUCTION_INLINES_INCL diff --git a/compiler/codegen/LinkageConventions.enum b/compiler/codegen/LinkageConventions.enum index 067b9770eec..d4151c6b167 100644 --- a/compiler/codegen/LinkageConventions.enum +++ b/compiler/codegen/LinkageConventions.enum @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/OMRLinkageConventions.enum" diff --git a/compiler/codegen/LinkageConventionsEnum.hpp b/compiler/codegen/LinkageConventionsEnum.hpp index d27cd8ae720..d8d00f51636 100644 --- a/compiler/codegen/LinkageConventionsEnum.hpp +++ b/compiler/codegen/LinkageConventionsEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_LINKAGECONVENTION_INCL diff --git a/compiler/codegen/Linkage_inlines.hpp b/compiler/codegen/Linkage_inlines.hpp index dc7c688081d..22119c1bfea 100644 --- a/compiler/codegen/Linkage_inlines.hpp +++ b/compiler/codegen/Linkage_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef LINKAGE_INLINES_INCL diff --git a/compiler/codegen/LiveReference.hpp b/compiler/codegen/LiveReference.hpp index de6071304cf..317c05add1e 100644 --- a/compiler/codegen/LiveReference.hpp +++ b/compiler/codegen/LiveReference.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef LIVEREFERENCE_INCL diff --git a/compiler/codegen/LiveRegister.cpp b/compiler/codegen/LiveRegister.cpp index 348d244c80a..7fdea74d329 100644 --- a/compiler/codegen/LiveRegister.cpp +++ b/compiler/codegen/LiveRegister.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/LiveRegister.hpp" diff --git a/compiler/codegen/LiveRegister.hpp b/compiler/codegen/LiveRegister.hpp index 661f2b50f29..fd5d396628c 100644 --- a/compiler/codegen/LiveRegister.hpp +++ b/compiler/codegen/LiveRegister.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef LIVEREGISTER_INCL diff --git a/compiler/codegen/Machine.hpp b/compiler/codegen/Machine.hpp index 0c0e653bf69..60987a8067b 100644 --- a/compiler/codegen/Machine.hpp +++ b/compiler/codegen/Machine.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_MACHINE_INCL diff --git a/compiler/codegen/Machine_inlines.hpp b/compiler/codegen/Machine_inlines.hpp index f10fbc6305e..5495aa3788e 100644 --- a/compiler/codegen/Machine_inlines.hpp +++ b/compiler/codegen/Machine_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef MACHINE_INLINES_INCL diff --git a/compiler/codegen/MemoryReference.hpp b/compiler/codegen/MemoryReference.hpp index e36ef1b5fde..fa57beee554 100644 --- a/compiler/codegen/MemoryReference.hpp +++ b/compiler/codegen/MemoryReference.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_MEMORY_REFERENCE_INCL diff --git a/compiler/codegen/NodeEvaluation.cpp b/compiler/codegen/NodeEvaluation.cpp index f7db8afffb4..09e79459c70 100644 --- a/compiler/codegen/NodeEvaluation.cpp +++ b/compiler/codegen/NodeEvaluation.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CodeGenerator.hpp" diff --git a/compiler/codegen/OMRAheadOfTimeCompile.cpp b/compiler/codegen/OMRAheadOfTimeCompile.cpp index 1076a4dff33..374cabf525b 100644 --- a/compiler/codegen/OMRAheadOfTimeCompile.cpp +++ b/compiler/codegen/OMRAheadOfTimeCompile.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/AheadOfTimeCompile.hpp" diff --git a/compiler/codegen/OMRAheadOfTimeCompile.hpp b/compiler/codegen/OMRAheadOfTimeCompile.hpp index 282cb8d7b3b..978161c597b 100644 --- a/compiler/codegen/OMRAheadOfTimeCompile.hpp +++ b/compiler/codegen/OMRAheadOfTimeCompile.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_AHEADOFTIMECOMPILE_INCL diff --git a/compiler/codegen/OMRCodeGenPhase.cpp b/compiler/codegen/OMRCodeGenPhase.cpp index 3e557765e02..ef1b40bb9e4 100644 --- a/compiler/codegen/OMRCodeGenPhase.cpp +++ b/compiler/codegen/OMRCodeGenPhase.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(J9ZOS390) diff --git a/compiler/codegen/OMRCodeGenPhase.hpp b/compiler/codegen/OMRCodeGenPhase.hpp index 338e708ef59..274748ee10a 100644 --- a/compiler/codegen/OMRCodeGenPhase.hpp +++ b/compiler/codegen/OMRCodeGenPhase.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_CODEGEN_PHASE diff --git a/compiler/codegen/OMRCodeGenPhaseEnum.hpp b/compiler/codegen/OMRCodeGenPhaseEnum.hpp index ab3be55348d..e293dbfc902 100644 --- a/compiler/codegen/OMRCodeGenPhaseEnum.hpp +++ b/compiler/codegen/OMRCodeGenPhaseEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/codegen/OMRCodeGenPhaseFunctionTable.hpp b/compiler/codegen/OMRCodeGenPhaseFunctionTable.hpp index 88db8432d38..185febbe9e5 100644 --- a/compiler/codegen/OMRCodeGenPhaseFunctionTable.hpp +++ b/compiler/codegen/OMRCodeGenPhaseFunctionTable.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/codegen/OMRCodeGenerator.cpp b/compiler/codegen/OMRCodeGenerator.cpp index 110cfed529a..a392c475163 100644 --- a/compiler/codegen/OMRCodeGenerator.cpp +++ b/compiler/codegen/OMRCodeGenerator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(J9ZOS390) diff --git a/compiler/codegen/OMRCodeGenerator.hpp b/compiler/codegen/OMRCodeGenerator.hpp index 767b365b6ac..5d0b6652594 100644 --- a/compiler/codegen/OMRCodeGenerator.hpp +++ b/compiler/codegen/OMRCodeGenerator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_CODEGENERATOR_INCL diff --git a/compiler/codegen/OMRCodeGeneratorUtils.hpp b/compiler/codegen/OMRCodeGeneratorUtils.hpp index f9e13176830..252d47bb75a 100644 --- a/compiler/codegen/OMRCodeGeneratorUtils.hpp +++ b/compiler/codegen/OMRCodeGeneratorUtils.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_CODEGENERATOR_UTILS_INCL diff --git a/compiler/codegen/OMRCodeGenerator_inlines.hpp b/compiler/codegen/OMRCodeGenerator_inlines.hpp index 9ce3b8ba1a9..eb9ac3202e4 100644 --- a/compiler/codegen/OMRCodeGenerator_inlines.hpp +++ b/compiler/codegen/OMRCodeGenerator_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_CODEGENERATOR_INLINES_INCL diff --git a/compiler/codegen/OMRELFRelocationResolver.cpp b/compiler/codegen/OMRELFRelocationResolver.cpp index 8bccea8c862..492940e382d 100644 --- a/compiler/codegen/OMRELFRelocationResolver.cpp +++ b/compiler/codegen/OMRELFRelocationResolver.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/ELFRelocationResolver.hpp" diff --git a/compiler/codegen/OMRELFRelocationResolver.hpp b/compiler/codegen/OMRELFRelocationResolver.hpp index 20f169e6cdf..c303f47f2b2 100644 --- a/compiler/codegen/OMRELFRelocationResolver.hpp +++ b/compiler/codegen/OMRELFRelocationResolver.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ELF_RELOCATION_RESOLVER_HPP diff --git a/compiler/codegen/OMRGCRegisterMap.cpp b/compiler/codegen/OMRGCRegisterMap.cpp index c7daf497a8a..77084d51656 100644 --- a/compiler/codegen/OMRGCRegisterMap.cpp +++ b/compiler/codegen/OMRGCRegisterMap.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/GCRegisterMap.hpp" diff --git a/compiler/codegen/OMRGCRegisterMap.hpp b/compiler/codegen/OMRGCRegisterMap.hpp index c413d427e45..0f12e001634 100644 --- a/compiler/codegen/OMRGCRegisterMap.hpp +++ b/compiler/codegen/OMRGCRegisterMap.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_GCREGISTERMAP_INCL diff --git a/compiler/codegen/OMRGCStackAtlas.cpp b/compiler/codegen/OMRGCStackAtlas.cpp index 0c51202d940..b8698b73396 100644 --- a/compiler/codegen/OMRGCStackAtlas.cpp +++ b/compiler/codegen/OMRGCStackAtlas.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/GCStackAtlas.hpp" diff --git a/compiler/codegen/OMRGCStackAtlas.hpp b/compiler/codegen/OMRGCStackAtlas.hpp index 40a6a017db0..9885b275693 100644 --- a/compiler/codegen/OMRGCStackAtlas.hpp +++ b/compiler/codegen/OMRGCStackAtlas.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_GCSTACKATLAS_INCL diff --git a/compiler/codegen/OMRInstOpCode.cpp b/compiler/codegen/OMRInstOpCode.cpp index 30699058ae6..c42e0535e4d 100644 --- a/compiler/codegen/OMRInstOpCode.cpp +++ b/compiler/codegen/OMRInstOpCode.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compiler/codegen/InstOpCode.hpp" diff --git a/compiler/codegen/OMRInstOpCode.enum b/compiler/codegen/OMRInstOpCode.enum index 845e13f3c9a..9126dddaa1d 100644 --- a/compiler/codegen/OMRInstOpCode.enum +++ b/compiler/codegen/OMRInstOpCode.enum @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/codegen/OMRInstOpCode.hpp b/compiler/codegen/OMRInstOpCode.hpp index 141bf57865c..04e18638393 100644 --- a/compiler/codegen/OMRInstOpCode.hpp +++ b/compiler/codegen/OMRInstOpCode.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_INSTOPCODE_INCL diff --git a/compiler/codegen/OMRInstruction.cpp b/compiler/codegen/OMRInstruction.cpp index 46f64090bd4..361644d4598 100644 --- a/compiler/codegen/OMRInstruction.cpp +++ b/compiler/codegen/OMRInstruction.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CodeGenerator.hpp" diff --git a/compiler/codegen/OMRInstruction.hpp b/compiler/codegen/OMRInstruction.hpp index 8d732c3f13d..5602902d0f6 100644 --- a/compiler/codegen/OMRInstruction.hpp +++ b/compiler/codegen/OMRInstruction.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_INSTRUCTION_INCL diff --git a/compiler/codegen/OMRInstructionDelegate.hpp b/compiler/codegen/OMRInstructionDelegate.hpp index ea4e39b5f3a..cf293181f9f 100644 --- a/compiler/codegen/OMRInstructionDelegate.hpp +++ b/compiler/codegen/OMRInstructionDelegate.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_INSTRUCTIONDELEGATE_INCL diff --git a/compiler/codegen/OMRInstructionFlagEnum.hpp b/compiler/codegen/OMRInstructionFlagEnum.hpp index d760befae77..365b6241e03 100644 --- a/compiler/codegen/OMRInstructionFlagEnum.hpp +++ b/compiler/codegen/OMRInstructionFlagEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/codegen/OMRInstruction_inlines.hpp b/compiler/codegen/OMRInstruction_inlines.hpp index 10ec460782d..f2d16480799 100644 --- a/compiler/codegen/OMRInstruction_inlines.hpp +++ b/compiler/codegen/OMRInstruction_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_INSTRUCTION_INLINES_INCL diff --git a/compiler/codegen/OMRLinkage.cpp b/compiler/codegen/OMRLinkage.cpp index 4f9331ad234..bb4e4af396d 100644 --- a/compiler/codegen/OMRLinkage.cpp +++ b/compiler/codegen/OMRLinkage.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/Linkage.hpp" diff --git a/compiler/codegen/OMRLinkage.hpp b/compiler/codegen/OMRLinkage.hpp index f1d31933f82..2d562f92be6 100644 --- a/compiler/codegen/OMRLinkage.hpp +++ b/compiler/codegen/OMRLinkage.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_LINKAGE_INCL diff --git a/compiler/codegen/OMRLinkageConventions.enum b/compiler/codegen/OMRLinkageConventions.enum index 0c4a9f91c99..b121ce913ee 100644 --- a/compiler/codegen/OMRLinkageConventions.enum +++ b/compiler/codegen/OMRLinkageConventions.enum @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/codegen/OMRLinkage_inlines.hpp b/compiler/codegen/OMRLinkage_inlines.hpp index ed0524dbc9f..72bf757923b 100644 --- a/compiler/codegen/OMRLinkage_inlines.hpp +++ b/compiler/codegen/OMRLinkage_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_LINKAGE_INLINES_INCL diff --git a/compiler/codegen/OMRMachine.cpp b/compiler/codegen/OMRMachine.cpp index 451e68fae13..3cf7ea48452 100644 --- a/compiler/codegen/OMRMachine.cpp +++ b/compiler/codegen/OMRMachine.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(J9ZOS390) diff --git a/compiler/codegen/OMRMachine.hpp b/compiler/codegen/OMRMachine.hpp index b3762f1cf84..f7486c3406d 100644 --- a/compiler/codegen/OMRMachine.hpp +++ b/compiler/codegen/OMRMachine.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_MACHINE_INCL diff --git a/compiler/codegen/OMRMachine_inlines.hpp b/compiler/codegen/OMRMachine_inlines.hpp index 1f715a0aff6..e08e902de10 100644 --- a/compiler/codegen/OMRMachine_inlines.hpp +++ b/compiler/codegen/OMRMachine_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_MACHINE_INLINES_INCL diff --git a/compiler/codegen/OMRMemoryReference.cpp b/compiler/codegen/OMRMemoryReference.cpp index 8c7706a5a05..c91fde5cb16 100644 --- a/compiler/codegen/OMRMemoryReference.cpp +++ b/compiler/codegen/OMRMemoryReference.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/MemoryReference.hpp" diff --git a/compiler/codegen/OMRMemoryReference.hpp b/compiler/codegen/OMRMemoryReference.hpp index 41e7f4a2583..0d5f3bf98b2 100644 --- a/compiler/codegen/OMRMemoryReference.hpp +++ b/compiler/codegen/OMRMemoryReference.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_MEMREF_INCL diff --git a/compiler/codegen/OMRPeephole.cpp b/compiler/codegen/OMRPeephole.cpp index a54717093c7..25b6ef8dd1b 100644 --- a/compiler/codegen/OMRPeephole.cpp +++ b/compiler/codegen/OMRPeephole.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/Peephole.hpp" diff --git a/compiler/codegen/OMRPeephole.hpp b/compiler/codegen/OMRPeephole.hpp index 5c3a25e6a05..e5eda4439b8 100644 --- a/compiler/codegen/OMRPeephole.hpp +++ b/compiler/codegen/OMRPeephole.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_PEEPHOLE_INCL diff --git a/compiler/codegen/OMRRealRegister.cpp b/compiler/codegen/OMRRealRegister.cpp index 3e18b62e357..0d2c2ad89b6 100644 --- a/compiler/codegen/OMRRealRegister.cpp +++ b/compiler/codegen/OMRRealRegister.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/RealRegister.hpp" diff --git a/compiler/codegen/OMRRealRegister.hpp b/compiler/codegen/OMRRealRegister.hpp index 6d3cecc5bbc..46d936cea5f 100644 --- a/compiler/codegen/OMRRealRegister.hpp +++ b/compiler/codegen/OMRRealRegister.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_REAL_REGISTER_INCL diff --git a/compiler/codegen/OMRRecognizedMethodsEnum.hpp b/compiler/codegen/OMRRecognizedMethodsEnum.hpp index 0eb52f93dd0..c9900c3cc38 100644 --- a/compiler/codegen/OMRRecognizedMethodsEnum.hpp +++ b/compiler/codegen/OMRRecognizedMethodsEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_RECOGNIZEDMETHODS_ENUM_INCL diff --git a/compiler/codegen/OMRRegister.cpp b/compiler/codegen/OMRRegister.cpp index 1ad1faaba25..c5ce27b3405 100644 --- a/compiler/codegen/OMRRegister.cpp +++ b/compiler/codegen/OMRRegister.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/Register.hpp" diff --git a/compiler/codegen/OMRRegister.hpp b/compiler/codegen/OMRRegister.hpp index 4ac81c98d11..3a370e3e5cc 100644 --- a/compiler/codegen/OMRRegister.hpp +++ b/compiler/codegen/OMRRegister.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_REGISTER_INCL diff --git a/compiler/codegen/OMRRegisterDependency.cpp b/compiler/codegen/OMRRegisterDependency.cpp index 780310c9de7..67a9a1bf6ae 100644 --- a/compiler/codegen/OMRRegisterDependency.cpp +++ b/compiler/codegen/OMRRegisterDependency.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/RegisterDependency.hpp" diff --git a/compiler/codegen/OMRRegisterDependency.hpp b/compiler/codegen/OMRRegisterDependency.hpp index d4b3fa6fcff..2348f79b730 100644 --- a/compiler/codegen/OMRRegisterDependency.hpp +++ b/compiler/codegen/OMRRegisterDependency.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_REGISTER_DEPENDENCY_INCL diff --git a/compiler/codegen/OMRRegisterDependencyStruct.hpp b/compiler/codegen/OMRRegisterDependencyStruct.hpp index 51505c95b7b..dce7ba793ff 100644 --- a/compiler/codegen/OMRRegisterDependencyStruct.hpp +++ b/compiler/codegen/OMRRegisterDependencyStruct.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_REGISTER_DEPENDENCY_STRUCT_INCL diff --git a/compiler/codegen/OMRRegisterPair.cpp b/compiler/codegen/OMRRegisterPair.cpp index 448615d0373..22dee397178 100644 --- a/compiler/codegen/OMRRegisterPair.cpp +++ b/compiler/codegen/OMRRegisterPair.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/RegisterPair.hpp" diff --git a/compiler/codegen/OMRRegisterPair.hpp b/compiler/codegen/OMRRegisterPair.hpp index fc9173d3d91..ec1163e2c6d 100644 --- a/compiler/codegen/OMRRegisterPair.hpp +++ b/compiler/codegen/OMRRegisterPair.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_REGISTER_PAIR_INCL diff --git a/compiler/codegen/OMRSnippet.cpp b/compiler/codegen/OMRSnippet.cpp index 05ec48d111c..5ae98526c79 100644 --- a/compiler/codegen/OMRSnippet.cpp +++ b/compiler/codegen/OMRSnippet.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/codegen/OMRSnippet.hpp b/compiler/codegen/OMRSnippet.hpp index 8c6f405ce9e..d6bedaac74c 100644 --- a/compiler/codegen/OMRSnippet.hpp +++ b/compiler/codegen/OMRSnippet.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_SNIPPET_INCL diff --git a/compiler/codegen/OMRSnippetGCMap.cpp b/compiler/codegen/OMRSnippetGCMap.cpp index f066653bdd4..655a8c6653d 100644 --- a/compiler/codegen/OMRSnippetGCMap.cpp +++ b/compiler/codegen/OMRSnippetGCMap.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/codegen/OMRSnippetGCMap.hpp b/compiler/codegen/OMRSnippetGCMap.hpp index 7f902103a80..50a45a8a90f 100644 --- a/compiler/codegen/OMRSnippetGCMap.hpp +++ b/compiler/codegen/OMRSnippetGCMap.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_SNIPPETGCMAP_INCL diff --git a/compiler/codegen/OMRTreeEvaluator.cpp b/compiler/codegen/OMRTreeEvaluator.cpp index 510c9e6bde1..45153621c6b 100644 --- a/compiler/codegen/OMRTreeEvaluator.cpp +++ b/compiler/codegen/OMRTreeEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/TreeEvaluator.hpp" diff --git a/compiler/codegen/OMRTreeEvaluator.hpp b/compiler/codegen/OMRTreeEvaluator.hpp index 920ed426496..35334a40b4f 100644 --- a/compiler/codegen/OMRTreeEvaluator.hpp +++ b/compiler/codegen/OMRTreeEvaluator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_TREE_EVALUATOR_INCL diff --git a/compiler/codegen/OMRUnresolvedDataSnippet.cpp b/compiler/codegen/OMRUnresolvedDataSnippet.cpp index 70e0885ea90..1ecf761a5ba 100644 --- a/compiler/codegen/OMRUnresolvedDataSnippet.cpp +++ b/compiler/codegen/OMRUnresolvedDataSnippet.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/UnresolvedDataSnippet.hpp" diff --git a/compiler/codegen/OMRUnresolvedDataSnippet.hpp b/compiler/codegen/OMRUnresolvedDataSnippet.hpp index bb8b4875d42..7cac400f9bb 100644 --- a/compiler/codegen/OMRUnresolvedDataSnippet.hpp +++ b/compiler/codegen/OMRUnresolvedDataSnippet.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_UNRESOLVEDDATASNIPPET_INCL diff --git a/compiler/codegen/OutOfLineCodeSection.cpp b/compiler/codegen/OutOfLineCodeSection.cpp index 578ff018b84..f607da4615a 100644 --- a/compiler/codegen/OutOfLineCodeSection.cpp +++ b/compiler/codegen/OutOfLineCodeSection.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/OutOfLineCodeSection.hpp" diff --git a/compiler/codegen/OutOfLineCodeSection.hpp b/compiler/codegen/OutOfLineCodeSection.hpp index 8bef4e0dff6..b33b659c171 100644 --- a/compiler/codegen/OutOfLineCodeSection.hpp +++ b/compiler/codegen/OutOfLineCodeSection.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OUTOFLINECODESECTION_INCL diff --git a/compiler/codegen/Peephole.hpp b/compiler/codegen/Peephole.hpp index 97c8f6dd71f..171d153c8e8 100644 --- a/compiler/codegen/Peephole.hpp +++ b/compiler/codegen/Peephole.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_PEEPHOLE_INCL diff --git a/compiler/codegen/PreInstructionSelection.cpp b/compiler/codegen/PreInstructionSelection.cpp index 4e4e8e42066..e3048d8d767 100644 --- a/compiler/codegen/PreInstructionSelection.cpp +++ b/compiler/codegen/PreInstructionSelection.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CodeGenerator.hpp" diff --git a/compiler/codegen/RealRegister.hpp b/compiler/codegen/RealRegister.hpp index a3db1a633bf..54ea3598ec3 100644 --- a/compiler/codegen/RealRegister.hpp +++ b/compiler/codegen/RealRegister.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_REAL_REGISTER_INCL diff --git a/compiler/codegen/RecognizedMethods.hpp b/compiler/codegen/RecognizedMethods.hpp index 3fbab865378..2511d008231 100644 --- a/compiler/codegen/RecognizedMethods.hpp +++ b/compiler/codegen/RecognizedMethods.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef RECOGNIZEDMETHODS_INCL diff --git a/compiler/codegen/Register.hpp b/compiler/codegen/Register.hpp index 6d560e8a59b..73a6563e855 100644 --- a/compiler/codegen/Register.hpp +++ b/compiler/codegen/Register.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_REGISTER_INCL diff --git a/compiler/codegen/RegisterConstants.hpp b/compiler/codegen/RegisterConstants.hpp index 704ff0adedc..6fadafe0b9f 100644 --- a/compiler/codegen/RegisterConstants.hpp +++ b/compiler/codegen/RegisterConstants.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef REGISTERKINDS_INCL diff --git a/compiler/codegen/RegisterDependency.hpp b/compiler/codegen/RegisterDependency.hpp index ad3aa7fcddd..29ed374d718 100644 --- a/compiler/codegen/RegisterDependency.hpp +++ b/compiler/codegen/RegisterDependency.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_REGISTER_DEPENDENCY_INCL diff --git a/compiler/codegen/RegisterDependencyStruct.hpp b/compiler/codegen/RegisterDependencyStruct.hpp index b42c3ba4981..fda225f3890 100644 --- a/compiler/codegen/RegisterDependencyStruct.hpp +++ b/compiler/codegen/RegisterDependencyStruct.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_REGISTER_DEPENDENCY_STRUCT_INCL diff --git a/compiler/codegen/RegisterIterator.cpp b/compiler/codegen/RegisterIterator.cpp index 99984d5842d..53d596f9c5b 100644 --- a/compiler/codegen/RegisterIterator.cpp +++ b/compiler/codegen/RegisterIterator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/codegen/RegisterIterator.hpp b/compiler/codegen/RegisterIterator.hpp index df1b8473736..680b49b8bd3 100644 --- a/compiler/codegen/RegisterIterator.hpp +++ b/compiler/codegen/RegisterIterator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_REGISTER_ITERATOR_INCL diff --git a/compiler/codegen/RegisterPair.hpp b/compiler/codegen/RegisterPair.hpp index c1778e61b70..d44761de89a 100644 --- a/compiler/codegen/RegisterPair.hpp +++ b/compiler/codegen/RegisterPair.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_REGISTER_PAIR_INCL diff --git a/compiler/codegen/RegisterPressureSimulatorInner.hpp b/compiler/codegen/RegisterPressureSimulatorInner.hpp index 1239f52aedc..a8d3baf5f55 100644 --- a/compiler/codegen/RegisterPressureSimulatorInner.hpp +++ b/compiler/codegen/RegisterPressureSimulatorInner.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef REGISTER_PRESSURE_SIMULATOR_INNER diff --git a/compiler/codegen/RegisterRematerializationInfo.hpp b/compiler/codegen/RegisterRematerializationInfo.hpp index 7e44d7fdf73..9a1fd6cac2b 100644 --- a/compiler/codegen/RegisterRematerializationInfo.hpp +++ b/compiler/codegen/RegisterRematerializationInfo.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef REMATERIALIZATIONINFO_INCL diff --git a/compiler/codegen/RegisterUsage.hpp b/compiler/codegen/RegisterUsage.hpp index 8da322e46c9..c83c6f76285 100644 --- a/compiler/codegen/RegisterUsage.hpp +++ b/compiler/codegen/RegisterUsage.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_REGISTER_USAGE_INCL diff --git a/compiler/codegen/Relocation.cpp b/compiler/codegen/Relocation.cpp index 3f70df61632..0b089e1aa05 100644 --- a/compiler/codegen/Relocation.cpp +++ b/compiler/codegen/Relocation.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/Relocation.hpp" diff --git a/compiler/codegen/Relocation.hpp b/compiler/codegen/Relocation.hpp index d65a070cd2d..8dac0ba281a 100644 --- a/compiler/codegen/Relocation.hpp +++ b/compiler/codegen/Relocation.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef RELOCATION_INCL diff --git a/compiler/codegen/ScratchRegisterManager.cpp b/compiler/codegen/ScratchRegisterManager.cpp index 395595539fc..cf4aa65bcad 100644 --- a/compiler/codegen/ScratchRegisterManager.cpp +++ b/compiler/codegen/ScratchRegisterManager.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/ScratchRegisterManager.hpp" diff --git a/compiler/codegen/ScratchRegisterManager.hpp b/compiler/codegen/ScratchRegisterManager.hpp index 3ab4254fbf7..934f9e89af5 100644 --- a/compiler/codegen/ScratchRegisterManager.hpp +++ b/compiler/codegen/ScratchRegisterManager.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SCRATCHREGISTERMANAGER_INCL diff --git a/compiler/codegen/Snippet.hpp b/compiler/codegen/Snippet.hpp index ddb7e9da34c..82d691a3de7 100644 --- a/compiler/codegen/Snippet.hpp +++ b/compiler/codegen/Snippet.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_SNIPPET_INCL diff --git a/compiler/codegen/SnippetGCMap.hpp b/compiler/codegen/SnippetGCMap.hpp index ceb719bc563..9f9523fc114 100644 --- a/compiler/codegen/SnippetGCMap.hpp +++ b/compiler/codegen/SnippetGCMap.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_SNIPPETGCMAP_INCL diff --git a/compiler/codegen/StaticRelocation.hpp b/compiler/codegen/StaticRelocation.hpp index 7042e460537..69bfc85ccd9 100644 --- a/compiler/codegen/StaticRelocation.hpp +++ b/compiler/codegen/StaticRelocation.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef STATICRELOCATION_HPP diff --git a/compiler/codegen/StorageInfo.cpp b/compiler/codegen/StorageInfo.cpp index d1f39e3a8da..d13e528647e 100644 --- a/compiler/codegen/StorageInfo.cpp +++ b/compiler/codegen/StorageInfo.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/StorageInfo.hpp" diff --git a/compiler/codegen/StorageInfo.hpp b/compiler/codegen/StorageInfo.hpp index 73e1ac02913..12627f60701 100644 --- a/compiler/codegen/StorageInfo.hpp +++ b/compiler/codegen/StorageInfo.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef STORAGEINFO_INCL diff --git a/compiler/codegen/TableOfConstants.hpp b/compiler/codegen/TableOfConstants.hpp index d52f6e65594..567b50bc2eb 100644 --- a/compiler/codegen/TableOfConstants.hpp +++ b/compiler/codegen/TableOfConstants.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_TABLEOFCONSTANTS_INCL diff --git a/compiler/codegen/TreeEvaluator.hpp b/compiler/codegen/TreeEvaluator.hpp index 6bbbf749255..a05ebc22753 100644 --- a/compiler/codegen/TreeEvaluator.hpp +++ b/compiler/codegen/TreeEvaluator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_TREE_EVALUATOR_INCL diff --git a/compiler/codegen/UnresolvedDataSnippet.hpp b/compiler/codegen/UnresolvedDataSnippet.hpp index ad53b5cc876..f89a91d349a 100644 --- a/compiler/codegen/UnresolvedDataSnippet.hpp +++ b/compiler/codegen/UnresolvedDataSnippet.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_UNRESOLVEDDATASNIPPET_INCL diff --git a/compiler/codegen/UnresolvedDataSnippet_inlines.hpp b/compiler/codegen/UnresolvedDataSnippet_inlines.hpp index 8d81f497bf6..095da9e96b9 100644 --- a/compiler/codegen/UnresolvedDataSnippet_inlines.hpp +++ b/compiler/codegen/UnresolvedDataSnippet_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_UNRESOLVEDDATASNIPPET_INLINE_INCL diff --git a/compiler/compile/AliasBuilder.hpp b/compiler/compile/AliasBuilder.hpp index 33b7f4c7797..75a3a6b732d 100644 --- a/compiler/compile/AliasBuilder.hpp +++ b/compiler/compile/AliasBuilder.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_ALIASBUILDER_INCL diff --git a/compiler/compile/CMakeLists.txt b/compiler/compile/CMakeLists.txt index 5712e821a75..88681a12bf7 100644 --- a/compiler/compile/CMakeLists.txt +++ b/compiler/compile/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# compiler_library(compile diff --git a/compiler/compile/Compilation.hpp b/compiler/compile/Compilation.hpp index ff6a9f7c8c1..b2798c33b08 100644 --- a/compiler/compile/Compilation.hpp +++ b/compiler/compile/Compilation.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_COMPILATION_INCL diff --git a/compiler/compile/CompilationException.hpp b/compiler/compile/CompilationException.hpp index 17f531261b3..d5279ce6f24 100644 --- a/compiler/compile/CompilationException.hpp +++ b/compiler/compile/CompilationException.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef COMPILATIONEXCEPTION_HPP diff --git a/compiler/compile/CompilationTypes.hpp b/compiler/compile/CompilationTypes.hpp index 2e645b1029b..eb9db8ef7f4 100644 --- a/compiler/compile/CompilationTypes.hpp +++ b/compiler/compile/CompilationTypes.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef COMPILATION_DATATYPES_INCL diff --git a/compiler/compile/Compilation_inlines.hpp b/compiler/compile/Compilation_inlines.hpp index 8ae2f9a9ecc..3822172e126 100644 --- a/compiler/compile/Compilation_inlines.hpp +++ b/compiler/compile/Compilation_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef COMPILATION_INLINES_INCL diff --git a/compiler/compile/InlineBlock.hpp b/compiler/compile/InlineBlock.hpp index aebf18e1b79..07d1c2d29b1 100644 --- a/compiler/compile/InlineBlock.hpp +++ b/compiler/compile/InlineBlock.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef INLINEBLOCK_INCL diff --git a/compiler/compile/Method.hpp b/compiler/compile/Method.hpp index e7b861c6c40..80c572b97ee 100644 --- a/compiler/compile/Method.hpp +++ b/compiler/compile/Method.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_METHOD_INCL diff --git a/compiler/compile/NonHelperSymbols.enum b/compiler/compile/NonHelperSymbols.enum index 24825f3c54e..f84345537fe 100644 --- a/compiler/compile/NonHelperSymbols.enum +++ b/compiler/compile/NonHelperSymbols.enum @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/OMRNonHelperSymbols.enum" diff --git a/compiler/compile/OMRAliasBuilder.cpp b/compiler/compile/OMRAliasBuilder.cpp index b2ae2795f0c..e68dfda3a24 100644 --- a/compiler/compile/OMRAliasBuilder.cpp +++ b/compiler/compile/OMRAliasBuilder.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/AliasBuilder.hpp" diff --git a/compiler/compile/OMRAliasBuilder.hpp b/compiler/compile/OMRAliasBuilder.hpp index e3a8327dc5e..e754afa4322 100644 --- a/compiler/compile/OMRAliasBuilder.hpp +++ b/compiler/compile/OMRAliasBuilder.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ALIASBUILDER_INCL diff --git a/compiler/compile/OMRCompilation.cpp b/compiler/compile/OMRCompilation.cpp index 146561c6e25..fbb947ff282 100644 --- a/compiler/compile/OMRCompilation.cpp +++ b/compiler/compile/OMRCompilation.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/Compilation.hpp" diff --git a/compiler/compile/OMRCompilation.hpp b/compiler/compile/OMRCompilation.hpp index c76b0d59b6e..01dfe176d66 100644 --- a/compiler/compile/OMRCompilation.hpp +++ b/compiler/compile/OMRCompilation.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_COMPILATION_INCL diff --git a/compiler/compile/OMRCompilation_inlines.hpp b/compiler/compile/OMRCompilation_inlines.hpp index c7f315e00d0..c35d9ad8e48 100644 --- a/compiler/compile/OMRCompilation_inlines.hpp +++ b/compiler/compile/OMRCompilation_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_COMPILATION_INLINES_INCL diff --git a/compiler/compile/OMRMethod.cpp b/compiler/compile/OMRMethod.cpp index 4ea7e803e1d..05d7acb24ac 100644 --- a/compiler/compile/OMRMethod.cpp +++ b/compiler/compile/OMRMethod.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/Method.hpp" diff --git a/compiler/compile/OMRMethod.hpp b/compiler/compile/OMRMethod.hpp index 35c125934f0..9d9ded758a8 100644 --- a/compiler/compile/OMRMethod.hpp +++ b/compiler/compile/OMRMethod.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_METHOD_INCL diff --git a/compiler/compile/OMRNonHelperSymbols.enum b/compiler/compile/OMRNonHelperSymbols.enum index 98903a6ce35..efacf119412 100644 --- a/compiler/compile/OMRNonHelperSymbols.enum +++ b/compiler/compile/OMRNonHelperSymbols.enum @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/compile/OMRSymbolReferenceTable.cpp b/compiler/compile/OMRSymbolReferenceTable.cpp index f7e95666c2e..7f302041fbe 100644 --- a/compiler/compile/OMRSymbolReferenceTable.cpp +++ b/compiler/compile/OMRSymbolReferenceTable.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/SymbolReferenceTable.hpp" diff --git a/compiler/compile/OMRSymbolReferenceTable.hpp b/compiler/compile/OMRSymbolReferenceTable.hpp index 6b2822ae2a5..f60641f29c7 100644 --- a/compiler/compile/OMRSymbolReferenceTable.hpp +++ b/compiler/compile/OMRSymbolReferenceTable.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_SYMBOLREFERENCETABLE_INCL diff --git a/compiler/compile/OSRData.cpp b/compiler/compile/OSRData.cpp index c1dbf26a996..d11ac5dd1ac 100644 --- a/compiler/compile/OSRData.cpp +++ b/compiler/compile/OSRData.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/OSRData.hpp" diff --git a/compiler/compile/OSRData.hpp b/compiler/compile/OSRData.hpp index d5711bfbdb6..4933ac588b7 100644 --- a/compiler/compile/OSRData.hpp +++ b/compiler/compile/OSRData.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OSRDATA_INCL diff --git a/compiler/compile/ResolvedMethod.cpp b/compiler/compile/ResolvedMethod.cpp index b18a51fc633..6a2d6cd4363 100644 --- a/compiler/compile/ResolvedMethod.cpp +++ b/compiler/compile/ResolvedMethod.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/ResolvedMethod.hpp" diff --git a/compiler/compile/ResolvedMethod.hpp b/compiler/compile/ResolvedMethod.hpp index 0354e6c17e8..aa905fa55fd 100644 --- a/compiler/compile/ResolvedMethod.hpp +++ b/compiler/compile/ResolvedMethod.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_RESOLVEDMETHODBASE_INCL diff --git a/compiler/compile/SymbolReferenceTable.hpp b/compiler/compile/SymbolReferenceTable.hpp index 8dad3559b46..dbf081b708e 100644 --- a/compiler/compile/SymbolReferenceTable.hpp +++ b/compiler/compile/SymbolReferenceTable.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_SYMBOLREFERENCETABLE_INCL diff --git a/compiler/compile/TLSCompilationManager.cpp b/compiler/compile/TLSCompilationManager.cpp index 7644051ab16..a9b557fff4e 100644 --- a/compiler/compile/TLSCompilationManager.cpp +++ b/compiler/compile/TLSCompilationManager.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/TLSCompilationManager.hpp" diff --git a/compiler/compile/TLSCompilationManager.hpp b/compiler/compile/TLSCompilationManager.hpp index c368f7bf8c1..5a5ce047ecc 100644 --- a/compiler/compile/TLSCompilationManager.hpp +++ b/compiler/compile/TLSCompilationManager.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TLSCOMPILATIONMANAGER_HPP diff --git a/compiler/compile/VirtualGuard.cpp b/compiler/compile/VirtualGuard.cpp index d4e068feef7..24885aaf750 100644 --- a/compiler/compile/VirtualGuard.cpp +++ b/compiler/compile/VirtualGuard.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/VirtualGuard.hpp" diff --git a/compiler/compile/VirtualGuard.hpp b/compiler/compile/VirtualGuard.hpp index f04b1a9f0c2..fbfb3865577 100644 --- a/compiler/compile/VirtualGuard.hpp +++ b/compiler/compile/VirtualGuard.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_VIRTUALGUARD_INCL diff --git a/compiler/control/CMakeLists.txt b/compiler/control/CMakeLists.txt index a372f73fd28..ff1ae876085 100644 --- a/compiler/control/CMakeLists.txt +++ b/compiler/control/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# compiler_library(control diff --git a/compiler/control/CompilationController.cpp b/compiler/control/CompilationController.cpp index e745570a05f..e4ce8c83c29 100644 --- a/compiler/control/CompilationController.cpp +++ b/compiler/control/CompilationController.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "control/CompilationController.hpp" diff --git a/compiler/control/CompilationController.hpp b/compiler/control/CompilationController.hpp index 7f226d655e8..0097f521f24 100644 --- a/compiler/control/CompilationController.hpp +++ b/compiler/control/CompilationController.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef COMPILATIONCONTROLLER_INCL diff --git a/compiler/control/CompilationStrategy.hpp b/compiler/control/CompilationStrategy.hpp index d856cafcc4e..30f160519d6 100644 --- a/compiler/control/CompilationStrategy.hpp +++ b/compiler/control/CompilationStrategy.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_COMPILATIONSTRATEGY_INCL diff --git a/compiler/control/CompileMethod.cpp b/compiler/control/CompileMethod.cpp index 4263da7b809..b9791b61195 100644 --- a/compiler/control/CompileMethod.cpp +++ b/compiler/control/CompileMethod.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "control/CompileMethod.hpp" diff --git a/compiler/control/CompileMethod.hpp b/compiler/control/CompileMethod.hpp index 0bfcc52d879..6f35712050e 100644 --- a/compiler/control/CompileMethod.hpp +++ b/compiler/control/CompileMethod.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/control/OMRCompilationStrategy.cpp b/compiler/control/OMRCompilationStrategy.cpp index b0e26ca3e5d..742046ea8a0 100644 --- a/compiler/control/OMRCompilationStrategy.cpp +++ b/compiler/control/OMRCompilationStrategy.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "control/CompilationStrategy.hpp" diff --git a/compiler/control/OMRCompilationStrategy.hpp b/compiler/control/OMRCompilationStrategy.hpp index cab47734ec9..5a4c064f04a 100644 --- a/compiler/control/OMRCompilationStrategy.hpp +++ b/compiler/control/OMRCompilationStrategy.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_COMPILATIONSTRATEGY_INCL diff --git a/compiler/control/OMROptions.cpp b/compiler/control/OMROptions.cpp index 9b2271dfb81..2f4e6f7efbd 100644 --- a/compiler/control/OMROptions.cpp +++ b/compiler/control/OMROptions.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "control/Options.hpp" diff --git a/compiler/control/OMROptions.hpp b/compiler/control/OMROptions.hpp index f5a77d146e7..13c4e3e3916 100644 --- a/compiler/control/OMROptions.hpp +++ b/compiler/control/OMROptions.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_OPTIONS_INCL diff --git a/compiler/control/OMROptions_inlines.hpp b/compiler/control/OMROptions_inlines.hpp index 2f13b3d9b11..65414b96f34 100644 --- a/compiler/control/OMROptions_inlines.hpp +++ b/compiler/control/OMROptions_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_OPTIONS_INLINES_INCL diff --git a/compiler/control/OMRRecompilation.cpp b/compiler/control/OMRRecompilation.cpp index 9049e2fbf79..971dcd3a608 100644 --- a/compiler/control/OMRRecompilation.cpp +++ b/compiler/control/OMRRecompilation.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "control/Recompilation.hpp" diff --git a/compiler/control/OMRRecompilation.hpp b/compiler/control/OMRRecompilation.hpp index 2d23d36532b..13efbeb4d4c 100644 --- a/compiler/control/OMRRecompilation.hpp +++ b/compiler/control/OMRRecompilation.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_RECOMPILATION_INCL diff --git a/compiler/control/OptimizationPlan.cpp b/compiler/control/OptimizationPlan.cpp index 69abd63723e..2c5c1506cc5 100644 --- a/compiler/control/OptimizationPlan.cpp +++ b/compiler/control/OptimizationPlan.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "control/OptimizationPlan.hpp" diff --git a/compiler/control/OptimizationPlan.hpp b/compiler/control/OptimizationPlan.hpp index 31b683b185f..34a045a966a 100644 --- a/compiler/control/OptimizationPlan.hpp +++ b/compiler/control/OptimizationPlan.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OPTIMIZATION_PLAN_INCL diff --git a/compiler/control/Options.hpp b/compiler/control/Options.hpp index 4de1898a811..69c2a7cedc0 100644 --- a/compiler/control/Options.hpp +++ b/compiler/control/Options.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_OPTIONS_INCL diff --git a/compiler/control/OptionsUtil.hpp b/compiler/control/OptionsUtil.hpp index b36bca32d33..3befb695554 100644 --- a/compiler/control/OptionsUtil.hpp +++ b/compiler/control/OptionsUtil.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_OPTIONSUTIL_INCL diff --git a/compiler/control/Options_inlines.hpp b/compiler/control/Options_inlines.hpp index fc7416bba33..5b8e68cf213 100644 --- a/compiler/control/Options_inlines.hpp +++ b/compiler/control/Options_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_OPTION_INLINES_INCL diff --git a/compiler/control/Recompilation.hpp b/compiler/control/Recompilation.hpp index bdc5ccedc21..decdde5de02 100644 --- a/compiler/control/Recompilation.hpp +++ b/compiler/control/Recompilation.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_RECOMPILATION_INCL diff --git a/compiler/cs2/allocator.h b/compiler/cs2/allocator.h index b99c89f46ba..4f27d0644ed 100644 --- a/compiler/cs2/allocator.h +++ b/compiler/cs2/allocator.h @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /***************************************************************************/ diff --git a/compiler/cs2/arrayof.h b/compiler/cs2/arrayof.h index e4f63b69e99..881a3bcd74c 100644 --- a/compiler/cs2/arrayof.h +++ b/compiler/cs2/arrayof.h @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /***************************************************************************/ diff --git a/compiler/cs2/bitmanip.h b/compiler/cs2/bitmanip.h index 945bc4cd1e3..ad71850b92b 100644 --- a/compiler/cs2/bitmanip.h +++ b/compiler/cs2/bitmanip.h @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /***************************************************************************/ diff --git a/compiler/cs2/bitvectr.h b/compiler/cs2/bitvectr.h index 4dd63aced45..bddb2b38988 100644 --- a/compiler/cs2/bitvectr.h +++ b/compiler/cs2/bitvectr.h @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /***************************************************************************/ diff --git a/compiler/cs2/cs2.h b/compiler/cs2/cs2.h index 4c52dd4ebfd..6857c5d3a69 100644 --- a/compiler/cs2/cs2.h +++ b/compiler/cs2/cs2.h @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CS2_H diff --git a/compiler/cs2/hashtab.h b/compiler/cs2/hashtab.h index 5da42676d0f..8867c2e917b 100644 --- a/compiler/cs2/hashtab.h +++ b/compiler/cs2/hashtab.h @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /***************************************************************************/ diff --git a/compiler/cs2/listof.h b/compiler/cs2/listof.h index de6edbdd8fa..a57ebc45071 100644 --- a/compiler/cs2/listof.h +++ b/compiler/cs2/listof.h @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CS2_LISTOF_H diff --git a/compiler/cs2/llistof.h b/compiler/cs2/llistof.h index a0f63b75aef..b4ee4fdae78 100644 --- a/compiler/cs2/llistof.h +++ b/compiler/cs2/llistof.h @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /***************************************************************************/ diff --git a/compiler/cs2/sparsrbit.h b/compiler/cs2/sparsrbit.h index 474e538da5b..65440743947 100644 --- a/compiler/cs2/sparsrbit.h +++ b/compiler/cs2/sparsrbit.h @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CS2_SPARSRBIT_H diff --git a/compiler/cs2/timer.h b/compiler/cs2/timer.h index b2918bd6525..5d45d62e790 100644 --- a/compiler/cs2/timer.h +++ b/compiler/cs2/timer.h @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /***************************************************************************/ diff --git a/compiler/cs2/windows_api.h b/compiler/cs2/windows_api.h index eff505ab317..072091dca6a 100644 --- a/compiler/cs2/windows_api.h +++ b/compiler/cs2/windows_api.h @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(OMR_OS_WINDOWS) diff --git a/compiler/env/ArithEnv.hpp b/compiler/env/ArithEnv.hpp index 6623ebea21d..b3213353ea6 100644 --- a/compiler/env/ArithEnv.hpp +++ b/compiler/env/ArithEnv.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_ARITHENV_INCL diff --git a/compiler/env/CMakeLists.txt b/compiler/env/CMakeLists.txt index db0af340599..fcc07eed2a7 100644 --- a/compiler/env/CMakeLists.txt +++ b/compiler/env/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# compiler_library(env diff --git a/compiler/env/CPU.hpp b/compiler/env/CPU.hpp index f907cb4c0c5..b404832f347 100644 --- a/compiler/env/CPU.hpp +++ b/compiler/env/CPU.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_CPU_INCL diff --git a/compiler/env/ClassEnv.hpp b/compiler/env/ClassEnv.hpp index 83f8e42fd1a..4a7ef176b1f 100644 --- a/compiler/env/ClassEnv.hpp +++ b/compiler/env/ClassEnv.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_CLASSENV_INCL diff --git a/compiler/env/CompileTimeProfiler.hpp b/compiler/env/CompileTimeProfiler.hpp index 38377db3fe0..a8592d3e384 100644 --- a/compiler/env/CompileTimeProfiler.hpp +++ b/compiler/env/CompileTimeProfiler.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_COMPILE_TIME_PROFILER_HPP diff --git a/compiler/env/CompilerEnv.hpp b/compiler/env/CompilerEnv.hpp index cf2a9dd993c..a4bab611f9c 100644 --- a/compiler/env/CompilerEnv.hpp +++ b/compiler/env/CompilerEnv.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_COMPILER_ENV_INCL diff --git a/compiler/env/DebugEnv.hpp b/compiler/env/DebugEnv.hpp index 2e1936f32b2..2caaa560958 100644 --- a/compiler/env/DebugEnv.hpp +++ b/compiler/env/DebugEnv.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_DEBUG_ENV_INCL diff --git a/compiler/env/DebugSegmentProvider.cpp b/compiler/env/DebugSegmentProvider.cpp index 214f97b39ae..ecf9c013f28 100644 --- a/compiler/env/DebugSegmentProvider.cpp +++ b/compiler/env/DebugSegmentProvider.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if (defined(LINUX) && !defined(OMRZTPF)) || defined(__APPLE__) || defined(_AIX) diff --git a/compiler/env/DebugSegmentProvider.hpp b/compiler/env/DebugSegmentProvider.hpp index 1419af24dd1..47abed283a6 100644 --- a/compiler/env/DebugSegmentProvider.hpp +++ b/compiler/env/DebugSegmentProvider.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_DEBUG_SEGMENT_PROVIDER diff --git a/compiler/env/Environment.hpp b/compiler/env/Environment.hpp index 052b3dd0bda..45445fb047f 100644 --- a/compiler/env/Environment.hpp +++ b/compiler/env/Environment.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_ENVIRONMENT_INCL diff --git a/compiler/env/ExceptionTable.cpp b/compiler/env/ExceptionTable.cpp index 1c74482919a..a0de279762c 100644 --- a/compiler/env/ExceptionTable.cpp +++ b/compiler/env/ExceptionTable.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/ExceptionTable.hpp" diff --git a/compiler/env/ExceptionTable.hpp b/compiler/env/ExceptionTable.hpp index dc4c7628fc7..0f5aa887b69 100644 --- a/compiler/env/ExceptionTable.hpp +++ b/compiler/env/ExceptionTable.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef EXCEPTIONTABLE_INCL diff --git a/compiler/env/FEBase.cpp b/compiler/env/FEBase.cpp index da59790f7f3..4ceda8f0ed6 100644 --- a/compiler/env/FEBase.cpp +++ b/compiler/env/FEBase.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/env/FEBase.hpp b/compiler/env/FEBase.hpp index 6ee81d74b9c..c1551fe3e2f 100644 --- a/compiler/env/FEBase.hpp +++ b/compiler/env/FEBase.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef FEBASE_HPP_JniLXw diff --git a/compiler/env/FEBase_t.hpp b/compiler/env/FEBase_t.hpp index 0bfd2f64680..9ea17dc3845 100644 --- a/compiler/env/FEBase_t.hpp +++ b/compiler/env/FEBase_t.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(OMR_OS_WINDOWS) diff --git a/compiler/env/FilePointer.hpp b/compiler/env/FilePointer.hpp index af1c89d3b35..06068eb05ef 100644 --- a/compiler/env/FilePointer.hpp +++ b/compiler/env/FilePointer.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_FILEPOINTER_INCL diff --git a/compiler/env/FilePointerDecl.hpp b/compiler/env/FilePointerDecl.hpp index a128332280c..86eff7649c9 100644 --- a/compiler/env/FilePointerDecl.hpp +++ b/compiler/env/FilePointerDecl.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_FILE_POINTER_DECL_INCL diff --git a/compiler/env/FrontEnd.cpp b/compiler/env/FrontEnd.cpp index bfaedf60188..edbff0c6549 100644 --- a/compiler/env/FrontEnd.cpp +++ b/compiler/env/FrontEnd.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/FrontEnd.hpp" diff --git a/compiler/env/FrontEnd.hpp b/compiler/env/FrontEnd.hpp index 1995894e1f9..5056417ba25 100644 --- a/compiler/env/FrontEnd.hpp +++ b/compiler/env/FrontEnd.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef FRONTEND_INCL diff --git a/compiler/env/Globals.cpp b/compiler/env/Globals.cpp index 0b77514d7dc..ee4c7676dd5 100644 --- a/compiler/env/Globals.cpp +++ b/compiler/env/Globals.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/CompilerEnv.hpp" diff --git a/compiler/env/HeuristicRegion.hpp b/compiler/env/HeuristicRegion.hpp index 219e1c357cd..9bc9bd03581 100644 --- a/compiler/env/HeuristicRegion.hpp +++ b/compiler/env/HeuristicRegion.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_HEURISTIC_REGION_HPP diff --git a/compiler/env/IO.hpp b/compiler/env/IO.hpp index 337c1200a87..271a53e4bc2 100644 --- a/compiler/env/IO.hpp +++ b/compiler/env/IO.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_IO_INCL diff --git a/compiler/env/JitConfig.cpp b/compiler/env/JitConfig.cpp index 0d961ce7a55..28c4bf50482 100644 --- a/compiler/env/JitConfig.cpp +++ b/compiler/env/JitConfig.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/JitConfig.hpp" diff --git a/compiler/env/JitConfig.hpp b/compiler/env/JitConfig.hpp index feab316541e..43594403ce7 100644 --- a/compiler/env/JitConfig.hpp +++ b/compiler/env/JitConfig.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JITCONFIG_HPP_BThFwv diff --git a/compiler/env/KnownObjectTable.hpp b/compiler/env/KnownObjectTable.hpp index 91750ab6b1b..f9a8a7d088c 100644 --- a/compiler/env/KnownObjectTable.hpp +++ b/compiler/env/KnownObjectTable.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_KNOWN_OBJECT_TABLE_INCL diff --git a/compiler/env/MemorySegment.hpp b/compiler/env/MemorySegment.hpp index 77e082335cc..c1369e7a805 100644 --- a/compiler/env/MemorySegment.hpp +++ b/compiler/env/MemorySegment.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_MEMORY_SEGMENT diff --git a/compiler/env/OMRArithEnv.cpp b/compiler/env/OMRArithEnv.cpp index c295d8ccebe..ff9dc74ccb0 100644 --- a/compiler/env/OMRArithEnv.cpp +++ b/compiler/env/OMRArithEnv.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/env/OMRArithEnv.hpp b/compiler/env/OMRArithEnv.hpp index 296c9f3ccf7..adf0f9a00a9 100644 --- a/compiler/env/OMRArithEnv.hpp +++ b/compiler/env/OMRArithEnv.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ARITHENV_INCL diff --git a/compiler/env/OMRCPU.cpp b/compiler/env/OMRCPU.cpp index 233af4d698b..868823f65e0 100644 --- a/compiler/env/OMRCPU.cpp +++ b/compiler/env/OMRCPU.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(J9ZOS390) diff --git a/compiler/env/OMRCPU.hpp b/compiler/env/OMRCPU.hpp index a8d1ee2ef80..0d9aa2b251f 100644 --- a/compiler/env/OMRCPU.hpp +++ b/compiler/env/OMRCPU.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_CPU_INCL diff --git a/compiler/env/OMRClassEnv.cpp b/compiler/env/OMRClassEnv.cpp index 31115252778..a77a9b4a9a1 100644 --- a/compiler/env/OMRClassEnv.cpp +++ b/compiler/env/OMRClassEnv.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/env/OMRClassEnv.hpp b/compiler/env/OMRClassEnv.hpp index b4f55cf408a..9cfada22a4b 100644 --- a/compiler/env/OMRClassEnv.hpp +++ b/compiler/env/OMRClassEnv.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_CLASSENV_INCL diff --git a/compiler/env/OMRCompilerEnv.cpp b/compiler/env/OMRCompilerEnv.cpp index fcf1ca9e2c3..78f717f74c0 100644 --- a/compiler/env/OMRCompilerEnv.cpp +++ b/compiler/env/OMRCompilerEnv.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/CompilerEnv.hpp" diff --git a/compiler/env/OMRCompilerEnv.hpp b/compiler/env/OMRCompilerEnv.hpp index eeb687a9f19..9cfb4877a12 100644 --- a/compiler/env/OMRCompilerEnv.hpp +++ b/compiler/env/OMRCompilerEnv.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_COMPILER_ENV_INCL diff --git a/compiler/env/OMRDebugEnv.cpp b/compiler/env/OMRDebugEnv.cpp index ee5caad61d2..83c1fe73f68 100644 --- a/compiler/env/OMRDebugEnv.cpp +++ b/compiler/env/OMRDebugEnv.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/env/OMRDebugEnv.hpp b/compiler/env/OMRDebugEnv.hpp index 50456832651..11fa12780a0 100644 --- a/compiler/env/OMRDebugEnv.hpp +++ b/compiler/env/OMRDebugEnv.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_DEBUG_ENV_INCL diff --git a/compiler/env/OMREnvironment.hpp b/compiler/env/OMREnvironment.hpp index 73cdfaa9047..5b4d2273d5e 100644 --- a/compiler/env/OMREnvironment.hpp +++ b/compiler/env/OMREnvironment.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ENVIRONMENT_INCL diff --git a/compiler/env/OMRIO.cpp b/compiler/env/OMRIO.cpp index 90549846be9..c7ef25687b6 100644 --- a/compiler/env/OMRIO.cpp +++ b/compiler/env/OMRIO.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/IO.hpp" diff --git a/compiler/env/OMRIO.hpp b/compiler/env/OMRIO.hpp index 69d3b219b31..4a1244a5ffa 100644 --- a/compiler/env/OMRIO.hpp +++ b/compiler/env/OMRIO.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_IO_INCL diff --git a/compiler/env/OMRKnownObjectTable.cpp b/compiler/env/OMRKnownObjectTable.cpp index f60e160ed40..98eb32c22e7 100644 --- a/compiler/env/OMRKnownObjectTable.cpp +++ b/compiler/env/OMRKnownObjectTable.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/KnownObjectTable.hpp" diff --git a/compiler/env/OMRKnownObjectTable.hpp b/compiler/env/OMRKnownObjectTable.hpp index e2971fc5101..36910c5a2da 100644 --- a/compiler/env/OMRKnownObjectTable.hpp +++ b/compiler/env/OMRKnownObjectTable.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_KNOWN_OBJECT_TABLE_INCL diff --git a/compiler/env/OMRMemory.hpp b/compiler/env/OMRMemory.hpp index feaf96b4e13..7451635860b 100644 --- a/compiler/env/OMRMemory.hpp +++ b/compiler/env/OMRMemory.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_MEMORY_INCL diff --git a/compiler/env/OMRObjectModel.cpp b/compiler/env/OMRObjectModel.cpp index 280682ec765..0f1d2d47275 100644 --- a/compiler/env/OMRObjectModel.cpp +++ b/compiler/env/OMRObjectModel.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/ObjectModel.hpp" diff --git a/compiler/env/OMRObjectModel.hpp b/compiler/env/OMRObjectModel.hpp index 2fc4986613b..ae286194472 100644 --- a/compiler/env/OMRObjectModel.hpp +++ b/compiler/env/OMRObjectModel.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_OBJECT_MODEL_INCL diff --git a/compiler/env/OMRPersistentInfo.cpp b/compiler/env/OMRPersistentInfo.cpp index be1696e7976..66a5b091b5b 100644 --- a/compiler/env/OMRPersistentInfo.cpp +++ b/compiler/env/OMRPersistentInfo.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/PersistentInfo.hpp" diff --git a/compiler/env/OMRPersistentInfo.hpp b/compiler/env/OMRPersistentInfo.hpp index 7eeaf3468e3..0b05a8d09c6 100644 --- a/compiler/env/OMRPersistentInfo.hpp +++ b/compiler/env/OMRPersistentInfo.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_PERSISTENTINFO_INCL diff --git a/compiler/env/OMRVMAccessCriticalSection.hpp b/compiler/env/OMRVMAccessCriticalSection.hpp index 57b0085eaed..e4d78e690c3 100644 --- a/compiler/env/OMRVMAccessCriticalSection.hpp +++ b/compiler/env/OMRVMAccessCriticalSection.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_VMACCESSCRITICALSECTION_INCL diff --git a/compiler/env/OMRVMEnv.cpp b/compiler/env/OMRVMEnv.cpp index 28609a76a4d..fa1b4df474e 100644 --- a/compiler/env/OMRVMEnv.cpp +++ b/compiler/env/OMRVMEnv.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/ObjectModel.hpp" diff --git a/compiler/env/OMRVMEnv.hpp b/compiler/env/OMRVMEnv.hpp index 4aace20fdbe..8455f92762b 100644 --- a/compiler/env/OMRVMEnv.hpp +++ b/compiler/env/OMRVMEnv.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_VMENV_INCL diff --git a/compiler/env/OMRVMMethodEnv.cpp b/compiler/env/OMRVMMethodEnv.cpp index 88db593b508..9964efbfa3a 100644 --- a/compiler/env/OMRVMMethodEnv.cpp +++ b/compiler/env/OMRVMMethodEnv.cpp @@ -16,5 +16,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/compiler/env/OMRVMMethodEnv.hpp b/compiler/env/OMRVMMethodEnv.hpp index 1281a059efc..a12c325481c 100644 --- a/compiler/env/OMRVMMethodEnv.hpp +++ b/compiler/env/OMRVMMethodEnv.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_VMMETHODENV_INCL diff --git a/compiler/env/ObjectModel.hpp b/compiler/env/ObjectModel.hpp index 498f91ff4dd..da4593d3f48 100644 --- a/compiler/env/ObjectModel.hpp +++ b/compiler/env/ObjectModel.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_OBJECTMODEL_INCL diff --git a/compiler/env/PersistentAllocator.cpp b/compiler/env/PersistentAllocator.cpp index b7c2f09c7b5..cae6620262c 100644 --- a/compiler/env/PersistentAllocator.cpp +++ b/compiler/env/PersistentAllocator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/PersistentAllocator.hpp" diff --git a/compiler/env/PersistentAllocator.hpp b/compiler/env/PersistentAllocator.hpp index 7a034892fc5..e69ec22f3a8 100644 --- a/compiler/env/PersistentAllocator.hpp +++ b/compiler/env/PersistentAllocator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_PERSISTENT_ALLOCATOR diff --git a/compiler/env/PersistentAllocatorKit.hpp b/compiler/env/PersistentAllocatorKit.hpp index d0dde58f218..de1abc3e16d 100644 --- a/compiler/env/PersistentAllocatorKit.hpp +++ b/compiler/env/PersistentAllocatorKit.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PERSISTENTALLOCATORKIT_HPP diff --git a/compiler/env/PersistentInfo.hpp b/compiler/env/PersistentInfo.hpp index c83a3324d4a..94a71c97657 100644 --- a/compiler/env/PersistentInfo.hpp +++ b/compiler/env/PersistentInfo.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_PERSISTENTINFO_INCL diff --git a/compiler/env/ProcessorInfo.hpp b/compiler/env/ProcessorInfo.hpp index 419f454dfee..2c94c464b6d 100644 --- a/compiler/env/ProcessorInfo.hpp +++ b/compiler/env/ProcessorInfo.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_PROCESSOR_INFO_INCL diff --git a/compiler/env/Processors.hpp b/compiler/env/Processors.hpp index 0277bcec561..d85e8f11b4c 100644 --- a/compiler/env/Processors.hpp +++ b/compiler/env/Processors.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_PROCESSORS_INCL diff --git a/compiler/env/RawAllocator.hpp b/compiler/env/RawAllocator.hpp index 91d4d60e5d7..6080537114e 100644 --- a/compiler/env/RawAllocator.hpp +++ b/compiler/env/RawAllocator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_RAW_ALLOCATOR_HPP diff --git a/compiler/env/Region.cpp b/compiler/env/Region.cpp index 1d4391df7b1..fc153a92b27 100644 --- a/compiler/env/Region.cpp +++ b/compiler/env/Region.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/MemorySegment.hpp" diff --git a/compiler/env/Region.hpp b/compiler/env/Region.hpp index b52c57d9b6e..8eadbaf8df5 100644 --- a/compiler/env/Region.hpp +++ b/compiler/env/Region.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_REGION_HPP diff --git a/compiler/env/RegionProfiler.hpp b/compiler/env/RegionProfiler.hpp index d9dae2b0428..7ce37c9417a 100644 --- a/compiler/env/RegionProfiler.hpp +++ b/compiler/env/RegionProfiler.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_REGION_PROFILER_HPP diff --git a/compiler/env/SegmentAllocator.cpp b/compiler/env/SegmentAllocator.cpp index 926e17ce782..c5262598b5a 100644 --- a/compiler/env/SegmentAllocator.cpp +++ b/compiler/env/SegmentAllocator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/SegmentAllocator.hpp" diff --git a/compiler/env/SegmentAllocator.hpp b/compiler/env/SegmentAllocator.hpp index f2961a04068..11c3cc0c15b 100644 --- a/compiler/env/SegmentAllocator.hpp +++ b/compiler/env/SegmentAllocator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_SEGMENT_ALLOCATOR_HPP diff --git a/compiler/env/SegmentPool.cpp b/compiler/env/SegmentPool.cpp index e854ce682d8..28cbba320a6 100644 --- a/compiler/env/SegmentPool.cpp +++ b/compiler/env/SegmentPool.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/SegmentPool.hpp" diff --git a/compiler/env/SegmentPool.hpp b/compiler/env/SegmentPool.hpp index d695a1f9aff..80745fceb9b 100644 --- a/compiler/env/SegmentPool.hpp +++ b/compiler/env/SegmentPool.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_SEGMENT_POOL diff --git a/compiler/env/SegmentProvider.cpp b/compiler/env/SegmentProvider.cpp index f61e08e37fd..9d310aa47a1 100644 --- a/compiler/env/SegmentProvider.cpp +++ b/compiler/env/SegmentProvider.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/SegmentProvider.hpp" diff --git a/compiler/env/SegmentProvider.hpp b/compiler/env/SegmentProvider.hpp index 1cc8a652315..e874d7ab238 100644 --- a/compiler/env/SegmentProvider.hpp +++ b/compiler/env/SegmentProvider.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_SEGMENT_PROVIDER diff --git a/compiler/env/StackMemoryRegion.cpp b/compiler/env/StackMemoryRegion.cpp index cfefe382e63..e2539088bcb 100644 --- a/compiler/env/StackMemoryRegion.cpp +++ b/compiler/env/StackMemoryRegion.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/StackMemoryRegion.hpp" diff --git a/compiler/env/StackMemoryRegion.hpp b/compiler/env/StackMemoryRegion.hpp index a18a43eb5c3..484d19f4117 100644 --- a/compiler/env/StackMemoryRegion.hpp +++ b/compiler/env/StackMemoryRegion.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_STACKREGION_HPP diff --git a/compiler/env/SystemSegmentProvider.cpp b/compiler/env/SystemSegmentProvider.cpp index 7a4f623973d..4419d875abc 100644 --- a/compiler/env/SystemSegmentProvider.cpp +++ b/compiler/env/SystemSegmentProvider.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/SystemSegmentProvider.hpp" diff --git a/compiler/env/SystemSegmentProvider.hpp b/compiler/env/SystemSegmentProvider.hpp index 2b7cc3652ad..e036f85b18f 100644 --- a/compiler/env/SystemSegmentProvider.hpp +++ b/compiler/env/SystemSegmentProvider.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_SYSTEM_SEGMENT_PROVIDER diff --git a/compiler/env/TRMemory.cpp b/compiler/env/TRMemory.cpp index 1cff7e282e9..6f51b1dae50 100644 --- a/compiler/env/TRMemory.cpp +++ b/compiler/env/TRMemory.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/env/TRMemory.hpp b/compiler/env/TRMemory.hpp index fe0a82541ab..720c124100c 100644 --- a/compiler/env/TRMemory.hpp +++ b/compiler/env/TRMemory.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/compiler/env/TRPersistentMemory.cpp b/compiler/env/TRPersistentMemory.cpp index 4873a5aef36..79849aea56b 100644 --- a/compiler/env/TRPersistentMemory.cpp +++ b/compiler/env/TRPersistentMemory.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/env/TypeLayout.hpp b/compiler/env/TypeLayout.hpp index b0fdf734ae7..f993e2b4418 100644 --- a/compiler/env/TypeLayout.hpp +++ b/compiler/env/TypeLayout.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TYPE_LAYOUT_INCL diff --git a/compiler/env/TypedAllocator.hpp b/compiler/env/TypedAllocator.hpp index 4aa588fb756..b6b591d9490 100644 --- a/compiler/env/TypedAllocator.hpp +++ b/compiler/env/TypedAllocator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_TYPED_ALLOCATOR_HPP diff --git a/compiler/env/VMAccessCriticalSection.hpp b/compiler/env/VMAccessCriticalSection.hpp index 498c1d20c45..fe9f414de2e 100644 --- a/compiler/env/VMAccessCriticalSection.hpp +++ b/compiler/env/VMAccessCriticalSection.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_VMACCESSCRITICALSECTION_INCL diff --git a/compiler/env/VMEnv.hpp b/compiler/env/VMEnv.hpp index 28faf10d989..595ec0d269a 100644 --- a/compiler/env/VMEnv.hpp +++ b/compiler/env/VMEnv.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_VMENV_INCL diff --git a/compiler/env/VMMethodEnv.hpp b/compiler/env/VMMethodEnv.hpp index d543edd2b3e..9fcf843f328 100644 --- a/compiler/env/VMMethodEnv.hpp +++ b/compiler/env/VMMethodEnv.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_VMMETHODENV_INCL diff --git a/compiler/env/VerboseLog.cpp b/compiler/env/VerboseLog.cpp index a0d20828687..74ffd7bc905 100644 --- a/compiler/env/VerboseLog.cpp +++ b/compiler/env/VerboseLog.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/VerboseLog.hpp" diff --git a/compiler/env/VerboseLog.hpp b/compiler/env/VerboseLog.hpp index a2287fd13cf..d792a6a7727 100644 --- a/compiler/env/VerboseLog.hpp +++ b/compiler/env/VerboseLog.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef VERBOSELOG_HPP diff --git a/compiler/env/defines.h b/compiler/env/defines.h index 120b92e59bc..5477285f737 100644 --- a/compiler/env/defines.h +++ b/compiler/env/defines.h @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_DEFINES_H diff --git a/compiler/env/jittypes.h b/compiler/env/jittypes.h index 07df48d099b..e2d962be2cd 100644 --- a/compiler/env/jittypes.h +++ b/compiler/env/jittypes.h @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JITTYPES_INCL diff --git a/compiler/il/AliasSetInterface.hpp b/compiler/il/AliasSetInterface.hpp index d7ba62e3993..04fe4e94283 100644 --- a/compiler/il/AliasSetInterface.hpp +++ b/compiler/il/AliasSetInterface.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ALIASSETINTERFACE_INCL diff --git a/compiler/il/Aliases.cpp b/compiler/il/Aliases.cpp index 58c09894f22..61ccd646994 100644 --- a/compiler/il/Aliases.cpp +++ b/compiler/il/Aliases.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/il/AutomaticSymbol.hpp b/compiler/il/AutomaticSymbol.hpp index a5ee0ec6ec1..73117c2e385 100644 --- a/compiler/il/AutomaticSymbol.hpp +++ b/compiler/il/AutomaticSymbol.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_AUTOMATICSYMBOL_INCL diff --git a/compiler/il/Block.hpp b/compiler/il/Block.hpp index 968ef4f07c1..608c48dfd36 100644 --- a/compiler/il/Block.hpp +++ b/compiler/il/Block.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_BLOCK_INCL diff --git a/compiler/il/Block_inlines.hpp b/compiler/il/Block_inlines.hpp index 1b5cbd6ec09..3f10b9f26d5 100644 --- a/compiler/il/Block_inlines.hpp +++ b/compiler/il/Block_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef BLOCK_INLINES_INCL diff --git a/compiler/il/CMakeLists.txt b/compiler/il/CMakeLists.txt index e15943d87e6..96c05b91a28 100644 --- a/compiler/il/CMakeLists.txt +++ b/compiler/il/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# compiler_library(il diff --git a/compiler/il/DataTypes.hpp b/compiler/il/DataTypes.hpp index e9cca3d360d..2fb17eacbd9 100644 --- a/compiler/il/DataTypes.hpp +++ b/compiler/il/DataTypes.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_DATATYPES_INCL diff --git a/compiler/il/DataTypesEnum.hpp b/compiler/il/DataTypesEnum.hpp index a43b81a1cfd..74dea8c9828 100644 --- a/compiler/il/DataTypesEnum.hpp +++ b/compiler/il/DataTypesEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // This file is used by projects to define their own data types diff --git a/compiler/il/DataTypes_inlines.hpp b/compiler/il/DataTypes_inlines.hpp index e1292fffcbb..20ae9fd0a7a 100644 --- a/compiler/il/DataTypes_inlines.hpp +++ b/compiler/il/DataTypes_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef DATATYPES_INLINES_INCL diff --git a/compiler/il/IL.hpp b/compiler/il/IL.hpp index 65de710e29f..390520a6c9a 100644 --- a/compiler/il/IL.hpp +++ b/compiler/il/IL.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_IL_INCL diff --git a/compiler/il/ILHelpers.hpp b/compiler/il/ILHelpers.hpp index a8dc8b33eac..59131a5ddc4 100644 --- a/compiler/il/ILHelpers.hpp +++ b/compiler/il/ILHelpers.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ILHELPERS_INCL diff --git a/compiler/il/ILOpCodeProperties.hpp b/compiler/il/ILOpCodeProperties.hpp index a1fea2170df..41e352d97ed 100644 --- a/compiler/il/ILOpCodeProperties.hpp +++ b/compiler/il/ILOpCodeProperties.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "il/OMRILOpCodeProperties.hpp" diff --git a/compiler/il/ILOpCodes.hpp b/compiler/il/ILOpCodes.hpp index 6ceb89760f1..9881c1fae8e 100644 --- a/compiler/il/ILOpCodes.hpp +++ b/compiler/il/ILOpCodes.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ILOPCODES_INCL diff --git a/compiler/il/ILOpCodesEnum.hpp b/compiler/il/ILOpCodesEnum.hpp index ffbff3affb8..a1017db3fdb 100644 --- a/compiler/il/ILOpCodesEnum.hpp +++ b/compiler/il/ILOpCodesEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ILOPCODES_ENUM_INCL diff --git a/compiler/il/ILOps.hpp b/compiler/il/ILOps.hpp index 823b5b5bd1f..c7ed2510a36 100644 --- a/compiler/il/ILOps.hpp +++ b/compiler/il/ILOps.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_ILOPS_INCL diff --git a/compiler/il/ILProps.hpp b/compiler/il/ILProps.hpp index 4832bdcea9e..2ff3b1922da 100644 --- a/compiler/il/ILProps.hpp +++ b/compiler/il/ILProps.hpp @@ -16,6 +16,6 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "il/OMRILProps.hpp" diff --git a/compiler/il/LabelSymbol.hpp b/compiler/il/LabelSymbol.hpp index 9172489e88b..73ca50f44dc 100644 --- a/compiler/il/LabelSymbol.hpp +++ b/compiler/il/LabelSymbol.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_LABELSYMBOL_INCL diff --git a/compiler/il/MethodSymbol.hpp b/compiler/il/MethodSymbol.hpp index 54def0fb3ca..15c46d37eaf 100644 --- a/compiler/il/MethodSymbol.hpp +++ b/compiler/il/MethodSymbol.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_METHODSYMBOL_INCL diff --git a/compiler/il/Node.hpp b/compiler/il/Node.hpp index 0007b5d7bfd..08803496bea 100644 --- a/compiler/il/Node.hpp +++ b/compiler/il/Node.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_NODE_INCL diff --git a/compiler/il/NodeExtension.hpp b/compiler/il/NodeExtension.hpp index c12c0d26efc..8dc2635193b 100644 --- a/compiler/il/NodeExtension.hpp +++ b/compiler/il/NodeExtension.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef NODEEXTENSION_INCL diff --git a/compiler/il/NodePool.cpp b/compiler/il/NodePool.cpp index 749f7fb1e37..00896f5dad3 100644 --- a/compiler/il/NodePool.cpp +++ b/compiler/il/NodePool.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "il/NodePool.hpp" diff --git a/compiler/il/NodePool.hpp b/compiler/il/NodePool.hpp index ac5c73f2a6b..f037eb21bd1 100644 --- a/compiler/il/NodePool.hpp +++ b/compiler/il/NodePool.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef NODEPOOL_INCL diff --git a/compiler/il/NodeUnions.hpp b/compiler/il/NodeUnions.hpp index 87c91400a16..7d5c841e1e7 100644 --- a/compiler/il/NodeUnions.hpp +++ b/compiler/il/NodeUnions.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef NODEUNIONS_INCL diff --git a/compiler/il/NodeUtils.cpp b/compiler/il/NodeUtils.cpp index 1860a714aec..cf5cfa6a162 100644 --- a/compiler/il/NodeUtils.cpp +++ b/compiler/il/NodeUtils.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "il/NodeUtils.hpp" diff --git a/compiler/il/NodeUtils.hpp b/compiler/il/NodeUtils.hpp index 74ae3a73e62..2db63c4108a 100644 --- a/compiler/il/NodeUtils.hpp +++ b/compiler/il/NodeUtils.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef NODEUTILS_INCL diff --git a/compiler/il/Node_inlines.hpp b/compiler/il/Node_inlines.hpp index b88714009a5..8df6d7ca880 100644 --- a/compiler/il/Node_inlines.hpp +++ b/compiler/il/Node_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef NODE_INLINES_INCL diff --git a/compiler/il/OMRAutomaticSymbol.cpp b/compiler/il/OMRAutomaticSymbol.cpp index ae2ee21b4f3..3ec9e7d7301 100644 --- a/compiler/il/OMRAutomaticSymbol.cpp +++ b/compiler/il/OMRAutomaticSymbol.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/il/OMRAutomaticSymbol.hpp b/compiler/il/OMRAutomaticSymbol.hpp index d2e456d3bb0..59c81c3678c 100644 --- a/compiler/il/OMRAutomaticSymbol.hpp +++ b/compiler/il/OMRAutomaticSymbol.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_AUTOMATICSYMBOL_INCL diff --git a/compiler/il/OMRBlock.cpp b/compiler/il/OMRBlock.cpp index d68457fbace..8b8e51bc076 100644 --- a/compiler/il/OMRBlock.cpp +++ b/compiler/il/OMRBlock.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "il/Block.hpp" diff --git a/compiler/il/OMRBlock.hpp b/compiler/il/OMRBlock.hpp index 378c5456d47..549e07e8ef7 100644 --- a/compiler/il/OMRBlock.hpp +++ b/compiler/il/OMRBlock.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_BLOCK_INCL diff --git a/compiler/il/OMRBlock_inlines.hpp b/compiler/il/OMRBlock_inlines.hpp index a5671d064bd..ace57a2d73a 100644 --- a/compiler/il/OMRBlock_inlines.hpp +++ b/compiler/il/OMRBlock_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_BLOCK_INLINES_INCL diff --git a/compiler/il/OMRDataTypes.cpp b/compiler/il/OMRDataTypes.cpp index c68065589de..6d6d81367a9 100644 --- a/compiler/il/OMRDataTypes.cpp +++ b/compiler/il/OMRDataTypes.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "il/DataTypes.hpp" diff --git a/compiler/il/OMRDataTypes.hpp b/compiler/il/OMRDataTypes.hpp index 7719dca5a50..5dba25a213b 100644 --- a/compiler/il/OMRDataTypes.hpp +++ b/compiler/il/OMRDataTypes.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_DATATYPE_INCL diff --git a/compiler/il/OMRDataTypes_inlines.hpp b/compiler/il/OMRDataTypes_inlines.hpp index 38512102cee..34aefc6d5f1 100644 --- a/compiler/il/OMRDataTypes_inlines.hpp +++ b/compiler/il/OMRDataTypes_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_DATATYPES_INLINES_INCL diff --git a/compiler/il/OMRIL.cpp b/compiler/il/OMRIL.cpp index 2509f324db6..dbfbd9f0a35 100644 --- a/compiler/il/OMRIL.cpp +++ b/compiler/il/OMRIL.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "il/IL.hpp" diff --git a/compiler/il/OMRIL.hpp b/compiler/il/OMRIL.hpp index 43b59419315..6e7b0fced42 100644 --- a/compiler/il/OMRIL.hpp +++ b/compiler/il/OMRIL.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_IL_INCL diff --git a/compiler/il/OMRILOpCodeProperties.hpp b/compiler/il/OMRILOpCodeProperties.hpp index 8b380049708..25ca8a2a459 100644 --- a/compiler/il/OMRILOpCodeProperties.hpp +++ b/compiler/il/OMRILOpCodeProperties.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_OPCODEPROPERTIES_INCL diff --git a/compiler/il/OMRILOpCodesEnum.hpp b/compiler/il/OMRILOpCodesEnum.hpp index 9b600f5dafa..6749b11804f 100644 --- a/compiler/il/OMRILOpCodesEnum.hpp +++ b/compiler/il/OMRILOpCodesEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ILOPCODES_ENUM_INCL diff --git a/compiler/il/OMRILOps.cpp b/compiler/il/OMRILOps.cpp index 50ca3d8b4ff..8d3f45e02b7 100644 --- a/compiler/il/OMRILOps.cpp +++ b/compiler/il/OMRILOps.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "il/ILOps.hpp" diff --git a/compiler/il/OMRILOps.hpp b/compiler/il/OMRILOps.hpp index dc3942057b9..7fdf99bdb0c 100644 --- a/compiler/il/OMRILOps.hpp +++ b/compiler/il/OMRILOps.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ILOPS_INCL diff --git a/compiler/il/OMRILProps.hpp b/compiler/il/OMRILProps.hpp index ce1cfba39e6..4cb65aa3219 100644 --- a/compiler/il/OMRILProps.hpp +++ b/compiler/il/OMRILProps.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ILPROPS_INCL diff --git a/compiler/il/OMRLabelSymbol.cpp b/compiler/il/OMRLabelSymbol.cpp index d57cc2cd4b6..ed37afb8847 100644 --- a/compiler/il/OMRLabelSymbol.cpp +++ b/compiler/il/OMRLabelSymbol.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/il/OMRLabelSymbol.hpp b/compiler/il/OMRLabelSymbol.hpp index 0af6a557373..1efebf82166 100644 --- a/compiler/il/OMRLabelSymbol.hpp +++ b/compiler/il/OMRLabelSymbol.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_LABELSYMBOL_INCL diff --git a/compiler/il/OMRMethodSymbol.cpp b/compiler/il/OMRMethodSymbol.cpp index e980cad4f5e..49a97412628 100644 --- a/compiler/il/OMRMethodSymbol.cpp +++ b/compiler/il/OMRMethodSymbol.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/Method.hpp" diff --git a/compiler/il/OMRMethodSymbol.hpp b/compiler/il/OMRMethodSymbol.hpp index c783c9323a0..650fe3b1dbe 100644 --- a/compiler/il/OMRMethodSymbol.hpp +++ b/compiler/il/OMRMethodSymbol.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_METHODSYMBOL_INCL diff --git a/compiler/il/OMRNode.cpp b/compiler/il/OMRNode.cpp index a922d633619..f226c8fe100 100644 --- a/compiler/il/OMRNode.cpp +++ b/compiler/il/OMRNode.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "il/Node.hpp" diff --git a/compiler/il/OMRNode.hpp b/compiler/il/OMRNode.hpp index 4b97cf503d4..669330c27f8 100644 --- a/compiler/il/OMRNode.hpp +++ b/compiler/il/OMRNode.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_NODE_INCL diff --git a/compiler/il/OMRNode_inlines.hpp b/compiler/il/OMRNode_inlines.hpp index 97e3412b846..19a6700ce09 100644 --- a/compiler/il/OMRNode_inlines.hpp +++ b/compiler/il/OMRNode_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_NODE_INLINES_INCL diff --git a/compiler/il/OMROpcodes.enum b/compiler/il/OMROpcodes.enum index 815bec3db7c..dd714fb9a4a 100644 --- a/compiler/il/OMROpcodes.enum +++ b/compiler/il/OMROpcodes.enum @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ OPCODE_MACRO(\ diff --git a/compiler/il/OMRParameterSymbol.cpp b/compiler/il/OMRParameterSymbol.cpp index eee7424efbe..e9ffb549714 100644 --- a/compiler/il/OMRParameterSymbol.cpp +++ b/compiler/il/OMRParameterSymbol.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/il/OMRParameterSymbol.hpp b/compiler/il/OMRParameterSymbol.hpp index f7efe993792..54b48aaa957 100644 --- a/compiler/il/OMRParameterSymbol.hpp +++ b/compiler/il/OMRParameterSymbol.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_PARAMETERSYMBOL_INCL diff --git a/compiler/il/OMRRegisterMappedSymbol.cpp b/compiler/il/OMRRegisterMappedSymbol.cpp index 2fee08cf608..08c14e954fb 100644 --- a/compiler/il/OMRRegisterMappedSymbol.cpp +++ b/compiler/il/OMRRegisterMappedSymbol.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/il/OMRRegisterMappedSymbol.hpp b/compiler/il/OMRRegisterMappedSymbol.hpp index ae69774264a..1ea6a7c12c2 100644 --- a/compiler/il/OMRRegisterMappedSymbol.hpp +++ b/compiler/il/OMRRegisterMappedSymbol.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_REGISTERMAPPEDSYMBOL_INCL diff --git a/compiler/il/OMRResolvedMethodSymbol.cpp b/compiler/il/OMRResolvedMethodSymbol.cpp index e796df553c8..27dfbe74785 100644 --- a/compiler/il/OMRResolvedMethodSymbol.cpp +++ b/compiler/il/OMRResolvedMethodSymbol.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/il/OMRResolvedMethodSymbol.hpp b/compiler/il/OMRResolvedMethodSymbol.hpp index c43a42d6e30..89062b3493b 100644 --- a/compiler/il/OMRResolvedMethodSymbol.hpp +++ b/compiler/il/OMRResolvedMethodSymbol.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_RESOLVEDMETHODSYMBOL_INCL diff --git a/compiler/il/OMRStaticSymbol.cpp b/compiler/il/OMRStaticSymbol.cpp index 3a67c45c44f..6e50ece4678 100644 --- a/compiler/il/OMRStaticSymbol.cpp +++ b/compiler/il/OMRStaticSymbol.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/il/OMRStaticSymbol.hpp b/compiler/il/OMRStaticSymbol.hpp index a57343a7f9e..d84af7a1cf9 100644 --- a/compiler/il/OMRStaticSymbol.hpp +++ b/compiler/il/OMRStaticSymbol.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_STATICSYMBOL_INCL diff --git a/compiler/il/OMRSymbol.cpp b/compiler/il/OMRSymbol.cpp index 66d21cbf47c..5f1da192fe4 100644 --- a/compiler/il/OMRSymbol.cpp +++ b/compiler/il/OMRSymbol.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/il/OMRSymbol.hpp b/compiler/il/OMRSymbol.hpp index 97467395e76..303dba35332 100644 --- a/compiler/il/OMRSymbol.hpp +++ b/compiler/il/OMRSymbol.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/compiler/il/OMRSymbolReference.cpp b/compiler/il/OMRSymbolReference.cpp index 94da79f0f23..63d5b53f21c 100644 --- a/compiler/il/OMRSymbolReference.cpp +++ b/compiler/il/OMRSymbolReference.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "il/SymbolReference.hpp" diff --git a/compiler/il/OMRSymbolReference.hpp b/compiler/il/OMRSymbolReference.hpp index 55efa35d4f9..0a0387355ad 100644 --- a/compiler/il/OMRSymbolReference.hpp +++ b/compiler/il/OMRSymbolReference.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_SYMBOLREFERENCE_INCL diff --git a/compiler/il/OMRSymbol_inlines.hpp b/compiler/il/OMRSymbol_inlines.hpp index 2116e82cf3a..15d71a5d0dc 100644 --- a/compiler/il/OMRSymbol_inlines.hpp +++ b/compiler/il/OMRSymbol_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_SYMBOL_INLINES_INCL diff --git a/compiler/il/OMRTreeTop.cpp b/compiler/il/OMRTreeTop.cpp index acc9f9439de..0178a1d8521 100644 --- a/compiler/il/OMRTreeTop.cpp +++ b/compiler/il/OMRTreeTop.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/il/OMRTreeTop.hpp b/compiler/il/OMRTreeTop.hpp index 90b748fc4de..e67b0b08ec0 100644 --- a/compiler/il/OMRTreeTop.hpp +++ b/compiler/il/OMRTreeTop.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_TREETOP_INCL diff --git a/compiler/il/OMRTreeTop_inlines.hpp b/compiler/il/OMRTreeTop_inlines.hpp index 7f5d1e5d4d5..1b853c1c3eb 100644 --- a/compiler/il/OMRTreeTop_inlines.hpp +++ b/compiler/il/OMRTreeTop_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_TREETOP_INLINES_INCL diff --git a/compiler/il/Opcodes.enum b/compiler/il/Opcodes.enum index 9f727a1709f..c78a0f2c241 100644 --- a/compiler/il/Opcodes.enum +++ b/compiler/il/Opcodes.enum @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "il/OMROpcodes.enum" diff --git a/compiler/il/ParameterSymbol.hpp b/compiler/il/ParameterSymbol.hpp index 9b955927cb3..b322eedd167 100644 --- a/compiler/il/ParameterSymbol.hpp +++ b/compiler/il/ParameterSymbol.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_PARAMETERSYMBOL_INCL diff --git a/compiler/il/RegisterMappedSymbol.hpp b/compiler/il/RegisterMappedSymbol.hpp index 34bbf9ff61f..cfbc450db32 100644 --- a/compiler/il/RegisterMappedSymbol.hpp +++ b/compiler/il/RegisterMappedSymbol.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_REGISTERMAPPEDSYMBOL_INCL diff --git a/compiler/il/ResolvedMethodSymbol.hpp b/compiler/il/ResolvedMethodSymbol.hpp index 2c632488da4..cb3042fe986 100644 --- a/compiler/il/ResolvedMethodSymbol.hpp +++ b/compiler/il/ResolvedMethodSymbol.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_RESOLVEDMETHODSYMBOL_INCL diff --git a/compiler/il/StaticSymbol.hpp b/compiler/il/StaticSymbol.hpp index 044ef648423..af2e9dadeaa 100644 --- a/compiler/il/StaticSymbol.hpp +++ b/compiler/il/StaticSymbol.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_STATICSYMBOL_INCL diff --git a/compiler/il/Symbol.hpp b/compiler/il/Symbol.hpp index 65b76991166..1027784c958 100644 --- a/compiler/il/Symbol.hpp +++ b/compiler/il/Symbol.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/compiler/il/SymbolReference.hpp b/compiler/il/SymbolReference.hpp index 7501f3169cb..99587df1880 100644 --- a/compiler/il/SymbolReference.hpp +++ b/compiler/il/SymbolReference.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_SYMBOLREFERENCE_INCL diff --git a/compiler/il/Symbol_inlines.hpp b/compiler/il/Symbol_inlines.hpp index 0f065f422a7..0d5a52fe309 100644 --- a/compiler/il/Symbol_inlines.hpp +++ b/compiler/il/Symbol_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SYMBOL_INLINES_INCL diff --git a/compiler/il/TreeTop.hpp b/compiler/il/TreeTop.hpp index 6e30aff0ef7..7411565531d 100644 --- a/compiler/il/TreeTop.hpp +++ b/compiler/il/TreeTop.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_TREETOP_INCL diff --git a/compiler/il/TreeTop_inlines.hpp b/compiler/il/TreeTop_inlines.hpp index d5ad19be10e..4718fc06e92 100644 --- a/compiler/il/TreeTop_inlines.hpp +++ b/compiler/il/TreeTop_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TREETOP_INLINES_INCL diff --git a/compiler/il/VectorOperations.enum b/compiler/il/VectorOperations.enum index 7416e832283..dbe5caf58f0 100644 --- a/compiler/il/VectorOperations.enum +++ b/compiler/il/VectorOperations.enum @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ VECTOR_OPERATION_MACRO(\ /* .operation = */ mAnyTrue, \ diff --git a/compiler/ilgen/ByteCodeIterator.hpp b/compiler/ilgen/ByteCodeIterator.hpp index 71cb2f199c6..78259c3c940 100644 --- a/compiler/ilgen/ByteCodeIterator.hpp +++ b/compiler/ilgen/ByteCodeIterator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef BYTECODEITERATOR_INCL diff --git a/compiler/ilgen/ByteCodeIteratorWithState.hpp b/compiler/ilgen/ByteCodeIteratorWithState.hpp index 7018c47b4ed..5ec75b440aa 100644 --- a/compiler/ilgen/ByteCodeIteratorWithState.hpp +++ b/compiler/ilgen/ByteCodeIteratorWithState.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/ilgen/BytecodeBuilder.hpp b/compiler/ilgen/BytecodeBuilder.hpp index 8f264e1bf5b..164e2660895 100644 --- a/compiler/ilgen/BytecodeBuilder.hpp +++ b/compiler/ilgen/BytecodeBuilder.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_BYTECODEBUILDER_INCL diff --git a/compiler/ilgen/CMakeLists.txt b/compiler/ilgen/CMakeLists.txt index 208ef7022eb..a8199dc3047 100644 --- a/compiler/ilgen/CMakeLists.txt +++ b/compiler/ilgen/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# compiler_library(ilgen diff --git a/compiler/ilgen/IlBuilder.hpp b/compiler/ilgen/IlBuilder.hpp index aefb73bb3d9..9c41ed59eea 100644 --- a/compiler/ilgen/IlBuilder.hpp +++ b/compiler/ilgen/IlBuilder.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_ILBUILDER_INCL diff --git a/compiler/ilgen/IlGen.hpp b/compiler/ilgen/IlGen.hpp index f57e799c6b9..84ecf0be447 100644 --- a/compiler/ilgen/IlGen.hpp +++ b/compiler/ilgen/IlGen.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef IlGen_hpp diff --git a/compiler/ilgen/IlGenRequest.cpp b/compiler/ilgen/IlGenRequest.cpp index 9cd6490b456..6631c55074d 100644 --- a/compiler/ilgen/IlGenRequest.cpp +++ b/compiler/ilgen/IlGenRequest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ilgen/IlGenRequest.hpp" diff --git a/compiler/ilgen/IlGenRequest.hpp b/compiler/ilgen/IlGenRequest.hpp index 33b345ad560..11b51788b12 100644 --- a/compiler/ilgen/IlGenRequest.hpp +++ b/compiler/ilgen/IlGenRequest.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_ILGENREQUEST_INCL diff --git a/compiler/ilgen/IlGeneratorMethodDetails.hpp b/compiler/ilgen/IlGeneratorMethodDetails.hpp index a698f08fab6..5d0ada25650 100644 --- a/compiler/ilgen/IlGeneratorMethodDetails.hpp +++ b/compiler/ilgen/IlGeneratorMethodDetails.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #error Each project must provide an implementation for IlGeneratorMethodDetails.hpp diff --git a/compiler/ilgen/IlGeneratorMethodDetails_inlines.hpp b/compiler/ilgen/IlGeneratorMethodDetails_inlines.hpp index dae59b19746..ba5c724330b 100644 --- a/compiler/ilgen/IlGeneratorMethodDetails_inlines.hpp +++ b/compiler/ilgen/IlGeneratorMethodDetails_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ILGENERATOR_METHOD_DETAILS_INLINES_INCL diff --git a/compiler/ilgen/IlInjector.cpp b/compiler/ilgen/IlInjector.cpp index d172bafaa4b..e0f9858732b 100644 --- a/compiler/ilgen/IlInjector.cpp +++ b/compiler/ilgen/IlInjector.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CodeGenerator.hpp" diff --git a/compiler/ilgen/IlInjector.hpp b/compiler/ilgen/IlInjector.hpp index 31de94e1ae2..3e9d2ec5a30 100644 --- a/compiler/ilgen/IlInjector.hpp +++ b/compiler/ilgen/IlInjector.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ILINJECTOR_INCL diff --git a/compiler/ilgen/IlReference.hpp b/compiler/ilgen/IlReference.hpp index e0df9bcc8fd..ba460f2bfb4 100644 --- a/compiler/ilgen/IlReference.hpp +++ b/compiler/ilgen/IlReference.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_ILREFERENCE_INCL diff --git a/compiler/ilgen/IlType.hpp b/compiler/ilgen/IlType.hpp index 568a71d94f5..c7fcaffe9ed 100644 --- a/compiler/ilgen/IlType.hpp +++ b/compiler/ilgen/IlType.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_ILTYPE_INCL diff --git a/compiler/ilgen/IlValue.hpp b/compiler/ilgen/IlValue.hpp index 19323b9cd11..3429f0286c1 100644 --- a/compiler/ilgen/IlValue.hpp +++ b/compiler/ilgen/IlValue.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_ILVALUE_INCL diff --git a/compiler/ilgen/JitBuilderRecorder.hpp b/compiler/ilgen/JitBuilderRecorder.hpp index 2149a878731..9fef7cbabe3 100644 --- a/compiler/ilgen/JitBuilderRecorder.hpp +++ b/compiler/ilgen/JitBuilderRecorder.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_JITBUILDERRECORDER_INCL diff --git a/compiler/ilgen/JitBuilderRecorderBinaryBuffer.hpp b/compiler/ilgen/JitBuilderRecorderBinaryBuffer.hpp index 594a624954a..7aa4493907c 100644 --- a/compiler/ilgen/JitBuilderRecorderBinaryBuffer.hpp +++ b/compiler/ilgen/JitBuilderRecorderBinaryBuffer.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_JITBUILDERRECORDER_BINARYBUFFER_INCL diff --git a/compiler/ilgen/JitBuilderRecorderBinaryFile.hpp b/compiler/ilgen/JitBuilderRecorderBinaryFile.hpp index 8a692cd9e8d..348c75bc745 100644 --- a/compiler/ilgen/JitBuilderRecorderBinaryFile.hpp +++ b/compiler/ilgen/JitBuilderRecorderBinaryFile.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_JITBUILDERRECORDER_BINARYFILE_INCL diff --git a/compiler/ilgen/JitBuilderRecorderTextFile.hpp b/compiler/ilgen/JitBuilderRecorderTextFile.hpp index 3a7c8e63ba8..a120db9bd08 100644 --- a/compiler/ilgen/JitBuilderRecorderTextFile.hpp +++ b/compiler/ilgen/JitBuilderRecorderTextFile.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_JITBUILDERRECORDER_TEXTFILE_INCL diff --git a/compiler/ilgen/MethodBuilder.hpp b/compiler/ilgen/MethodBuilder.hpp index 7301805f08b..238dcf36833 100644 --- a/compiler/ilgen/MethodBuilder.hpp +++ b/compiler/ilgen/MethodBuilder.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_METHODBUILDER_INCL diff --git a/compiler/ilgen/OMRBytecodeBuilder.cpp b/compiler/ilgen/OMRBytecodeBuilder.cpp index 24e6cfe3b71..605ce8fbab2 100644 --- a/compiler/ilgen/OMRBytecodeBuilder.cpp +++ b/compiler/ilgen/OMRBytecodeBuilder.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/Compilation.hpp" diff --git a/compiler/ilgen/OMRBytecodeBuilder.hpp b/compiler/ilgen/OMRBytecodeBuilder.hpp index 2d964082fa1..b8a889c6093 100644 --- a/compiler/ilgen/OMRBytecodeBuilder.hpp +++ b/compiler/ilgen/OMRBytecodeBuilder.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_BYTECODEBUILDER_INCL diff --git a/compiler/ilgen/OMRIlBuilder.cpp b/compiler/ilgen/OMRIlBuilder.cpp index bf90dace1db..402a7f3a9d9 100644 --- a/compiler/ilgen/OMRIlBuilder.cpp +++ b/compiler/ilgen/OMRIlBuilder.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/TRMemory.hpp" // must precede IlBuilder.hpp to get TR_ALLOC diff --git a/compiler/ilgen/OMRIlBuilder.hpp b/compiler/ilgen/OMRIlBuilder.hpp index d7e49babc9d..b57353bc61e 100644 --- a/compiler/ilgen/OMRIlBuilder.hpp +++ b/compiler/ilgen/OMRIlBuilder.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ILBUILDER_INCL diff --git a/compiler/ilgen/OMRIlGenRequest.hpp b/compiler/ilgen/OMRIlGenRequest.hpp index a7827d0a4b4..a15f1890a01 100644 --- a/compiler/ilgen/OMRIlGenRequest.hpp +++ b/compiler/ilgen/OMRIlGenRequest.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ILGENREQUEST_INCL diff --git a/compiler/ilgen/OMRIlGeneratorMethodDetails.hpp b/compiler/ilgen/OMRIlGeneratorMethodDetails.hpp index f6c7eaf8816..d2697eff582 100644 --- a/compiler/ilgen/OMRIlGeneratorMethodDetails.hpp +++ b/compiler/ilgen/OMRIlGeneratorMethodDetails.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ILGENERATOR_METHOD_DETAILS_INCL diff --git a/compiler/ilgen/OMRIlGeneratorMethodDetails_inlines.hpp b/compiler/ilgen/OMRIlGeneratorMethodDetails_inlines.hpp index 3f64710ac2d..5c56a14fb71 100644 --- a/compiler/ilgen/OMRIlGeneratorMethodDetails_inlines.hpp +++ b/compiler/ilgen/OMRIlGeneratorMethodDetails_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ILGENERATOR_METHOD_DETAILS_INLINES_INCL diff --git a/compiler/ilgen/OMRIlReference.hpp b/compiler/ilgen/OMRIlReference.hpp index fba90cab377..03b80f5d09e 100644 --- a/compiler/ilgen/OMRIlReference.hpp +++ b/compiler/ilgen/OMRIlReference.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ILREFERENCE_INCL diff --git a/compiler/ilgen/OMRIlType.cpp b/compiler/ilgen/OMRIlType.cpp index 97fb58e18a6..82c588f37c2 100644 --- a/compiler/ilgen/OMRIlType.cpp +++ b/compiler/ilgen/OMRIlType.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/ilgen/OMRIlType.hpp b/compiler/ilgen/OMRIlType.hpp index 4aaf06efe86..9ce4263456c 100644 --- a/compiler/ilgen/OMRIlType.hpp +++ b/compiler/ilgen/OMRIlType.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ILTYPE_INCL diff --git a/compiler/ilgen/OMRIlValue.cpp b/compiler/ilgen/OMRIlValue.cpp index 5b43cd59c50..da429d75001 100644 --- a/compiler/ilgen/OMRIlValue.cpp +++ b/compiler/ilgen/OMRIlValue.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/Compilation.hpp" diff --git a/compiler/ilgen/OMRIlValue.hpp b/compiler/ilgen/OMRIlValue.hpp index 0736e219b8d..3a940c3aa2b 100644 --- a/compiler/ilgen/OMRIlValue.hpp +++ b/compiler/ilgen/OMRIlValue.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_ILVALUE_INCL diff --git a/compiler/ilgen/OMRJitBuilderRecorder.cpp b/compiler/ilgen/OMRJitBuilderRecorder.cpp index 709d43b7baa..9d38fcf5f41 100644 --- a/compiler/ilgen/OMRJitBuilderRecorder.cpp +++ b/compiler/ilgen/OMRJitBuilderRecorder.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "infra/Assert.hpp" diff --git a/compiler/ilgen/OMRJitBuilderRecorder.hpp b/compiler/ilgen/OMRJitBuilderRecorder.hpp index abc569f3458..e56a7bcdecb 100644 --- a/compiler/ilgen/OMRJitBuilderRecorder.hpp +++ b/compiler/ilgen/OMRJitBuilderRecorder.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_JITBUILDERRECORDER_INCL diff --git a/compiler/ilgen/OMRJitBuilderRecorderBinaryBuffer.cpp b/compiler/ilgen/OMRJitBuilderRecorderBinaryBuffer.cpp index c3f695ff920..3dd09aab939 100644 --- a/compiler/ilgen/OMRJitBuilderRecorderBinaryBuffer.cpp +++ b/compiler/ilgen/OMRJitBuilderRecorderBinaryBuffer.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/ilgen/OMRJitBuilderRecorderBinaryBuffer.hpp b/compiler/ilgen/OMRJitBuilderRecorderBinaryBuffer.hpp index 102e35e4cab..5c58df69afd 100644 --- a/compiler/ilgen/OMRJitBuilderRecorderBinaryBuffer.hpp +++ b/compiler/ilgen/OMRJitBuilderRecorderBinaryBuffer.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_JITBUILDERRECORDER_BINARYBUFFER_INCL diff --git a/compiler/ilgen/OMRJitBuilderRecorderBinaryFile.cpp b/compiler/ilgen/OMRJitBuilderRecorderBinaryFile.cpp index e4c8568ed8b..e8ff7f833b3 100644 --- a/compiler/ilgen/OMRJitBuilderRecorderBinaryFile.cpp +++ b/compiler/ilgen/OMRJitBuilderRecorderBinaryFile.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/ilgen/OMRJitBuilderRecorderBinaryFile.hpp b/compiler/ilgen/OMRJitBuilderRecorderBinaryFile.hpp index f348982a5df..1b19ba17307 100644 --- a/compiler/ilgen/OMRJitBuilderRecorderBinaryFile.hpp +++ b/compiler/ilgen/OMRJitBuilderRecorderBinaryFile.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_JITBUILDERRECORDER_BINARYFILE_INCL diff --git a/compiler/ilgen/OMRJitBuilderRecorderTextFile.cpp b/compiler/ilgen/OMRJitBuilderRecorderTextFile.cpp index 0a7b3d2944b..d62c29d3d89 100644 --- a/compiler/ilgen/OMRJitBuilderRecorderTextFile.cpp +++ b/compiler/ilgen/OMRJitBuilderRecorderTextFile.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/ilgen/OMRJitBuilderRecorderTextFile.hpp b/compiler/ilgen/OMRJitBuilderRecorderTextFile.hpp index dd227e11223..d620b5a3014 100644 --- a/compiler/ilgen/OMRJitBuilderRecorderTextFile.hpp +++ b/compiler/ilgen/OMRJitBuilderRecorderTextFile.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_JITBUILDERRECORDER_TEXTFILE_INCL diff --git a/compiler/ilgen/OMRMethodBuilder.cpp b/compiler/ilgen/OMRMethodBuilder.cpp index 1ffd7e572a1..d24941a1b00 100644 --- a/compiler/ilgen/OMRMethodBuilder.cpp +++ b/compiler/ilgen/OMRMethodBuilder.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/ilgen/OMRMethodBuilder.hpp b/compiler/ilgen/OMRMethodBuilder.hpp index 78645e0e47b..b0a3b49072d 100644 --- a/compiler/ilgen/OMRMethodBuilder.hpp +++ b/compiler/ilgen/OMRMethodBuilder.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_METHODBUILDER_INCL diff --git a/compiler/ilgen/OMRThunkBuilder.cpp b/compiler/ilgen/OMRThunkBuilder.cpp index c8a71afe134..c3b187e8a73 100644 --- a/compiler/ilgen/OMRThunkBuilder.cpp +++ b/compiler/ilgen/OMRThunkBuilder.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/ilgen/OMRThunkBuilder.hpp b/compiler/ilgen/OMRThunkBuilder.hpp index 123bbf2e5a4..e671703697d 100644 --- a/compiler/ilgen/OMRThunkBuilder.hpp +++ b/compiler/ilgen/OMRThunkBuilder.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_THUNKBUILDER_INCL diff --git a/compiler/ilgen/OMRTypeDictionary.cpp b/compiler/ilgen/OMRTypeDictionary.cpp index 1587317e5c5..2f5d840462b 100644 --- a/compiler/ilgen/OMRTypeDictionary.cpp +++ b/compiler/ilgen/OMRTypeDictionary.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/ilgen/OMRTypeDictionary.hpp b/compiler/ilgen/OMRTypeDictionary.hpp index a8f1192dce2..c3953016e23 100644 --- a/compiler/ilgen/OMRTypeDictionary.hpp +++ b/compiler/ilgen/OMRTypeDictionary.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_TYPEDICTIONARY_INCL diff --git a/compiler/ilgen/OMRVirtualMachineOperandArray.cpp b/compiler/ilgen/OMRVirtualMachineOperandArray.cpp index 9c00d9b8826..a68464959d8 100644 --- a/compiler/ilgen/OMRVirtualMachineOperandArray.cpp +++ b/compiler/ilgen/OMRVirtualMachineOperandArray.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ilgen/VirtualMachineOperandArray.hpp" diff --git a/compiler/ilgen/OMRVirtualMachineOperandArray.hpp b/compiler/ilgen/OMRVirtualMachineOperandArray.hpp index e1e40265b57..bc505ee61fc 100644 --- a/compiler/ilgen/OMRVirtualMachineOperandArray.hpp +++ b/compiler/ilgen/OMRVirtualMachineOperandArray.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_VIRTUALMACHINEOPERANDARRAY_INCL diff --git a/compiler/ilgen/OMRVirtualMachineOperandStack.cpp b/compiler/ilgen/OMRVirtualMachineOperandStack.cpp index 04086dead7f..4b6fc2eaae6 100644 --- a/compiler/ilgen/OMRVirtualMachineOperandStack.cpp +++ b/compiler/ilgen/OMRVirtualMachineOperandStack.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/TRMemory.hpp" // include first to get correct TR_ALLOC definition diff --git a/compiler/ilgen/OMRVirtualMachineOperandStack.hpp b/compiler/ilgen/OMRVirtualMachineOperandStack.hpp index 31afab80468..6be39d46484 100644 --- a/compiler/ilgen/OMRVirtualMachineOperandStack.hpp +++ b/compiler/ilgen/OMRVirtualMachineOperandStack.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_VIRTUALMACHINEOPERANDSTACK_INCL diff --git a/compiler/ilgen/OMRVirtualMachineRegister.cpp b/compiler/ilgen/OMRVirtualMachineRegister.cpp index 1b3ebbed3c7..282b2790460 100644 --- a/compiler/ilgen/OMRVirtualMachineRegister.cpp +++ b/compiler/ilgen/OMRVirtualMachineRegister.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "infra/Assert.hpp" diff --git a/compiler/ilgen/OMRVirtualMachineRegister.hpp b/compiler/ilgen/OMRVirtualMachineRegister.hpp index b8c70a7da21..8e4ecff6a31 100644 --- a/compiler/ilgen/OMRVirtualMachineRegister.hpp +++ b/compiler/ilgen/OMRVirtualMachineRegister.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_VIRTUALMACHINEREGISTER_INCL diff --git a/compiler/ilgen/OMRVirtualMachineRegisterInStruct.cpp b/compiler/ilgen/OMRVirtualMachineRegisterInStruct.cpp index efed5e35dd0..9dc05b0d6bb 100644 --- a/compiler/ilgen/OMRVirtualMachineRegisterInStruct.cpp +++ b/compiler/ilgen/OMRVirtualMachineRegisterInStruct.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/compiler/ilgen/OMRVirtualMachineRegisterInStruct.hpp b/compiler/ilgen/OMRVirtualMachineRegisterInStruct.hpp index 33e6c52dd8c..50d612be54e 100644 --- a/compiler/ilgen/OMRVirtualMachineRegisterInStruct.hpp +++ b/compiler/ilgen/OMRVirtualMachineRegisterInStruct.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_VIRTUALMACHINEREGISTERINSTRUCT_INCL diff --git a/compiler/ilgen/OMRVirtualMachineState.cpp b/compiler/ilgen/OMRVirtualMachineState.cpp index 00bdccd7b30..e0e38da32ff 100644 --- a/compiler/ilgen/OMRVirtualMachineState.cpp +++ b/compiler/ilgen/OMRVirtualMachineState.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ilgen/VirtualMachineState.hpp" diff --git a/compiler/ilgen/OMRVirtualMachineState.hpp b/compiler/ilgen/OMRVirtualMachineState.hpp index 4f5e8d77094..5d017ff98a9 100644 --- a/compiler/ilgen/OMRVirtualMachineState.hpp +++ b/compiler/ilgen/OMRVirtualMachineState.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_VIRTUALMACHINESTATE_INCL diff --git a/compiler/ilgen/StatementNames.hpp b/compiler/ilgen/StatementNames.hpp index d4119e3b673..38b71b952c8 100644 --- a/compiler/ilgen/StatementNames.hpp +++ b/compiler/ilgen/StatementNames.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_STATEMENTNAMES_INCL diff --git a/compiler/ilgen/ThunkBuilder.hpp b/compiler/ilgen/ThunkBuilder.hpp index fad7383050c..35857e37b72 100644 --- a/compiler/ilgen/ThunkBuilder.hpp +++ b/compiler/ilgen/ThunkBuilder.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_THUNKBUILDER_INCL diff --git a/compiler/ilgen/TypeDictionary.hpp b/compiler/ilgen/TypeDictionary.hpp index c8b543b73d2..b1d00dd5d19 100644 --- a/compiler/ilgen/TypeDictionary.hpp +++ b/compiler/ilgen/TypeDictionary.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_TYPEDICTIONARY_INCL diff --git a/compiler/ilgen/VirtualMachineOperandArray.hpp b/compiler/ilgen/VirtualMachineOperandArray.hpp index 4009c4246b7..d0321f34dd0 100644 --- a/compiler/ilgen/VirtualMachineOperandArray.hpp +++ b/compiler/ilgen/VirtualMachineOperandArray.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_VIRTUALMACHINEOPERANDARRAY_INCL diff --git a/compiler/ilgen/VirtualMachineOperandStack.hpp b/compiler/ilgen/VirtualMachineOperandStack.hpp index d4a9b9d7a0d..6d24d8fa49d 100644 --- a/compiler/ilgen/VirtualMachineOperandStack.hpp +++ b/compiler/ilgen/VirtualMachineOperandStack.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_VIRTUALMACHINEOPERANDSTACK_INCL diff --git a/compiler/ilgen/VirtualMachineRegister.hpp b/compiler/ilgen/VirtualMachineRegister.hpp index 2d4040d9bfe..d04ae9f8d12 100644 --- a/compiler/ilgen/VirtualMachineRegister.hpp +++ b/compiler/ilgen/VirtualMachineRegister.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_VIRTUALMACHINEREGISTER_INCL diff --git a/compiler/ilgen/VirtualMachineRegisterInStruct.hpp b/compiler/ilgen/VirtualMachineRegisterInStruct.hpp index dba0f8ef023..24800269da6 100644 --- a/compiler/ilgen/VirtualMachineRegisterInStruct.hpp +++ b/compiler/ilgen/VirtualMachineRegisterInStruct.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_VIRTUALMACHINEREGISTERINSTRUCT_INCL diff --git a/compiler/ilgen/VirtualMachineState.hpp b/compiler/ilgen/VirtualMachineState.hpp index d918a062180..e189e63b02d 100644 --- a/compiler/ilgen/VirtualMachineState.hpp +++ b/compiler/ilgen/VirtualMachineState.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_VIRTUALMACHINESTATE_INCL diff --git a/compiler/infra/Annotations.hpp b/compiler/infra/Annotations.hpp index 5b1b9298de7..76f73e62400 100644 --- a/compiler/infra/Annotations.hpp +++ b/compiler/infra/Annotations.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ANNOTATIONS_INCL diff --git a/compiler/infra/Arith.hpp b/compiler/infra/Arith.hpp index 72d3b47f76a..427a602b244 100644 --- a/compiler/infra/Arith.hpp +++ b/compiler/infra/Arith.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARITH_INCL diff --git a/compiler/infra/Array.hpp b/compiler/infra/Array.hpp index 2c610360ecc..32dbd279039 100644 --- a/compiler/infra/Array.hpp +++ b/compiler/infra/Array.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARRAY_INCL diff --git a/compiler/infra/Assert.cpp b/compiler/infra/Assert.cpp index 321c9a4a341..b8562b4b71f 100644 --- a/compiler/infra/Assert.cpp +++ b/compiler/infra/Assert.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "infra/Assert.hpp" diff --git a/compiler/infra/Assert.hpp b/compiler/infra/Assert.hpp index bde1c7f38f6..ce2af094b86 100644 --- a/compiler/infra/Assert.hpp +++ b/compiler/infra/Assert.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/compiler/infra/Bit.hpp b/compiler/infra/Bit.hpp index 058d7607dbb..8f4a17d1862 100644 --- a/compiler/infra/Bit.hpp +++ b/compiler/infra/Bit.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef BITMANIP_H diff --git a/compiler/infra/BitVector.cpp b/compiler/infra/BitVector.cpp index f0018b2f866..72b775bc06a 100644 --- a/compiler/infra/BitVector.cpp +++ b/compiler/infra/BitVector.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "infra/BitVector.hpp" diff --git a/compiler/infra/BitVector.hpp b/compiler/infra/BitVector.hpp index 93f1c0647aa..0fbe6bb6d3c 100644 --- a/compiler/infra/BitVector.hpp +++ b/compiler/infra/BitVector.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef BITVECTOR_INCL diff --git a/compiler/infra/CMakeLists.txt b/compiler/infra/CMakeLists.txt index 4957b465d3e..3784d87bcaa 100644 --- a/compiler/infra/CMakeLists.txt +++ b/compiler/infra/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# compiler_library(infra diff --git a/compiler/infra/Cfg.hpp b/compiler/infra/Cfg.hpp index aee8cfbde77..cd4a20f4ea0 100644 --- a/compiler/infra/Cfg.hpp +++ b/compiler/infra/Cfg.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_CFG_INCL diff --git a/compiler/infra/CfgEdge.hpp b/compiler/infra/CfgEdge.hpp index c4b96acfb3e..01f05f3697a 100644 --- a/compiler/infra/CfgEdge.hpp +++ b/compiler/infra/CfgEdge.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_CFGEDGE_INCL diff --git a/compiler/infra/CfgNode.hpp b/compiler/infra/CfgNode.hpp index 45c0b6e704a..e35c99695ca 100644 --- a/compiler/infra/CfgNode.hpp +++ b/compiler/infra/CfgNode.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_CFGNODE_INCL diff --git a/compiler/infra/Checklist.cpp b/compiler/infra/Checklist.cpp index 1461ba78956..77d8e570aa3 100644 --- a/compiler/infra/Checklist.cpp +++ b/compiler/infra/Checklist.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "infra/Checklist.hpp" diff --git a/compiler/infra/Checklist.hpp b/compiler/infra/Checklist.hpp index daedbc6e187..f0f2ecf134a 100644 --- a/compiler/infra/Checklist.hpp +++ b/compiler/infra/Checklist.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_CHECKLIST_INCL diff --git a/compiler/infra/CriticalSection.hpp b/compiler/infra/CriticalSection.hpp index 6176e799e45..cdd21a2055f 100644 --- a/compiler/infra/CriticalSection.hpp +++ b/compiler/infra/CriticalSection.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_CRITICALSECTION_INCL diff --git a/compiler/infra/Flags.hpp b/compiler/infra/Flags.hpp index b4265294b66..4451ca697e4 100644 --- a/compiler/infra/Flags.hpp +++ b/compiler/infra/Flags.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_FLAGS_INCL diff --git a/compiler/infra/HashTab.cpp b/compiler/infra/HashTab.cpp index 3b83eecbd42..3b75b9e2980 100644 --- a/compiler/infra/HashTab.cpp +++ b/compiler/infra/HashTab.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "infra/HashTab.hpp" diff --git a/compiler/infra/HashTab.hpp b/compiler/infra/HashTab.hpp index d4f71750842..2c4baac32da 100644 --- a/compiler/infra/HashTab.hpp +++ b/compiler/infra/HashTab.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef HASHTAB_INCL diff --git a/compiler/infra/HedgeTree.hpp b/compiler/infra/HedgeTree.hpp index a9eb2c8f811..edd1e2c0a08 100644 --- a/compiler/infra/HedgeTree.hpp +++ b/compiler/infra/HedgeTree.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef HEDGETREE_INCL diff --git a/compiler/infra/IGBase.cpp b/compiler/infra/IGBase.cpp index a66880ef70b..c81df1626ca 100644 --- a/compiler/infra/IGBase.cpp +++ b/compiler/infra/IGBase.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "infra/IGBase.hpp" diff --git a/compiler/infra/IGBase.hpp b/compiler/infra/IGBase.hpp index 71c501b63fe..cd4257548ef 100644 --- a/compiler/infra/IGBase.hpp +++ b/compiler/infra/IGBase.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef IGBASE_INCL diff --git a/compiler/infra/IGNode.cpp b/compiler/infra/IGNode.cpp index bbe57767950..85365d01a00 100644 --- a/compiler/infra/IGNode.cpp +++ b/compiler/infra/IGNode.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "infra/IGNode.hpp" diff --git a/compiler/infra/IGNode.hpp b/compiler/infra/IGNode.hpp index a6a54249c4b..0932efef329 100644 --- a/compiler/infra/IGNode.hpp +++ b/compiler/infra/IGNode.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef IGNODE_INCL diff --git a/compiler/infra/ILTraverser.cpp b/compiler/infra/ILTraverser.cpp index 33cd823764b..57054c9a0e1 100644 --- a/compiler/infra/ILTraverser.cpp +++ b/compiler/infra/ILTraverser.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "infra/ILTraverser.hpp" diff --git a/compiler/infra/ILTraverser.hpp b/compiler/infra/ILTraverser.hpp index 8e9ebb86eed..6c4394eb423 100644 --- a/compiler/infra/ILTraverser.hpp +++ b/compiler/infra/ILTraverser.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_ILTRAVERSER_HPP diff --git a/compiler/infra/ILWalk.cpp b/compiler/infra/ILWalk.cpp index 92500f63aec..349640cb69d 100644 --- a/compiler/infra/ILWalk.cpp +++ b/compiler/infra/ILWalk.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "infra/ILWalk.hpp" diff --git a/compiler/infra/ILWalk.hpp b/compiler/infra/ILWalk.hpp index 605abcf4c6a..6e3696b3cca 100644 --- a/compiler/infra/ILWalk.hpp +++ b/compiler/infra/ILWalk.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_INFRA_ILWALK diff --git a/compiler/infra/InterferenceGraph.cpp b/compiler/infra/InterferenceGraph.cpp index 41eafa040df..7edda8eeec2 100644 --- a/compiler/infra/InterferenceGraph.cpp +++ b/compiler/infra/InterferenceGraph.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "infra/InterferenceGraph.hpp" diff --git a/compiler/infra/InterferenceGraph.hpp b/compiler/infra/InterferenceGraph.hpp index 4ebac0cb5ea..b4668e7f541 100644 --- a/compiler/infra/InterferenceGraph.hpp +++ b/compiler/infra/InterferenceGraph.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef INTERFERENCEGRAPH_INCL diff --git a/compiler/infra/Link.hpp b/compiler/infra/Link.hpp index a52e2fdc37b..a680087432a 100644 --- a/compiler/infra/Link.hpp +++ b/compiler/infra/Link.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef LINK_INCL diff --git a/compiler/infra/List.hpp b/compiler/infra/List.hpp index 098d0bedec2..4c5aa644693 100644 --- a/compiler/infra/List.hpp +++ b/compiler/infra/List.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef LIST_INCL diff --git a/compiler/infra/Monitor.hpp b/compiler/infra/Monitor.hpp index fdc7164484b..7ccb1e8165e 100644 --- a/compiler/infra/Monitor.hpp +++ b/compiler/infra/Monitor.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_MONITOR_INCL diff --git a/compiler/infra/MonitorTable.hpp b/compiler/infra/MonitorTable.hpp index ba5efbf2e63..db7de70c2c6 100644 --- a/compiler/infra/MonitorTable.hpp +++ b/compiler/infra/MonitorTable.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_MONITORTABLE_INCL diff --git a/compiler/infra/OMRCfg.cpp b/compiler/infra/OMRCfg.cpp index 78b9bb1ec7a..e53288d2e0b 100644 --- a/compiler/infra/OMRCfg.cpp +++ b/compiler/infra/OMRCfg.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "infra/Cfg.hpp" diff --git a/compiler/infra/OMRCfg.hpp b/compiler/infra/OMRCfg.hpp index 30ebab09af7..79dde53dddb 100644 --- a/compiler/infra/OMRCfg.hpp +++ b/compiler/infra/OMRCfg.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_CFG_INCL diff --git a/compiler/infra/OMRMonitor.cpp b/compiler/infra/OMRMonitor.cpp index 6f1a7b17e56..a9c0d3a5f4f 100644 --- a/compiler/infra/OMRMonitor.cpp +++ b/compiler/infra/OMRMonitor.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "infra/Monitor.hpp" diff --git a/compiler/infra/OMRMonitor.hpp b/compiler/infra/OMRMonitor.hpp index 666bb29c04c..873cb7d8520 100644 --- a/compiler/infra/OMRMonitor.hpp +++ b/compiler/infra/OMRMonitor.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_MONITOR_INCL diff --git a/compiler/infra/OMRMonitorTable.cpp b/compiler/infra/OMRMonitorTable.cpp index f4b6267ab11..f0cdfaa6f10 100644 --- a/compiler/infra/OMRMonitorTable.cpp +++ b/compiler/infra/OMRMonitorTable.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "infra/MonitorTable.hpp" diff --git a/compiler/infra/OMRMonitorTable.hpp b/compiler/infra/OMRMonitorTable.hpp index df8bc18b867..bccc5c30a9d 100644 --- a/compiler/infra/OMRMonitorTable.hpp +++ b/compiler/infra/OMRMonitorTable.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_MONITORTABLE_INCL diff --git a/compiler/infra/Random.cpp b/compiler/infra/Random.cpp index e3628d45680..c3fdba4b890 100644 --- a/compiler/infra/Random.cpp +++ b/compiler/infra/Random.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "infra/Random.hpp" diff --git a/compiler/infra/Random.hpp b/compiler/infra/Random.hpp index 8120acdf7b4..c83e8046157 100644 --- a/compiler/infra/Random.hpp +++ b/compiler/infra/Random.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef RANDOM_INCL diff --git a/compiler/infra/ReferenceWrapper.hpp b/compiler/infra/ReferenceWrapper.hpp index 67fd139bf44..6dc24cd74ec 100644 --- a/compiler/infra/ReferenceWrapper.hpp +++ b/compiler/infra/ReferenceWrapper.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef REFERENCE_WRAPPER_HPP diff --git a/compiler/infra/STLUtils.cpp b/compiler/infra/STLUtils.cpp index 9756037a707..ab6ec6be199 100644 --- a/compiler/infra/STLUtils.cpp +++ b/compiler/infra/STLUtils.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/compiler/infra/STLUtils.hpp b/compiler/infra/STLUtils.hpp index 92c07eb420c..05b8771cb9b 100644 --- a/compiler/infra/STLUtils.hpp +++ b/compiler/infra/STLUtils.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/compiler/infra/SideTable.hpp b/compiler/infra/SideTable.hpp index bd911f1636f..927a5aae47a 100644 --- a/compiler/infra/SideTable.hpp +++ b/compiler/infra/SideTable.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_INFRA_SIDE_TABLE diff --git a/compiler/infra/SimpleRegex.cpp b/compiler/infra/SimpleRegex.cpp index a2e27057266..3a394fde9fa 100644 --- a/compiler/infra/SimpleRegex.cpp +++ b/compiler/infra/SimpleRegex.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "infra/SimpleRegex.hpp" diff --git a/compiler/infra/SimpleRegex.hpp b/compiler/infra/SimpleRegex.hpp index 562ba3138e3..8532a6ac249 100644 --- a/compiler/infra/SimpleRegex.hpp +++ b/compiler/infra/SimpleRegex.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SIMPLEREGEX_INCL diff --git a/compiler/infra/Stack.hpp b/compiler/infra/Stack.hpp index 2aaebd55abc..831151a307a 100644 --- a/compiler/infra/Stack.hpp +++ b/compiler/infra/Stack.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef STACK_INCL diff --git a/compiler/infra/Statistics.hpp b/compiler/infra/Statistics.hpp index 38653fe6ac6..77884e68b33 100644 --- a/compiler/infra/Statistics.hpp +++ b/compiler/infra/Statistics.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef _STATISTICS_HPP__ diff --git a/compiler/infra/String.cpp b/compiler/infra/String.cpp index a7a6b9caec9..debcea9d05b 100644 --- a/compiler/infra/String.cpp +++ b/compiler/infra/String.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "infra/String.hpp" diff --git a/compiler/infra/String.hpp b/compiler/infra/String.hpp index 8a1bfee9056..a5b8261e815 100644 --- a/compiler/infra/String.hpp +++ b/compiler/infra/String.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_STRING_INCL diff --git a/compiler/infra/TRCfgEdge.hpp b/compiler/infra/TRCfgEdge.hpp index d5aa421dfbb..5919033e630 100644 --- a/compiler/infra/TRCfgEdge.hpp +++ b/compiler/infra/TRCfgEdge.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "infra/CfgEdge.hpp" diff --git a/compiler/infra/TRCfgNode.hpp b/compiler/infra/TRCfgNode.hpp index 40cc665c18c..67da5fca81c 100644 --- a/compiler/infra/TRCfgNode.hpp +++ b/compiler/infra/TRCfgNode.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "infra/CfgNode.hpp" diff --git a/compiler/infra/TRlist.hpp b/compiler/infra/TRlist.hpp index 784450610e7..2d6bed4ca64 100644 --- a/compiler/infra/TRlist.hpp +++ b/compiler/infra/TRlist.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TRLIST_INCL diff --git a/compiler/infra/ThreadLocal.hpp b/compiler/infra/ThreadLocal.hpp index f32146891ed..7a5838723cc 100644 --- a/compiler/infra/ThreadLocal.hpp +++ b/compiler/infra/ThreadLocal.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef THREADLOCAL_INCL diff --git a/compiler/infra/Timer.cpp b/compiler/infra/Timer.cpp index b95d14d6210..c97c9b6957e 100644 --- a/compiler/infra/Timer.cpp +++ b/compiler/infra/Timer.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // diff --git a/compiler/infra/Timer.hpp b/compiler/infra/Timer.hpp index 577a5bbbe73..64ea2610d57 100644 --- a/compiler/infra/Timer.hpp +++ b/compiler/infra/Timer.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TIMER_INCL diff --git a/compiler/infra/TreeServices.cpp b/compiler/infra/TreeServices.cpp index f2c4cfaab28..e823a344bf7 100644 --- a/compiler/infra/TreeServices.cpp +++ b/compiler/infra/TreeServices.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "infra/TreeServices.hpp" diff --git a/compiler/infra/TreeServices.hpp b/compiler/infra/TreeServices.hpp index 3da577fc47f..d6be312c9e9 100644 --- a/compiler/infra/TreeServices.hpp +++ b/compiler/infra/TreeServices.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TRS_INCL diff --git a/compiler/infra/TrilDumper.cpp b/compiler/infra/TrilDumper.cpp index b35355ac359..194d34b439d 100644 --- a/compiler/infra/TrilDumper.cpp +++ b/compiler/infra/TrilDumper.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/ResolvedMethod.hpp" diff --git a/compiler/infra/TrilDumper.hpp b/compiler/infra/TrilDumper.hpp index 4725c79ff7e..9ea4b2a90e9 100644 --- a/compiler/infra/TrilDumper.hpp +++ b/compiler/infra/TrilDumper.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_TRILDUMPER_HPP diff --git a/compiler/infra/Uncopyable.hpp b/compiler/infra/Uncopyable.hpp index 45ee222d31f..c33288136da 100644 --- a/compiler/infra/Uncopyable.hpp +++ b/compiler/infra/Uncopyable.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_UNCOPYABLE_INCL diff --git a/compiler/infra/deque.hpp b/compiler/infra/deque.hpp index f1fce9fc3b5..4db6e07fc86 100644 --- a/compiler/infra/deque.hpp +++ b/compiler/infra/deque.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef DEQUE_HPP diff --git a/compiler/infra/forward_list.hpp b/compiler/infra/forward_list.hpp index a0937adec91..2b827a7c85c 100644 --- a/compiler/infra/forward_list.hpp +++ b/compiler/infra/forward_list.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef FORWARD_LIST_HPP diff --git a/compiler/infra/vector.hpp b/compiler/infra/vector.hpp index f311b821791..19b7868bf4b 100644 --- a/compiler/infra/vector.hpp +++ b/compiler/infra/vector.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef VECTOR_HPP diff --git a/compiler/objectfmt/FunctionCallData.hpp b/compiler/objectfmt/FunctionCallData.hpp index 1804b719a66..94659bdace4 100644 --- a/compiler/objectfmt/FunctionCallData.hpp +++ b/compiler/objectfmt/FunctionCallData.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_FUNCTIONCALLDATA_INCL diff --git a/compiler/objectfmt/JitCodeRWXObjectFormat.hpp b/compiler/objectfmt/JitCodeRWXObjectFormat.hpp index e165a3c69c1..bce238bf460 100644 --- a/compiler/objectfmt/JitCodeRWXObjectFormat.hpp +++ b/compiler/objectfmt/JitCodeRWXObjectFormat.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_JITCODERWX_OBJECTFORMAT_INCL diff --git a/compiler/objectfmt/JitCodeRXObjectFormat.hpp b/compiler/objectfmt/JitCodeRXObjectFormat.hpp index a291e97b0d2..4e8c0e40678 100644 --- a/compiler/objectfmt/JitCodeRXObjectFormat.hpp +++ b/compiler/objectfmt/JitCodeRXObjectFormat.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_JITCODERX_OBJECTFORMAT_INCL diff --git a/compiler/objectfmt/OMRFunctionCallData.hpp b/compiler/objectfmt/OMRFunctionCallData.hpp index fba70756e01..85f81c4e9d3 100644 --- a/compiler/objectfmt/OMRFunctionCallData.hpp +++ b/compiler/objectfmt/OMRFunctionCallData.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_FUNCTIONCALLDATA_INCL diff --git a/compiler/objectfmt/OMRJitCodeRWXObjectFormat.hpp b/compiler/objectfmt/OMRJitCodeRWXObjectFormat.hpp index 945ad6fc589..cf183af39da 100644 --- a/compiler/objectfmt/OMRJitCodeRWXObjectFormat.hpp +++ b/compiler/objectfmt/OMRJitCodeRWXObjectFormat.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_JITCODERWX_OBJECTFORMAT_INCL diff --git a/compiler/objectfmt/OMRJitCodeRXObjectFormat.hpp b/compiler/objectfmt/OMRJitCodeRXObjectFormat.hpp index d511977f6de..1c412aa62ee 100644 --- a/compiler/objectfmt/OMRJitCodeRXObjectFormat.hpp +++ b/compiler/objectfmt/OMRJitCodeRXObjectFormat.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_JITCODERX_OBJECTFORMAT_INCL diff --git a/compiler/objectfmt/OMRObjectFormat.hpp b/compiler/objectfmt/OMRObjectFormat.hpp index b7b4cc56a45..e1b3d61b73b 100644 --- a/compiler/objectfmt/OMRObjectFormat.hpp +++ b/compiler/objectfmt/OMRObjectFormat.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_OBJECTFORMAT_INCL diff --git a/compiler/objectfmt/ObjectFormat.hpp b/compiler/objectfmt/ObjectFormat.hpp index bb5e265fdba..2b78b584139 100644 --- a/compiler/objectfmt/ObjectFormat.hpp +++ b/compiler/objectfmt/ObjectFormat.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_OBJECTFORMAT_INCL diff --git a/compiler/optimizer/AsyncCheckInsertion.cpp b/compiler/optimizer/AsyncCheckInsertion.cpp index e7132b24a81..d28b8477cd2 100644 --- a/compiler/optimizer/AsyncCheckInsertion.cpp +++ b/compiler/optimizer/AsyncCheckInsertion.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/AsyncCheckInsertion.hpp" diff --git a/compiler/optimizer/AsyncCheckInsertion.hpp b/compiler/optimizer/AsyncCheckInsertion.hpp index c6e4a231502..be2a1c4b02c 100644 --- a/compiler/optimizer/AsyncCheckInsertion.hpp +++ b/compiler/optimizer/AsyncCheckInsertion.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ASYNC_CHECK_INSERTION_H diff --git a/compiler/optimizer/BackwardBitVectorAnalysis.cpp b/compiler/optimizer/BackwardBitVectorAnalysis.cpp index af92baa0b6e..70675610604 100644 --- a/compiler/optimizer/BackwardBitVectorAnalysis.cpp +++ b/compiler/optimizer/BackwardBitVectorAnalysis.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/optimizer/BackwardIntersectionBitVectorAnalysis.cpp b/compiler/optimizer/BackwardIntersectionBitVectorAnalysis.cpp index 5bc1f98b6b4..d5798310a24 100644 --- a/compiler/optimizer/BackwardIntersectionBitVectorAnalysis.cpp +++ b/compiler/optimizer/BackwardIntersectionBitVectorAnalysis.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/optimizer/BackwardUnionBitVectorAnalysis.cpp b/compiler/optimizer/BackwardUnionBitVectorAnalysis.cpp index 5b99d1ef21d..8f91cb6934e 100644 --- a/compiler/optimizer/BackwardUnionBitVectorAnalysis.cpp +++ b/compiler/optimizer/BackwardUnionBitVectorAnalysis.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/optimizer/BitVectorAnalysis.cpp b/compiler/optimizer/BitVectorAnalysis.cpp index 13c018e9cbd..6e46288a70e 100644 --- a/compiler/optimizer/BitVectorAnalysis.cpp +++ b/compiler/optimizer/BitVectorAnalysis.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/optimizer/CFGSimplifier.hpp b/compiler/optimizer/CFGSimplifier.hpp index 7f81ce0c96e..d4a73a4dcd4 100644 --- a/compiler/optimizer/CFGSimplifier.hpp +++ b/compiler/optimizer/CFGSimplifier.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_CFGSIMPLIFIER_INCL diff --git a/compiler/optimizer/CMakeLists.txt b/compiler/optimizer/CMakeLists.txt index 1a25f64e4de..0230879aadd 100644 --- a/compiler/optimizer/CMakeLists.txt +++ b/compiler/optimizer/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# compiler_library(optimizer diff --git a/compiler/optimizer/CallInfo.hpp b/compiler/optimizer/CallInfo.hpp index 9a331da807c..839fddc2d14 100644 --- a/compiler/optimizer/CallInfo.hpp +++ b/compiler/optimizer/CallInfo.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /////////////////////////////////////////////////////////////////////////// diff --git a/compiler/optimizer/CatchBlockRemover.cpp b/compiler/optimizer/CatchBlockRemover.cpp index 5917f00d8c9..7e25b64e2f9 100644 --- a/compiler/optimizer/CatchBlockRemover.cpp +++ b/compiler/optimizer/CatchBlockRemover.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/CatchBlockRemover.hpp" diff --git a/compiler/optimizer/CatchBlockRemover.hpp b/compiler/optimizer/CatchBlockRemover.hpp index 4e86b192d45..16f008250eb 100644 --- a/compiler/optimizer/CatchBlockRemover.hpp +++ b/compiler/optimizer/CatchBlockRemover.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CATCHBLOCKREMOVER_INCL diff --git a/compiler/optimizer/CompactLocals.cpp b/compiler/optimizer/CompactLocals.cpp index 7c80bbc052b..a362135aa2d 100644 --- a/compiler/optimizer/CompactLocals.cpp +++ b/compiler/optimizer/CompactLocals.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/CompactLocals.hpp" diff --git a/compiler/optimizer/CompactLocals.hpp b/compiler/optimizer/CompactLocals.hpp index 6831f8c643a..ee8924da246 100644 --- a/compiler/optimizer/CompactLocals.hpp +++ b/compiler/optimizer/CompactLocals.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef COMPACTLOCALS_INCL diff --git a/compiler/optimizer/CopyPropagation.cpp b/compiler/optimizer/CopyPropagation.cpp index 8b0bb52750e..8afaefbf9c2 100644 --- a/compiler/optimizer/CopyPropagation.cpp +++ b/compiler/optimizer/CopyPropagation.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/CopyPropagation.hpp" diff --git a/compiler/optimizer/CopyPropagation.hpp b/compiler/optimizer/CopyPropagation.hpp index 7e080395751..29655cd6b14 100644 --- a/compiler/optimizer/CopyPropagation.hpp +++ b/compiler/optimizer/CopyPropagation.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef COPYPROP_INCL diff --git a/compiler/optimizer/DataFlowAnalysis.cpp b/compiler/optimizer/DataFlowAnalysis.cpp index 0140cc9fd52..c04544872b4 100644 --- a/compiler/optimizer/DataFlowAnalysis.cpp +++ b/compiler/optimizer/DataFlowAnalysis.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/DataFlowAnalysis.hpp" diff --git a/compiler/optimizer/DataFlowAnalysis.enum b/compiler/optimizer/DataFlowAnalysis.enum index 5a84747c4f5..bcac12f4395 100644 --- a/compiler/optimizer/DataFlowAnalysis.enum +++ b/compiler/optimizer/DataFlowAnalysis.enum @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/OMRDataFlowAnalysis.enum" diff --git a/compiler/optimizer/DataFlowAnalysis.hpp b/compiler/optimizer/DataFlowAnalysis.hpp index d4927912ae6..08c23c37184 100644 --- a/compiler/optimizer/DataFlowAnalysis.hpp +++ b/compiler/optimizer/DataFlowAnalysis.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef DFA_INCL diff --git a/compiler/optimizer/DeadStoreElimination.cpp b/compiler/optimizer/DeadStoreElimination.cpp index 8081e72048e..746ece1ac55 100644 --- a/compiler/optimizer/DeadStoreElimination.cpp +++ b/compiler/optimizer/DeadStoreElimination.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/DeadStoreElimination.hpp" diff --git a/compiler/optimizer/DeadStoreElimination.hpp b/compiler/optimizer/DeadStoreElimination.hpp index bfb50a9527d..747480cb752 100644 --- a/compiler/optimizer/DeadStoreElimination.hpp +++ b/compiler/optimizer/DeadStoreElimination.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef DEADSTOR_INCL diff --git a/compiler/optimizer/DeadTreesElimination.cpp b/compiler/optimizer/DeadTreesElimination.cpp index 2f9e4e6b77d..125a1710b97 100644 --- a/compiler/optimizer/DeadTreesElimination.cpp +++ b/compiler/optimizer/DeadTreesElimination.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/DeadTreesElimination.hpp" diff --git a/compiler/optimizer/DeadTreesElimination.hpp b/compiler/optimizer/DeadTreesElimination.hpp index 80f98d29ccf..21b68571002 100644 --- a/compiler/optimizer/DeadTreesElimination.hpp +++ b/compiler/optimizer/DeadTreesElimination.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_DEADTREESELIMINATION_INCL diff --git a/compiler/optimizer/DebuggingCounters.cpp b/compiler/optimizer/DebuggingCounters.cpp index 96cc441d0aa..f22fdaf608d 100644 --- a/compiler/optimizer/DebuggingCounters.cpp +++ b/compiler/optimizer/DebuggingCounters.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/DebuggingCounters.hpp" diff --git a/compiler/optimizer/DebuggingCounters.hpp b/compiler/optimizer/DebuggingCounters.hpp index 9e358115081..4d4e336fbed 100644 --- a/compiler/optimizer/DebuggingCounters.hpp +++ b/compiler/optimizer/DebuggingCounters.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef DEBUGGING_COUNTERS_INCL diff --git a/compiler/optimizer/Delayedness.cpp b/compiler/optimizer/Delayedness.cpp index b40d78b7598..9107a6672d6 100644 --- a/compiler/optimizer/Delayedness.cpp +++ b/compiler/optimizer/Delayedness.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/optimizer/DominatorVerifier.cpp b/compiler/optimizer/DominatorVerifier.cpp index 3285066c6ed..10fe495c582 100644 --- a/compiler/optimizer/DominatorVerifier.cpp +++ b/compiler/optimizer/DominatorVerifier.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if DEBUG diff --git a/compiler/optimizer/DominatorVerifier.hpp b/compiler/optimizer/DominatorVerifier.hpp index 529a4d4a0d3..890458ab435 100644 --- a/compiler/optimizer/DominatorVerifier.hpp +++ b/compiler/optimizer/DominatorVerifier.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if DEBUG diff --git a/compiler/optimizer/Dominators.cpp b/compiler/optimizer/Dominators.cpp index 512d7245f6e..fa307bef1eb 100644 --- a/compiler/optimizer/Dominators.cpp +++ b/compiler/optimizer/Dominators.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/Dominators.hpp" diff --git a/compiler/optimizer/Dominators.hpp b/compiler/optimizer/Dominators.hpp index e4af093b8cb..5696d5b08f6 100644 --- a/compiler/optimizer/Dominators.hpp +++ b/compiler/optimizer/Dominators.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef DOMINATORS_INCL diff --git a/compiler/optimizer/DominatorsChk.cpp b/compiler/optimizer/DominatorsChk.cpp index 573b118f9e9..12056e1f586 100644 --- a/compiler/optimizer/DominatorsChk.cpp +++ b/compiler/optimizer/DominatorsChk.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if DEBUG diff --git a/compiler/optimizer/DominatorsChk.hpp b/compiler/optimizer/DominatorsChk.hpp index a4cfb2f1e45..f364bbb9f9e 100644 --- a/compiler/optimizer/DominatorsChk.hpp +++ b/compiler/optimizer/DominatorsChk.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if DEBUG diff --git a/compiler/optimizer/Earliestness.cpp b/compiler/optimizer/Earliestness.cpp index f6890c60951..206e8cf2c47 100644 --- a/compiler/optimizer/Earliestness.cpp +++ b/compiler/optimizer/Earliestness.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/optimizer/ExpressionsSimplification.cpp b/compiler/optimizer/ExpressionsSimplification.cpp index 5b828af61fb..bd358c178a0 100644 --- a/compiler/optimizer/ExpressionsSimplification.cpp +++ b/compiler/optimizer/ExpressionsSimplification.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/ExpressionsSimplification.hpp" diff --git a/compiler/optimizer/ExpressionsSimplification.hpp b/compiler/optimizer/ExpressionsSimplification.hpp index ba85247120e..54aff77b270 100644 --- a/compiler/optimizer/ExpressionsSimplification.hpp +++ b/compiler/optimizer/ExpressionsSimplification.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef EXPSIMP_INCL diff --git a/compiler/optimizer/FEInliner.cpp b/compiler/optimizer/FEInliner.cpp index 3a09c71589d..ca7f1c377b6 100644 --- a/compiler/optimizer/FEInliner.cpp +++ b/compiler/optimizer/FEInliner.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/optimizer/FieldPrivatizer.cpp b/compiler/optimizer/FieldPrivatizer.cpp index a9eb32fffa5..ef9a1014d4b 100644 --- a/compiler/optimizer/FieldPrivatizer.cpp +++ b/compiler/optimizer/FieldPrivatizer.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/FieldPrivatizer.hpp" diff --git a/compiler/optimizer/FieldPrivatizer.hpp b/compiler/optimizer/FieldPrivatizer.hpp index 577429444e5..96e7a847ec9 100644 --- a/compiler/optimizer/FieldPrivatizer.hpp +++ b/compiler/optimizer/FieldPrivatizer.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef FIELDPRIV_INCL diff --git a/compiler/optimizer/GeneralLoopUnroller.cpp b/compiler/optimizer/GeneralLoopUnroller.cpp index 0eba7564705..3ed86103bd6 100644 --- a/compiler/optimizer/GeneralLoopUnroller.cpp +++ b/compiler/optimizer/GeneralLoopUnroller.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/GeneralLoopUnroller.hpp" diff --git a/compiler/optimizer/GeneralLoopUnroller.hpp b/compiler/optimizer/GeneralLoopUnroller.hpp index 824559838d2..140e3621a82 100644 --- a/compiler/optimizer/GeneralLoopUnroller.hpp +++ b/compiler/optimizer/GeneralLoopUnroller.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef GENERALLOOPUNROLLER_INCL diff --git a/compiler/optimizer/GlobalAnticipatability.cpp b/compiler/optimizer/GlobalAnticipatability.cpp index 5e124a730f6..4612dfee480 100644 --- a/compiler/optimizer/GlobalAnticipatability.cpp +++ b/compiler/optimizer/GlobalAnticipatability.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/optimizer/GlobalRegister.hpp b/compiler/optimizer/GlobalRegister.hpp index aca16987dcb..fce9674caab 100644 --- a/compiler/optimizer/GlobalRegister.hpp +++ b/compiler/optimizer/GlobalRegister.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef GLOBALREGISTER_INCL diff --git a/compiler/optimizer/GlobalRegisterAllocator.cpp b/compiler/optimizer/GlobalRegisterAllocator.cpp index 092e1d384de..69a52e16dc5 100644 --- a/compiler/optimizer/GlobalRegisterAllocator.cpp +++ b/compiler/optimizer/GlobalRegisterAllocator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/GlobalRegisterAllocator.hpp" diff --git a/compiler/optimizer/GlobalRegisterAllocator.hpp b/compiler/optimizer/GlobalRegisterAllocator.hpp index 8a0a2fd9642..3196f261e0a 100644 --- a/compiler/optimizer/GlobalRegisterAllocator.hpp +++ b/compiler/optimizer/GlobalRegisterAllocator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef GLOBAL_REGISTER_ALLOCATOR_INCL diff --git a/compiler/optimizer/GlobalRegister_inlines.hpp b/compiler/optimizer/GlobalRegister_inlines.hpp index 7e9193c83e7..0c8a0f99dae 100644 --- a/compiler/optimizer/GlobalRegister_inlines.hpp +++ b/compiler/optimizer/GlobalRegister_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef GLOBALREGISTER_INLINES_INCL diff --git a/compiler/optimizer/GlobalValuePropagation.hpp b/compiler/optimizer/GlobalValuePropagation.hpp index 790757caf82..0fc6762999d 100644 --- a/compiler/optimizer/GlobalValuePropagation.hpp +++ b/compiler/optimizer/GlobalValuePropagation.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_GLOBALVALUEPROPAGATION_INCL diff --git a/compiler/optimizer/InductionVariable.cpp b/compiler/optimizer/InductionVariable.cpp index e8c038db4ef..88d818064eb 100644 --- a/compiler/optimizer/InductionVariable.cpp +++ b/compiler/optimizer/InductionVariable.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/InductionVariable.hpp" diff --git a/compiler/optimizer/InductionVariable.hpp b/compiler/optimizer/InductionVariable.hpp index 6eeff03ec00..764214f6ea0 100644 --- a/compiler/optimizer/InductionVariable.hpp +++ b/compiler/optimizer/InductionVariable.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef INDUCTIONVAR_INCL diff --git a/compiler/optimizer/Inliner.cpp b/compiler/optimizer/Inliner.cpp index dabcaf1cc18..3224838180d 100644 --- a/compiler/optimizer/Inliner.cpp +++ b/compiler/optimizer/Inliner.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifdef J9ZTPF #define __TPF_DO_NOT_MAP_ATOE_REMOVE diff --git a/compiler/optimizer/Inliner.hpp b/compiler/optimizer/Inliner.hpp index b70bfd26f93..dafbcd4be99 100644 --- a/compiler/optimizer/Inliner.hpp +++ b/compiler/optimizer/Inliner.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /////////////////////////////////////////////////////////////////////////// diff --git a/compiler/optimizer/InlinerFailureReason.hpp b/compiler/optimizer/InlinerFailureReason.hpp index 6b3472537ae..4e7e8ba17f8 100644 --- a/compiler/optimizer/InlinerFailureReason.hpp +++ b/compiler/optimizer/InlinerFailureReason.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /////////////////////////////////////////////////////////////////////////// diff --git a/compiler/optimizer/IntersectionBitVectorAnalysis.cpp b/compiler/optimizer/IntersectionBitVectorAnalysis.cpp index aaed4d60d31..b83e1608503 100644 --- a/compiler/optimizer/IntersectionBitVectorAnalysis.cpp +++ b/compiler/optimizer/IntersectionBitVectorAnalysis.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/optimizer/IsolatedStoreElimination.cpp b/compiler/optimizer/IsolatedStoreElimination.cpp index 660ff66a057..2fd4735bba1 100644 --- a/compiler/optimizer/IsolatedStoreElimination.cpp +++ b/compiler/optimizer/IsolatedStoreElimination.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/IsolatedStoreElimination.hpp" diff --git a/compiler/optimizer/IsolatedStoreElimination.hpp b/compiler/optimizer/IsolatedStoreElimination.hpp index 9cc888a7b28..4a8e755dcd8 100644 --- a/compiler/optimizer/IsolatedStoreElimination.hpp +++ b/compiler/optimizer/IsolatedStoreElimination.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ISOLSTOR_INCL diff --git a/compiler/optimizer/Isolatedness.cpp b/compiler/optimizer/Isolatedness.cpp index 200e8a14f7f..adfb5cfbebf 100644 --- a/compiler/optimizer/Isolatedness.cpp +++ b/compiler/optimizer/Isolatedness.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/optimizer/Latestness.cpp b/compiler/optimizer/Latestness.cpp index 7904b4aac72..0498645ec47 100644 --- a/compiler/optimizer/Latestness.cpp +++ b/compiler/optimizer/Latestness.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/optimizer/LiveOnAllPaths.cpp b/compiler/optimizer/LiveOnAllPaths.cpp index e20e3f5193a..3675e79bb0d 100644 --- a/compiler/optimizer/LiveOnAllPaths.cpp +++ b/compiler/optimizer/LiveOnAllPaths.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/optimizer/LiveVariableInformation.cpp b/compiler/optimizer/LiveVariableInformation.cpp index dac81f2e452..614ab0636da 100644 --- a/compiler/optimizer/LiveVariableInformation.cpp +++ b/compiler/optimizer/LiveVariableInformation.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/optimizer/Liveness.cpp b/compiler/optimizer/Liveness.cpp index d4a2f2356f5..830398a3fa2 100644 --- a/compiler/optimizer/Liveness.cpp +++ b/compiler/optimizer/Liveness.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/optimizer/LoadExtensions.cpp b/compiler/optimizer/LoadExtensions.cpp index e945271a43b..db44fa55255 100644 --- a/compiler/optimizer/LoadExtensions.cpp +++ b/compiler/optimizer/LoadExtensions.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/LoadExtensions.hpp" diff --git a/compiler/optimizer/LoadExtensions.hpp b/compiler/optimizer/LoadExtensions.hpp index 5f98556e0a4..d233a638463 100644 --- a/compiler/optimizer/LoadExtensions.hpp +++ b/compiler/optimizer/LoadExtensions.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef LOADEXTENSIONS_INCL diff --git a/compiler/optimizer/LocalAnalysis.cpp b/compiler/optimizer/LocalAnalysis.cpp index 3b80a71eb2c..5588167c6d8 100644 --- a/compiler/optimizer/LocalAnalysis.cpp +++ b/compiler/optimizer/LocalAnalysis.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/LocalAnalysis.hpp" diff --git a/compiler/optimizer/LocalAnalysis.hpp b/compiler/optimizer/LocalAnalysis.hpp index 14b583c7b4d..7997fdffabb 100644 --- a/compiler/optimizer/LocalAnalysis.hpp +++ b/compiler/optimizer/LocalAnalysis.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef LA_INCL diff --git a/compiler/optimizer/LocalAnticipatability.cpp b/compiler/optimizer/LocalAnticipatability.cpp index ac1482614b9..b871c5b0024 100644 --- a/compiler/optimizer/LocalAnticipatability.cpp +++ b/compiler/optimizer/LocalAnticipatability.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/optimizer/LocalCSE.hpp b/compiler/optimizer/LocalCSE.hpp index c2b411bfa3a..5378baefee5 100644 --- a/compiler/optimizer/LocalCSE.hpp +++ b/compiler/optimizer/LocalCSE.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_LOCALCSE_INCL diff --git a/compiler/optimizer/LocalDeadStoreElimination.cpp b/compiler/optimizer/LocalDeadStoreElimination.cpp index ed167e8eb18..1d936c010c7 100644 --- a/compiler/optimizer/LocalDeadStoreElimination.cpp +++ b/compiler/optimizer/LocalDeadStoreElimination.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/LocalDeadStoreElimination.hpp" diff --git a/compiler/optimizer/LocalDeadStoreElimination.hpp b/compiler/optimizer/LocalDeadStoreElimination.hpp index 04793196471..955d352f84c 100644 --- a/compiler/optimizer/LocalDeadStoreElimination.hpp +++ b/compiler/optimizer/LocalDeadStoreElimination.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_LOCALDEADSTOREELIMINATION_INCL diff --git a/compiler/optimizer/LocalLiveRangeReducer.cpp b/compiler/optimizer/LocalLiveRangeReducer.cpp index cfa3946112f..7a48a1f7616 100644 --- a/compiler/optimizer/LocalLiveRangeReducer.cpp +++ b/compiler/optimizer/LocalLiveRangeReducer.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/LocalLiveRangeReducer.hpp" diff --git a/compiler/optimizer/LocalLiveRangeReducer.hpp b/compiler/optimizer/LocalLiveRangeReducer.hpp index 238a6b9fc8f..4413181a99b 100644 --- a/compiler/optimizer/LocalLiveRangeReducer.hpp +++ b/compiler/optimizer/LocalLiveRangeReducer.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef LLRREDUC_INCL diff --git a/compiler/optimizer/LocalOpts.cpp b/compiler/optimizer/LocalOpts.cpp index 4b1420f249c..cc1e64287e7 100644 --- a/compiler/optimizer/LocalOpts.cpp +++ b/compiler/optimizer/LocalOpts.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/LocalOpts.hpp" diff --git a/compiler/optimizer/LocalOpts.hpp b/compiler/optimizer/LocalOpts.hpp index 2c536d34248..d8b083e3eec 100644 --- a/compiler/optimizer/LocalOpts.hpp +++ b/compiler/optimizer/LocalOpts.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef LOCALOPTS_INCL diff --git a/compiler/optimizer/LocalReordering.cpp b/compiler/optimizer/LocalReordering.cpp index 7ff45f754fb..6923165f797 100644 --- a/compiler/optimizer/LocalReordering.cpp +++ b/compiler/optimizer/LocalReordering.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/LocalReordering.hpp" diff --git a/compiler/optimizer/LocalReordering.hpp b/compiler/optimizer/LocalReordering.hpp index 3ed8200dffc..504c5a163d6 100644 --- a/compiler/optimizer/LocalReordering.hpp +++ b/compiler/optimizer/LocalReordering.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef LREORDER_INCL diff --git a/compiler/optimizer/LocalTransparency.cpp b/compiler/optimizer/LocalTransparency.cpp index 04021613780..c960207f877 100644 --- a/compiler/optimizer/LocalTransparency.cpp +++ b/compiler/optimizer/LocalTransparency.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/optimizer/LocalValuePropagation.hpp b/compiler/optimizer/LocalValuePropagation.hpp index 95c8c2b217f..9727f148268 100644 --- a/compiler/optimizer/LocalValuePropagation.hpp +++ b/compiler/optimizer/LocalValuePropagation.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_LOCALVALUEPROPAGATION_INCL diff --git a/compiler/optimizer/LoopCanonicalizer.cpp b/compiler/optimizer/LoopCanonicalizer.cpp index fa505c0a2fb..eba1adcb094 100644 --- a/compiler/optimizer/LoopCanonicalizer.cpp +++ b/compiler/optimizer/LoopCanonicalizer.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/LoopCanonicalizer.hpp" diff --git a/compiler/optimizer/LoopCanonicalizer.hpp b/compiler/optimizer/LoopCanonicalizer.hpp index d1ad3fc60f6..e03985bd8f8 100644 --- a/compiler/optimizer/LoopCanonicalizer.hpp +++ b/compiler/optimizer/LoopCanonicalizer.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef LCA_INCL diff --git a/compiler/optimizer/LoopReducer.cpp b/compiler/optimizer/LoopReducer.cpp index b0ede8a641d..17791357cbf 100644 --- a/compiler/optimizer/LoopReducer.cpp +++ b/compiler/optimizer/LoopReducer.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/LoopReducer.hpp" diff --git a/compiler/optimizer/LoopReducer.hpp b/compiler/optimizer/LoopReducer.hpp index cec0ca611ea..1e75018975f 100644 --- a/compiler/optimizer/LoopReducer.hpp +++ b/compiler/optimizer/LoopReducer.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef LRA_INCL diff --git a/compiler/optimizer/LoopReplicator.cpp b/compiler/optimizer/LoopReplicator.cpp index 0f50f402eea..b795de57b6b 100644 --- a/compiler/optimizer/LoopReplicator.cpp +++ b/compiler/optimizer/LoopReplicator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/LoopReplicator.hpp" diff --git a/compiler/optimizer/LoopReplicator.hpp b/compiler/optimizer/LoopReplicator.hpp index e4bbade606d..c77067193ca 100644 --- a/compiler/optimizer/LoopReplicator.hpp +++ b/compiler/optimizer/LoopReplicator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/optimizer/LoopVersioner.cpp b/compiler/optimizer/LoopVersioner.cpp index fc54ff07579..3da7a7f7281 100644 --- a/compiler/optimizer/LoopVersioner.cpp +++ b/compiler/optimizer/LoopVersioner.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/LoopVersioner.hpp" diff --git a/compiler/optimizer/LoopVersioner.hpp b/compiler/optimizer/LoopVersioner.hpp index b42388a08c7..537f32d4596 100644 --- a/compiler/optimizer/LoopVersioner.hpp +++ b/compiler/optimizer/LoopVersioner.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef LOOPVERSIONER_INCL diff --git a/compiler/optimizer/OMRCFGSimplifier.cpp b/compiler/optimizer/OMRCFGSimplifier.cpp index 8d1ee45a162..b345ea273ca 100644 --- a/compiler/optimizer/OMRCFGSimplifier.cpp +++ b/compiler/optimizer/OMRCFGSimplifier.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/CFGSimplifier.hpp" diff --git a/compiler/optimizer/OMRCFGSimplifier.hpp b/compiler/optimizer/OMRCFGSimplifier.hpp index d58f12a5f7a..917a4727aa4 100644 --- a/compiler/optimizer/OMRCFGSimplifier.hpp +++ b/compiler/optimizer/OMRCFGSimplifier.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_CFGSIMPLIFIER_INCL diff --git a/compiler/optimizer/OMRDataFlowAnalysis.enum b/compiler/optimizer/OMRDataFlowAnalysis.enum index 0d6c5ad305f..2fc0aff706c 100644 --- a/compiler/optimizer/OMRDataFlowAnalysis.enum +++ b/compiler/optimizer/OMRDataFlowAnalysis.enum @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/optimizer/OMRGlobalRegister.cpp b/compiler/optimizer/OMRGlobalRegister.cpp index 926670ab16e..43f8c191a80 100644 --- a/compiler/optimizer/OMRGlobalRegister.cpp +++ b/compiler/optimizer/OMRGlobalRegister.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/GlobalRegister.hpp" diff --git a/compiler/optimizer/OMRGlobalRegister.hpp b/compiler/optimizer/OMRGlobalRegister.hpp index 04006d60fcb..9cf01334722 100644 --- a/compiler/optimizer/OMRGlobalRegister.hpp +++ b/compiler/optimizer/OMRGlobalRegister.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_GLOBALREGISTER_INCL diff --git a/compiler/optimizer/OMRGlobalRegister_inlines.hpp b/compiler/optimizer/OMRGlobalRegister_inlines.hpp index 54199a7c2c7..4a28db3c946 100644 --- a/compiler/optimizer/OMRGlobalRegister_inlines.hpp +++ b/compiler/optimizer/OMRGlobalRegister_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_GLOBALREGISTER_INLINES_INCL diff --git a/compiler/optimizer/OMRLocalCSE.cpp b/compiler/optimizer/OMRLocalCSE.cpp index 2806971436e..184e455899a 100644 --- a/compiler/optimizer/OMRLocalCSE.cpp +++ b/compiler/optimizer/OMRLocalCSE.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/LocalCSE.hpp" diff --git a/compiler/optimizer/OMRLocalCSE.hpp b/compiler/optimizer/OMRLocalCSE.hpp index 874faeaa77b..5c0a2ebac83 100644 --- a/compiler/optimizer/OMRLocalCSE.hpp +++ b/compiler/optimizer/OMRLocalCSE.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_LOCALCSE_INCL diff --git a/compiler/optimizer/OMROptimization.cpp b/compiler/optimizer/OMROptimization.cpp index fc99f088311..c4c5dde80a3 100644 --- a/compiler/optimizer/OMROptimization.cpp +++ b/compiler/optimizer/OMROptimization.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/Optimization.hpp" diff --git a/compiler/optimizer/OMROptimization.hpp b/compiler/optimizer/OMROptimization.hpp index e12ac2e3ab6..73aaadfb2bb 100644 --- a/compiler/optimizer/OMROptimization.hpp +++ b/compiler/optimizer/OMROptimization.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_OPTIMIZATION_INCL diff --git a/compiler/optimizer/OMROptimizationGroups.enum b/compiler/optimizer/OMROptimizationGroups.enum index 073a0317f27..d6a0cd66a8f 100644 --- a/compiler/optimizer/OMROptimizationGroups.enum +++ b/compiler/optimizer/OMROptimizationGroups.enum @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/optimizer/OMROptimizationManager.cpp b/compiler/optimizer/OMROptimizationManager.cpp index fdedb0c0714..21709a3855f 100644 --- a/compiler/optimizer/OMROptimizationManager.cpp +++ b/compiler/optimizer/OMROptimizationManager.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/OptimizationManager.hpp" diff --git a/compiler/optimizer/OMROptimizationManager.hpp b/compiler/optimizer/OMROptimizationManager.hpp index 5cc19bf1771..002a6282c4b 100644 --- a/compiler/optimizer/OMROptimizationManager.hpp +++ b/compiler/optimizer/OMROptimizationManager.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_OPTIMIZATIONMANAGER_INCL diff --git a/compiler/optimizer/OMROptimizationManager_inlines.hpp b/compiler/optimizer/OMROptimizationManager_inlines.hpp index 3b04093ffff..375912d010a 100644 --- a/compiler/optimizer/OMROptimizationManager_inlines.hpp +++ b/compiler/optimizer/OMROptimizationManager_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_OPTIMIZATIONMANAGER_INLINES_INCL diff --git a/compiler/optimizer/OMROptimization_inlines.hpp b/compiler/optimizer/OMROptimization_inlines.hpp index 8101159a48b..417ce734c7f 100644 --- a/compiler/optimizer/OMROptimization_inlines.hpp +++ b/compiler/optimizer/OMROptimization_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_OPTIMIZATION_INLINES_INCL diff --git a/compiler/optimizer/OMROptimizations.enum b/compiler/optimizer/OMROptimizations.enum index 7d6d05c7aee..7759a2aeede 100644 --- a/compiler/optimizer/OMROptimizations.enum +++ b/compiler/optimizer/OMROptimizations.enum @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/optimizer/OMROptimizer.cpp b/compiler/optimizer/OMROptimizer.cpp index 4978c6d194b..c5b1e67c230 100644 --- a/compiler/optimizer/OMROptimizer.cpp +++ b/compiler/optimizer/OMROptimizer.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/Optimizer.hpp" diff --git a/compiler/optimizer/OMROptimizer.hpp b/compiler/optimizer/OMROptimizer.hpp index c0340032d4a..0beae41acd6 100644 --- a/compiler/optimizer/OMROptimizer.hpp +++ b/compiler/optimizer/OMROptimizer.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_OPTIMIZER_INCL diff --git a/compiler/optimizer/OMROptimizer_inlines.hpp b/compiler/optimizer/OMROptimizer_inlines.hpp index c7444d5e7bd..7854128c323 100644 --- a/compiler/optimizer/OMROptimizer_inlines.hpp +++ b/compiler/optimizer/OMROptimizer_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_OPTIMIZER_INLINES_INCL diff --git a/compiler/optimizer/OMRRecognizedCallTransformer.cpp b/compiler/optimizer/OMRRecognizedCallTransformer.cpp index a4cefeed9d3..89727c13512 100644 --- a/compiler/optimizer/OMRRecognizedCallTransformer.cpp +++ b/compiler/optimizer/OMRRecognizedCallTransformer.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* 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 +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/RecognizedCallTransformer.hpp" diff --git a/compiler/optimizer/OMRRecognizedCallTransformer.hpp b/compiler/optimizer/OMRRecognizedCallTransformer.hpp index 853f05aa299..5a56054a19f 100644 --- a/compiler/optimizer/OMRRecognizedCallTransformer.hpp +++ b/compiler/optimizer/OMRRecognizedCallTransformer.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* 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 +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMRRECOGNIZEDCALLTRANSFORMER_INCL diff --git a/compiler/optimizer/OMRRegisterCandidate.cpp b/compiler/optimizer/OMRRegisterCandidate.cpp index 1ce9898c217..85d95de9427 100644 --- a/compiler/optimizer/OMRRegisterCandidate.cpp +++ b/compiler/optimizer/OMRRegisterCandidate.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifdef OMRZTPF diff --git a/compiler/optimizer/OMRRegisterCandidate.hpp b/compiler/optimizer/OMRRegisterCandidate.hpp index 030abbafd0c..61dba6970f9 100644 --- a/compiler/optimizer/OMRRegisterCandidate.hpp +++ b/compiler/optimizer/OMRRegisterCandidate.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_REGISTERCANDIDATE_INCL diff --git a/compiler/optimizer/OMRSimplifier.cpp b/compiler/optimizer/OMRSimplifier.cpp index ae1043ece96..980d5014944 100644 --- a/compiler/optimizer/OMRSimplifier.cpp +++ b/compiler/optimizer/OMRSimplifier.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/Simplifier.hpp" diff --git a/compiler/optimizer/OMRSimplifier.hpp b/compiler/optimizer/OMRSimplifier.hpp index b29da557549..bc21ab03797 100644 --- a/compiler/optimizer/OMRSimplifier.hpp +++ b/compiler/optimizer/OMRSimplifier.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_SIMPLIFIER_INCL diff --git a/compiler/optimizer/OMRSimplifierHandlers.cpp b/compiler/optimizer/OMRSimplifierHandlers.cpp index 39d8b25cb02..2df5d2bc00e 100644 --- a/compiler/optimizer/OMRSimplifierHandlers.cpp +++ b/compiler/optimizer/OMRSimplifierHandlers.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_SIMPLIFIERHANDLERS_INCL diff --git a/compiler/optimizer/OMRSimplifierHandlers.hpp b/compiler/optimizer/OMRSimplifierHandlers.hpp index bc285aed5e7..d8a4cda3c40 100644 --- a/compiler/optimizer/OMRSimplifierHandlers.hpp +++ b/compiler/optimizer/OMRSimplifierHandlers.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_SIMPLIFIERHANDLERS_INCL diff --git a/compiler/optimizer/OMRSimplifierHelpers.cpp b/compiler/optimizer/OMRSimplifierHelpers.cpp index 3c6386da774..8d90b9e5545 100644 --- a/compiler/optimizer/OMRSimplifierHelpers.cpp +++ b/compiler/optimizer/OMRSimplifierHelpers.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/OMRSimplifierHelpers.hpp" diff --git a/compiler/optimizer/OMRSimplifierHelpers.hpp b/compiler/optimizer/OMRSimplifierHelpers.hpp index 86e0b45b999..5614fdc78fc 100644 --- a/compiler/optimizer/OMRSimplifierHelpers.hpp +++ b/compiler/optimizer/OMRSimplifierHelpers.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_SIMPLIFIERHELPERS_INCL diff --git a/compiler/optimizer/OMRSimplifierTable.enum b/compiler/optimizer/OMRSimplifierTable.enum index 4debc5b512a..72a2c4ef8ca 100644 --- a/compiler/optimizer/OMRSimplifierTable.enum +++ b/compiler/optimizer/OMRSimplifierTable.enum @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_SIMPLIFIERTABLE_ENUM_INCL diff --git a/compiler/optimizer/OMRTransformUtil.cpp b/compiler/optimizer/OMRTransformUtil.cpp index 84a44b2f773..e5eb9c54f36 100644 --- a/compiler/optimizer/OMRTransformUtil.cpp +++ b/compiler/optimizer/OMRTransformUtil.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/TransformUtil.hpp" diff --git a/compiler/optimizer/OMRTransformUtil.hpp b/compiler/optimizer/OMRTransformUtil.hpp index d39271c1127..632eb3ec029 100644 --- a/compiler/optimizer/OMRTransformUtil.hpp +++ b/compiler/optimizer/OMRTransformUtil.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_TRANSFORMUTIL_INCL diff --git a/compiler/optimizer/OMRValuePropagation.cpp b/compiler/optimizer/OMRValuePropagation.cpp index 591414242b9..76ee3c0fa73 100644 --- a/compiler/optimizer/OMRValuePropagation.cpp +++ b/compiler/optimizer/OMRValuePropagation.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/ValuePropagation.hpp" diff --git a/compiler/optimizer/OMRValuePropagation.hpp b/compiler/optimizer/OMRValuePropagation.hpp index 6d22720e48c..6f2a7c0aac5 100644 --- a/compiler/optimizer/OMRValuePropagation.hpp +++ b/compiler/optimizer/OMRValuePropagation.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_VALUEPROPAGATION_INCL diff --git a/compiler/optimizer/OSRDefAnalysis.cpp b/compiler/optimizer/OSRDefAnalysis.cpp index 668fe9c643a..7df4e669cd3 100644 --- a/compiler/optimizer/OSRDefAnalysis.cpp +++ b/compiler/optimizer/OSRDefAnalysis.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/OSRDefAnalysis.hpp" diff --git a/compiler/optimizer/OSRDefAnalysis.hpp b/compiler/optimizer/OSRDefAnalysis.hpp index d66e4850ce7..a161a97c722 100644 --- a/compiler/optimizer/OSRDefAnalysis.hpp +++ b/compiler/optimizer/OSRDefAnalysis.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OSRDEFANALYSIS_INCL diff --git a/compiler/optimizer/Optimization.hpp b/compiler/optimizer/Optimization.hpp index 125f314537f..3e349683d0c 100644 --- a/compiler/optimizer/Optimization.hpp +++ b/compiler/optimizer/Optimization.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_OPTIMIZATION_INCL diff --git a/compiler/optimizer/OptimizationData.hpp b/compiler/optimizer/OptimizationData.hpp index f8e53de9e50..1ad0e447b2b 100644 --- a/compiler/optimizer/OptimizationData.hpp +++ b/compiler/optimizer/OptimizationData.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_OPTIMIZATIONDATA_INCL diff --git a/compiler/optimizer/OptimizationGroups.enum b/compiler/optimizer/OptimizationGroups.enum index 0c1c09543ab..0cd172402ac 100644 --- a/compiler/optimizer/OptimizationGroups.enum +++ b/compiler/optimizer/OptimizationGroups.enum @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/OMROptimizationGroups.enum" diff --git a/compiler/optimizer/OptimizationManager.hpp b/compiler/optimizer/OptimizationManager.hpp index 17d175c290b..f42d60fd0eb 100644 --- a/compiler/optimizer/OptimizationManager.hpp +++ b/compiler/optimizer/OptimizationManager.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_OPTIMIZATIONMANAGER_INCL diff --git a/compiler/optimizer/OptimizationManager_inlines.hpp b/compiler/optimizer/OptimizationManager_inlines.hpp index 3ca83e99d92..0d6f2265b83 100644 --- a/compiler/optimizer/OptimizationManager_inlines.hpp +++ b/compiler/optimizer/OptimizationManager_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OPTIMIZATIONMANAGER_INLINES_INCL diff --git a/compiler/optimizer/OptimizationPolicy.hpp b/compiler/optimizer/OptimizationPolicy.hpp index e639683ac6c..f1511ed5979 100644 --- a/compiler/optimizer/OptimizationPolicy.hpp +++ b/compiler/optimizer/OptimizationPolicy.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_OPTIMIZATIONPOLICY_INCL diff --git a/compiler/optimizer/OptimizationStrategies.hpp b/compiler/optimizer/OptimizationStrategies.hpp index 59fc8c4c75f..30857e7195a 100644 --- a/compiler/optimizer/OptimizationStrategies.hpp +++ b/compiler/optimizer/OptimizationStrategies.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OPTIMIZATIONSTRATEGIES_INCL diff --git a/compiler/optimizer/OptimizationUtil.hpp b/compiler/optimizer/OptimizationUtil.hpp index 896a0cf67e4..6f310814add 100644 --- a/compiler/optimizer/OptimizationUtil.hpp +++ b/compiler/optimizer/OptimizationUtil.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_OptimizationUtil_INCL diff --git a/compiler/optimizer/Optimization_inlines.hpp b/compiler/optimizer/Optimization_inlines.hpp index 9a994d5871b..2a58684c110 100644 --- a/compiler/optimizer/Optimization_inlines.hpp +++ b/compiler/optimizer/Optimization_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OPTIMIZATION_INLINES_INCL diff --git a/compiler/optimizer/Optimizations.enum b/compiler/optimizer/Optimizations.enum index 2e6745302fc..e41b1ed6b97 100644 --- a/compiler/optimizer/Optimizations.enum +++ b/compiler/optimizer/Optimizations.enum @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/OMROptimizations.enum" diff --git a/compiler/optimizer/Optimizations.hpp b/compiler/optimizer/Optimizations.hpp index 2bc2f2cffaf..1bfbec4578b 100644 --- a/compiler/optimizer/Optimizations.hpp +++ b/compiler/optimizer/Optimizations.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_OPTIMIZATIONS_INCL diff --git a/compiler/optimizer/Optimizer.hpp b/compiler/optimizer/Optimizer.hpp index c3d85554ba1..1e2568d6079 100644 --- a/compiler/optimizer/Optimizer.hpp +++ b/compiler/optimizer/Optimizer.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_OPTIMIZER_INCL diff --git a/compiler/optimizer/Optimizer_inlines.hpp b/compiler/optimizer/Optimizer_inlines.hpp index ee77530859e..d5a81b9a7e3 100644 --- a/compiler/optimizer/Optimizer_inlines.hpp +++ b/compiler/optimizer/Optimizer_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OPTIMIZER_INLINES_INCL diff --git a/compiler/optimizer/OrderBlocks.cpp b/compiler/optimizer/OrderBlocks.cpp index 7c77cdd704e..6ddf26cf0e4 100644 --- a/compiler/optimizer/OrderBlocks.cpp +++ b/compiler/optimizer/OrderBlocks.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/OrderBlocks.hpp" diff --git a/compiler/optimizer/OrderBlocks.hpp b/compiler/optimizer/OrderBlocks.hpp index b31c383f692..5e518e53c03 100644 --- a/compiler/optimizer/OrderBlocks.hpp +++ b/compiler/optimizer/OrderBlocks.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ORDERBLOCKS_INCL diff --git a/compiler/optimizer/PartialRedundancy.cpp b/compiler/optimizer/PartialRedundancy.cpp index 12a2c86dc83..64b13b67a41 100644 --- a/compiler/optimizer/PartialRedundancy.cpp +++ b/compiler/optimizer/PartialRedundancy.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/PartialRedundancy.hpp" diff --git a/compiler/optimizer/PartialRedundancy.hpp b/compiler/optimizer/PartialRedundancy.hpp index d6bb5ee9826..b5b3c537ae5 100644 --- a/compiler/optimizer/PartialRedundancy.hpp +++ b/compiler/optimizer/PartialRedundancy.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PARTIALREDUNDANCY_INCL diff --git a/compiler/optimizer/PreExistence.cpp b/compiler/optimizer/PreExistence.cpp index 4650c122a34..00b200da98f 100644 --- a/compiler/optimizer/PreExistence.cpp +++ b/compiler/optimizer/PreExistence.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/PreExistence.hpp" diff --git a/compiler/optimizer/PreExistence.hpp b/compiler/optimizer/PreExistence.hpp index bca842e75fa..6c3814d54b1 100644 --- a/compiler/optimizer/PreExistence.hpp +++ b/compiler/optimizer/PreExistence.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_PREEXISTENCE_INCL diff --git a/compiler/optimizer/Reachability.cpp b/compiler/optimizer/Reachability.cpp index ef698805705..0ff873dc552 100644 --- a/compiler/optimizer/Reachability.cpp +++ b/compiler/optimizer/Reachability.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/Reachability.hpp" diff --git a/compiler/optimizer/Reachability.hpp b/compiler/optimizer/Reachability.hpp index c327f635f10..27cc397db98 100644 --- a/compiler/optimizer/Reachability.hpp +++ b/compiler/optimizer/Reachability.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef REACHABILITY_INCL diff --git a/compiler/optimizer/ReachingDefinitions.cpp b/compiler/optimizer/ReachingDefinitions.cpp index 60da10acc8a..45a770a8f4f 100644 --- a/compiler/optimizer/ReachingDefinitions.cpp +++ b/compiler/optimizer/ReachingDefinitions.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/optimizer/RecognizedCallTransformer.hpp b/compiler/optimizer/RecognizedCallTransformer.hpp index f3ea079140b..572c4e3d498 100644 --- a/compiler/optimizer/RecognizedCallTransformer.hpp +++ b/compiler/optimizer/RecognizedCallTransformer.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* 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 +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_RECOGNIZEDCALLTRANSFORMER_INCL diff --git a/compiler/optimizer/RedundantAsyncCheckRemoval.cpp b/compiler/optimizer/RedundantAsyncCheckRemoval.cpp index ec250de2a8e..8708ade3051 100644 --- a/compiler/optimizer/RedundantAsyncCheckRemoval.cpp +++ b/compiler/optimizer/RedundantAsyncCheckRemoval.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/RedundantAsyncCheckRemoval.hpp" diff --git a/compiler/optimizer/RedundantAsyncCheckRemoval.hpp b/compiler/optimizer/RedundantAsyncCheckRemoval.hpp index 9f78a3878e7..d67dfb332bb 100644 --- a/compiler/optimizer/RedundantAsyncCheckRemoval.hpp +++ b/compiler/optimizer/RedundantAsyncCheckRemoval.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef REDUNDANT_ASYNC_CHECK_REMOVAL_H diff --git a/compiler/optimizer/RegDepCopyRemoval.cpp b/compiler/optimizer/RegDepCopyRemoval.cpp index 848e0762a57..686c4b7624e 100644 --- a/compiler/optimizer/RegDepCopyRemoval.cpp +++ b/compiler/optimizer/RegDepCopyRemoval.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/RegDepCopyRemoval.hpp" diff --git a/compiler/optimizer/RegDepCopyRemoval.hpp b/compiler/optimizer/RegDepCopyRemoval.hpp index 96ed378a4fe..74f206a3c63 100644 --- a/compiler/optimizer/RegDepCopyRemoval.hpp +++ b/compiler/optimizer/RegDepCopyRemoval.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef REGDEPCOPYREMOVAL_INCL diff --git a/compiler/optimizer/RegisterCandidate.hpp b/compiler/optimizer/RegisterCandidate.hpp index dc11e16366c..10878d93115 100644 --- a/compiler/optimizer/RegisterCandidate.hpp +++ b/compiler/optimizer/RegisterCandidate.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef REGISTERCANDIDATE_INCL diff --git a/compiler/optimizer/RematTools.cpp b/compiler/optimizer/RematTools.cpp index e5c329a0c58..44162df1aec 100644 --- a/compiler/optimizer/RematTools.cpp +++ b/compiler/optimizer/RematTools.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/RematTools.hpp" diff --git a/compiler/optimizer/RematTools.hpp b/compiler/optimizer/RematTools.hpp index 7fd500732ee..e6d844d0802 100644 --- a/compiler/optimizer/RematTools.hpp +++ b/compiler/optimizer/RematTools.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/optimizer/ReorderIndexExpr.cpp b/compiler/optimizer/ReorderIndexExpr.cpp index bc394568c0e..2a82e27b229 100644 --- a/compiler/optimizer/ReorderIndexExpr.cpp +++ b/compiler/optimizer/ReorderIndexExpr.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/ReorderIndexExpr.hpp" diff --git a/compiler/optimizer/ReorderIndexExpr.hpp b/compiler/optimizer/ReorderIndexExpr.hpp index 76827a12d7e..626e7a3e09f 100644 --- a/compiler/optimizer/ReorderIndexExpr.hpp +++ b/compiler/optimizer/ReorderIndexExpr.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef REORDER_INDEX_EXPR_INCL diff --git a/compiler/optimizer/SelectOpt.hpp b/compiler/optimizer/SelectOpt.hpp index 0b2502bf507..b98bb362556 100644 --- a/compiler/optimizer/SelectOpt.hpp +++ b/compiler/optimizer/SelectOpt.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SELECT_OPT_INCL diff --git a/compiler/optimizer/Simplifier.hpp b/compiler/optimizer/Simplifier.hpp index 2df90a4564f..c69cb5c7762 100644 --- a/compiler/optimizer/Simplifier.hpp +++ b/compiler/optimizer/Simplifier.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_SIMPLIFIER_INCL diff --git a/compiler/optimizer/SimplifierHandlers.hpp b/compiler/optimizer/SimplifierHandlers.hpp index 96473601fb9..da8713afbc4 100644 --- a/compiler/optimizer/SimplifierHandlers.hpp +++ b/compiler/optimizer/SimplifierHandlers.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SIMPLIFIERHANDLERS_INCL diff --git a/compiler/optimizer/SimplifierTable.enum b/compiler/optimizer/SimplifierTable.enum index 75e20de5aa2..135a85919bf 100644 --- a/compiler/optimizer/SimplifierTable.enum +++ b/compiler/optimizer/SimplifierTable.enum @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SIMPLIFIERTABLE_ENUM_INCL diff --git a/compiler/optimizer/SimplifierTable.hpp b/compiler/optimizer/SimplifierTable.hpp index 7e094c57cc9..ddef220d36f 100644 --- a/compiler/optimizer/SimplifierTable.hpp +++ b/compiler/optimizer/SimplifierTable.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SIMPLIFIERTABLE_INCL diff --git a/compiler/optimizer/SinkStores.cpp b/compiler/optimizer/SinkStores.cpp index bae61ffaf8c..5f3099ff09f 100644 --- a/compiler/optimizer/SinkStores.cpp +++ b/compiler/optimizer/SinkStores.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/SinkStores.hpp" diff --git a/compiler/optimizer/SinkStores.hpp b/compiler/optimizer/SinkStores.hpp index 8654d7cc488..afb861018c1 100644 --- a/compiler/optimizer/SinkStores.hpp +++ b/compiler/optimizer/SinkStores.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SINKSTORES_INCL diff --git a/compiler/optimizer/StripMiner.cpp b/compiler/optimizer/StripMiner.cpp index b0d4a726fb8..ad70e21fb3b 100644 --- a/compiler/optimizer/StripMiner.cpp +++ b/compiler/optimizer/StripMiner.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/StripMiner.hpp" diff --git a/compiler/optimizer/StripMiner.hpp b/compiler/optimizer/StripMiner.hpp index 2dda4c9bf3f..b5f5200ffd1 100644 --- a/compiler/optimizer/StripMiner.hpp +++ b/compiler/optimizer/StripMiner.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/LoopCanonicalizer.hpp" diff --git a/compiler/optimizer/StructuralAnalysis.cpp b/compiler/optimizer/StructuralAnalysis.cpp index cb35ba47328..24da1f7d575 100644 --- a/compiler/optimizer/StructuralAnalysis.cpp +++ b/compiler/optimizer/StructuralAnalysis.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/StructuralAnalysis.hpp" diff --git a/compiler/optimizer/StructuralAnalysis.hpp b/compiler/optimizer/StructuralAnalysis.hpp index 503ecf4219f..458e13e9312 100644 --- a/compiler/optimizer/StructuralAnalysis.hpp +++ b/compiler/optimizer/StructuralAnalysis.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef STRUCTURALANALYSIS_INCL diff --git a/compiler/optimizer/Structure.cpp b/compiler/optimizer/Structure.cpp index 91c979ca079..452ac7004cd 100644 --- a/compiler/optimizer/Structure.cpp +++ b/compiler/optimizer/Structure.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/Structure.hpp" diff --git a/compiler/optimizer/Structure.hpp b/compiler/optimizer/Structure.hpp index b42926ad40b..976146d5db4 100644 --- a/compiler/optimizer/Structure.hpp +++ b/compiler/optimizer/Structure.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef STRUCTURE_INCL diff --git a/compiler/optimizer/SwitchAnalyzer.cpp b/compiler/optimizer/SwitchAnalyzer.cpp index e1968225b2a..9be1bd5fa14 100644 --- a/compiler/optimizer/SwitchAnalyzer.cpp +++ b/compiler/optimizer/SwitchAnalyzer.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/SwitchAnalyzer.hpp" diff --git a/compiler/optimizer/SwitchAnalyzer.hpp b/compiler/optimizer/SwitchAnalyzer.hpp index f57b0da3168..146f8765ef2 100644 --- a/compiler/optimizer/SwitchAnalyzer.hpp +++ b/compiler/optimizer/SwitchAnalyzer.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SWITCHANALYZER_HPP diff --git a/compiler/optimizer/TransformUtil.hpp b/compiler/optimizer/TransformUtil.hpp index 7a0e8254e6b..e87865fe138 100644 --- a/compiler/optimizer/TransformUtil.hpp +++ b/compiler/optimizer/TransformUtil.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_TRANSFORMUTIL_INCL diff --git a/compiler/optimizer/TranslateTable.cpp b/compiler/optimizer/TranslateTable.cpp index c3c5013dd45..da2e21bed80 100644 --- a/compiler/optimizer/TranslateTable.cpp +++ b/compiler/optimizer/TranslateTable.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/TranslateTable.hpp" diff --git a/compiler/optimizer/TranslateTable.hpp b/compiler/optimizer/TranslateTable.hpp index 06cebbcf966..5a6f525c05d 100644 --- a/compiler/optimizer/TranslateTable.hpp +++ b/compiler/optimizer/TranslateTable.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_TRANSLATETABLE_INCL diff --git a/compiler/optimizer/TrivialDeadBlockRemover.cpp b/compiler/optimizer/TrivialDeadBlockRemover.cpp index a4173274559..9a907277dfe 100644 --- a/compiler/optimizer/TrivialDeadBlockRemover.cpp +++ b/compiler/optimizer/TrivialDeadBlockRemover.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/TrivialDeadBlockRemover.hpp" diff --git a/compiler/optimizer/TrivialDeadBlockRemover.hpp b/compiler/optimizer/TrivialDeadBlockRemover.hpp index 6ed321c061c..8935f54e6d1 100644 --- a/compiler/optimizer/TrivialDeadBlockRemover.hpp +++ b/compiler/optimizer/TrivialDeadBlockRemover.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TRIVIALDEADBLOCKREMOVER_INCL diff --git a/compiler/optimizer/UnionBitVectorAnalysis.cpp b/compiler/optimizer/UnionBitVectorAnalysis.cpp index f105a19ca38..680804462d2 100644 --- a/compiler/optimizer/UnionBitVectorAnalysis.cpp +++ b/compiler/optimizer/UnionBitVectorAnalysis.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/optimizer/UseDefInfo.cpp b/compiler/optimizer/UseDefInfo.cpp index b26392fa16b..79919766535 100644 --- a/compiler/optimizer/UseDefInfo.cpp +++ b/compiler/optimizer/UseDefInfo.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/UseDefInfo.hpp" diff --git a/compiler/optimizer/UseDefInfo.hpp b/compiler/optimizer/UseDefInfo.hpp index 91a09ada35b..209b32f14da 100644 --- a/compiler/optimizer/UseDefInfo.hpp +++ b/compiler/optimizer/UseDefInfo.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef USEDEFINFO_INCL diff --git a/compiler/optimizer/VPConstraint.cpp b/compiler/optimizer/VPConstraint.cpp index 9d93ffc8f30..989dccb4dc8 100644 --- a/compiler/optimizer/VPConstraint.cpp +++ b/compiler/optimizer/VPConstraint.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/VPConstraint.hpp" diff --git a/compiler/optimizer/VPConstraint.hpp b/compiler/optimizer/VPConstraint.hpp index abd7f49e2c1..429e15d1990 100644 --- a/compiler/optimizer/VPConstraint.hpp +++ b/compiler/optimizer/VPConstraint.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef VPCONSTRAINT_INCL diff --git a/compiler/optimizer/VPHandlers.cpp b/compiler/optimizer/VPHandlers.cpp index f1c364fb0df..377f06e286c 100644 --- a/compiler/optimizer/VPHandlers.cpp +++ b/compiler/optimizer/VPHandlers.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/optimizer/VPHandlersCommon.cpp b/compiler/optimizer/VPHandlersCommon.cpp index 0b38e9b62b8..7eeae494698 100644 --- a/compiler/optimizer/VPHandlersCommon.cpp +++ b/compiler/optimizer/VPHandlersCommon.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/optimizer/ValueNumberInfo.cpp b/compiler/optimizer/ValueNumberInfo.cpp index 06f40f9bf3e..40199f562a4 100644 --- a/compiler/optimizer/ValueNumberInfo.cpp +++ b/compiler/optimizer/ValueNumberInfo.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/ValueNumberInfo.hpp" diff --git a/compiler/optimizer/ValueNumberInfo.hpp b/compiler/optimizer/ValueNumberInfo.hpp index 8dbc5a862a2..58e1d4a39ac 100644 --- a/compiler/optimizer/ValueNumberInfo.hpp +++ b/compiler/optimizer/ValueNumberInfo.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef VALUENUMBERINFO_INCL diff --git a/compiler/optimizer/ValuePropagation.hpp b/compiler/optimizer/ValuePropagation.hpp index eda3ddc6199..1ffc369439a 100644 --- a/compiler/optimizer/ValuePropagation.hpp +++ b/compiler/optimizer/ValuePropagation.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_VALUEPROPAGATION_INCL diff --git a/compiler/optimizer/ValuePropagationCommon.cpp b/compiler/optimizer/ValuePropagationCommon.cpp index e0b08b84e67..5a7fbbdfc0a 100644 --- a/compiler/optimizer/ValuePropagationCommon.cpp +++ b/compiler/optimizer/ValuePropagationCommon.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // *************************************************************************** diff --git a/compiler/optimizer/ValuePropagationTable.hpp b/compiler/optimizer/ValuePropagationTable.hpp index 76febd13475..c262cc5afa4 100644 --- a/compiler/optimizer/ValuePropagationTable.hpp +++ b/compiler/optimizer/ValuePropagationTable.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef VALUEPROPAGATIONTABLE_INCL diff --git a/compiler/optimizer/VirtualGuardCoalescer.cpp b/compiler/optimizer/VirtualGuardCoalescer.cpp index feae8c10ada..74a3bd4626d 100644 --- a/compiler/optimizer/VirtualGuardCoalescer.cpp +++ b/compiler/optimizer/VirtualGuardCoalescer.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/VirtualGuardCoalescer.hpp" diff --git a/compiler/optimizer/VirtualGuardCoalescer.hpp b/compiler/optimizer/VirtualGuardCoalescer.hpp index c43c43052bb..772ae56f1a0 100644 --- a/compiler/optimizer/VirtualGuardCoalescer.hpp +++ b/compiler/optimizer/VirtualGuardCoalescer.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef VIRTUALGUARDCOALESCER_HPP diff --git a/compiler/optimizer/VirtualGuardHeadMerger.cpp b/compiler/optimizer/VirtualGuardHeadMerger.cpp index c09ed29e188..d5858593904 100644 --- a/compiler/optimizer/VirtualGuardHeadMerger.cpp +++ b/compiler/optimizer/VirtualGuardHeadMerger.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/optimizer/VirtualGuardHeadMerger.hpp b/compiler/optimizer/VirtualGuardHeadMerger.hpp index 0f814786d38..82ed5742f30 100644 --- a/compiler/optimizer/VirtualGuardHeadMerger.hpp +++ b/compiler/optimizer/VirtualGuardHeadMerger.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef VIRTUALGUARDHEADMERGER_INCL diff --git a/compiler/optimizer/abstractinterpreter/AbsOpArray.cpp b/compiler/optimizer/abstractinterpreter/AbsOpArray.cpp index 9fbb0e672bb..9f7a306c5b9 100644 --- a/compiler/optimizer/abstractinterpreter/AbsOpArray.cpp +++ b/compiler/optimizer/abstractinterpreter/AbsOpArray.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/abstractinterpreter/AbsOpArray.hpp" diff --git a/compiler/optimizer/abstractinterpreter/AbsOpArray.hpp b/compiler/optimizer/abstractinterpreter/AbsOpArray.hpp index d08df3a00a2..309722b7846 100644 --- a/compiler/optimizer/abstractinterpreter/AbsOpArray.hpp +++ b/compiler/optimizer/abstractinterpreter/AbsOpArray.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ABS_OP_ARRAY diff --git a/compiler/optimizer/abstractinterpreter/AbsOpStack.cpp b/compiler/optimizer/abstractinterpreter/AbsOpStack.cpp index b05947a766e..00eed4a1bf8 100644 --- a/compiler/optimizer/abstractinterpreter/AbsOpStack.cpp +++ b/compiler/optimizer/abstractinterpreter/AbsOpStack.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/abstractinterpreter/AbsOpStack.hpp" diff --git a/compiler/optimizer/abstractinterpreter/AbsOpStack.hpp b/compiler/optimizer/abstractinterpreter/AbsOpStack.hpp index 96e61bc070d..1baeb08cafb 100644 --- a/compiler/optimizer/abstractinterpreter/AbsOpStack.hpp +++ b/compiler/optimizer/abstractinterpreter/AbsOpStack.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ABS_OP_STACK_INCL diff --git a/compiler/optimizer/abstractinterpreter/AbsValue.cpp b/compiler/optimizer/abstractinterpreter/AbsValue.cpp index b39f2ca4806..b44e39f345b 100644 --- a/compiler/optimizer/abstractinterpreter/AbsValue.cpp +++ b/compiler/optimizer/abstractinterpreter/AbsValue.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/abstractinterpreter/AbsValue.hpp" diff --git a/compiler/optimizer/abstractinterpreter/AbsValue.hpp b/compiler/optimizer/abstractinterpreter/AbsValue.hpp index 2fcec52c799..fd0ae04d79e 100644 --- a/compiler/optimizer/abstractinterpreter/AbsValue.hpp +++ b/compiler/optimizer/abstractinterpreter/AbsValue.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ABS_VALUE_INCL diff --git a/compiler/p/CMakeLists.txt b/compiler/p/CMakeLists.txt index 3e1c8314b0f..0056d143eab 100644 --- a/compiler/p/CMakeLists.txt +++ b/compiler/p/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### compiler_library(p diff --git a/compiler/p/codegen/BinaryEvaluator.cpp b/compiler/p/codegen/BinaryEvaluator.cpp index c7ac7b26f49..fbb9a4b4419 100644 --- a/compiler/p/codegen/BinaryEvaluator.cpp +++ b/compiler/p/codegen/BinaryEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/p/codegen/ConstantDataSnippet.hpp b/compiler/p/codegen/ConstantDataSnippet.hpp index 924255daad5..6bebbc302a6 100644 --- a/compiler/p/codegen/ConstantDataSnippet.hpp +++ b/compiler/p/codegen/ConstantDataSnippet.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_CONSTANTDATASNIPPET_INCL diff --git a/compiler/p/codegen/ControlFlowEvaluator.cpp b/compiler/p/codegen/ControlFlowEvaluator.cpp index 73ab4b0d3d4..bef5bc9776f 100644 --- a/compiler/p/codegen/ControlFlowEvaluator.cpp +++ b/compiler/p/codegen/ControlFlowEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/p/codegen/FPTreeEvaluator.cpp b/compiler/p/codegen/FPTreeEvaluator.cpp index 2fe1afb22d8..7ce0a903b8f 100644 --- a/compiler/p/codegen/FPTreeEvaluator.cpp +++ b/compiler/p/codegen/FPTreeEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/p/codegen/GenerateInstructions.cpp b/compiler/p/codegen/GenerateInstructions.cpp index 56d6fa56485..d99dbfc471e 100644 --- a/compiler/p/codegen/GenerateInstructions.cpp +++ b/compiler/p/codegen/GenerateInstructions.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compiler/p/codegen/GenerateInstructions.hpp" diff --git a/compiler/p/codegen/GenerateInstructions.hpp b/compiler/p/codegen/GenerateInstructions.hpp index 994ec69cb16..077332fe7b8 100644 --- a/compiler/p/codegen/GenerateInstructions.hpp +++ b/compiler/p/codegen/GenerateInstructions.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/GenerateOMRInstructions.hpp" diff --git a/compiler/p/codegen/GenerateOMRInstructions.hpp b/compiler/p/codegen/GenerateOMRInstructions.hpp index 8e0f6bf1cf8..528c4e3b54c 100644 --- a/compiler/p/codegen/GenerateOMRInstructions.hpp +++ b/compiler/p/codegen/GenerateOMRInstructions.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/p/codegen/InstOpCode.hpp b/compiler/p/codegen/InstOpCode.hpp index fd9b7846144..c286d217f76 100644 --- a/compiler/p/codegen/InstOpCode.hpp +++ b/compiler/p/codegen/InstOpCode.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_POWER_INSTOPCODE_INCL diff --git a/compiler/p/codegen/Instruction.hpp b/compiler/p/codegen/Instruction.hpp index c3f801312d3..7067e09f219 100644 --- a/compiler/p/codegen/Instruction.hpp +++ b/compiler/p/codegen/Instruction.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_INSTRUCTION_INCL diff --git a/compiler/p/codegen/Linkage.hpp b/compiler/p/codegen/Linkage.hpp index a4b432581e4..312826c6296 100644 --- a/compiler/p/codegen/Linkage.hpp +++ b/compiler/p/codegen/Linkage.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_LINKAGE_INCL diff --git a/compiler/p/codegen/LoadStoreHandler.hpp b/compiler/p/codegen/LoadStoreHandler.hpp index 703be50536b..468d1f61bc8 100644 --- a/compiler/p/codegen/LoadStoreHandler.hpp +++ b/compiler/p/codegen/LoadStoreHandler.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_LOADSTOREHANDLER_INCL diff --git a/compiler/p/codegen/MemoryReference.hpp b/compiler/p/codegen/MemoryReference.hpp index 8487175f60f..c44163e4bf3 100644 --- a/compiler/p/codegen/MemoryReference.hpp +++ b/compiler/p/codegen/MemoryReference.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_MEMORYREFERENCE_INCL diff --git a/compiler/p/codegen/OMRAheadOfTimeCompile.hpp b/compiler/p/codegen/OMRAheadOfTimeCompile.hpp index 019a5a07d8c..b5862a6bb95 100644 --- a/compiler/p/codegen/OMRAheadOfTimeCompile.hpp +++ b/compiler/p/codegen/OMRAheadOfTimeCompile.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_POWER_AHEADOFTIMECOMPILE_INCL diff --git a/compiler/p/codegen/OMRCodeGenerator.cpp b/compiler/p/codegen/OMRCodeGenerator.cpp index 7ec7b2167f2..1c232945158 100644 --- a/compiler/p/codegen/OMRCodeGenerator.cpp +++ b/compiler/p/codegen/OMRCodeGenerator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/p/codegen/OMRCodeGenerator.hpp b/compiler/p/codegen/OMRCodeGenerator.hpp index 4f69e7eca05..1faf5738b22 100644 --- a/compiler/p/codegen/OMRCodeGenerator.hpp +++ b/compiler/p/codegen/OMRCodeGenerator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_POWER_CODEGENERATOR_INCL diff --git a/compiler/p/codegen/OMRConstantDataSnippet.cpp b/compiler/p/codegen/OMRConstantDataSnippet.cpp index 1c1d46de61c..7863ab9f47a 100644 --- a/compiler/p/codegen/OMRConstantDataSnippet.cpp +++ b/compiler/p/codegen/OMRConstantDataSnippet.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/ConstantDataSnippet.hpp" diff --git a/compiler/p/codegen/OMRConstantDataSnippet.hpp b/compiler/p/codegen/OMRConstantDataSnippet.hpp index af6c75f57a5..d12e700cc86 100644 --- a/compiler/p/codegen/OMRConstantDataSnippet.hpp +++ b/compiler/p/codegen/OMRConstantDataSnippet.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_PPCCONSTANTDATASNIPPET_INCL diff --git a/compiler/p/codegen/OMRInstOpCode.cpp b/compiler/p/codegen/OMRInstOpCode.cpp index 2014a76a282..7549582fd99 100644 --- a/compiler/p/codegen/OMRInstOpCode.cpp +++ b/compiler/p/codegen/OMRInstOpCode.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/OMRInstOpCode.hpp" diff --git a/compiler/p/codegen/OMRInstOpCode.enum b/compiler/p/codegen/OMRInstOpCode.enum index 8c0f1dfbe70..46204a7c408 100644 --- a/compiler/p/codegen/OMRInstOpCode.enum +++ b/compiler/p/codegen/OMRInstOpCode.enum @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/p/codegen/OMRInstOpCode.hpp b/compiler/p/codegen/OMRInstOpCode.hpp index 9c06e2e7902..a1b55221f4e 100644 --- a/compiler/p/codegen/OMRInstOpCode.hpp +++ b/compiler/p/codegen/OMRInstOpCode.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_POWER_INSTOPCODE_INCL diff --git a/compiler/p/codegen/OMRInstOpCodeProperties.hpp b/compiler/p/codegen/OMRInstOpCodeProperties.hpp index 8dd9c6d987a..0feb3e7c034 100644 --- a/compiler/p/codegen/OMRInstOpCodeProperties.hpp +++ b/compiler/p/codegen/OMRInstOpCodeProperties.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/p/codegen/OMRInstruction.cpp b/compiler/p/codegen/OMRInstruction.cpp index de13ce8d6a3..be9fe5cb089 100644 --- a/compiler/p/codegen/OMRInstruction.cpp +++ b/compiler/p/codegen/OMRInstruction.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/p/codegen/OMRInstruction.hpp b/compiler/p/codegen/OMRInstruction.hpp index ece8f264b21..cc8cb25882a 100644 --- a/compiler/p/codegen/OMRInstruction.hpp +++ b/compiler/p/codegen/OMRInstruction.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_POWER_INSTRUCTION_INCL diff --git a/compiler/p/codegen/OMRInstructionDelegate.cpp b/compiler/p/codegen/OMRInstructionDelegate.cpp index b6194e1f13b..40178f00cbf 100644 --- a/compiler/p/codegen/OMRInstructionDelegate.cpp +++ b/compiler/p/codegen/OMRInstructionDelegate.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/InstructionDelegate.hpp" diff --git a/compiler/p/codegen/OMRInstructionDelegate.hpp b/compiler/p/codegen/OMRInstructionDelegate.hpp index d706b550fdf..e84f03bd19c 100644 --- a/compiler/p/codegen/OMRInstructionDelegate.hpp +++ b/compiler/p/codegen/OMRInstructionDelegate.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_POWER_INSTRUCTIONDELEGATE_INCL diff --git a/compiler/p/codegen/OMRInstructionKindEnum.hpp b/compiler/p/codegen/OMRInstructionKindEnum.hpp index a7da2f2fd17..6bd7358c763 100644 --- a/compiler/p/codegen/OMRInstructionKindEnum.hpp +++ b/compiler/p/codegen/OMRInstructionKindEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/p/codegen/OMRLinkage.cpp b/compiler/p/codegen/OMRLinkage.cpp index 6ae9a8f59ff..79309feb55c 100644 --- a/compiler/p/codegen/OMRLinkage.cpp +++ b/compiler/p/codegen/OMRLinkage.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/Linkage.hpp" diff --git a/compiler/p/codegen/OMRLinkage.hpp b/compiler/p/codegen/OMRLinkage.hpp index dd10e4f76f0..19dc3fb039b 100644 --- a/compiler/p/codegen/OMRLinkage.hpp +++ b/compiler/p/codegen/OMRLinkage.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_POWER_LINKAGE_INCL diff --git a/compiler/p/codegen/OMRLinkage_inlines.hpp b/compiler/p/codegen/OMRLinkage_inlines.hpp index 90a45efc712..243fd8e4d63 100644 --- a/compiler/p/codegen/OMRLinkage_inlines.hpp +++ b/compiler/p/codegen/OMRLinkage_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_POWER_LINKAGE_INLINES_INCL diff --git a/compiler/p/codegen/OMRLoadStoreHandler.cpp b/compiler/p/codegen/OMRLoadStoreHandler.cpp index ed236dc11ed..31f780b0c9f 100644 --- a/compiler/p/codegen/OMRLoadStoreHandler.cpp +++ b/compiler/p/codegen/OMRLoadStoreHandler.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/LoadStoreHandler.hpp" diff --git a/compiler/p/codegen/OMRLoadStoreHandler.hpp b/compiler/p/codegen/OMRLoadStoreHandler.hpp index f0fdfd806cc..80c60dfbdfd 100644 --- a/compiler/p/codegen/OMRLoadStoreHandler.hpp +++ b/compiler/p/codegen/OMRLoadStoreHandler.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_POWER_LOADSTOREHANDLER_INCL diff --git a/compiler/p/codegen/OMRMachine.cpp b/compiler/p/codegen/OMRMachine.cpp index 880e6827dac..d4ca18ce56a 100644 --- a/compiler/p/codegen/OMRMachine.cpp +++ b/compiler/p/codegen/OMRMachine.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "p/codegen/OMRMachine.hpp" diff --git a/compiler/p/codegen/OMRMachine.hpp b/compiler/p/codegen/OMRMachine.hpp index fbf9faa01f3..e5203123bf5 100644 --- a/compiler/p/codegen/OMRMachine.hpp +++ b/compiler/p/codegen/OMRMachine.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_POWER_MACHINE_INCL diff --git a/compiler/p/codegen/OMRMemoryReference.cpp b/compiler/p/codegen/OMRMemoryReference.cpp index 80f501b8e18..01ada6d410d 100644 --- a/compiler/p/codegen/OMRMemoryReference.cpp +++ b/compiler/p/codegen/OMRMemoryReference.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/p/codegen/OMRMemoryReference.hpp b/compiler/p/codegen/OMRMemoryReference.hpp index 83b3703098a..accf13a0634 100644 --- a/compiler/p/codegen/OMRMemoryReference.hpp +++ b/compiler/p/codegen/OMRMemoryReference.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Power_MEMORY_REFERENCE_INCL diff --git a/compiler/p/codegen/OMRPeephole.cpp b/compiler/p/codegen/OMRPeephole.cpp index 43c5b502b10..ca1ea891916 100644 --- a/compiler/p/codegen/OMRPeephole.cpp +++ b/compiler/p/codegen/OMRPeephole.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/Peephole.hpp" diff --git a/compiler/p/codegen/OMRPeephole.hpp b/compiler/p/codegen/OMRPeephole.hpp index daecf7c88bb..005cf6be6c7 100644 --- a/compiler/p/codegen/OMRPeephole.hpp +++ b/compiler/p/codegen/OMRPeephole.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Power_PEEPHOLE_INCL diff --git a/compiler/p/codegen/OMRRealRegister.cpp b/compiler/p/codegen/OMRRealRegister.cpp index 84b6264bb58..b0d07a8e00a 100644 --- a/compiler/p/codegen/OMRRealRegister.cpp +++ b/compiler/p/codegen/OMRRealRegister.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/p/codegen/OMRRealRegister.hpp b/compiler/p/codegen/OMRRealRegister.hpp index 70f4fd09790..db5573d485a 100644 --- a/compiler/p/codegen/OMRRealRegister.hpp +++ b/compiler/p/codegen/OMRRealRegister.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Power_REAL_REGISTER_INCL diff --git a/compiler/p/codegen/OMRRegister.hpp b/compiler/p/codegen/OMRRegister.hpp index b2a726d00be..2cf6c97bebd 100644 --- a/compiler/p/codegen/OMRRegister.hpp +++ b/compiler/p/codegen/OMRRegister.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_POWER_REGISTER_INCL diff --git a/compiler/p/codegen/OMRRegisterDependency.cpp b/compiler/p/codegen/OMRRegisterDependency.cpp index 078bef1ace6..e1765e2ef71 100644 --- a/compiler/p/codegen/OMRRegisterDependency.cpp +++ b/compiler/p/codegen/OMRRegisterDependency.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/p/codegen/OMRRegisterDependency.hpp b/compiler/p/codegen/OMRRegisterDependency.hpp index 438bfcb6c00..b77f19df9c5 100644 --- a/compiler/p/codegen/OMRRegisterDependency.hpp +++ b/compiler/p/codegen/OMRRegisterDependency.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Power_REGISTER_DEPENDENCY_INCL diff --git a/compiler/p/codegen/OMRRegisterDependencyStruct.hpp b/compiler/p/codegen/OMRRegisterDependencyStruct.hpp index deeddb9714b..028898bc3f5 100644 --- a/compiler/p/codegen/OMRRegisterDependencyStruct.hpp +++ b/compiler/p/codegen/OMRRegisterDependencyStruct.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Power_REGISTER_DEPENDENCY_STRUCT_INCL diff --git a/compiler/p/codegen/OMRSnippet.cpp b/compiler/p/codegen/OMRSnippet.cpp index a6169d706fa..9cf3c956abc 100644 --- a/compiler/p/codegen/OMRSnippet.cpp +++ b/compiler/p/codegen/OMRSnippet.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/Snippet.hpp" diff --git a/compiler/p/codegen/OMRSnippet.hpp b/compiler/p/codegen/OMRSnippet.hpp index cdf71fa9dfb..5925573d256 100644 --- a/compiler/p/codegen/OMRSnippet.hpp +++ b/compiler/p/codegen/OMRSnippet.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Power_SNIPPET_INCL diff --git a/compiler/p/codegen/OMRTreeEvaluator.cpp b/compiler/p/codegen/OMRTreeEvaluator.cpp index e4bd3909660..4ef88281845 100644 --- a/compiler/p/codegen/OMRTreeEvaluator.cpp +++ b/compiler/p/codegen/OMRTreeEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/p/codegen/OMRTreeEvaluator.hpp b/compiler/p/codegen/OMRTreeEvaluator.hpp index d6fa5664d7e..f415a1d3e85 100644 --- a/compiler/p/codegen/OMRTreeEvaluator.hpp +++ b/compiler/p/codegen/OMRTreeEvaluator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Power_TREE_EVALUATOR_INCL diff --git a/compiler/p/codegen/PPCAOTRelocation.cpp b/compiler/p/codegen/PPCAOTRelocation.cpp index 4633a6e7ba1..59eefbbffa5 100644 --- a/compiler/p/codegen/PPCAOTRelocation.cpp +++ b/compiler/p/codegen/PPCAOTRelocation.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "p/codegen/PPCAOTRelocation.hpp" diff --git a/compiler/p/codegen/PPCAOTRelocation.hpp b/compiler/p/codegen/PPCAOTRelocation.hpp index acd0b1af627..94b73d95257 100644 --- a/compiler/p/codegen/PPCAOTRelocation.hpp +++ b/compiler/p/codegen/PPCAOTRelocation.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PPCAOTRELOCATION_INCL diff --git a/compiler/p/codegen/PPCBinaryEncoding.cpp b/compiler/p/codegen/PPCBinaryEncoding.cpp index 24e190ee06e..add5f788933 100644 --- a/compiler/p/codegen/PPCBinaryEncoding.cpp +++ b/compiler/p/codegen/PPCBinaryEncoding.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/p/codegen/PPCCRBackingStore.hpp b/compiler/p/codegen/PPCCRBackingStore.hpp index 11a0eadf3ab..65dd22b0570 100644 --- a/compiler/p/codegen/PPCCRBackingStore.hpp +++ b/compiler/p/codegen/PPCCRBackingStore.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PPCCRBACKINGSTORE_INCL diff --git a/compiler/p/codegen/PPCDebug.cpp b/compiler/p/codegen/PPCDebug.cpp index 1bfca2ed1d7..5bf183d26f5 100644 --- a/compiler/p/codegen/PPCDebug.cpp +++ b/compiler/p/codegen/PPCDebug.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_TARGET_POWER diff --git a/compiler/p/codegen/PPCEvaluator.hpp b/compiler/p/codegen/PPCEvaluator.hpp index db82ffde46c..f14cd5d8057 100644 --- a/compiler/p/codegen/PPCEvaluator.hpp +++ b/compiler/p/codegen/PPCEvaluator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PPC_TREE_EVALUATOR_INCL diff --git a/compiler/p/codegen/PPCHelperCallSnippet.cpp b/compiler/p/codegen/PPCHelperCallSnippet.cpp index 206740e3b53..df9af714567 100644 --- a/compiler/p/codegen/PPCHelperCallSnippet.cpp +++ b/compiler/p/codegen/PPCHelperCallSnippet.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "p/codegen/PPCHelperCallSnippet.hpp" diff --git a/compiler/p/codegen/PPCHelperCallSnippet.hpp b/compiler/p/codegen/PPCHelperCallSnippet.hpp index 251cc92e91f..2188deb9aad 100644 --- a/compiler/p/codegen/PPCHelperCallSnippet.hpp +++ b/compiler/p/codegen/PPCHelperCallSnippet.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PPCHELPERCALLSNIPPET_INCL diff --git a/compiler/p/codegen/PPCInstruction.cpp b/compiler/p/codegen/PPCInstruction.cpp index 0bd358d06ab..efd973e31ae 100644 --- a/compiler/p/codegen/PPCInstruction.cpp +++ b/compiler/p/codegen/PPCInstruction.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "p/codegen/PPCInstruction.hpp" diff --git a/compiler/p/codegen/PPCInstruction.hpp b/compiler/p/codegen/PPCInstruction.hpp index d93f91c8d5b..0e5f1235f50 100644 --- a/compiler/p/codegen/PPCInstruction.hpp +++ b/compiler/p/codegen/PPCInstruction.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PPCINSTRUCTION_INCL diff --git a/compiler/p/codegen/PPCOpsDefines.hpp b/compiler/p/codegen/PPCOpsDefines.hpp index e632839b7ab..322c6ba0fd0 100644 --- a/compiler/p/codegen/PPCOpsDefines.hpp +++ b/compiler/p/codegen/PPCOpsDefines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_PPCOPSDEFINES_INCL diff --git a/compiler/p/codegen/PPCOutOfLineCodeSection.cpp b/compiler/p/codegen/PPCOutOfLineCodeSection.cpp index 69548f14c60..4f47d3a6da0 100644 --- a/compiler/p/codegen/PPCOutOfLineCodeSection.cpp +++ b/compiler/p/codegen/PPCOutOfLineCodeSection.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "p/codegen/PPCOutOfLineCodeSection.hpp" diff --git a/compiler/p/codegen/PPCOutOfLineCodeSection.hpp b/compiler/p/codegen/PPCOutOfLineCodeSection.hpp index 0123b27a38c..32ec80d4497 100644 --- a/compiler/p/codegen/PPCOutOfLineCodeSection.hpp +++ b/compiler/p/codegen/PPCOutOfLineCodeSection.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PPCOUTOFLINECODESECTION_INCL diff --git a/compiler/p/codegen/PPCSystemLinkage.cpp b/compiler/p/codegen/PPCSystemLinkage.cpp index 9784f68ac17..185a2832194 100644 --- a/compiler/p/codegen/PPCSystemLinkage.cpp +++ b/compiler/p/codegen/PPCSystemLinkage.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "p/codegen/PPCSystemLinkage.hpp" diff --git a/compiler/p/codegen/PPCSystemLinkage.hpp b/compiler/p/codegen/PPCSystemLinkage.hpp index a3b8e84f6f1..c199c507b37 100644 --- a/compiler/p/codegen/PPCSystemLinkage.hpp +++ b/compiler/p/codegen/PPCSystemLinkage.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_POWER_SYSTEMLINKAGE_INCL diff --git a/compiler/p/codegen/PPCTableOfConstants.cpp b/compiler/p/codegen/PPCTableOfConstants.cpp index f296193b8d5..ed78842b4ef 100644 --- a/compiler/p/codegen/PPCTableOfConstants.cpp +++ b/compiler/p/codegen/PPCTableOfConstants.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "p/codegen/PPCTableOfConstants.hpp" diff --git a/compiler/p/codegen/PPCTableOfConstants.hpp b/compiler/p/codegen/PPCTableOfConstants.hpp index 404875dc68c..0b59bf4302b 100644 --- a/compiler/p/codegen/PPCTableOfConstants.hpp +++ b/compiler/p/codegen/PPCTableOfConstants.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PPCTABLEOFCONSTANTS_INCL diff --git a/compiler/p/codegen/PseudoRegisterEnum.hpp b/compiler/p/codegen/PseudoRegisterEnum.hpp index 649f0023b8d..1b6a3193fe7 100644 --- a/compiler/p/codegen/PseudoRegisterEnum.hpp +++ b/compiler/p/codegen/PseudoRegisterEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/p/codegen/RealRegisterEnum.hpp b/compiler/p/codegen/RealRegisterEnum.hpp index 9907cd28bbc..4414cb40c25 100644 --- a/compiler/p/codegen/RealRegisterEnum.hpp +++ b/compiler/p/codegen/RealRegisterEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/p/codegen/RealRegisterMaskEnum.hpp b/compiler/p/codegen/RealRegisterMaskEnum.hpp index a17d92028fd..61c83296d5f 100644 --- a/compiler/p/codegen/RealRegisterMaskEnum.hpp +++ b/compiler/p/codegen/RealRegisterMaskEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/p/codegen/RegisterDependency.hpp b/compiler/p/codegen/RegisterDependency.hpp index 685d87c2a18..a538e83baf8 100644 --- a/compiler/p/codegen/RegisterDependency.hpp +++ b/compiler/p/codegen/RegisterDependency.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_REGISTER_DEPENDENCY_INCL diff --git a/compiler/p/codegen/TreeEvaluatorTable.hpp b/compiler/p/codegen/TreeEvaluatorTable.hpp index 3e5408fd244..269c0e38474 100644 --- a/compiler/p/codegen/TreeEvaluatorTable.hpp +++ b/compiler/p/codegen/TreeEvaluatorTable.hpp @@ -16,6 +16,6 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "p/codegen/OMRTreeEvaluatorTable.hpp" diff --git a/compiler/p/codegen/TreeEvaluatorVMX.cpp b/compiler/p/codegen/TreeEvaluatorVMX.cpp index 5fff86dbea7..3d16fdac2d9 100644 --- a/compiler/p/codegen/TreeEvaluatorVMX.cpp +++ b/compiler/p/codegen/TreeEvaluatorVMX.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/p/codegen/UnaryEvaluator.cpp b/compiler/p/codegen/UnaryEvaluator.cpp index a5723fa73b1..5fd62dc3376 100644 --- a/compiler/p/codegen/UnaryEvaluator.cpp +++ b/compiler/p/codegen/UnaryEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/p/env/OMRCPU.cpp b/compiler/p/env/OMRCPU.cpp index 7b514672c1b..4efba674974 100644 --- a/compiler/p/env/OMRCPU.cpp +++ b/compiler/p/env/OMRCPU.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/CPU.hpp" diff --git a/compiler/p/env/OMRCPU.hpp b/compiler/p/env/OMRCPU.hpp index 6fb262e07e5..dc7c514d66e 100644 --- a/compiler/p/env/OMRCPU.hpp +++ b/compiler/p/env/OMRCPU.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_POWER_CPU_INCL diff --git a/compiler/p/env/OMRDebugEnv.cpp b/compiler/p/env/OMRDebugEnv.cpp index 46b6f6cef0f..eaf7bc919ae 100644 --- a/compiler/p/env/OMRDebugEnv.cpp +++ b/compiler/p/env/OMRDebugEnv.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/DebugEnv.hpp" diff --git a/compiler/p/env/OMRDebugEnv.hpp b/compiler/p/env/OMRDebugEnv.hpp index 448163748c7..bfbc1dacbc3 100644 --- a/compiler/p/env/OMRDebugEnv.hpp +++ b/compiler/p/env/OMRDebugEnv.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_POWER_DEBUG_ENV_INCL diff --git a/compiler/p/env/PPCProcessorEnum.hpp b/compiler/p/env/PPCProcessorEnum.hpp index be50e9c5db1..18a57469b43 100644 --- a/compiler/p/env/PPCProcessorEnum.hpp +++ b/compiler/p/env/PPCProcessorEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/p/runtime/CodeCacheConfig.hpp b/compiler/p/runtime/CodeCacheConfig.hpp index 13d0c63e35e..56f8458af1a 100644 --- a/compiler/p/runtime/CodeCacheConfig.hpp +++ b/compiler/p/runtime/CodeCacheConfig.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_CODECACHECONFIG_INCL diff --git a/compiler/p/runtime/OMRCodeCacheConfig.cpp b/compiler/p/runtime/OMRCodeCacheConfig.cpp index 359bef5bd18..84e94987c70 100644 --- a/compiler/p/runtime/OMRCodeCacheConfig.cpp +++ b/compiler/p/runtime/OMRCodeCacheConfig.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "p/runtime/CodeCacheConfig.hpp" diff --git a/compiler/p/runtime/OMRCodeCacheConfig.hpp b/compiler/p/runtime/OMRCodeCacheConfig.hpp index bc999a3a9df..08bdd16dc56 100644 --- a/compiler/p/runtime/OMRCodeCacheConfig.hpp +++ b/compiler/p/runtime/OMRCodeCacheConfig.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_POWER_CODECACHECONFIG_INCL diff --git a/compiler/p/runtime/PPCArrayCopy.inc b/compiler/p/runtime/PPCArrayCopy.inc index 52604702bd4..ef8fe590330 100644 --- a/compiler/p/runtime/PPCArrayCopy.inc +++ b/compiler/p/runtime/PPCArrayCopy.inc @@ -16,7 +16,7 @@ !! [1] https://www.gnu.org/software/classpath/license.html !! [2] https://openjdk.org/legal/assembly-exception.html !! -!! 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 +!! SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! arrayCopy*, wordArrayCopy*, halfWordArrayCopy*, forwardArrayCopy*, diff --git a/compiler/p/runtime/PPCAsmUtil.inc b/compiler/p/runtime/PPCAsmUtil.inc index 5fb9c22b0cc..3fb7c526f35 100644 --- a/compiler/p/runtime/PPCAsmUtil.inc +++ b/compiler/p/runtime/PPCAsmUtil.inc @@ -16,7 +16,7 @@ !! [1] https://www.gnu.org/software/classpath/license.html !! [2] https://openjdk.org/legal/assembly-exception.html !! -!! 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 +!! SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! #ifdef AIXPPC diff --git a/compiler/p/runtime/PPCCodeSync.inc b/compiler/p/runtime/PPCCodeSync.inc index b96093b4476..a7b4d650d1a 100644 --- a/compiler/p/runtime/PPCCodeSync.inc +++ b/compiler/p/runtime/PPCCodeSync.inc @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/p/runtime/VirtualGuardRuntime.spp b/compiler/p/runtime/VirtualGuardRuntime.spp index 0fab8d91282..e8aaa59e0de 100644 --- a/compiler/p/runtime/VirtualGuardRuntime.spp +++ b/compiler/p/runtime/VirtualGuardRuntime.spp @@ -16,7 +16,7 @@ !! [1] https://www.gnu.org/software/classpath/license.html !! [2] https://openjdk.org/legal/assembly-exception.html !! -!! 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 +!! SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! #include "p/runtime/ppcasmdefines.inc" diff --git a/compiler/p/runtime/ppcasmdefines.inc b/compiler/p/runtime/ppcasmdefines.inc index 56738ea7971..4af6e515c03 100644 --- a/compiler/p/runtime/ppcasmdefines.inc +++ b/compiler/p/runtime/ppcasmdefines.inc @@ -16,7 +16,7 @@ !! [1] https://www.gnu.org/software/classpath/license.html !! [2] https://openjdk.org/legal/assembly-exception.html !! -!! 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 +!! SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! #ifdef TR_TARGET_64BIT diff --git a/compiler/ras/CFGChecker.cpp b/compiler/ras/CFGChecker.cpp index b1b736965f6..c03dcc610d0 100644 --- a/compiler/ras/CFGChecker.cpp +++ b/compiler/ras/CFGChecker.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ras/CFGChecker.hpp" diff --git a/compiler/ras/CFGChecker.hpp b/compiler/ras/CFGChecker.hpp index 3a76c7ad5f1..4c5917f8367 100644 --- a/compiler/ras/CFGChecker.hpp +++ b/compiler/ras/CFGChecker.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CFGCHECK_INCL diff --git a/compiler/ras/CMakeLists.txt b/compiler/ras/CMakeLists.txt index 1467820ca1b..234b6da9f42 100644 --- a/compiler/ras/CMakeLists.txt +++ b/compiler/ras/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### compiler_library(ras diff --git a/compiler/ras/CallStack.cpp b/compiler/ras/CallStack.cpp index b3412967bd7..e4f9259c98b 100644 --- a/compiler/ras/CallStack.cpp +++ b/compiler/ras/CallStack.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/ras/CallStack.hpp b/compiler/ras/CallStack.hpp index 6b531752004..01df3cb2867 100644 --- a/compiler/ras/CallStack.hpp +++ b/compiler/ras/CallStack.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CALLSTACK_INCL diff --git a/compiler/ras/CallStackIterator.hpp b/compiler/ras/CallStackIterator.hpp index 580957b9421..e75ab503bcc 100644 --- a/compiler/ras/CallStackIterator.hpp +++ b/compiler/ras/CallStackIterator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CALL_STACK_ITERATOR_INCL diff --git a/compiler/ras/Debug.cpp b/compiler/ras/Debug.cpp index cff06236478..11b21b7649e 100644 --- a/compiler/ras/Debug.cpp +++ b/compiler/ras/Debug.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ras/Debug.hpp" diff --git a/compiler/ras/Debug.hpp b/compiler/ras/Debug.hpp index 0c4f2217c30..b5c1a7c7cc9 100644 --- a/compiler/ras/Debug.hpp +++ b/compiler/ras/Debug.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* __ ___ __ __ ___ __ ___ ___ __ diff --git a/compiler/ras/DebugCounter.cpp b/compiler/ras/DebugCounter.cpp index 975c2b7e73c..976001cd90d 100644 --- a/compiler/ras/DebugCounter.cpp +++ b/compiler/ras/DebugCounter.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ras/DebugCounter.hpp" diff --git a/compiler/ras/DebugCounter.hpp b/compiler/ras/DebugCounter.hpp index d6c8d778025..d450a61b2ac 100644 --- a/compiler/ras/DebugCounter.hpp +++ b/compiler/ras/DebugCounter.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef DEBUGCOUNTER_INCL diff --git a/compiler/ras/DebugCounter.md b/compiler/ras/DebugCounter.md index 7153047a3c3..c2d8717ce85 100644 --- a/compiler/ras/DebugCounter.md +++ b/compiler/ras/DebugCounter.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Debug Counter diff --git a/compiler/ras/Delimiter.hpp b/compiler/ras/Delimiter.hpp index d409bc3de5c..f983b4fc4c6 100644 --- a/compiler/ras/Delimiter.hpp +++ b/compiler/ras/Delimiter.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_DELIMITER_INCL diff --git a/compiler/ras/ILValidationRules.cpp b/compiler/ras/ILValidationRules.cpp index 9133ffc6635..b61664bd51a 100644 --- a/compiler/ras/ILValidationRules.cpp +++ b/compiler/ras/ILValidationRules.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ras/ILValidationRules.hpp" diff --git a/compiler/ras/ILValidationRules.hpp b/compiler/ras/ILValidationRules.hpp index e2ee342a46d..4b9e4688a45 100644 --- a/compiler/ras/ILValidationRules.hpp +++ b/compiler/ras/ILValidationRules.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ILVALIDATIONRULES_HPP diff --git a/compiler/ras/ILValidationStrategies.hpp b/compiler/ras/ILValidationStrategies.hpp index 7a029f0e705..d3769f1e7e1 100644 --- a/compiler/ras/ILValidationStrategies.hpp +++ b/compiler/ras/ILValidationStrategies.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ILVALIDATIONSTRATEGIES_HPP diff --git a/compiler/ras/ILValidationUtils.cpp b/compiler/ras/ILValidationUtils.cpp index 9f5c3ea2ddf..fe9aff63203 100644 --- a/compiler/ras/ILValidationUtils.cpp +++ b/compiler/ras/ILValidationUtils.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ras/ILValidationUtils.hpp" diff --git a/compiler/ras/ILValidationUtils.hpp b/compiler/ras/ILValidationUtils.hpp index db82d2f6c26..1e0732a2916 100644 --- a/compiler/ras/ILValidationUtils.hpp +++ b/compiler/ras/ILValidationUtils.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ILVALIDATION_UTILS_HPP diff --git a/compiler/ras/ILValidator.cpp b/compiler/ras/ILValidator.cpp index d93573faf86..8a75735c9e6 100644 --- a/compiler/ras/ILValidator.cpp +++ b/compiler/ras/ILValidator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/ras/ILValidator.hpp b/compiler/ras/ILValidator.hpp index 890ff14becd..b4a733b66b3 100644 --- a/compiler/ras/ILValidator.hpp +++ b/compiler/ras/ILValidator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ILVALIDATOR_HPP diff --git a/compiler/ras/IgnoreLocale.cpp b/compiler/ras/IgnoreLocale.cpp index 0d188cded9e..9efa7726537 100644 --- a/compiler/ras/IgnoreLocale.cpp +++ b/compiler/ras/IgnoreLocale.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ras/IgnoreLocale.hpp" diff --git a/compiler/ras/IgnoreLocale.hpp b/compiler/ras/IgnoreLocale.hpp index bc95c83bd7c..0780f8f17b2 100644 --- a/compiler/ras/IgnoreLocale.hpp +++ b/compiler/ras/IgnoreLocale.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/ras/IlVerifier.hpp b/compiler/ras/IlVerifier.hpp index 1095792907a..423a77b1d2d 100644 --- a/compiler/ras/IlVerifier.hpp +++ b/compiler/ras/IlVerifier.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef IlVerifier_hpp diff --git a/compiler/ras/IlVerifierHelpers.hpp b/compiler/ras/IlVerifierHelpers.hpp index 8ac9fd1735a..3cb424e2012 100644 --- a/compiler/ras/IlVerifierHelpers.hpp +++ b/compiler/ras/IlVerifierHelpers.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/compiler/ras/LimitFile.cpp b/compiler/ras/LimitFile.cpp index b3072f7a2cb..453eb3f8d96 100644 --- a/compiler/ras/LimitFile.cpp +++ b/compiler/ras/LimitFile.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/ras/LogTracer.cpp b/compiler/ras/LogTracer.cpp index bb68d160fbd..d755e00ad25 100644 --- a/compiler/ras/LogTracer.cpp +++ b/compiler/ras/LogTracer.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ras/LogTracer.hpp" diff --git a/compiler/ras/LogTracer.hpp b/compiler/ras/LogTracer.hpp index 6cf8112bd96..81d1507ba18 100644 --- a/compiler/ras/LogTracer.hpp +++ b/compiler/ras/LogTracer.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TRLOGTRACER diff --git a/compiler/ras/OptionsDebug.cpp b/compiler/ras/OptionsDebug.cpp index 613fc5bae76..f94f79c81fd 100644 --- a/compiler/ras/OptionsDebug.cpp +++ b/compiler/ras/OptionsDebug.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/ras/Tree.cpp b/compiler/ras/Tree.cpp index 17c9e288f2e..86b3b6bf13e 100644 --- a/compiler/ras/Tree.cpp +++ b/compiler/ras/Tree.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/riscv/CMakeLists.txt b/compiler/riscv/CMakeLists.txt index 24fe7fe5521..5bae4d556f5 100644 --- a/compiler/riscv/CMakeLists.txt +++ b/compiler/riscv/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### compiler_library(riscv diff --git a/compiler/riscv/codegen/BinaryEvaluator.cpp b/compiler/riscv/codegen/BinaryEvaluator.cpp index c88185c126b..da8e4ac2674 100644 --- a/compiler/riscv/codegen/BinaryEvaluator.cpp +++ b/compiler/riscv/codegen/BinaryEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/riscv/codegen/ControlFlowEvaluator.cpp b/compiler/riscv/codegen/ControlFlowEvaluator.cpp index 3dffbfa0c92..ba9571841aa 100644 --- a/compiler/riscv/codegen/ControlFlowEvaluator.cpp +++ b/compiler/riscv/codegen/ControlFlowEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/RVInstruction.hpp" diff --git a/compiler/riscv/codegen/FPTreeEvaluator.cpp b/compiler/riscv/codegen/FPTreeEvaluator.cpp index 20ce6e9b781..7fcd5fdf070 100644 --- a/compiler/riscv/codegen/FPTreeEvaluator.cpp +++ b/compiler/riscv/codegen/FPTreeEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CodeGenerator.hpp" diff --git a/compiler/riscv/codegen/GenerateInstructions.cpp b/compiler/riscv/codegen/GenerateInstructions.cpp index fdc1a1d6fab..e0727fdd875 100644 --- a/compiler/riscv/codegen/GenerateInstructions.cpp +++ b/compiler/riscv/codegen/GenerateInstructions.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/riscv/codegen/GenerateInstructions.hpp b/compiler/riscv/codegen/GenerateInstructions.hpp index 0ea617cac81..d80d84d8c8f 100644 --- a/compiler/riscv/codegen/GenerateInstructions.hpp +++ b/compiler/riscv/codegen/GenerateInstructions.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef GENERATE_INSTRUCTIONS_INCL diff --git a/compiler/riscv/codegen/InstOpCode.hpp b/compiler/riscv/codegen/InstOpCode.hpp index 6275be46bac..99e48163357 100644 --- a/compiler/riscv/codegen/InstOpCode.hpp +++ b/compiler/riscv/codegen/InstOpCode.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_RV_INSTOPCODE_INCL diff --git a/compiler/riscv/codegen/Instruction.hpp b/compiler/riscv/codegen/Instruction.hpp index 08e1e0237a4..13661560a22 100644 --- a/compiler/riscv/codegen/Instruction.hpp +++ b/compiler/riscv/codegen/Instruction.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_INSTRUCTION_INCL diff --git a/compiler/riscv/codegen/Linkage.hpp b/compiler/riscv/codegen/Linkage.hpp index 955886bf185..c82e19a7137 100644 --- a/compiler/riscv/codegen/Linkage.hpp +++ b/compiler/riscv/codegen/Linkage.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_LINKAGE_INCL diff --git a/compiler/riscv/codegen/MemoryReference.hpp b/compiler/riscv/codegen/MemoryReference.hpp index ad9050b148b..b04bb132baf 100644 --- a/compiler/riscv/codegen/MemoryReference.hpp +++ b/compiler/riscv/codegen/MemoryReference.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_MEMORYREFERENCE_INCL diff --git a/compiler/riscv/codegen/OMRCodeGenerator.cpp b/compiler/riscv/codegen/OMRCodeGenerator.cpp index 20e51c1359d..bbb278b897b 100644 --- a/compiler/riscv/codegen/OMRCodeGenerator.cpp +++ b/compiler/riscv/codegen/OMRCodeGenerator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/riscv/codegen/OMRCodeGenerator.hpp b/compiler/riscv/codegen/OMRCodeGenerator.hpp index 1c3b3e8388b..ba641ff9934 100644 --- a/compiler/riscv/codegen/OMRCodeGenerator.hpp +++ b/compiler/riscv/codegen/OMRCodeGenerator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_RV_CODEGENERATOR_INCL diff --git a/compiler/riscv/codegen/OMRInstOpCode.enum b/compiler/riscv/codegen/OMRInstOpCode.enum index 172c36d732e..226a97c6d89 100644 --- a/compiler/riscv/codegen/OMRInstOpCode.enum +++ b/compiler/riscv/codegen/OMRInstOpCode.enum @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/riscv/codegen/OMRInstOpCode.hpp b/compiler/riscv/codegen/OMRInstOpCode.hpp index 57f285fd3e2..c173f093020 100644 --- a/compiler/riscv/codegen/OMRInstOpCode.hpp +++ b/compiler/riscv/codegen/OMRInstOpCode.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_RV_INSTOPCODE_INCL diff --git a/compiler/riscv/codegen/OMRInstruction.cpp b/compiler/riscv/codegen/OMRInstruction.cpp index f0ecdd31d96..6cd3fba0368 100644 --- a/compiler/riscv/codegen/OMRInstruction.cpp +++ b/compiler/riscv/codegen/OMRInstruction.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/riscv/codegen/OMRInstruction.hpp b/compiler/riscv/codegen/OMRInstruction.hpp index 8abf22dafbc..07f574b5d1c 100644 --- a/compiler/riscv/codegen/OMRInstruction.hpp +++ b/compiler/riscv/codegen/OMRInstruction.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_RV_INSTRUCTION_INCL diff --git a/compiler/riscv/codegen/OMRInstructionDelegate.cpp b/compiler/riscv/codegen/OMRInstructionDelegate.cpp index a9356ce7231..56d50779597 100644 --- a/compiler/riscv/codegen/OMRInstructionDelegate.cpp +++ b/compiler/riscv/codegen/OMRInstructionDelegate.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/InstructionDelegate.hpp" diff --git a/compiler/riscv/codegen/OMRInstructionDelegate.hpp b/compiler/riscv/codegen/OMRInstructionDelegate.hpp index abf8cbc5b56..fef6fc0825a 100644 --- a/compiler/riscv/codegen/OMRInstructionDelegate.hpp +++ b/compiler/riscv/codegen/OMRInstructionDelegate.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_RV_INSTRUCTIONDELEGATE_INCL diff --git a/compiler/riscv/codegen/OMRInstructionKindEnum.hpp b/compiler/riscv/codegen/OMRInstructionKindEnum.hpp index 4a4821395cd..1ce5c1c96c1 100644 --- a/compiler/riscv/codegen/OMRInstructionKindEnum.hpp +++ b/compiler/riscv/codegen/OMRInstructionKindEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/riscv/codegen/OMRLinkage.cpp b/compiler/riscv/codegen/OMRLinkage.cpp index 35ba11e5bfc..58455fa9494 100644 --- a/compiler/riscv/codegen/OMRLinkage.cpp +++ b/compiler/riscv/codegen/OMRLinkage.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/riscv/codegen/OMRLinkage.hpp b/compiler/riscv/codegen/OMRLinkage.hpp index b1bbf037529..fb6097c5790 100644 --- a/compiler/riscv/codegen/OMRLinkage.hpp +++ b/compiler/riscv/codegen/OMRLinkage.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_RV_LINKAGE_INCL diff --git a/compiler/riscv/codegen/OMRMachine.cpp b/compiler/riscv/codegen/OMRMachine.cpp index e6057532408..aaf979bc34c 100644 --- a/compiler/riscv/codegen/OMRMachine.cpp +++ b/compiler/riscv/codegen/OMRMachine.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include // for NULL, etc diff --git a/compiler/riscv/codegen/OMRMachine.hpp b/compiler/riscv/codegen/OMRMachine.hpp index 03edef6faf2..880c672dc09 100644 --- a/compiler/riscv/codegen/OMRMachine.hpp +++ b/compiler/riscv/codegen/OMRMachine.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_RV_MACHINE_INCL diff --git a/compiler/riscv/codegen/OMRMemoryReference.cpp b/compiler/riscv/codegen/OMRMemoryReference.cpp index dc10b5ba01d..c0fd1039138 100644 --- a/compiler/riscv/codegen/OMRMemoryReference.cpp +++ b/compiler/riscv/codegen/OMRMemoryReference.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/MemoryReference.hpp" diff --git a/compiler/riscv/codegen/OMRMemoryReference.hpp b/compiler/riscv/codegen/OMRMemoryReference.hpp index 9c4258eadff..ea7dfa4af8e 100644 --- a/compiler/riscv/codegen/OMRMemoryReference.hpp +++ b/compiler/riscv/codegen/OMRMemoryReference.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_RV_MEMORY_REFERENCE_INCL diff --git a/compiler/riscv/codegen/OMRRealRegister.cpp b/compiler/riscv/codegen/OMRRealRegister.cpp index 977476d706c..590cf635619 100644 --- a/compiler/riscv/codegen/OMRRealRegister.cpp +++ b/compiler/riscv/codegen/OMRRealRegister.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/RealRegister.hpp" diff --git a/compiler/riscv/codegen/OMRRealRegister.hpp b/compiler/riscv/codegen/OMRRealRegister.hpp index bb41fe994c3..bc09688523c 100644 --- a/compiler/riscv/codegen/OMRRealRegister.hpp +++ b/compiler/riscv/codegen/OMRRealRegister.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_RV_REAL_REGISTER_INCL diff --git a/compiler/riscv/codegen/OMRRegister.hpp b/compiler/riscv/codegen/OMRRegister.hpp index 7d192825815..e33b4b93879 100644 --- a/compiler/riscv/codegen/OMRRegister.hpp +++ b/compiler/riscv/codegen/OMRRegister.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_RV_REGISTER_INCL diff --git a/compiler/riscv/codegen/OMRRegisterDependency.cpp b/compiler/riscv/codegen/OMRRegisterDependency.cpp index dd754dbdfe6..bca62a0b8d1 100644 --- a/compiler/riscv/codegen/OMRRegisterDependency.cpp +++ b/compiler/riscv/codegen/OMRRegisterDependency.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/riscv/codegen/OMRRegisterDependency.hpp b/compiler/riscv/codegen/OMRRegisterDependency.hpp index b57fc336488..c3ca5785bf9 100644 --- a/compiler/riscv/codegen/OMRRegisterDependency.hpp +++ b/compiler/riscv/codegen/OMRRegisterDependency.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_RV_REGISTER_DEPENDENCY_INCL diff --git a/compiler/riscv/codegen/OMRSnippet.cpp b/compiler/riscv/codegen/OMRSnippet.cpp index 627ccef6996..47caef8ccd0 100644 --- a/compiler/riscv/codegen/OMRSnippet.cpp +++ b/compiler/riscv/codegen/OMRSnippet.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/Snippet.hpp" diff --git a/compiler/riscv/codegen/OMRSnippet.hpp b/compiler/riscv/codegen/OMRSnippet.hpp index 3fa463f5e3e..a02419fbe17 100644 --- a/compiler/riscv/codegen/OMRSnippet.hpp +++ b/compiler/riscv/codegen/OMRSnippet.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_RV_SNIPPET_INCL diff --git a/compiler/riscv/codegen/OMRTreeEvaluator.cpp b/compiler/riscv/codegen/OMRTreeEvaluator.cpp index b1881f9a5cf..f39e9a30b5b 100644 --- a/compiler/riscv/codegen/OMRTreeEvaluator.cpp +++ b/compiler/riscv/codegen/OMRTreeEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/riscv/codegen/OMRTreeEvaluator.hpp b/compiler/riscv/codegen/OMRTreeEvaluator.hpp index 9d840f0e9d1..2c1eef9c533 100644 --- a/compiler/riscv/codegen/OMRTreeEvaluator.hpp +++ b/compiler/riscv/codegen/OMRTreeEvaluator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_RV_TREE_EVALUATOR_INCL #define OMR_RV_TREE_EVALUATOR_INCL diff --git a/compiler/riscv/codegen/OpBinary.cpp b/compiler/riscv/codegen/OpBinary.cpp index 0a0012eafb8..2e542f3c980 100644 --- a/compiler/riscv/codegen/OpBinary.cpp +++ b/compiler/riscv/codegen/OpBinary.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/InstOpCode.hpp" diff --git a/compiler/riscv/codegen/PseudoRegisterEnum.hpp b/compiler/riscv/codegen/PseudoRegisterEnum.hpp index fc16e77b5c6..144d28992de 100644 --- a/compiler/riscv/codegen/PseudoRegisterEnum.hpp +++ b/compiler/riscv/codegen/PseudoRegisterEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/riscv/codegen/RVDebug.cpp b/compiler/riscv/codegen/RVDebug.cpp index 57f1815a78f..0d3021d5fdc 100644 --- a/compiler/riscv/codegen/RVDebug.cpp +++ b/compiler/riscv/codegen/RVDebug.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/riscv/codegen/RVHelperCallSnippet.cpp b/compiler/riscv/codegen/RVHelperCallSnippet.cpp index 1736466d8ab..4fb6b98bb3f 100644 --- a/compiler/riscv/codegen/RVHelperCallSnippet.cpp +++ b/compiler/riscv/codegen/RVHelperCallSnippet.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/RVHelperCallSnippet.hpp" diff --git a/compiler/riscv/codegen/RVHelperCallSnippet.hpp b/compiler/riscv/codegen/RVHelperCallSnippet.hpp index 2404ba5af75..3bb89c8686c 100644 --- a/compiler/riscv/codegen/RVHelperCallSnippet.hpp +++ b/compiler/riscv/codegen/RVHelperCallSnippet.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef RVHELPERCALLSNIPPET_INCL diff --git a/compiler/riscv/codegen/RVInstruction.cpp b/compiler/riscv/codegen/RVInstruction.cpp index 5ee93cf4833..cd9f330c966 100644 --- a/compiler/riscv/codegen/RVInstruction.cpp +++ b/compiler/riscv/codegen/RVInstruction.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/RVInstruction.hpp" diff --git a/compiler/riscv/codegen/RVInstruction.hpp b/compiler/riscv/codegen/RVInstruction.hpp index 367fd32f4d6..e9dd54a9cb9 100644 --- a/compiler/riscv/codegen/RVInstruction.hpp +++ b/compiler/riscv/codegen/RVInstruction.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef RVINSTRUCTION_INCL diff --git a/compiler/riscv/codegen/RVInstructionUtils.hpp b/compiler/riscv/codegen/RVInstructionUtils.hpp index e6d2c20de44..d2b8bc2d2c3 100644 --- a/compiler/riscv/codegen/RVInstructionUtils.hpp +++ b/compiler/riscv/codegen/RVInstructionUtils.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef RVINSTRUCTIONUTILS_INCL diff --git a/compiler/riscv/codegen/RVOutOfLineCodeSection.cpp b/compiler/riscv/codegen/RVOutOfLineCodeSection.cpp index 973421d0e50..f09b7a10311 100644 --- a/compiler/riscv/codegen/RVOutOfLineCodeSection.cpp +++ b/compiler/riscv/codegen/RVOutOfLineCodeSection.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/RVOutOfLineCodeSection.hpp" diff --git a/compiler/riscv/codegen/RVOutOfLineCodeSection.hpp b/compiler/riscv/codegen/RVOutOfLineCodeSection.hpp index 0487de95bd5..d62af970de0 100644 --- a/compiler/riscv/codegen/RVOutOfLineCodeSection.hpp +++ b/compiler/riscv/codegen/RVOutOfLineCodeSection.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef RVOUTOFLINECODESECTION_INCL diff --git a/compiler/riscv/codegen/RVSystemLinkage.cpp b/compiler/riscv/codegen/RVSystemLinkage.cpp index 73ae41d5867..87aab39887f 100644 --- a/compiler/riscv/codegen/RVSystemLinkage.cpp +++ b/compiler/riscv/codegen/RVSystemLinkage.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/riscv/codegen/RVSystemLinkage.hpp b/compiler/riscv/codegen/RVSystemLinkage.hpp index ba2019f051b..3bbebd25375 100644 --- a/compiler/riscv/codegen/RVSystemLinkage.hpp +++ b/compiler/riscv/codegen/RVSystemLinkage.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_RV_SYSTEMLINKAGE_INCL diff --git a/compiler/riscv/codegen/RealRegister.hpp b/compiler/riscv/codegen/RealRegister.hpp index 6b5c745f5af..d7674e0a70f 100644 --- a/compiler/riscv/codegen/RealRegister.hpp +++ b/compiler/riscv/codegen/RealRegister.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_REAL_REGISTER_INCL diff --git a/compiler/riscv/codegen/RealRegisterEnum.hpp b/compiler/riscv/codegen/RealRegisterEnum.hpp index f57af5f96b9..a6e6c2b9fc0 100644 --- a/compiler/riscv/codegen/RealRegisterEnum.hpp +++ b/compiler/riscv/codegen/RealRegisterEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/riscv/codegen/RealRegisterMaskEnum.hpp b/compiler/riscv/codegen/RealRegisterMaskEnum.hpp index 5e6569aad6f..f4962ac0fda 100644 --- a/compiler/riscv/codegen/RealRegisterMaskEnum.hpp +++ b/compiler/riscv/codegen/RealRegisterMaskEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/riscv/codegen/RegisterDependency.hpp b/compiler/riscv/codegen/RegisterDependency.hpp index 6dcffefa06e..3b678aadda8 100644 --- a/compiler/riscv/codegen/RegisterDependency.hpp +++ b/compiler/riscv/codegen/RegisterDependency.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_REGISTER_DEPENDENCY_INCL diff --git a/compiler/riscv/codegen/TreeEvaluatorTable.hpp b/compiler/riscv/codegen/TreeEvaluatorTable.hpp index d808f2dc981..b13b4eae699 100644 --- a/compiler/riscv/codegen/TreeEvaluatorTable.hpp +++ b/compiler/riscv/codegen/TreeEvaluatorTable.hpp @@ -16,6 +16,6 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "riscv/codegen/OMRTreeEvaluatorTable.hpp" diff --git a/compiler/riscv/codegen/UnaryEvaluator.cpp b/compiler/riscv/codegen/UnaryEvaluator.cpp index 2d390bc72f5..f77f7da40a3 100644 --- a/compiler/riscv/codegen/UnaryEvaluator.cpp +++ b/compiler/riscv/codegen/UnaryEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/RVInstruction.hpp" diff --git a/compiler/riscv/env/OMRCPU.cpp b/compiler/riscv/env/OMRCPU.cpp index 11135b09e11..fb167bdc5f5 100644 --- a/compiler/riscv/env/OMRCPU.cpp +++ b/compiler/riscv/env/OMRCPU.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/CPU.hpp" diff --git a/compiler/riscv/env/OMRCPU.hpp b/compiler/riscv/env/OMRCPU.hpp index 5883ad5bd73..b6efeacd8e2 100644 --- a/compiler/riscv/env/OMRCPU.hpp +++ b/compiler/riscv/env/OMRCPU.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_RV_CPU_INCL diff --git a/compiler/riscv/env/OMRDebugEnv.cpp b/compiler/riscv/env/OMRDebugEnv.cpp index b8bfdc634b7..f07842ad109 100644 --- a/compiler/riscv/env/OMRDebugEnv.cpp +++ b/compiler/riscv/env/OMRDebugEnv.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/DebugEnv.hpp" diff --git a/compiler/riscv/env/OMRDebugEnv.hpp b/compiler/riscv/env/OMRDebugEnv.hpp index e0a30a45d9a..3695fcaa70b 100644 --- a/compiler/riscv/env/OMRDebugEnv.hpp +++ b/compiler/riscv/env/OMRDebugEnv.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_RV_DEBUG_ENV_INCL diff --git a/compiler/riscv/env/OMREnvironment.hpp b/compiler/riscv/env/OMREnvironment.hpp index 98a6ab5e045..6c8d479270b 100644 --- a/compiler/riscv/env/OMREnvironment.hpp +++ b/compiler/riscv/env/OMREnvironment.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_RV_ENVIRONMENT_INCL diff --git a/compiler/riscv/env/RVProcessorEnum.hpp b/compiler/riscv/env/RVProcessorEnum.hpp index 4552adb5e7a..82ec1a4eb41 100644 --- a/compiler/riscv/env/RVProcessorEnum.hpp +++ b/compiler/riscv/env/RVProcessorEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/riscv/runtime/CodeSync.cpp b/compiler/riscv/runtime/CodeSync.cpp index 789a4036f12..de8bbe9bd1c 100644 --- a/compiler/riscv/runtime/CodeSync.cpp +++ b/compiler/riscv/runtime/CodeSync.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/riscv/runtime/CodeSync.hpp b/compiler/riscv/runtime/CodeSync.hpp index 596bf1c0b71..ed6886521d6 100644 --- a/compiler/riscv/runtime/CodeSync.hpp +++ b/compiler/riscv/runtime/CodeSync.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CODESYNC_HPP_ diff --git a/compiler/riscv/runtime/VirtualGuardRuntime.cpp b/compiler/riscv/runtime/VirtualGuardRuntime.cpp index ead24e327ad..0ad851fce6f 100644 --- a/compiler/riscv/runtime/VirtualGuardRuntime.cpp +++ b/compiler/riscv/runtime/VirtualGuardRuntime.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/runtime/CMakeLists.txt b/compiler/runtime/CMakeLists.txt index c045fb044d8..5c7980cd0ab 100644 --- a/compiler/runtime/CMakeLists.txt +++ b/compiler/runtime/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# compiler_library(runtime diff --git a/compiler/runtime/CodeCache.hpp b/compiler/runtime/CodeCache.hpp index 961cea0019a..a223932f4d1 100644 --- a/compiler/runtime/CodeCache.hpp +++ b/compiler/runtime/CodeCache.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_CODECACHE_INCL diff --git a/compiler/runtime/CodeCacheConfig.hpp b/compiler/runtime/CodeCacheConfig.hpp index 2dc28c5c6ae..7a9a7c6800e 100644 --- a/compiler/runtime/CodeCacheConfig.hpp +++ b/compiler/runtime/CodeCacheConfig.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_CODECACHECONFIG_INCL diff --git a/compiler/runtime/CodeCacheExceptions.hpp b/compiler/runtime/CodeCacheExceptions.hpp index 4f67269647c..42ccd8b7030 100644 --- a/compiler/runtime/CodeCacheExceptions.hpp +++ b/compiler/runtime/CodeCacheExceptions.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CODECACHEEXCEPTIONS_HPP diff --git a/compiler/runtime/CodeCacheManager.hpp b/compiler/runtime/CodeCacheManager.hpp index ce08cf95ed6..a76155574e9 100644 --- a/compiler/runtime/CodeCacheManager.hpp +++ b/compiler/runtime/CodeCacheManager.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_CODECACHEMANAGER_INCL diff --git a/compiler/runtime/CodeCacheMemorySegment.hpp b/compiler/runtime/CodeCacheMemorySegment.hpp index ace13c3cfa4..b9a10e36f11 100644 --- a/compiler/runtime/CodeCacheMemorySegment.hpp +++ b/compiler/runtime/CodeCacheMemorySegment.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_CODECACHEMEMORYSEGMENT_INCL diff --git a/compiler/runtime/CodeCacheTypes.cpp b/compiler/runtime/CodeCacheTypes.cpp index e60a86ae021..01096c77d25 100644 --- a/compiler/runtime/CodeCacheTypes.cpp +++ b/compiler/runtime/CodeCacheTypes.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "runtime/CodeCacheTypes.hpp" diff --git a/compiler/runtime/CodeCacheTypes.hpp b/compiler/runtime/CodeCacheTypes.hpp index 66278351204..8d1d3075f17 100644 --- a/compiler/runtime/CodeCacheTypes.hpp +++ b/compiler/runtime/CodeCacheTypes.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CODECACHETYPES_INCL diff --git a/compiler/runtime/CodeMetaData.hpp b/compiler/runtime/CodeMetaData.hpp index 65a0a78988e..99e5904b7b7 100644 --- a/compiler/runtime/CodeMetaData.hpp +++ b/compiler/runtime/CodeMetaData.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_METHOD_METADATA_INCL diff --git a/compiler/runtime/CodeMetaDataManager.hpp b/compiler/runtime/CodeMetaDataManager.hpp index c4725ac5a15..3e6f3c38196 100644 --- a/compiler/runtime/CodeMetaDataManager.hpp +++ b/compiler/runtime/CodeMetaDataManager.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_CODE_METADATA_MANAGER_INCL diff --git a/compiler/runtime/CodeMetaDataManager_inlines.hpp b/compiler/runtime/CodeMetaDataManager_inlines.hpp index 6780f60ed70..77593d882e2 100644 --- a/compiler/runtime/CodeMetaDataManager_inlines.hpp +++ b/compiler/runtime/CodeMetaDataManager_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CODE_METADATA_MANAGER_INLINES_INCL diff --git a/compiler/runtime/CodeMetaDataPOD.hpp b/compiler/runtime/CodeMetaDataPOD.hpp index 830cb5e20ad..3191bc6e374 100644 --- a/compiler/runtime/CodeMetaDataPOD.hpp +++ b/compiler/runtime/CodeMetaDataPOD.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_METHOD_METADATAPOD_INCL diff --git a/compiler/runtime/MethodExceptionData.hpp b/compiler/runtime/MethodExceptionData.hpp index 1da2eff7636..8cb8b5d97ec 100644 --- a/compiler/runtime/MethodExceptionData.hpp +++ b/compiler/runtime/MethodExceptionData.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_METHODEXCEPTIONDATA_INCL diff --git a/compiler/runtime/OMRCodeCache.cpp b/compiler/runtime/OMRCodeCache.cpp index 36d1eb63897..28ed4c09807 100644 --- a/compiler/runtime/OMRCodeCache.cpp +++ b/compiler/runtime/OMRCodeCache.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "runtime/CodeCache.hpp" diff --git a/compiler/runtime/OMRCodeCache.hpp b/compiler/runtime/OMRCodeCache.hpp index 491cfd02516..8a5f68f5963 100644 --- a/compiler/runtime/OMRCodeCache.hpp +++ b/compiler/runtime/OMRCodeCache.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_CODECACHE_INCL diff --git a/compiler/runtime/OMRCodeCacheConfig.cpp b/compiler/runtime/OMRCodeCacheConfig.cpp index eeba83b13b9..b63e405f87c 100644 --- a/compiler/runtime/OMRCodeCacheConfig.cpp +++ b/compiler/runtime/OMRCodeCacheConfig.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "runtime/CodeCacheConfig.hpp" diff --git a/compiler/runtime/OMRCodeCacheConfig.hpp b/compiler/runtime/OMRCodeCacheConfig.hpp index b19a0c16808..ecbb5e4bc8b 100644 --- a/compiler/runtime/OMRCodeCacheConfig.hpp +++ b/compiler/runtime/OMRCodeCacheConfig.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_CODECACHECONFIG_INCL diff --git a/compiler/runtime/OMRCodeCacheManager.cpp b/compiler/runtime/OMRCodeCacheManager.cpp index f574f9d74f7..f1e105f0244 100644 --- a/compiler/runtime/OMRCodeCacheManager.cpp +++ b/compiler/runtime/OMRCodeCacheManager.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "runtime/CodeCacheManager.hpp" diff --git a/compiler/runtime/OMRCodeCacheManager.hpp b/compiler/runtime/OMRCodeCacheManager.hpp index b03267ee6f9..ed8a3393c9b 100644 --- a/compiler/runtime/OMRCodeCacheManager.hpp +++ b/compiler/runtime/OMRCodeCacheManager.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_CODECACHEMANAGER_INCL diff --git a/compiler/runtime/OMRCodeCacheMemorySegment.cpp b/compiler/runtime/OMRCodeCacheMemorySegment.cpp index e338144729b..42d40e8a4aa 100644 --- a/compiler/runtime/OMRCodeCacheMemorySegment.cpp +++ b/compiler/runtime/OMRCodeCacheMemorySegment.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "runtime/CodeCacheMemorySegment.hpp" diff --git a/compiler/runtime/OMRCodeCacheMemorySegment.hpp b/compiler/runtime/OMRCodeCacheMemorySegment.hpp index 43cde5d7ec9..4eb1f5185ff 100644 --- a/compiler/runtime/OMRCodeCacheMemorySegment.hpp +++ b/compiler/runtime/OMRCodeCacheMemorySegment.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_CODECACHEMEMORYSEGMENT_INCL diff --git a/compiler/runtime/OMRCodeMetaData.cpp b/compiler/runtime/OMRCodeMetaData.cpp index e956cfe93ab..215d741314e 100644 --- a/compiler/runtime/OMRCodeMetaData.cpp +++ b/compiler/runtime/OMRCodeMetaData.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "runtime/CodeMetaData.hpp" diff --git a/compiler/runtime/OMRCodeMetaData.hpp b/compiler/runtime/OMRCodeMetaData.hpp index de0fb48a3e2..a2626db5e4d 100644 --- a/compiler/runtime/OMRCodeMetaData.hpp +++ b/compiler/runtime/OMRCodeMetaData.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_CODE_METADATA_INCL diff --git a/compiler/runtime/OMRCodeMetaDataManager.cpp b/compiler/runtime/OMRCodeMetaDataManager.cpp index f26df428c35..885eaa2e53f 100644 --- a/compiler/runtime/OMRCodeMetaDataManager.cpp +++ b/compiler/runtime/OMRCodeMetaDataManager.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "runtime/CodeMetaDataManager.hpp" diff --git a/compiler/runtime/OMRCodeMetaDataManager.hpp b/compiler/runtime/OMRCodeMetaDataManager.hpp index fcb5a91b2d4..7a7a733cd50 100644 --- a/compiler/runtime/OMRCodeMetaDataManager.hpp +++ b/compiler/runtime/OMRCodeMetaDataManager.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_CODE_METADATA_MANAGER_INCL diff --git a/compiler/runtime/OMRCodeMetaDataManager_inlines.hpp b/compiler/runtime/OMRCodeMetaDataManager_inlines.hpp index 17902189757..fb3aa156d22 100644 --- a/compiler/runtime/OMRCodeMetaDataManager_inlines.hpp +++ b/compiler/runtime/OMRCodeMetaDataManager_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_CODE_METADATA_MANAGER_INLINE_INCL diff --git a/compiler/runtime/OMRCodeMetaDataPOD.hpp b/compiler/runtime/OMRCodeMetaDataPOD.hpp index 4e6c1d00c44..cc60b13f09d 100644 --- a/compiler/runtime/OMRCodeMetaDataPOD.hpp +++ b/compiler/runtime/OMRCodeMetaDataPOD.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_METHOD_METADATAPOD_INCL diff --git a/compiler/runtime/OMRRuntimeAssumptions.cpp b/compiler/runtime/OMRRuntimeAssumptions.cpp index ce97ddfe4cc..b563f56c599 100644 --- a/compiler/runtime/OMRRuntimeAssumptions.cpp +++ b/compiler/runtime/OMRRuntimeAssumptions.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "runtime/OMRRuntimeAssumptions.hpp" diff --git a/compiler/runtime/OMRRuntimeAssumptions.hpp b/compiler/runtime/OMRRuntimeAssumptions.hpp index 948155bec55..138c4f2f21a 100644 --- a/compiler/runtime/OMRRuntimeAssumptions.hpp +++ b/compiler/runtime/OMRRuntimeAssumptions.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_PROJECT_SPECIFIC diff --git a/compiler/runtime/Runtime.cpp b/compiler/runtime/Runtime.cpp index 4136b81d156..f39e5393b19 100644 --- a/compiler/runtime/Runtime.cpp +++ b/compiler/runtime/Runtime.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "runtime/Runtime.hpp" diff --git a/compiler/runtime/Runtime.hpp b/compiler/runtime/Runtime.hpp index e3eb3dab609..eab61ce944a 100644 --- a/compiler/runtime/Runtime.hpp +++ b/compiler/runtime/Runtime.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef RUNTIME_INCL diff --git a/compiler/runtime/Trampoline.cpp b/compiler/runtime/Trampoline.cpp index d347ddd62a0..a275e2e08fc 100644 --- a/compiler/runtime/Trampoline.cpp +++ b/compiler/runtime/Trampoline.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/x/CMakeLists.txt b/compiler/x/CMakeLists.txt index 4db54e6ab71..7eca431897e 100644 --- a/compiler/x/CMakeLists.txt +++ b/compiler/x/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# compiler_library(x diff --git a/compiler/x/amd64/codegen/AMD64SystemLinkage.cpp b/compiler/x/amd64/codegen/AMD64SystemLinkage.cpp index cc57704d364..52c1f4b1fdc 100644 --- a/compiler/x/amd64/codegen/AMD64SystemLinkage.cpp +++ b/compiler/x/amd64/codegen/AMD64SystemLinkage.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "x/amd64/codegen/AMD64SystemLinkage.hpp" diff --git a/compiler/x/amd64/codegen/AMD64SystemLinkage.hpp b/compiler/x/amd64/codegen/AMD64SystemLinkage.hpp index 602e81a5a37..90bf8bf32ad 100644 --- a/compiler/x/amd64/codegen/AMD64SystemLinkage.hpp +++ b/compiler/x/amd64/codegen/AMD64SystemLinkage.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef AMD64SYSTEMLINKAGE_INCL diff --git a/compiler/x/amd64/codegen/MemoryReference.hpp b/compiler/x/amd64/codegen/MemoryReference.hpp index 62269f4d637..bf91a00e82e 100644 --- a/compiler/x/amd64/codegen/MemoryReference.hpp +++ b/compiler/x/amd64/codegen/MemoryReference.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_MEMORYREFERENCE_INCL diff --git a/compiler/x/amd64/codegen/OMRCodeGenerator.cpp b/compiler/x/amd64/codegen/OMRCodeGenerator.cpp index 74a087f0137..f80c66541a0 100644 --- a/compiler/x/amd64/codegen/OMRCodeGenerator.cpp +++ b/compiler/x/amd64/codegen/OMRCodeGenerator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CodeGenerator.hpp" diff --git a/compiler/x/amd64/codegen/OMRCodeGenerator.hpp b/compiler/x/amd64/codegen/OMRCodeGenerator.hpp index 48c1ae3495a..815eb2d6cfd 100644 --- a/compiler/x/amd64/codegen/OMRCodeGenerator.hpp +++ b/compiler/x/amd64/codegen/OMRCodeGenerator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_AMD64_CODEGENERATOR_INCL diff --git a/compiler/x/amd64/codegen/OMRELFRelocationResolver.cpp b/compiler/x/amd64/codegen/OMRELFRelocationResolver.cpp index 40ee2cca021..39cb0ee0a7f 100644 --- a/compiler/x/amd64/codegen/OMRELFRelocationResolver.cpp +++ b/compiler/x/amd64/codegen/OMRELFRelocationResolver.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/ELFRelocationResolver.hpp" diff --git a/compiler/x/amd64/codegen/OMRELFRelocationResolver.hpp b/compiler/x/amd64/codegen/OMRELFRelocationResolver.hpp index 7ff576ddc63..ce27ffd76af 100644 --- a/compiler/x/amd64/codegen/OMRELFRelocationResolver.hpp +++ b/compiler/x/amd64/codegen/OMRELFRelocationResolver.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMRELFRELOCATIONRESOLVER_HPP diff --git a/compiler/x/amd64/codegen/OMRMachine.cpp b/compiler/x/amd64/codegen/OMRMachine.cpp index df6025fd0f1..885f00550ea 100644 --- a/compiler/x/amd64/codegen/OMRMachine.cpp +++ b/compiler/x/amd64/codegen/OMRMachine.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "x/amd64/codegen/OMRMachine.hpp" diff --git a/compiler/x/amd64/codegen/OMRMachine.hpp b/compiler/x/amd64/codegen/OMRMachine.hpp index eb84cb7415f..0c8725f6239 100644 --- a/compiler/x/amd64/codegen/OMRMachine.hpp +++ b/compiler/x/amd64/codegen/OMRMachine.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_AMD64_MACHINE_INCL diff --git a/compiler/x/amd64/codegen/OMRMemoryReference.cpp b/compiler/x/amd64/codegen/OMRMemoryReference.cpp index 89902eff520..d969bfbfeef 100644 --- a/compiler/x/amd64/codegen/OMRMemoryReference.cpp +++ b/compiler/x/amd64/codegen/OMRMemoryReference.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/x/amd64/codegen/OMRMemoryReference.hpp b/compiler/x/amd64/codegen/OMRMemoryReference.hpp index a1ef6e2391b..a7caa83bd03 100644 --- a/compiler/x/amd64/codegen/OMRMemoryReference.hpp +++ b/compiler/x/amd64/codegen/OMRMemoryReference.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_AMD64_MEMORY_REFERENCE_INCL diff --git a/compiler/x/amd64/codegen/OMRRealRegister.cpp b/compiler/x/amd64/codegen/OMRRealRegister.cpp index 38cbb0860a9..e19ca2c1e7f 100644 --- a/compiler/x/amd64/codegen/OMRRealRegister.cpp +++ b/compiler/x/amd64/codegen/OMRRealRegister.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/RealRegister.hpp" diff --git a/compiler/x/amd64/codegen/OMRRealRegister.hpp b/compiler/x/amd64/codegen/OMRRealRegister.hpp index 698696599e3..38f59db3aff 100644 --- a/compiler/x/amd64/codegen/OMRRealRegister.hpp +++ b/compiler/x/amd64/codegen/OMRRealRegister.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_X86_AMD64_REAL_REGISTER_INCL diff --git a/compiler/x/amd64/codegen/OMRTreeEvaluator.cpp b/compiler/x/amd64/codegen/OMRTreeEvaluator.cpp index 878fbedb703..d5c660e8d0a 100644 --- a/compiler/x/amd64/codegen/OMRTreeEvaluator.cpp +++ b/compiler/x/amd64/codegen/OMRTreeEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/TreeEvaluator.hpp" diff --git a/compiler/x/amd64/codegen/OMRTreeEvaluator.hpp b/compiler/x/amd64/codegen/OMRTreeEvaluator.hpp index 7e7271e3e73..df539e15ff2 100644 --- a/compiler/x/amd64/codegen/OMRTreeEvaluator.hpp +++ b/compiler/x/amd64/codegen/OMRTreeEvaluator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_AMD64_TREE_EVALUATOR_INCL diff --git a/compiler/x/amd64/codegen/PseudoRegisterEnum.hpp b/compiler/x/amd64/codegen/PseudoRegisterEnum.hpp index 649f0023b8d..1b6a3193fe7 100644 --- a/compiler/x/amd64/codegen/PseudoRegisterEnum.hpp +++ b/compiler/x/amd64/codegen/PseudoRegisterEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/x/amd64/codegen/RealRegisterEnum.hpp b/compiler/x/amd64/codegen/RealRegisterEnum.hpp index 5cba4a33c30..f9f663a9b6a 100644 --- a/compiler/x/amd64/codegen/RealRegisterEnum.hpp +++ b/compiler/x/amd64/codegen/RealRegisterEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/x/amd64/codegen/RealRegisterMaskEnum.hpp b/compiler/x/amd64/codegen/RealRegisterMaskEnum.hpp index 62057a7f8c6..86aa353d1e8 100644 --- a/compiler/x/amd64/codegen/RealRegisterMaskEnum.hpp +++ b/compiler/x/amd64/codegen/RealRegisterMaskEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ noRegMask = 0x00000000, diff --git a/compiler/x/amd64/codegen/TreeEvaluatorTable.hpp b/compiler/x/amd64/codegen/TreeEvaluatorTable.hpp index 754fdb67358..7c6937d5fac 100644 --- a/compiler/x/amd64/codegen/TreeEvaluatorTable.hpp +++ b/compiler/x/amd64/codegen/TreeEvaluatorTable.hpp @@ -16,6 +16,6 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "x/amd64/codegen/OMRTreeEvaluatorTable.hpp" diff --git a/compiler/x/amd64/objectfmt/OMRJitCodeRWXObjectFormat.cpp b/compiler/x/amd64/objectfmt/OMRJitCodeRWXObjectFormat.cpp index c0391bec98b..a2fc26c704e 100644 --- a/compiler/x/amd64/objectfmt/OMRJitCodeRWXObjectFormat.cpp +++ b/compiler/x/amd64/objectfmt/OMRJitCodeRWXObjectFormat.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CodeGenerator.hpp" diff --git a/compiler/x/amd64/objectfmt/OMRJitCodeRWXObjectFormat.hpp b/compiler/x/amd64/objectfmt/OMRJitCodeRWXObjectFormat.hpp index 51d7d8bcbb9..cdc9280b98f 100644 --- a/compiler/x/amd64/objectfmt/OMRJitCodeRWXObjectFormat.hpp +++ b/compiler/x/amd64/objectfmt/OMRJitCodeRWXObjectFormat.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_AMD64_JITCODERWX_OBJECTFORMAT_INCL diff --git a/compiler/x/amd64/objectfmt/OMRJitCodeRXObjectFormat.cpp b/compiler/x/amd64/objectfmt/OMRJitCodeRXObjectFormat.cpp index b968434998a..2ec4d1ca6d3 100644 --- a/compiler/x/amd64/objectfmt/OMRJitCodeRXObjectFormat.cpp +++ b/compiler/x/amd64/objectfmt/OMRJitCodeRXObjectFormat.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CodeGenerator.hpp" diff --git a/compiler/x/amd64/objectfmt/OMRJitCodeRXObjectFormat.hpp b/compiler/x/amd64/objectfmt/OMRJitCodeRXObjectFormat.hpp index 236b1cfbab3..60d9d4e4539 100644 --- a/compiler/x/amd64/objectfmt/OMRJitCodeRXObjectFormat.hpp +++ b/compiler/x/amd64/objectfmt/OMRJitCodeRXObjectFormat.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_AMD64_JITCODERX_OBJECTFORMAT_INCL diff --git a/compiler/x/codegen/BinaryCommutativeAnalyser.cpp b/compiler/x/codegen/BinaryCommutativeAnalyser.cpp index b6502bab659..5d360213f2e 100644 --- a/compiler/x/codegen/BinaryCommutativeAnalyser.cpp +++ b/compiler/x/codegen/BinaryCommutativeAnalyser.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "x/codegen/BinaryCommutativeAnalyser.hpp" diff --git a/compiler/x/codegen/BinaryCommutativeAnalyser.hpp b/compiler/x/codegen/BinaryCommutativeAnalyser.hpp index b0eaebdda9e..29a353304d3 100644 --- a/compiler/x/codegen/BinaryCommutativeAnalyser.hpp +++ b/compiler/x/codegen/BinaryCommutativeAnalyser.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef IA32BINARYCOMMUTATIVEANALYSER_INCL diff --git a/compiler/x/codegen/BinaryEvaluator.cpp b/compiler/x/codegen/BinaryEvaluator.cpp index 134c19f97e2..d5bc7110719 100644 --- a/compiler/x/codegen/BinaryEvaluator.cpp +++ b/compiler/x/codegen/BinaryEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/x/codegen/CompareAnalyser.cpp b/compiler/x/codegen/CompareAnalyser.cpp index 898237b7c11..edbb80bc5bf 100644 --- a/compiler/x/codegen/CompareAnalyser.cpp +++ b/compiler/x/codegen/CompareAnalyser.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "x/codegen/CompareAnalyser.hpp" diff --git a/compiler/x/codegen/CompareAnalyser.hpp b/compiler/x/codegen/CompareAnalyser.hpp index 520633d6059..c4ddf46e222 100644 --- a/compiler/x/codegen/CompareAnalyser.hpp +++ b/compiler/x/codegen/CompareAnalyser.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef IA32COMPAREANALYSER_INCL diff --git a/compiler/x/codegen/ConstantDataSnippet.hpp b/compiler/x/codegen/ConstantDataSnippet.hpp index 15cf6352435..963a99e5e85 100644 --- a/compiler/x/codegen/ConstantDataSnippet.hpp +++ b/compiler/x/codegen/ConstantDataSnippet.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef X86CONSTANTDATASNIPPET_INCL diff --git a/compiler/x/codegen/ControlFlowEvaluator.cpp b/compiler/x/codegen/ControlFlowEvaluator.cpp index 6b9ff56b71e..a092e1d9117 100644 --- a/compiler/x/codegen/ControlFlowEvaluator.cpp +++ b/compiler/x/codegen/ControlFlowEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/x/codegen/DataSnippet.cpp b/compiler/x/codegen/DataSnippet.cpp index cba916f3ed3..625af600b25 100644 --- a/compiler/x/codegen/DataSnippet.cpp +++ b/compiler/x/codegen/DataSnippet.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "x/codegen/DataSnippet.hpp" diff --git a/compiler/x/codegen/DataSnippet.hpp b/compiler/x/codegen/DataSnippet.hpp index 75c03454f57..73014efd2af 100644 --- a/compiler/x/codegen/DataSnippet.hpp +++ b/compiler/x/codegen/DataSnippet.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef X86DATASNIPPET_INCL diff --git a/compiler/x/codegen/DivideCheckSnippet.cpp b/compiler/x/codegen/DivideCheckSnippet.cpp index b05ddc26cda..d6e50d4b922 100644 --- a/compiler/x/codegen/DivideCheckSnippet.cpp +++ b/compiler/x/codegen/DivideCheckSnippet.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "x/codegen/DivideCheckSnippet.hpp" diff --git a/compiler/x/codegen/DivideCheckSnippet.hpp b/compiler/x/codegen/DivideCheckSnippet.hpp index d5ee593a676..6edf1eb41dd 100644 --- a/compiler/x/codegen/DivideCheckSnippet.hpp +++ b/compiler/x/codegen/DivideCheckSnippet.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef DIVIDECHECKSNIPPET_INCL diff --git a/compiler/x/codegen/FPBinaryArithmeticAnalyser.cpp b/compiler/x/codegen/FPBinaryArithmeticAnalyser.cpp index 70c6d9e5fa7..6639ebaf397 100644 --- a/compiler/x/codegen/FPBinaryArithmeticAnalyser.cpp +++ b/compiler/x/codegen/FPBinaryArithmeticAnalyser.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "x/codegen/FPBinaryArithmeticAnalyser.hpp" diff --git a/compiler/x/codegen/FPBinaryArithmeticAnalyser.hpp b/compiler/x/codegen/FPBinaryArithmeticAnalyser.hpp index a64d38d9b94..7d0c740bdef 100644 --- a/compiler/x/codegen/FPBinaryArithmeticAnalyser.hpp +++ b/compiler/x/codegen/FPBinaryArithmeticAnalyser.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef IA32FPBINARYARITHMETICANALYSER_INCL diff --git a/compiler/x/codegen/FPCompareAnalyser.cpp b/compiler/x/codegen/FPCompareAnalyser.cpp index b57fd02a305..7621631fcd8 100644 --- a/compiler/x/codegen/FPCompareAnalyser.cpp +++ b/compiler/x/codegen/FPCompareAnalyser.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "x/codegen/FPCompareAnalyser.hpp" diff --git a/compiler/x/codegen/FPCompareAnalyser.hpp b/compiler/x/codegen/FPCompareAnalyser.hpp index 5c95eae1aa1..106985ec317 100644 --- a/compiler/x/codegen/FPCompareAnalyser.hpp +++ b/compiler/x/codegen/FPCompareAnalyser.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef IA32FPCOMPAREANALYSER_INCL diff --git a/compiler/x/codegen/FPTreeEvaluator.cpp b/compiler/x/codegen/FPTreeEvaluator.cpp index db1dfdaf5b9..e062245d7da 100644 --- a/compiler/x/codegen/FPTreeEvaluator.cpp +++ b/compiler/x/codegen/FPTreeEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "x/codegen/FPTreeEvaluator.hpp" diff --git a/compiler/x/codegen/FPTreeEvaluator.hpp b/compiler/x/codegen/FPTreeEvaluator.hpp index 874a5cd9426..c65be94d81d 100644 --- a/compiler/x/codegen/FPTreeEvaluator.hpp +++ b/compiler/x/codegen/FPTreeEvaluator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef IA32FPTREEEVALUATOR_INCL diff --git a/compiler/x/codegen/HelperCallSnippet.cpp b/compiler/x/codegen/HelperCallSnippet.cpp index 03113b5fff0..1b53ea872e7 100644 --- a/compiler/x/codegen/HelperCallSnippet.cpp +++ b/compiler/x/codegen/HelperCallSnippet.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "x/codegen/HelperCallSnippet.hpp" diff --git a/compiler/x/codegen/HelperCallSnippet.hpp b/compiler/x/codegen/HelperCallSnippet.hpp index 338c2c9634d..6837836ce61 100644 --- a/compiler/x/codegen/HelperCallSnippet.hpp +++ b/compiler/x/codegen/HelperCallSnippet.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef X86HELPERCALLSNIPPET_INCL diff --git a/compiler/x/codegen/IA32LinkageUtils.cpp b/compiler/x/codegen/IA32LinkageUtils.cpp index a93a3c837ef..68d22695358 100644 --- a/compiler/x/codegen/IA32LinkageUtils.cpp +++ b/compiler/x/codegen/IA32LinkageUtils.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/IA32LinkageUtils.hpp" diff --git a/compiler/x/codegen/IA32LinkageUtils.hpp b/compiler/x/codegen/IA32LinkageUtils.hpp index 64afbb82a4c..989f81214b3 100644 --- a/compiler/x/codegen/IA32LinkageUtils.hpp +++ b/compiler/x/codegen/IA32LinkageUtils.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef IA32_LINKAGEUTILS_INCL diff --git a/compiler/x/codegen/InstOpCode.hpp b/compiler/x/codegen/InstOpCode.hpp index bfca9219402..36ad5651828 100644 --- a/compiler/x/codegen/InstOpCode.hpp +++ b/compiler/x/codegen/InstOpCode.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_X86_INSTOPCODE_INCL diff --git a/compiler/x/codegen/Instruction.hpp b/compiler/x/codegen/Instruction.hpp index 3a6032b351e..0d1d4f5bc0c 100644 --- a/compiler/x/codegen/Instruction.hpp +++ b/compiler/x/codegen/Instruction.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_INSTRUCTION_INCL diff --git a/compiler/x/codegen/IntegerMultiplyDecomposer.cpp b/compiler/x/codegen/IntegerMultiplyDecomposer.cpp index a42a16efeee..a57826ef7d6 100644 --- a/compiler/x/codegen/IntegerMultiplyDecomposer.cpp +++ b/compiler/x/codegen/IntegerMultiplyDecomposer.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "x/codegen/IntegerMultiplyDecomposer.hpp" diff --git a/compiler/x/codegen/IntegerMultiplyDecomposer.hpp b/compiler/x/codegen/IntegerMultiplyDecomposer.hpp index 4649bb17b88..2f3168e7438 100644 --- a/compiler/x/codegen/IntegerMultiplyDecomposer.hpp +++ b/compiler/x/codegen/IntegerMultiplyDecomposer.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef INTEGERMULTIPLYDECOMPOSER_INCL diff --git a/compiler/x/codegen/Linkage.hpp b/compiler/x/codegen/Linkage.hpp index 0cb89bdb0fb..614b6763f33 100644 --- a/compiler/x/codegen/Linkage.hpp +++ b/compiler/x/codegen/Linkage.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_LINKAGE_INCL diff --git a/compiler/x/codegen/MemoryReference.hpp b/compiler/x/codegen/MemoryReference.hpp index 3fb3bc75faa..cc76ea9e0df 100644 --- a/compiler/x/codegen/MemoryReference.hpp +++ b/compiler/x/codegen/MemoryReference.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_MEMORYREFERENCE_INCL diff --git a/compiler/x/codegen/OMRCodeGenerator.cpp b/compiler/x/codegen/OMRCodeGenerator.cpp index fff517cb2dd..5da52344fec 100644 --- a/compiler/x/codegen/OMRCodeGenerator.cpp +++ b/compiler/x/codegen/OMRCodeGenerator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CodeGenerator.hpp" diff --git a/compiler/x/codegen/OMRCodeGenerator.hpp b/compiler/x/codegen/OMRCodeGenerator.hpp index 1370de93eb5..3e7ab066808 100644 --- a/compiler/x/codegen/OMRCodeGenerator.hpp +++ b/compiler/x/codegen/OMRCodeGenerator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_X86_CODEGENERATOR_INCL diff --git a/compiler/x/codegen/OMRInstOpCode.cpp b/compiler/x/codegen/OMRInstOpCode.cpp index 494d89da421..4e3152633d0 100644 --- a/compiler/x/codegen/OMRInstOpCode.cpp +++ b/compiler/x/codegen/OMRInstOpCode.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/OMRInstOpCode.hpp" diff --git a/compiler/x/codegen/OMRInstOpCode.enum b/compiler/x/codegen/OMRInstOpCode.enum index 319236f431b..b06f3b11ba0 100644 --- a/compiler/x/codegen/OMRInstOpCode.enum +++ b/compiler/x/codegen/OMRInstOpCode.enum @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #define INSTRUCTION(name, mnemonic, binary, property0, property1, features) name diff --git a/compiler/x/codegen/OMRInstOpCode.hpp b/compiler/x/codegen/OMRInstOpCode.hpp index 822f1dbc043..fafb9fe27cb 100644 --- a/compiler/x/codegen/OMRInstOpCode.hpp +++ b/compiler/x/codegen/OMRInstOpCode.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_X86_INSTOPCODE_INCL diff --git a/compiler/x/codegen/OMRInstOpCodeProperties.hpp b/compiler/x/codegen/OMRInstOpCodeProperties.hpp index 15e4b2e63cd..74dece8c475 100644 --- a/compiler/x/codegen/OMRInstOpCodeProperties.hpp +++ b/compiler/x/codegen/OMRInstOpCodeProperties.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/x/codegen/OMRInstruction.cpp b/compiler/x/codegen/OMRInstruction.cpp index 6be6c991a69..b92e924f6e3 100644 --- a/compiler/x/codegen/OMRInstruction.cpp +++ b/compiler/x/codegen/OMRInstruction.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/x/codegen/OMRInstruction.hpp b/compiler/x/codegen/OMRInstruction.hpp index 23628752862..f81cd6b8b1d 100644 --- a/compiler/x/codegen/OMRInstruction.hpp +++ b/compiler/x/codegen/OMRInstruction.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_X86_INSTRUCTION_INCL diff --git a/compiler/x/codegen/OMRInstructionDelegate.cpp b/compiler/x/codegen/OMRInstructionDelegate.cpp index b6194e1f13b..40178f00cbf 100644 --- a/compiler/x/codegen/OMRInstructionDelegate.cpp +++ b/compiler/x/codegen/OMRInstructionDelegate.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/InstructionDelegate.hpp" diff --git a/compiler/x/codegen/OMRInstructionDelegate.hpp b/compiler/x/codegen/OMRInstructionDelegate.hpp index f2880d6af99..e0a1cb95dac 100644 --- a/compiler/x/codegen/OMRInstructionDelegate.hpp +++ b/compiler/x/codegen/OMRInstructionDelegate.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_X86_INSTRUCTIONDELEGATE_INCL diff --git a/compiler/x/codegen/OMRInstructionKindEnum.hpp b/compiler/x/codegen/OMRInstructionKindEnum.hpp index 6695c5c7a09..9711222cfa5 100644 --- a/compiler/x/codegen/OMRInstructionKindEnum.hpp +++ b/compiler/x/codegen/OMRInstructionKindEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/x/codegen/OMRLinkage.cpp b/compiler/x/codegen/OMRLinkage.cpp index c8a143dd2c8..d5230770562 100644 --- a/compiler/x/codegen/OMRLinkage.cpp +++ b/compiler/x/codegen/OMRLinkage.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/Linkage.hpp" diff --git a/compiler/x/codegen/OMRLinkage.hpp b/compiler/x/codegen/OMRLinkage.hpp index 386ba6872d4..0e74dcab3f8 100644 --- a/compiler/x/codegen/OMRLinkage.hpp +++ b/compiler/x/codegen/OMRLinkage.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_X86_LINKAGE_INCL diff --git a/compiler/x/codegen/OMRLinkage_inlines.hpp b/compiler/x/codegen/OMRLinkage_inlines.hpp index a2cd11b915e..d5f9ca491a6 100644 --- a/compiler/x/codegen/OMRLinkage_inlines.hpp +++ b/compiler/x/codegen/OMRLinkage_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_X86_LINKAGE_INLINES_INCL diff --git a/compiler/x/codegen/OMRMachine.cpp b/compiler/x/codegen/OMRMachine.cpp index b25f801b2cf..e4d0628a4d4 100644 --- a/compiler/x/codegen/OMRMachine.cpp +++ b/compiler/x/codegen/OMRMachine.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/x/codegen/OMRMachine.hpp b/compiler/x/codegen/OMRMachine.hpp index b8f37830db2..ce590356e3b 100644 --- a/compiler/x/codegen/OMRMachine.hpp +++ b/compiler/x/codegen/OMRMachine.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_X86_MACHINE_INCL diff --git a/compiler/x/codegen/OMRMemoryReference.cpp b/compiler/x/codegen/OMRMemoryReference.cpp index b31066dc313..338c83d9bcc 100644 --- a/compiler/x/codegen/OMRMemoryReference.cpp +++ b/compiler/x/codegen/OMRMemoryReference.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/x/codegen/OMRMemoryReference.hpp b/compiler/x/codegen/OMRMemoryReference.hpp index 2abea8077b4..519d99d221b 100644 --- a/compiler/x/codegen/OMRMemoryReference.hpp +++ b/compiler/x/codegen/OMRMemoryReference.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_X86_MEMORY_REFERENCE_INCL diff --git a/compiler/x/codegen/OMRRealRegister.cpp b/compiler/x/codegen/OMRRealRegister.cpp index b16cd813b91..a3fad98ba5d 100644 --- a/compiler/x/codegen/OMRRealRegister.cpp +++ b/compiler/x/codegen/OMRRealRegister.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CodeGenerator.hpp" diff --git a/compiler/x/codegen/OMRRealRegister.hpp b/compiler/x/codegen/OMRRealRegister.hpp index 06045389ed1..a867d8e1b18 100644 --- a/compiler/x/codegen/OMRRealRegister.hpp +++ b/compiler/x/codegen/OMRRealRegister.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_X86_REAL_REGISTER_INCL diff --git a/compiler/x/codegen/OMRRegister.cpp b/compiler/x/codegen/OMRRegister.cpp index e36e0bc179d..493577ce9a0 100644 --- a/compiler/x/codegen/OMRRegister.cpp +++ b/compiler/x/codegen/OMRRegister.cpp @@ -16,5 +16,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/compiler/x/codegen/OMRRegister.hpp b/compiler/x/codegen/OMRRegister.hpp index b90696a30ca..43ea68dbf79 100644 --- a/compiler/x/codegen/OMRRegister.hpp +++ b/compiler/x/codegen/OMRRegister.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_X86_REGISTER_INCL diff --git a/compiler/x/codegen/OMRRegisterDependency.cpp b/compiler/x/codegen/OMRRegisterDependency.cpp index f49c44a46bb..91a5fb66807 100644 --- a/compiler/x/codegen/OMRRegisterDependency.cpp +++ b/compiler/x/codegen/OMRRegisterDependency.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/x/codegen/OMRRegisterDependency.hpp b/compiler/x/codegen/OMRRegisterDependency.hpp index 238f936be84..1717b0b7dae 100644 --- a/compiler/x/codegen/OMRRegisterDependency.hpp +++ b/compiler/x/codegen/OMRRegisterDependency.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_X86_REGISTER_DEPENDENCY_INCL diff --git a/compiler/x/codegen/OMRRegisterDependencyStruct.hpp b/compiler/x/codegen/OMRRegisterDependencyStruct.hpp index 57c54cfad46..4d910daaf7d 100644 --- a/compiler/x/codegen/OMRRegisterDependencyStruct.hpp +++ b/compiler/x/codegen/OMRRegisterDependencyStruct.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_X86_REGISTER_DEPENDENCY_STRUCT_INCL diff --git a/compiler/x/codegen/OMRSnippet.cpp b/compiler/x/codegen/OMRSnippet.cpp index d6bf54b6c05..35014f97dfa 100644 --- a/compiler/x/codegen/OMRSnippet.cpp +++ b/compiler/x/codegen/OMRSnippet.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/Snippet.hpp" diff --git a/compiler/x/codegen/OMRSnippet.hpp b/compiler/x/codegen/OMRSnippet.hpp index 108cd872f62..c7f33a65dcb 100644 --- a/compiler/x/codegen/OMRSnippet.hpp +++ b/compiler/x/codegen/OMRSnippet.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_X86_SNIPPET_INCL diff --git a/compiler/x/codegen/OMRTreeEvaluator.cpp b/compiler/x/codegen/OMRTreeEvaluator.cpp index d14c2e26182..543feacbd5b 100644 --- a/compiler/x/codegen/OMRTreeEvaluator.cpp +++ b/compiler/x/codegen/OMRTreeEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/x/codegen/OMRTreeEvaluator.hpp b/compiler/x/codegen/OMRTreeEvaluator.hpp index 2a462459588..80ff3886309 100644 --- a/compiler/x/codegen/OMRTreeEvaluator.hpp +++ b/compiler/x/codegen/OMRTreeEvaluator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_X86_TREE_EVALUATOR_INCL diff --git a/compiler/x/codegen/OMRX86Instruction.cpp b/compiler/x/codegen/OMRX86Instruction.cpp index 59ff6f906a0..8accd0742cf 100644 --- a/compiler/x/codegen/OMRX86Instruction.cpp +++ b/compiler/x/codegen/OMRX86Instruction.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/X86Instruction.hpp" diff --git a/compiler/x/codegen/OMRX86Instruction.hpp b/compiler/x/codegen/OMRX86Instruction.hpp index a5d9bd984c3..b2db217097a 100644 --- a/compiler/x/codegen/OMRX86Instruction.hpp +++ b/compiler/x/codegen/OMRX86Instruction.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_X86INSTRUCTION_INCL diff --git a/compiler/x/codegen/OutlinedInstructions.cpp b/compiler/x/codegen/OutlinedInstructions.cpp index e40a40c0a79..fe5cf6de338 100644 --- a/compiler/x/codegen/OutlinedInstructions.cpp +++ b/compiler/x/codegen/OutlinedInstructions.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "x/codegen/OutlinedInstructions.hpp" diff --git a/compiler/x/codegen/OutlinedInstructions.hpp b/compiler/x/codegen/OutlinedInstructions.hpp index a0b738ef109..203872d2d4b 100644 --- a/compiler/x/codegen/OutlinedInstructions.hpp +++ b/compiler/x/codegen/OutlinedInstructions.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OUTLINEDINSTRUCTIONS_INCL diff --git a/compiler/x/codegen/RealRegister.hpp b/compiler/x/codegen/RealRegister.hpp index 0a3e32352f9..89f3beaa189 100644 --- a/compiler/x/codegen/RealRegister.hpp +++ b/compiler/x/codegen/RealRegister.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_REAL_REGISTER_INCL diff --git a/compiler/x/codegen/RegisterDependency.hpp b/compiler/x/codegen/RegisterDependency.hpp index 2738331f2b3..10ef9d9b795 100644 --- a/compiler/x/codegen/RegisterDependency.hpp +++ b/compiler/x/codegen/RegisterDependency.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_REGISTER_DEPENDENCY_INCL diff --git a/compiler/x/codegen/RegisterRematerialization.cpp b/compiler/x/codegen/RegisterRematerialization.cpp index 7e74dc5297d..51784928468 100644 --- a/compiler/x/codegen/RegisterRematerialization.cpp +++ b/compiler/x/codegen/RegisterRematerialization.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "x/codegen/RegisterRematerialization.hpp" diff --git a/compiler/x/codegen/RegisterRematerialization.hpp b/compiler/x/codegen/RegisterRematerialization.hpp index adbb31389f5..13fed6cf78a 100644 --- a/compiler/x/codegen/RegisterRematerialization.hpp +++ b/compiler/x/codegen/RegisterRematerialization.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef REGISTERREMATERIALIZATION_INCL diff --git a/compiler/x/codegen/RestartSnippet.hpp b/compiler/x/codegen/RestartSnippet.hpp index f332691a467..3c30c98c6bd 100644 --- a/compiler/x/codegen/RestartSnippet.hpp +++ b/compiler/x/codegen/RestartSnippet.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef IA32RESTARTSNIPPET_INCL diff --git a/compiler/x/codegen/SIMDTreeEvaluator.cpp b/compiler/x/codegen/SIMDTreeEvaluator.cpp index 4c481cc7783..d922a0d00e0 100644 --- a/compiler/x/codegen/SIMDTreeEvaluator.cpp +++ b/compiler/x/codegen/SIMDTreeEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CodeGenerator.hpp" diff --git a/compiler/x/codegen/SubtractAnalyser.cpp b/compiler/x/codegen/SubtractAnalyser.cpp index 76dba97c5aa..53b835bb19d 100644 --- a/compiler/x/codegen/SubtractAnalyser.cpp +++ b/compiler/x/codegen/SubtractAnalyser.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "x/codegen/SubtractAnalyser.hpp" diff --git a/compiler/x/codegen/SubtractAnalyser.hpp b/compiler/x/codegen/SubtractAnalyser.hpp index 9e72230ef47..0e6427a2417 100644 --- a/compiler/x/codegen/SubtractAnalyser.hpp +++ b/compiler/x/codegen/SubtractAnalyser.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef IA32SUBTRACTANALYSER_INCL diff --git a/compiler/x/codegen/UnaryEvaluator.cpp b/compiler/x/codegen/UnaryEvaluator.cpp index 9c816e6ca60..3733919c947 100644 --- a/compiler/x/codegen/UnaryEvaluator.cpp +++ b/compiler/x/codegen/UnaryEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CodeGenerator.hpp" diff --git a/compiler/x/codegen/X86BinaryEncoding.cpp b/compiler/x/codegen/X86BinaryEncoding.cpp index bd66671f1d1..7a38419e262 100644 --- a/compiler/x/codegen/X86BinaryEncoding.cpp +++ b/compiler/x/codegen/X86BinaryEncoding.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/x/codegen/X86Debug.cpp b/compiler/x/codegen/X86Debug.cpp index 6caebf2c413..83caddf8564 100644 --- a/compiler/x/codegen/X86Debug.cpp +++ b/compiler/x/codegen/X86Debug.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/x/codegen/X86FPConversionSnippet.cpp b/compiler/x/codegen/X86FPConversionSnippet.cpp index 11c07fd9af7..999feefee51 100644 --- a/compiler/x/codegen/X86FPConversionSnippet.cpp +++ b/compiler/x/codegen/X86FPConversionSnippet.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "x/codegen/X86FPConversionSnippet.hpp" diff --git a/compiler/x/codegen/X86FPConversionSnippet.hpp b/compiler/x/codegen/X86FPConversionSnippet.hpp index 861d34e9e0c..5fbc73e5195 100644 --- a/compiler/x/codegen/X86FPConversionSnippet.hpp +++ b/compiler/x/codegen/X86FPConversionSnippet.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef IA32FPCONVERSIONSNIPPET_INCL diff --git a/compiler/x/codegen/X86Instruction.hpp b/compiler/x/codegen/X86Instruction.hpp index dce68c15682..661f5f543b8 100644 --- a/compiler/x/codegen/X86Instruction.hpp +++ b/compiler/x/codegen/X86Instruction.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_X86INSTRUCTION_INCL diff --git a/compiler/x/codegen/X86LinkageProperties.hpp b/compiler/x/codegen/X86LinkageProperties.hpp index 5aeae978a6f..613ec91a980 100644 --- a/compiler/x/codegen/X86LinkageProperties.hpp +++ b/compiler/x/codegen/X86LinkageProperties.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef X86LINKAGEPROPERTIES_HPP diff --git a/compiler/x/codegen/X86Ops.ins b/compiler/x/codegen/X86Ops.ins index f501c527b4d..0d53d1cf78f 100644 --- a/compiler/x/codegen/X86Ops.ins +++ b/compiler/x/codegen/X86Ops.ins @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/x/codegen/X86Register.hpp b/compiler/x/codegen/X86Register.hpp index c05f48c7208..cce2e2c2aa6 100644 --- a/compiler/x/codegen/X86Register.hpp +++ b/compiler/x/codegen/X86Register.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef X86REGISTER_INCL diff --git a/compiler/x/codegen/X86SystemLinkage.cpp b/compiler/x/codegen/X86SystemLinkage.cpp index 8fdb489dd1e..4a562f5bb56 100644 --- a/compiler/x/codegen/X86SystemLinkage.cpp +++ b/compiler/x/codegen/X86SystemLinkage.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "x/codegen/X86SystemLinkage.hpp" diff --git a/compiler/x/codegen/X86SystemLinkage.hpp b/compiler/x/codegen/X86SystemLinkage.hpp index b7f7a13363b..b868420182b 100644 --- a/compiler/x/codegen/X86SystemLinkage.hpp +++ b/compiler/x/codegen/X86SystemLinkage.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef X86SYSTEMLINKAGE_INCL diff --git a/compiler/x/codegen/XMMBinaryArithmeticAnalyser.cpp b/compiler/x/codegen/XMMBinaryArithmeticAnalyser.cpp index 951b54e9a05..9e639981ff9 100644 --- a/compiler/x/codegen/XMMBinaryArithmeticAnalyser.cpp +++ b/compiler/x/codegen/XMMBinaryArithmeticAnalyser.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // __ ___ __ __ ___ __ ___ ___ __ diff --git a/compiler/x/env/OMRCPU.cpp b/compiler/x/env/OMRCPU.cpp index 6ce7cd49ef3..cc7c8ed7b8d 100644 --- a/compiler/x/env/OMRCPU.cpp +++ b/compiler/x/env/OMRCPU.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/x/env/OMRCPU.hpp b/compiler/x/env/OMRCPU.hpp index c9c535528d4..801db5da6bf 100644 --- a/compiler/x/env/OMRCPU.hpp +++ b/compiler/x/env/OMRCPU.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_X86_CPU_INCL diff --git a/compiler/x/env/OMRDebugEnv.cpp b/compiler/x/env/OMRDebugEnv.cpp index 2ca26e5a961..a8b61c2e03c 100644 --- a/compiler/x/env/OMRDebugEnv.cpp +++ b/compiler/x/env/OMRDebugEnv.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/DebugEnv.hpp" diff --git a/compiler/x/env/OMRDebugEnv.hpp b/compiler/x/env/OMRDebugEnv.hpp index 1d24260fb27..5bfe082c309 100644 --- a/compiler/x/env/OMRDebugEnv.hpp +++ b/compiler/x/env/OMRDebugEnv.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_X86_DEBUG_ENV_INCL diff --git a/compiler/x/env/X86ProcessorEnum.hpp b/compiler/x/env/X86ProcessorEnum.hpp index 9a8cb409784..e83aa6cafc9 100644 --- a/compiler/x/env/X86ProcessorEnum.hpp +++ b/compiler/x/env/X86ProcessorEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/x/i386/codegen/IA32SystemLinkage.cpp b/compiler/x/i386/codegen/IA32SystemLinkage.cpp index 76b30194caf..4e4919ea8ed 100644 --- a/compiler/x/i386/codegen/IA32SystemLinkage.cpp +++ b/compiler/x/i386/codegen/IA32SystemLinkage.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/IA32SystemLinkage.hpp" diff --git a/compiler/x/i386/codegen/IA32SystemLinkage.hpp b/compiler/x/i386/codegen/IA32SystemLinkage.hpp index f67676ce903..e783522d5a1 100644 --- a/compiler/x/i386/codegen/IA32SystemLinkage.hpp +++ b/compiler/x/i386/codegen/IA32SystemLinkage.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef IA32_SYSTEMLINKAGE_INCL diff --git a/compiler/x/i386/codegen/OMRCodeGenerator.cpp b/compiler/x/i386/codegen/OMRCodeGenerator.cpp index 0ac2d12faeb..d262b2d495b 100644 --- a/compiler/x/i386/codegen/OMRCodeGenerator.cpp +++ b/compiler/x/i386/codegen/OMRCodeGenerator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CodeGenerator.hpp" diff --git a/compiler/x/i386/codegen/OMRCodeGenerator.hpp b/compiler/x/i386/codegen/OMRCodeGenerator.hpp index 6911cabfc9e..6a1dfadde7b 100644 --- a/compiler/x/i386/codegen/OMRCodeGenerator.hpp +++ b/compiler/x/i386/codegen/OMRCodeGenerator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_I386_CODEGENERATOR_INCL diff --git a/compiler/x/i386/codegen/OMRMachine.cpp b/compiler/x/i386/codegen/OMRMachine.cpp index e36e0bc179d..493577ce9a0 100644 --- a/compiler/x/i386/codegen/OMRMachine.cpp +++ b/compiler/x/i386/codegen/OMRMachine.cpp @@ -16,5 +16,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/compiler/x/i386/codegen/OMRMachine.hpp b/compiler/x/i386/codegen/OMRMachine.hpp index 20e78d637a5..935cb5d376f 100644 --- a/compiler/x/i386/codegen/OMRMachine.hpp +++ b/compiler/x/i386/codegen/OMRMachine.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_IA32_MACHINE_INCL diff --git a/compiler/x/i386/codegen/OMRRealRegister.cpp b/compiler/x/i386/codegen/OMRRealRegister.cpp index d2e97f89a07..b1ec3874077 100644 --- a/compiler/x/i386/codegen/OMRRealRegister.cpp +++ b/compiler/x/i386/codegen/OMRRealRegister.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/RealRegister.hpp" diff --git a/compiler/x/i386/codegen/OMRRealRegister.hpp b/compiler/x/i386/codegen/OMRRealRegister.hpp index 8dc93460424..1175b2be199 100644 --- a/compiler/x/i386/codegen/OMRRealRegister.hpp +++ b/compiler/x/i386/codegen/OMRRealRegister.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_X86_I386_REAL_REGISTER_INCL diff --git a/compiler/x/i386/codegen/OMRTreeEvaluator.cpp b/compiler/x/i386/codegen/OMRTreeEvaluator.cpp index 45f92fe400b..8d7038fe509 100644 --- a/compiler/x/i386/codegen/OMRTreeEvaluator.cpp +++ b/compiler/x/i386/codegen/OMRTreeEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/x/i386/codegen/OMRTreeEvaluator.hpp b/compiler/x/i386/codegen/OMRTreeEvaluator.hpp index 2bb32bacaf0..2457aca9478 100644 --- a/compiler/x/i386/codegen/OMRTreeEvaluator.hpp +++ b/compiler/x/i386/codegen/OMRTreeEvaluator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_I386_TREE_EVALUATOR_INCL diff --git a/compiler/x/i386/codegen/PseudoRegisterEnum.hpp b/compiler/x/i386/codegen/PseudoRegisterEnum.hpp index 649f0023b8d..1b6a3193fe7 100644 --- a/compiler/x/i386/codegen/PseudoRegisterEnum.hpp +++ b/compiler/x/i386/codegen/PseudoRegisterEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/x/i386/codegen/RealRegisterEnum.hpp b/compiler/x/i386/codegen/RealRegisterEnum.hpp index 91240bdc3ed..5184309f165 100644 --- a/compiler/x/i386/codegen/RealRegisterEnum.hpp +++ b/compiler/x/i386/codegen/RealRegisterEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/x/i386/codegen/RealRegisterMaskEnum.hpp b/compiler/x/i386/codegen/RealRegisterMaskEnum.hpp index 4d1584fbd98..fabac85a1aa 100644 --- a/compiler/x/i386/codegen/RealRegisterMaskEnum.hpp +++ b/compiler/x/i386/codegen/RealRegisterMaskEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ noRegMask = 0x00000000, diff --git a/compiler/x/i386/codegen/TreeEvaluatorTable.hpp b/compiler/x/i386/codegen/TreeEvaluatorTable.hpp index 92b7757b68e..2e732e27e10 100644 --- a/compiler/x/i386/codegen/TreeEvaluatorTable.hpp +++ b/compiler/x/i386/codegen/TreeEvaluatorTable.hpp @@ -16,6 +16,6 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "x/i386/codegen/OMRTreeEvaluatorTable.hpp" diff --git a/compiler/x/objectfmt/FunctionCallData.hpp b/compiler/x/objectfmt/FunctionCallData.hpp index 5de6b88b352..0d99f87d27d 100644 --- a/compiler/x/objectfmt/FunctionCallData.hpp +++ b/compiler/x/objectfmt/FunctionCallData.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_FUNCTIONCALLDATA_INCL diff --git a/compiler/x/objectfmt/OMRFunctionCallData.hpp b/compiler/x/objectfmt/OMRFunctionCallData.hpp index 1b8ca9f5636..29243f7fba2 100644 --- a/compiler/x/objectfmt/OMRFunctionCallData.hpp +++ b/compiler/x/objectfmt/OMRFunctionCallData.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_X86_FUNCTIONCALLDATA_INCL diff --git a/compiler/x/objectfmt/OMRJitCodeRWXObjectFormat.hpp b/compiler/x/objectfmt/OMRJitCodeRWXObjectFormat.hpp index e9fa87d8c5b..fedb1776f8f 100644 --- a/compiler/x/objectfmt/OMRJitCodeRWXObjectFormat.hpp +++ b/compiler/x/objectfmt/OMRJitCodeRWXObjectFormat.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_X86_JITCODERWX_OBJECTFORMAT_INCL diff --git a/compiler/x/objectfmt/OMRJitCodeRXObjectFormat.hpp b/compiler/x/objectfmt/OMRJitCodeRXObjectFormat.hpp index 52b83b0c043..4028a36f784 100644 --- a/compiler/x/objectfmt/OMRJitCodeRXObjectFormat.hpp +++ b/compiler/x/objectfmt/OMRJitCodeRXObjectFormat.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_X86_JITCODERX_OBJECTFORMAT_INCL diff --git a/compiler/x/runtime/VirtualGuardRuntime.cpp b/compiler/x/runtime/VirtualGuardRuntime.cpp index b318c2f164d..77e3f814976 100644 --- a/compiler/x/runtime/VirtualGuardRuntime.cpp +++ b/compiler/x/runtime/VirtualGuardRuntime.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/x/runtime/X86Runtime.hpp b/compiler/x/runtime/X86Runtime.hpp index 3e14cb49f3e..9f39d4e0fed 100644 --- a/compiler/x/runtime/X86Runtime.hpp +++ b/compiler/x/runtime/X86Runtime.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef X86RUNTIME_INCL diff --git a/compiler/z/CMakeLists.txt b/compiler/z/CMakeLists.txt index 5b2f85552ce..fb687fb26bb 100644 --- a/compiler/z/CMakeLists.txt +++ b/compiler/z/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# compiler_library(z diff --git a/compiler/z/codegen/BinaryAnalyser.cpp b/compiler/z/codegen/BinaryAnalyser.cpp index 56d13a93315..870f1964ea1 100644 --- a/compiler/z/codegen/BinaryAnalyser.cpp +++ b/compiler/z/codegen/BinaryAnalyser.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "z/codegen/BinaryAnalyser.hpp" diff --git a/compiler/z/codegen/BinaryAnalyser.hpp b/compiler/z/codegen/BinaryAnalyser.hpp index 4132c2a1af5..1abd4384355 100644 --- a/compiler/z/codegen/BinaryAnalyser.hpp +++ b/compiler/z/codegen/BinaryAnalyser.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef S390BINARYANALYSER_INCL diff --git a/compiler/z/codegen/BinaryCommutativeAnalyser.cpp b/compiler/z/codegen/BinaryCommutativeAnalyser.cpp index 4491704de3f..59ebb786867 100644 --- a/compiler/z/codegen/BinaryCommutativeAnalyser.cpp +++ b/compiler/z/codegen/BinaryCommutativeAnalyser.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "z/codegen/BinaryCommutativeAnalyser.hpp" diff --git a/compiler/z/codegen/BinaryCommutativeAnalyser.hpp b/compiler/z/codegen/BinaryCommutativeAnalyser.hpp index 985b4fa9be6..8077c3acf62 100644 --- a/compiler/z/codegen/BinaryCommutativeAnalyser.hpp +++ b/compiler/z/codegen/BinaryCommutativeAnalyser.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef S390BINARYCOMMUTATIVEANALYSER_INCL diff --git a/compiler/z/codegen/BinaryEvaluator.cpp b/compiler/z/codegen/BinaryEvaluator.cpp index 4612a557a7a..4e5ca9a26da 100644 --- a/compiler/z/codegen/BinaryEvaluator.cpp +++ b/compiler/z/codegen/BinaryEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/z/codegen/CallSnippet.cpp b/compiler/z/codegen/CallSnippet.cpp index 18ff6831736..9eaf7933930 100644 --- a/compiler/z/codegen/CallSnippet.cpp +++ b/compiler/z/codegen/CallSnippet.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "z/codegen/CallSnippet.hpp" diff --git a/compiler/z/codegen/CallSnippet.hpp b/compiler/z/codegen/CallSnippet.hpp index d6b9b47862d..e38409f626b 100644 --- a/compiler/z/codegen/CallSnippet.hpp +++ b/compiler/z/codegen/CallSnippet.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef S390CALLSNIPPET_INCL diff --git a/compiler/z/codegen/CodeGenPhaseToPerform.hpp b/compiler/z/codegen/CodeGenPhaseToPerform.hpp index f943910c140..8a65aa17bf0 100644 --- a/compiler/z/codegen/CodeGenPhaseToPerform.hpp +++ b/compiler/z/codegen/CodeGenPhaseToPerform.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/z/codegen/CompareAnalyser.cpp b/compiler/z/codegen/CompareAnalyser.cpp index c64f240ab8d..f8861368743 100644 --- a/compiler/z/codegen/CompareAnalyser.cpp +++ b/compiler/z/codegen/CompareAnalyser.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "z/codegen/CompareAnalyser.hpp" diff --git a/compiler/z/codegen/CompareAnalyser.hpp b/compiler/z/codegen/CompareAnalyser.hpp index 0609236afcf..8408d208c1e 100644 --- a/compiler/z/codegen/CompareAnalyser.hpp +++ b/compiler/z/codegen/CompareAnalyser.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef S390COMPAREANALYSER_INCL diff --git a/compiler/z/codegen/ConstantDataSnippet.cpp b/compiler/z/codegen/ConstantDataSnippet.cpp index 34d3683440e..ba452b3edcf 100644 --- a/compiler/z/codegen/ConstantDataSnippet.cpp +++ b/compiler/z/codegen/ConstantDataSnippet.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "z/codegen/ConstantDataSnippet.hpp" diff --git a/compiler/z/codegen/ConstantDataSnippet.hpp b/compiler/z/codegen/ConstantDataSnippet.hpp index 8775a04318a..18d47ad180a 100644 --- a/compiler/z/codegen/ConstantDataSnippet.hpp +++ b/compiler/z/codegen/ConstantDataSnippet.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef S390CONSTANTDATASNIPPET_INCL diff --git a/compiler/z/codegen/ControlFlowEvaluator.cpp b/compiler/z/codegen/ControlFlowEvaluator.cpp index 3f03ac08eb2..a6dccdd5097 100644 --- a/compiler/z/codegen/ControlFlowEvaluator.cpp +++ b/compiler/z/codegen/ControlFlowEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/z/codegen/EndianConversion.hpp b/compiler/z/codegen/EndianConversion.hpp index 82022e6c04f..861dc46e5db 100644 --- a/compiler/z/codegen/EndianConversion.hpp +++ b/compiler/z/codegen/EndianConversion.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/z/codegen/FPTreeEvaluator.cpp b/compiler/z/codegen/FPTreeEvaluator.cpp index 570e219c88c..4683ac610e7 100644 --- a/compiler/z/codegen/FPTreeEvaluator.cpp +++ b/compiler/z/codegen/FPTreeEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/z/codegen/InstOpCode.cpp b/compiler/z/codegen/InstOpCode.cpp index 6bf43bfb874..fb945d1d608 100644 --- a/compiler/z/codegen/InstOpCode.cpp +++ b/compiler/z/codegen/InstOpCode.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/InstOpCode.hpp" diff --git a/compiler/z/codegen/InstOpCode.hpp b/compiler/z/codegen/InstOpCode.hpp index 28755c0adf6..bacd3b0ba95 100644 --- a/compiler/z/codegen/InstOpCode.hpp +++ b/compiler/z/codegen/InstOpCode.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_INSTOPCODE_INCL diff --git a/compiler/z/codegen/InstOpCodeTables.cpp b/compiler/z/codegen/InstOpCodeTables.cpp index c7e820e59f9..825c0d49fa5 100644 --- a/compiler/z/codegen/InstOpCodeTables.cpp +++ b/compiler/z/codegen/InstOpCodeTables.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compiler/z/codegen/InstOpCode.hpp" diff --git a/compiler/z/codegen/Instruction.hpp b/compiler/z/codegen/Instruction.hpp index d04cac293d4..a081ba5423e 100644 --- a/compiler/z/codegen/Instruction.hpp +++ b/compiler/z/codegen/Instruction.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_INSTRUCTION_INCL diff --git a/compiler/z/codegen/Linkage.hpp b/compiler/z/codegen/Linkage.hpp index a7806a4fac7..d43f13eef4b 100644 --- a/compiler/z/codegen/Linkage.hpp +++ b/compiler/z/codegen/Linkage.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_LINKAGE_INCL diff --git a/compiler/z/codegen/MemoryReference.hpp b/compiler/z/codegen/MemoryReference.hpp index 8946ff01dff..176af7c296b 100644 --- a/compiler/z/codegen/MemoryReference.hpp +++ b/compiler/z/codegen/MemoryReference.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_MEMORYREFERENCE_INCL diff --git a/compiler/z/codegen/OMRCodeGenPhase.cpp b/compiler/z/codegen/OMRCodeGenPhase.cpp index e3beb3d64e1..1608109d5c4 100644 --- a/compiler/z/codegen/OMRCodeGenPhase.cpp +++ b/compiler/z/codegen/OMRCodeGenPhase.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ //On zOS XLC linker can't handle files with same name at link time diff --git a/compiler/z/codegen/OMRCodeGenPhase.hpp b/compiler/z/codegen/OMRCodeGenPhase.hpp index a9ef1deda57..daf2a11b264 100644 --- a/compiler/z/codegen/OMRCodeGenPhase.hpp +++ b/compiler/z/codegen/OMRCodeGenPhase.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Z_CODEGEN_PHASE diff --git a/compiler/z/codegen/OMRCodeGenPhaseEnum.hpp b/compiler/z/codegen/OMRCodeGenPhaseEnum.hpp index a91119c8446..54ca8cca06a 100644 --- a/compiler/z/codegen/OMRCodeGenPhaseEnum.hpp +++ b/compiler/z/codegen/OMRCodeGenPhaseEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/z/codegen/OMRCodeGenPhaseFunctionTable.hpp b/compiler/z/codegen/OMRCodeGenPhaseFunctionTable.hpp index f3c5466697a..2a144075923 100644 --- a/compiler/z/codegen/OMRCodeGenPhaseFunctionTable.hpp +++ b/compiler/z/codegen/OMRCodeGenPhaseFunctionTable.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/z/codegen/OMRCodeGenerator.cpp b/compiler/z/codegen/OMRCodeGenerator.cpp index 3699c55568c..db7f9025f38 100644 --- a/compiler/z/codegen/OMRCodeGenerator.cpp +++ b/compiler/z/codegen/OMRCodeGenerator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // On zOS XLC linker can't handle files with same name at link time. diff --git a/compiler/z/codegen/OMRCodeGenerator.hpp b/compiler/z/codegen/OMRCodeGenerator.hpp index d12e7bcbad2..99f05edbd26 100644 --- a/compiler/z/codegen/OMRCodeGenerator.hpp +++ b/compiler/z/codegen/OMRCodeGenerator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Z_CODEGENERATOR_INCL diff --git a/compiler/z/codegen/OMRCodeGenerator_inlines.hpp b/compiler/z/codegen/OMRCodeGenerator_inlines.hpp index 07cf18512a7..97c02f6d282 100644 --- a/compiler/z/codegen/OMRCodeGenerator_inlines.hpp +++ b/compiler/z/codegen/OMRCodeGenerator_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Z_CODEGENERATOR_INLINES_INCL diff --git a/compiler/z/codegen/OMRInstOpCode.enum b/compiler/z/codegen/OMRInstOpCode.enum index 95e590de2cc..64bba767e0a 100644 --- a/compiler/z/codegen/OMRInstOpCode.enum +++ b/compiler/z/codegen/OMRInstOpCode.enum @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/z/codegen/OMRInstOpCode.hpp b/compiler/z/codegen/OMRInstOpCode.hpp index 961cdbbae2c..b5110608b24 100644 --- a/compiler/z/codegen/OMRInstOpCode.hpp +++ b/compiler/z/codegen/OMRInstOpCode.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Z_INSTOPCODE_INCL diff --git a/compiler/z/codegen/OMRInstOpCodeProperties.hpp b/compiler/z/codegen/OMRInstOpCodeProperties.hpp index f8bbc250265..49998b5b130 100644 --- a/compiler/z/codegen/OMRInstOpCodeProperties.hpp +++ b/compiler/z/codegen/OMRInstOpCodeProperties.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/z/codegen/OMRInstruction.cpp b/compiler/z/codegen/OMRInstruction.cpp index 0efbd202e42..b96d06a9119 100644 --- a/compiler/z/codegen/OMRInstruction.cpp +++ b/compiler/z/codegen/OMRInstruction.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ //On zOS XLC linker can't handle files with same name at link time diff --git a/compiler/z/codegen/OMRInstruction.hpp b/compiler/z/codegen/OMRInstruction.hpp index 229a9cec399..4c2c0a6f82e 100644 --- a/compiler/z/codegen/OMRInstruction.hpp +++ b/compiler/z/codegen/OMRInstruction.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Z_INSTRUCTION_INCL diff --git a/compiler/z/codegen/OMRInstructionDelegate.cpp b/compiler/z/codegen/OMRInstructionDelegate.cpp index d06cffd7a46..12f93ae44be 100644 --- a/compiler/z/codegen/OMRInstructionDelegate.cpp +++ b/compiler/z/codegen/OMRInstructionDelegate.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // On zOS, the XLC linker can't handle files with the same name at link diff --git a/compiler/z/codegen/OMRInstructionDelegate.hpp b/compiler/z/codegen/OMRInstructionDelegate.hpp index 2e21ef88f6e..1edd1343140 100644 --- a/compiler/z/codegen/OMRInstructionDelegate.hpp +++ b/compiler/z/codegen/OMRInstructionDelegate.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Z_INSTRUCTIONDELEGATE_INCL diff --git a/compiler/z/codegen/OMRInstructionKindEnum.hpp b/compiler/z/codegen/OMRInstructionKindEnum.hpp index b00e89a83de..a20b1ffeb9b 100644 --- a/compiler/z/codegen/OMRInstructionKindEnum.hpp +++ b/compiler/z/codegen/OMRInstructionKindEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/z/codegen/OMRLinkage.cpp b/compiler/z/codegen/OMRLinkage.cpp index 2536f65a787..1c4413de0f0 100644 --- a/compiler/z/codegen/OMRLinkage.cpp +++ b/compiler/z/codegen/OMRLinkage.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #pragma csect(CODE,"TRLINKAGEBase#C") diff --git a/compiler/z/codegen/OMRLinkage.hpp b/compiler/z/codegen/OMRLinkage.hpp index df74391ba03..065b9b7dc3b 100644 --- a/compiler/z/codegen/OMRLinkage.hpp +++ b/compiler/z/codegen/OMRLinkage.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Z_LINKAGE_INCL diff --git a/compiler/z/codegen/OMRLinkage_inlines.hpp b/compiler/z/codegen/OMRLinkage_inlines.hpp index dfe5ed98959..f99f41f97b2 100644 --- a/compiler/z/codegen/OMRLinkage_inlines.hpp +++ b/compiler/z/codegen/OMRLinkage_inlines.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Z_LINKAGE_INLINES_INCL diff --git a/compiler/z/codegen/OMRMachine.cpp b/compiler/z/codegen/OMRMachine.cpp index fbfffedb99f..02c9c99668e 100644 --- a/compiler/z/codegen/OMRMachine.cpp +++ b/compiler/z/codegen/OMRMachine.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ //On zOS XLC linker can't handle files with same name at link time diff --git a/compiler/z/codegen/OMRMachine.hpp b/compiler/z/codegen/OMRMachine.hpp index 61b254d2315..d662165be40 100644 --- a/compiler/z/codegen/OMRMachine.hpp +++ b/compiler/z/codegen/OMRMachine.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Z_MACHINE_INCL diff --git a/compiler/z/codegen/OMRMemoryReference.cpp b/compiler/z/codegen/OMRMemoryReference.cpp index db1f7ea4e9c..042a30c16c2 100644 --- a/compiler/z/codegen/OMRMemoryReference.cpp +++ b/compiler/z/codegen/OMRMemoryReference.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ //On zOS XLC linker can't handle files with same name at link time diff --git a/compiler/z/codegen/OMRMemoryReference.hpp b/compiler/z/codegen/OMRMemoryReference.hpp index 086bc2b9451..d3a35eaf557 100644 --- a/compiler/z/codegen/OMRMemoryReference.hpp +++ b/compiler/z/codegen/OMRMemoryReference.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Z_MEMORY_REFERENCE_INCL diff --git a/compiler/z/codegen/OMRPeephole.cpp b/compiler/z/codegen/OMRPeephole.cpp index a58268c85bf..d8af1034d94 100644 --- a/compiler/z/codegen/OMRPeephole.cpp +++ b/compiler/z/codegen/OMRPeephole.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #pragma csect(CODE,"OMRZPeephole#C") diff --git a/compiler/z/codegen/OMRPeephole.hpp b/compiler/z/codegen/OMRPeephole.hpp index 4b2e74a299f..ea3b97e3ba6 100644 --- a/compiler/z/codegen/OMRPeephole.hpp +++ b/compiler/z/codegen/OMRPeephole.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Z_PEEPHOLE_INCL diff --git a/compiler/z/codegen/OMRRealRegister.cpp b/compiler/z/codegen/OMRRealRegister.cpp index d879279c406..988e2a59ae9 100644 --- a/compiler/z/codegen/OMRRealRegister.cpp +++ b/compiler/z/codegen/OMRRealRegister.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ //On zOS XLC linker can't handle files with same name at link time diff --git a/compiler/z/codegen/OMRRealRegister.hpp b/compiler/z/codegen/OMRRealRegister.hpp index f2a22f13460..1a2b583fd36 100644 --- a/compiler/z/codegen/OMRRealRegister.hpp +++ b/compiler/z/codegen/OMRRealRegister.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Z_REAL_REGISTER_INCL diff --git a/compiler/z/codegen/OMRRegister.cpp b/compiler/z/codegen/OMRRegister.cpp index a55384fdf8b..fe045a8cfff 100644 --- a/compiler/z/codegen/OMRRegister.cpp +++ b/compiler/z/codegen/OMRRegister.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ //On zOS XLC linker can't handle files with same name at link time diff --git a/compiler/z/codegen/OMRRegister.hpp b/compiler/z/codegen/OMRRegister.hpp index fb566c89bdf..4c83cf2856e 100644 --- a/compiler/z/codegen/OMRRegister.hpp +++ b/compiler/z/codegen/OMRRegister.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Z_REGISTER_INCL diff --git a/compiler/z/codegen/OMRRegisterDependency.cpp b/compiler/z/codegen/OMRRegisterDependency.cpp index 1fd6e91c2d3..0dd580dada1 100644 --- a/compiler/z/codegen/OMRRegisterDependency.cpp +++ b/compiler/z/codegen/OMRRegisterDependency.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ //On zOS XLC linker can't handle files with same name at link time diff --git a/compiler/z/codegen/OMRRegisterDependency.hpp b/compiler/z/codegen/OMRRegisterDependency.hpp index ac55d90bb53..b4acb276cf2 100644 --- a/compiler/z/codegen/OMRRegisterDependency.hpp +++ b/compiler/z/codegen/OMRRegisterDependency.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Z_REGISTER_DEPENDENCY_INCL diff --git a/compiler/z/codegen/OMRRegisterDependencyStruct.hpp b/compiler/z/codegen/OMRRegisterDependencyStruct.hpp index e68f9873cad..7e29e1950aa 100644 --- a/compiler/z/codegen/OMRRegisterDependencyStruct.hpp +++ b/compiler/z/codegen/OMRRegisterDependencyStruct.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Z_REGISTER_DEPENDENCY_STRUCT_INCL diff --git a/compiler/z/codegen/OMRSnippet.cpp b/compiler/z/codegen/OMRSnippet.cpp index b368ad88e86..0fbe66af8c9 100644 --- a/compiler/z/codegen/OMRSnippet.cpp +++ b/compiler/z/codegen/OMRSnippet.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #pragma csect(CODE,"OMRZSnippet#C") diff --git a/compiler/z/codegen/OMRSnippet.hpp b/compiler/z/codegen/OMRSnippet.hpp index 3be687ed256..9bbdf7f2b68 100644 --- a/compiler/z/codegen/OMRSnippet.hpp +++ b/compiler/z/codegen/OMRSnippet.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Z_SNIPPET_INCL diff --git a/compiler/z/codegen/OMRTreeEvaluator.cpp b/compiler/z/codegen/OMRTreeEvaluator.cpp index 323e0baa319..eff3d2e179b 100644 --- a/compiler/z/codegen/OMRTreeEvaluator.cpp +++ b/compiler/z/codegen/OMRTreeEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ //On zOS XLC linker can't handle files with same name at link time diff --git a/compiler/z/codegen/OMRTreeEvaluator.hpp b/compiler/z/codegen/OMRTreeEvaluator.hpp index b1f76bd5014..be74453fc13 100644 --- a/compiler/z/codegen/OMRTreeEvaluator.hpp +++ b/compiler/z/codegen/OMRTreeEvaluator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Z_TREE_EVALUATOR_INCL diff --git a/compiler/z/codegen/OpMemToMem.cpp b/compiler/z/codegen/OpMemToMem.cpp index 842842b4192..fb1e094ba5e 100644 --- a/compiler/z/codegen/OpMemToMem.cpp +++ b/compiler/z/codegen/OpMemToMem.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "z/codegen/OpMemToMem.hpp" diff --git a/compiler/z/codegen/OpMemToMem.hpp b/compiler/z/codegen/OpMemToMem.hpp index 732e50981a2..2ed069f639e 100644 --- a/compiler/z/codegen/OpMemToMem.hpp +++ b/compiler/z/codegen/OpMemToMem.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OPMEMTOMEM_INCL diff --git a/compiler/z/codegen/PseudoRegisterEnum.hpp b/compiler/z/codegen/PseudoRegisterEnum.hpp index 6f915f7e64a..b51990210df 100644 --- a/compiler/z/codegen/PseudoRegisterEnum.hpp +++ b/compiler/z/codegen/PseudoRegisterEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/z/codegen/RealRegisterEnum.hpp b/compiler/z/codegen/RealRegisterEnum.hpp index 218c3c5b3ab..684a30a1d0c 100644 --- a/compiler/z/codegen/RealRegisterEnum.hpp +++ b/compiler/z/codegen/RealRegisterEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/z/codegen/RealRegisterMaskEnum.hpp b/compiler/z/codegen/RealRegisterMaskEnum.hpp index f006d3e2fb1..022b3e7cb87 100644 --- a/compiler/z/codegen/RealRegisterMaskEnum.hpp +++ b/compiler/z/codegen/RealRegisterMaskEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/z/codegen/RegisterDependency.hpp b/compiler/z/codegen/RegisterDependency.hpp index 84e90e861d4..58e81b26006 100644 --- a/compiler/z/codegen/RegisterDependency.hpp +++ b/compiler/z/codegen/RegisterDependency.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_REGISTER_DEPENDENCY_INCL diff --git a/compiler/z/codegen/S390BranchCondNames.cpp b/compiler/z/codegen/S390BranchCondNames.cpp index 4988ab91f0a..b0f911675b4 100644 --- a/compiler/z/codegen/S390BranchCondNames.cpp +++ b/compiler/z/codegen/S390BranchCondNames.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/InstOpCode.hpp" diff --git a/compiler/z/codegen/S390Debug.cpp b/compiler/z/codegen/S390Debug.cpp index dccda8996af..2ffa0aa9015 100644 --- a/compiler/z/codegen/S390Debug.cpp +++ b/compiler/z/codegen/S390Debug.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined (_MSC_VER) && (_MSC_VER < 1900) diff --git a/compiler/z/codegen/S390Evaluator.hpp b/compiler/z/codegen/S390Evaluator.hpp index 996d7105833..5d6f91aec35 100644 --- a/compiler/z/codegen/S390Evaluator.hpp +++ b/compiler/z/codegen/S390Evaluator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_S390_TREE_EVALUATOR_INCL diff --git a/compiler/z/codegen/S390GenerateInstructions.cpp b/compiler/z/codegen/S390GenerateInstructions.cpp index 3dccab37b34..0ea22ab763f 100644 --- a/compiler/z/codegen/S390GenerateInstructions.cpp +++ b/compiler/z/codegen/S390GenerateInstructions.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "z/codegen/S390GenerateInstructions.hpp" diff --git a/compiler/z/codegen/S390GenerateInstructions.hpp b/compiler/z/codegen/S390GenerateInstructions.hpp index 35d30e9a536..60956d30bc8 100644 --- a/compiler/z/codegen/S390GenerateInstructions.hpp +++ b/compiler/z/codegen/S390GenerateInstructions.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef GENERATEINSTRUCTION_INCL diff --git a/compiler/z/codegen/S390HelperCallSnippet.cpp b/compiler/z/codegen/S390HelperCallSnippet.cpp index 4df5ffdaa7f..f80d9ed9e76 100644 --- a/compiler/z/codegen/S390HelperCallSnippet.cpp +++ b/compiler/z/codegen/S390HelperCallSnippet.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "z/codegen/S390HelperCallSnippet.hpp" diff --git a/compiler/z/codegen/S390HelperCallSnippet.hpp b/compiler/z/codegen/S390HelperCallSnippet.hpp index e193c29c385..6a373a53791 100644 --- a/compiler/z/codegen/S390HelperCallSnippet.hpp +++ b/compiler/z/codegen/S390HelperCallSnippet.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef S390HELPERCALLSNIPPET_INCL diff --git a/compiler/z/codegen/S390Instruction.cpp b/compiler/z/codegen/S390Instruction.cpp index 43c73e6a4d2..354923868bb 100644 --- a/compiler/z/codegen/S390Instruction.cpp +++ b/compiler/z/codegen/S390Instruction.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/z/codegen/S390Instruction.hpp b/compiler/z/codegen/S390Instruction.hpp index 9cf445e0fa0..3ad7f28769b 100644 --- a/compiler/z/codegen/S390Instruction.hpp +++ b/compiler/z/codegen/S390Instruction.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef S390INSTRUCTION_INCL diff --git a/compiler/z/codegen/S390OutOfLineCodeSection.cpp b/compiler/z/codegen/S390OutOfLineCodeSection.cpp index 2bb593efd3a..7704463400d 100644 --- a/compiler/z/codegen/S390OutOfLineCodeSection.cpp +++ b/compiler/z/codegen/S390OutOfLineCodeSection.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "z/codegen/S390OutOfLineCodeSection.hpp" diff --git a/compiler/z/codegen/S390OutOfLineCodeSection.hpp b/compiler/z/codegen/S390OutOfLineCodeSection.hpp index e385c94575a..da58c4173ce 100644 --- a/compiler/z/codegen/S390OutOfLineCodeSection.hpp +++ b/compiler/z/codegen/S390OutOfLineCodeSection.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef S390OUTOFLINECODESECTION_INCL diff --git a/compiler/z/codegen/S390Snippets.cpp b/compiler/z/codegen/S390Snippets.cpp index e36e0bc179d..493577ce9a0 100644 --- a/compiler/z/codegen/S390Snippets.cpp +++ b/compiler/z/codegen/S390Snippets.cpp @@ -16,5 +16,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/compiler/z/codegen/S390Snippets.hpp b/compiler/z/codegen/S390Snippets.hpp index 393b58a252c..2f98d35a960 100644 --- a/compiler/z/codegen/S390Snippets.hpp +++ b/compiler/z/codegen/S390Snippets.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Z_S390SNIPPETS_INCL diff --git a/compiler/z/codegen/SystemLinkage.cpp b/compiler/z/codegen/SystemLinkage.cpp index 960878fd436..a12d6cc166c 100644 --- a/compiler/z/codegen/SystemLinkage.cpp +++ b/compiler/z/codegen/SystemLinkage.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/z/codegen/SystemLinkage.hpp b/compiler/z/codegen/SystemLinkage.hpp index 587bab23005..0f296a9bf00 100644 --- a/compiler/z/codegen/SystemLinkage.hpp +++ b/compiler/z/codegen/SystemLinkage.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_SYSTEMLINKAGE_INCL diff --git a/compiler/z/codegen/SystemLinkageLinux.cpp b/compiler/z/codegen/SystemLinkageLinux.cpp index 87534c89bb2..548b13492ad 100644 --- a/compiler/z/codegen/SystemLinkageLinux.cpp +++ b/compiler/z/codegen/SystemLinkageLinux.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // See also S390Linkage.cpp which contains more S390 Linkage diff --git a/compiler/z/codegen/SystemLinkageLinux.hpp b/compiler/z/codegen/SystemLinkageLinux.hpp index d79756d63a8..c2a736efc19 100644 --- a/compiler/z/codegen/SystemLinkageLinux.hpp +++ b/compiler/z/codegen/SystemLinkageLinux.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Z_SYSTEMLINKAGELINUX_INCL diff --git a/compiler/z/codegen/SystemLinkagezOS.cpp b/compiler/z/codegen/SystemLinkagezOS.cpp index 1045200929e..35e36c9f7ca 100644 --- a/compiler/z/codegen/SystemLinkagezOS.cpp +++ b/compiler/z/codegen/SystemLinkagezOS.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // See also S390Linkage.cpp which contains more S390 Linkage diff --git a/compiler/z/codegen/SystemLinkagezOS.hpp b/compiler/z/codegen/SystemLinkagezOS.hpp index e53815fff34..ced72b91ac3 100644 --- a/compiler/z/codegen/SystemLinkagezOS.hpp +++ b/compiler/z/codegen/SystemLinkagezOS.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Z_SYSTEMLINKAGEZOS_INCL diff --git a/compiler/z/codegen/TreeEvaluatorTable.hpp b/compiler/z/codegen/TreeEvaluatorTable.hpp index a5ed8ae9088..6bbcfa6d93c 100644 --- a/compiler/z/codegen/TreeEvaluatorTable.hpp +++ b/compiler/z/codegen/TreeEvaluatorTable.hpp @@ -16,6 +16,6 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "z/codegen/OMRTreeEvaluatorTable.hpp" diff --git a/compiler/z/codegen/UnaryEvaluator.cpp b/compiler/z/codegen/UnaryEvaluator.cpp index 91227f592f1..d95ef1117e4 100644 --- a/compiler/z/codegen/UnaryEvaluator.cpp +++ b/compiler/z/codegen/UnaryEvaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/compiler/z/codegen/snippet/PPA1Snippet.cpp b/compiler/z/codegen/snippet/PPA1Snippet.cpp index c45d559a932..08ace14c5ca 100644 --- a/compiler/z/codegen/snippet/PPA1Snippet.cpp +++ b/compiler/z/codegen/snippet/PPA1Snippet.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/Linkage.hpp" diff --git a/compiler/z/codegen/snippet/PPA1Snippet.hpp b/compiler/z/codegen/snippet/PPA1Snippet.hpp index 108f7b3a1b3..c41324df9b1 100644 --- a/compiler/z/codegen/snippet/PPA1Snippet.hpp +++ b/compiler/z/codegen/snippet/PPA1Snippet.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Z_SNIPPET_PPA1SNIPPET_INCL diff --git a/compiler/z/codegen/snippet/PPA2Snippet.cpp b/compiler/z/codegen/snippet/PPA2Snippet.cpp index ab55b600730..44e8cb74cdf 100644 --- a/compiler/z/codegen/snippet/PPA2Snippet.cpp +++ b/compiler/z/codegen/snippet/PPA2Snippet.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/Linkage.hpp" diff --git a/compiler/z/codegen/snippet/PPA2Snippet.hpp b/compiler/z/codegen/snippet/PPA2Snippet.hpp index dae3c76b4be..7cf5a7b2a24 100644 --- a/compiler/z/codegen/snippet/PPA2Snippet.hpp +++ b/compiler/z/codegen/snippet/PPA2Snippet.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Z_SNIPPET_PPA2SNIPPET_INCL diff --git a/compiler/z/env/OMRCPU.cpp b/compiler/z/env/OMRCPU.cpp index b88fb74ee6e..47247f1b8ab 100644 --- a/compiler/z/env/OMRCPU.cpp +++ b/compiler/z/env/OMRCPU.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // On zOS XLC linker can't handle files with same name at link time. diff --git a/compiler/z/env/OMRCPU.hpp b/compiler/z/env/OMRCPU.hpp index b6043e0bca9..bce55e8d1be 100644 --- a/compiler/z/env/OMRCPU.hpp +++ b/compiler/z/env/OMRCPU.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Z_CPU_INCL diff --git a/compiler/z/env/OMRDebugEnv.cpp b/compiler/z/env/OMRDebugEnv.cpp index 6592d5c2348..718ccbd55c2 100644 --- a/compiler/z/env/OMRDebugEnv.cpp +++ b/compiler/z/env/OMRDebugEnv.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #pragma csect(CODE,"OMRZDebugEnv#C") diff --git a/compiler/z/env/OMRDebugEnv.hpp b/compiler/z/env/OMRDebugEnv.hpp index 8da66f59890..8a242359d77 100644 --- a/compiler/z/env/OMRDebugEnv.hpp +++ b/compiler/z/env/OMRDebugEnv.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Z_DEBUG_ENV_INCL diff --git a/compiler/z/env/S390ProcessorEnum.hpp b/compiler/z/env/S390ProcessorEnum.hpp index d677bc3d828..2006181a069 100644 --- a/compiler/z/env/S390ProcessorEnum.hpp +++ b/compiler/z/env/S390ProcessorEnum.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/compiler/z/objectfmt/FunctionCallData.hpp b/compiler/z/objectfmt/FunctionCallData.hpp index 28bc324d34c..0e086febdbd 100644 --- a/compiler/z/objectfmt/FunctionCallData.hpp +++ b/compiler/z/objectfmt/FunctionCallData.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_FUNCTIONCALLDATA_INCL diff --git a/compiler/z/objectfmt/OMRFunctionCallData.hpp b/compiler/z/objectfmt/OMRFunctionCallData.hpp index 5552f711431..e3be0909773 100644 --- a/compiler/z/objectfmt/OMRFunctionCallData.hpp +++ b/compiler/z/objectfmt/OMRFunctionCallData.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Z_FUNCTIONCALLDATA_INCL diff --git a/compiler/z/objectfmt/OMRJitCodeRWXObjectFormat.cpp b/compiler/z/objectfmt/OMRJitCodeRWXObjectFormat.cpp index f54d42cccd2..00c939e9745 100644 --- a/compiler/z/objectfmt/OMRJitCodeRWXObjectFormat.cpp +++ b/compiler/z/objectfmt/OMRJitCodeRWXObjectFormat.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CodeGenerator.hpp" diff --git a/compiler/z/objectfmt/OMRJitCodeRWXObjectFormat.hpp b/compiler/z/objectfmt/OMRJitCodeRWXObjectFormat.hpp index eb820029a31..4dae550028f 100644 --- a/compiler/z/objectfmt/OMRJitCodeRWXObjectFormat.hpp +++ b/compiler/z/objectfmt/OMRJitCodeRWXObjectFormat.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Z_JITCODERWX_OBJECTFORMAT_INCL diff --git a/compiler/z/objectfmt/OMRJitCodeRXObjectFormat.cpp b/compiler/z/objectfmt/OMRJitCodeRXObjectFormat.cpp index 022a05763e2..a9820994066 100644 --- a/compiler/z/objectfmt/OMRJitCodeRXObjectFormat.cpp +++ b/compiler/z/objectfmt/OMRJitCodeRXObjectFormat.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CodeGenerator.hpp" diff --git a/compiler/z/objectfmt/OMRJitCodeRXObjectFormat.hpp b/compiler/z/objectfmt/OMRJitCodeRXObjectFormat.hpp index a56f00f56cf..bba66f12bb3 100644 --- a/compiler/z/objectfmt/OMRJitCodeRXObjectFormat.hpp +++ b/compiler/z/objectfmt/OMRJitCodeRXObjectFormat.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_Z_JITCODERX_OBJECTFORMAT_INCL diff --git a/compiler/z/runtime/VirtualGuardRuntime.cpp b/compiler/z/runtime/VirtualGuardRuntime.cpp index 851f5d4abe1..22137b7bfea 100644 --- a/compiler/z/runtime/VirtualGuardRuntime.cpp +++ b/compiler/z/runtime/VirtualGuardRuntime.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/configure b/configure index 85b9ef195f5..63d723af53a 100755 --- a/configure +++ b/configure @@ -2726,7 +2726,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### ############### Categorize the OS diff --git a/configure.ac b/configure.ac index bf43abc1cda..e3e9f2732ed 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # This configure.ac has been confirmed to work with Autoconf v2.63, diff --git a/ddr/CMakeLists.txt b/ddr/CMakeLists.txt index c699d3d9328..417e79c6595 100644 --- a/ddr/CMakeLists.txt +++ b/ddr/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### if(NOT OMR_DDR) diff --git a/ddr/Makefile b/ddr/Makefile index 2d0f7214c93..033a86c968e 100644 --- a/ddr/Makefile +++ b/ddr/Makefile @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### top_srcdir := .. diff --git a/ddr/include/ddr/blobgen/genBlob.hpp b/ddr/include/ddr/blobgen/genBlob.hpp index 8785ca77d55..73dea23bdcc 100644 --- a/ddr/include/ddr/blobgen/genBlob.hpp +++ b/ddr/include/ddr/blobgen/genBlob.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef GENBLOB_HPP diff --git a/ddr/include/ddr/blobgen/java/genBinaryBlob.hpp b/ddr/include/ddr/blobgen/java/genBinaryBlob.hpp index ced453bd57d..930025cb240 100644 --- a/ddr/include/ddr/blobgen/java/genBinaryBlob.hpp +++ b/ddr/include/ddr/blobgen/java/genBinaryBlob.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef GENBINARYBLOB_HPP diff --git a/ddr/include/ddr/blobgen/java/genSuperset.hpp b/ddr/include/ddr/blobgen/java/genSuperset.hpp index d11ef020e06..280a3b409b8 100644 --- a/ddr/include/ddr/blobgen/java/genSuperset.hpp +++ b/ddr/include/ddr/blobgen/java/genSuperset.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef GENSUPERSET_HPP diff --git a/ddr/include/ddr/config.hpp b/ddr/include/ddr/config.hpp index ea70b01055e..6f2941581ad 100644 --- a/ddr/include/ddr/config.hpp +++ b/ddr/include/ddr/config.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CONFIG_HPP diff --git a/ddr/include/ddr/error.hpp b/ddr/include/ddr/error.hpp index b4eb83eb73d..6ef8427f865 100644 --- a/ddr/include/ddr/error.hpp +++ b/ddr/include/ddr/error.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(DDR_ERROR_HPP) diff --git a/ddr/include/ddr/ir/ClassType.hpp b/ddr/include/ddr/ir/ClassType.hpp index a25f51f4f36..1284dca5c08 100644 --- a/ddr/include/ddr/ir/ClassType.hpp +++ b/ddr/include/ddr/ir/ClassType.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CLASSTYPE_HPP diff --git a/ddr/include/ddr/ir/ClassUDT.hpp b/ddr/include/ddr/ir/ClassUDT.hpp index 68fedb0a96f..822dbda0573 100644 --- a/ddr/include/ddr/ir/ClassUDT.hpp +++ b/ddr/include/ddr/ir/ClassUDT.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CLASSUDT_HPP diff --git a/ddr/include/ddr/ir/EnumMember.hpp b/ddr/include/ddr/ir/EnumMember.hpp index e016d09eb42..76b9101c31a 100644 --- a/ddr/include/ddr/ir/EnumMember.hpp +++ b/ddr/include/ddr/ir/EnumMember.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ENUMMEMBER_HPP diff --git a/ddr/include/ddr/ir/EnumUDT.hpp b/ddr/include/ddr/ir/EnumUDT.hpp index 27289721a25..570573fa3ea 100644 --- a/ddr/include/ddr/ir/EnumUDT.hpp +++ b/ddr/include/ddr/ir/EnumUDT.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ENUMUDT_HPP diff --git a/ddr/include/ddr/ir/Field.hpp b/ddr/include/ddr/ir/Field.hpp index 01695b8e0b9..4d14ab749e8 100644 --- a/ddr/include/ddr/ir/Field.hpp +++ b/ddr/include/ddr/ir/Field.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef FIELD_HPP diff --git a/ddr/include/ddr/ir/Macro.hpp b/ddr/include/ddr/ir/Macro.hpp index cf4a57e02ab..3b6e2e768e0 100644 --- a/ddr/include/ddr/ir/Macro.hpp +++ b/ddr/include/ddr/ir/Macro.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef MACRO_HPP diff --git a/ddr/include/ddr/ir/Members.hpp b/ddr/include/ddr/ir/Members.hpp index 535ce414aa0..b4158861e98 100644 --- a/ddr/include/ddr/ir/Members.hpp +++ b/ddr/include/ddr/ir/Members.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef MEMBERS_HPP diff --git a/ddr/include/ddr/ir/Modifiers.hpp b/ddr/include/ddr/ir/Modifiers.hpp index 3eacce8765c..7b670c8aaac 100644 --- a/ddr/include/ddr/ir/Modifiers.hpp +++ b/ddr/include/ddr/ir/Modifiers.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef MODIFIERS_HPP diff --git a/ddr/include/ddr/ir/NamespaceUDT.hpp b/ddr/include/ddr/ir/NamespaceUDT.hpp index 620cc58b622..566bcabbda2 100644 --- a/ddr/include/ddr/ir/NamespaceUDT.hpp +++ b/ddr/include/ddr/ir/NamespaceUDT.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef NAMESPACEUDT_HPP diff --git a/ddr/include/ddr/ir/Symbol_IR.hpp b/ddr/include/ddr/ir/Symbol_IR.hpp index 646019b983b..892ea172ffa 100644 --- a/ddr/include/ddr/ir/Symbol_IR.hpp +++ b/ddr/include/ddr/ir/Symbol_IR.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SYMBOL_IR_HPP diff --git a/ddr/include/ddr/ir/TextFile.hpp b/ddr/include/ddr/ir/TextFile.hpp index 174d71308a7..132cd303700 100644 --- a/ddr/include/ddr/ir/TextFile.hpp +++ b/ddr/include/ddr/ir/TextFile.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TEXTFILE_HPP diff --git a/ddr/include/ddr/ir/Type.hpp b/ddr/include/ddr/ir/Type.hpp index a38077f53b4..6e0e27ef75f 100644 --- a/ddr/include/ddr/ir/Type.hpp +++ b/ddr/include/ddr/ir/Type.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TYPE_HPP diff --git a/ddr/include/ddr/ir/TypePrinter.hpp b/ddr/include/ddr/ir/TypePrinter.hpp index 33221026bfb..b4f8546aa86 100644 --- a/ddr/include/ddr/ir/TypePrinter.hpp +++ b/ddr/include/ddr/ir/TypePrinter.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ddr/ir/TypeVisitor.hpp" diff --git a/ddr/include/ddr/ir/TypeVisitor.hpp b/ddr/include/ddr/ir/TypeVisitor.hpp index dbea9d78a3f..c07b9c4934d 100644 --- a/ddr/include/ddr/ir/TypeVisitor.hpp +++ b/ddr/include/ddr/ir/TypeVisitor.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TYPEVISITOR_HPP diff --git a/ddr/include/ddr/ir/TypedefUDT.hpp b/ddr/include/ddr/ir/TypedefUDT.hpp index 4aa4efa6a21..0881a5f21b1 100644 --- a/ddr/include/ddr/ir/TypedefUDT.hpp +++ b/ddr/include/ddr/ir/TypedefUDT.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TYPEDEFUDT_HPP diff --git a/ddr/include/ddr/ir/UDT.hpp b/ddr/include/ddr/ir/UDT.hpp index f18438f714e..981bafe3a0a 100644 --- a/ddr/include/ddr/ir/UDT.hpp +++ b/ddr/include/ddr/ir/UDT.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef UDT_HPP diff --git a/ddr/include/ddr/ir/UnionUDT.hpp b/ddr/include/ddr/ir/UnionUDT.hpp index c306af1126e..9bf9b2bbb6d 100644 --- a/ddr/include/ddr/ir/UnionUDT.hpp +++ b/ddr/include/ddr/ir/UnionUDT.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef UNIONUDT_HPP diff --git a/ddr/include/ddr/macros/MacroInfo.hpp b/ddr/include/ddr/macros/MacroInfo.hpp index 780f2dff053..092905d3ff3 100644 --- a/ddr/include/ddr/macros/MacroInfo.hpp +++ b/ddr/include/ddr/macros/MacroInfo.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef MACROINFO_HPP diff --git a/ddr/include/ddr/macros/MacroTool.hpp b/ddr/include/ddr/macros/MacroTool.hpp index 4f3406cb585..1af5d75c0c0 100644 --- a/ddr/include/ddr/macros/MacroTool.hpp +++ b/ddr/include/ddr/macros/MacroTool.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef MACROTOOL_HPP diff --git a/ddr/include/ddr/scanner/Scanner.hpp b/ddr/include/ddr/scanner/Scanner.hpp index 38a73befa22..b784d516b3a 100644 --- a/ddr/include/ddr/scanner/Scanner.hpp +++ b/ddr/include/ddr/scanner/Scanner.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SCANNER_HPP diff --git a/ddr/include/ddr/scanner/dwarf/AixSymbolTableParser.hpp b/ddr/include/ddr/scanner/dwarf/AixSymbolTableParser.hpp index b0167d8cdcf..c7f5422d7f7 100644 --- a/ddr/include/ddr/scanner/dwarf/AixSymbolTableParser.hpp +++ b/ddr/include/ddr/scanner/dwarf/AixSymbolTableParser.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef AixSymbolTableParser_HPP diff --git a/ddr/include/ddr/scanner/dwarf/DwarfFunctions.hpp b/ddr/include/ddr/scanner/dwarf/DwarfFunctions.hpp index af7633ecc73..bbaf1270561 100644 --- a/ddr/include/ddr/scanner/dwarf/DwarfFunctions.hpp +++ b/ddr/include/ddr/scanner/dwarf/DwarfFunctions.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef DWARFFUNCTIONS_HPP #define DWARFFUNCTIONS_HPP diff --git a/ddr/include/ddr/scanner/dwarf/DwarfScanner.hpp b/ddr/include/ddr/scanner/dwarf/DwarfScanner.hpp index c4a452dc94c..01230ff8c51 100644 --- a/ddr/include/ddr/scanner/dwarf/DwarfScanner.hpp +++ b/ddr/include/ddr/scanner/dwarf/DwarfScanner.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef DWARFSCANNER_HPP diff --git a/ddr/include/ddr/scanner/pdb/PdbScanner.hpp b/ddr/include/ddr/scanner/pdb/PdbScanner.hpp index 1a07db92052..a3d1a2ff1a8 100644 --- a/ddr/include/ddr/scanner/pdb/PdbScanner.hpp +++ b/ddr/include/ddr/scanner/pdb/PdbScanner.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PDBSCANNER_HPP diff --git a/ddr/include/ddr/std/sstream.hpp b/ddr/include/ddr/std/sstream.hpp index bb2b87700ab..c628aecd332 100644 --- a/ddr/include/ddr/std/sstream.hpp +++ b/ddr/include/ddr/std/sstream.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SSTREAM_HPP diff --git a/ddr/include/ddr/std/string.hpp b/ddr/include/ddr/std/string.hpp index 23fc55768b6..136a1527a79 100644 --- a/ddr/include/ddr/std/string.hpp +++ b/ddr/include/ddr/std/string.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef STRING_HPP diff --git a/ddr/include/ddr/std/unordered_map.hpp b/ddr/include/ddr/std/unordered_map.hpp index cabe06fdf31..a7cd116a08b 100644 --- a/ddr/include/ddr/std/unordered_map.hpp +++ b/ddr/include/ddr/std/unordered_map.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(DDR_UNORDERED_MAP) diff --git a/ddr/lib/CMakeLists.txt b/ddr/lib/CMakeLists.txt index 870406a581d..598de6901ef 100644 --- a/ddr/lib/CMakeLists.txt +++ b/ddr/lib/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### add_subdirectory(ddr-blobgen) diff --git a/ddr/lib/Makefile b/ddr/lib/Makefile index bb2d7e52b03..3a68f634408 100644 --- a/ddr/lib/Makefile +++ b/ddr/lib/Makefile @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### top_srcdir := ../.. diff --git a/ddr/lib/ddr-blobgen/CMakeLists.txt b/ddr/lib/ddr-blobgen/CMakeLists.txt index 67e080f35ad..e432a16a859 100644 --- a/ddr/lib/ddr-blobgen/CMakeLists.txt +++ b/ddr/lib/ddr-blobgen/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### omr_add_library(omr_ddr_blobgen diff --git a/ddr/lib/ddr-blobgen/Makefile b/ddr/lib/ddr-blobgen/Makefile index fa9fb389bdd..b67317e9797 100644 --- a/ddr/lib/ddr-blobgen/Makefile +++ b/ddr/lib/ddr-blobgen/Makefile @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### top_srcdir=../../.. diff --git a/ddr/lib/ddr-blobgen/java/genBinaryBlob.cpp b/ddr/lib/ddr-blobgen/java/genBinaryBlob.cpp index ff4a5ef67fd..0fec710edd6 100644 --- a/ddr/lib/ddr-blobgen/java/genBinaryBlob.cpp +++ b/ddr/lib/ddr-blobgen/java/genBinaryBlob.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ddr/blobgen/java/genBinaryBlob.hpp" diff --git a/ddr/lib/ddr-blobgen/java/genBlobJava.cpp b/ddr/lib/ddr-blobgen/java/genBlobJava.cpp index ca6243efccf..1bf2960dc6f 100644 --- a/ddr/lib/ddr-blobgen/java/genBlobJava.cpp +++ b/ddr/lib/ddr-blobgen/java/genBlobJava.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ddr/blobgen/genBlob.hpp" diff --git a/ddr/lib/ddr-blobgen/java/genSuperset.cpp b/ddr/lib/ddr-blobgen/java/genSuperset.cpp index efeac2fbace..aa5f261a4d1 100644 --- a/ddr/lib/ddr-blobgen/java/genSuperset.cpp +++ b/ddr/lib/ddr-blobgen/java/genSuperset.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ddr/blobgen/java/genSuperset.hpp" diff --git a/ddr/lib/ddr-ir/CMakeLists.txt b/ddr/lib/ddr-ir/CMakeLists.txt index d6a642427fe..a4c20be1109 100644 --- a/ddr/lib/ddr-ir/CMakeLists.txt +++ b/ddr/lib/ddr-ir/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### omr_add_library(omr_ddr_ir diff --git a/ddr/lib/ddr-ir/ClassType.cpp b/ddr/lib/ddr-ir/ClassType.cpp index be8b2acc435..e12c70bd550 100644 --- a/ddr/lib/ddr-ir/ClassType.cpp +++ b/ddr/lib/ddr-ir/ClassType.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ddr/ir/ClassType.hpp" diff --git a/ddr/lib/ddr-ir/ClassUDT.cpp b/ddr/lib/ddr-ir/ClassUDT.cpp index 2aaf29505a5..dd64a78e007 100644 --- a/ddr/lib/ddr-ir/ClassUDT.cpp +++ b/ddr/lib/ddr-ir/ClassUDT.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ddr/ir/ClassUDT.hpp" diff --git a/ddr/lib/ddr-ir/EnumMember.cpp b/ddr/lib/ddr-ir/EnumMember.cpp index 82d1c03f322..c95bb8490b5 100644 --- a/ddr/lib/ddr-ir/EnumMember.cpp +++ b/ddr/lib/ddr-ir/EnumMember.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ddr/ir/EnumMember.hpp" diff --git a/ddr/lib/ddr-ir/EnumUDT.cpp b/ddr/lib/ddr-ir/EnumUDT.cpp index 13e0de975a9..c9c83922567 100644 --- a/ddr/lib/ddr-ir/EnumUDT.cpp +++ b/ddr/lib/ddr-ir/EnumUDT.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ddr/ir/EnumUDT.hpp" diff --git a/ddr/lib/ddr-ir/Field.cpp b/ddr/lib/ddr-ir/Field.cpp index adad5b8db61..15e43d8651a 100644 --- a/ddr/lib/ddr-ir/Field.cpp +++ b/ddr/lib/ddr-ir/Field.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ddr/ir/Field.hpp" diff --git a/ddr/lib/ddr-ir/Macro.cpp b/ddr/lib/ddr-ir/Macro.cpp index d61cb4ef980..ccaa785e90e 100644 --- a/ddr/lib/ddr-ir/Macro.cpp +++ b/ddr/lib/ddr-ir/Macro.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ddr/ir/Macro.hpp" diff --git a/ddr/lib/ddr-ir/Makefile b/ddr/lib/ddr-ir/Makefile index aec99780310..73d1a988eec 100644 --- a/ddr/lib/ddr-ir/Makefile +++ b/ddr/lib/ddr-ir/Makefile @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### top_srcdir = ../../.. diff --git a/ddr/lib/ddr-ir/Members.cpp b/ddr/lib/ddr-ir/Members.cpp index 1a5a30c5aa4..f87c7e52dfe 100644 --- a/ddr/lib/ddr-ir/Members.cpp +++ b/ddr/lib/ddr-ir/Members.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ddr/ir/Members.hpp" diff --git a/ddr/lib/ddr-ir/Modifiers.cpp b/ddr/lib/ddr-ir/Modifiers.cpp index 234ff2d00a1..fa8de09951b 100644 --- a/ddr/lib/ddr-ir/Modifiers.cpp +++ b/ddr/lib/ddr-ir/Modifiers.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/ddr/lib/ddr-ir/NamespaceUDT.cpp b/ddr/lib/ddr-ir/NamespaceUDT.cpp index dacce3e3e78..c8e1b6c26f0 100644 --- a/ddr/lib/ddr-ir/NamespaceUDT.cpp +++ b/ddr/lib/ddr-ir/NamespaceUDT.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ddr/ir/NamespaceUDT.hpp" diff --git a/ddr/lib/ddr-ir/Symbol_IR.cpp b/ddr/lib/ddr-ir/Symbol_IR.cpp index 840cc9bd5ce..0dcf6d31d01 100644 --- a/ddr/lib/ddr-ir/Symbol_IR.cpp +++ b/ddr/lib/ddr-ir/Symbol_IR.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ddr/ir/Symbol_IR.hpp" diff --git a/ddr/lib/ddr-ir/TextFile.cpp b/ddr/lib/ddr-ir/TextFile.cpp index 03536b6f066..61628b0209d 100644 --- a/ddr/lib/ddr-ir/TextFile.cpp +++ b/ddr/lib/ddr-ir/TextFile.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ddr/ir/TextFile.hpp" diff --git a/ddr/lib/ddr-ir/Type.cpp b/ddr/lib/ddr-ir/Type.cpp index dcd549d3f9a..338e8e0fcde 100644 --- a/ddr/lib/ddr-ir/Type.cpp +++ b/ddr/lib/ddr-ir/Type.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ddr/ir/Type.hpp" diff --git a/ddr/lib/ddr-ir/TypePrinter.cpp b/ddr/lib/ddr-ir/TypePrinter.cpp index 815d31289ba..19f6fe99cb7 100644 --- a/ddr/lib/ddr-ir/TypePrinter.cpp +++ b/ddr/lib/ddr-ir/TypePrinter.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ddr/ir/TypePrinter.hpp" diff --git a/ddr/lib/ddr-ir/TypedefUDT.cpp b/ddr/lib/ddr-ir/TypedefUDT.cpp index f4c7ec05c79..d0f0095d2c6 100644 --- a/ddr/lib/ddr-ir/TypedefUDT.cpp +++ b/ddr/lib/ddr-ir/TypedefUDT.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ddr/ir/TypedefUDT.hpp" diff --git a/ddr/lib/ddr-ir/UDT.cpp b/ddr/lib/ddr-ir/UDT.cpp index e0b98c3718b..0c23cca8151 100644 --- a/ddr/lib/ddr-ir/UDT.cpp +++ b/ddr/lib/ddr-ir/UDT.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ddr/ir/UDT.hpp" diff --git a/ddr/lib/ddr-ir/UnionUDT.cpp b/ddr/lib/ddr-ir/UnionUDT.cpp index 55aa6a838f2..44ca68b624f 100644 --- a/ddr/lib/ddr-ir/UnionUDT.cpp +++ b/ddr/lib/ddr-ir/UnionUDT.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ddr/ir/UnionUDT.hpp" diff --git a/ddr/lib/ddr-macros/CMakeLists.txt b/ddr/lib/ddr-macros/CMakeLists.txt index d7db2aa4b2a..57ddcd71081 100644 --- a/ddr/lib/ddr-macros/CMakeLists.txt +++ b/ddr/lib/ddr-macros/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### omr_add_library(omr_ddr_macros diff --git a/ddr/lib/ddr-macros/MacroInfo.cpp b/ddr/lib/ddr-macros/MacroInfo.cpp index d1c37d23d8e..59b90d0c45e 100644 --- a/ddr/lib/ddr-macros/MacroInfo.cpp +++ b/ddr/lib/ddr-macros/MacroInfo.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ddr/macros/MacroInfo.hpp" diff --git a/ddr/lib/ddr-macros/MacroTool.cpp b/ddr/lib/ddr-macros/MacroTool.cpp index 4309e44ae97..add434674ae 100644 --- a/ddr/lib/ddr-macros/MacroTool.cpp +++ b/ddr/lib/ddr-macros/MacroTool.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ddr/macros/MacroTool.hpp" diff --git a/ddr/lib/ddr-macros/Makefile b/ddr/lib/ddr-macros/Makefile index 074d41e3d9a..95210aa8a34 100644 --- a/ddr/lib/ddr-macros/Makefile +++ b/ddr/lib/ddr-macros/Makefile @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### top_srcdir = ../../.. diff --git a/ddr/lib/ddr-scanner/CMakeLists.txt b/ddr/lib/ddr-scanner/CMakeLists.txt index de905ab1d0c..11e9f42408f 100644 --- a/ddr/lib/ddr-scanner/CMakeLists.txt +++ b/ddr/lib/ddr-scanner/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### omr_add_library(omr_ddr_scanner diff --git a/ddr/lib/ddr-scanner/Makefile b/ddr/lib/ddr-scanner/Makefile index 078760f7013..07c3a42a246 100644 --- a/ddr/lib/ddr-scanner/Makefile +++ b/ddr/lib/ddr-scanner/Makefile @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### top_srcdir = ../../.. diff --git a/ddr/lib/ddr-scanner/Scanner.cpp b/ddr/lib/ddr-scanner/Scanner.cpp index ab38ff847db..9bcf6190e69 100644 --- a/ddr/lib/ddr-scanner/Scanner.cpp +++ b/ddr/lib/ddr-scanner/Scanner.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ddr/scanner/Scanner.hpp" diff --git a/ddr/lib/ddr-scanner/dwarf/AixSymbolTableParser.cpp b/ddr/lib/ddr-scanner/dwarf/AixSymbolTableParser.cpp index 002d15aaac4..e3f7a7fef50 100644 --- a/ddr/lib/ddr-scanner/dwarf/AixSymbolTableParser.cpp +++ b/ddr/lib/ddr-scanner/dwarf/AixSymbolTableParser.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ddr/error.hpp" diff --git a/ddr/lib/ddr-scanner/dwarf/DwarfFunctions.cpp b/ddr/lib/ddr-scanner/dwarf/DwarfFunctions.cpp index 591fcb32865..8d340dfe7e5 100644 --- a/ddr/lib/ddr-scanner/dwarf/DwarfFunctions.cpp +++ b/ddr/lib/ddr-scanner/dwarf/DwarfFunctions.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ddr/scanner/dwarf/DwarfFunctions.hpp" diff --git a/ddr/lib/ddr-scanner/dwarf/DwarfParser.cpp b/ddr/lib/ddr-scanner/dwarf/DwarfParser.cpp index 21fa30b454d..93167543b1a 100644 --- a/ddr/lib/ddr-scanner/dwarf/DwarfParser.cpp +++ b/ddr/lib/ddr-scanner/dwarf/DwarfParser.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ddr/scanner/dwarf/DwarfFunctions.hpp" diff --git a/ddr/lib/ddr-scanner/dwarf/DwarfScanner.cpp b/ddr/lib/ddr-scanner/dwarf/DwarfScanner.cpp index 706762bc19c..3a4387c8158 100644 --- a/ddr/lib/ddr-scanner/dwarf/DwarfScanner.cpp +++ b/ddr/lib/ddr-scanner/dwarf/DwarfScanner.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ddr/scanner/dwarf/DwarfScanner.hpp" diff --git a/ddr/lib/ddr-scanner/pdb/PdbScanner.cpp b/ddr/lib/ddr-scanner/pdb/PdbScanner.cpp index c3086e347e8..aeae04ab990 100644 --- a/ddr/lib/ddr-scanner/pdb/PdbScanner.cpp +++ b/ddr/lib/ddr-scanner/pdb/PdbScanner.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ddr/scanner/pdb/PdbScanner.hpp" diff --git a/ddr/test/CMakeLists.txt b/ddr/test/CMakeLists.txt index 8282c7c5e97..e3019a4c983 100644 --- a/ddr/test/CMakeLists.txt +++ b/ddr/test/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################# include(OmrDDRSupport) diff --git a/ddr/test/makefile b/ddr/test/makefile index f30f7f72d0e..4f5743e312e 100644 --- a/ddr/test/makefile +++ b/ddr/test/makefile @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### top_srcdir = ../.. diff --git a/ddr/test/map_to_type/map_to_type.hpp b/ddr/test/map_to_type/map_to_type.hpp index 2504ae70c4e..1dcc6ba69cf 100644 --- a/ddr/test/map_to_type/map_to_type.hpp +++ b/ddr/test/map_to_type/map_to_type.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /*@ddr_namespace: map_to_type=MapToTypeTest1*/ diff --git a/ddr/test/sample1.cpp b/ddr/test/sample1.cpp index d05566286c9..972a7c0d2b3 100644 --- a/ddr/test/sample1.cpp +++ b/ddr/test/sample1.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/ddr/test/sample2.cpp b/ddr/test/sample2.cpp index 97f0ba09bee..33d9086f2b4 100644 --- a/ddr/test/sample2.cpp +++ b/ddr/test/sample2.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/ddr/test/sample3.cpp b/ddr/test/sample3.cpp index 7e9cce82ab4..9db6d41f50b 100644 --- a/ddr/test/sample3.cpp +++ b/ddr/test/sample3.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/ddr/test/sample4.c b/ddr/test/sample4.c index 12ba3e68c18..204bbcde340 100644 --- a/ddr/test/sample4.c +++ b/ddr/test/sample4.c @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/ddr/test/test.cpp b/ddr/test/test.cpp index 4b18f5de7da..21ec03fc8a0 100644 --- a/ddr/test/test.cpp +++ b/ddr/test/test.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "testHeader.h" diff --git a/ddr/test/testHeader.h b/ddr/test/testHeader.h index 8cd865e2886..a642a4ffcb4 100644 --- a/ddr/test/testHeader.h +++ b/ddr/test/testHeader.h @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/ddr/test/test_subdir/testFileInSubDir.cpp b/ddr/test/test_subdir/testFileInSubDir.cpp index d206dde396d..aae041dc356 100644 --- a/ddr/test/test_subdir/testFileInSubDir.cpp +++ b/ddr/test/test_subdir/testFileInSubDir.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "testHeaderInSubDir.hpp" diff --git a/ddr/test/test_subdir/testHeaderInSubDir.hpp b/ddr/test/test_subdir/testHeaderInSubDir.hpp index b613d26a6c5..834907ac805 100644 --- a/ddr/test/test_subdir/testHeaderInSubDir.hpp +++ b/ddr/test/test_subdir/testHeaderInSubDir.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* Since no ddr_format is specified, this define should be ignored */ diff --git a/ddr/tools/CMakeLists.txt b/ddr/tools/CMakeLists.txt index 2477e14bcf5..375814a2b1d 100644 --- a/ddr/tools/CMakeLists.txt +++ b/ddr/tools/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### add_subdirectory(blob_reader) diff --git a/ddr/tools/Makefile b/ddr/tools/Makefile index a5072c2f211..b93852fddfa 100644 --- a/ddr/tools/Makefile +++ b/ddr/tools/Makefile @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### top_srcdir := ../.. diff --git a/ddr/tools/blob_reader/CMakeLists.txt b/ddr/tools/blob_reader/CMakeLists.txt index 31d5082a453..8f27138058a 100644 --- a/ddr/tools/blob_reader/CMakeLists.txt +++ b/ddr/tools/blob_reader/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### omr_add_executable(omr_blob_reader diff --git a/ddr/tools/blob_reader/Makefile b/ddr/tools/blob_reader/Makefile index e5e9aff696d..e97f5503ee4 100644 --- a/ddr/tools/blob_reader/Makefile +++ b/ddr/tools/blob_reader/Makefile @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### top_srcdir = ../../.. diff --git a/ddr/tools/blob_reader/blob_reader.cpp b/ddr/tools/blob_reader/blob_reader.cpp index 72a7187ab20..0c7b6cef6fc 100644 --- a/ddr/tools/blob_reader/blob_reader.cpp +++ b/ddr/tools/blob_reader/blob_reader.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ddr/config.hpp" diff --git a/ddr/tools/ddrgen/CMakeLists.txt b/ddr/tools/ddrgen/CMakeLists.txt index 68f12c97bcf..c2ffcd4246c 100644 --- a/ddr/tools/ddrgen/CMakeLists.txt +++ b/ddr/tools/ddrgen/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### omr_add_executable(omr_ddrgen diff --git a/ddr/tools/ddrgen/Makefile b/ddr/tools/ddrgen/Makefile index f7478f8d4e1..a70c17e6ab1 100644 --- a/ddr/tools/ddrgen/Makefile +++ b/ddr/tools/ddrgen/Makefile @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### top_srcdir = ../../.. diff --git a/ddr/tools/ddrgen/ddrgen.cpp b/ddr/tools/ddrgen/ddrgen.cpp index 390dd7de07b..633d9e89155 100644 --- a/ddr/tools/ddrgen/ddrgen.cpp +++ b/ddr/tools/ddrgen/ddrgen.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ddr/config.hpp" diff --git a/ddr/tools/getmacros b/ddr/tools/getmacros index 6a753de95ef..979622ff073 100755 --- a/ddr/tools/getmacros +++ b/ddr/tools/getmacros @@ -18,7 +18,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### debug=1 diff --git a/ddr_artifacts.mk b/ddr_artifacts.mk index f6bf3fbd702..d024e60746c 100644 --- a/ddr_artifacts.mk +++ b/ddr_artifacts.mk @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### ### diff --git a/doc/BuildingWithCMake.md b/doc/BuildingWithCMake.md index 782421fecfc..23ab52c51ea 100644 --- a/doc/BuildingWithCMake.md +++ b/doc/BuildingWithCMake.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Building with CMake diff --git a/doc/CodingStandard.md b/doc/CodingStandard.md index 8863e51a0eb..e64ad5d4994 100644 --- a/doc/CodingStandard.md +++ b/doc/CodingStandard.md @@ -16,7 +16,7 @@ License, version 2 with the OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # OMR C and C++ Coding Standards diff --git a/doc/GitCrashCourse.md b/doc/GitCrashCourse.md index 279b26d8755..f1d3201ab5e 100644 --- a/doc/GitCrashCourse.md +++ b/doc/GitCrashCourse.md @@ -16,7 +16,7 @@ License, version 2 with the OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Git Crash Course diff --git a/doc/GuideForCommitters.md b/doc/GuideForCommitters.md index f33c206d68d..2c9ada50cf8 100644 --- a/doc/GuideForCommitters.md +++ b/doc/GuideForCommitters.md @@ -16,7 +16,7 @@ License, version 2 with the OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OMR Committer Guide diff --git a/doc/SupportedC++Features.md b/doc/SupportedC++Features.md index 69d211ac4c2..9430f5af991 100644 --- a/doc/SupportedC++Features.md +++ b/doc/SupportedC++Features.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Supported C++ Features diff --git a/doc/compiler/CompilerOptions.md b/doc/compiler/CompilerOptions.md index c905f9c46e5..e096912e931 100644 --- a/doc/compiler/CompilerOptions.md +++ b/doc/compiler/CompilerOptions.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # OMR Compiler Options diff --git a/doc/compiler/Contributing.md b/doc/compiler/Contributing.md index 8341622d031..51e92d5ac1b 100644 --- a/doc/compiler/Contributing.md +++ b/doc/compiler/Contributing.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Contributing {#Contributing} diff --git a/doc/compiler/ProblemDetermination.md b/doc/compiler/ProblemDetermination.md index 370e20f8840..b61ecef3cac 100644 --- a/doc/compiler/ProblemDetermination.md +++ b/doc/compiler/ProblemDetermination.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Introduction diff --git a/doc/compiler/README.md b/doc/compiler/README.md index 635f8c38790..4962d8dc6e7 100644 --- a/doc/compiler/README.md +++ b/doc/compiler/README.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> This directory contains long form prose articles that can be collated together by doxygen. diff --git a/doc/compiler/debug/DebugCounters.md b/doc/compiler/debug/DebugCounters.md index cf0de7b05fb..0d717408967 100644 --- a/doc/compiler/debug/DebugCounters.md +++ b/doc/compiler/debug/DebugCounters.md @@ -17,8 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Debug Counters diff --git a/doc/compiler/extensible_classes/Extensible_Classes.md b/doc/compiler/extensible_classes/Extensible_Classes.md index 7711671e683..713e1ad75b4 100644 --- a/doc/compiler/extensible_classes/Extensible_Classes.md +++ b/doc/compiler/extensible_classes/Extensible_Classes.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Extensible Classes {#ExtensibleClasses} diff --git a/doc/compiler/extensible_classes/Extensible_Classes_in_OMR.md b/doc/compiler/extensible_classes/Extensible_Classes_in_OMR.md index 66ba8105b96..7ec9ee18a7b 100644 --- a/doc/compiler/extensible_classes/Extensible_Classes_in_OMR.md +++ b/doc/compiler/extensible_classes/Extensible_Classes_in_OMR.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Extensible Classes in OMR {#OMRExtensibleClasses} diff --git a/doc/compiler/il/ExtendingTrees.md b/doc/compiler/il/ExtendingTrees.md index b12928ee70d..826c3cebf32 100644 --- a/doc/compiler/il/ExtendingTrees.md +++ b/doc/compiler/il/ExtendingTrees.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Extending Trees {#ExtendingTrees} diff --git a/doc/compiler/il/GlRegDeps.md b/doc/compiler/il/GlRegDeps.md index ad61762bee8..2ad32e5e2da 100644 --- a/doc/compiler/il/GlRegDeps.md +++ b/doc/compiler/il/GlRegDeps.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Global Register Dependency diff --git a/doc/compiler/il/ILOpcodes.md b/doc/compiler/il/ILOpcodes.md index 466c2bc5864..f8069bda7d4 100644 --- a/doc/compiler/il/ILOpcodes.md +++ b/doc/compiler/il/ILOpcodes.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Notes on IL Opcodes diff --git a/doc/compiler/il/IntroToTrees.md b/doc/compiler/il/IntroToTrees.md index e1f10fbc974..0f9f67c3759 100644 --- a/doc/compiler/il/IntroToTrees.md +++ b/doc/compiler/il/IntroToTrees.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Testarossa's Intermediate Language: An Intro to Trees {#IntroToTrees} diff --git a/doc/compiler/il/MainlineAndOutOfLineCode.md b/doc/compiler/il/MainlineAndOutOfLineCode.md index b1f210b54d5..d96293e18ab 100644 --- a/doc/compiler/il/MainlineAndOutOfLineCode.md +++ b/doc/compiler/il/MainlineAndOutOfLineCode.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Mainline and Out of Line Code diff --git a/doc/compiler/il/Node.md b/doc/compiler/il/Node.md index c1b67f5b1d8..a285bc63e00 100644 --- a/doc/compiler/il/Node.md +++ b/doc/compiler/il/Node.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Node diff --git a/doc/compiler/il/SymbolsSymrefsAliasing.md b/doc/compiler/il/SymbolsSymrefsAliasing.md index 200a85ebe47..e6c5b68180a 100644 --- a/doc/compiler/il/SymbolsSymrefsAliasing.md +++ b/doc/compiler/il/SymbolsSymrefsAliasing.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Symbols, Symbol References, and Aliasing in the OMR compiler diff --git a/doc/compiler/optimizer/Inliner.md b/doc/compiler/optimizer/Inliner.md index 178faba1385..696c059c20f 100644 --- a/doc/compiler/optimizer/Inliner.md +++ b/doc/compiler/optimizer/Inliner.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ## Overview diff --git a/doc/compiler/osr/OSR.md b/doc/compiler/osr/OSR.md index 6606c9938e8..22982034e49 100644 --- a/doc/compiler/osr/OSR.md +++ b/doc/compiler/osr/OSR.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/doc/compiler/regular_expression/Regular_Expression.md b/doc/compiler/regular_expression/Regular_Expression.md index ce9e3e88a1f..e7d4716152b 100644 --- a/doc/compiler/regular_expression/Regular_Expression.md +++ b/doc/compiler/regular_expression/Regular_Expression.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Regular expression diff --git a/doc/compiler/runtime/CodeMetaData.md b/doc/compiler/runtime/CodeMetaData.md index 0953a4d2b36..519e58b65db 100644 --- a/doc/compiler/runtime/CodeMetaData.md +++ b/doc/compiler/runtime/CodeMetaData.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Code Metadata and Code Metadata Manager in the Eclipse OMR compiler diff --git a/doc/compiler/runtime/ELFGenerator.md b/doc/compiler/runtime/ELFGenerator.md index a0793c606d3..ddd6f723c37 100644 --- a/doc/compiler/runtime/ELFGenerator.md +++ b/doc/compiler/runtime/ELFGenerator.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # ELFGenerator diff --git a/doc/compiler/tril/TrilLanguageReference.md b/doc/compiler/tril/TrilLanguageReference.md index 93c01f8a19f..56d1877e9b8 100644 --- a/doc/compiler/tril/TrilLanguageReference.md +++ b/doc/compiler/tril/TrilLanguageReference.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Tril Language Reference diff --git a/doc/compiler/x/OpCodeEncoding.md b/doc/compiler/x/OpCodeEncoding.md index 129bab85e89..cb3d203bf0a 100644 --- a/doc/compiler/x/OpCodeEncoding.md +++ b/doc/compiler/x/OpCodeEncoding.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # X86 Binary Encoding Scheme - Issue [#425](https://github.com/eclipse/omr/issues/425) diff --git a/doc/ddr.md b/doc/ddr.md index bf977cc1015..bba83a3719c 100644 --- a/doc/ddr.md +++ b/doc/ddr.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # DDR: The Direct Dump Reader diff --git a/doc/ddr/DDR.md b/doc/ddr/DDR.md index 25124b12d0d..d43bae37682 100644 --- a/doc/ddr/DDR.md +++ b/doc/ddr/DDR.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # DDR info generation diff --git a/doc/diagnostics/CallingConventions.md b/doc/diagnostics/CallingConventions.md index 102b9e2ace5..5b2b6c31ce3 100644 --- a/doc/diagnostics/CallingConventions.md +++ b/doc/diagnostics/CallingConventions.md @@ -16,7 +16,7 @@ License, version 2 with the OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # x86 diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 6e06f10bd7b..e9f503b1697 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### include(OmrAssert) diff --git a/example/gcmain.cpp b/example/gcmain.cpp index e5176702f7f..a00000f391b 100644 --- a/example/gcmain.cpp +++ b/example/gcmain.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/example/glue/ArrayletObjectModel.hpp b/example/glue/ArrayletObjectModel.hpp index 1e8fe06a2c1..085373c0b6b 100644 --- a/example/glue/ArrayletObjectModel.hpp +++ b/example/glue/ArrayletObjectModel.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(ARRAYLETOBJECTMODEL_) diff --git a/example/glue/CMakeLists.txt b/example/glue/CMakeLists.txt index 8b8f12388e8..3ca63fae8c4 100644 --- a/example/glue/CMakeLists.txt +++ b/example/glue/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### set(OMR_GC_GLUE_TARGET "omr_example_gc_glue" CACHE STRING "The gc glue target, must be interface library" FORCE) diff --git a/example/glue/CollectorLanguageInterfaceImpl.cpp b/example/glue/CollectorLanguageInterfaceImpl.cpp index 7f41c77ba00..4e0b25a7be0 100644 --- a/example/glue/CollectorLanguageInterfaceImpl.cpp +++ b/example/glue/CollectorLanguageInterfaceImpl.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9nongenerated.h" diff --git a/example/glue/CollectorLanguageInterfaceImpl.hpp b/example/glue/CollectorLanguageInterfaceImpl.hpp index 4e0bf63d621..a4f01dbfb2c 100644 --- a/example/glue/CollectorLanguageInterfaceImpl.hpp +++ b/example/glue/CollectorLanguageInterfaceImpl.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef COLLECTORLANGUAGEINTERFACEIMPL_HPP_ diff --git a/example/glue/CompactDelegate.hpp b/example/glue/CompactDelegate.hpp index 62b5cda9c55..68474c727c6 100644 --- a/example/glue/CompactDelegate.hpp +++ b/example/glue/CompactDelegate.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef COMPACTDELEGATE_HPP_ diff --git a/example/glue/CompactSchemeFixupObject.cpp b/example/glue/CompactSchemeFixupObject.cpp index b7ad4c99f0b..7a40fcdfa55 100644 --- a/example/glue/CompactSchemeFixupObject.cpp +++ b/example/glue/CompactSchemeFixupObject.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omr.h" diff --git a/example/glue/CompactSchemeFixupObject.hpp b/example/glue/CompactSchemeFixupObject.hpp index 64911499118..0737022c433 100644 --- a/example/glue/CompactSchemeFixupObject.hpp +++ b/example/glue/CompactSchemeFixupObject.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef COMPACTSCHEMEOBJECTFIXUP_HPP_ diff --git a/example/glue/ConcurrentMarkingDelegate.cpp b/example/glue/ConcurrentMarkingDelegate.cpp index 72566a4ff3f..77d8bcb8000 100644 --- a/example/glue/ConcurrentMarkingDelegate.cpp +++ b/example/glue/ConcurrentMarkingDelegate.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ConcurrentMarkingDelegate.hpp" diff --git a/example/glue/ConcurrentMarkingDelegate.hpp b/example/glue/ConcurrentMarkingDelegate.hpp index 76b7a05425d..9cd4871c5bb 100644 --- a/example/glue/ConcurrentMarkingDelegate.hpp +++ b/example/glue/ConcurrentMarkingDelegate.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(CONCURRENTMARKINGDELEGATE_HPP_) diff --git a/example/glue/ConfigurationDelegate.hpp b/example/glue/ConfigurationDelegate.hpp index c69493a71c3..11d51b567a5 100644 --- a/example/glue/ConfigurationDelegate.hpp +++ b/example/glue/ConfigurationDelegate.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CONFIGURATIONDELEGATE_HPP_ diff --git a/example/glue/ContractslotScanner.hpp b/example/glue/ContractslotScanner.hpp index 638fd1e496a..3f8827b25d2 100644 --- a/example/glue/ContractslotScanner.hpp +++ b/example/glue/ContractslotScanner.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "Base.hpp" diff --git a/example/glue/EnvironmentDelegate.cpp b/example/glue/EnvironmentDelegate.cpp index 7c12b5cea7a..f0f69958dde 100644 --- a/example/glue/EnvironmentDelegate.cpp +++ b/example/glue/EnvironmentDelegate.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ModronAssertions.h" diff --git a/example/glue/EnvironmentDelegate.hpp b/example/glue/EnvironmentDelegate.hpp index ba3b94c8816..4ffea6a6990 100644 --- a/example/glue/EnvironmentDelegate.hpp +++ b/example/glue/EnvironmentDelegate.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ENVIRONMENTDELEGATE_HPP_ diff --git a/example/glue/FrequentObjectsStats.cpp b/example/glue/FrequentObjectsStats.cpp index 9a2ef08a82e..6181a2fcd30 100644 --- a/example/glue/FrequentObjectsStats.cpp +++ b/example/glue/FrequentObjectsStats.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "FrequentObjectsStats.hpp" diff --git a/example/glue/FrequentObjectsStats.hpp b/example/glue/FrequentObjectsStats.hpp index aa02dbc78e8..26699fa1c5c 100644 --- a/example/glue/FrequentObjectsStats.hpp +++ b/example/glue/FrequentObjectsStats.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(FREQUENTOBJECTSSTATS_HPP_) diff --git a/example/glue/GlobalCollectorDelegate.cpp b/example/glue/GlobalCollectorDelegate.cpp index 4f44d76766a..8218b773196 100644 --- a/example/glue/GlobalCollectorDelegate.cpp +++ b/example/glue/GlobalCollectorDelegate.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "GlobalCollectorDelegate.hpp" diff --git a/example/glue/GlobalCollectorDelegate.hpp b/example/glue/GlobalCollectorDelegate.hpp index 18b833c52d6..225fc9ca184 100644 --- a/example/glue/GlobalCollectorDelegate.hpp +++ b/example/glue/GlobalCollectorDelegate.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef GLOBALCOLLECTORDELEGATE_HPP_ diff --git a/example/glue/HeapWalkerDelegate.hpp b/example/glue/HeapWalkerDelegate.hpp index 4983f102c81..c87a99f7e29 100644 --- a/example/glue/HeapWalkerDelegate.hpp +++ b/example/glue/HeapWalkerDelegate.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(HEAPWALKERDELEGATE_HPP_) diff --git a/example/glue/LanguageSegregatedAllocationCache.hpp b/example/glue/LanguageSegregatedAllocationCache.hpp index 06535712be6..9e493b774b7 100644 --- a/example/glue/LanguageSegregatedAllocationCache.hpp +++ b/example/glue/LanguageSegregatedAllocationCache.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef LANGUAGESEGREGATEDALLOCATIONCACHE_HPP_ diff --git a/example/glue/LanguageThreadLocalHeap.hpp b/example/glue/LanguageThreadLocalHeap.hpp index f1615b852bc..d37fa5d6bb4 100644 --- a/example/glue/LanguageThreadLocalHeap.hpp +++ b/example/glue/LanguageThreadLocalHeap.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef LANGUAGETHREADLOCALHEAP_HPP_ diff --git a/example/glue/LanguageVMGlue.c b/example/glue/LanguageVMGlue.c index 8c240edd52d..1734f974e24 100644 --- a/example/glue/LanguageVMGlue.c +++ b/example/glue/LanguageVMGlue.c @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omr.h" diff --git a/example/glue/MarkingDelegate.cpp b/example/glue/MarkingDelegate.cpp index 42773687b96..66a1594ddd2 100644 --- a/example/glue/MarkingDelegate.cpp +++ b/example/glue/MarkingDelegate.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omr.h" diff --git a/example/glue/MarkingDelegate.hpp b/example/glue/MarkingDelegate.hpp index 9acf0b483bb..4d786f0e850 100644 --- a/example/glue/MarkingDelegate.hpp +++ b/example/glue/MarkingDelegate.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(MARKINGDELEGATE_HPP_) diff --git a/example/glue/MixedObjectModel.hpp b/example/glue/MixedObjectModel.hpp index d77080181cb..c3987bf1d00 100644 --- a/example/glue/MixedObjectModel.hpp +++ b/example/glue/MixedObjectModel.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(MIXEDOBJECTMODEL_HPP_) diff --git a/example/glue/MixedObjectScanner.hpp b/example/glue/MixedObjectScanner.hpp index 625d8847eb6..305567c349b 100644 --- a/example/glue/MixedObjectScanner.hpp +++ b/example/glue/MixedObjectScanner.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef MIXEDOBJECTSCANNER_HPP_ diff --git a/example/glue/Object.hpp b/example/glue/Object.hpp index c6dc59392fe..f83cfaf3ecf 100644 --- a/example/glue/Object.hpp +++ b/example/glue/Object.hpp @@ -16,8 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(OBJECT_HPP_) diff --git a/example/glue/ObjectAllocationModel.hpp b/example/glue/ObjectAllocationModel.hpp index 08fe5459a63..98665f6fa14 100644 --- a/example/glue/ObjectAllocationModel.hpp +++ b/example/glue/ObjectAllocationModel.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(OBJECTALLOCATIONMODEL_HPP_) diff --git a/example/glue/ObjectIterator.cpp b/example/glue/ObjectIterator.cpp index a4c71820f16..fad8fc41d4d 100644 --- a/example/glue/ObjectIterator.cpp +++ b/example/glue/ObjectIterator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omrcfg.h" diff --git a/example/glue/ObjectIterator.hpp b/example/glue/ObjectIterator.hpp index ecdc3bcf01b..a3e2d5eca2d 100644 --- a/example/glue/ObjectIterator.hpp +++ b/example/glue/ObjectIterator.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(OBJECTITERATOR_HPP_) diff --git a/example/glue/ObjectModel.hpp b/example/glue/ObjectModel.hpp index 580b5b0e890..372d6295631 100644 --- a/example/glue/ObjectModel.hpp +++ b/example/glue/ObjectModel.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(OBJECTMODEL_HPP_) diff --git a/example/glue/ObjectModelDelegate.cpp b/example/glue/ObjectModelDelegate.cpp index 676f70c8eb7..8acec7a9b6d 100644 --- a/example/glue/ObjectModelDelegate.cpp +++ b/example/glue/ObjectModelDelegate.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "EnvironmentBase.hpp" diff --git a/example/glue/ObjectModelDelegate.hpp b/example/glue/ObjectModelDelegate.hpp index 88cedb233dc..ab2de0204dc 100644 --- a/example/glue/ObjectModelDelegate.hpp +++ b/example/glue/ObjectModelDelegate.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OBJECTMODELDELEGATE_HPP_ diff --git a/example/glue/ObjectScannerState.hpp b/example/glue/ObjectScannerState.hpp index 69ef12520d7..ba139835c4f 100644 --- a/example/glue/ObjectScannerState.hpp +++ b/example/glue/ObjectScannerState.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(OBJECTSCANNERSTATE_HPP_) diff --git a/example/glue/Profiling.c b/example/glue/Profiling.c index 8819380c6aa..59b4f1a6d7f 100644 --- a/example/glue/Profiling.c +++ b/example/glue/Profiling.c @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/example/glue/ScavengerBackOutScanner.hpp b/example/glue/ScavengerBackOutScanner.hpp index e003bc4ac27..31e88587c0d 100644 --- a/example/glue/ScavengerBackOutScanner.hpp +++ b/example/glue/ScavengerBackOutScanner.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SCAVENGERBACKOUTSCANNER_HPP_ diff --git a/example/glue/ScavengerDelegate.cpp b/example/glue/ScavengerDelegate.cpp index 2bc36dafd42..88e8f6a8412 100644 --- a/example/glue/ScavengerDelegate.cpp +++ b/example/glue/ScavengerDelegate.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omrcfg.h" diff --git a/example/glue/ScavengerDelegate.hpp b/example/glue/ScavengerDelegate.hpp index 01a3c32cf53..4495742ba8c 100644 --- a/example/glue/ScavengerDelegate.hpp +++ b/example/glue/ScavengerDelegate.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SCAVENGERDELEGATE_HPP_ diff --git a/example/glue/ScavengerRootScanner.hpp b/example/glue/ScavengerRootScanner.hpp index 75bb5e7e48c..4befba15b6f 100644 --- a/example/glue/ScavengerRootScanner.hpp +++ b/example/glue/ScavengerRootScanner.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SCAVENGERROOTSCANNER_HPP_ diff --git a/example/glue/StartupManagerImpl.cpp b/example/glue/StartupManagerImpl.cpp index fb96f82525e..b80ef122bad 100644 --- a/example/glue/StartupManagerImpl.cpp +++ b/example/glue/StartupManagerImpl.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "GCExtensionsBase.hpp" diff --git a/example/glue/StartupManagerImpl.hpp b/example/glue/StartupManagerImpl.hpp index 2fd1ccf62cc..18526f71449 100644 --- a/example/glue/StartupManagerImpl.hpp +++ b/example/glue/StartupManagerImpl.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(MM_STARTUPMANAGERIMPL_HPP_) diff --git a/example/glue/UtilGlue.c b/example/glue/UtilGlue.c index 93d1a9ad1ac..f57c8a702a3 100644 --- a/example/glue/UtilGlue.c +++ b/example/glue/UtilGlue.c @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omr.h" diff --git a/example/glue/VerboseManagerImpl.cpp b/example/glue/VerboseManagerImpl.cpp index 242f325d5c2..b63527cd112 100644 --- a/example/glue/VerboseManagerImpl.cpp +++ b/example/glue/VerboseManagerImpl.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "gcutils.h" diff --git a/example/glue/VerboseManagerImpl.hpp b/example/glue/VerboseManagerImpl.hpp index 4a1f1186e45..c0fd1da66a7 100644 --- a/example/glue/VerboseManagerImpl.hpp +++ b/example/glue/VerboseManagerImpl.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(VERBOSEMANAGEREXAMPLE_HPP_) diff --git a/example/glue/configure_includes/configure_aix_ppc.mk b/example/glue/configure_includes/configure_aix_ppc.mk index d3780ae0701..84c5f58cfc5 100644 --- a/example/glue/configure_includes/configure_aix_ppc.mk +++ b/example/glue/configure_includes/configure_aix_ppc.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # Detect 64-bit vs. 32-bit diff --git a/example/glue/configure_includes/configure_common.mk b/example/glue/configure_includes/configure_common.mk index 01c2fc3625a..776a4748339 100644 --- a/example/glue/configure_includes/configure_common.mk +++ b/example/glue/configure_includes/configure_common.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### CONFIGURE_ARGS += \ diff --git a/example/glue/configure_includes/configure_linux_390.mk b/example/glue/configure_includes/configure_linux_390.mk index b55e20e78b5..eb53cec895e 100644 --- a/example/glue/configure_includes/configure_linux_390.mk +++ b/example/glue/configure_includes/configure_linux_390.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # Detect 64-bit vs. 31-bit diff --git a/example/glue/configure_includes/configure_linux_aarch64.mk b/example/glue/configure_includes/configure_linux_aarch64.mk index f06785dfec9..eacc5d810f0 100644 --- a/example/glue/configure_includes/configure_linux_aarch64.mk +++ b/example/glue/configure_includes/configure_linux_aarch64.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### include $(CONFIG_INCL_DIR)/configure_common.mk diff --git a/example/glue/configure_includes/configure_linux_arm.mk b/example/glue/configure_includes/configure_linux_arm.mk index 795c1905035..c512fb3656b 100644 --- a/example/glue/configure_includes/configure_linux_arm.mk +++ b/example/glue/configure_includes/configure_linux_arm.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### include $(CONFIG_INCL_DIR)/configure_common.mk diff --git a/example/glue/configure_includes/configure_linux_ppc.mk b/example/glue/configure_includes/configure_linux_ppc.mk index 366b73eda0b..9d987713b9c 100644 --- a/example/glue/configure_includes/configure_linux_ppc.mk +++ b/example/glue/configure_includes/configure_linux_ppc.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # Detect 64-bit vs. 32-bit diff --git a/example/glue/configure_includes/configure_linux_riscv.mk b/example/glue/configure_includes/configure_linux_riscv.mk index 16986e54457..55dbc92fcc7 100644 --- a/example/glue/configure_includes/configure_linux_riscv.mk +++ b/example/glue/configure_includes/configure_linux_riscv.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### include $(CONFIG_INCL_DIR)/configure_common.mk diff --git a/example/glue/configure_includes/configure_linux_x86.mk b/example/glue/configure_includes/configure_linux_x86.mk index b1e07b82242..b49d6a3a077 100644 --- a/example/glue/configure_includes/configure_linux_x86.mk +++ b/example/glue/configure_includes/configure_linux_x86.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # Detect 64-bit vs. 32-bit diff --git a/example/glue/configure_includes/configure_osx.mk b/example/glue/configure_includes/configure_osx.mk index 8f8a64adc48..0d2b9594852 100644 --- a/example/glue/configure_includes/configure_osx.mk +++ b/example/glue/configure_includes/configure_osx.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### TEMP_TARGET_DATASIZE:=64 diff --git a/example/glue/configure_includes/configure_win_x86.mk b/example/glue/configure_includes/configure_win_x86.mk index 9ff2b24ac6a..0b722d5bde5 100644 --- a/example/glue/configure_includes/configure_win_x86.mk +++ b/example/glue/configure_includes/configure_win_x86.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # Detect 64-bit vs. 32-bit diff --git a/example/glue/configure_includes/configure_zos_390.mk b/example/glue/configure_includes/configure_zos_390.mk index 4f06d0ed41e..ccb1935ffaf 100644 --- a/example/glue/configure_includes/configure_zos_390.mk +++ b/example/glue/configure_includes/configure_zos_390.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # Detect 64-bit vs. 31-bit diff --git a/example/glue/objectdescription.h b/example/glue/objectdescription.h index a75bb2518b0..af3fe42ce32 100644 --- a/example/glue/objectdescription.h +++ b/example/glue/objectdescription.h @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(OBJECTDESCRIPTION_H_) diff --git a/example/glue/omrExampleVM.cpp b/example/glue/omrExampleVM.cpp index 4dea27719fa..45fd14bdc97 100644 --- a/example/glue/omrExampleVM.cpp +++ b/example/glue/omrExampleVM.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/example/glue/omrExampleVM.hpp b/example/glue/omrExampleVM.hpp index f0e317ab442..d529530f735 100644 --- a/example/glue/omrExampleVM.hpp +++ b/example/glue/omrExampleVM.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMREXAMPLEVM_HPP_ diff --git a/example/glue/sizeclasses.h b/example/glue/sizeclasses.h index 884789b03b7..d32763d6c5d 100644 --- a/example/glue/sizeclasses.h +++ b/example/glue/sizeclasses.h @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SIZECLASSES_H_ diff --git a/example/makefile b/example/makefile index 1d4ad6bf47c..b775fce0c3e 100644 --- a/example/makefile +++ b/example/makefile @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # top_srcdir is the relative path to the top of the OMR source tree. diff --git a/fvtest/CMakeLists.txt b/fvtest/CMakeLists.txt index 2f686ee5785..157bed3bdf2 100644 --- a/fvtest/CMakeLists.txt +++ b/fvtest/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### include(OmrAssert) diff --git a/fvtest/algotest/CMakeLists.txt b/fvtest/algotest/CMakeLists.txt index ea1348edc14..a76c0288f66 100644 --- a/fvtest/algotest/CMakeLists.txt +++ b/fvtest/algotest/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### omr_add_hookgen(INPUT hooksample.hdf) diff --git a/fvtest/algotest/algoTest.cpp b/fvtest/algotest/algoTest.cpp index 1a12625ca9a..765f30a874f 100644 --- a/fvtest/algotest/algoTest.cpp +++ b/fvtest/algotest/algoTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/fvtest/algotest/algorithm_test_internal.h b/fvtest/algotest/algorithm_test_internal.h index 1c4c48c92f5..3a7a4bf409e 100644 --- a/fvtest/algotest/algorithm_test_internal.h +++ b/fvtest/algotest/algorithm_test_internal.h @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef algorithm_test_internal_h diff --git a/fvtest/algotest/avltest.c b/fvtest/algotest/avltest.c index 61573f860cb..cde7b760040 100644 --- a/fvtest/algotest/avltest.c +++ b/fvtest/algotest/avltest.c @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/fvtest/algotest/avltest.lst b/fvtest/algotest/avltest.lst index 2d28f22ea5e..96ff42fbb66 100644 --- a/fvtest/algotest/avltest.lst +++ b/fvtest/algotest/avltest.lst @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # format: diff --git a/fvtest/algotest/hashtabletest.c b/fvtest/algotest/hashtabletest.c index 49f4098b043..358fb309717 100644 --- a/fvtest/algotest/hashtabletest.c +++ b/fvtest/algotest/hashtabletest.c @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/fvtest/algotest/hooksample.hdf b/fvtest/algotest/hooksample.hdf index 52d30055fb1..b0a4260c4ae 100644 --- a/fvtest/algotest/hooksample.hdf +++ b/fvtest/algotest/hooksample.hdf @@ -17,7 +17,7 @@ License, version 2 with the OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> hooksample.h diff --git a/fvtest/algotest/hooktest.c b/fvtest/algotest/hooktest.c index 3f7449d62a9..2cbee1980d4 100644 --- a/fvtest/algotest/hooktest.c +++ b/fvtest/algotest/hooktest.c @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/fvtest/algotest/main.cpp b/fvtest/algotest/main.cpp index 72777708fe7..1cc8eba1cd6 100644 --- a/fvtest/algotest/main.cpp +++ b/fvtest/algotest/main.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omrTest.h" diff --git a/fvtest/algotest/makefile b/fvtest/algotest/makefile index c18db9bd08f..557a405a106 100644 --- a/fvtest/algotest/makefile +++ b/fvtest/algotest/makefile @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### top_srcdir := ../.. diff --git a/fvtest/algotest/pooltest.c b/fvtest/algotest/pooltest.c index 725079d1edc..7f93f2dd826 100644 --- a/fvtest/algotest/pooltest.c +++ b/fvtest/algotest/pooltest.c @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/fvtest/compilertest/CMakeLists.txt b/fvtest/compilertest/CMakeLists.txt index 6ae9f6cf3a7..176233558c8 100644 --- a/fvtest/compilertest/CMakeLists.txt +++ b/fvtest/compilertest/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### include(OmrCompilerSupport) diff --git a/fvtest/compilertest/Jit.hpp b/fvtest/compilertest/Jit.hpp index 064165e54ea..106dcc06f0e 100644 --- a/fvtest/compilertest/Jit.hpp +++ b/fvtest/compilertest/Jit.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/fvtest/compilertest/Makefile b/fvtest/compilertest/Makefile index 4923bb6c375..d001aaa2147 100644 --- a/fvtest/compilertest/Makefile +++ b/fvtest/compilertest/Makefile @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### .PHONY: all clean cleanobjs cleandeps cleandll diff --git a/fvtest/compilertest/README.md b/fvtest/compilertest/README.md index 7897be0406b..a8fcd4c038d 100644 --- a/fvtest/compilertest/README.md +++ b/fvtest/compilertest/README.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Test Compiler diff --git a/fvtest/compilertest/build/IWYU_Mappings.imp b/fvtest/compilertest/build/IWYU_Mappings.imp index ec010171d79..05e5ebb5903 100644 --- a/fvtest/compilertest/build/IWYU_Mappings.imp +++ b/fvtest/compilertest/build/IWYU_Mappings.imp @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### #TODO:AARCH64 add codegen code relevent to aarch64 same as ARM ?? diff --git a/fvtest/compilertest/build/Makefile b/fvtest/compilertest/build/Makefile index 8f1e3759569..8a9cc9fa0cf 100644 --- a/fvtest/compilertest/build/Makefile +++ b/fvtest/compilertest/build/Makefile @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # fvtest/compilertest/build Makefile diff --git a/fvtest/compilertest/build/files/common.mk b/fvtest/compilertest/build/files/common.mk index f25c4a75e97..a0239e9794e 100644 --- a/fvtest/compilertest/build/files/common.mk +++ b/fvtest/compilertest/build/files/common.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### JIT_PRODUCT_BACKEND_SOURCES+=\ diff --git a/fvtest/compilertest/build/files/host/arm.mk b/fvtest/compilertest/build/files/host/arm.mk index 0a0f9b8b026..5d3e7c58acb 100644 --- a/fvtest/compilertest/build/files/host/arm.mk +++ b/fvtest/compilertest/build/files/host/arm.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### JIT_PRODUCT_SOURCE_FILES+= diff --git a/fvtest/compilertest/build/files/host/p.mk b/fvtest/compilertest/build/files/host/p.mk index 9b7ed045cf9..7a8370eb4f5 100644 --- a/fvtest/compilertest/build/files/host/p.mk +++ b/fvtest/compilertest/build/files/host/p.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### JIT_PRODUCT_SOURCE_FILES+=\ diff --git a/fvtest/compilertest/build/files/host/x.mk b/fvtest/compilertest/build/files/host/x.mk index b06caff309b..971bca9abc7 100644 --- a/fvtest/compilertest/build/files/host/x.mk +++ b/fvtest/compilertest/build/files/host/x.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### #JIT_PRODUCT_SOURCE_FILES += diff --git a/fvtest/compilertest/build/files/host/z.mk b/fvtest/compilertest/build/files/host/z.mk index 0a0f9b8b026..5d3e7c58acb 100644 --- a/fvtest/compilertest/build/files/host/z.mk +++ b/fvtest/compilertest/build/files/host/z.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### JIT_PRODUCT_SOURCE_FILES+= diff --git a/fvtest/compilertest/build/files/target/amd64.mk b/fvtest/compilertest/build/files/target/amd64.mk index 84173531f00..cca42b989cc 100644 --- a/fvtest/compilertest/build/files/target/amd64.mk +++ b/fvtest/compilertest/build/files/target/amd64.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### JIT_PRODUCT_BACKEND_SOURCES+=\ diff --git a/fvtest/compilertest/build/files/target/arm.mk b/fvtest/compilertest/build/files/target/arm.mk index f2d8765456b..2371cc10dfd 100644 --- a/fvtest/compilertest/build/files/target/arm.mk +++ b/fvtest/compilertest/build/files/target/arm.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### JIT_PRODUCT_BACKEND_SOURCES+=\ diff --git a/fvtest/compilertest/build/files/target/i386.mk b/fvtest/compilertest/build/files/target/i386.mk index 48129b77f51..2848b2bfd64 100644 --- a/fvtest/compilertest/build/files/target/i386.mk +++ b/fvtest/compilertest/build/files/target/i386.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### JIT_PRODUCT_BACKEND_SOURCES+=\ diff --git a/fvtest/compilertest/build/files/target/p.mk b/fvtest/compilertest/build/files/target/p.mk index ab9752d00da..584c483aecb 100644 --- a/fvtest/compilertest/build/files/target/p.mk +++ b/fvtest/compilertest/build/files/target/p.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### JIT_PRODUCT_BACKEND_SOURCES+=\ diff --git a/fvtest/compilertest/build/files/target/x.mk b/fvtest/compilertest/build/files/target/x.mk index f2f90bdab0b..13b2f28ce69 100644 --- a/fvtest/compilertest/build/files/target/x.mk +++ b/fvtest/compilertest/build/files/target/x.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### JIT_PRODUCT_BACKEND_SOURCES+=\ diff --git a/fvtest/compilertest/build/files/target/z.mk b/fvtest/compilertest/build/files/target/z.mk index 38c3db33d71..e7f01a83706 100644 --- a/fvtest/compilertest/build/files/target/z.mk +++ b/fvtest/compilertest/build/files/target/z.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### JIT_PRODUCT_BACKEND_SOURCES+=\ diff --git a/fvtest/compilertest/build/platform/common.mk b/fvtest/compilertest/build/platform/common.mk index 99498f2741d..9dcd4aa061f 100644 --- a/fvtest/compilertest/build/platform/common.mk +++ b/fvtest/compilertest/build/platform/common.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # diff --git a/fvtest/compilertest/build/platform/host/amd64-linux-gcc.mk b/fvtest/compilertest/build/platform/host/amd64-linux-gcc.mk index 7718cf660eb..dcbfa136951 100644 --- a/fvtest/compilertest/build/platform/host/amd64-linux-gcc.mk +++ b/fvtest/compilertest/build/platform/host/amd64-linux-gcc.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### HOST_ARCH=x diff --git a/fvtest/compilertest/build/platform/host/amd64-linux64-clang.mk b/fvtest/compilertest/build/platform/host/amd64-linux64-clang.mk index fbc8d329e4d..7cb568e6e16 100644 --- a/fvtest/compilertest/build/platform/host/amd64-linux64-clang.mk +++ b/fvtest/compilertest/build/platform/host/amd64-linux64-clang.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### HOST_ARCH=x diff --git a/fvtest/compilertest/build/platform/host/amd64-linux64-gcc.mk b/fvtest/compilertest/build/platform/host/amd64-linux64-gcc.mk index 914a57ef397..029d51bff77 100644 --- a/fvtest/compilertest/build/platform/host/amd64-linux64-gcc.mk +++ b/fvtest/compilertest/build/platform/host/amd64-linux64-gcc.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### HOST_ARCH=x diff --git a/fvtest/compilertest/build/platform/host/amd64-osx-clang.mk b/fvtest/compilertest/build/platform/host/amd64-osx-clang.mk index 1770784297f..0b14cbe977c 100644 --- a/fvtest/compilertest/build/platform/host/amd64-osx-clang.mk +++ b/fvtest/compilertest/build/platform/host/amd64-osx-clang.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### HOST_ARCH=x diff --git a/fvtest/compilertest/build/platform/host/ia32-linux-gcc.mk b/fvtest/compilertest/build/platform/host/ia32-linux-gcc.mk index 7718cf660eb..dcbfa136951 100644 --- a/fvtest/compilertest/build/platform/host/ia32-linux-gcc.mk +++ b/fvtest/compilertest/build/platform/host/ia32-linux-gcc.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### HOST_ARCH=x diff --git a/fvtest/compilertest/build/platform/host/ppc64-linux64-gcc.mk b/fvtest/compilertest/build/platform/host/ppc64-linux64-gcc.mk index 5f7924f3d9a..70f67fc890d 100644 --- a/fvtest/compilertest/build/platform/host/ppc64-linux64-gcc.mk +++ b/fvtest/compilertest/build/platform/host/ppc64-linux64-gcc.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### HOST_ARCH=p diff --git a/fvtest/compilertest/build/platform/host/ppc64le-linux64-gcc.mk b/fvtest/compilertest/build/platform/host/ppc64le-linux64-gcc.mk index 5f7924f3d9a..70f67fc890d 100644 --- a/fvtest/compilertest/build/platform/host/ppc64le-linux64-gcc.mk +++ b/fvtest/compilertest/build/platform/host/ppc64le-linux64-gcc.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### HOST_ARCH=p diff --git a/fvtest/compilertest/build/platform/host/s390-linux-clang.mk b/fvtest/compilertest/build/platform/host/s390-linux-clang.mk index a1f59366c57..db180ba86c4 100644 --- a/fvtest/compilertest/build/platform/host/s390-linux-clang.mk +++ b/fvtest/compilertest/build/platform/host/s390-linux-clang.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### HOST_ARCH=z diff --git a/fvtest/compilertest/build/platform/host/s390-linux-gcc.mk b/fvtest/compilertest/build/platform/host/s390-linux-gcc.mk index 8c6fa80e064..46c17e6403b 100644 --- a/fvtest/compilertest/build/platform/host/s390-linux-gcc.mk +++ b/fvtest/compilertest/build/platform/host/s390-linux-gcc.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### HOST_ARCH=z diff --git a/fvtest/compilertest/build/platform/host/s390-linux64-clang.mk b/fvtest/compilertest/build/platform/host/s390-linux64-clang.mk index 70a28efa009..4b804425746 100644 --- a/fvtest/compilertest/build/platform/host/s390-linux64-clang.mk +++ b/fvtest/compilertest/build/platform/host/s390-linux64-clang.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### HOST_ARCH=z diff --git a/fvtest/compilertest/build/platform/host/s390-linux64-gcc.mk b/fvtest/compilertest/build/platform/host/s390-linux64-gcc.mk index bfc4fbf461b..e293377f5a4 100644 --- a/fvtest/compilertest/build/platform/host/s390-linux64-gcc.mk +++ b/fvtest/compilertest/build/platform/host/s390-linux64-gcc.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### HOST_ARCH=z diff --git a/fvtest/compilertest/build/platform/target/all.mk b/fvtest/compilertest/build/platform/target/all.mk index 012b7e565cc..cfb0a83f95d 100644 --- a/fvtest/compilertest/build/platform/target/all.mk +++ b/fvtest/compilertest/build/platform/target/all.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # diff --git a/fvtest/compilertest/build/rules/common.mk b/fvtest/compilertest/build/rules/common.mk index 8d008d8bdb8..cd6eb308472 100644 --- a/fvtest/compilertest/build/rules/common.mk +++ b/fvtest/compilertest/build/rules/common.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # Add our targets to the global targets diff --git a/fvtest/compilertest/build/rules/gnu/common.mk b/fvtest/compilertest/build/rules/gnu/common.mk index e7524f7e2a6..426602dfc61 100644 --- a/fvtest/compilertest/build/rules/gnu/common.mk +++ b/fvtest/compilertest/build/rules/gnu/common.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # diff --git a/fvtest/compilertest/build/rules/gnu/filetypes.mk b/fvtest/compilertest/build/rules/gnu/filetypes.mk index a6f57430518..3af7e34d945 100644 --- a/fvtest/compilertest/build/rules/gnu/filetypes.mk +++ b/fvtest/compilertest/build/rules/gnu/filetypes.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # diff --git a/fvtest/compilertest/build/toolcfg/common.mk b/fvtest/compilertest/build/toolcfg/common.mk index a9f2b82f1a4..2049e24c4bd 100644 --- a/fvtest/compilertest/build/toolcfg/common.mk +++ b/fvtest/compilertest/build/toolcfg/common.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### diff --git a/fvtest/compilertest/build/toolcfg/gnu/common.mk b/fvtest/compilertest/build/toolcfg/gnu/common.mk index afed04dbe87..4c822eb4f47 100644 --- a/fvtest/compilertest/build/toolcfg/gnu/common.mk +++ b/fvtest/compilertest/build/toolcfg/gnu/common.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # diff --git a/fvtest/compilertest/build/toolcfg/host/32.mk b/fvtest/compilertest/build/toolcfg/host/32.mk index e9c8117af77..d6e2380677f 100644 --- a/fvtest/compilertest/build/toolcfg/host/32.mk +++ b/fvtest/compilertest/build/toolcfg/host/32.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### HOST_DEFINES+=TR_HOST_32BIT diff --git a/fvtest/compilertest/build/toolcfg/host/64.mk b/fvtest/compilertest/build/toolcfg/host/64.mk index 4b025c438e7..5c90dee5e20 100644 --- a/fvtest/compilertest/build/toolcfg/host/64.mk +++ b/fvtest/compilertest/build/toolcfg/host/64.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### HOST_DEFINES+=TR_HOST_64BIT BITVECTOR_64BIT diff --git a/fvtest/compilertest/build/toolcfg/host/aix.mk b/fvtest/compilertest/build/toolcfg/host/aix.mk index 9ae0f10b291..633a116adc8 100644 --- a/fvtest/compilertest/build/toolcfg/host/aix.mk +++ b/fvtest/compilertest/build/toolcfg/host/aix.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### HOST_DEFINES+=AIX diff --git a/fvtest/compilertest/build/toolcfg/host/arm.mk b/fvtest/compilertest/build/toolcfg/host/arm.mk index c026f2ddcb5..2fabebcb451 100644 --- a/fvtest/compilertest/build/toolcfg/host/arm.mk +++ b/fvtest/compilertest/build/toolcfg/host/arm.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### HOST_DEFINES+=TR_HOST_ARM diff --git a/fvtest/compilertest/build/toolcfg/host/linux.mk b/fvtest/compilertest/build/toolcfg/host/linux.mk index 576f9792a70..0fabf034979 100644 --- a/fvtest/compilertest/build/toolcfg/host/linux.mk +++ b/fvtest/compilertest/build/toolcfg/host/linux.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### HOST_DEFINES+=LINUX diff --git a/fvtest/compilertest/build/toolcfg/host/osx.mk b/fvtest/compilertest/build/toolcfg/host/osx.mk index 13d3c76095e..0aa85040f27 100644 --- a/fvtest/compilertest/build/toolcfg/host/osx.mk +++ b/fvtest/compilertest/build/toolcfg/host/osx.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### HOST_DEFINES+=OSX diff --git a/fvtest/compilertest/build/toolcfg/host/p.mk b/fvtest/compilertest/build/toolcfg/host/p.mk index 1f0f2d8327f..d33f9c8e134 100644 --- a/fvtest/compilertest/build/toolcfg/host/p.mk +++ b/fvtest/compilertest/build/toolcfg/host/p.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### HOST_DEFINES+=TR_HOST_POWER diff --git a/fvtest/compilertest/build/toolcfg/host/win.mk b/fvtest/compilertest/build/toolcfg/host/win.mk index 63c06e3058c..e4c41946f74 100644 --- a/fvtest/compilertest/build/toolcfg/host/win.mk +++ b/fvtest/compilertest/build/toolcfg/host/win.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### HOST_DEFINES+=OMR_OS_WINDOWS diff --git a/fvtest/compilertest/build/toolcfg/host/x.mk b/fvtest/compilertest/build/toolcfg/host/x.mk index 55f51a5d0c3..78e87695ae5 100644 --- a/fvtest/compilertest/build/toolcfg/host/x.mk +++ b/fvtest/compilertest/build/toolcfg/host/x.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### HOST_DEFINES+=TR_HOST_X86 diff --git a/fvtest/compilertest/build/toolcfg/host/z.mk b/fvtest/compilertest/build/toolcfg/host/z.mk index 63d637c5a05..cc2bb98ed59 100644 --- a/fvtest/compilertest/build/toolcfg/host/z.mk +++ b/fvtest/compilertest/build/toolcfg/host/z.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### HOST_DEFINES+=TR_HOST_S390 diff --git a/fvtest/compilertest/build/toolcfg/host/zos.mk b/fvtest/compilertest/build/toolcfg/host/zos.mk index 9c0f7ff7785..fa0bf61c9a7 100644 --- a/fvtest/compilertest/build/toolcfg/host/zos.mk +++ b/fvtest/compilertest/build/toolcfg/host/zos.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### HOST_DEFINES+=ZOS diff --git a/fvtest/compilertest/build/toolcfg/target/32.mk b/fvtest/compilertest/build/toolcfg/target/32.mk index bfadd2fdbd2..035e9e299a6 100644 --- a/fvtest/compilertest/build/toolcfg/target/32.mk +++ b/fvtest/compilertest/build/toolcfg/target/32.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### TARGET_DEFINES+=TR_TARGET_32BIT diff --git a/fvtest/compilertest/build/toolcfg/target/64.mk b/fvtest/compilertest/build/toolcfg/target/64.mk index 2d4456a0284..a52a7dcaa62 100644 --- a/fvtest/compilertest/build/toolcfg/target/64.mk +++ b/fvtest/compilertest/build/toolcfg/target/64.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### TARGET_DEFINES+=TR_TARGET_64BIT diff --git a/fvtest/compilertest/build/toolcfg/target/arm.mk b/fvtest/compilertest/build/toolcfg/target/arm.mk index 707e9fe7eed..7f8941fa001 100644 --- a/fvtest/compilertest/build/toolcfg/target/arm.mk +++ b/fvtest/compilertest/build/toolcfg/target/arm.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### TARGET_DEFINES+=TR_TARGET_ARM diff --git a/fvtest/compilertest/build/toolcfg/target/p.mk b/fvtest/compilertest/build/toolcfg/target/p.mk index 0d18fb65163..56d24f75720 100644 --- a/fvtest/compilertest/build/toolcfg/target/p.mk +++ b/fvtest/compilertest/build/toolcfg/target/p.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### TARGET_DEFINES+=TR_TARGET_POWER diff --git a/fvtest/compilertest/build/toolcfg/target/x.mk b/fvtest/compilertest/build/toolcfg/target/x.mk index e93a668febd..75a96091209 100644 --- a/fvtest/compilertest/build/toolcfg/target/x.mk +++ b/fvtest/compilertest/build/toolcfg/target/x.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### TARGET_DEFINES+=TR_TARGET_X86 diff --git a/fvtest/compilertest/build/toolcfg/target/z.mk b/fvtest/compilertest/build/toolcfg/target/z.mk index d6a83a4dd32..700c429fd29 100644 --- a/fvtest/compilertest/build/toolcfg/target/z.mk +++ b/fvtest/compilertest/build/toolcfg/target/z.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### TARGET_DEFINES+=TR_TARGET_S390 diff --git a/fvtest/compilertest/compile/Method.hpp b/fvtest/compilertest/compile/Method.hpp index 90be26f4e90..6194dba1cb6 100644 --- a/fvtest/compilertest/compile/Method.hpp +++ b/fvtest/compilertest/compile/Method.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TEST_METHOD_INCL diff --git a/fvtest/compilertest/compile/ResolvedMethod.cpp b/fvtest/compilertest/compile/ResolvedMethod.cpp index 235163c789d..a51110f0bfd 100644 --- a/fvtest/compilertest/compile/ResolvedMethod.cpp +++ b/fvtest/compilertest/compile/ResolvedMethod.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/Compilation.hpp" diff --git a/fvtest/compilertest/compile/ResolvedMethod.hpp b/fvtest/compilertest/compile/ResolvedMethod.hpp index 7191ce1b06c..2e4d2b9f9d2 100644 --- a/fvtest/compilertest/compile/ResolvedMethod.hpp +++ b/fvtest/compilertest/compile/ResolvedMethod.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TEST_RESOLVEDMETHOD_INCL diff --git a/fvtest/compilertest/control/TestJit.cpp b/fvtest/compilertest/control/TestJit.cpp index 2ad0d36025e..9d029494195 100644 --- a/fvtest/compilertest/control/TestJit.cpp +++ b/fvtest/compilertest/control/TestJit.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/fvtest/compilertest/env/ConcreteFE.hpp b/fvtest/compilertest/env/ConcreteFE.hpp index 505cf03132d..0653dd79b8f 100644 --- a/fvtest/compilertest/env/ConcreteFE.hpp +++ b/fvtest/compilertest/env/ConcreteFE.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/FrontEnd.hpp" diff --git a/fvtest/compilertest/env/FrontEnd.cpp b/fvtest/compilertest/env/FrontEnd.cpp index a9f308069c7..e5a9e87c4aa 100644 --- a/fvtest/compilertest/env/FrontEnd.cpp +++ b/fvtest/compilertest/env/FrontEnd.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/FrontEnd.hpp" diff --git a/fvtest/compilertest/env/FrontEnd.hpp b/fvtest/compilertest/env/FrontEnd.hpp index c6a4df72a7f..9d9bad35529 100644 --- a/fvtest/compilertest/env/FrontEnd.hpp +++ b/fvtest/compilertest/env/FrontEnd.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TESTFE_INCL diff --git a/fvtest/compilertest/env/ObjectModel.hpp b/fvtest/compilertest/env/ObjectModel.hpp index 004d3a9b3c6..68fd9411720 100644 --- a/fvtest/compilertest/env/ObjectModel.hpp +++ b/fvtest/compilertest/env/ObjectModel.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_OBJECTMODEL_INCL diff --git a/fvtest/compilertest/env/TestObjectModel.hpp b/fvtest/compilertest/env/TestObjectModel.hpp index b3ead5c763b..125091e70af 100644 --- a/fvtest/compilertest/env/TestObjectModel.hpp +++ b/fvtest/compilertest/env/TestObjectModel.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TEST_OBJECTMODEL_INCL diff --git a/fvtest/compilertest/ilgen/IlBuilder.hpp b/fvtest/compilertest/ilgen/IlBuilder.hpp index 89fe77978d3..86417583915 100644 --- a/fvtest/compilertest/ilgen/IlBuilder.hpp +++ b/fvtest/compilertest/ilgen/IlBuilder.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_ILBUILDER_INCL diff --git a/fvtest/compilertest/ilgen/IlGeneratorMethodDetails.hpp b/fvtest/compilertest/ilgen/IlGeneratorMethodDetails.hpp index aef4b504943..cf709e74eb6 100644 --- a/fvtest/compilertest/ilgen/IlGeneratorMethodDetails.hpp +++ b/fvtest/compilertest/ilgen/IlGeneratorMethodDetails.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_ILGENERATOR_METHOD_DETAILS_INCL diff --git a/fvtest/compilertest/ilgen/IlInjector.cpp b/fvtest/compilertest/ilgen/IlInjector.cpp index d468fcdfd96..1ad6054ee14 100644 --- a/fvtest/compilertest/ilgen/IlInjector.cpp +++ b/fvtest/compilertest/ilgen/IlInjector.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ilgen/IlInjector.hpp" diff --git a/fvtest/compilertest/ilgen/IlInjector.hpp b/fvtest/compilertest/ilgen/IlInjector.hpp index b50e903dc5a..5bdb7659bd1 100644 --- a/fvtest/compilertest/ilgen/IlInjector.hpp +++ b/fvtest/compilertest/ilgen/IlInjector.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TEST_ILINJECTOR_INCL diff --git a/fvtest/compilertest/ilgen/MethodBuilder.hpp b/fvtest/compilertest/ilgen/MethodBuilder.hpp index 543effd2362..25ff2a4bea9 100644 --- a/fvtest/compilertest/ilgen/MethodBuilder.hpp +++ b/fvtest/compilertest/ilgen/MethodBuilder.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_METHODBUILDER_INCL diff --git a/fvtest/compilertest/ilgen/MethodInfo.hpp b/fvtest/compilertest/ilgen/MethodInfo.hpp index d33e17390e2..314efbc8e4d 100644 --- a/fvtest/compilertest/ilgen/MethodInfo.hpp +++ b/fvtest/compilertest/ilgen/MethodInfo.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TEST_METHODINFO_INCL diff --git a/fvtest/compilertest/ilgen/TestIlBuilder.hpp b/fvtest/compilertest/ilgen/TestIlBuilder.hpp index e8f1f1c6d9e..eae85428416 100644 --- a/fvtest/compilertest/ilgen/TestIlBuilder.hpp +++ b/fvtest/compilertest/ilgen/TestIlBuilder.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TEST_ILBUILDER_INCL diff --git a/fvtest/compilertest/ilgen/TestIlGeneratorMethodDetails.cpp b/fvtest/compilertest/ilgen/TestIlGeneratorMethodDetails.cpp index 9668b3ab5ef..b0b7446cd02 100644 --- a/fvtest/compilertest/ilgen/TestIlGeneratorMethodDetails.cpp +++ b/fvtest/compilertest/ilgen/TestIlGeneratorMethodDetails.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/FrontEnd.hpp" diff --git a/fvtest/compilertest/ilgen/TestIlGeneratorMethodDetails.hpp b/fvtest/compilertest/ilgen/TestIlGeneratorMethodDetails.hpp index 2adcd6c3e16..356de7c90a2 100644 --- a/fvtest/compilertest/ilgen/TestIlGeneratorMethodDetails.hpp +++ b/fvtest/compilertest/ilgen/TestIlGeneratorMethodDetails.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TEST_ILGENERATOR_METHOD_DETAILS_INCL diff --git a/fvtest/compilertest/ilgen/TestMethodBuilder.hpp b/fvtest/compilertest/ilgen/TestMethodBuilder.hpp index f7560367822..41e2cae69b2 100644 --- a/fvtest/compilertest/ilgen/TestMethodBuilder.hpp +++ b/fvtest/compilertest/ilgen/TestMethodBuilder.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TEST_METHODBUILDER_INCL diff --git a/fvtest/compilertest/iwyu.mk b/fvtest/compilertest/iwyu.mk index 956eafe1eaf..fc27269316a 100644 --- a/fvtest/compilertest/iwyu.mk +++ b/fvtest/compilertest/iwyu.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # include-what-you-use, or iwyu, is a open source tool based on clang diff --git a/fvtest/compilertest/linter.mk b/fvtest/compilertest/linter.mk index 850c472fb42..2ef3090fa0e 100644 --- a/fvtest/compilertest/linter.mk +++ b/fvtest/compilertest/linter.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # To lint: diff --git a/fvtest/compilertest/p/codegen/Evaluator.cpp b/fvtest/compilertest/p/codegen/Evaluator.cpp index 174cb8e97d2..aa1f3e06c00 100644 --- a/fvtest/compilertest/p/codegen/Evaluator.cpp +++ b/fvtest/compilertest/p/codegen/Evaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CodeGenerator.hpp" diff --git a/fvtest/compilertest/p/runtime/AsmUtil.spp b/fvtest/compilertest/p/runtime/AsmUtil.spp index a98316beca0..6824abb9497 100644 --- a/fvtest/compilertest/p/runtime/AsmUtil.spp +++ b/fvtest/compilertest/p/runtime/AsmUtil.spp @@ -16,7 +16,7 @@ !! [1] https://www.gnu.org/software/classpath/license.html !! [2] https://openjdk.org/legal/assembly-exception.html !! -!! 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 +!! SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! #include "p/runtime/ppcasmdefines.inc" diff --git a/fvtest/compilertest/p/runtime/CodeDispatch.spp b/fvtest/compilertest/p/runtime/CodeDispatch.spp index c6149f5efba..0026e0c3cdf 100644 --- a/fvtest/compilertest/p/runtime/CodeDispatch.spp +++ b/fvtest/compilertest/p/runtime/CodeDispatch.spp @@ -16,7 +16,7 @@ !! [1] https://www.gnu.org/software/classpath/license.html !! [2] https://openjdk.org/legal/assembly-exception.html !! -!! 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 +!! SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! #include "p/runtime/ppcasmdefines.inc" diff --git a/fvtest/compilertest/p/runtime/CodeSync.cpp b/fvtest/compilertest/p/runtime/CodeSync.cpp index 92765974e2f..629fb4c218c 100644 --- a/fvtest/compilertest/p/runtime/CodeSync.cpp +++ b/fvtest/compilertest/p/runtime/CodeSync.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "p/runtime/PPCCodeSync.inc" diff --git a/fvtest/compilertest/runtime/CodeCacheManager.hpp b/fvtest/compilertest/runtime/CodeCacheManager.hpp index 2bd8b0b98dd..4cd5f0cb01e 100644 --- a/fvtest/compilertest/runtime/CodeCacheManager.hpp +++ b/fvtest/compilertest/runtime/CodeCacheManager.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_CODECACHEMANAGER_INCL diff --git a/fvtest/compilertest/runtime/StackAtlasPOD.hpp b/fvtest/compilertest/runtime/StackAtlasPOD.hpp index 5a9182aff72..67eeb80a7bb 100644 --- a/fvtest/compilertest/runtime/StackAtlasPOD.hpp +++ b/fvtest/compilertest/runtime/StackAtlasPOD.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TEST_STACKATLASPOD_INCL diff --git a/fvtest/compilertest/runtime/TestCodeCacheManager.cpp b/fvtest/compilertest/runtime/TestCodeCacheManager.cpp index 100557e5ae5..a82bdab50c0 100644 --- a/fvtest/compilertest/runtime/TestCodeCacheManager.cpp +++ b/fvtest/compilertest/runtime/TestCodeCacheManager.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(OMR_OS_WINDOWS) #include diff --git a/fvtest/compilertest/runtime/TestCodeCacheManager.hpp b/fvtest/compilertest/runtime/TestCodeCacheManager.hpp index 8788be43e5e..f115074565b 100644 --- a/fvtest/compilertest/runtime/TestCodeCacheManager.hpp +++ b/fvtest/compilertest/runtime/TestCodeCacheManager.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TEST_CODECACHEMANAGER_INCL diff --git a/fvtest/compilertest/runtime/TestJitConfig.hpp b/fvtest/compilertest/runtime/TestJitConfig.hpp index 7b239871200..24aebe729e3 100644 --- a/fvtest/compilertest/runtime/TestJitConfig.hpp +++ b/fvtest/compilertest/runtime/TestJitConfig.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TEST_JITCONFIG_HPP diff --git a/fvtest/compilertest/testjit.mk b/fvtest/compilertest/testjit.mk index 3015b89c0cf..f66459b7574 100644 --- a/fvtest/compilertest/testjit.mk +++ b/fvtest/compilertest/testjit.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # diff --git a/fvtest/compilertest/tests/BuilderTest.cpp b/fvtest/compilertest/tests/BuilderTest.cpp index 40c0cb9a5c2..803aac80e41 100644 --- a/fvtest/compilertest/tests/BuilderTest.cpp +++ b/fvtest/compilertest/tests/BuilderTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/fvtest/compilertest/tests/BuilderTest.hpp b/fvtest/compilertest/tests/BuilderTest.hpp index 187ac097f7f..b43dfce520e 100644 --- a/fvtest/compilertest/tests/BuilderTest.hpp +++ b/fvtest/compilertest/tests/BuilderTest.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef BUILDERTEST_INCL diff --git a/fvtest/compilertest/tests/FooBarTest.cpp b/fvtest/compilertest/tests/FooBarTest.cpp index ce9454e7e52..d7c302d0f44 100644 --- a/fvtest/compilertest/tests/FooBarTest.cpp +++ b/fvtest/compilertest/tests/FooBarTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/fvtest/compilertest/tests/FooBarTest.hpp b/fvtest/compilertest/tests/FooBarTest.hpp index 550228a9841..03522817af7 100644 --- a/fvtest/compilertest/tests/FooBarTest.hpp +++ b/fvtest/compilertest/tests/FooBarTest.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "TestDriver.hpp" diff --git a/fvtest/compilertest/tests/LimitFileTest.cpp b/fvtest/compilertest/tests/LimitFileTest.cpp index 8dbd8c634ed..d34d8ef65d6 100644 --- a/fvtest/compilertest/tests/LimitFileTest.cpp +++ b/fvtest/compilertest/tests/LimitFileTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(GTEST_HAS_DEATH_TEST) diff --git a/fvtest/compilertest/tests/LimitFileTest.hpp b/fvtest/compilertest/tests/LimitFileTest.hpp index a14746ba9bb..260ad6c78e1 100644 --- a/fvtest/compilertest/tests/LimitFileTest.hpp +++ b/fvtest/compilertest/tests/LimitFileTest.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TEST_LIMITFILE_INCL diff --git a/fvtest/compilertest/tests/LogFileTest.cpp b/fvtest/compilertest/tests/LogFileTest.cpp index c013b4d70ca..6f8a98d1e17 100644 --- a/fvtest/compilertest/tests/LogFileTest.cpp +++ b/fvtest/compilertest/tests/LogFileTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(GTEST_HAS_DEATH_TEST) diff --git a/fvtest/compilertest/tests/LogFileTest.hpp b/fvtest/compilertest/tests/LogFileTest.hpp index 7d9bfeccb1e..078702c2485 100644 --- a/fvtest/compilertest/tests/LogFileTest.hpp +++ b/fvtest/compilertest/tests/LogFileTest.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TEST_LOGFILE_INCL diff --git a/fvtest/compilertest/tests/OMRTestEnv.cpp b/fvtest/compilertest/tests/OMRTestEnv.cpp index 8c02cdbb894..846c9eb0f05 100644 --- a/fvtest/compilertest/tests/OMRTestEnv.cpp +++ b/fvtest/compilertest/tests/OMRTestEnv.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(OMR_OS_WINDOWS) diff --git a/fvtest/compilertest/tests/OMRTestEnv.hpp b/fvtest/compilertest/tests/OMRTestEnv.hpp index b23e466f0da..a7ae47d7dcc 100644 --- a/fvtest/compilertest/tests/OMRTestEnv.hpp +++ b/fvtest/compilertest/tests/OMRTestEnv.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TEST_TESTS_OMRTESTENV_HPP_ diff --git a/fvtest/compilertest/tests/OpCodesTest.cpp b/fvtest/compilertest/tests/OpCodesTest.cpp index 8d2428f1602..1e3f921b4c1 100644 --- a/fvtest/compilertest/tests/OpCodesTest.cpp +++ b/fvtest/compilertest/tests/OpCodesTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/fvtest/compilertest/tests/OpCodesTest.hpp b/fvtest/compilertest/tests/OpCodesTest.hpp index c72b34a7a0e..ee7634900a2 100644 --- a/fvtest/compilertest/tests/OpCodesTest.hpp +++ b/fvtest/compilertest/tests/OpCodesTest.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "TestDriver.hpp" diff --git a/fvtest/compilertest/tests/OptTestDriver.cpp b/fvtest/compilertest/tests/OptTestDriver.cpp index 80d60f1d1c7..8b68bc0630c 100644 --- a/fvtest/compilertest/tests/OptTestDriver.cpp +++ b/fvtest/compilertest/tests/OptTestDriver.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "OptTestDriver.hpp" diff --git a/fvtest/compilertest/tests/OptTestDriver.hpp b/fvtest/compilertest/tests/OptTestDriver.hpp index 85011d5bcf1..9933b86b830 100644 --- a/fvtest/compilertest/tests/OptTestDriver.hpp +++ b/fvtest/compilertest/tests/OptTestDriver.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OPTTESTDRIVER_HPP diff --git a/fvtest/compilertest/tests/OptionSetTest.cpp b/fvtest/compilertest/tests/OptionSetTest.cpp index 1242402dc60..42f725a3a1e 100644 --- a/fvtest/compilertest/tests/OptionSetTest.cpp +++ b/fvtest/compilertest/tests/OptionSetTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(GTEST_HAS_DEATH_TEST) diff --git a/fvtest/compilertest/tests/OptionSetTest.hpp b/fvtest/compilertest/tests/OptionSetTest.hpp index b6166b0368d..60f1a7c01c4 100644 --- a/fvtest/compilertest/tests/OptionSetTest.hpp +++ b/fvtest/compilertest/tests/OptionSetTest.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TEST_OPTIONSET_INCL diff --git a/fvtest/compilertest/tests/PPCOpCodesTest.cpp b/fvtest/compilertest/tests/PPCOpCodesTest.cpp index 8b17ec6ca8c..fab5d12daf7 100644 --- a/fvtest/compilertest/tests/PPCOpCodesTest.cpp +++ b/fvtest/compilertest/tests/PPCOpCodesTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/fvtest/compilertest/tests/PPCOpCodesTest.hpp b/fvtest/compilertest/tests/PPCOpCodesTest.hpp index 024483f3a7b..d154526a582 100644 --- a/fvtest/compilertest/tests/PPCOpCodesTest.hpp +++ b/fvtest/compilertest/tests/PPCOpCodesTest.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "OpCodesTest.hpp" diff --git a/fvtest/compilertest/tests/Qux2Test.cpp b/fvtest/compilertest/tests/Qux2Test.cpp index 4ff08792fb0..e02a57724b5 100644 --- a/fvtest/compilertest/tests/Qux2Test.cpp +++ b/fvtest/compilertest/tests/Qux2Test.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/fvtest/compilertest/tests/Qux2Test.hpp b/fvtest/compilertest/tests/Qux2Test.hpp index 712474dc61d..ca33fe59884 100644 --- a/fvtest/compilertest/tests/Qux2Test.hpp +++ b/fvtest/compilertest/tests/Qux2Test.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "TestDriver.hpp" diff --git a/fvtest/compilertest/tests/S390OpCodesTest.cpp b/fvtest/compilertest/tests/S390OpCodesTest.cpp index 47050dc80d9..8b60ab3985e 100644 --- a/fvtest/compilertest/tests/S390OpCodesTest.cpp +++ b/fvtest/compilertest/tests/S390OpCodesTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/fvtest/compilertest/tests/S390OpCodesTest.hpp b/fvtest/compilertest/tests/S390OpCodesTest.hpp index d759428ad68..65de90083e9 100644 --- a/fvtest/compilertest/tests/S390OpCodesTest.hpp +++ b/fvtest/compilertest/tests/S390OpCodesTest.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "OpCodesTest.hpp" diff --git a/fvtest/compilertest/tests/SimplifierFoldAndTest.cpp b/fvtest/compilertest/tests/SimplifierFoldAndTest.cpp index 54707976902..466876eb407 100644 --- a/fvtest/compilertest/tests/SimplifierFoldAndTest.cpp +++ b/fvtest/compilertest/tests/SimplifierFoldAndTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/fvtest/compilertest/tests/SingleBitContainerTest.cpp b/fvtest/compilertest/tests/SingleBitContainerTest.cpp index 8ded1f95435..9fe0c4b361a 100644 --- a/fvtest/compilertest/tests/SingleBitContainerTest.cpp +++ b/fvtest/compilertest/tests/SingleBitContainerTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "infra/BitVector.hpp" diff --git a/fvtest/compilertest/tests/TestDriver.cpp b/fvtest/compilertest/tests/TestDriver.cpp index 75d15ce3da1..525b0eeb160 100644 --- a/fvtest/compilertest/tests/TestDriver.cpp +++ b/fvtest/compilertest/tests/TestDriver.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/fvtest/compilertest/tests/TestDriver.hpp b/fvtest/compilertest/tests/TestDriver.hpp index f27c5a2b49c..c45a6294fe5 100644 --- a/fvtest/compilertest/tests/TestDriver.hpp +++ b/fvtest/compilertest/tests/TestDriver.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TESTDRIVER_HPP diff --git a/fvtest/compilertest/tests/X86OpCodesTest.cpp b/fvtest/compilertest/tests/X86OpCodesTest.cpp index 6c76907d7bf..403deefb676 100644 --- a/fvtest/compilertest/tests/X86OpCodesTest.cpp +++ b/fvtest/compilertest/tests/X86OpCodesTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/fvtest/compilertest/tests/X86OpCodesTest.hpp b/fvtest/compilertest/tests/X86OpCodesTest.hpp index f8ea978da7b..305c8f25012 100644 --- a/fvtest/compilertest/tests/X86OpCodesTest.hpp +++ b/fvtest/compilertest/tests/X86OpCodesTest.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "OpCodesTest.hpp" diff --git a/fvtest/compilertest/tests/injectors/BarIlInjector.cpp b/fvtest/compilertest/tests/injectors/BarIlInjector.cpp index 810d0a4ee72..e31717d4d0f 100644 --- a/fvtest/compilertest/tests/injectors/BarIlInjector.cpp +++ b/fvtest/compilertest/tests/injectors/BarIlInjector.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/Compilation.hpp" diff --git a/fvtest/compilertest/tests/injectors/BarIlInjector.hpp b/fvtest/compilertest/tests/injectors/BarIlInjector.hpp index 610e87d663f..25945101cb5 100644 --- a/fvtest/compilertest/tests/injectors/BarIlInjector.hpp +++ b/fvtest/compilertest/tests/injectors/BarIlInjector.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ilgen/IlInjector.hpp" diff --git a/fvtest/compilertest/tests/injectors/BinaryOpIlInjector.cpp b/fvtest/compilertest/tests/injectors/BinaryOpIlInjector.cpp index 4c268197738..175f2e7afe1 100644 --- a/fvtest/compilertest/tests/injectors/BinaryOpIlInjector.cpp +++ b/fvtest/compilertest/tests/injectors/BinaryOpIlInjector.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/Compilation.hpp" diff --git a/fvtest/compilertest/tests/injectors/BinaryOpIlInjector.hpp b/fvtest/compilertest/tests/injectors/BinaryOpIlInjector.hpp index 12dcb23038c..ef532362df4 100644 --- a/fvtest/compilertest/tests/injectors/BinaryOpIlInjector.hpp +++ b/fvtest/compilertest/tests/injectors/BinaryOpIlInjector.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TEST_BINARYOPILINJECTOR_INCL diff --git a/fvtest/compilertest/tests/injectors/CallIlInjector.cpp b/fvtest/compilertest/tests/injectors/CallIlInjector.cpp index cb5998a82ab..6adcb9cd205 100644 --- a/fvtest/compilertest/tests/injectors/CallIlInjector.cpp +++ b/fvtest/compilertest/tests/injectors/CallIlInjector.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/Compilation.hpp" diff --git a/fvtest/compilertest/tests/injectors/CallIlInjector.hpp b/fvtest/compilertest/tests/injectors/CallIlInjector.hpp index b82d001a7c6..834269e6736 100644 --- a/fvtest/compilertest/tests/injectors/CallIlInjector.hpp +++ b/fvtest/compilertest/tests/injectors/CallIlInjector.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TEST_CALLILINJECTOR_INCL diff --git a/fvtest/compilertest/tests/injectors/ChildlessUnaryOpIlInjector.cpp b/fvtest/compilertest/tests/injectors/ChildlessUnaryOpIlInjector.cpp index 5512be1f657..61d5ee7249a 100644 --- a/fvtest/compilertest/tests/injectors/ChildlessUnaryOpIlInjector.cpp +++ b/fvtest/compilertest/tests/injectors/ChildlessUnaryOpIlInjector.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/Compilation.hpp" diff --git a/fvtest/compilertest/tests/injectors/ChildlessUnaryOpIlInjector.hpp b/fvtest/compilertest/tests/injectors/ChildlessUnaryOpIlInjector.hpp index 8ce4dc74090..6acd7dcd5ba 100644 --- a/fvtest/compilertest/tests/injectors/ChildlessUnaryOpIlInjector.hpp +++ b/fvtest/compilertest/tests/injectors/ChildlessUnaryOpIlInjector.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TEST_CHILDLESSUNARYOPILINJECTOR_INCL diff --git a/fvtest/compilertest/tests/injectors/CmpBranchOpIlInjector.cpp b/fvtest/compilertest/tests/injectors/CmpBranchOpIlInjector.cpp index a988bc0e0d6..16f53c64fd8 100644 --- a/fvtest/compilertest/tests/injectors/CmpBranchOpIlInjector.cpp +++ b/fvtest/compilertest/tests/injectors/CmpBranchOpIlInjector.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/Compilation.hpp" diff --git a/fvtest/compilertest/tests/injectors/CmpBranchOpIlInjector.hpp b/fvtest/compilertest/tests/injectors/CmpBranchOpIlInjector.hpp index 708371f7432..5723d51d881 100644 --- a/fvtest/compilertest/tests/injectors/CmpBranchOpIlInjector.hpp +++ b/fvtest/compilertest/tests/injectors/CmpBranchOpIlInjector.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TEST_CMPBRANCHOPILINJECTOR_INCL diff --git a/fvtest/compilertest/tests/injectors/FooIlInjector.cpp b/fvtest/compilertest/tests/injectors/FooIlInjector.cpp index 75111493300..397b0af6ef4 100644 --- a/fvtest/compilertest/tests/injectors/FooIlInjector.cpp +++ b/fvtest/compilertest/tests/injectors/FooIlInjector.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/Compilation.hpp" diff --git a/fvtest/compilertest/tests/injectors/FooIlInjector.hpp b/fvtest/compilertest/tests/injectors/FooIlInjector.hpp index f89e9595ca9..287f68ca1c5 100644 --- a/fvtest/compilertest/tests/injectors/FooIlInjector.hpp +++ b/fvtest/compilertest/tests/injectors/FooIlInjector.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ilgen/IlInjector.hpp" diff --git a/fvtest/compilertest/tests/injectors/IndirectLoadIlInjector.cpp b/fvtest/compilertest/tests/injectors/IndirectLoadIlInjector.cpp index 3de7b1a41e5..4d9cccac113 100644 --- a/fvtest/compilertest/tests/injectors/IndirectLoadIlInjector.cpp +++ b/fvtest/compilertest/tests/injectors/IndirectLoadIlInjector.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/Compilation.hpp" diff --git a/fvtest/compilertest/tests/injectors/IndirectLoadIlInjector.hpp b/fvtest/compilertest/tests/injectors/IndirectLoadIlInjector.hpp index 4c1f430a41e..6d5eba46fe3 100644 --- a/fvtest/compilertest/tests/injectors/IndirectLoadIlInjector.hpp +++ b/fvtest/compilertest/tests/injectors/IndirectLoadIlInjector.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TEST_INDIRECTLOADIILINJECTOR_INCL diff --git a/fvtest/compilertest/tests/injectors/IndirectStoreIlInjector.cpp b/fvtest/compilertest/tests/injectors/IndirectStoreIlInjector.cpp index 690af804fbd..d4a7fa3e5cd 100644 --- a/fvtest/compilertest/tests/injectors/IndirectStoreIlInjector.cpp +++ b/fvtest/compilertest/tests/injectors/IndirectStoreIlInjector.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/Compilation.hpp" diff --git a/fvtest/compilertest/tests/injectors/IndirectStoreIlInjector.hpp b/fvtest/compilertest/tests/injectors/IndirectStoreIlInjector.hpp index 681389e4aaf..5a44f392f37 100644 --- a/fvtest/compilertest/tests/injectors/IndirectStoreIlInjector.hpp +++ b/fvtest/compilertest/tests/injectors/IndirectStoreIlInjector.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TEST_INDIRECTSTOREIILINJECTOR_INCL diff --git a/fvtest/compilertest/tests/injectors/OpIlInjector.cpp b/fvtest/compilertest/tests/injectors/OpIlInjector.cpp index 0b751ee2ef3..30ff8309984 100644 --- a/fvtest/compilertest/tests/injectors/OpIlInjector.cpp +++ b/fvtest/compilertest/tests/injectors/OpIlInjector.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CodeGenerator.hpp" diff --git a/fvtest/compilertest/tests/injectors/OpIlInjector.hpp b/fvtest/compilertest/tests/injectors/OpIlInjector.hpp index 095e18ae9fe..b422c14e26c 100644 --- a/fvtest/compilertest/tests/injectors/OpIlInjector.hpp +++ b/fvtest/compilertest/tests/injectors/OpIlInjector.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TEST_OPILINJECTOR_INCL diff --git a/fvtest/compilertest/tests/injectors/Qux2IlInjector.cpp b/fvtest/compilertest/tests/injectors/Qux2IlInjector.cpp index 11125e675f4..f9a8034dc40 100644 --- a/fvtest/compilertest/tests/injectors/Qux2IlInjector.cpp +++ b/fvtest/compilertest/tests/injectors/Qux2IlInjector.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/Compilation.hpp" diff --git a/fvtest/compilertest/tests/injectors/Qux2IlInjector.hpp b/fvtest/compilertest/tests/injectors/Qux2IlInjector.hpp index 5046f1ac21f..35ff86cfc8b 100644 --- a/fvtest/compilertest/tests/injectors/Qux2IlInjector.hpp +++ b/fvtest/compilertest/tests/injectors/Qux2IlInjector.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ilgen/IlInjector.hpp" diff --git a/fvtest/compilertest/tests/injectors/SelectOpIlInjector.cpp b/fvtest/compilertest/tests/injectors/SelectOpIlInjector.cpp index f0670d93600..aceb6323b27 100644 --- a/fvtest/compilertest/tests/injectors/SelectOpIlInjector.cpp +++ b/fvtest/compilertest/tests/injectors/SelectOpIlInjector.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/Compilation.hpp" diff --git a/fvtest/compilertest/tests/injectors/SelectOpIlInjector.hpp b/fvtest/compilertest/tests/injectors/SelectOpIlInjector.hpp index 3ca57f08545..a927cca462a 100644 --- a/fvtest/compilertest/tests/injectors/SelectOpIlInjector.hpp +++ b/fvtest/compilertest/tests/injectors/SelectOpIlInjector.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TEST_SELECTOPILINJECTOR_INCL diff --git a/fvtest/compilertest/tests/injectors/StoreOpIlInjector.cpp b/fvtest/compilertest/tests/injectors/StoreOpIlInjector.cpp index eaa79d895d2..459305184ec 100644 --- a/fvtest/compilertest/tests/injectors/StoreOpIlInjector.cpp +++ b/fvtest/compilertest/tests/injectors/StoreOpIlInjector.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/Compilation.hpp" diff --git a/fvtest/compilertest/tests/injectors/StoreOpIlInjector.hpp b/fvtest/compilertest/tests/injectors/StoreOpIlInjector.hpp index b15895ec7bd..eb4733b1ecd 100644 --- a/fvtest/compilertest/tests/injectors/StoreOpIlInjector.hpp +++ b/fvtest/compilertest/tests/injectors/StoreOpIlInjector.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TEST_STORE_OP_IL_INJECTOR_HPP diff --git a/fvtest/compilertest/tests/injectors/UnaryOpIlInjector.cpp b/fvtest/compilertest/tests/injectors/UnaryOpIlInjector.cpp index d3e7ee068bd..b4a620dcbc5 100644 --- a/fvtest/compilertest/tests/injectors/UnaryOpIlInjector.cpp +++ b/fvtest/compilertest/tests/injectors/UnaryOpIlInjector.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/Compilation.hpp" diff --git a/fvtest/compilertest/tests/injectors/UnaryOpIlInjector.hpp b/fvtest/compilertest/tests/injectors/UnaryOpIlInjector.hpp index ef7b346ef5e..d68a9774995 100644 --- a/fvtest/compilertest/tests/injectors/UnaryOpIlInjector.hpp +++ b/fvtest/compilertest/tests/injectors/UnaryOpIlInjector.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TEST_UNARYOPILINJECTOR_INCL diff --git a/fvtest/compilertest/tests/main.cpp b/fvtest/compilertest/tests/main.cpp index 805a1dfc273..3a1440b47ab 100644 --- a/fvtest/compilertest/tests/main.cpp +++ b/fvtest/compilertest/tests/main.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/fvtest/compilertest/x/codegen/Evaluator.cpp b/fvtest/compilertest/x/codegen/Evaluator.cpp index a9ebf9d32c5..779d5aa8dd7 100644 --- a/fvtest/compilertest/x/codegen/Evaluator.cpp +++ b/fvtest/compilertest/x/codegen/Evaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ extern "C" diff --git a/fvtest/compilertest/z/codegen/Evaluator.cpp b/fvtest/compilertest/z/codegen/Evaluator.cpp index 077582dc758..1a675562f1c 100644 --- a/fvtest/compilertest/z/codegen/Evaluator.cpp +++ b/fvtest/compilertest/z/codegen/Evaluator.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CodeGenerator.hpp" diff --git a/fvtest/compilertriltest/ArithmeticTest.cpp b/fvtest/compilertriltest/ArithmeticTest.cpp index 0bb74413fa1..6413af3f65b 100644 --- a/fvtest/compilertriltest/ArithmeticTest.cpp +++ b/fvtest/compilertriltest/ArithmeticTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "OpCodeTest.hpp" diff --git a/fvtest/compilertriltest/ArrayTest.cpp b/fvtest/compilertriltest/ArrayTest.cpp index 129771d47ed..b92119fef46 100644 --- a/fvtest/compilertriltest/ArrayTest.cpp +++ b/fvtest/compilertriltest/ArrayTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "OpCodeTest.hpp" diff --git a/fvtest/compilertriltest/BitPermuteTest.cpp b/fvtest/compilertriltest/BitPermuteTest.cpp index ecb10261804..7f127674207 100644 --- a/fvtest/compilertriltest/BitPermuteTest.cpp +++ b/fvtest/compilertriltest/BitPermuteTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/fvtest/compilertriltest/CMakeLists.txt b/fvtest/compilertriltest/CMakeLists.txt index 70bf78bc17f..cfe08c5f183 100644 --- a/fvtest/compilertriltest/CMakeLists.txt +++ b/fvtest/compilertriltest/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### cmake_minimum_required(VERSION 3.2 FATAL_ERROR) diff --git a/fvtest/compilertriltest/CallTest.cpp b/fvtest/compilertriltest/CallTest.cpp index aa33a4eb331..7a41ff73e3b 100644 --- a/fvtest/compilertriltest/CallTest.cpp +++ b/fvtest/compilertriltest/CallTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "JitTest.hpp" diff --git a/fvtest/compilertriltest/CompareTest.cpp b/fvtest/compilertriltest/CompareTest.cpp index e096005ff2a..d4595e11ae8 100644 --- a/fvtest/compilertriltest/CompareTest.cpp +++ b/fvtest/compilertriltest/CompareTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "OpCodeTest.hpp" diff --git a/fvtest/compilertriltest/ILValidatorTest.cpp b/fvtest/compilertriltest/ILValidatorTest.cpp index 0d069373787..d00b164d01a 100644 --- a/fvtest/compilertriltest/ILValidatorTest.cpp +++ b/fvtest/compilertriltest/ILValidatorTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "JitTest.hpp" diff --git a/fvtest/compilertriltest/IfxcmpgeReductionTest.cpp b/fvtest/compilertriltest/IfxcmpgeReductionTest.cpp index 3765a4a8c7d..749a93e1cae 100644 --- a/fvtest/compilertriltest/IfxcmpgeReductionTest.cpp +++ b/fvtest/compilertriltest/IfxcmpgeReductionTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/fvtest/compilertriltest/JitTest.cpp b/fvtest/compilertriltest/JitTest.cpp index 3798f766f46..47f315be614 100644 --- a/fvtest/compilertriltest/JitTest.cpp +++ b/fvtest/compilertriltest/JitTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "JitTest.hpp" diff --git a/fvtest/compilertriltest/JitTest.hpp b/fvtest/compilertriltest/JitTest.hpp index 2d004a162c9..df3fcbf8ba5 100644 --- a/fvtest/compilertriltest/JitTest.hpp +++ b/fvtest/compilertriltest/JitTest.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JITTEST_HPP diff --git a/fvtest/compilertriltest/JitTestUtilitiesTest.cpp b/fvtest/compilertriltest/JitTestUtilitiesTest.cpp index b11e73541ec..9088ac06f41 100644 --- a/fvtest/compilertriltest/JitTestUtilitiesTest.cpp +++ b/fvtest/compilertriltest/JitTestUtilitiesTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "JitTest.hpp" diff --git a/fvtest/compilertriltest/LinkageTest.cpp b/fvtest/compilertriltest/LinkageTest.cpp index bf7bee733d2..ab9588bebe8 100644 --- a/fvtest/compilertriltest/LinkageTest.cpp +++ b/fvtest/compilertriltest/LinkageTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "JitTest.hpp" diff --git a/fvtest/compilertriltest/LogicalTest.cpp b/fvtest/compilertriltest/LogicalTest.cpp index caac620fc44..25177023042 100644 --- a/fvtest/compilertriltest/LogicalTest.cpp +++ b/fvtest/compilertriltest/LogicalTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/fvtest/compilertriltest/LongAndAsRotateTest.cpp b/fvtest/compilertriltest/LongAndAsRotateTest.cpp index 32b64c483fc..367e53670e1 100644 --- a/fvtest/compilertriltest/LongAndAsRotateTest.cpp +++ b/fvtest/compilertriltest/LongAndAsRotateTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "JitTest.hpp" diff --git a/fvtest/compilertriltest/MaxMinTest.cpp b/fvtest/compilertriltest/MaxMinTest.cpp index c765f3b819d..f0dede0be4b 100644 --- a/fvtest/compilertriltest/MaxMinTest.cpp +++ b/fvtest/compilertriltest/MaxMinTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "OpCodeTest.hpp" diff --git a/fvtest/compilertriltest/MinimalTest.cpp b/fvtest/compilertriltest/MinimalTest.cpp index 56920db0005..c2ebfce558a 100644 --- a/fvtest/compilertriltest/MinimalTest.cpp +++ b/fvtest/compilertriltest/MinimalTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/fvtest/compilertriltest/MockStrategyTest.cpp b/fvtest/compilertriltest/MockStrategyTest.cpp index 12996ee4e16..73d967a4fcf 100644 --- a/fvtest/compilertriltest/MockStrategyTest.cpp +++ b/fvtest/compilertriltest/MockStrategyTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "JitTest.hpp" diff --git a/fvtest/compilertriltest/OpCodeTest.hpp b/fvtest/compilertriltest/OpCodeTest.hpp index 87e6998ef49..62c9481ab4a 100644 --- a/fvtest/compilertriltest/OpCodeTest.hpp +++ b/fvtest/compilertriltest/OpCodeTest.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OPCODETEST_HPP diff --git a/fvtest/compilertriltest/SelectTest.cpp b/fvtest/compilertriltest/SelectTest.cpp index c980c22c329..a810a95d080 100644 --- a/fvtest/compilertriltest/SelectTest.cpp +++ b/fvtest/compilertriltest/SelectTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "OpCodeTest.hpp" diff --git a/fvtest/compilertriltest/SharedVerifiers.hpp b/fvtest/compilertriltest/SharedVerifiers.hpp index 6825fc3494e..ddcbcfcfb3d 100644 --- a/fvtest/compilertriltest/SharedVerifiers.hpp +++ b/fvtest/compilertriltest/SharedVerifiers.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/fvtest/compilertriltest/ShiftAndRotateTest.cpp b/fvtest/compilertriltest/ShiftAndRotateTest.cpp index e6710fe9990..0e25c2a7310 100644 --- a/fvtest/compilertriltest/ShiftAndRotateTest.cpp +++ b/fvtest/compilertriltest/ShiftAndRotateTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "OpCodeTest.hpp" diff --git a/fvtest/compilertriltest/SimplifierFoldAbsNegTest.cpp b/fvtest/compilertriltest/SimplifierFoldAbsNegTest.cpp index b543fac04d8..cf3970e2ca5 100644 --- a/fvtest/compilertriltest/SimplifierFoldAbsNegTest.cpp +++ b/fvtest/compilertriltest/SimplifierFoldAbsNegTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/fvtest/compilertriltest/SimplifierFoldAndTest.cpp b/fvtest/compilertriltest/SimplifierFoldAndTest.cpp index d0ce52cc92e..f52bc92f6af 100644 --- a/fvtest/compilertriltest/SimplifierFoldAndTest.cpp +++ b/fvtest/compilertriltest/SimplifierFoldAndTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "JitTest.hpp" diff --git a/fvtest/compilertriltest/TypeConversionTest.cpp b/fvtest/compilertriltest/TypeConversionTest.cpp index d89a3c7374d..eedef192ac9 100644 --- a/fvtest/compilertriltest/TypeConversionTest.cpp +++ b/fvtest/compilertriltest/TypeConversionTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "OpCodeTest.hpp" diff --git a/fvtest/compilertriltest/VectorTest.cpp b/fvtest/compilertriltest/VectorTest.cpp index a6c7ca81796..eb32d16ac54 100644 --- a/fvtest/compilertriltest/VectorTest.cpp +++ b/fvtest/compilertriltest/VectorTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "JitTest.hpp" diff --git a/fvtest/compilertriltest/main.cpp b/fvtest/compilertriltest/main.cpp index 3e0534e6e47..ad8c545d49c 100644 --- a/fvtest/compilertriltest/main.cpp +++ b/fvtest/compilertriltest/main.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "JitTest.hpp" diff --git a/fvtest/compilerunittest/CCData.cpp b/fvtest/compilerunittest/CCData.cpp index 5c5ec29a043..94dece6f1b6 100644 --- a/fvtest/compilerunittest/CCData.cpp +++ b/fvtest/compilerunittest/CCData.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "gtest/gtest.h" diff --git a/fvtest/compilerunittest/CMakeLists.txt b/fvtest/compilerunittest/CMakeLists.txt index 6e28e75799c..02fbe1ec2d7 100644 --- a/fvtest/compilerunittest/CMakeLists.txt +++ b/fvtest/compilerunittest/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### cmake_minimum_required(VERSION 3.2 FATAL_ERROR) diff --git a/fvtest/compilerunittest/CodeGenTest.cpp b/fvtest/compilerunittest/CodeGenTest.cpp index c4356d4b7e8..57f5c1700d9 100644 --- a/fvtest/compilerunittest/CodeGenTest.cpp +++ b/fvtest/compilerunittest/CodeGenTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CodeGenTest.hpp" diff --git a/fvtest/compilerunittest/CodeGenTest.hpp b/fvtest/compilerunittest/CodeGenTest.hpp index e70dd0bc0e4..de87d2e3de3 100644 --- a/fvtest/compilerunittest/CodeGenTest.hpp +++ b/fvtest/compilerunittest/CodeGenTest.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CODEGENTEST_HPP diff --git a/fvtest/compilerunittest/CompilerUnitTest.hpp b/fvtest/compilerunittest/CompilerUnitTest.hpp index 2ab675b845a..83fc776b15b 100644 --- a/fvtest/compilerunittest/CompilerUnitTest.hpp +++ b/fvtest/compilerunittest/CompilerUnitTest.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef COMPILER_UNIT_TEST_HPP diff --git a/fvtest/compilerunittest/aarch64/BinaryEncoder.cpp b/fvtest/compilerunittest/aarch64/BinaryEncoder.cpp index 4385544f04c..eb62ff2e417 100644 --- a/fvtest/compilerunittest/aarch64/BinaryEncoder.cpp +++ b/fvtest/compilerunittest/aarch64/BinaryEncoder.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/fvtest/compilerunittest/abstractinterpreter/AbsInterpreterTest.cpp b/fvtest/compilerunittest/abstractinterpreter/AbsInterpreterTest.cpp index 9f9a0f9b988..c12445c2d44 100644 --- a/fvtest/compilerunittest/abstractinterpreter/AbsInterpreterTest.cpp +++ b/fvtest/compilerunittest/abstractinterpreter/AbsInterpreterTest.cpp @@ -16,7 +16,7 @@ * [1] https://www->gnu->org/software/classpath/license->html * [2] http://openjdk->java->net/legal/assembly-exception->html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/fvtest/compilerunittest/abstractinterpreter/AbsInterpreterTest.hpp b/fvtest/compilerunittest/abstractinterpreter/AbsInterpreterTest.hpp index 7621513728f..9babbd72009 100644 --- a/fvtest/compilerunittest/abstractinterpreter/AbsInterpreterTest.hpp +++ b/fvtest/compilerunittest/abstractinterpreter/AbsInterpreterTest.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ABS_INTERPRETER_TEST_HPP diff --git a/fvtest/compilerunittest/main.cpp b/fvtest/compilerunittest/main.cpp index 89ca4ca09ad..c5aaafe1d2c 100644 --- a/fvtest/compilerunittest/main.cpp +++ b/fvtest/compilerunittest/main.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omrTest.h" diff --git a/fvtest/compilerunittest/p/BinaryEncoder.cpp b/fvtest/compilerunittest/p/BinaryEncoder.cpp index 2ed4ef4007b..cc59f107a55 100644 --- a/fvtest/compilerunittest/p/BinaryEncoder.cpp +++ b/fvtest/compilerunittest/p/BinaryEncoder.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "../CodeGenTest.hpp" diff --git a/fvtest/compilerunittest/p/MemoryReferenceExpansion.cpp b/fvtest/compilerunittest/p/MemoryReferenceExpansion.cpp index ef6b5761f64..acb2b44a8fc 100644 --- a/fvtest/compilerunittest/p/MemoryReferenceExpansion.cpp +++ b/fvtest/compilerunittest/p/MemoryReferenceExpansion.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "../CodeGenTest.hpp" diff --git a/fvtest/compilerunittest/p/Peephole.cpp b/fvtest/compilerunittest/p/Peephole.cpp index 9ed6a87946b..68eee76b381 100644 --- a/fvtest/compilerunittest/p/Peephole.cpp +++ b/fvtest/compilerunittest/p/Peephole.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "../CodeGenTest.hpp" diff --git a/fvtest/compilerunittest/p/Util.hpp b/fvtest/compilerunittest/p/Util.hpp index ad0a4047bd6..5ef63baec7e 100644 --- a/fvtest/compilerunittest/p/Util.hpp +++ b/fvtest/compilerunittest/p/Util.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef P_UTIL_HPP diff --git a/fvtest/compilerunittest/x/BinaryEncoder.cpp b/fvtest/compilerunittest/x/BinaryEncoder.cpp index ccadd6ea23a..e8d5bb77f12 100644 --- a/fvtest/compilerunittest/x/BinaryEncoder.cpp +++ b/fvtest/compilerunittest/x/BinaryEncoder.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/fvtest/coretest/CMakeLists.txt b/fvtest/coretest/CMakeLists.txt index 68568755559..0a0174a99cb 100644 --- a/fvtest/coretest/CMakeLists.txt +++ b/fvtest/coretest/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### function(omr_add_core_test testname) diff --git a/fvtest/coretest/TestBytes.cpp b/fvtest/coretest/TestBytes.cpp index db1bd0036ad..bb4d6fe9b39 100644 --- a/fvtest/coretest/TestBytes.cpp +++ b/fvtest/coretest/TestBytes.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/fvtest/coretest/TestIntrusiveList.cpp b/fvtest/coretest/TestIntrusiveList.cpp index 595a013db3c..e829254282b 100644 --- a/fvtest/coretest/TestIntrusiveList.cpp +++ b/fvtest/coretest/TestIntrusiveList.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/fvtest/coretest/TestTypeTraits.cpp b/fvtest/coretest/TestTypeTraits.cpp index 30fe575a8e7..f970f43f11a 100644 --- a/fvtest/coretest/TestTypeTraits.cpp +++ b/fvtest/coretest/TestTypeTraits.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/fvtest/coretest/main.cpp b/fvtest/coretest/main.cpp index 4daffb5ce8d..2c6077239ca 100644 --- a/fvtest/coretest/main.cpp +++ b/fvtest/coretest/main.cpp @@ -16,8 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omrTest.h" diff --git a/fvtest/gc_api_test/CMakeLists.txt b/fvtest/gc_api_test/CMakeLists.txt index cd1b91c71ea..f7bd82c78b9 100644 --- a/fvtest/gc_api_test/CMakeLists.txt +++ b/fvtest/gc_api_test/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### include(OmrAssert) diff --git a/fvtest/gc_api_test/main.cpp b/fvtest/gc_api_test/main.cpp index 4daffb5ce8d..2c6077239ca 100644 --- a/fvtest/gc_api_test/main.cpp +++ b/fvtest/gc_api_test/main.cpp @@ -16,8 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omrTest.h" diff --git a/fvtest/gctest/CMakeLists.txt b/fvtest/gctest/CMakeLists.txt index 4b161666908..c57fad481e7 100644 --- a/fvtest/gctest/CMakeLists.txt +++ b/fvtest/gctest/CMakeLists.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### omr_assert( diff --git a/fvtest/gctest/GCConfigObjectTable.cpp b/fvtest/gctest/GCConfigObjectTable.cpp index eb8432fb677..f4000df9a84 100644 --- a/fvtest/gctest/GCConfigObjectTable.cpp +++ b/fvtest/gctest/GCConfigObjectTable.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "GCConfigObjectTable.hpp" diff --git a/fvtest/gctest/GCConfigObjectTable.hpp b/fvtest/gctest/GCConfigObjectTable.hpp index dc05db2e2e0..ca1c1c5f585 100644 --- a/fvtest/gctest/GCConfigObjectTable.hpp +++ b/fvtest/gctest/GCConfigObjectTable.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "gcTestHelpers.hpp" diff --git a/fvtest/gctest/GCConfigTest.cpp b/fvtest/gctest/GCConfigTest.cpp index 38665e7a0b2..6530ed6f6f9 100644 --- a/fvtest/gctest/GCConfigTest.cpp +++ b/fvtest/gctest/GCConfigTest.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CollectorLanguageInterface.hpp" diff --git a/fvtest/gctest/GCConfigTest.hpp b/fvtest/gctest/GCConfigTest.hpp index 56513b61afb..1c91672c88b 100644 --- a/fvtest/gctest/GCConfigTest.hpp +++ b/fvtest/gctest/GCConfigTest.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "AllocateDescription.hpp" diff --git a/fvtest/gctest/StartupManagerTestExample.cpp b/fvtest/gctest/StartupManagerTestExample.cpp index c777f50c809..33a1ff41f97 100644 --- a/fvtest/gctest/StartupManagerTestExample.cpp +++ b/fvtest/gctest/StartupManagerTestExample.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "StartupManagerTestExample.hpp" diff --git a/fvtest/gctest/StartupManagerTestExample.hpp b/fvtest/gctest/StartupManagerTestExample.hpp index b2368e6b92c..679d9ef3853 100644 --- a/fvtest/gctest/StartupManagerTestExample.hpp +++ b/fvtest/gctest/StartupManagerTestExample.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(MM_STARTUPMANAGERTESTEXAMPLE_HPP_) diff --git a/fvtest/gctest/TestHeapRegionStateTable.cpp b/fvtest/gctest/TestHeapRegionStateTable.cpp index 93dd7d786af..6136e98531d 100644 --- a/fvtest/gctest/TestHeapRegionStateTable.cpp +++ b/fvtest/gctest/TestHeapRegionStateTable.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "HeapRegionStateTable.hpp" diff --git a/fvtest/gctest/configuration/gencon_GC_backout_config.xml b/fvtest/gctest/configuration/gencon_GC_backout_config.xml index 9315ae0803a..0c2470e8dce 100644 --- a/fvtest/gctest/configuration/gencon_GC_backout_config.xml +++ b/fvtest/gctest/configuration/gencon_GC_backout_config.xml @@ -17,7 +17,7 @@ License, version 2 with the OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 -->

License

[2] https://openjdk.org/legal/assembly-exception.html

-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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0

If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may diff --git a/nls/portnls.h b/nls/portnls.h index 00ff8bf21da..13bd55c91c1 100644 --- a/nls/portnls.h +++ b/nls/portnls.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef portnls_h diff --git a/omr.rc.in b/omr.rc.in index c271a9de904..c3c274b4d35 100644 --- a/omr.rc.in +++ b/omr.rc.in @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/omr/CMakeLists.txt b/omr/CMakeLists.txt index d99edc9f630..0fde46bb6d3 100644 --- a/omr/CMakeLists.txt +++ b/omr/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### omr_add_tracegen(omrti.tdf) diff --git a/omr/OMR_Agent.cpp b/omr/OMR_Agent.cpp index cc5b677d23e..f7ef599d963 100644 --- a/omr/OMR_Agent.cpp +++ b/omr/OMR_Agent.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "OMR_Agent.hpp" diff --git a/omr/OMR_MethodDictionary.cpp b/omr/OMR_MethodDictionary.cpp index f8245834f68..faa517ae30c 100644 --- a/omr/OMR_MethodDictionary.cpp +++ b/omr/OMR_MethodDictionary.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "OMR_MethodDictionary.hpp" diff --git a/omr/OMR_MethodDictionary.hpp b/omr/OMR_MethodDictionary.hpp index 94a5b7ca44f..1b3d2c9fb22 100644 --- a/omr/OMR_MethodDictionary.hpp +++ b/omr/OMR_MethodDictionary.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(OMR_METHODDICTIONARY_HPP_INCLUDED) #define OMR_METHODDICTIONARY_HPP_INCLUDED diff --git a/omr/OMR_Profiler.cpp b/omr/OMR_Profiler.cpp index caacaad67ed..6d900133ba1 100644 --- a/omr/OMR_Profiler.cpp +++ b/omr/OMR_Profiler.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omrprofiler.h" diff --git a/omr/OMR_Runtime.cpp b/omr/OMR_Runtime.cpp index a8043fb00e4..89602e4786d 100644 --- a/omr/OMR_Runtime.cpp +++ b/omr/OMR_Runtime.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #define linkNext _linkNext diff --git a/omr/OMR_TI.cpp b/omr/OMR_TI.cpp index 733a09a6760..99174315f99 100644 --- a/omr/OMR_TI.cpp +++ b/omr/OMR_TI.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/omr/OMR_TIMemorySize.cpp b/omr/OMR_TIMemorySize.cpp index 320baf0b383..05b42df52a9 100644 --- a/omr/OMR_TIMemorySize.cpp +++ b/omr/OMR_TIMemorySize.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omrport.h" diff --git a/omr/OMR_VM.cpp b/omr/OMR_VM.cpp index 0c399f20c43..c48aa8fb5f9 100644 --- a/omr/OMR_VM.cpp +++ b/omr/OMR_VM.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omrcfg.h" diff --git a/omr/OMR_VMThread.cpp b/omr/OMR_VMThread.cpp index 541433b1b60..d55edc5fd95 100644 --- a/omr/OMR_VMThread.cpp +++ b/omr/OMR_VMThread.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/omr/makefile b/omr/makefile index 9ee9e7a0245..ebc948f8620 100644 --- a/omr/makefile +++ b/omr/makefile @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### top_srcdir := .. diff --git a/omr/omrti.tdf b/omr/omrti.tdf index b66a4329f5f..99160bffc81 100644 --- a/omr/omrti.tdf +++ b/omr/omrti.tdf @@ -16,7 +16,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// 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 +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 Executable=omrti DATFileName=OMRTraceFormat.dat diff --git a/omr/omrvm.tdf b/omr/omrvm.tdf index 98ebaff1b51..0a65fb79eb4 100644 --- a/omr/omrvm.tdf +++ b/omr/omrvm.tdf @@ -16,7 +16,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// 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 +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 Executable=omrvm DATFileName=OMRTraceFormat.dat diff --git a/omr/startup/CMakeLists.txt b/omr/startup/CMakeLists.txt index ae3109c9f30..00658e1bb93 100644 --- a/omr/startup/CMakeLists.txt +++ b/omr/startup/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### omr_add_library(omrvmstartup STATIC diff --git a/omr/startup/makefile b/omr/startup/makefile index 9619395edd6..00a8885fbce 100644 --- a/omr/startup/makefile +++ b/omr/startup/makefile @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### top_srcdir := ../.. diff --git a/omr/startup/omrrasinit.c b/omr/startup/omrrasinit.c index 697355571b6..42753abbabc 100644 --- a/omr/startup/omrrasinit.c +++ b/omr/startup/omrrasinit.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omrrasinit.h" diff --git a/omr/startup/omrtrcinit.c b/omr/startup/omrtrcinit.c index 8a84b9c9f53..7a8baf6d43f 100644 --- a/omr/startup/omrtrcinit.c +++ b/omr/startup/omrtrcinit.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/omr/startup/omrvmstartup.cpp b/omr/startup/omrvmstartup.cpp index 3cde3097069..f224a7172fa 100644 --- a/omr/startup/omrvmstartup.cpp +++ b/omr/startup/omrvmstartup.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/omr_glue_static_lib/makefile b/omr_glue_static_lib/makefile index b9e0964f0b5..704139ad8b4 100644 --- a/omr_glue_static_lib/makefile +++ b/omr_glue_static_lib/makefile @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### top_srcdir := .. diff --git a/omr_static_lib/makefile b/omr_static_lib/makefile index 05e3745bd2a..7dd75bdc23f 100644 --- a/omr_static_lib/makefile +++ b/omr_static_lib/makefile @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # Create one giant archive for OMR. diff --git a/omrmakefiles/confighelpers.m4 b/omrmakefiles/confighelpers.m4 index 87b2da6ad92..4235f023b30 100644 --- a/omrmakefiles/confighelpers.m4 +++ b/omrmakefiles/confighelpers.m4 @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### ############### Categorize the OS diff --git a/omrmakefiles/configure.mk.in b/omrmakefiles/configure.mk.in index 5229d455e28..0d85e1b915a 100644 --- a/omrmakefiles/configure.mk.in +++ b/omrmakefiles/configure.mk.in @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### ### diff --git a/omrmakefiles/generate-exports.sh b/omrmakefiles/generate-exports.sh index 653a35ed9eb..9c75d2d69fb 100644 --- a/omrmakefiles/generate-exports.sh +++ b/omrmakefiles/generate-exports.sh @@ -18,7 +18,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### ## Program Usage diff --git a/omrmakefiles/jitinclude.mk b/omrmakefiles/jitinclude.mk index 23eaf6c0b75..60e90dd2873 100644 --- a/omrmakefiles/jitinclude.mk +++ b/omrmakefiles/jitinclude.mk @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### OMR_INCLUDES_FOR_JIT = $(OMR_DIR)/include_core $(OMR_DIR)/thread $(OMR_DIR)/gc/include diff --git a/omrmakefiles/omr_defs.mk b/omrmakefiles/omr_defs.mk index be8e915e1fe..81818cabf25 100644 --- a/omrmakefiles/omr_defs.mk +++ b/omrmakefiles/omr_defs.mk @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### ### diff --git a/omrmakefiles/omrconf.sh b/omrmakefiles/omrconf.sh index e73353cc382..2d7aac1bb13 100644 --- a/omrmakefiles/omrconf.sh +++ b/omrmakefiles/omrconf.sh @@ -18,7 +18,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### OMRDIR=$1 diff --git a/omrmakefiles/rules.aix.mk b/omrmakefiles/rules.aix.mk index 5d374bdc34d..2d511df4ee4 100644 --- a/omrmakefiles/rules.aix.mk +++ b/omrmakefiles/rules.aix.mk @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # rules.aix.mk diff --git a/omrmakefiles/rules.linux.mk b/omrmakefiles/rules.linux.mk index 35f0e1f3452..929099ec232 100644 --- a/omrmakefiles/rules.linux.mk +++ b/omrmakefiles/rules.linux.mk @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### ### diff --git a/omrmakefiles/rules.mk b/omrmakefiles/rules.mk index 26599a913f9..da1078b6fe5 100644 --- a/omrmakefiles/rules.mk +++ b/omrmakefiles/rules.mk @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### ### diff --git a/omrmakefiles/rules.osx.mk b/omrmakefiles/rules.osx.mk index 2b50f641474..d647a70cb3f 100644 --- a/omrmakefiles/rules.osx.mk +++ b/omrmakefiles/rules.osx.mk @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### ### diff --git a/omrmakefiles/rules.win.mk b/omrmakefiles/rules.win.mk index 3c80238e087..849aa2fc1dc 100644 --- a/omrmakefiles/rules.win.mk +++ b/omrmakefiles/rules.win.mk @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # Windows-specific tools diff --git a/omrmakefiles/rules.zos.mk b/omrmakefiles/rules.zos.mk index 1da96248414..326c78ec66a 100644 --- a/omrmakefiles/rules.zos.mk +++ b/omrmakefiles/rules.zos.mk @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # If --enable-native-encoding was not passed to configure, diff --git a/omrmakefiles/rules.ztpf.mk b/omrmakefiles/rules.ztpf.mk index ee73487f96e..12cee66566d 100644 --- a/omrmakefiles/rules.ztpf.mk +++ b/omrmakefiles/rules.ztpf.mk @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # z/TPF only has one s390x configuration: diff --git a/omrmakefiles/winexe.manifest b/omrmakefiles/winexe.manifest index 370600cc3cf..1fcacb69577 100644 --- a/omrmakefiles/winexe.manifest +++ b/omrmakefiles/winexe.manifest @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -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 +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/omrsigcompat/CMakeLists.txt b/omrsigcompat/CMakeLists.txt index 995c7fb9a98..9f6718bce28 100644 --- a/omrsigcompat/CMakeLists.txt +++ b/omrsigcompat/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### include(OmrMsvcRuntime) diff --git a/omrsigcompat/makefile b/omrsigcompat/makefile index 04b684d578d..352455e0713 100644 --- a/omrsigcompat/makefile +++ b/omrsigcompat/makefile @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### top_srcdir := .. diff --git a/omrsigcompat/omrsig.cpp b/omrsigcompat/omrsig.cpp index 1e223bb0861..ac4b1534539 100644 --- a/omrsigcompat/omrsig.cpp +++ b/omrsigcompat/omrsig.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(J9ZOS390) diff --git a/omrsigcompat/omrsig_internal.hpp b/omrsigcompat/omrsig_internal.hpp index c718e25629a..0e2d2133f52 100644 --- a/omrsigcompat/omrsig_internal.hpp +++ b/omrsigcompat/omrsig_internal.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/omrtrace/CMakeLists.txt b/omrtrace/CMakeLists.txt index 87a4f378dfe..a89631cf6dd 100644 --- a/omrtrace/CMakeLists.txt +++ b/omrtrace/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### omr_add_library(omrtrace STATIC diff --git a/omrtrace/makefile b/omrtrace/makefile index adf987178fc..17fe725ad08 100644 --- a/omrtrace/makefile +++ b/omrtrace/makefile @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# 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 +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### top_srcdir := .. diff --git a/omrtrace/omrtrace_internal.h b/omrtrace/omrtrace_internal.h index 18d7c0ce455..132665ed53f 100644 --- a/omrtrace/omrtrace_internal.h +++ b/omrtrace/omrtrace_internal.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(OMR_TRACE_INTERNAL_H_INCLUDED) diff --git a/omrtrace/omrtraceapi.cpp b/omrtrace/omrtraceapi.cpp index d0471cec442..c54d41f836b 100644 --- a/omrtrace/omrtraceapi.cpp +++ b/omrtrace/omrtraceapi.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/omrtrace/omrtracecomponent.cpp b/omrtrace/omrtracecomponent.cpp index 7ecbb41d9b3..ef3f95719c9 100644 --- a/omrtrace/omrtracecomponent.cpp +++ b/omrtrace/omrtracecomponent.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* _GNU_SOURCE forces GLIBC_2.0 sscanf/vsscanf/fscanf for RHEL5 compatability */ diff --git a/omrtrace/omrtraceformatter.cpp b/omrtrace/omrtraceformatter.cpp index 58ea6438c61..2e223f1713b 100644 --- a/omrtrace/omrtraceformatter.cpp +++ b/omrtrace/omrtraceformatter.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/omrtrace/omrtracelog.cpp b/omrtrace/omrtracelog.cpp index 0666d8b47af..668baf5e2c0 100644 --- a/omrtrace/omrtracelog.cpp +++ b/omrtrace/omrtracelog.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/omrtrace/omrtracemain.cpp b/omrtrace/omrtracemain.cpp index da4ba3824a9..373e2ba0461 100644 --- a/omrtrace/omrtracemain.cpp +++ b/omrtrace/omrtracemain.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/omrtrace/omrtracemisc.cpp b/omrtrace/omrtracemisc.cpp index 4d5ae0c12fb..8371e0c049e 100644 --- a/omrtrace/omrtracemisc.cpp +++ b/omrtrace/omrtracemisc.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/omrtrace/omrtraceoptions.cpp b/omrtrace/omrtraceoptions.cpp index a9c65051ee0..cc3dfa7ac56 100644 --- a/omrtrace/omrtraceoptions.cpp +++ b/omrtrace/omrtraceoptions.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/omrtrace/omrtracepublish.cpp b/omrtrace/omrtracepublish.cpp index 25e19604a1f..125bca0a157 100644 --- a/omrtrace/omrtracepublish.cpp +++ b/omrtrace/omrtracepublish.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "AtomicSupport.hpp" diff --git a/omrtrace/omrtracewrappers.cpp b/omrtrace/omrtracewrappers.cpp index 39e67f337f1..4ae070213a0 100644 --- a/omrtrace/omrtracewrappers.cpp +++ b/omrtrace/omrtracewrappers.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * 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 + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/perftest/gctest/configuration/21645_core.20150126.202455.11862202.0001.xml b/perftest/gctest/configuration/21645_core.20150126.202455.11862202.0001.xml index 7f2663499cb..c9fc1cddd4b 100644 --- a/perftest/gctest/configuration/21645_core.20150126.202455.11862202.0001.xml +++ b/perftest/gctest/configuration/21645_core.20150126.202455.11862202.0001.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - 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 + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 -->