update license of njk contributed code (x86_64 asm)

these changes are based on the following communication via email:

"I hereby grant that all of the code I have contributed to musl on or
before April 23, 2012 may be licensed under the terms of the following
MIT license:

Copyright (c) 2011-2012 Nicholas J. Kain

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."

diff --git a/COPYRIGHT b/COPYRIGHT
index d46826c01f70b5159bd2ab19449de02f3d72919d..3571385ecffacbc6da05b33a28388800c72dd8fa 100644 (file)
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -33,8 +33,10 @@ licensed under following terms: "Permission to use, copy, modify,
 and/or distribute this code for any purpose with or without fee is
 hereby granted. There is no warranty."
 
-The x86_64 port was written by Nicholas J. Kain. See individual files
-for their copyright status.
+The x86_64 port was written by Nicholas J. Kain. Several files (crt)
+were released into the public domain; others are licensed under the
+standard MIT license terms. See individual files for their copyright
+status.
 
 All files which have no copyright comments are original works
 Copyright © 2005-2012 Rich Felker, the main author of this library.

diff --git a/src/setjmp/x86_64/longjmp.s b/src/setjmp/x86_64/longjmp.s
index 444076f13c6e35ab036ae21b388f8107a9f6d847..e175a4b9606bba41eccc8972c22244e533718f0a 100644 (file)
--- a/src/setjmp/x86_64/longjmp.s
+++ b/src/setjmp/x86_64/longjmp.s
@@ -1,4 +1,4 @@
-/* Copyright 2011 Nicholas J. Kain, licensed GNU LGPL 2.1 or later */
+/* Copyright 2011-2012 Nicholas J. Kain, licensed under standard MIT license */
 .global _longjmp
 .global longjmp
 .type _longjmp,@function

diff --git a/src/setjmp/x86_64/setjmp.s b/src/setjmp/x86_64/setjmp.s
index 5b3173b9c53045b8129055cda7ed8c3b56e9f556..98f58b8d6551e391f426fc53c81678a03ac89074 100644 (file)
--- a/src/setjmp/x86_64/setjmp.s
+++ b/src/setjmp/x86_64/setjmp.s
@@ -1,4 +1,4 @@
-/* Copyright 2011 Nicholas J. Kain, licensed GNU LGPL 2.1 or later */
+/* Copyright 2011-2012 Nicholas J. Kain, licensed under standard MIT license */
 .global __setjmp
 .global _setjmp
 .global setjmp

diff --git a/src/signal/x86_64/sigsetjmp.s b/src/signal/x86_64/sigsetjmp.s
index e883ac449360c227fb9acb49388c268f3b956c2e..94d7148ddfee602424f590dd7bd7094430f66a85 100644 (file)
--- a/src/signal/x86_64/sigsetjmp.s
+++ b/src/signal/x86_64/sigsetjmp.s
@@ -1,4 +1,4 @@
-/* Copyright 2011 Nicholas J. Kain, licensed GNU LGPL 2.1 or later */
+/* Copyright 2011-2012 Nicholas J. Kain, licensed under standard MIT license */
 .global sigsetjmp
 .type sigsetjmp,@function
 sigsetjmp:

diff --git a/src/thread/x86_64/__set_thread_area.s b/src/thread/x86_64/__set_thread_area.s
index 99c5356a77dadc4b825d090eb82d6663c19d8484..cc538e52e23e6c3fefcf5eb6a3802a1e3729cdfe 100644 (file)
--- a/src/thread/x86_64/__set_thread_area.s
+++ b/src/thread/x86_64/__set_thread_area.s
@@ -1,4 +1,4 @@
-/* Copyright 2011 Nicholas J. Kain, licensed GNU LGPL 2.1 or later */
+/* Copyright 2011-2012 Nicholas J. Kain, licensed under standard MIT license */
 .text
 .global __set_thread_area
 .type __set_thread_area,@function

diff --git a/src/thread/x86_64/__unmapself.s b/src/thread/x86_64/__unmapself.s
index 99c1b7c168efde0dfae9745f31805ef95ab3028a..e2689e65052ce76b4639324c3bcf239f97c36eee 100644 (file)
--- a/src/thread/x86_64/__unmapself.s
+++ b/src/thread/x86_64/__unmapself.s
@@ -1,4 +1,4 @@
-/* Copyright 2011 Nicholas J. Kain, licensed GNU LGPL 2.1 or later */
+/* Copyright 2011-2012 Nicholas J. Kain, licensed under standard MIT license */
 .text
 .global __unmapself
 .type   __unmapself,@function