From: Jakub Jelinek Date: Tue, 30 May 2017 07:38:19 +0000 (+0200) Subject: backport: hashtab.h: Use standard GPLv3 with runtime exception boilerplate. X-Git-Tag: releases/gcc-5.5.0~290 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bb63fe6bfed250088b4df9a19d4025866fabc04;p=thirdparty%2Fgcc.git backport: hashtab.h: Use standard GPLv3 with runtime exception boilerplate. Backported from mainline 2016-11-01 Jakub Jelinek * hashtab.h: Use standard GPLv3 with runtime exception boilerplate. From-SVN: r248621 --- diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index a511c0cb9ae8..eb135c9c3ab3 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,11 @@ +2017-05-30 Jakub Jelinek + + Backported from mainline + 2016-11-01 Jakub Jelinek + + * hashtab.h: Use standard GPLv3 with runtime exception + boilerplate. + 2016-07-07 Jakub Jelinek Backported from mainline diff --git a/libgomp/hashtab.h b/libgomp/hashtab.h index 0cc224ddb3b8..4af90cd5e0d1 100644 --- a/libgomp/hashtab.h +++ b/libgomp/hashtab.h @@ -2,19 +2,27 @@ Copyright (C) 1999-2015 Free Software Foundation, Inc. Contributed by Vladimir Makarov . -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 + . */ /* 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