summaryrefslogtreecommitdiffstats
path: root/libgcc
diff options
context:
space:
mode:
authorgjl <gjl@138bc75d-0d04-0410-961f-82ee72b054a4>2014-05-27 09:05:12 +0000
committergjl <gjl@138bc75d-0d04-0410-961f-82ee72b054a4>2014-05-27 09:05:12 +0000
commitad69ec7d7360d7d233ed621cb9876f6c59e9c701 (patch)
treed96cc5666b93a8bb427aa178cb389f26f57227e1 /libgcc
parent9bd1b1a1384483dc3bc6286f96778b29bb6fb5b8 (diff)
downloadppe42-gcc-ad69ec7d7360d7d233ed621cb9876f6c59e9c701.tar.gz
ppe42-gcc-ad69ec7d7360d7d233ed621cb9876f6c59e9c701.zip
gcc/
Backport from 2014-05-12 mainline r210322. Backport from 2014-05-27 mainline r210959. PR libgcc/61152 * config/arm/arm.h (License): Add GCC Runtime Library Exception. * config/arm/arm-cores.def (License): Same. * config/arm/arm-opts.h (License): Same. * config/arm/aout.h (License): Same. * config/arm/bpabi.h (License): Same. * config/arm/elf.h (License): Same. * config/arm/linux-elf.h (License): Same. * config/arm/linux-gas.h (License): Same. * config/arm/netbsd-elf.h (License): Same. * config/arm/uclinux-eabi.h (License): Same. * config/arm/uclinux-elf.h (License): Same. * config/arm/vxworks.h (License): Same. libgcc/ Backport from 2014-05-27 mainline r210322. PR libgcc/61152 * config/arm/bpabi-lib.h (License): Add GCC Runtime Library Exception. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@210960 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgcc')
-rw-r--r--libgcc/ChangeLog7
-rw-r--r--libgcc/config/arm/bpabi-lib.h4
2 files changed, 11 insertions, 0 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index e43ffc4569e..7439942fc80 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-05-27 Georg-Johann Lay <avr@gjlay.de>
+
+ Backport from 2014-05-27 mainline r210322.
+
+ PR libgcc/61152
+ * config/arm/bpabi-lib.h (License): Add GCC Runtime Library Exception.
+
2014-05-22 Nick Clifton <nickc@redhat.com>
* config/msp430/t-msp430 (HOST_LIBGCC2_CFLAGS): Add
diff --git a/libgcc/config/arm/bpabi-lib.h b/libgcc/config/arm/bpabi-lib.h
index 193cc5604ad..d6e77969001 100644
--- a/libgcc/config/arm/bpabi-lib.h
+++ b/libgcc/config/arm/bpabi-lib.h
@@ -14,6 +14,10 @@
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
OpenPOWER on IntegriCloud