2013-03-30 Tobias Burnus <burnus@net-b.de>

        * Merged Revs. 189741 to 197268 from the trunk.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/fortran-dev@197269 138bc75d-0d04-0410-961f-82ee72b054a4

40 files changed, 43 insertions, 50 deletions

diff --git a/libgfortran/m4/all.m4 b/libgfortran/m4/all.m4
index cc174207817..6781f7d657e 100644
--- a/libgfortran/m4/all.m4
+++ b/libgfortran/m4/all.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the ALL intrinsic
-   Copyright 2002, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2002-2013 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org>
 
 This file is part of the GNU Fortran runtime library (libgfortran).
diff --git a/libgfortran/m4/any.m4 b/libgfortran/m4/any.m4
index 81ec31046f5..64205558a5b 100644
--- a/libgfortran/m4/any.m4
+++ b/libgfortran/m4/any.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the ANY intrinsic
-   Copyright 2002, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2002-2013 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org>
 
 This file is part of the GNU Fortran runtime library (libgfortran).
diff --git a/libgfortran/m4/bessel.m4 b/libgfortran/m4/bessel.m4
index bce3c876cc9..15ccd2cf8e3 100644
--- a/libgfortran/m4/bessel.m4
+++ b/libgfortran/m4/bessel.m4
@@ -1,6 +1,6 @@
 `/* Implementation of the BESSEL_JN and BESSEL_YN transformational
    function using a recurrence algorithm.
-   Copyright 2010, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2010-2013 Free Software Foundation, Inc.
    Contributed by Tobias Burnus <burnus@net-b.de>
 
 This file is part of the GNU Fortran runtime library (libgfortran).
@@ -149,7 +149,6 @@ bessel_yn_r'rtype_kind` ('rtype` * const restrict ret, int n1, int n2,
       return;
     }
 
-  ret->base_addr = ret->base_addr;
   last1 = MATHFUNC(yn) (n1, x);
   ret->base_addr[0] = last1;
 
diff --git a/libgfortran/m4/count.m4 b/libgfortran/m4/count.m4
index 5998c20e685..4ced7572462 100644
--- a/libgfortran/m4/count.m4
+++ b/libgfortran/m4/count.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the COUNT intrinsic
-   Copyright 2002, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2002-2013 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org>
 
 This file is part of the GNU Fortran runtime library (libgfortran).
