Re: [commit/sim] Switch to GPLv3

Re: [commit/sim] Switch to GPLv3

[Hans-Peter Nilsson]

On Fri, 24 Aug 2007, Joel Brobecker wrote:

> Similarly to the changes I made in the gdb/ directory, I have transitioned
> the sim/ subdirectory to GPLv3 by applying the following patches.

Let me suggest a "grep 'version 2' sim/*", some remain.  Also,
many of the files were generated.  You'll catch the remaining
igen one as above, but there's also at least cgen, perhaps others.

brgds, H-P
PS.  Eventually.  Right now, I prioritize a few other bugs elsewhere.

Re: [commit/sim] Switch to GPLv3

[Daniel Jacobowitz]

On Sun, Aug 26, 2007 at 08:42:55AM -0400, Hans-Peter Nilsson wrote:
> On Fri, 24 Aug 2007, Joel Brobecker wrote:
> 
> > Similarly to the changes I made in the gdb/ directory, I have transitioned
> > the sim/ subdirectory to GPLv3 by applying the following patches.
> 
> Let me suggest a "grep 'version 2' sim/*", some remain.  Also,
> many of the files were generated.  You'll catch the remaining
> igen one as above, but there's also at least cgen, perhaps others.

Most of the remaining ones are not FSF copyrighted.  I see only:
  sim/igen/lf.c
  mips/configure.ac
  testsuite/sim/mips/testutils.inc
  testsuite/sim/mips/utils-dsp.inc
  testsuite/sim/mips/utils-fpu.inc
  testsuite/sim/mips/utils-mdmx.inc

-- 
Daniel Jacobowitz
CodeSourcery

Re: [commit/sim] Switch to GPLv3

[Hans-Peter Nilsson]

On Sun, 26 Aug 2007, Daniel Jacobowitz wrote:
> Most of the remaining ones are not FSF copyrighted.  I see only:

Oh, I see I was in src/sim/igen when grepping otherwise I get
your point; *lots* of false positives.

I only noticed
sim/igen/compare_igen_models
sim/igen/lf.c

(both C. FSF) and thought better mention it than leave it for
the moment.

brgds, H-P

Re: [commit/sim] Switch to GPLv3

[Joel Brobecker]

> Most of the remaining ones are not FSF copyrighted.  I see only:
>   sim/igen/lf.c
>   mips/configure.ac
>   testsuite/sim/mips/testutils.inc
>   testsuite/sim/mips/utils-dsp.inc
>   testsuite/sim/mips/utils-fpu.inc
>   testsuite/sim/mips/utils-mdmx.inc

Oops, thanks to both of you for spotting these. I will fix these
files as soon as I have a moment - unless someone gets to them
before I do, of course ;-).

-- 
Joel

Re: [commit/sim] Switch to GPLv3

[Joel Brobecker]

