summaryrefslogtreecommitdiff
path: root/LICENCE
diff options
context:
space:
mode:
authorJon French2018-05-15 17:50:05 +0100
committerJon French2018-05-15 17:50:05 +0100
commite2d8fe4d847b6e8f71eecd7aa6d15799bd2a2e11 (patch)
treeaf5ca7ac35244a706f9631ab8f1a4dada172f27d /LICENCE
parented3bb9702bd1f76041a3798f453714b0636a1b6b (diff)
parent77b393e4f53d14955d301cbd16e22d2e7b026ede (diff)
Merge branch 'sail2' into mappings
Diffstat (limited to 'LICENCE')
-rw-r--r--LICENCE8
1 files changed, 6 insertions, 2 deletions
diff --git a/LICENCE b/LICENCE
index 451ce6c3..c3aa62aa 100644
--- a/LICENCE
+++ b/LICENCE
@@ -1,12 +1,16 @@
Sail
Sail and the Sail architecture models here, comprising all files and
-directories except the PPrint library, are subject to the BSD
-two-clause licence below.
+directories except the PPrint library, and ASL-derived Sail code in
+the aarch64 directory, are subject to the BSD two-clause licence
+below.
The PPrint library, in src/pprint, is subject to the CeCILL-C free
software licence agreement therein.
+The ASL derived parts of the ARMv8.3 specification in
+aarch64/no_vector and aarch64/full are copyright ARM Ltd.
+
Copyright (c) 2013-2018
Kathyrn Gray
Shaked Flur