diff --git a/libgfortran/m4/cshift0.m4 b/libgfortran/m4/cshift0.m4
index 9e461f853f7..6aeff4babe3 100644
--- a/libgfortran/m4/cshift0.m4
+++ b/libgfortran/m4/cshift0.m4
@@ -1,5 +1,5 @@
 `/* Helper function for cshift functions.
-   Copyright 2008, 2009, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2008-2013 Free Software Foundation, Inc.
    Contributed by Thomas Koenig <tkoenig@gcc.gnu.org>
 
 This file is part of the GNU Fortran runtime library (libgfortran).
diff --git a/libgfortran/m4/cshift1.m4 b/libgfortran/m4/cshift1.m4
index b83b2e602c7..80186c86ccc 100644
--- a/libgfortran/m4/cshift1.m4
+++ b/libgfortran/m4/cshift1.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the CSHIFT intrinsic
-   Copyright 2003, 2007, 2009, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2003-2013 Free Software Foundation, Inc.
    Contributed by Feng Wang <wf_cs@yahoo.com>
 
 This file is part of the GNU Fortran runtime library (libgfortran).
diff --git a/libgfortran/m4/eoshift1.m4 b/libgfortran/m4/eoshift1.m4
index 10e19390190..095f06f3bac 100644
--- a/libgfortran/m4/eoshift1.m4
+++ b/libgfortran/m4/eoshift1.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the EOSHIFT intrinsic
-   Copyright 2002, 2005, 2007, 2009, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2002-2013 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org>
 
 This file is part of the GNU Fortran runtime library (libgfortran).
diff --git a/libgfortran/m4/eoshift3.m4 b/libgfortran/m4/eoshift3.m4
index 4493df2640b..6c83e223442 100644
--- a/libgfortran/m4/eoshift3.m4
+++ b/libgfortran/m4/eoshift3.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the EOSHIFT intrinsic
-   Copyright 2002, 2005, 2007, 2009, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2002-2013 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org>
 
 This file is part of the GNU Fortran runtime library (libgfortran).
diff --git a/libgfortran/m4/exponent.m4 b/libgfortran/m4/exponent.m4
index 043f150fcb0..08a9c360fd4 100644
--- a/libgfortran/m4/exponent.m4
+++ b/libgfortran/m4/exponent.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the EXPONENT intrinsic
-   Copyright 2003, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2003-2013 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
 This file is part of the GNU Fortran 95 runtime library (libgfortran).
diff --git a/libgfortran/m4/fraction.m4 b/libgfortran/m4/fraction.m4
index cca2db980ad..448dbe7183c 100644
--- a/libgfortran/m4/fraction.m4
+++ b/libgfortran/m4/fraction.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the FRACTION intrinsic
-   Copyright 2003, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2003-2013 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
 This file is part of the GNU Fortran 95 runtime library (libgfortran).
diff --git a/libgfortran/m4/head.m4 b/libgfortran/m4/head.m4
index 30cdea89273..fdb7683fc41 100644
--- a/libgfortran/m4/head.m4
+++ b/libgfortran/m4/head.m4
@@ -1,4 +1,4 @@
-`!   Copyright 2002, 2007, 2009 Free Software Foundation, Inc.
+`!   Copyright (C) 2002-2013 Free Software Foundation, Inc.
 !   Contributed by Paul Brook <paul@nowt.org>
 !
 !This file is part of the GNU Fortran 95 runtime library (libgfortran).
diff --git a/libgfortran/m4/iall.m4 b/libgfortran/m4/iall.m4
index 2e6667e2664..3d8feeff287 100644
--- a/libgfortran/m4/iall.m4
+++ b/libgfortran/m4/iall.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the IALL intrinsic
-   Copyright 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010-2013 Free Software Foundation, Inc.
    Contributed by Tobias Burnus <burnus@net-b.de>
 
 This file is part of the GNU Fortran runtime library (libgfortran).
diff --git a/libgfortran/m4/iany.m4 b/libgfortran/m4/iany.m4
index a17d951e5cc..510aeac83d7 100644
--- a/libgfortran/m4/iany.m4
+++ b/libgfortran/m4/iany.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the IANY intrinsic
-   Copyright 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010-2013 Free Software Foundation, Inc.
    Contributed by Tobias Burnus <burnus@net-b.de>
 
 This file is part of the GNU Fortran runtime library (libgfortran).
diff --git a/libgfortran/m4/ifunction.m4 b/libgfortran/m4/ifunction.m4
index b7828082ace..41e69204876 100644
--- a/libgfortran/m4/ifunction.m4
+++ b/libgfortran/m4/ifunction.m4
@@ -311,17 +311,12 @@ void
       {
 ')dnl
 define(START_MASKED_ARRAY_BLOCK,
-`	if (len <= 0)
-	  *dest = '$1`;
-	else
+`	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 ')dnl
 define(FINISH_MASKED_ARRAY_FUNCTION,
-`	      }
-	    *dest = result;
-	  }
+`	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
@@ -499,6 +494,6 @@ FINISH_ARRAY_FUNCTION($4)')dnl
 define(MASKED_ARRAY_FUNCTION,
 `START_MASKED_ARRAY_FUNCTION
 $2
-START_MASKED_ARRAY_BLOCK($1)
+START_MASKED_ARRAY_BLOCK
 $3
 FINISH_MASKED_ARRAY_FUNCTION')dnl
