From: Maxim Kuvyrkov Date: Thu, 1 Aug 2013 21:28:16 +0000 (+0000) Subject: Backport from trunk: Fix licenses on several libgcc files. X-Git-Tag: releases/gcc-4.7.4~552 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=728812bf83ef8d4207bf6d08e9b9a5b5e8ecd7b8;p=thirdparty%2Fgcc.git Backport from trunk: Fix licenses on several libgcc files. * config/ia64/unwind-ia64.h, * config/mips/vr4120-div.S: Fix license from GPL-3.0+ to GPL-3.0-with-GCC-exception. From-SVN: r201419 --- diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 52beedbe7727..c25c281be07e 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,11 @@ +2013-08-01 Maxim Kuvyrkov + + Backport from trunk: Fix licenses on several libgcc files. + + * config/ia64/unwind-ia64.h, + * config/mips/vr4120-div.S: Fix license from GPL-3.0+ to + GPL-3.0-with-GCC-exception. + 2013-06-08 Walter Lee Backport from mainline: diff --git a/libgcc/config/ia64/unwind-ia64.h b/libgcc/config/ia64/unwind-ia64.h index b98f048fdb50..1140ca3c0f02 100644 --- a/libgcc/config/ia64/unwind-ia64.h +++ b/libgcc/config/ia64/unwind-ia64.h @@ -2,21 +2,26 @@ Contributed by Andrew MacLeod Andrew Haley - This file is part of GCC. +This file is part of GCC. - GCC 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. +GCC 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. - GCC 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. +GCC 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 GCC; see the file COPYING3. If not see - . */ +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 +. */ struct unw_table_entry { diff --git a/libgcc/config/mips/vr4120-div.S b/libgcc/config/mips/vr4120-div.S index 79ede3de9552..f393e1339a7c 100644 --- a/libgcc/config/mips/vr4120-div.S +++ b/libgcc/config/mips/vr4120-div.S @@ -3,18 +3,23 @@ This file is part of GCC. -GCC 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. +GCC 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. -GCC 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. +GCC 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 GCC; see the file COPYING3. If not see +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 . */ /* This file contains functions which implement divsi3 and modsi3 for