Update the copyright header of various files...

... to follow the correct syntax (according to the gospel of
gnulib's update-copyright). In other words:
  - no comma after the last year;
  - FSF spelled exactly "Free Software Foundation, Inc.", with
    the comma and the period at the end.

sim/common/ChangeLog:

	* dv-sockser.h, sim-assert.h, sim-fpu.c: Reformat the copyright
	header.

sim/m32c/ChangeLog:

	* blinky.S, gloss.S, sample.S: Reformat copyright header.

sim/mn10300/ChangeLog:

	* sim-main.h: Reformat copyright header.

sim/ppc/ChangeLog:

	* dp-bit.c: Reformat copyright header.

gdb/ChangeLog:

        * gdb/common/gdb_thread_db.h, gdb/dbxread.c, gdb/environ.c,
        gdb/gcore.h, gdb/rs6000-tdep.h, gdb/s390-nat.c, gdb/tic6x-tdep.c:
        Reformat the copyright header.

gdb/gdbserver/ChangeLog:

	* terminal.h: Reformat copyright header.

gdb/testsuite/ChangeLog:

	* dg-extract-results.sh, gdb.arch/gcore.c, gdb.arch/gdb1558.c,
	gdb.arch/i386-gnu-cfi.c, gdb.base/complex.c, gdb.base/cvexpr.c,
	gdb.base/gcore.c, gdb.base/gdb1555-main.c, gdb.base/gdb1555.c,
	gdb.base/gdb1821.c, gdb.base/long_long.c, gdb.base/restore.c,
	gdb.base/sepdebug.c, gdb.base/type-opaque-lib.c,
	gdb.base/type-opaque-main.c, gdb.cp/maint.exp, gdb.cp/namespace1.cc,
	gdb.cp/pr9631.cc, gdb.cp/psmang1.cc, gdb.cp/psmang2.cc,
	gdb.cp/try_catch.cc, gdb.cp/virtfunc.cc, gdb.hp/gdb.base-hp/reg.exp,
	gdb.mi/basics.c, gdb.mi/mi-stack.c, gdb.mi/mi-var-child.c,
	gdb.mi/mi2-var-child.exp, gdb.mi/var-cmd.c,
	gdb.threads/thread_check.c: Reformat copyright header.

52 files changed, 88 insertions, 55 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0882b5fbc28..0095cdece75 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-02  Joel Brobecker  <brobecker@adacore.com>
+
+	* gdb/common/gdb_thread_db.h, gdb/dbxread.c, gdb/environ.c,
+	gdb/gcore.h, gdb/rs6000-tdep.h, gdb/s390-nat.c, gdb/tic6x-tdep.c:
+	Reformat the copyright header.
+
 2012-01-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	Revert this part of:
diff --git a/gdb/common/gdb_thread_db.h b/gdb/common/gdb_thread_db.h
index c770b0c7878..96ac988a3cb 100644
--- a/gdb/common/gdb_thread_db.h
+++ b/gdb/common/gdb_thread_db.h
@@ -15,7 +15,7 @@
 #else
 
 /* Copyright (C) 1999, 2000, 2007, 2008, 2009, 2010, 2011
-Free Software Foundation, Inc.
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/gdb/dbxread.c b/gdb/dbxread.c
index 33c776f7763..2210af2500c 100644
--- a/gdb/dbxread.c
+++ b/gdb/dbxread.c
@@ -1,6 +1,6 @@
 /* Read dbx symbol tables and convert to internal format, for GDB.
    Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
-   1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2008, 2009, 2010, 2011.
+   1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    This file is part of GDB.
diff --git a/gdb/environ.c b/gdb/environ.c
index 62d23e6d4f3..73e278ad7ef 100644
--- a/gdb/environ.c
+++ b/gdb/environ.c
@@ -1,7 +1,7 @@
 /* environ.c -- library for manipulating environments for GNU.
 
-   Copyright (C) 1986, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 2000, 2005
-   2003, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 2000,
+   2003, 2005, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/gdb/gcore.h b/gdb/gcore.h
index fc168d3e2ee..8fa7a7a8e75 100644
--- a/gdb/gcore.h
+++ b/gdb/gcore.h
@@ -1,6 +1,6 @@
 /* Support for reading/writing gcore files.
 
-   Copyright (C) 2009, Free Software Foundation, Inc.
+   Copyright (C) 2009 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index f9b88783050..207c7154cd6 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,5 +1,9 @@
 2012-01-02  Joel Brobecker  <brobecker@adacore.com>
 
+	* terminal.h: Reformat copyright header.
+
+2012-01-02  Joel Brobecker  <brobecker@adacore.com>
+
 	* server.c (gdbserver_version): Update copyright year.
 	* gdbreplay.c (gdbreplay_version): Likewise.
 
diff --git a/gdb/gdbserver/terminal.h b/gdb/gdbserver/terminal.h
index 843f039930c..661f4fe3775 100644
--- a/gdb/gdbserver/terminal.h
+++ b/gdb/gdbserver/terminal.h
@@ -1,5 +1,5 @@
 /* Terminal interface definitions for the GDB remote server.
-   Copyright (C) 2002, Free Software Foundation, Inc.
+   Copyright (C) 2002 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
diff --git a/gdb/rs6000-tdep.h b/gdb/rs6000-tdep.h
index 50924be990b..6205fb53468 100644
--- a/gdb/rs6000-tdep.h
+++ b/gdb/rs6000-tdep.h
@@ -1,6 +1,4 @@
 /* Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
-Free Software Foundation, Inc.
-
    Free Software Foundation, Inc.
 
    This file is part of GDB.
diff --git a/gdb/s390-nat.c b/gdb/s390-nat.c
index d975015a7f7..63816759c7b 100644
--- a/gdb/s390-nat.c
+++ b/gdb/s390-nat.c
@@ -1,6 +1,6 @@
 /* S390 native-dependent code for GDB, the GNU debugger.
    Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007, 2009
-   Free Software Foundation, Inc
+   Free Software Foundation, Inc.
 
    Contributed by D.J. Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com)
    for IBM Deutschland Entwicklung GmbH, IBM Corporation.
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 91b9487a63c..751aa66d8ab 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,17 @@
+2012-01-02  Joel Brobecker  <brobecker@adacore.com>
+
+	* dg-extract-results.sh, gdb.arch/gcore.c, gdb.arch/gdb1558.c,
+	gdb.arch/i386-gnu-cfi.c, gdb.base/complex.c, gdb.base/cvexpr.c,
+	gdb.base/gcore.c, gdb.base/gdb1555-main.c, gdb.base/gdb1555.c,
+	gdb.base/gdb1821.c, gdb.base/long_long.c, gdb.base/restore.c,
+	gdb.base/sepdebug.c, gdb.base/type-opaque-lib.c,
+	gdb.base/type-opaque-main.c, gdb.cp/maint.exp, gdb.cp/namespace1.cc,
+	gdb.cp/pr9631.cc, gdb.cp/psmang1.cc, gdb.cp/psmang2.cc,
+	gdb.cp/try_catch.cc, gdb.cp/virtfunc.cc, gdb.hp/gdb.base-hp/reg.exp,
+	gdb.mi/basics.c, gdb.mi/mi-stack.c, gdb.mi/mi-var-child.c,
+	gdb.mi/mi2-var-child.exp, gdb.mi/var-cmd.c,
+	gdb.threads/thread_check.c: Reformat copyright header.
+
 2011-12-30  Edjunior Machado  <emachado@linux.vnet.ibm.com>
 
 	* gdb.python/py-finish-breakpoint.exp: Add `.' prefix for ppc64.
diff --git a/gdb/testsuite/dg-extract-results.sh b/gdb/testsuite/dg-extract-results.sh
index 0ad85cb7aa2..439ce4e4899 100755
--- a/gdb/testsuite/dg-extract-results.sh
+++ b/gdb/testsuite/dg-extract-results.sh
@@ -6,7 +6,7 @@
 # The resulting file can be used with test result comparison scripts for
 # results from tests that were run in parallel.  See usage() below.
 
-# Copyright (C) 2008, 2009, 2010 Free Software Foundation
+# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 # Contributed by Janis Johnson <janis187@us.ibm.com>
 #
 # This file is part of GCC.
diff --git a/gdb/testsuite/gdb.arch/gcore.c b/gdb/testsuite/gdb.arch/gcore.c
index 5011e309dd6..f9abbffb3a4 100644
--- a/gdb/testsuite/gdb.arch/gcore.c
+++ b/gdb/testsuite/gdb.arch/gcore.c
@@ -1,5 +1,5 @@
 /* Copyright 2002, 2004, 2007, 2008, 2009, 2010, 2011
-Free Software Foundation, Inc.
+   Free Software Foundation, Inc.
 
    This file is part of GDB.
 
diff --git a/gdb/testsuite/gdb.arch/gdb1558.c b/gdb/testsuite/gdb.arch/gdb1558.c
index 462fe50699c..1aa1136bce8 100644
--- a/gdb/testsuite/gdb.arch/gdb1558.c
+++ b/gdb/testsuite/gdb.arch/gdb1558.c
@@ -1,5 +1,5 @@
 /* Copyright 2004, 2005, 2007, 2008, 2009, 2010, 2011
-Free Software Foundation, Inc.
+   Free Software Foundation, Inc.
  
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/gdb/testsuite/gdb.arch/i386-gnu-cfi.c b/gdb/testsuite/gdb.arch/i386-gnu-cfi.c
index 645d173124e..546e37c4f72 100644
--- a/gdb/testsuite/gdb.arch/i386-gnu-cfi.c
+++ b/gdb/testsuite/gdb.arch/i386-gnu-cfi.c
@@ -1,6 +1,6 @@
 /* Unwinding of DW_CFA_GNU_negative_offset_extended test program.
 
-   Copyright 2007, Free Software Foundation, Inc.
+   Copyright 2007 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
diff --git a/gdb/testsuite/gdb.base/complex.c b/gdb/testsuite/gdb.base/complex.c
index feeccd04c09..6e8996d829e 100644
--- a/gdb/testsuite/gdb.base/complex.c
+++ b/gdb/testsuite/gdb.base/complex.c
@@ -1,5 +1,5 @@
 /* Copyright 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2011
-Free Software Foundation, Inc.
+   Free Software Foundation, Inc.
 
    This file is part of GDB.
 
diff --git a/gdb/testsuite/gdb.base/cvexpr.c b/gdb/testsuite/gdb.base/cvexpr.c
index e1110f31741..c68044d2a43 100644
--- a/gdb/testsuite/gdb.base/cvexpr.c
+++ b/gdb/testsuite/gdb.base/cvexpr.c
@@ -1,5 +1,5 @@
 /* Copyright (C) 2001, 2004, 2007, 2008, 2009, 2010, 2011
-Free Software Foundation, Inc.
+   Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/gdb/testsuite/gdb.base/gcore.c b/gdb/testsuite/gdb.base/gcore.c
index 5011e309dd6..f9abbffb3a4 100644
--- a/gdb/testsuite/gdb.base/gcore.c
+++ b/gdb/testsuite/gdb.base/gcore.c
@@ -1,5 +1,5 @@
 /* Copyright 2002, 2004, 2007, 2008, 2009, 2010, 2011
-Free Software Foundation, Inc.
+   Free Software Foundation, Inc.
 
    This file is part of GDB.
 
diff --git a/gdb/testsuite/gdb.base/gdb1555-main.c b/gdb/testsuite/gdb.base/gdb1555-main.c
index 6bfd3f71697..4c5fb57f750 100644
--- a/gdb/testsuite/gdb.base/gdb1555-main.c
+++ b/gdb/testsuite/gdb.base/gdb1555-main.c
@@ -1,6 +1,6 @@
 /* Test step/next in a shared library
 
-   Copyright 2004, Free Software Foundation, Inc.
+   Copyright 2004 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
diff --git a/gdb/testsuite/gdb.base/gdb1555.c b/gdb/testsuite/gdb.base/gdb1555.c
index 6e6ec83dace..0905c255704 100644
--- a/gdb/testsuite/gdb.base/gdb1555.c
+++ b/gdb/testsuite/gdb.base/gdb1555.c
@@ -1,6 +1,6 @@
 /* Test step/next in a shared library
 
-   Copyright 2004, Free Software Foundation, Inc.
+   Copyright 2004 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
diff --git a/gdb/testsuite/gdb.base/gdb1821.c b/gdb/testsuite/gdb.base/gdb1821.c
index 8dfdb08496d..7e62ad63e82 100644
--- a/gdb/testsuite/gdb.base/gdb1821.c
+++ b/gdb/testsuite/gdb.base/gdb1821.c
@@ -1,6 +1,6 @@
 /* Test printing of structure member names in gdb. PR exp/1821
 
-   Copyright 2005, Free Software Foundation, Inc.
+   Copyright 2005 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
diff --git a/gdb/testsuite/gdb.base/long_long.c b/gdb/testsuite/gdb.base/long_long.c
index 9b5fa53d567..6d25eb1364f 100644
--- a/gdb/testsuite/gdb.base/long_long.c
+++ b/gdb/testsuite/gdb.base/long_long.c
@@ -1,7 +1,6 @@
 /* This test script is part of GDB, the GNU debugger.
 
-   Copyright 1999, 2004,
-   Free Software Foundation, Inc.
+   Copyright 1999, 2004 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/gdb/testsuite/gdb.base/restore.c b/gdb/testsuite/gdb.base/restore.c
index c9f246c2c6e..eaf79b7fd44 100644
--- a/gdb/testsuite/gdb.base/restore.c
+++ b/gdb/testsuite/gdb.base/restore.c
@@ -1,6 +1,6 @@
 /* This testcase is part of GDB, the GNU debugger.
 
-   Copyright 1998, 1999, 2001, 2003, 2004, Free Software Foundation, Inc.
+   Copyright 1998, 1999, 2001, 2003, 2004 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/gdb/testsuite/gdb.base/sepdebug.c b/gdb/testsuite/gdb.base/sepdebug.c
index 6d2bc96897e..273506c6ed7 100644
--- a/gdb/testsuite/gdb.base/sepdebug.c
+++ b/gdb/testsuite/gdb.base/sepdebug.c
@@ -1,5 +1,5 @@
-/* Copyright 1994, 1995, 1999, 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2011
-Free Software Foundation, Inc.
+/* Copyright 1994, 1995, 1999, 2002, 2003, 2004, 2007, 2008, 2009, 2010,
+   2011 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/gdb/testsuite/gdb.base/type-opaque-lib.c b/gdb/testsuite/gdb.base/type-opaque-lib.c
index fd2187114b1..65a74a883eb 100644
--- a/gdb/testsuite/gdb.base/type-opaque-lib.c
+++ b/gdb/testsuite/gdb.base/type-opaque-lib.c
@@ -1,6 +1,6 @@
 /* Test resolving of an opaque type from the loaded shared library.
 
-   Copyright 2007, Free Software Foundation, Inc.
+   Copyright 2007 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
diff --git a/gdb/testsuite/gdb.base/type-opaque-main.c b/gdb/testsuite/gdb.base/type-opaque-main.c
index 77caa366f34..405bdca198a 100644
--- a/gdb/testsuite/gdb.base/type-opaque-main.c
+++ b/gdb/testsuite/gdb.base/type-opaque-main.c
@@ -1,6 +1,6 @@
 /* Test resolving of an opaque type from the loaded shared library.
 
-   Copyright 2007, Free Software Foundation, Inc.
+   Copyright 2007 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
diff --git a/gdb/testsuite/gdb.cp/maint.exp b/gdb/testsuite/gdb.cp/maint.exp
index 41c12a6b0ab..543501c0d5a 100644
--- a/gdb/testsuite/gdb.cp/maint.exp
+++ b/gdb/testsuite/gdb.cp/maint.exp
@@ -1,4 +1,4 @@
-# Copyright 2003, 2004, 2006, 2011 Free Software Foundation Inc.
+# Copyright 2003, 2004, 2006, 2011 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/gdb/testsuite/gdb.cp/namespace1.cc b/gdb/testsuite/gdb.cp/namespace1.cc
index d646c94e70f..71ed7874fcb 100644
--- a/gdb/testsuite/gdb.cp/namespace1.cc
+++ b/gdb/testsuite/gdb.cp/namespace1.cc
@@ -1,5 +1,5 @@
 /* Copyright 2003, 2004, 2007, 2008, 2009, 2010, 2011
-Free Software Foundation, Inc.
+   Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/gdb/testsuite/gdb.cp/pr9631.cc b/gdb/testsuite/gdb.cp/pr9631.cc
index eb9233e52a3..2ce174de22c 100644
--- a/gdb/testsuite/gdb.cp/pr9631.cc
+++ b/gdb/testsuite/gdb.cp/pr9631.cc
@@ -1,7 +1,6 @@
 /* This test script is part of GDB, the GNU debugger.
 
-   Copyright 2009,
-   Free Software Foundation, Inc.
+   Copyright 2009 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/gdb/testsuite/gdb.cp/psmang1.cc b/gdb/testsuite/gdb.cp/psmang1.cc
index f87c0540ab0..6663cc48cff 100644
--- a/gdb/testsuite/gdb.cp/psmang1.cc
+++ b/gdb/testsuite/gdb.cp/psmang1.cc
@@ -1,7 +1,6 @@
 /* This test script is part of GDB, the GNU debugger.
 
-   Copyright 2002, 2004,
-   Free Software Foundation, Inc.
+   Copyright 2002, 2004 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/gdb/testsuite/gdb.cp/psmang2.cc b/gdb/testsuite/gdb.cp/psmang2.cc
index ded9b6f6745..f9b03130734 100644
--- a/gdb/testsuite/gdb.cp/psmang2.cc
+++ b/gdb/testsuite/gdb.cp/psmang2.cc
@@ -1,7 +1,6 @@
 /* This test script is part of GDB, the GNU debugger.
 
-   Copyright 2002, 2004,
-   Free Software Foundation, Inc.
+   Copyright 2002, 2004 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/gdb/testsuite/gdb.cp/try_catch.cc b/gdb/testsuite/gdb.cp/try_catch.cc
index 863b51e8aaa..b0ff9474f82 100644
--- a/gdb/testsuite/gdb.cp/try_catch.cc
+++ b/gdb/testsuite/gdb.cp/try_catch.cc
@@ -1,7 +1,6 @@
 /* This test script is part of GDB, the GNU debugger.
 
-   Copyright 2002, 2004,
-   Free Software Foundation, Inc.
+   Copyright 2002, 2004 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/gdb/testsuite/gdb.cp/virtfunc.cc b/gdb/testsuite/gdb.cp/virtfunc.cc
index 67330544742..757f6424564 100644
--- a/gdb/testsuite/gdb.cp/virtfunc.cc
+++ b/gdb/testsuite/gdb.cp/virtfunc.cc
@@ -1,6 +1,6 @@
 /* This test script is part of GDB, the GNU debugger.
 
-   Copyright 1993, 1994, 1997, 1998, 1999, 2003, 2004,
+   Copyright 1993, 1994, 1997, 1998, 1999, 2003, 2004
    Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/reg.exp b/gdb/testsuite/gdb.hp/gdb.base-hp/reg.exp
index b3a8ebf92db..ac38436efbf 100644
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/reg.exp
+++ b/gdb/testsuite/gdb.hp/gdb.base-hp/reg.exp
@@ -1,7 +1,6 @@
 # This test script is part of GDB, the GNU debugger.
 
-# Copyright 1998, 1999, 2001, 2004,
-# Free Software Foundation, Inc.
+# Copyright 1998, 1999, 2001, 2004 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/gdb/testsuite/gdb.mi/basics.c b/gdb/testsuite/gdb.mi/basics.c
index 55a4c644492..c0bef3578b0 100644
--- a/gdb/testsuite/gdb.mi/basics.c
+++ b/gdb/testsuite/gdb.mi/basics.c
@@ -1,5 +1,5 @@
 /* Copyright 1999, 2000, 2004, 2007, 2008, 2009, 2010, 2011
-Free Software Foundation, Inc.
+   Free Software Foundation, Inc.
 
    This file is part of GDB.
 
diff --git a/gdb/testsuite/gdb.mi/mi-stack.c b/gdb/testsuite/gdb.mi/mi-stack.c
index a636cdc4cc3..7ee1ca79c04 100644
--- a/gdb/testsuite/gdb.mi/mi-stack.c
+++ b/gdb/testsuite/gdb.mi/mi-stack.c
@@ -1,5 +1,5 @@
 /* Copyright 1999, 2000, 2004, 2005, 2007, 2008, 2009, 2010, 2011
-Free Software Foundation, Inc.
+   Free Software Foundation, Inc.
 
    This file is part of GDB.
 
diff --git a/gdb/testsuite/gdb.mi/mi-var-child.c b/gdb/testsuite/gdb.mi/mi-var-child.c
index 0d0ee2f7cc3..649a8e3857e 100644
--- a/gdb/testsuite/gdb.mi/mi-var-child.c
+++ b/gdb/testsuite/gdb.mi/mi-var-child.c
@@ -1,5 +1,5 @@
 /* Copyright 1999, 2004, 2005, 2007, 2008, 2009, 2010, 2011
-Free Software Foundation, Inc.
+   Free Software Foundation, Inc.
 
    This file is part of GDB.
 
diff --git a/gdb/testsuite/gdb.mi/mi2-var-child.exp b/gdb/testsuite/gdb.mi/mi2-var-child.exp
index 0f9b4d46b53..e49bfa7568a 100644
--- a/gdb/testsuite/gdb.mi/mi2-var-child.exp
+++ b/gdb/testsuite/gdb.mi/mi2-var-child.exp
@@ -1,4 +1,5 @@
-# Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2009 Free Software Foundation
+# Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2009 Free Software
+# Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/gdb/testsuite/gdb.mi/var-cmd.c b/gdb/testsuite/gdb.mi/var-cmd.c
index 71c5b9dcd52..4c97380a8e5 100644
--- a/gdb/testsuite/gdb.mi/var-cmd.c
+++ b/gdb/testsuite/gdb.mi/var-cmd.c
@@ -1,5 +1,5 @@
 /* Copyright 1999, 2004, 2007, 2008, 2009, 2010, 2011
-Free Software Foundation, Inc.
+   Free Software Foundation, Inc.
 
    This file is part of GDB.
 
diff --git a/gdb/testsuite/gdb.threads/thread_check.c b/gdb/testsuite/gdb.threads/thread_check.c
index d70fcf559d8..00ad6010cf0 100644
--- a/gdb/testsuite/gdb.threads/thread_check.c
+++ b/gdb/testsuite/gdb.threads/thread_check.c
@@ -1,5 +1,5 @@
 /* Copyright (C) 2004, 2007, 2008, 2009, 2010, 2011
-Free Software Foundation, Inc.
+   Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/gdb/tic6x-tdep.c b/gdb/tic6x-tdep.c
index c7df5bce0ad..35117e59af7 100644
--- a/gdb/tic6x-tdep.c
+++ b/gdb/tic6x-tdep.c
@@ -1,7 +1,6 @@
 /* Target dependent code for GDB on TI C6x systems.
 
-   Copyright (C) 2010, 2011.
-   Free Software Foundation, Inc.
+   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
    Contributed by Andrew Jenner <andrew@codesourcery.com>
    Contributed by Yao Qi <yao@codesourcery.com>
 
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index b2b8b639f9b..e2259e9f8d1 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-02  Joel Brobecker  <brobecker@adacore.com>
+
+	* dv-sockser.h, sim-assert.h, sim-fpu.c: Reformat the copyright
+	header.
+
 2011-12-19  Joel Brobecker  <brobecker@adacore.com>
 
 	* Make-common.in (hw-config.h): Work around bug in Solaris 2.8
diff --git a/sim/common/dv-sockser.h b/sim/common/dv-sockser.h
index 0ad071a7b4c..bfa8406701c 100644
--- a/sim/common/dv-sockser.h
+++ b/sim/common/dv-sockser.h
@@ -1,5 +1,5 @@
 /* Serial port emulation via sockets.
-   Copyright (C) 1998, Free Software Foundation, Inc.
+   Copyright (C) 1998 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
diff --git a/sim/common/sim-assert.h b/sim/common/sim-assert.h
index 871a68e570d..04aff2c1abf 100644
--- a/sim/common/sim-assert.h
+++ b/sim/common/sim-assert.h
@@ -1,6 +1,6 @@
 /*  This file is part of the program GDB.
 
-    Copyright (C) 1997, Free Software Foundation, Inc.
+    Copyright (C) 1997 Free Software Foundation, Inc.
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/sim/common/sim-fpu.c b/sim/common/sim-fpu.c
index be4336b50d1..032429e6826 100644
--- a/sim/common/sim-fpu.c
+++ b/sim/common/sim-fpu.c
@@ -3,7 +3,7 @@
    hardware floating point.  */
 
 /* Copyright 1994, 1997, 1998, 2003, 2007, 2008, 2009, 2010, 2011
-Free Software Foundation, Inc.
+   Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/sim/m32c/ChangeLog b/sim/m32c/ChangeLog
index d3ba69d304a..fce8381c725 100644
--- a/sim/m32c/ChangeLog
+++ b/sim/m32c/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-02  Joel Brobecker  <brobecker@adacore.com>
+
+	* blinky.S, gloss.S, sample.S: Reformat copyright header.
+
 2011-12-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* aclocal.m4: New file.
diff --git a/sim/m32c/blinky.S b/sim/m32c/blinky.S
index b53976d77a3..d0548b09dac 100644
--- a/sim/m32c/blinky.S
+++ b/sim/m32c/blinky.S
@@ -1,7 +1,7 @@
 ;;; blinky.S --- sample program to blink LED's on M32C simulator
 ;;; 
 ;;; Copyright (C) 2005, 2007, 2008, 2009, 2010, 2011
-	Free Software Foundation, Inc.
+;;; Free Software Foundation, Inc.
 ;;; Contributed by Red Hat, Inc.
 ;;;
 ;;; This file is part of the GNU simulators.
diff --git a/sim/m32c/gloss.S b/sim/m32c/gloss.S
index 2940e59e4f7..4441d47e308 100644
--- a/sim/m32c/gloss.S
+++ b/sim/m32c/gloss.S
@@ -1,7 +1,7 @@
 ;;; gloss.S --- system calls for sample2.x
 ;;; 
 ;;; Copyright (C) 2005, 2007, 2008, 2009, 2010, 2011
-	Free Software Foundation, Inc.
+;;; Free Software Foundation, Inc.
 ;;; Contributed by Red Hat, Inc.
 ;;;
 ;;; This file is part of the GNU simulators.
diff --git a/sim/m32c/sample.S b/sim/m32c/sample.S
index 4839e6914e0..18a1b22fbde 100644
--- a/sim/m32c/sample.S
+++ b/sim/m32c/sample.S
@@ -1,7 +1,7 @@
 ;;; sample.S --- simple test program for M32C simulator
 ;;; 
 ;;; Copyright (C) 2005, 2007, 2008, 2009, 2010, 2011
-	Free Software Foundation, Inc.
+;;; Free Software Foundation, Inc.
 ;;; Contributed by Red Hat, Inc.
 ;;;
 ;;; This file is part of the GNU simulators.
diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index f5fd97464a6..e8c845d23d9 100644
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-02  Joel Brobecker  <brobecker@adacore.com>
+
+	* sim-main.h: Reformat copyright header.
+
 2011-12-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* aclocal.m4: New file.
diff --git a/sim/mn10300/sim-main.h b/sim/mn10300/sim-main.h
index 29cc4b06ced..6fd38a896c0 100644
--- a/sim/mn10300/sim-main.h
+++ b/sim/mn10300/sim-main.h
@@ -1,7 +1,7 @@
 /*  This file is part of the program psim.
 
     Copyright (C) 1994-1997, Andrew Cagney <cagney@highland.com.au>
-    Copyright (C) 1997, Free Software Foundation
+    Copyright (C) 1997 Free Software Foundation, Inc.
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 1771d2f1b99..769b2990e6c 100644
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-02  Joel Brobecker  <brobecker@adacore.com>
+
+	* dp-bit.c: Reformat copyright header.
+
 2011-02-11  Ben Golding  <ben_golding@yahoo.co.uk>
 
 	* events.c: add #include <stdlib.h> for free(). Fix PR build/13372.
diff --git a/sim/ppc/dp-bit.c b/sim/ppc/dp-bit.c
index abc47e244a8..05f373ea285 100644
--- a/sim/ppc/dp-bit.c
+++ b/sim/ppc/dp-bit.c
@@ -3,7 +3,7 @@
    floating point.  */
 
 /* Copyright (C) 1994, 2007, 2008, 2009, 2010, 2011
-Free Software Foundation, Inc.
+   Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by