diff --git a/LICENSE b/LICENSE index d66dabd..d0c55eec 100644 --- a/LICENSE +++ b/LICENSE @@ -173,7 +173,7 @@ incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. ----- Exceptions to the Apache 2.0 License ---- +---- LLVM Exceptions to the Apache 2.0 License ---- As an exception, if, as a result of your compiling your source code, portions of this Software are embedded into an Object form of such source code, you may diff --git a/riscv-sw/build-flow/Makefile.include b/riscv-sw/build-flow/Makefile.include index 9479bdb..2dc7b86 100644 --- a/riscv-sw/build-flow/Makefile.include +++ b/riscv-sw/build-flow/Makefile.include @@ -1,6 +1,6 @@ # Copyright 2021 Gregory Chadwick -# Licensed under the Apache License, Version 2.0, see LICENSE for details. -# SPDX-License-Identifier: Apache-2.0 +# Licensed under the Apache License Version 2.0, with LLVM Exceptions, see LICENSE for details. +# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception RISCV_SW_PATH = $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) diff --git a/riscv-sw/build-flow/crt0.s b/riscv-sw/build-flow/crt0.s index 86b24d4..fc2bb31 100644 --- a/riscv-sw/build-flow/crt0.s +++ b/riscv-sw/build-flow/crt0.s @@ -1,6 +1,6 @@ # Copyright 2021 Gregory Chadwick -# Licensed under the Apache License, Version 2.0, see LICENSE for details. -# SPDX-License-Identifier: Apache-2.0 +# Licensed under the Apache License Version 2.0, with LLVM Exceptions, see LICENSE for details. +# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception .section .text.start diff --git a/riscv-sw/build-flow/link.ld b/riscv-sw/build-flow/link.ld index 49d1eac..47990ef 100644 --- a/riscv-sw/build-flow/link.ld +++ b/riscv-sw/build-flow/link.ld @@ -1,6 +1,6 @@ /* Copyright 2021 Gregory Chadwick - Licensed under the Apache License, Version 2.0, see LICENSE for details. - SPDX-License-Identifier: Apache-2.0 */ + Licensed under the Apache License Version 2.0, with LLVM Exceptions, see LICENSE for details. + SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception */ OUTPUT_ARCH(riscv) diff --git a/riscv-sw/examples/hello_world/Makefile b/riscv-sw/examples/hello_world/Makefile index 1f8bc83..642674c 100644 --- a/riscv-sw/examples/hello_world/Makefile +++ b/riscv-sw/examples/hello_world/Makefile @@ -1,6 +1,6 @@ # Copyright 2021 Gregory Chadwick -# Licensed under the Apache License, Version 2.0, see LICENSE for details. -# SPDX-License-Identifier: Apache-2.0 +# Licensed under the Apache License Version 2.0, with LLVM Exceptions, see LICENSE for details. +# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception PROG_NAME = hello_world diff --git a/riscv-sw/examples/hello_world/hello_world.c b/riscv-sw/examples/hello_world/hello_world.c index bcc5596..d50a530 100644 --- a/riscv-sw/examples/hello_world/hello_world.c +++ b/riscv-sw/examples/hello_world/hello_world.c @@ -1,6 +1,6 @@ // Copyright 2021 Gregory Chadwick -// Licensed under the Apache License, Version 2.0, see LICENSE for details. -// SPDX-License-Identifier: Apache-2.0 +// Licensed under the Apache License Version 2.0, with LLVM Exceptions, see LICENSE for details. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception #include diff --git a/rrs-cli/src/main.rs b/rrs-cli/src/main.rs index 721b994..40641a2 100644 --- a/rrs-cli/src/main.rs +++ b/rrs-cli/src/main.rs @@ -1,6 +1,6 @@ // Copyright 2021 Gregory Chadwick -// Licensed under the Apache License, Version 2.0, see LICENSE for details. -// SPDX-License-Identifier: Apache-2.0 +// Licensed under the Apache License Version 2.0, with LLVM Exceptions, see LICENSE for details. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception use clap::{clap_app, ArgMatches}; use rrs_lib::instruction_executor::{InstructionExecutor, InstructionTrap}; diff --git a/rrs-lib/src/csrs.rs b/rrs-lib/src/csrs.rs index 03e2878..4259b55 100644 --- a/rrs-lib/src/csrs.rs +++ b/rrs-lib/src/csrs.rs @@ -1,6 +1,6 @@ // Copyright 2021 Gregory Chadwick -// Licensed under the Apache License, Version 2.0, see LICENSE for details. -// SPDX-License-Identifier: Apache-2.0 +// Licensed under the Apache License Version 2.0, with LLVM Exceptions, see LICENSE for details. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception use super::CSR; use num_enum::{IntoPrimitive, TryFromPrimitive}; diff --git a/rrs-lib/src/instruction_executor.rs b/rrs-lib/src/instruction_executor.rs index 9c1f324..f1b4673 100644 --- a/rrs-lib/src/instruction_executor.rs +++ b/rrs-lib/src/instruction_executor.rs @@ -1,6 +1,6 @@ // Copyright 2021 Gregory Chadwick -// Licensed under the Apache License, Version 2.0, see LICENSE for details. -// SPDX-License-Identifier: Apache-2.0 +// Licensed under the Apache License Version 2.0, with LLVM Exceptions, see LICENSE for details. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception //! An [InstructionProcessor] that executes instructions. //! diff --git a/rrs-lib/src/instruction_formats.rs b/rrs-lib/src/instruction_formats.rs index 2f11b3c..84a7ea5 100644 --- a/rrs-lib/src/instruction_formats.rs +++ b/rrs-lib/src/instruction_formats.rs @@ -1,6 +1,6 @@ // Copyright 2021 Gregory Chadwick -// Licensed under the Apache License, Version 2.0, see LICENSE for details. -// SPDX-License-Identifier: Apache-2.0 +// Licensed under the Apache License Version 2.0, with LLVM Exceptions, see LICENSE for details. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception //! Structures and constants for instruction decoding //! diff --git a/rrs-lib/src/instruction_string_outputter.rs b/rrs-lib/src/instruction_string_outputter.rs index 91055a1..74dd260 100644 --- a/rrs-lib/src/instruction_string_outputter.rs +++ b/rrs-lib/src/instruction_string_outputter.rs @@ -1,6 +1,6 @@ // Copyright 2021 Gregory Chadwick -// Licensed under the Apache License, Version 2.0, see LICENSE for details. -// SPDX-License-Identifier: Apache-2.0 +// Licensed under the Apache License Version 2.0, with LLVM Exceptions, see LICENSE for details. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception //! An [InstructionProcessor] that outputs a string of the instruction disassembly //! diff --git a/rrs-lib/src/lib.rs b/rrs-lib/src/lib.rs index 8013782..7545b84 100644 --- a/rrs-lib/src/lib.rs +++ b/rrs-lib/src/lib.rs @@ -1,6 +1,6 @@ // Copyright 2021 Gregory Chadwick -// Licensed under the Apache License, Version 2.0, see LICENSE for details. -// SPDX-License-Identifier: Apache-2.0 +// Licensed under the Apache License Version 2.0, with LLVM Exceptions, see LICENSE for details. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception //! RISC-V instruction set simulator library //! diff --git a/rrs-lib/src/memories.rs b/rrs-lib/src/memories.rs index 30d633d..951ee0f 100644 --- a/rrs-lib/src/memories.rs +++ b/rrs-lib/src/memories.rs @@ -1,6 +1,6 @@ // Copyright 2021 Gregory Chadwick -// Licensed under the Apache License, Version 2.0, see LICENSE for details. -// SPDX-License-Identifier: Apache-2.0 +// Licensed under the Apache License Version 2.0, with LLVM Exceptions, see LICENSE for details. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception //! Various [Memory] implementations useful for an ISS and utility functions diff --git a/rrs-lib/src/process_instruction.rs b/rrs-lib/src/process_instruction.rs index 68b8303..e34e630 100644 --- a/rrs-lib/src/process_instruction.rs +++ b/rrs-lib/src/process_instruction.rs @@ -1,6 +1,6 @@ // Copyright 2021 Gregory Chadwick -// Licensed under the Apache License, Version 2.0, see LICENSE for details. -// SPDX-License-Identifier: Apache-2.0 +// Licensed under the Apache License Version 2.0, with LLVM Exceptions, see LICENSE for details. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception use super::instruction_formats; use super::InstructionProcessor;