Licensing changes to GPLv3 resp. GPLv3 with GCC Runtime Exception.

[pf3gnuchains/gcc-fork.git] / gcc / config / picochip / libgccExtras / popcounthi2.asm

diff --git a/gcc/config/picochip/libgccExtras/popcounthi2.asm b/gcc/config/picochip/libgccExtras/popcounthi2.asm
index bfafd0c..b5f8468 100644 (file)
--- a/gcc/config/picochip/libgccExtras/popcounthi2.asm
+++ b/gcc/config/picochip/libgccExtras/popcounthi2.asm
@@ -3,33 +3,28 @@
 //
 //   Support for 16-bit population count.
 //
-//   Copyright (C) 2003, 2004, 2005, 2008  Free Software Foundation, Inc.
+//   Copyright (C) 2003, 2004, 2005, 2008, 2009  Free Software Foundation, Inc.
 //   Contributed by picoChip Designs Ltd.
 //   Maintained by Daniel Towner (daniel.towner@picochip.com)
 //
 //   This file 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, or (at your option) any
+//   Free Software Foundation; either version 3, or (at your option) any
 //   later version.
 //
-//   In addition to the permissions in the GNU General Public License, the
-//   Free Software Foundation gives you unlimited permission to link the
-//   compiled version of this file into combinations with other programs,
-//   and to distribute those combinations without any restriction coming
-//   from the use of this file.  (The General Public License restrictions
-//   do apply in other respects; for example, they cover modification of
-//   the file, and distribution when not linked into a combine
-//   executable.)
-//
 //   This file 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; see the file COPYING.  If not, write to
-//   the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-//   Boston, MA 02110-1301, USA.
+//   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/>.
        
 .section .text