Skip to content

Commit

Permalink
Update LICENSE
Browse files Browse the repository at this point in the history
Re-organise so the funding information is clearly distinct from
the BSD 2-clause license
  • Loading branch information
Alasdair committed Feb 13, 2025
1 parent af66b8d commit 940b8bb
Showing 1 changed file with 20 additions and 18 deletions.
38 changes: 20 additions & 18 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,14 +1,29 @@
Sail

Sail and the Sail architecture models here, comprising all files and
directories except the ASL-derived Sail code in the aarch64 directory,
and the logo in the etc/logo/ directory (by Jean Pichon, under CC0),
are subject to the BSD two-clause licence below.
the logo in the etc/logo/ directory (by Jean Pichon, under CC0), and
various exceptions detailed in THIRD_PARTY_FILES.md are subject to the
BSD two-clause licence below.

The ASL derived parts of the ARMv8.3 specification in
aarch64/no_vector and aarch64/full are copyright ARM Ltd.

Copyright (c) 2013-2021
This work was partially supported by EPSRC grant EP/K008528/1
REMS: Rigorous Engineering for Mainstream Systems, an ARM iCASE award,
EPSRC IAA KTF funding, and donations from Arm. This project has
received funding from the European Research Council (ERC) under the
European Union’s Horizon 2020 research and innovation programme (grant
agreement No 789108, ELVER).

This software was developed by SRI International and the University of
Cambridge Computer Laboratory (Department of Computer Science and
Technology) under DARPA/AFRL contracts FA8650-18-C-7809 ("CIFV")
and FA8750-10-C-0237 ("CTSRD").

-----

Sail

Copyright (c) 2013-2025
Kathyrn Gray
Shaked Flur
Stephen Kell
Expand All @@ -28,19 +43,6 @@ Copyright (c) 2013-2021

All rights reserved.

This work was partially supported by EPSRC grant EP/K008528/1 <a
href="http://www.cl.cam.ac.uk/users/pes20/rems">REMS: Rigorous
Engineering for Mainstream Systems</a>, an ARM iCASE award, EPSRC IAA
KTF funding, and donations from Arm. This project has received
funding from the European Research Council (ERC) under the European
Union’s Horizon 2020 research and innovation programme (grant
agreement No 789108, ELVER).

This software was developed by SRI International and the University of
Cambridge Computer Laboratory (Department of Computer Science and
Technology) under DARPA/AFRL contracts FA8650-18-C-7809 ("CIFV")
and FA8750-10-C-0237 ("CTSRD").

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
Expand Down

0 comments on commit 940b8bb

Please sign in to comment.