[-- Attachment #1: Type: text/plain, Size: 893 bytes --]

> Most of the remaining ones are not FSF copyrighted.  I see only:
>   sim/igen/lf.c
>   mips/configure.ac
>   testsuite/sim/mips/testutils.inc
>   testsuite/sim/mips/utils-dsp.inc
>   testsuite/sim/mips/utils-fpu.inc
>   testsuite/sim/mips/utils-mdmx.inc

Now fixed as follow:

2007-08-27  Joel Brobecker  <brobecker@adacore.com>

        * lf.c (lf_print__gnu_copyleft): Change license to GPL version 3.

2007-08-24  Joel Brobecker  <brobecker@adacore.com>

        * configure.ac: Change license of multi-run.c to GPL version 3.
        * configure: Regenerate.

2007-08-27  Joel Brobecker  <brobecker@adacore.com>

        * testutils.inc: Change license to GPL version 3.
        * utils-dsp.inc: Change license to GPL version 3.
        * utils-fpu.inc: Change license to GPL version 3.
        * utils-mdmx.inc: Change license to GPL version 3.

Thanks for pointing this out.

-- 
Joel

[-- Attachment #2: sim-igen.diff --]
[-- Type: text/plain, Size: 1446 bytes --]

Index: igen/lf.c
===================================================================
RCS file: /cvs/src/src/sim/igen/lf.c,v
retrieving revision 1.6
diff -u -p -r1.6 lf.c
--- igen/lf.c	24 Aug 2007 14:28:36 -0000	1.6
+++ igen/lf.c	27 Aug 2007 23:55:48 -0000
@@ -265,22 +265,20 @@ lf_print__gnu_copyleft (lf *file)
       nr += lf_printf (file, "\
 /* This file is part of GDB.\n\
 \n\
-   Copyright 2002 Free Software Foundation, Inc.\n\
+   Copyright 2002, 2007 Free Software Foundation, Inc.\n\
 \n\
    This program is free software; you can redistribute it and/or modify\n\
    it under the terms of the GNU General Public License as published by\n\
-   the Free Software Foundation; either version 2 of the License, or\n\
+   the Free Software Foundation; either version 3 of the License, or\n\
    (at your option) any later version.\n\
 \n\
    This program is distributed in the hope that it will be useful,\n\
    but WITHOUT ANY WARRANTY; without even the implied warranty of\n\
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n\
    GNU General Public License for more details.\n\
- \n\
+\n\
    You should have received a copy of the GNU General Public License\n\
-   along with this program; if not, write to the Free Software\n\
-   Foundation, Inc., 59 Temple Place - Suite 330,\n\
-   Boston, MA 02111-1307, USA.\n\
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.\n\
 \n\
    --\n\
 \n\


[-- Attachment #3: sim-mips.diff --]
[-- Type: text/plain, Size: 1345 bytes --]

Index: mips/configure.ac
===================================================================
RCS file: /cvs/src/src/sim/mips/configure.ac,v
retrieving revision 1.13
diff -u -p -r1.13 configure.ac
--- mips/configure.ac	28 Jun 2007 06:00:52 -0000	1.13
+++ mips/configure.ac	27 Aug 2007 23:55:48 -0000
@@ -234,11 +234,11 @@ if test ${sim_gen} = MULTI; then
 
   cat << __EOF__ > multi-run.c
 /* Main entry point for MULTI simulators.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2007 Free Software Foundation, Inc.
 
    This program 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 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -247,8 +247,7 @@ if test ${sim_gen} = MULTI; then
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    --
 

[-- Attachment #4: sim-testsuite-mips.diff --]
[-- Type: text/plain, Size: 5358 bytes --]

Index: testutils.inc
===================================================================
RCS file: /cvs/src/src/sim/testsuite/sim/mips/testutils.inc,v
retrieving revision 1.3
diff -u -p -r1.3 testutils.inc
--- testutils.inc	9 Jan 2007 17:59:20 -0000	1.3
+++ testutils.inc	27 Aug 2007 23:58:16 -0000
@@ -6,17 +6,16 @@
 #
 # This program 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 of the License, or
+# (at your option) any later version.
 #
 # This program 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; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 # $1, $4, $5, %6, are used as temps by the macros defined here.
Index: utils-dsp.inc
===================================================================
RCS file: /cvs/src/src/sim/testsuite/sim/mips/utils-dsp.inc,v
retrieving revision 1.3
diff -u -p -r1.3 utils-dsp.inc
--- utils-dsp.inc	20 Feb 2007 13:28:56 -0000	1.3
+++ utils-dsp.inc	27 Aug 2007 23:58:16 -0000
@@ -6,17 +6,16 @@
 #
 # This program 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 of the License, or
+# (at your option) any later version.
 #
 # This program 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; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 # $4, $5, $6, $7, $ac0, $ac1, $ac2, $ac3 are used as temps by the macros
 # defined here.
Index: utils-fpu.inc
===================================================================
RCS file: /cvs/src/src/sim/testsuite/sim/mips/utils-fpu.inc,v
retrieving revision 1.3
diff -u -p -r1.3 utils-fpu.inc
--- utils-fpu.inc	9 Jan 2007 17:59:20 -0000	1.3
+++ utils-fpu.inc	27 Aug 2007 23:58:16 -0000
@@ -6,17 +6,16 @@
 #
 # This program 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 of the License, or
+# (at your option) any later version.
 #
 # This program 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; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 	.macro	enable_fpu fr
         mfc0    $20, $12
Index: utils-mdmx.inc
===================================================================
RCS file: /cvs/src/src/sim/testsuite/sim/mips/utils-mdmx.inc,v
retrieving revision 1.3
diff -u -p -r1.3 utils-mdmx.inc
--- utils-mdmx.inc	9 Jan 2007 17:59:20 -0000	1.3
+++ utils-mdmx.inc	27 Aug 2007 23:58:16 -0000
@@ -6,17 +6,16 @@
 #
 # This program 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 of the License, or
+# (at your option) any later version.
 #
 # This program 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; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 	.include "utils-fpu.inc"
 

Re: [commit/sim] Switch to GPLv3

[Hans-Peter Nilsson]

On Mon, 27 Aug 2007, Joel Brobecker wrote:
>         * lf.c (lf_print__gnu_copyleft): Change license to GPL version 3.

Still missing sim/igen/compare_igen_models.
(Hehe, you treated Dan's list as complete. :)

brgds, H-P

Re: [commit/sim] Switch to GPLv3

[Joel Brobecker]

[-- Attachment #1: Type: text/plain, Size: 237 bytes --]

> Still missing sim/igen/compare_igen_models.
> (Hehe, you treated Dan's list as complete. :)

Fixed thusly.

2008-08-28  Joel Brobecker  <brobecker@adacore.com>

        * compare_igen_models: Change license to GPL version 3.

-- 
Joel

[-- Attachment #2: igen.diff --]
[-- Type: text/plain, Size: 1435 bytes --]

Index: compare_igen_models
===================================================================
RCS file: /cvs/src/src/sim/igen/compare_igen_models,v
retrieving revision 1.3
diff -u -p -r1.3 compare_igen_models
--- compare_igen_models	9 Jan 2007 17:59:18 -0000	1.3
+++ compare_igen_models	28 Aug 2007 16:07:38 -0000
@@ -8,17 +8,16 @@
 # 
 # This program 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 of the License, or
+# (at your option) any later version.
+#
 # This program 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; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # This is a simple-minded script to compare the functions and instructions
 # listed for two different models in one or more .igen files.