This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH] License changes


On Sat, 4 Apr 2009, Jakub Jelinek wrote:

> On Thu, Apr 02, 2009 at 10:41:03PM +0200, Jakub Jelinek wrote:
> > The attached patch changes GPLv2+ license headers to GPLv3+
> > and some GPLv2+ w/exception to GPLv3+ without exception.
> 
> Here is an updated patch which also includes changes from Nick Clifton
> and has been successfully bootstrapped/regtested on x86_64-linux.
> 
> Ok for trunk and backport to 4.4 afterwards?

I have reviewed the logs and the diffs to individual files, and the
patch is OK subject to the comments below (which suggest reposting
fixed versions of the libgomp and libobjc changes and committing the
rest, fixed as indicated).  I have not reviewed for the questions of:

* Should other files have the exception that presently do not?

* Are there files that after this patch still use GPLv2, LGPLv2 or
  LGPLv2.1, with or without exception, or that are missing copyright
  and license notices, that should change to GPLv3, with or without
  exception?

These questions are better reviewed once the patch has been checked
in.

> 	* config/arm/arm_neon.h: Likewise.

As a generated file, the log message should say "Regenerate." (ideally
having made sure the file is indeed what you get by running the
patched generator, although this may not be convenient if you don't
have an O'Caml compiler to hand).

> libobjc/

> 	* libobjc.def: Likewise.

I believe this file should be considered part of the build system so
get GPLv3 without the exception.  In fact the patch appears to do
this, so it's just the log entry that is wrong here.

> 	* makefile.dos: Likewise.

Likewise (actually, I think this file is long dead and could be
removed).

> libgfortran/

> 	* generated/_abs_c10.F90: Likewise.
[...]

All these generated/ files should be marked as "Regenerate."

> libcpp/
> 	* symtab.c: Change copyright header to refer to version 3 of
> 	the GNU General Public License with version 3.1 of the GCC
> 	Runtime Library Exception and to point readers at the COPYING3
> 	and COPYING3.RUNTIME files and the FSF's license web page.

All these log entries for libcpp - a host-side library - are wrong;
there's a correct set later (subject to comments on that set) for the
changes to GPLv3 without exception.

> libcpp/

> 	* ucnid.h: Likewise.

This should be "Regenerate."; it's generated by makeucnid.c.

> Index: libgomp/iter.c
> ===================================================================
> --- libgomp/iter.c	(revision 145499)
> +++ libgomp/iter.c	(working copy)
> @@ -1,11 +1,11 @@
> -/* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
> +/* Copyright (C) 2005, 2008, 2009 Free Software Foundation, Inc.
>     Contributed by Richard Henderson <rth@redhat.com>.
>  
>     This file is part of the GNU OpenMP Library (libgomp).
>  
>     Libgomp is free software; you can redistribute it and/or modify it
>     under the terms of the GNU Lesser General Public License as published by
> -   the Free Software Foundation; either version 2.1 of the License, or
> +   the Free Software Foundation; either version 3 of the License, or
>     (at your option) any later version.
[...]
> -/* As a special exception, if you link this library with other files, some
> -   of which are compiled with GCC, to produce an executable, this library
> -   does not by itself cause the resulting executable to be covered by the
> -   GNU General Public License.  This exception does not however invalidate
> -   any other reasons why the executable file might be covered by the GNU
> -   General Public License.  */
> +   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

There is some confusion here about whether this is GPL+exception or
LGPL+exception; it refers to the LGPL but then says you should be
received a copy of the GPL.

Formally this may be less inconsistent with v3 than with v2 (since
LGPLv3 is formulated as additional permissions on top of GPLv3), but I
am unaware of any reason libgomp is different from the other GCC
runtime libraries, so believe it should in fact use GPLv3+exception.
The same applies to all other files in libgomp that presently use
LGPL+exception.

(I'd recommend committing all the other parts of the patch and
reposting an updated version of the libgomp and libobjc changes.)

> Index: gcc/ada/sysdep.c
> ===================================================================
> --- gcc/ada/sysdep.c	(revision 145499)
> +++ gcc/ada/sysdep.c	(working copy)
> @@ -6,24 +6,23 @@
>   *                                                                          *
>   *                          C Implementation File                           *
>   *                                                                          *
> - *         Copyright (C) 1992-2008, Free Software Foundation, Inc.          *
> + *         Copyright (C) 1992-2008, 2009 Free Software Foundation, Inc.     *

The style used in Ada files is a range of years, so I think this
should be "1992-2009".  Likewise in other Ada files that this patch
changes to introduce a comma in the list of copyright years.
(Although the Ada practice goes against GNU procedures, now is not the
time to change it.)

> Index: gcc/ada/g-traceb.ads
> ===================================================================
> --- gcc/ada/g-traceb.ads	(revision 145499)
> +++ gcc/ada/g-traceb.ads	(working copy)
> @@ -7,24 +7,23 @@
>  --                                 S p e c                                  --
>  --                                                                          --
>  --                     Copyright (C) 1999-2008, AdaCore                     --
> +--             Copyright (C) 2009  Free Software Foundation, Inc.           --

I don't think we can make the changes to Ada files with non-FSF
copyright holders without making sure there is permission from those
copyright holders for distributing them under GPLv3+exception.  The
same also applies to files listing Florida State University or
University of Toronto as copyright holder (or maybe other copyright
holders); I haven't listed the affected files individually.

> Index: gcc/config/frv/frvbegin.c
> ===================================================================
> --- gcc/config/frv/frvbegin.c	(revision 145499)
> +++ gcc/config/frv/frvbegin.c	(working copy)
> @@ -1,12 +1,12 @@
>  /* Frv initialization file linked before all user modules
> -   Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
> +   Copyright (C) 1999, 2000, 2003, 2004, 2009 Free Software Foundation, Inc.
>      Contributed by Red Hat, Inc.
>    
>     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 2, or (at your option)
> +   the Free Software Foundation * either version 3, or (at your option)

(Preexisting condition, can be fixed in a separate patch.)  " *
either" should be "; either".

> Index: gcc/config/frv/cmovd.c
> ===================================================================
> --- gcc/config/frv/cmovd.c	(revision 145499)
> +++ gcc/config/frv/cmovd.c	(working copy)
> @@ -1,12 +1,12 @@
>  /* Move double-word library function.
> -   Copyright (C) 2000, 2003 Free Software Foundation, Inc.
> +   Copyright (C) 2000, 2003, 2009 Free Software Foundation, Inc.
>     Contributed by Red Hat, Inc.
>    
>     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 2, or (at your option)
> +   the Free Software Foundation * either version 3a, or (at your option)

Likewise, but there's no version 3a; the patch committed needs to say
"version 3".

> Index: gcc/config/frv/cmovh.c
> ===================================================================
> --- gcc/config/frv/cmovh.c	(revision 145499)
> +++ gcc/config/frv/cmovh.c	(working copy)
> @@ -1,12 +1,12 @@
>  /* Move half-word library function.
> -   Copyright (C) 2000, 2003 Free Software Foundation, Inc.
> +   Copyright (C) 2000, 2003, 2009 Free Software Foundation, Inc.
>     Contributed by Red Hat, Inc.
>    
>     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 2, or (at your option)
> +   the Free Software Foundation * either version 3, or (at your option)

Likewise.

> Index: gcc/config/frv/lib1funcs.asm
> ===================================================================
> --- gcc/config/frv/lib1funcs.asm	(revision 145499)
> +++ gcc/config/frv/lib1funcs.asm	(working copy)
> @@ -1,12 +1,12 @@
>  /* Library functions.
> -   Copyright (C) 2000, 2003, 2008 Free Software Foundation, Inc.
> +   Copyright (C) 2000, 2003, 2008, 2009 Free Software Foundation, Inc.
>     Contributed by Red Hat, Inc.
>    
>     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 2, or (at your option)
> +   the Free Software Foundation * either version 3, or (at your option)

Likewise.

> Index: gcc/config/frv/frvend.c
> ===================================================================
> --- gcc/config/frv/frvend.c	(revision 145499)
> +++ gcc/config/frv/frvend.c	(working copy)
> @@ -1,12 +1,12 @@
>  /* Frv initialization file linked after all user modules
> -   Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
> +   Copyright (C) 1999, 2000, 2003, 2004, 2009 Free Software Foundation, Inc.
>      Contributed by Red Hat, Inc.
>    
>     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 2, or (at your option)
> +   the Free Software Foundation * either version 3, or (at your option)

Likewise.

> Index: gcc/config/frv/cmovw.c
> ===================================================================
> --- gcc/config/frv/cmovw.c	(revision 145499)
> +++ gcc/config/frv/cmovw.c	(working copy)
> @@ -1,12 +1,12 @@
>  /* Move word library function.
> -   Copyright (C) 2000, 2003 Free Software Foundation, Inc.
> +   Copyright (C) 2000, 2003, 2009 Free Software Foundation, Inc.
>     Contributed by Red Hat, Inc.
>    
>     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 2, or (at your option)
> +   the Free Software Foundation * either version 3, or (at your option)

Likewise.

> Index: gcc/config/m68k/cf.md
> ===================================================================
> --- gcc/config/m68k/cf.md	(revision 145499)
> +++ gcc/config/m68k/cf.md	(working copy)
> @@ -1,12 +1,12 @@
>  ;; ColdFire V1, V2, V3 and V4/V4e DFA description.
> -;; Copyright (C) 2007, 2008 Free Software Foundation, Inc.
> +;; Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
>  ;; Contributed by CodeSourcery Inc., www.codesourcery.com
>  ;;
>  ;; 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 2, or (at your option)
> +;; 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,
> @@ -14,10 +14,14 @@
>  ;; 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 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/>.

This file should not have the exception; it should be under plain
GPLv3.

> Index: gcc/config/rs6000/paired.md
> ===================================================================
> --- gcc/config/rs6000/paired.md	(revision 145499)
> +++ gcc/config/rs6000/paired.md	(working copy)
> @@ -1,5 +1,5 @@
>  ;; PowerPC paired single and double hummer description
> -;; Copyright (C) 2007
> +;; Copyright (C) 2007, 2009
>  ;; Free Software Foundation, Inc.
>  ;; Contributed by David Edelsohn <edelsohn@gnu.org> and Revital Eres
>  ;; <eres@il.ibm.com>
> @@ -8,18 +8,22 @@
>  
>  ;; 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 2, or (at your
> +;; 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.
> -
> -;; You should have received a copy of the GNU General Public License
> -;; along with GCC; 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/>.

Likewise.

> Index: libstdc++-v3/config/abi/pre/gnu.ver
> ===================================================================
> --- libstdc++-v3/config/abi/pre/gnu.ver	(revision 145499)
> +++ libstdc++-v3/config/abi/pre/gnu.ver	(working copy)
> @@ -6,7 +6,7 @@
>  ## This file is part of the GNU ISO C++ Library.  This library 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)
> +## Free Software Foundation; either version 3, or (at your option)
>  ## any later version.
>  ##
>  ## This library is distributed in the hope that it will be useful,
> @@ -14,10 +14,15 @@
>  ## 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 library; 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/>.

I believe we are considering such version lists as part of the build
system rather than as something linked into the user program, and so
as files not getting the exception.


> Index: libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver
> ===================================================================
> --- libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver	(revision 145499)
> +++ libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver	(working copy)
> @@ -1,13 +1,13 @@
>  ## Linker script for GNU namespace versioning.
>  ##
> -## Copyright (C) 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
> +## Copyright (C) 2002, 2003, 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
>  ##
>  ## This file is part of the libstdc++ version 3 distribution.
>  ##
>  ## This file is part of the GNU ISO C++ Library.  This library 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)
> +## Free Software Foundation; either version 3, or (at your option)
>  ## any later version.
>  ##
>  ## This library is distributed in the hope that it will be useful,
> @@ -15,10 +15,15 @@
>  ## 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 library; 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/>.

Likewise.

> Index: libobjc/init.c
> ===================================================================
> --- libobjc/init.c	(revision 145499)
> +++ libobjc/init.c	(working copy)
> @@ -1,5 +1,6 @@
>  /* GNU Objective C Runtime initialization 
> -   Copyright (C) 1993, 1995, 1996, 1997, 2002 Free Software Foundation, Inc.
> +   Copyright (C) 1993, 1995, 1996, 1997, 2002, 2009
> +   Free Software Foundation, Inc.
>     Contributed by Kresten Krab Thorup
>     +load support contributed by Ovidiu Predescu <ovidiu@net-community.com>
>  
> @@ -7,23 +8,16 @@ 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 2, or (at your option) any later version.
> +Foundaion; 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.
>  
> -You should have received a copy of the GNU General Public License along with
> -GCC; see the file COPYING.  If not, write to the Free Software
> -Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
> -
> -/* As a special exception, if you link this library with files compiled with
> -   GCC to produce an executable, this does not cause the resulting executable
> -   to be covered by the GNU General Public License. This exception does not
> -   however invalidate any other reasons why the executable file might be
> -   covered by the GNU General Public License.  */
>  
> +see  */
> +// <http://www.gnu.org/licenses/>.

This file needs the exception wording; there appears to have been some
problem applying the changes here.  Other problems with the change
include "Foundaion"; I think the libobjc changes should be reposted.

> Index: libobjc/class.c
> ===================================================================
> --- libobjc/class.c	(revision 145499)
> +++ libobjc/class.c	(working copy)
> @@ -1,5 +1,5 @@
>  /* GNU Objective C Runtime class related functions
> -   Copyright (C) 1993, 1995, 1996, 1997, 2001, 2002
> +   Copyright (C) 1993, 1995, 1996, 1997, 2001, 2002, 2009
>       Free Software Foundation, Inc.
>     Contributed by Kresten Krab Thorup and Dennis Glatting.
>  
> @@ -10,23 +10,16 @@ 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 2, or (at your option) any later version.
> +Foundaion; 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.
>  
> -You should have received a copy of the GNU General Public License along with
> -GCC; see the file COPYING.  If not, write to the Free Software
> -Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
> -
> -/* As a special exception, if you link this library with files compiled with
> -   GCC to produce an executable, this does not cause the resulting executable
> -   to be covered by the GNU General Public License. This exception does not
> -   however invalidate any other reasons why the executable file might be
> -   covered by the GNU General Public License.  */
>  
> +see  */
> +// <http://www.gnu.org/licenses/>.

Likewise.

> Index: libobjc/Protocol.m
> ===================================================================
> --- libobjc/Protocol.m	(revision 145499)
> +++ libobjc/Protocol.m	(working copy)
> @@ -1,29 +1,21 @@
>  /* This file contains the implementation of class Protocol.
> -   Copyright (C) 1993, 2004 Free Software Foundation, Inc.
> +   Copyright (C) 1993, 2004, 2009 Free Software Foundation, Inc.
>  
>  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 2, or (at your option)
> -any later version.
> +the Free Software Foundation; either version 3, or (at your option)
> +any laer 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.
>  
> -You should have received a copy of the GNU General Public License
> -along with GCC; see the file COPYING.  If not, write to
> -the Free Software Foundation, 51 Franklin Street, Fifth Floor,
> -Boston, MA 02110-1301, USA.  */
>   
> -/* As a special exception, if you link this library with files
> -   compiled with GCC to produce an executable, this does not cause
> -   the resulting executable to be covered by the GNU General Public License.
> -   This exception does not however invalidate any other reasons why
> -   the executable file might be covered by the GNU General Public License.  */
> -
> +see  */
> +// <http://www.gnu.org/licenses/>.

Likewise; "laer version".

> Index: libobjc/hash.c
> ===================================================================
> --- libobjc/hash.c	(revision 145499)
> +++ libobjc/hash.c	(working copy)
> @@ -1,29 +1,21 @@
>  /* Hash tables for Objective C internal structures
> -   Copyright (C) 1993, 1996, 1997, 2004 Free Software Foundation, Inc.
> +   Copyright (C) 1993, 1996, 1997, 2004, 2009 Free Software Foundation, Inc.
>  
>  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 2, or (at your option)
> -any later version.
> +the Free Software Foundation; either version 3, or (at your option)
> +any laer 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.
>  
> -You should have received a copy of the GNU General Public License
> -along with GCC; see the file COPYING.  If not, write to
> -the Free Software Foundation, 51 Franklin Street, Fifth Floor,
> -Boston, MA 02110-1301, USA.  */
> -
> -/* As a special exception, if you link this library with files
> -   compiled with GCC to produce an executable, this does not cause
> -   the resulting executable to be covered by the GNU General Public License.
> -   This exception does not however invalidate any other reasons why
> -   the executable file might be covered by the GNU General Public License.  */
>  
> +see  */
> +// <http://www.gnu.org/licenses/>.

Likewise.

> Index: libobjc/encoding.c
> ===================================================================
> --- libobjc/encoding.c	(revision 145499)
> +++ libobjc/encoding.c	(working copy)
> @@ -1,5 +1,5 @@
>  /* Encoding of types for Objective C.
> -   Copyright (C) 1993, 1995, 1996, 1997, 1998, 2000, 2002, 2004
> +   Copyright (C) 1993, 1995, 1996, 1997, 1998, 2000, 2002, 2004, 2009
>     Free Software Foundation, Inc.
>     Contributed by Kresten Krab Thorup
>     Bitfield support by Ovidiu Predescu
> @@ -8,25 +8,17 @@ 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 2, or (at your option)
> -any later version.
> +the Free Software Foundation; either version 3, or (at your option)
> +any laer 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.
>  
> -You should have received a copy of the GNU General Public License
> -along with GCC; see the file COPYING.  If not, write to
> -the Free Software Foundation, 51 Franklin Street, Fifth Floor,
> -Boston, MA 02110-1301, USA.  */
> -
> -/* As a special exception, if you link this library with files
> -   compiled with GCC to produce an executable, this does not cause
> -   the resulting executable to be covered by the GNU General Public License.
> -   This exception does not however invalidate any other reasons why
> -   the executable file might be covered by the GNU General Public License.  */
>  
> +see  */
> +// <http://www.gnu.org/licenses/>.

Likewise.

> Index: libobjc/exception.c
> ===================================================================
> --- libobjc/exception.c	(revision 145499)
> +++ libobjc/exception.c	(working copy)
> @@ -5,25 +5,17 @@ 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 2, or (at your option) any
> -later version.
> +Free Software Foundation; either version 3, or (at your option) any
> +later ersion.
>  
>  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 COPYING.  If not, write to
> -the Free Software Foundation, 51 Franklin Street, Fifth Floor,
> -Boston, MA 02110-1301, USA.  */
> -
> -/* As a special exception, if you link this library with files compiled
> -   with GCC to produce an executable, this does not cause the resulting
> -   executable to be covered by the GNU General Public License.  This
> -   exception does not however invalidate any other reasons why the
> -   executable file might be covered by the GNU General Public License. */
>  
> +see  */
> +// <http://www.gnu.org/licenses/>.

Likewise; "later ersion".

> Index: libobjc/NXConstStr.m
> ===================================================================
> --- libobjc/NXConstStr.m	(revision 145499)
> +++ libobjc/NXConstStr.m	(working copy)
> @@ -1,30 +1,22 @@
>  /* Implementation of the NXConstantString class for Objective-C.
> -   Copyright (C) 1995 Free Software Foundation, Inc.
> +   Copyright (C) 1995, 2009 Free Software Foundation, Inc.
>     Contributed by Pieter J. Schoenmakers <tiggr@es.ele.tue.nl>
>  
>  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 2, or (at your option) any
> -later version.
> +Free Software Foundation; either version 3, or (at your option) any
> +later ersion.
>  
>  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 COPYING.  If not, write to
> -the Free Software Foundation, 51 Franklin Street, Fifth Floor,
> -Boston, MA 02110-1301, USA.  */
>   
> -/* As a special exception, if you link this library with files
> -   compiled with GCC to produce an executable, this does not cause
> -   the resulting executable to be covered by the GNU General Public License.
> -   This exception does not however invalidate any other reasons why
> -   the executable file might be covered by the GNU General Public License.  */
> -
> +see  */
> +// <http://www.gnu.org/licenses/>.

Likewise.

> Index: libobjc/Object.m
> ===================================================================
> --- libobjc/Object.m	(revision 145499)
> +++ libobjc/Object.m	(working copy)
> @@ -1,29 +1,21 @@
>  /* The implementation of class Object for Objective-C.
> -   Copyright (C) 1993, 1994, 1995, 1997, 2002 Free Software Foundation, Inc.
> +   Copyright (C) 1993, 1994, 1995, 1997, 2002, 2009 Free Software Foundation, Inc.
>  
>  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 2, or (at your option) any
> -later version.
> +Free Software Foundation; either version 3, or (at your option) any
> +later ersion.
>  
>  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 COPYING.  If not, write to
> -the Free Software Foundation, 51 Franklin Street, Fifth Floor,
> -Boston, MA 02110-1301, USA.  */
> -
> -/* As a special exception, if you link this library with files compiled
> -   with GCC to produce an executable, this does not cause the resulting
> -   executable to be covered by the GNU General Public License.  This
> -   exception does not however invalidate any other reasons why the
> -   executable file might be covered by the GNU General Public License. */
>  
> +see  */
> +// <http://www.gnu.org/licenses/>.

Likewise.

> Index: libobjc/archive.c
> ===================================================================
> --- libobjc/archive.c	(revision 145499)
> +++ libobjc/archive.c	(working copy)
> @@ -1,29 +1,21 @@
>   /* GNU Objective C Runtime archiving
> -   Copyright (C) 1993, 1995, 1996, 1997, 2002, 2004 Free Software Foundation, Inc.
> +   Copyright (C) 1993, 1995, 1996, 1997, 2002, 2004, 2009 Free Software Foundation, Inc.
>     Contributed by Kresten Krab Thorup
>  
>  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 2, or (at your option) any later version.
> +Foundaion; 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.
>  
> -You should have received a copy of the GNU General Public License along with
> -GCC; see the file COPYING.  If not, write to the Free Software
> -Foundation, 51 Franklin Street, Fifth Floor,
> -Boston, MA 02110-1301, USA.  */
> -
> -/* As a special exception, if you link this library with files compiled with
> -   GCC to produce an executable, this does not cause the resulting executable
> -   to be covered by the GNU General Public License. This exception does not
> -   however invalidate any other reasons why the executable file might be
> -   covered by the GNU General Public License.  */
>  
> +see  */
> +// <http://www.gnu.org/licenses/>.

Likewise.

> Index: libobjc/gc.c
> ===================================================================
> --- libobjc/gc.c	(revision 145499)
> +++ libobjc/gc.c	(working copy)
> @@ -1,30 +1,22 @@
>  /* Basic data types for Objective C.
> -   Copyright (C) 1998, 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
> +   Copyright (C) 1998, 2002, 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
>     Contributed by Ovidiu Predescu.
>  
>  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 2, or (at your option)
> -any later version.
> +the Free Software Foundation; either version 3, or (at your option)
> +any laer 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.
>  
> -You should have received a copy of the GNU General Public License
> -along with GCC; see the file COPYING.  If not, write to
> -the Free Software Foundation, 51 Franklin Street, Fifth Floor,
> -Boston, MA 02110-1301, USA.  */
> -
> -/* As a special exception, if you link this library with files
> -   compiled with GCC to produce an executable, this does not cause
> -   the resulting executable to be covered by the GNU General Public License.
> -   This exception does not however invalidate any other reasons why
> -   the executable file might be covered by the GNU General Public License.  */
>  
> +see  */
> +// <http://www.gnu.org/licenses/>.

Likewise.

> Index: libgfortran/intrinsics/selected_int_kind.f90
> ===================================================================
> --- libgfortran/intrinsics/selected_int_kind.f90	(revision 145499)
> +++ libgfortran/intrinsics/selected_int_kind.f90	(working copy)
> @@ -1,4 +1,4 @@
> -!   Copyright 2003, 2004 Free Software Foundation, Inc.
> +!   Copyright 2003, 2004, 2009 Free Software Foundation, Inc.
>  !   Contributed by Kejia Zhao <kejia_zh@yahoo.com.cn>
>  !
>  !This file is part of the GNU Fortran 95 runtime library (libgfor).
> @@ -6,18 +6,21 @@
>  !GNU libgfor is free software; you can redistribute it and/or
>  !modify it under the terms of the GNU Lesser General Public
>  !License as published by the Free Software Foundation; either
> -!version 2.1 of the License, or (at your option) any later version.
> +!version 3 of the License, or (at your option) any later version.
>  !
>  !GNU libgfor 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 Lesser General Public License for more details.

I know no reason for this file in libgfortran to be under
LGPL+exception instead of GPL+exception, so I think it should change
to GPL+exception.

> Index: libgfortran/intrinsics/selected_real_kind.f90
> ===================================================================
> --- libgfortran/intrinsics/selected_real_kind.f90	(revision 145499)
> +++ libgfortran/intrinsics/selected_real_kind.f90	(working copy)
> @@ -1,4 +1,4 @@
> -!   Copyright 2003, 2004 Free Software Foundation, Inc.
> +!   Copyright 2003, 2004, 2009 Free Software Foundation, Inc.
>  !   Contributed by Kejia Zhao <kejia_zh@yahoo.com.cn>
>  !
>  !This file is part of the GNU Fortran 95 runtime library (libgfor).
> @@ -6,18 +6,21 @@
>  !GNU libgfor is free software; you can redistribute it and/or
>  !modify it under the terms of the GNU Lesser General Public
>  !License as published by the Free Software Foundation; either
> -!version 2.1 of the License, or (at your option) any later version.
> +!version 3 of the License, or (at your option) any later version.
>  !
>  !GNU libgfor 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 Lesser General Public License for more details.

Likewise.

> Index: libgfortran/intrinsics/dprod_r8.f90
> ===================================================================
> --- libgfortran/intrinsics/dprod_r8.f90	(revision 145499)
> +++ libgfortran/intrinsics/dprod_r8.f90	(working copy)
> @@ -1,4 +1,4 @@
> -!   Copyright 2003 Free Software Foundation, Inc.
> +!   Copyright 2003, 2009 Free Software Foundation, Inc.
>  !   Contributed by Paul Brook <paul@nowt.org>
>  !
>  !This file is part of the GNU Fortran 95 runtime library (libgfortran).
> @@ -6,17 +6,21 @@
>  !GNU libgfor is free software; you can redistribute it and/or
>  !modify it under the terms of the GNU Lesser General Public
>  !License as published by the Free Software Foundation; either
> -!version 2.1 of the License, or (at your option) any later version.
> +!version 3 of the License, or (at your option) any later version.
>  !
>  !GNU libgfor 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 Lesser General Public License for more details.

Likewise.

> Index: libgfortran/libgfortran.h
> ===================================================================
> --- libgfortran/libgfortran.h	(revision 145499)
> +++ libgfortran/libgfortran.h	(working copy)
> @@ -1,5 +1,5 @@
>  /* Common declarations for all of libgfortran.
> -   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
> +   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
>     Free Software Foundation, Inc.
>     Contributed by Paul Brook <paul@nowt.org>, and
>     Andy Vaught <andy@xena.eas.asu.edu>
> @@ -9,25 +9,21 @@ This file is part of the GNU Fortran 95 
>  Libgfortran is free software; you can redistribute it and/or
>  modify it under the terms of the GNU Lesser General Public
>  License as published by the Free Software Foundation; either
> -version 2.1 of the License, or (at your option) any later version.
> +version 3 of the License, or (at your option) any later version.
>  
>  Libgfortran 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 Lesser General Public License for more details.

Likewise.

> Index: libgfortran/c99_protos.h
> ===================================================================
> --- libgfortran/c99_protos.h	(revision 145499)
> +++ libgfortran/c99_protos.h	(working copy)
> @@ -1,30 +1,26 @@
>  /* Declarations of various C99 functions 
> -   Copyright (C) 2004, 2006, 2007 Free Software Foundation, Inc.
> +   Copyright (C) 2004, 2006, 2007, 2009 Free Software Foundation, Inc.
>  
>  This file is part of the GNU Fortran 95 runtime library (libgfortran).
>  
>  Libgfortran is free software; you can redistribute it and/or
>  modify it under the terms of the GNU Lesser General Public
>  License as published by the Free Software Foundation; either
> -version 2.1 of the License, or (at your option) any later version.
> +version 3 of the License, or (at your option) any later version.
>  
>  Libgfortran 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 Lesser General Public License for more details.

Likewise.

> Index: libcpp/system.h
> ===================================================================
> --- libcpp/system.h	(revision 145499)
> +++ libcpp/system.h	(working copy)
> @@ -1,13 +1,13 @@
>  /* Get common system includes and various definitions and declarations based
>     on autoconf macros.
> -   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
> +   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2009
>     Free Software Foundation, Inc.
>  
>  This file is part of libcpp (aka cpplib).
>  
>  GCC is free software; you can redistribute it and/or modify it under

(Preexisting condition, can be fixed separately.)  Saying "is part of
libcpp" then "GCC is free software" does not explicitly say that the
file itself is free; it should probably say "is part of GCC" or "This
program is free software ... along with this program".

> Index: fixincludes/system.h
> ===================================================================
> --- fixincludes/system.h	(revision 145499)
> +++ fixincludes/system.h	(working copy)
> @@ -1,13 +1,13 @@
>  /* Get common system includes and various definitions and declarations based
>     on autoconf macros.
> -   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
> +   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2009
>     Free Software Foundation, Inc.
>  
>  This file is part of libcpp (aka cpplib).
>  
>  GCC is free software; you can redistribute it and/or modify it under

Likewise, for a file in fixincludes.

> Index: fixincludes/fixincl.c
> ===================================================================
> --- fixincludes/fixincl.c	(revision 145499)
> +++ fixincludes/fixincl.c	(working copy)
> @@ -2,13 +2,14 @@
>     files which are fixed to work correctly with ANSI C and placed in a
>     directory that GCC will search.
>  
> -   Copyright (C) 1997, 1998, 1999, 2000, 2004 Free Software Foundation, Inc.
> +   Copyright (C) 1997, 1998, 1999, 2000, 2004, 2009
> +   Free Software Foundation, Inc.
>  
>  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 2, or (at your option)
> +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,
> @@ -17,9 +18,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICU
>  GNU General Public License for more details.

(Preexisting condition, can be fixed separately.)  There's a control
character in this notice, "more de^Gtails".

-- 
Joseph S. Myers
joseph@codesourcery.com


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]