* [committed] Fix up libgomp/hashtab.h license
@ 2016-11-01 16:52 Jakub Jelinek
2017-01-02 14:01 ` Gerald Pfeifer
0 siblings, 1 reply; 2+ messages in thread
From: Jakub Jelinek @ 2016-11-01 16:52 UTC (permalink / raw)
To: gcc-patches
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.
--- 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
Jakub
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [committed] Fix up libgomp/hashtab.h license
2016-11-01 16:52 [committed] Fix up libgomp/hashtab.h license Jakub Jelinek
@ 2017-01-02 14:01 ` Gerald Pfeifer
0 siblings, 0 replies; 2+ messages in thread
From: Gerald Pfeifer @ 2017-01-02 14:01 UTC (permalink / raw)
To: Jakub Jelinek; +Cc: gcc-patches
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-01-02 14:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-01 16:52 [committed] Fix up libgomp/hashtab.h license Jakub Jelinek
2017-01-02 14:01 ` Gerald Pfeifer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).