summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sim/ChangeLog4
-rw-r--r--sim/arm/COPYING2
-rw-r--r--sim/arm/armcopro.c2
-rw-r--r--sim/arm/armdefs.h2
-rw-r--r--sim/arm/armemu.c2
-rw-r--r--sim/arm/armemu.h2
-rw-r--r--sim/arm/armfpe.h2
-rw-r--r--sim/arm/arminit.c2
-rw-r--r--sim/arm/armopts.h2
-rw-r--r--sim/arm/armos.c2
-rw-r--r--sim/arm/armos.h2
-rw-r--r--sim/arm/armrdi.c2
-rw-r--r--sim/arm/armsupp.c2
-rw-r--r--sim/arm/armvirt.c2
-rw-r--r--sim/arm/bag.c2
-rw-r--r--sim/arm/bag.h2
-rw-r--r--sim/arm/communicate.c2
-rw-r--r--sim/arm/communicate.h2
-rw-r--r--sim/arm/dbg_conf.h2
-rw-r--r--sim/arm/dbg_cp.h2
-rw-r--r--sim/arm/dbg_hif.h2
-rw-r--r--sim/arm/dbg_rdi.h2
-rw-r--r--sim/arm/gdbhost.c2
-rw-r--r--sim/arm/gdbhost.h2
-rw-r--r--sim/arm/kid.c2
-rw-r--r--sim/arm/main.c2
-rw-r--r--sim/arm/parent.c2
-rw-r--r--sim/arm/thumbemu.c2
-rw-r--r--sim/bfin/aclocal.m42
-rw-r--r--sim/bfin/linux-fixed-code.s2
-rw-r--r--sim/erc32/erc32.c2
-rw-r--r--sim/erc32/exec.c2
-rw-r--r--sim/erc32/float.c2
-rw-r--r--sim/erc32/func.c2
-rw-r--r--sim/erc32/interf.c2
-rw-r--r--sim/erc32/sis.c2
-rw-r--r--sim/erc32/sis.h2
-rw-r--r--sim/lm32/mloop.in2
-rw-r--r--sim/microblaze/interp.c2
-rw-r--r--sim/mips/m16run.c2
-rw-r--r--sim/mips/sim-main.c2
-rw-r--r--sim/moxie/moxie-gdb.dts2
-rw-r--r--sim/ppc/COPYING2
-rw-r--r--sim/ppc/Makefile.in2
-rw-r--r--sim/ppc/README4
-rw-r--r--sim/ppc/basics.h2
-rw-r--r--sim/ppc/bits.c2
-rw-r--r--sim/ppc/bits.h2
-rw-r--r--sim/ppc/cap.c2
-rw-r--r--sim/ppc/cap.h2
-rw-r--r--sim/ppc/corefile-n.h2
-rw-r--r--sim/ppc/corefile.c2
-rw-r--r--sim/ppc/corefile.h2
-rw-r--r--sim/ppc/cpu.c2
-rw-r--r--sim/ppc/cpu.h2
-rw-r--r--sim/ppc/dc-complex2
-rw-r--r--sim/ppc/dc-simple2
-rw-r--r--sim/ppc/dc-stupid2
-rw-r--r--sim/ppc/dc-test.012
-rw-r--r--sim/ppc/dc-test.022
-rw-r--r--sim/ppc/debug.c2
-rw-r--r--sim/ppc/debug.h2
-rw-r--r--sim/ppc/device.c2
-rw-r--r--sim/ppc/device.h2
-rw-r--r--sim/ppc/device_table.c2
-rw-r--r--sim/ppc/device_table.h2
-rw-r--r--sim/ppc/dgen.c2
-rw-r--r--sim/ppc/double.c2
-rw-r--r--sim/ppc/emul_bugapi.c2
-rw-r--r--sim/ppc/emul_bugapi.h2
-rw-r--r--sim/ppc/emul_chirp.c2
-rw-r--r--sim/ppc/emul_chirp.h2
-rw-r--r--sim/ppc/emul_generic.c2
-rw-r--r--sim/ppc/emul_generic.h2
-rw-r--r--sim/ppc/emul_netbsd.c2
-rw-r--r--sim/ppc/emul_netbsd.h2
-rw-r--r--sim/ppc/emul_unix.c2
-rw-r--r--sim/ppc/emul_unix.h2
-rw-r--r--sim/ppc/events.c2
-rw-r--r--sim/ppc/events.h2
-rw-r--r--sim/ppc/filter.c2
-rw-r--r--sim/ppc/filter.h2
-rw-r--r--sim/ppc/filter_filename.c2
-rw-r--r--sim/ppc/filter_filename.h2
-rw-r--r--sim/ppc/gen-icache.c2
-rw-r--r--sim/ppc/gen-icache.h2
-rw-r--r--sim/ppc/gen-idecode.c2
-rw-r--r--sim/ppc/gen-idecode.h2
-rw-r--r--sim/ppc/gen-itable.c2
-rw-r--r--sim/ppc/gen-itable.h2
-rw-r--r--sim/ppc/gen-model.c2
-rw-r--r--sim/ppc/gen-model.h2
-rw-r--r--sim/ppc/gen-semantics.c2
-rw-r--r--sim/ppc/gen-semantics.h2
-rw-r--r--sim/ppc/gen-support.c2
-rw-r--r--sim/ppc/gen-support.h2
-rw-r--r--sim/ppc/hw_com.c2
-rw-r--r--sim/ppc/hw_core.c2
-rw-r--r--sim/ppc/hw_cpu.c2
-rw-r--r--sim/ppc/hw_cpu.h2
-rw-r--r--sim/ppc/hw_disk.c2
-rw-r--r--sim/ppc/hw_eeprom.c2
-rw-r--r--sim/ppc/hw_glue.c2
-rw-r--r--sim/ppc/hw_htab.c2
-rw-r--r--sim/ppc/hw_ide.c2
-rw-r--r--sim/ppc/hw_init.c2
-rw-r--r--sim/ppc/hw_iobus.c2
-rw-r--r--sim/ppc/hw_memory.c2
-rw-r--r--sim/ppc/hw_nvram.c2
-rw-r--r--sim/ppc/hw_opic.c2
-rw-r--r--sim/ppc/hw_pal.c2
-rw-r--r--sim/ppc/hw_phb.c2
-rw-r--r--sim/ppc/hw_phb.h2
-rw-r--r--sim/ppc/hw_register.c2
-rw-r--r--sim/ppc/hw_sem.c2
-rw-r--r--sim/ppc/hw_shm.c2
-rw-r--r--sim/ppc/hw_trace.c2
-rw-r--r--sim/ppc/hw_vm.c2
-rw-r--r--sim/ppc/idecode_branch.h2
-rw-r--r--sim/ppc/idecode_expression.h2
-rw-r--r--sim/ppc/idecode_fields.h2
-rw-r--r--sim/ppc/igen.c2
-rw-r--r--sim/ppc/igen.h2
-rw-r--r--sim/ppc/inline.c2
-rw-r--r--sim/ppc/inline.h2
-rw-r--r--sim/ppc/interrupts.c2
-rw-r--r--sim/ppc/interrupts.h2
-rw-r--r--sim/ppc/ld-cache.c2
-rw-r--r--sim/ppc/ld-cache.h2
-rw-r--r--sim/ppc/ld-decode.c2
-rw-r--r--sim/ppc/ld-decode.h2
-rw-r--r--sim/ppc/ld-insn.c2
-rw-r--r--sim/ppc/ld-insn.h2
-rw-r--r--sim/ppc/lf.c4
-rw-r--r--sim/ppc/lf.h2
-rw-r--r--sim/ppc/main.c2
-rw-r--r--sim/ppc/misc.c2
-rw-r--r--sim/ppc/misc.h2
-rw-r--r--sim/ppc/mon.c2
-rw-r--r--sim/ppc/mon.h2
-rw-r--r--sim/ppc/options.c2
-rw-r--r--sim/ppc/options.h2
-rw-r--r--sim/ppc/os_emul.c2
-rw-r--r--sim/ppc/os_emul.h2
-rw-r--r--sim/ppc/pk_disklabel.c2
-rw-r--r--sim/ppc/ppc-instructions2
-rw-r--r--sim/ppc/ppc-spr-table2
-rw-r--r--sim/ppc/psim.c2
-rw-r--r--sim/ppc/psim.h2
-rw-r--r--sim/ppc/psim.texinfo2
-rw-r--r--sim/ppc/registers.c2
-rw-r--r--sim/ppc/registers.h2
-rw-r--r--sim/ppc/sim-endian-n.h2
-rw-r--r--sim/ppc/sim-endian.c2
-rw-r--r--sim/ppc/sim-endian.h2
-rw-r--r--sim/ppc/sim_callbacks.h2
-rw-r--r--sim/ppc/sim_calls.c2
-rw-r--r--sim/ppc/std-config.h2
-rw-r--r--sim/ppc/table.c2
-rw-r--r--sim/ppc/table.h2
-rw-r--r--sim/ppc/tree.c2
-rw-r--r--sim/ppc/tree.h2
-rw-r--r--sim/ppc/vm.c2
-rw-r--r--sim/ppc/vm.h2
-rw-r--r--sim/ppc/vm_n.h2
-rw-r--r--sim/ppc/words.h2
-rw-r--r--sim/rl78/Makefile.in2
-rw-r--r--sim/rx/Makefile.in2
-rw-r--r--sim/testsuite/sim/mips/mips32-dsp2.s2
169 files changed, 174 insertions, 170 deletions
diff --git a/sim/ChangeLog b/sim/ChangeLog
index 675903bfaeb..f76e3428fab 100644
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-19 Joel Brobecker <brobecker@adacore.com>
+
+ Update the non-FSF-copyrighted files in sim to GPLv3 or later.
+
2012-11-20 Pavel Chupin <pavel.v.chupin@intel.com>
* common/Make-common.in: Use lt_cv_dlopen_libs under PLUGINS
diff --git a/sim/arm/COPYING b/sim/arm/COPYING
index ebb24a85e9d..f938b573149 100644
--- a/sim/arm/COPYING
+++ b/sim/arm/COPYING
@@ -295,7 +295,7 @@ the "copyright" line and a pointer to where the full notice is found.
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,
diff --git a/sim/arm/armcopro.c b/sim/arm/armcopro.c
index 29303c00b78..57d32c51166 100644
--- a/sim/arm/armcopro.c
+++ b/sim/arm/armcopro.c
@@ -3,7 +3,7 @@
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,
diff --git a/sim/arm/armdefs.h b/sim/arm/armdefs.h
index 2942023b7d8..e175ebcde83 100644
--- a/sim/arm/armdefs.h
+++ b/sim/arm/armdefs.h
@@ -3,7 +3,7 @@
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,
diff --git a/sim/arm/armemu.c b/sim/arm/armemu.c
index 558e897582a..282a06ee16b 100644
--- a/sim/arm/armemu.c
+++ b/sim/arm/armemu.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/arm/armemu.h b/sim/arm/armemu.h
index ec188038291..63e6ecd12a6 100644
--- a/sim/arm/armemu.h
+++ b/sim/arm/armemu.h
@@ -3,7 +3,7 @@
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,
diff --git a/sim/arm/armfpe.h b/sim/arm/armfpe.h
index c5a291f0a2a..a348f893f75 100644
--- a/sim/arm/armfpe.h
+++ b/sim/arm/armfpe.h
@@ -3,7 +3,7 @@
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,
diff --git a/sim/arm/arminit.c b/sim/arm/arminit.c
index c84fb5cce44..f2328438188 100644
--- a/sim/arm/arminit.c
+++ b/sim/arm/arminit.c
@@ -3,7 +3,7 @@
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,
diff --git a/sim/arm/armopts.h b/sim/arm/armopts.h
index 8fad7477504..4eeac9dc021 100644
--- a/sim/arm/armopts.h
+++ b/sim/arm/armopts.h
@@ -3,7 +3,7 @@
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,
diff --git a/sim/arm/armos.c b/sim/arm/armos.c
index 39b9d4f0615..942b41ca408 100644
--- a/sim/arm/armos.c
+++ b/sim/arm/armos.c
@@ -3,7 +3,7 @@
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,
diff --git a/sim/arm/armos.h b/sim/arm/armos.h
index ce2d5bc0e4d..a39dbc94b76 100644
--- a/sim/arm/armos.h
+++ b/sim/arm/armos.h
@@ -3,7 +3,7 @@
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,
diff --git a/sim/arm/armrdi.c b/sim/arm/armrdi.c
index 05f1c69005c..b21be11637c 100644
--- a/sim/arm/armrdi.c
+++ b/sim/arm/armrdi.c
@@ -3,7 +3,7 @@
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,
diff --git a/sim/arm/armsupp.c b/sim/arm/armsupp.c
index 2e49af8f0e1..9d61245db91 100644
--- a/sim/arm/armsupp.c
+++ b/sim/arm/armsupp.c
@@ -3,7 +3,7 @@
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,
diff --git a/sim/arm/armvirt.c b/sim/arm/armvirt.c
index 969085d24f4..d0e36f2c68e 100644
--- a/sim/arm/armvirt.c
+++ b/sim/arm/armvirt.c
@@ -3,7 +3,7 @@
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,
diff --git a/sim/arm/bag.c b/sim/arm/bag.c
index 1998f3947c0..ef3bdbab314 100644
--- a/sim/arm/bag.c
+++ b/sim/arm/bag.c
@@ -3,7 +3,7 @@
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,
diff --git a/sim/arm/bag.h b/sim/arm/bag.h
index 5592bc838c2..acc341a45ab 100644
--- a/sim/arm/bag.h
+++ b/sim/arm/bag.h
@@ -3,7 +3,7 @@
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,
diff --git a/sim/arm/communicate.c b/sim/arm/communicate.c
index fac2b60244e..06b66b65d56 100644
--- a/sim/arm/communicate.c
+++ b/sim/arm/communicate.c
@@ -3,7 +3,7 @@
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,
diff --git a/sim/arm/communicate.h b/sim/arm/communicate.h
index b7f32e6a25c..69de5e78847 100644
--- a/sim/arm/communicate.h
+++ b/sim/arm/communicate.h
@@ -3,7 +3,7 @@
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,
diff --git a/sim/arm/dbg_conf.h b/sim/arm/dbg_conf.h
index 81e37c0ff54..42dd10d22f0 100644
--- a/sim/arm/dbg_conf.h
+++ b/sim/arm/dbg_conf.h
@@ -3,7 +3,7 @@
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,
diff --git a/sim/arm/dbg_cp.h b/sim/arm/dbg_cp.h
index 68f4f63ecd1..f262aa36b6e 100644
--- a/sim/arm/dbg_cp.h
+++ b/sim/arm/dbg_cp.h
@@ -3,7 +3,7 @@
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,
diff --git a/sim/arm/dbg_hif.h b/sim/arm/dbg_hif.h
index 90056c3b687..8066066345f 100644
--- a/sim/arm/dbg_hif.h
+++ b/sim/arm/dbg_hif.h
@@ -3,7 +3,7 @@
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,
diff --git a/sim/arm/dbg_rdi.h b/sim/arm/dbg_rdi.h
index c04a47622ed..0a9cf1761c0 100644
--- a/sim/arm/dbg_rdi.h
+++ b/sim/arm/dbg_rdi.h
@@ -3,7 +3,7 @@
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,
diff --git a/sim/arm/gdbhost.c b/sim/arm/gdbhost.c
index 5058b7cf97c..555cd04dd83 100644
--- a/sim/arm/gdbhost.c
+++ b/sim/arm/gdbhost.c
@@ -3,7 +3,7 @@
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,
diff --git a/sim/arm/gdbhost.h b/sim/arm/gdbhost.h
index 2ddc17ddc0e..a5b8da6e5b5 100644
--- a/sim/arm/gdbhost.h
+++ b/sim/arm/gdbhost.h
@@ -3,7 +3,7 @@
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,
diff --git a/sim/arm/kid.c b/sim/arm/kid.c
index d9073e66c70..887533df309 100644
--- a/sim/arm/kid.c
+++ b/sim/arm/kid.c
@@ -3,7 +3,7 @@
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,
diff --git a/sim/arm/main.c b/sim/arm/main.c
index 9bc20fef235..eb286baac6a 100644
--- a/sim/arm/main.c
+++ b/sim/arm/main.c
@@ -3,7 +3,7 @@
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,
diff --git a/sim/arm/parent.c b/sim/arm/parent.c
index 159e8e35b62..0a0520cf149 100644
--- a/sim/arm/parent.c
+++ b/sim/arm/parent.c
@@ -3,7 +3,7 @@
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,
diff --git a/sim/arm/thumbemu.c b/sim/arm/thumbemu.c
index 8707ca71a64..487feeb1600 100644
--- a/sim/arm/thumbemu.c
+++ b/sim/arm/thumbemu.c
@@ -3,7 +3,7 @@
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,
diff --git a/sim/bfin/aclocal.m4 b/sim/bfin/aclocal.m4
index 9a24208b983..91030780de4 100644
--- a/sim/bfin/aclocal.m4
+++ b/sim/bfin/aclocal.m4
@@ -19,7 +19,7 @@
#
# 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, but
diff --git a/sim/bfin/linux-fixed-code.s b/sim/bfin/linux-fixed-code.s
index 060f56f986c..db8c6cad4e5 100644
--- a/sim/bfin/linux-fixed-code.s
+++ b/sim/bfin/linux-fixed-code.s
@@ -7,7 +7,7 @@
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,
diff --git a/sim/erc32/erc32.c b/sim/erc32/erc32.c
index 83dc51f162b..b8e0e603a98 100644
--- a/sim/erc32/erc32.c
+++ b/sim/erc32/erc32.c
@@ -6,7 +6,7 @@
*
* 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 (at your option)
+ * 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
diff --git a/sim/erc32/exec.c b/sim/erc32/exec.c
index 78906ab110f..14791198424 100644
--- a/sim/erc32/exec.c
+++ b/sim/erc32/exec.c
@@ -6,7 +6,7 @@
*
* 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 (at your option)
+ * 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
diff --git a/sim/erc32/float.c b/sim/erc32/float.c
index 074ceb97a7d..15ba7543284 100644
--- a/sim/erc32/float.c
+++ b/sim/erc32/float.c
@@ -6,7 +6,7 @@
*
* 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 (at your option)
+ * 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
diff --git a/sim/erc32/func.c b/sim/erc32/func.c
index 88751ea08b4..54d2557c659 100644
--- a/sim/erc32/func.c
+++ b/sim/erc32/func.c
@@ -6,7 +6,7 @@
*
* 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 (at your option)
+ * 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
diff --git a/sim/erc32/interf.c b/sim/erc32/interf.c
index ee4053d2b05..f448cfa1dc3 100644
--- a/sim/erc32/interf.c
+++ b/sim/erc32/interf.c
@@ -6,7 +6,7 @@
*
* 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 (at your option)
+ * 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
diff --git a/sim/erc32/sis.c b/sim/erc32/sis.c
index 2354df919f3..0696fb921a1 100644
--- a/sim/erc32/sis.c
+++ b/sim/erc32/sis.c
@@ -6,7 +6,7 @@
*
* 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 (at your option)
+ * 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
diff --git a/sim/erc32/sis.h b/sim/erc32/sis.h
index 606f45008a7..dbc5028736c 100644
--- a/sim/erc32/sis.h
+++ b/sim/erc32/sis.h
@@ -6,7 +6,7 @@
*
* 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 (at your option)
+ * 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
diff --git a/sim/lm32/mloop.in b/sim/lm32/mloop.in
index 859c6a8758a..8707576e567 100644
--- a/sim/lm32/mloop.in
+++ b/sim/lm32/mloop.in
@@ -5,7 +5,7 @@
#
# 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)
+# the Free Software Foundation; either version 3, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
diff --git a/sim/microblaze/interp.c b/sim/microblaze/interp.c
index 8e838dbb59c..bdeeb27aa8c 100644
--- a/sim/microblaze/interp.c
+++ b/sim/microblaze/interp.c
@@ -5,7 +5,7 @@
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,
diff --git a/sim/mips/m16run.c b/sim/mips/m16run.c
index 8a5d6070cba..e55bb78912e 100644
--- a/sim/mips/m16run.c
+++ b/sim/mips/m16run.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/mips/sim-main.c b/sim/mips/sim-main.c
index edee498bc94..8aa4f28eb08 100644
--- a/sim/mips/sim-main.c
+++ b/sim/mips/sim-main.c
@@ -2,7 +2,7 @@
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,
diff --git a/sim/moxie/moxie-gdb.dts b/sim/moxie/moxie-gdb.dts
index 56e0369b597..eb3efd1775d 100644
--- a/sim/moxie/moxie-gdb.dts
+++ b/sim/moxie/moxie-gdb.dts
@@ -7,7 +7,7 @@
*
* 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
+ * published by 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,
diff --git a/sim/ppc/COPYING b/sim/ppc/COPYING
index 60549be514a..60ab06edf29 100644
--- a/sim/ppc/COPYING
+++ b/sim/ppc/COPYING
@@ -295,7 +295,7 @@ the "copyright" line and a pointer to where the full notice is found.
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,
diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in
index 71c65cf8265..cd44e395b7e 100644
--- a/sim/ppc/Makefile.in
+++ b/sim/ppc/Makefile.in
@@ -5,7 +5,7 @@
#
# 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,
diff --git a/sim/ppc/README b/sim/ppc/README
index ff3fbd2b349..bcbe939d2bc 100644
--- a/sim/ppc/README
+++ b/sim/ppc/README
@@ -7,7 +7,7 @@
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,
@@ -26,7 +26,7 @@
PSIM is a program written in extended ANSI-C that implements an
instruction level simulation of the PowerPC environment. It is freely
available in source code form under the terms of the GNU General
-Public License (version 2 or later).
+Public License (version 3 or later).
The PowerPC Architecture is described as having three levels of
compliance:
diff --git a/sim/ppc/basics.h b/sim/ppc/basics.h
index 1520023178c..41e005e9662 100644
--- a/sim/ppc/basics.h
+++ b/sim/ppc/basics.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/bits.c b/sim/ppc/bits.c
index 4a3d9c6f6b4..ecbf7a64dda 100644
--- a/sim/ppc/bits.c
+++ b/sim/ppc/bits.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/bits.h b/sim/ppc/bits.h
index 35e4322b818..fc1e7f6e6b1 100644
--- a/sim/ppc/bits.h
+++ b/sim/ppc/bits.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/cap.c b/sim/ppc/cap.c
index 281429deedb..3b578d2b03b 100644
--- a/sim/ppc/cap.c
+++ b/sim/ppc/cap.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/cap.h b/sim/ppc/cap.h
index 6c91752af8d..94ec8f63181 100644
--- a/sim/ppc/cap.h
+++ b/sim/ppc/cap.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/corefile-n.h b/sim/ppc/corefile-n.h
index 0e4cae8fcbc..08d231cc930 100644
--- a/sim/ppc/corefile-n.h
+++ b/sim/ppc/corefile-n.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/corefile.c b/sim/ppc/corefile.c
index 332eefa4fd3..839f520ded1 100644
--- a/sim/ppc/corefile.c
+++ b/sim/ppc/corefile.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/corefile.h b/sim/ppc/corefile.h
index 726470ca3f3..2503fa933e4 100644
--- a/sim/ppc/corefile.h
+++ b/sim/ppc/corefile.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/cpu.c b/sim/ppc/cpu.c
index bce82f1d141..0cc61045c90 100644
--- a/sim/ppc/cpu.c
+++ b/sim/ppc/cpu.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/cpu.h b/sim/ppc/cpu.h
index 840f5815742..870ff7f208b 100644
--- a/sim/ppc/cpu.h
+++ b/sim/ppc/cpu.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/dc-complex b/sim/ppc/dc-complex
index 34a58615dcb..0577183c8c4 100644
--- a/sim/ppc/dc-complex
+++ b/sim/ppc/dc-complex
@@ -5,7 +5,7 @@
#
# 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,
diff --git a/sim/ppc/dc-simple b/sim/ppc/dc-simple
index 9ea823e66c0..661fceeb8ab 100644
--- a/sim/ppc/dc-simple
+++ b/sim/ppc/dc-simple
@@ -5,7 +5,7 @@
#
# 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,
diff --git a/sim/ppc/dc-stupid b/sim/ppc/dc-stupid
index 4238bdb9c09..0cf30cd70a8 100644
--- a/sim/ppc/dc-stupid
+++ b/sim/ppc/dc-stupid
@@ -5,7 +5,7 @@
#
# 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,
diff --git a/sim/ppc/dc-test.01 b/sim/ppc/dc-test.01
index df8c175cc0d..5a4cf3a850e 100644
--- a/sim/ppc/dc-test.01
+++ b/sim/ppc/dc-test.01
@@ -5,7 +5,7 @@
#
# 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,
diff --git a/sim/ppc/dc-test.02 b/sim/ppc/dc-test.02
index a98d0a78e2c..91fe44fe6da 100644
--- a/sim/ppc/dc-test.02
+++ b/sim/ppc/dc-test.02
@@ -5,7 +5,7 @@
#
# 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,
diff --git a/sim/ppc/debug.c b/sim/ppc/debug.c
index 79dd47b6ef3..b454b0db07b 100644
--- a/sim/ppc/debug.c
+++ b/sim/ppc/debug.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/debug.h b/sim/ppc/debug.h
index e49b7950c8e..59a8a5d2181 100644
--- a/sim/ppc/debug.h
+++ b/sim/ppc/debug.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/device.c b/sim/ppc/device.c
index 14b10ce32c9..2c022234cc1 100644
--- a/sim/ppc/device.c
+++ b/sim/ppc/device.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/device.h b/sim/ppc/device.h
index d7117916d4a..6725380fc60 100644
--- a/sim/ppc/device.h
+++ b/sim/ppc/device.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/device_table.c b/sim/ppc/device_table.c
index 09772aba6b4..6ecf04cbf92 100644
--- a/sim/ppc/device_table.c
+++ b/sim/ppc/device_table.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/device_table.h b/sim/ppc/device_table.h
index af6c28d697d..0d29774a5b0 100644
--- a/sim/ppc/device_table.h
+++ b/sim/ppc/device_table.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/dgen.c b/sim/ppc/dgen.c
index 98f9eb0d233..17f966249ea 100644
--- a/sim/ppc/dgen.c
+++ b/sim/ppc/dgen.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/double.c b/sim/ppc/double.c
index 85943010883..27d659399d7 100644
--- a/sim/ppc/double.c
+++ b/sim/ppc/double.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/emul_bugapi.c b/sim/ppc/emul_bugapi.c
index 7141b35f2ea..e099cf400bd 100644
--- a/sim/ppc/emul_bugapi.c
+++ b/sim/ppc/emul_bugapi.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/emul_bugapi.h b/sim/ppc/emul_bugapi.h
index fd3e3838fbd..20c0fd48a8e 100644
--- a/sim/ppc/emul_bugapi.h
+++ b/sim/ppc/emul_bugapi.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/emul_chirp.c b/sim/ppc/emul_chirp.c
index 976f766aa36..ce19d19c6db 100644
--- a/sim/ppc/emul_chirp.c
+++ b/sim/ppc/emul_chirp.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/emul_chirp.h b/sim/ppc/emul_chirp.h
index 2265f5c3ee4..2a06d19e6b6 100644
--- a/sim/ppc/emul_chirp.h
+++ b/sim/ppc/emul_chirp.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/emul_generic.c b/sim/ppc/emul_generic.c
index 1d431750dda..3a72d997533 100644
--- a/sim/ppc/emul_generic.c
+++ b/sim/ppc/emul_generic.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/emul_generic.h b/sim/ppc/emul_generic.h
index a86026e9b9d..879e1330180 100644
--- a/sim/ppc/emul_generic.h
+++ b/sim/ppc/emul_generic.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/emul_netbsd.c b/sim/ppc/emul_netbsd.c
index 1a8987f3318..e539a22bdad 100644
--- a/sim/ppc/emul_netbsd.c
+++ b/sim/ppc/emul_netbsd.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/emul_netbsd.h b/sim/ppc/emul_netbsd.h
index f9a3e85e8be..9c808630661 100644
--- a/sim/ppc/emul_netbsd.h
+++ b/sim/ppc/emul_netbsd.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/emul_unix.c b/sim/ppc/emul_unix.c
index e66d23f0114..8c270031be7 100644
--- a/sim/ppc/emul_unix.c
+++ b/sim/ppc/emul_unix.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/emul_unix.h b/sim/ppc/emul_unix.h
index 6695cc7aa81..65c6125502e 100644
--- a/sim/ppc/emul_unix.h
+++ b/sim/ppc/emul_unix.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/events.c b/sim/ppc/events.c
index a2a157263b2..2b628ae85ce 100644
--- a/sim/ppc/events.c
+++ b/sim/ppc/events.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/events.h b/sim/ppc/events.h
index be7be50cfcb..222fcdc1a23 100644
--- a/sim/ppc/events.h
+++ b/sim/ppc/events.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/filter.c b/sim/ppc/filter.c
index a1597757cd7..69eda2bd882 100644
--- a/sim/ppc/filter.c
+++ b/sim/ppc/filter.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/filter.h b/sim/ppc/filter.h
index 814f704f8d2..27a3f89bf28 100644
--- a/sim/ppc/filter.h
+++ b/sim/ppc/filter.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/filter_filename.c b/sim/ppc/filter_filename.c
index 6d62d7a35ae..fd99cc2fb1f 100644
--- a/sim/ppc/filter_filename.c
+++ b/sim/ppc/filter_filename.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/filter_filename.h b/sim/ppc/filter_filename.h
index a60b4f2d7dc..229df08c127 100644
--- a/sim/ppc/filter_filename.h
+++ b/sim/ppc/filter_filename.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/gen-icache.c b/sim/ppc/gen-icache.c
index 8665ec8eacb..9baf12f5a83 100644
--- a/sim/ppc/gen-icache.c
+++ b/sim/ppc/gen-icache.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/gen-icache.h b/sim/ppc/gen-icache.h
index 7d9e0e16c01..c004fe5c096 100644
--- a/sim/ppc/gen-icache.h
+++ b/sim/ppc/gen-icache.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/gen-idecode.c b/sim/ppc/gen-idecode.c
index 8c29cc456a6..81f58bcb569 100644
--- a/sim/ppc/gen-idecode.c
+++ b/sim/ppc/gen-idecode.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/gen-idecode.h b/sim/ppc/gen-idecode.h
index f46376bf9ed..02cb61caf06 100644
--- a/sim/ppc/gen-idecode.h
+++ b/sim/ppc/gen-idecode.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/gen-itable.c b/sim/ppc/gen-itable.c
index 4897b98774c..19148f9675e 100644
--- a/sim/ppc/gen-itable.c
+++ b/sim/ppc/gen-itable.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/gen-itable.h b/sim/ppc/gen-itable.h
index 341dc678547..37fbe82864c 100644
--- a/sim/ppc/gen-itable.h
+++ b/sim/ppc/gen-itable.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/gen-model.c b/sim/ppc/gen-model.c
index b4614312d69..49a6d95f810 100644
--- a/sim/ppc/gen-model.c
+++ b/sim/ppc/gen-model.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/gen-model.h b/sim/ppc/gen-model.h
index b465a75abf8..2d03bc50285 100644
--- a/sim/ppc/gen-model.h
+++ b/sim/ppc/gen-model.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/gen-semantics.c b/sim/ppc/gen-semantics.c
index 68682dcaac6..2d71e36e52f 100644
--- a/sim/ppc/gen-semantics.c
+++ b/sim/ppc/gen-semantics.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/gen-semantics.h b/sim/ppc/gen-semantics.h
index 2c25715f7c7..951462e219c 100644
--- a/sim/ppc/gen-semantics.h
+++ b/sim/ppc/gen-semantics.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/gen-support.c b/sim/ppc/gen-support.c
index ed02d7dc75a..2b14299ecb7 100644
--- a/sim/ppc/gen-support.c
+++ b/sim/ppc/gen-support.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/gen-support.h b/sim/ppc/gen-support.h
index 70862d76881..831ea1a514a 100644
--- a/sim/ppc/gen-support.h
+++ b/sim/ppc/gen-support.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/hw_com.c b/sim/ppc/hw_com.c
index ff8afe73482..cc8fa537031 100644
--- a/sim/ppc/hw_com.c
+++ b/sim/ppc/hw_com.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/hw_core.c b/sim/ppc/hw_core.c
index 1a439576bd9..cd357b7a6f1 100644
--- a/sim/ppc/hw_core.c
+++ b/sim/ppc/hw_core.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/hw_cpu.c b/sim/ppc/hw_cpu.c
index 117a4c256f2..bf37dfe01f1 100644
--- a/sim/ppc/hw_cpu.c
+++ b/sim/ppc/hw_cpu.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/hw_cpu.h b/sim/ppc/hw_cpu.h
index 11d0298ee12..50e3d88bf47 100644
--- a/sim/ppc/hw_cpu.h
+++ b/sim/ppc/hw_cpu.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/hw_disk.c b/sim/ppc/hw_disk.c
index 041ed383045..55d13374670 100644
--- a/sim/ppc/hw_disk.c
+++ b/sim/ppc/hw_disk.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/hw_eeprom.c b/sim/ppc/hw_eeprom.c
index 069103b5ff8..c8ad1806a19 100644
--- a/sim/ppc/hw_eeprom.c
+++ b/sim/ppc/hw_eeprom.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/hw_glue.c b/sim/ppc/hw_glue.c
index d7ad9290361..31df5ae87eb 100644
--- a/sim/ppc/hw_glue.c
+++ b/sim/ppc/hw_glue.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/hw_htab.c b/sim/ppc/hw_htab.c
index 5234f0f2c63..1fd9ed0d538 100644
--- a/sim/ppc/hw_htab.c
+++ b/sim/ppc/hw_htab.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/hw_ide.c b/sim/ppc/hw_ide.c
index 00d54b32e1e..5db4e166ef2 100644
--- a/sim/ppc/hw_ide.c
+++ b/sim/ppc/hw_ide.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/hw_init.c b/sim/ppc/hw_init.c
index 04467748816..4f22680ca86 100644
--- a/sim/ppc/hw_init.c
+++ b/sim/ppc/hw_init.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/hw_iobus.c b/sim/ppc/hw_iobus.c
index 3cd138c1c80..e76d3d5c2cc 100644
--- a/sim/ppc/hw_iobus.c
+++ b/sim/ppc/hw_iobus.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/hw_memory.c b/sim/ppc/hw_memory.c
index f27f6c8528b..3149dca909e 100644
--- a/sim/ppc/hw_memory.c
+++ b/sim/ppc/hw_memory.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/hw_nvram.c b/sim/ppc/hw_nvram.c
index 32308f754a0..86667165d53 100644
--- a/sim/ppc/hw_nvram.c
+++ b/sim/ppc/hw_nvram.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/hw_opic.c b/sim/ppc/hw_opic.c
index c314347e5a5..d103dc18f47 100644
--- a/sim/ppc/hw_opic.c
+++ b/sim/ppc/hw_opic.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/hw_pal.c b/sim/ppc/hw_pal.c
index a4256b94f3a..e0f28025e40 100644
--- a/sim/ppc/hw_pal.c
+++ b/sim/ppc/hw_pal.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/hw_phb.c b/sim/ppc/hw_phb.c
index 0071f59faf3..c2e95222749 100644
--- a/sim/ppc/hw_phb.c
+++ b/sim/ppc/hw_phb.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/hw_phb.h b/sim/ppc/hw_phb.h
index 030fe0a8194..5114bae628f 100644
--- a/sim/ppc/hw_phb.h
+++ b/sim/ppc/hw_phb.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/hw_register.c b/sim/ppc/hw_register.c
index 1fa01e0c6c3..edf2f82f6c3 100644
--- a/sim/ppc/hw_register.c
+++ b/sim/ppc/hw_register.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/hw_sem.c b/sim/ppc/hw_sem.c
index a7d618b31b8..c8ffd11f424 100644
--- a/sim/ppc/hw_sem.c
+++ b/sim/ppc/hw_sem.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/hw_shm.c b/sim/ppc/hw_shm.c
index 01a4a9a9839..7d9e3d29d58 100644
--- a/sim/ppc/hw_shm.c
+++ b/sim/ppc/hw_shm.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/hw_trace.c b/sim/ppc/hw_trace.c
index 38a7fdf823b..a2ac737636a 100644
--- a/sim/ppc/hw_trace.c
+++ b/sim/ppc/hw_trace.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/hw_vm.c b/sim/ppc/hw_vm.c
index 10987e09c5a..6fd3a263001 100644
--- a/sim/ppc/hw_vm.c
+++ b/sim/ppc/hw_vm.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/idecode_branch.h b/sim/ppc/idecode_branch.h
index ecae98eb8e7..0db507674b5 100644
--- a/sim/ppc/idecode_branch.h
+++ b/sim/ppc/idecode_branch.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/idecode_expression.h b/sim/ppc/idecode_expression.h
index 936583ce9db..8713d0e2537 100644
--- a/sim/ppc/idecode_expression.h
+++ b/sim/ppc/idecode_expression.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/idecode_fields.h b/sim/ppc/idecode_fields.h
index 1c449bc9769..2421daaec16 100644
--- a/sim/ppc/idecode_fields.h
+++ b/sim/ppc/idecode_fields.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/igen.c b/sim/ppc/igen.c
index 4ac6708c3ec..05ecbaa50ee 100644
--- a/sim/ppc/igen.c
+++ b/sim/ppc/igen.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/igen.h b/sim/ppc/igen.h
index d3462098905..e8675907d98 100644
--- a/sim/ppc/igen.h
+++ b/sim/ppc/igen.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/inline.c b/sim/ppc/inline.c
index 43595a53424..82a2509d5f8 100644
--- a/sim/ppc/inline.c
+++ b/sim/ppc/inline.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/inline.h b/sim/ppc/inline.h
index 6ff94153c25..94ef72fdf64 100644
--- a/sim/ppc/inline.h
+++ b/sim/ppc/inline.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/interrupts.c b/sim/ppc/interrupts.c
index dafb2b33144..ac34fbdd1f6 100644
--- a/sim/ppc/interrupts.c
+++ b/sim/ppc/interrupts.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/interrupts.h b/sim/ppc/interrupts.h
index 93447a874d7..982bc6d1a2b 100644
--- a/sim/ppc/interrupts.h
+++ b/sim/ppc/interrupts.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/ld-cache.c b/sim/ppc/ld-cache.c
index ef16c675437..ba4ac44351d 100644
--- a/sim/ppc/ld-cache.c
+++ b/sim/ppc/ld-cache.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/ld-cache.h b/sim/ppc/ld-cache.h
index a3fd0a49b45..160183cf7f2 100644
--- a/sim/ppc/ld-cache.h
+++ b/sim/ppc/ld-cache.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/ld-decode.c b/sim/ppc/ld-decode.c
index 3964960af26..c3ce5dbd413 100644
--- a/sim/ppc/ld-decode.c
+++ b/sim/ppc/ld-decode.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/ld-decode.h b/sim/ppc/ld-decode.h
index de23181ba37..7f787516104 100644
--- a/sim/ppc/ld-decode.h
+++ b/sim/ppc/ld-decode.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/ld-insn.c b/sim/ppc/ld-insn.c
index e3b1ba579c7..19c3ba08467 100644
--- a/sim/ppc/ld-insn.c
+++ b/sim/ppc/ld-insn.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/ld-insn.h b/sim/ppc/ld-insn.h
index 4e1b7f76d19..e78ce2f9aa6 100644
--- a/sim/ppc/ld-insn.h
+++ b/sim/ppc/ld-insn.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/lf.c b/sim/ppc/lf.c
index e47dfda5da2..3f4876fdde5 100644
--- a/sim/ppc/lf.c
+++ b/sim/ppc/lf.c
@@ -4,7 +4,7 @@
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,
@@ -280,7 +280,7 @@ lf_print__gnu_copyleft(lf *file)
\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\
diff --git a/sim/ppc/lf.h b/sim/ppc/lf.h
index 7bf6d1cafff..742ddb2ca94 100644
--- a/sim/ppc/lf.h
+++ b/sim/ppc/lf.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/main.c b/sim/ppc/main.c
index 7cb50368a91..f6ce8efb49d 100644
--- a/sim/ppc/main.c
+++ b/sim/ppc/main.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/misc.c b/sim/ppc/misc.c
index 23e981a1847..f3903d9bddf 100644
--- a/sim/ppc/misc.c
+++ b/sim/ppc/misc.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/misc.h b/sim/ppc/misc.h
index d09d5fecfda..f7a23bd270b 100644
--- a/sim/ppc/misc.h
+++ b/sim/ppc/misc.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/mon.c b/sim/ppc/mon.c
index 2bdaf474158..015226c835b 100644
--- a/sim/ppc/mon.c
+++ b/sim/ppc/mon.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/mon.h b/sim/ppc/mon.h
index ab64b8e13c4..1f645b093c5 100644
--- a/sim/ppc/mon.h
+++ b/sim/ppc/mon.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/options.c b/sim/ppc/options.c
index d7079eb3e7a..9e3c07dbbf7 100644
--- a/sim/ppc/options.c
+++ b/sim/ppc/options.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/options.h b/sim/ppc/options.h
index 5adb9ebcf1b..281e3d0c810 100644
--- a/sim/ppc/options.h
+++ b/sim/ppc/options.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/os_emul.c b/sim/ppc/os_emul.c
index dc60c8f6641..6353342fc77 100644
--- a/sim/ppc/os_emul.c
+++ b/sim/ppc/os_emul.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/os_emul.h b/sim/ppc/os_emul.h
index 6d74e9c6f93..091a1cedbf3 100644
--- a/sim/ppc/os_emul.h
+++ b/sim/ppc/os_emul.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/pk_disklabel.c b/sim/ppc/pk_disklabel.c
index 0a9d32a66c5..1f8b13e41f6 100644
--- a/sim/ppc/pk_disklabel.c
+++ b/sim/ppc/pk_disklabel.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/ppc-instructions b/sim/ppc/ppc-instructions
index 86c5157f0c9..e274eca64a8 100644
--- a/sim/ppc/ppc-instructions
+++ b/sim/ppc/ppc-instructions
@@ -21,7 +21,7 @@
#
# 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,
diff --git a/sim/ppc/ppc-spr-table b/sim/ppc/ppc-spr-table
index e224df97f40..3a3d6fefd7d 100644
--- a/sim/ppc/ppc-spr-table
+++ b/sim/ppc/ppc-spr-table
@@ -5,7 +5,7 @@
#
# 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,
diff --git a/sim/ppc/psim.c b/sim/ppc/psim.c
index 7378b9b2a02..66f05964a8a 100644
--- a/sim/ppc/psim.c
+++ b/sim/ppc/psim.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/psim.h b/sim/ppc/psim.h
index 607e5a227e6..878b8f42a47 100644
--- a/sim/ppc/psim.h
+++ b/sim/ppc/psim.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/psim.texinfo b/sim/ppc/psim.texinfo
index 6a7b4f12593..538dd8f390b 100644
--- a/sim/ppc/psim.texinfo
+++ b/sim/ppc/psim.texinfo
@@ -780,7 +780,7 @@ into another language, under the above conditions for modified versions.
PSIM is a program written in extended ANSI-C that implements an
instruction level simulation of the PowerPC environment. It is freely
available in source code form under the terms of the GNU General
-Public License (version 2 or later).
+Public License (version 3 or later).
The PowerPC Architecture is described as having three levels of
compliance:
diff --git a/sim/ppc/registers.c b/sim/ppc/registers.c
index 832360103f7..57933b659d4 100644
--- a/sim/ppc/registers.c
+++ b/sim/ppc/registers.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/registers.h b/sim/ppc/registers.h
index 15c9d43c9d6..5481a120308 100644
--- a/sim/ppc/registers.h
+++ b/sim/ppc/registers.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/sim-endian-n.h b/sim/ppc/sim-endian-n.h
index 9e7d4b9e767..2dc74f029af 100644
--- a/sim/ppc/sim-endian-n.h
+++ b/sim/ppc/sim-endian-n.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/sim-endian.c b/sim/ppc/sim-endian.c
index 9fe36692fd0..32b030dc9b7 100644
--- a/sim/ppc/sim-endian.c
+++ b/sim/ppc/sim-endian.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/sim-endian.h b/sim/ppc/sim-endian.h
index ff33d238fd1..f95e27c1ca6 100644
--- a/sim/ppc/sim-endian.h
+++ b/sim/ppc/sim-endian.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/sim_callbacks.h b/sim/ppc/sim_callbacks.h
index 6f3473d659f..a28955f3384 100644
--- a/sim/ppc/sim_callbacks.h
+++ b/sim/ppc/sim_callbacks.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/sim_calls.c b/sim/ppc/sim_calls.c
index 66d7f036d7f..23d46dc0c88 100644
--- a/sim/ppc/sim_calls.c
+++ b/sim/ppc/sim_calls.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/std-config.h b/sim/ppc/std-config.h
index a153c987b83..0f11f24bf33 100644
--- a/sim/ppc/std-config.h
+++ b/sim/ppc/std-config.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/table.c b/sim/ppc/table.c
index 75bc6799e9e..71f3a6cec57 100644
--- a/sim/ppc/table.c
+++ b/sim/ppc/table.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/table.h b/sim/ppc/table.h
index 863c9258560..a11d58a144d 100644
--- a/sim/ppc/table.h
+++ b/sim/ppc/table.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/tree.c b/sim/ppc/tree.c
index 4b14323d5ed..2e62df05b77 100644
--- a/sim/ppc/tree.c
+++ b/sim/ppc/tree.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/tree.h b/sim/ppc/tree.h
index 2ed7fd0bbf5..a95d12a426e 100644
--- a/sim/ppc/tree.h
+++ b/sim/ppc/tree.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/vm.c b/sim/ppc/vm.c
index cfbdda54265..ceccaac8301 100644
--- a/sim/ppc/vm.c
+++ b/sim/ppc/vm.c
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/vm.h b/sim/ppc/vm.h
index b8c4c8c234b..1d7be530191 100644
--- a/sim/ppc/vm.h
+++ b/sim/ppc/vm.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/vm_n.h b/sim/ppc/vm_n.h
index 9222ffa2cc0..b12840cdb32 100644
--- a/sim/ppc/vm_n.h
+++ b/sim/ppc/vm_n.h
@@ -4,7 +4,7 @@
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,
diff --git a/sim/ppc/words.h b/sim/ppc/words.h
index a3de1aa6220..39410d9e6a6 100644
--- a/sim/ppc/words.h
+++ b/sim/ppc/words.h
@@ -4,7 +4,7 @@
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License
- as published by the Free Software Foundation; either version 2 of
+ as published by the Free Software Foundation; either version 3 of
the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful, but
diff --git a/sim/rl78/Makefile.in b/sim/rl78/Makefile.in
index 70c767b176e..1bad3d9c205 100644
--- a/sim/rl78/Makefile.in
+++ b/sim/rl78/Makefile.in
@@ -7,7 +7,7 @@
###
### The GNU simulators are free software; you can redistribute them and/or
### modify them under the terms of the GNU General Public License as
-### published by the Free Software Foundation; either version 2 of the
+### published by the Free Software Foundation; either version 3 of the
### License, or (at your option) any later version.
###
### The GNU simulators are distributed in the hope that they will be
diff --git a/sim/rx/Makefile.in b/sim/rx/Makefile.in
index ad268071645..689e646c11f 100644
--- a/sim/rx/Makefile.in
+++ b/sim/rx/Makefile.in
@@ -7,7 +7,7 @@
###
### The GNU simulators are free software; you can redistribute them and/or
### modify them under the terms of the GNU General Public License as
-### published by the Free Software Foundation; either version 2 of the
+### published by the Free Software Foundation; either version 3 of the
### License, or (at your option) any later version.
###
### The GNU simulators are distributed in the hope that they will be
diff --git a/sim/testsuite/sim/mips/mips32-dsp2.s b/sim/testsuite/sim/mips/mips32-dsp2.s
index 9c1078ce54f..a9463a61f26 100644
--- a/sim/testsuite/sim/mips/mips32-dsp2.s
+++ b/sim/testsuite/sim/mips/mips32-dsp2.s
@@ -12,7 +12,7 @@
#
# 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)
+# the Free Software Foundation; either version 3, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,