libgcc2 exception clause inconsistent

[Mike Stump]

In gcc/libgcc2.c, this was done:

revision 1.92
date: 2000/05/15 23:14:15;  author: law;  state: Exp;  lines: +9 -7
Update to libgcc copyright exception clause.
----------------------------

See patch at end for the exact change.  This change is incomplete, as 
there are many such files that need the same change:

mrs $ find . -type f | xargs grep 'As a special exception, if you link'
./gcc/config/alpha/crtfastmath.c: *    As a special exception, if you 
link this library with files
./gcc/config/arm/crti.asm:#    As a special exception, if you link this 
library with files
./gcc/config/arm/crtn.asm:#    As a special exception, if you link this 
library with files
./gcc/config/cris/arit.c:   As a special exception, if you link this 
library with files, some of
./gcc/config/cris/cris_abi_symbol.c:   As a special exception, if you 
link this library with files, some of
./gcc/config/fp-bit.c:/* As a special exception, if you link this 
library with other files,
./gcc/config/fp-bit.h:/* As a special exception, if you link this 
library with other files,
./gcc/config/fr30/crti.asm:#    As a special exception, if you link 
this library with files
./gcc/config/fr30/crtn.asm:#    As a special exception, if you link 
this library with files
./gcc/config/frv/cmovd.c:/* As a special exception, if you link this 
library with other files,
./gcc/config/frv/cmovh.c:/* As a special exception, if you link this 
library with other files,
./gcc/config/frv/cmovw.c:/* As a special exception, if you link this 
library with other files,
./gcc/config/frv/frvbegin.c:/* As a special exception, if you link this 
library with other files,
./gcc/config/frv/frvend.c:/* As a special exception, if you link this 
library with other files,
./gcc/config/frv/lib1funcs.asm:/* As a special exception, if you link 
this library with other files,
./gcc/config/i386/cygwin.asm: *    As a special exception, if you link 
this library with files
./gcc/config/i386/gthr-win32.c:/* As a special exception, if you link 
this library with other files,
./gcc/config/i386/sol2-c1.asm:!    As a special exception, if you link 
this library with files
./gcc/config/i386/sol2-ci.asm:!    As a special exception, if you link 
this library with files
./gcc/config/i386/sol2-cn.asm:!    As a special exception, if you link 
this library with files
./gcc/config/i386/sol2-gc1.asm:!    As a special exception, if you link 
this library with files
./gcc/config/ia64/crti.asm:#    As a special exception, if you link 
this library with files
./gcc/config/ia64/crtn.asm:#    As a special exception, if you link 
this library with files
./gcc/config/ia64/fde-glibc.c:/* As a special exception, if you link 
this library with other files,
./gcc/config/ia64/unwind-ia64.c:/* As a special exception, if you link 
this library with other files,
./gcc/config/m68hc11/larith.asm:/* As a special exception, if you link 
this library with other files,
./gcc/config/m68hc11/m68hc11-crt0.S:/* As a special exception, if you 
link this library with other files,
./gcc/config/m68k/crti.s:/* As a special exception, if you link this 
library with files
./gcc/config/m68k/crtn.s:/* As a special exception, if you link this 
library with files
./gcc/config/m68k/lb1sf68.asm:/* As a special exception, if you link 
this library with files
./gcc/config/mcore/crti.asm:#    As a special exception, if you link 
this library with files
./gcc/config/mcore/crtn.asm:#    As a special exception, if you link 
this library with files
./gcc/config/mips/mips16.S:/* As a special exception, if you link this 
library with other files,
./gcc/config/rs6000/crtsavres.asm: *    As a special exception, if you 
link this library with files
./gcc/config/rs6000/darwin-fpsave.asm: *  As a special exception, if 
you link this library with files
./gcc/config/rs6000/darwin-tramp.asm: *  As a special exception, if you 
link this library with files
./gcc/config/rs6000/darwin-vecsave.asm: *  As a special exception, if 
you link this library with files
./gcc/config/rs6000/darwin-world.asm: *  As a special exception, if you 
link this library with files
./gcc/config/rs6000/eabi-ci.asm:   As a special exception, if you link 
this library with files
./gcc/config/rs6000/eabi-cn.asm:   As a special exception, if you link 
this library with files
./gcc/config/rs6000/eabi.asm: *    As a special exception, if you link 
this library with files
./gcc/config/rs6000/sol-ci.asm:#    As a special exception, if you link 
this library with files
./gcc/config/rs6000/sol-cn.asm:#    As a special exception, if you link 
this library with files
./gcc/config/rs6000/tramp.asm: *    As a special exception, if you link 
this library with files
./gcc/config/sparc/crtfastmath.c: *    As a special exception, if you 
link this library with files
./gcc/config/sparc/sol2-c1.asm:!    As a special exception, if you link 
this library with files
./gcc/config/sparc/sol2-ci.asm:!    As a special exception, if you link 
this library with files
./gcc/config/sparc/sol2-cn.asm:!    As a special exception, if you link 
this library with files
./gcc/config/vxlib.c:/* As a special exception, if you link this 
library with other files,
./gcc/gbl-ctors.h:/* As a special exception, if you link this library 
with other files,
./gcc/gcov-io.h:/* As a special exception, if you link this library 
with other files,
./gcc/gthr-aix.h:/* As a special exception, if you link this library 
with other files,
./gcc/gthr-dce.h:/* As a special exception, if you link this library 
with other files,
./gcc/gthr-gnat.c:/* As a special exception, if you link this library 
with other files,
./gcc/gthr-gnat.h:/* As a special exception, if you link this library 
with other files,
./gcc/gthr-posix.c:/* As a special exception, if you link this library 
with other files,
./gcc/gthr-posix.h:/* As a special exception, if you link this library 
with other files,
./gcc/gthr-rtems.h:/* As a special exception, if you link this library 
with other files,
./gcc/gthr-single.h:/* As a special exception, if you link this library 
with other files,
./gcc/gthr-solaris.h:/* As a special exception, if you link this 
library with other files,
./gcc/gthr-vxworks.h:/* As a special exception, if you link this 
library with other files,
./gcc/gthr-win32.h:/* As a special exception, if you link this library 
with other files,
./gcc/gthr.h:/* As a special exception, if you link this library with 
other files,
./gcc/libgcc2.h:/* As a special exception, if you link this library 
with other files,
./gcc/tsystem.h:/* As a special exception, if you link this library 
with other files,
./gcc/unwind-dw2-fde-darwin.c:/* As a special exception, if you link 
this library with other files,
./gcc/unwind-dw2-fde-glibc.c:/* As a special exception, if you link 
this library with other files,
./libiberty/clock.c:As a special exception, if you link this library 
with files
./libiberty/snprintf.c:As a special exception, if you link this library 
with files
./libiberty/strtod.c:As a special exception, if you link this library 
with files
./libiberty/vsnprintf.c:As a special exception, if you link this 
library with files
./libiberty/vsprintf.c:As a special exception, if you link this library 
with files
./libjava/sysdep/ia64.c:/* As a special exception, if you link this 
library with other files,
./libobjc/archive.c:/* As a special exception, if you link this library 
with files compiled with
./libobjc/class.c:/* As a special exception, if you link this library 
with files compiled with
./libobjc/encoding.c:/* As a special exception, if you link this 
library with files
./libobjc/gc.c:/* As a special exception, if you link this library with 
files
./libobjc/hash.c:/* As a special exception, if you link this library 
with files
./libobjc/init.c:/* As a special exception, if you link this library 
with files compiled with
./libobjc/libobjc_entry.c:/* As a special exception, if you link this 
library with files compiled with
./libobjc/linking.m:/* As a special exception, if you link this library 
with files compiled with
./libobjc/misc.c:/* As a special exception, if you link this library 
with files compiled with
./libobjc/nil_method.c:/* As a special exception, if you link this 
library with files compiled with
./libobjc/NXConstStr.m:/* As a special exception, if you link this 
library with files
./libobjc/objc/encoding.h:/* As a special exception, if you link this 
library with files
./libobjc/objc/hash.h:/* As a special exception, if you link this 
library with files
./libobjc/objc/NXConstStr.h:/* As a special exception, if you link this 
library with files
./libobjc/objc/objc-api.h:/* As a special exception, if you link this 
library with files compiled
./libobjc/objc/objc-decls.h:/* As a special exception, if you link this 
library with files compiled
./libobjc/objc/objc-list.h:/* As a special exception, if you link this 
library with files compiled with
./libobjc/objc/objc.h:/* As a special exception, if you link this 
library with files
./libobjc/objc/Object.h:/* As a special exception, if you link this 
library with files compiled
./libobjc/objc/Protocol.h:/* As a special exception, if you link this 
library with files
./libobjc/objc/runtime.h:/* As a special exception, if you link this 
library with files compiled with
./libobjc/objc/sarray.h:/* As a special exception, if you link this 
library with files
./libobjc/objc/thr.h:/* As a special exception, if you link this 
library with files
./libobjc/objc/typedstream.h:/* As a special exception, if you link 
this library with files compiled
./libobjc/Object.m:/* As a special exception, if you link this library 
with files compiled
./libobjc/objects.c:/* As a special exception, if you link this library 
with files compiled with
./libobjc/Protocol.m:/* As a special exception, if you link this 
library with files
./libobjc/sarray.c:/* As a special exception, if you link this library 
with files
./libobjc/selector.c:/* As a special exception, if you link this 
library with files compiled with
./libobjc/sendmsg.c:/* As a special exception, if you link this library 
with files compiled with
./libobjc/thr-dce.c:/* As a special exception, if you link this library 
with files compiled with
./libobjc/thr-decosf1.c:/* As a special exception, if you link this 
library with files compiled with
./libobjc/thr-irix.c:/* As a special exception, if you link this 
library with files compiled with
./libobjc/thr-mach.c:/* As a special exception, if you link this 
library with files compiled with
./libobjc/thr-objc.c:/* As a special exception, if you link this 
library with files compiled with
./libobjc/thr-os2.c:/* As a special exception, if you link this library 
with files compiled with
./libobjc/thr-posix.c:/* As a special exception, if you link this 
library with files compiled with
./libobjc/thr-pthreads.c:/* As a special exception, if you link this 
library with files compiled with
./libobjc/thr-rtems.c:/* As a special exception, if you link this 
library with files compiled with
./libobjc/thr-single.c:/* As a special exception, if you link this 
library with files compiled with
./libobjc/thr-solaris.c:/* As a special exception, if you link this 
library with files compiled with
./libobjc/thr-vxworks.c:/* As a special exception, if you link this 
library with files compiled with
./libobjc/thr-win32.c:/* As a special exception, if you link this 
library with files compiled with
./libobjc/thr.c:/* As a special exception, if you link this library 
with files compiled with

Lawyers prefer, we prefer, that the exact same clause is in each file.  
Could someone say which version is the right one, and pre-approve the 
mechanical unification?  Thanks.

Also, there is no changelog for this that I can find, nor is there an 
email to gcc-patches like was done in the beginning of may 
<http://gcc.gnu.org/ml/gcc-patches/2000-05/msg00028.html> for copyright 
updates.  :-(  That seems wrong.


diff -u -p -r1.91 -r1.92
--- libgcc2.c   4 May 2000 23:21:33 -0000       1.91
+++ libgcc2.c   15 May 2000 23:14:15 -0000      1.92
@@ -10,6 +10,15 @@ it under the terms of the GNU General Pu
  the Free Software Foundation; either version 2, 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.)
+
  GNU CC 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
@@ -20,13 +29,6 @@ along with GNU CC; see the file COPYING.
  the Free Software Foundation, 59 Temple Place - Suite 330,
  Boston, MA 02111-1307, USA.  */

-/* 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.  */
-
  /* It is incorrect to include config.h here, because this file is being
     compiled for the target, and hence definitions concerning only the 
host
     do not apply.  */