X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=LICENSE;h=eb696b20162fc9513ee36de7c1061e9deda17488;hp=f2b5228d061ae3a5a98c20940eb2e9dec8ecd991;hb=ae51baf267fc36ccc259f9287e2750c138ff80bc;hpb=af02d47e5d0712e5ccde6d8f1ee89f18de798cad

diff --git a/LICENSE b/LICENSE
index f2b5228..eb696b2 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,9 @@
 Userspace RCU library licensing
 Mathieu Desnoyers
-May 10, 2009
+May 15, 2012
+
+
+* LGPLv2.1
 
 The library part is distributed under LGPLv2.1 or later. See lgpl-2.1.txt for
 details. This applies to :
@@ -20,6 +23,28 @@ Dynamic-only linking with the LGPL library is used if _LGPL_SOURCE is not
 defined. It permits relinking with newer versions of the library, which is
 required by the LGPL license.
 
+See lgpl-relicensing.txt for details.
+
+
+* MIT-style license :
+
+xchg() primitive has been rewritten from scratch starting from atomic_ops 1.2
+which has a MIT-style license that is intended to allow use in both free and
+proprietary software:
+	http://www.hpl.hp.com/research/linux/atomic_ops/LICENSING.txt
+	http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/
+
+This license applies to :
+
+arch_atomic_x86.h
+arch_atomic_ppc.h
+arch_atomic_s390.h
+arch_s390.h
+compiler.h
+
+
+* GPLv2
+
 Library test code is distributed under the GPLv2 license. See gpl-2.0.txt for
 details. This applies to :
 
@@ -27,6 +52,14 @@ urcutorture.h
 urcutorture.c
 api_x86.h
 api_ppc.h
+api_gcc.h
 test_urcu.c
 test_urcu_yield.c
 test_rwlock_timing.c
+urcu-asm.c
+
+* GPLv3 (or later)
+
+The following build-related macro is under GPLv3 (or later):
+
+m4/ax_tls.m4