diff mbox

[committed] Fix up libgomp/hashtab.h license

Message ID 20161101165206.GY3541@tucnak.redhat.com
State New
Headers show

Commit Message

Jakub Jelinek Nov. 1, 2016, 4:52 p.m. UTC 
Hi!

libgomp is GPLv3 + runtime exception licensed, hashtab.h has been copied
and adjusted from include/ similarly how splay-tree.c has been changed,
the latter got the GPLv3 + runtime exception boiler plate, but not
hashtab.h.

Fixed thusly, committed to trunk.  Shall I backport to release branches?

2016-11-01  Jakub Jelinek  <jakub@redhat.com>

	* hashtab.h: Use standard GPLv3 with runtime exception
	boilerplate.


	Jakub

Comments

Gerald Pfeifer Jan. 2, 2017, 2:01 p.m. UTC | #1 
On Tue, 1 Nov 2016, Jakub Jelinek wrote:
> libgomp is GPLv3 + runtime exception licensed, hashtab.h has been copied
> and adjusted from include/ similarly how splay-tree.c has been changed,
> the latter got the GPLv3 + runtime exception boiler plate, but not
> hashtab.h.
> 
> Fixed thusly, committed to trunk.  Shall I backport to release branches?
> 
> 2016-11-01  Jakub Jelinek  <jakub@redhat.com>
> 
> 	* hashtab.h: Use standard GPLv3 with runtime exception
> 	boilerplate.

Not sure how many people would seriously use libgomp with GCC 5,
so the backport to GCC 6 you did probably is sufficient.  

Just for the sake of consistency ("all active release branches"), 
GCC 5 might make sense, too?

Gerald
diff mbox

Patch

--- libgomp/hashtab.h	(revision 241744)
+++ libgomp/hashtab.h	(working copy)
@@ -2,19 +2,27 @@ 
    Copyright (C) 1999-2016 Free Software Foundation, Inc.
    Contributed by Vladimir Makarov <vmakarov@cygnus.com>.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+   This file is part of the GNU Offloading and Multi Processing Library
+   (libgomp).
+
+   Libgomp is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   Libgomp is distributed in the hope that it will be useful, but WITHOUT ANY
+   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+   FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+   more details.
+
+   Under Section 7 of GPL version 3, you are granted additional
+   permissions described in the GCC Runtime Library Exception, version
+   3.1, as published by the Free Software Foundation.
+
+   You should have received a copy of the GNU General Public License and
+   a copy of the GCC Runtime Library Exception along with this program;
+   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+   <http://www.gnu.org/licenses/>.  */
 
 /* The hash table code copied from include/hashtab.[hc] and adjusted,
    so that the hash table entries are in the flexible array at the end