diff options
-rw-r--r-- | README.md | 5 | ||||
-rw-r--r-- | doc/LICENSING.txt | 16 |
2 files changed, 12 insertions, 9 deletions
@@ -62,7 +62,7 @@ However, two small libraries are built and installed: * `libatomic_ops.a` is a support library, which is not needed on some platforms. This is intended to be usable, under some mild restrictions, in free or proprietary code, as are all the header files. - See doc/LICENSING.txt. + See doc/LICENSING.txt for more details about the licensing. * `libatomic_ops_gpl.a` contains some higher level facilities. This code is currently covered by the GPL. The contents currently correspond to @@ -130,4 +130,5 @@ The file gcc/sh.h is * Copyright (c) 2009 by Takashi YOSHII. All rights reserved. -See [LICENSING.txt](doc/LICENSING.txt) for the details. +Please be aware of the dual nature of the license of libatomic_ops, +see [LICENSING.txt](doc/LICENSING.txt) for the details. diff --git a/doc/LICENSING.txt b/doc/LICENSING.txt index c6e1640..dca21d7 100644 --- a/doc/LICENSING.txt +++ b/doc/LICENSING.txt @@ -3,7 +3,7 @@ both free and proprietary software. Hence most code that we expect to be linked into a client application is covered by an MIT-style license. A few library routines are covered by the GNU General Public License. -These are put into a separate library, libatomic_ops_gpl.a . +These are put into a separate library, libatomic_ops_gpl.a file. The low-level part of the library is mostly covered by the following license: @@ -32,8 +32,9 @@ SOFTWARE. -------------------------------- -A few files in the sysdeps directory were inherited in part from the -Boehm-Demers-Weiser conservative garbage collector, and are covered by + +A few files in the atomic_ops/sysdeps directory were inherited in part from +the Boehm-Demers-Weiser conservative garbage collector, and are covered by its license, which is similar in spirit: -------------------------------- @@ -51,11 +52,12 @@ modified is included with the above copyright notice. ---------------------------------- + A few files are covered by the GNU General Public License. (See file -"COPYING".) This applies only to test code, sample applications, -and the libatomic_ops_gpl portion of the library. -Thus libatomic_ops_gpl should generally not be linked into proprietary code. -(This distinction was motivated by patent considerations.) +"COPYING".) This applies only to the test code and the libatomic_ops_gpl +portion of the library. Thus, libatomic_ops_gpl should generally not be +linked into proprietary code. (This distinction was motivated by patent +considerations.) It is possible that the license of the GPL pieces may be changed for future versions to make them more consistent with the rest of the package. |