diff --git a/libgfortran/m4/in_pack.m4 b/libgfortran/m4/in_pack.m4
index 6b9d40b1ca1..e5f3fc67e68 100644
--- a/libgfortran/m4/in_pack.m4
+++ b/libgfortran/m4/in_pack.m4
@@ -1,5 +1,5 @@
 `/* Helper function for repacking arrays.
-   Copyright 2003, 2006, 2007, 2009, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2003-2013 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org>
 
 This file is part of the GNU Fortran runtime library (libgfortran).
diff --git a/libgfortran/m4/in_unpack.m4 b/libgfortran/m4/in_unpack.m4
index ccd6a8530b7..8605077915a 100644
--- a/libgfortran/m4/in_unpack.m4
+++ b/libgfortran/m4/in_unpack.m4
@@ -1,5 +1,5 @@
 `/* Helper function for repacking arrays.
-   Copyright 2003, 2006, 2007, 2009, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2003-2013 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org>
 
 This file is part of the GNU Fortran runtime library (libgfortran).
diff --git a/libgfortran/m4/iparity.m4 b/libgfortran/m4/iparity.m4
index 78dbc3dd434..7a1e830919e 100644
--- a/libgfortran/m4/iparity.m4
+++ b/libgfortran/m4/iparity.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the IPARITY intrinsic
-   Copyright 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010-2013 Free Software Foundation, Inc.
    Contributed by Tobias Burnus <burnus@net-b.de>
 
 This file is part of the GNU Fortran runtime library (libgfortran).
diff --git a/libgfortran/m4/matmul.m4 b/libgfortran/m4/matmul.m4
index e44e2c2150e..dd1e0ea551f 100644
--- a/libgfortran/m4/matmul.m4
+++ b/libgfortran/m4/matmul.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the MATMUL intrinsic
-   Copyright 2002, 2005, 2006, 2007, 2009, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2002-2013 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org>
 
 This file is part of the GNU Fortran runtime library (libgfortran).
diff --git a/libgfortran/m4/matmull.m4 b/libgfortran/m4/matmull.m4
index 5c1fd79b741..22948975168 100644
--- a/libgfortran/m4/matmull.m4
+++ b/libgfortran/m4/matmull.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the MATMUL intrinsic
-   Copyright 2002, 2005, 2006, 2007, 2009, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2002-2013 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org>
 
 This file is part of the GNU Fortran runtime library (libgfortran).
diff --git a/libgfortran/m4/maxloc0.m4 b/libgfortran/m4/maxloc0.m4
index aef7b9b8dc7..5b050936b9d 100644
--- a/libgfortran/m4/maxloc0.m4
+++ b/libgfortran/m4/maxloc0.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the MAXLOC intrinsic
-   Copyright 2002, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002-2013 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org>
 
 This file is part of the GNU Fortran 95 runtime library (libgfortran).
diff --git a/libgfortran/m4/maxloc1.m4 b/libgfortran/m4/maxloc1.m4
index 44872ee61a0..888ce774164 100644
--- a/libgfortran/m4/maxloc1.m4
+++ b/libgfortran/m4/maxloc1.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the MAXLOC intrinsic
-   Copyright 2002, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2002-2013 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org>
 
 This file is part of the GNU Fortran runtime library (libgfortran).
diff --git a/libgfortran/m4/maxval.m4 b/libgfortran/m4/maxval.m4
index 15390688056..da7b6b155bb 100644
--- a/libgfortran/m4/maxval.m4
+++ b/libgfortran/m4/maxval.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the MAXVAL intrinsic
-   Copyright 2002, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2002-2013 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org>
 
 This file is part of the GNU Fortran runtime library (libgfortran).
diff --git a/libgfortran/m4/minloc0.m4 b/libgfortran/m4/minloc0.m4
index 1345f2df472..ac7cb4ec114 100644
--- a/libgfortran/m4/minloc0.m4
+++ b/libgfortran/m4/minloc0.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the MINLOC intrinsic
-   Copyright 2002, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002-2013 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org>
 
 This file is part of the GNU Fortran 95 runtime library (libgfortran).
diff --git a/libgfortran/m4/minloc1.m4 b/libgfortran/m4/minloc1.m4
index e0bd3cd88ce..4d34eb81259 100644
--- a/libgfortran/m4/minloc1.m4
+++ b/libgfortran/m4/minloc1.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the MINLOC intrinsic
-   Copyright 2002, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2002-2013 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org>
 
 This file is part of the GNU Fortran runtime library (libgfortran).
diff --git a/libgfortran/m4/minval.m4 b/libgfortran/m4/minval.m4
index 037dd672595..c1b35483579 100644
--- a/libgfortran/m4/minval.m4
+++ b/libgfortran/m4/minval.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the MINVAL intrinsic
-   Copyright 2002, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2002-2013 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org>
 
 This file is part of the GNU Fortran runtime library (libgfortran).
diff --git a/libgfortran/m4/nearest.m4 b/libgfortran/m4/nearest.m4
index 643443048e1..bdbc0e28fce 100644
--- a/libgfortran/m4/nearest.m4
+++ b/libgfortran/m4/nearest.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the NEAREST intrinsic
-   Copyright 2003, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2003-2013 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
 This file is part of the GNU Fortran 95 runtime library (libgfortran).
diff --git a/libgfortran/m4/norm2.m4 b/libgfortran/m4/norm2.m4
index b2162ac23ed..ed80f61ab4d 100644
--- a/libgfortran/m4/norm2.m4
+++ b/libgfortran/m4/norm2.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the NORM2 intrinsic
-   Copyright 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010-2013 Free Software Foundation, Inc.
    Contributed by Tobias Burnus  <burnus@net-b.de>
 
 This file is part of the GNU Fortran runtime library (libgfortran).
diff --git a/libgfortran/m4/pack.m4 b/libgfortran/m4/pack.m4
index 630b4b4667a..678eee355e6 100644
--- a/libgfortran/m4/pack.m4
+++ b/libgfortran/m4/pack.m4
@@ -1,6 +1,5 @@
 `/* Specific implementation of the PACK intrinsic
-   Copyright (C) 2002, 2004, 2005, 2006, 2007, 2008, 2009, 2012
-   Free Software Foundation, Inc.
+   Copyright (C) 2002-2013 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org>
 
 This file is part of the GNU Fortran runtime library (libgfortran).
diff --git a/libgfortran/m4/parity.m4 b/libgfortran/m4/parity.m4
index 6ff0ad2e817..0e902c49170 100644
--- a/libgfortran/m4/parity.m4
+++ b/libgfortran/m4/parity.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the PARITY intrinsic
-   Copyright 2010, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2010-2013 Free Software Foundation, Inc.
    Contributed by Tobias Burnus  <burnus@net-b.de>
 
 This file is part of the GNU Fortran runtime library (libgfortran).
diff --git a/libgfortran/m4/pow.m4 b/libgfortran/m4/pow.m4
index 3814f87fea8..6f08ace9226 100644
--- a/libgfortran/m4/pow.m4
+++ b/libgfortran/m4/pow.m4
@@ -1,5 +1,5 @@
 `/* Support routines for the intrinsic power (**) operator.
-   Copyright 2004, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2004-2013 Free Software Foundation, Inc.
    Contributed by Paul Brook
 
 This file is part of the GNU Fortran 95 runtime library (libgfortran).
diff --git a/libgfortran/m4/product.m4 b/libgfortran/m4/product.m4
index 6f6f2c01184..e01fb406c1c 100644
--- a/libgfortran/m4/product.m4
+++ b/libgfortran/m4/product.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the PRODUCT intrinsic
-   Copyright 2002, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2002-2013 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org>
 
 This file is part of the GNU Fortran runtime library (libgfortran).
diff --git a/libgfortran/m4/reshape.m4 b/libgfortran/m4/reshape.m4
index f8b173a3d66..c5c8dd71613 100644
--- a/libgfortran/m4/reshape.m4
+++ b/libgfortran/m4/reshape.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the RESHAPE intrinsic
-   Copyright 2002, 2006, 2007, 2009, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2002-2013 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org>
 
 This file is part of the GNU Fortran runtime library (libgfortran).
diff --git a/libgfortran/m4/rrspacing.m4 b/libgfortran/m4/rrspacing.m4
index 5f11d5b6b6d..01a01adacf6 100644
--- a/libgfortran/m4/rrspacing.m4
+++ b/libgfortran/m4/rrspacing.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the RRSPACING intrinsic
-   Copyright 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2006-2013 Free Software Foundation, Inc.
    Contributed by Steven G. Kargl <kargl@gcc.gnu.org>
 
 This file is part of the GNU Fortran 95 runtime library (libgfortran).
diff --git a/libgfortran/m4/set_exponent.m4 b/libgfortran/m4/set_exponent.m4
index 5f31ab681db..753048750f6 100644
--- a/libgfortran/m4/set_exponent.m4
+++ b/libgfortran/m4/set_exponent.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the SET_EXPONENT intrinsic
-   Copyright 2003, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2003-2013 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
 This file is part of the GNU Fortran 95 runtime library (libgfortran).
diff --git a/libgfortran/m4/shape.m4 b/libgfortran/m4/shape.m4
index ba7316034ba..1516fb51ffe 100644
--- a/libgfortran/m4/shape.m4
+++ b/libgfortran/m4/shape.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the SHAPE intrinsic
-   Copyright 2002, 2006, 2007, 2009, 2010, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2002-2013 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org>
 
 This file is part of the GNU Fortran runtime library (libgfortran).
diff --git a/libgfortran/m4/spacing.m4 b/libgfortran/m4/spacing.m4
index faae6d124e1..0f32d223823 100644
--- a/libgfortran/m4/spacing.m4
+++ b/libgfortran/m4/spacing.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the SPACING intrinsic
-   Copyright 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2006-2013 Free Software Foundation, Inc.
    Contributed by Steven G. Kargl <kargl@gcc.gnu.org>
 
 This file is part of the GNU Fortran 95 runtime library (libgfortran).
diff --git a/libgfortran/m4/spread.m4 b/libgfortran/m4/spread.m4
index 38b20451927..456fb498fbe 100644
--- a/libgfortran/m4/spread.m4
+++ b/libgfortran/m4/spread.m4
@@ -1,5 +1,5 @@
 `/* Special implementation of the SPREAD intrinsic
-   Copyright 2008, 2009, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2008-2013 Free Software Foundation, Inc.
    Contributed by Thomas Koenig <tkoenig@gcc.gnu.org>, based on
    spread_generic.c written by Paul Brook <paul@nowt.org>
 
diff --git a/libgfortran/m4/sum.m4 b/libgfortran/m4/sum.m4
index b502c6e7d8a..2f1dcfe5818 100644
--- a/libgfortran/m4/sum.m4
+++ b/libgfortran/m4/sum.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the SUM intrinsic
-   Copyright 2002, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002-2013 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org>
 
 This file is part of the GNU Fortran 95 runtime library (libgfortran).
diff --git a/libgfortran/m4/transpose.m4 b/libgfortran/m4/transpose.m4
index 1f56b59d11c..d6d63bd8394 100644
--- a/libgfortran/m4/transpose.m4
+++ b/libgfortran/m4/transpose.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the TRANSPOSE intrinsic
-   Copyright 2003, 2005, 2006, 2007, 2009, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2003-2013 Free Software Foundation, Inc.
    Contributed by Tobias Schlüter
 
 This file is part of the GNU Fortran runtime library (libgfortran).
diff --git a/libgfortran/m4/unpack.m4 b/libgfortran/m4/unpack.m4
index c19b59c1478..f0141f998d0 100644
--- a/libgfortran/m4/unpack.m4
+++ b/libgfortran/m4/unpack.m4
@@ -1,5 +1,5 @@
 `/* Specific implementation of the UNPACK intrinsic
-   Copyright 2008, 2009, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2008-2013 Free Software Foundation, Inc.
    Contributed by Thomas Koenig <tkoenig@gcc.gnu.org>, based on
    unpack_generic.c by Paul Brook <paul@nowt.org>.