Merged current trunk to branch.

42 files changed, 100 insertions, 77 deletions

diff --git a/libatomic/ChangeLog b/libatomic/ChangeLog
index a68232c..04b53ef 100644
--- a/libatomic/ChangeLog
+++ b/libatomic/ChangeLog
@@ -1,3 +1,22 @@
+2021-07-21  Martin Sebor  <msebor@redhat.com>
+
+	PR bootstrap/101379
+	* config/linux/arm/host-config.h (__kernel_helper_version): New
+	function.  Adjust shadow macro.
+
+2021-01-15  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/70454
+	* configure.tgt: For i?86 and x86_64 determine if -march=i486 needs to
+	be added through preprocessor check on
+	__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4.  Determine if try_ifunc is needed
+	based on preprocessor check on __GCC_HAVE_SYNC_COMPARE_AND_SWAP_16
+	or __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8.
+
+2021-01-05  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* configure: Re-generate.
+
 2020-12-05  Iain Sandoe  <iain@sandoe.co.uk>
 
 	PR target/97865
@@ -575,7 +594,7 @@
 
 	* Initial commit.
 
-Copyright (C) 2012-2020 Free Software Foundation, Inc.
+Copyright (C) 2012-2021 Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am
index f540d59..0f3cd6f 100644
--- a/libatomic/Makefile.am
+++ b/libatomic/Makefile.am
@@ -1,4 +1,4 @@
-##  Copyright (C) 2012-2020 Free Software Foundation, Inc.
+##  Copyright (C) 2012-2021 Free Software Foundation, Inc.
 ##  Contributed by Richard Henderson <rth@redhat.com>.
 ##
 ##  This file is part of the GNU Atomic Library (libatomic).
diff --git a/libatomic/cas_n.c b/libatomic/cas_n.c
index 5a899a8..d206969 100644
--- a/libatomic/cas_n.c
+++ b/libatomic/cas_n.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2012-2021 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
    This file is part of the GNU Atomic Library (libatomic).
diff --git a/libatomic/config/arm/arm-config.h b/libatomic/config/arm/arm-config.h
index 53ccf67..dff6bd7 100644
--- a/libatomic/config/arm/arm-config.h
+++ b/libatomic/config/arm/arm-config.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2012-2021 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
    This file is part of the GNU Atomic Library (libatomic).
diff --git a/libatomic/config/arm/exch_n.c b/libatomic/config/arm/exch_n.c
index 2b8e7c5..4729c2f 100644
--- a/libatomic/config/arm/exch_n.c
+++ b/libatomic/config/arm/exch_n.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2012-2021 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
    This file is part of the GNU Atomic Library (libatomic).
diff --git a/libatomic/config/linux/aarch64/host-config.h b/libatomic/config/linux/aarch64/host-config.h
index ce6af27..19387fc 100644
--- a/libatomic/config/linux/aarch64/host-config.h
+++ b/libatomic/config/linux/aarch64/host-config.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2017-2021 Free Software Foundation, Inc.
 
    This file is part of the GNU Atomic Library (libatomic).
 
diff --git a/libatomic/config/linux/arm/host-config.h b/libatomic/config/linux/arm/host-config.h
index e5ad061..777d08a 100644
--- a/libatomic/config/linux/arm/host-config.h
+++ b/libatomic/config/linux/arm/host-config.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2012-2021 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
    This file is part of the GNU Atomic Library (libatomic).
@@ -39,8 +39,14 @@ typedef void (__kernel_dmb_t) (void);
 #define __kernel_dmb (*(__kernel_dmb_t *) 0xffff0fa0)
 
 /* Kernel helper page version number.  */
-#define __kernel_helper_version (*(unsigned int *)0xffff0ffc)
+static inline unsigned*
+__kernel_helper_version ()
+{
+  unsigned *volatile addr = (unsigned int *)0xffff0ffc;
+  return addr;
+}
 
+#define __kernel_helper_version (*__kernel_helper_version())
 
 #ifndef HAVE_STREX
 static inline bool
diff --git a/libatomic/config/linux/arm/init.c b/libatomic/config/linux/arm/init.c
index 48ed14e..f4c27f9 100644
--- a/libatomic/config/linux/arm/init.c
+++ b/libatomic/config/linux/arm/init.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2012-2021 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
    This file is part of the GNU Atomic Library (libatomic).
diff --git a/libatomic/config/linux/arm/load_n.c b/libatomic/config/linux/arm/load_n.c
index 8c42a10..b3518ee 100644
--- a/libatomic/config/linux/arm/load_n.c
+++ b/libatomic/config/linux/arm/load_n.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2012-2021 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
    This file is part of the GNU Atomic Library (libatomic).
diff --git a/libatomic/config/linux/arm/store_n.c b/libatomic/config/linux/arm/store_n.c
index 1bf80c6..6dca1c3 100644
--- a/libatomic/config/linux/arm/store_n.c
+++ b/libatomic/config/linux/arm/store_n.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2012-2021 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
    This file is part of the GNU Atomic Library (libatomic).
diff --git a/libatomic/config/mingw/host-config.h b/libatomic/config/mingw/host-config.h
index f8d45bc..865d5b0 100644
--- a/libatomic/config/mingw/host-config.h
+++ b/libatomic/config/mingw/host-config.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2014-2021 Free Software Foundation, Inc.
    Contributed by Kai Tietz <ktietz@redhat.com>.
 
    This file is part of the GNU Atomic Library (libatomic).
diff --git a/libatomic/config/mingw/lock.c b/libatomic/config/mingw/lock.c
index 9f1b071..d7a4027 100644
--- a/libatomic/config/mingw/lock.c
+++ b/libatomic/config/mingw/lock.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2014-2021 Free Software Foundation, Inc.
    Contributed by Kai Tietz <ktietz@redhat.com>.
 
    This file is part of the GNU Atomic Library (libatomic).
diff --git a/libatomic/config/nvptx/host-config.h b/libatomic/config/nvptx/host-config.h
index eb9de81..8f71b4a 100644
--- a/libatomic/config/nvptx/host-config.h
+++ b/libatomic/config/nvptx/host-config.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 Free Software Foundation, Inc.
+/* Copyright (C) 2020-2021 Free Software Foundation, Inc.
 
    This file is part of the GNU Atomic Library (libatomic).
 
diff --git a/libatomic/config/nvptx/lock.c b/libatomic/config/nvptx/lock.c
index dea85a3..6c82570 100644
--- a/libatomic/config/nvptx/lock.c
+++ b/libatomic/config/nvptx/lock.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 Free Software Foundation, Inc.
+/* Copyright (C) 2020-2021 Free Software Foundation, Inc.
 
    This file is part of the GNU Atomic Library (libatomic).
 
diff --git a/libatomic/config/posix/host-config.h b/libatomic/config/posix/host-config.h
index 1004ef1a..62be4cb 100644
--- a/libatomic/config/posix/host-config.h
+++ b/libatomic/config/posix/host-config.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2012-2021 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
    This file is part of the GNU Atomic Library (libatomic).
diff --git a/libatomic/config/posix/lock.c b/libatomic/config/posix/lock.c
index 6e05745..54766df 100644
--- a/libatomic/config/posix/lock.c
+++ b/libatomic/config/posix/lock.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2012-2021 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
    This file is part of the GNU Atomic Library (libatomic).
diff --git a/libatomic/config/rtems/host-config.h b/libatomic/config/rtems/host-config.h
index cf57805..02625f6 100644
--- a/libatomic/config/rtems/host-config.h
+++ b/libatomic/config/rtems/host-config.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2016-2021 Free Software Foundation, Inc.
    Contributed by Sebastian Huber <sebastian.huber@embedded-brains.de>.
 
    This file is part of the GNU Atomic Library (libatomic).
diff --git a/libatomic/config/rtems/lock.c b/libatomic/config/rtems/lock.c
index ad4fea3..f84aa1b 100644
--- a/libatomic/config/rtems/lock.c
+++ b/libatomic/config/rtems/lock.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2016-2021 Free Software Foundation, Inc.
    Contributed by Sebastian Huber <sebastian.huber@embedded-brains.de>.
 
    This file is part of the GNU Atomic Library (libatomic).
diff --git a/libatomic/config/s390/exch_n.c b/libatomic/config/s390/exch_n.c
index bc78e55..212415d 100644
--- a/libatomic/config/s390/exch_n.c
+++ b/libatomic/config/s390/exch_n.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2018-2021 Free Software Foundation, Inc.
    Contributed by Andreas Krebbel <krebbel@linux.vnet.ibm.com>
 
    This file is part of the GNU Atomic Library (libatomic).
diff --git a/libatomic/config/x86/fenv.c b/libatomic/config/x86/fenv.c
index 138a67f..45859a0 100644
--- a/libatomic/config/x86/fenv.c
+++ b/libatomic/config/x86/fenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2013-2021 Free Software Foundation, Inc.
 
    This file is part of the GNU Atomic Library (libatomic).
 
diff --git a/libatomic/config/x86/host-config.h b/libatomic/config/x86/host-config.h
index 627ab52..443e8bc 100644
--- a/libatomic/config/x86/host-config.h
+++ b/libatomic/config/x86/host-config.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2012-2021 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
    This file is part of the GNU Atomic Library (libatomic).
diff --git a/libatomic/config/x86/init.c b/libatomic/config/x86/init.c
index 676a2a2..0cfd5fc 100644
--- a/libatomic/config/x86/init.c
+++ b/libatomic/config/x86/init.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2012-2021 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
    This file is part of the GNU Atomic Library (libatomic).
diff --git a/libatomic/configure b/libatomic/configure
index 50fe548..5867e69 100755
--- a/libatomic/configure
+++ b/libatomic/configure
@@ -10570,16 +10570,6 @@ freebsd* | dragonfly*)
   esac
   ;;
 
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
 haiku*)
   version_type=linux
   need_lib_prefix=no
@@ -10701,7 +10691,7 @@ linux*oldld* | linux*aout* | linux*coff*)
 # project, but have not yet been accepted: they are GCC-local changes
 # for the time being.  (See
 # https://lists.gnu.org/archive/html/libtool-patches/2018-05/msg00000.html)
-linux* | k*bsd*-gnu | kopensolaris*-gnu | uclinuxfdpiceabi)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | uclinuxfdpiceabi)
   version_type=linux
   need_lib_prefix=no
   need_version=no
diff --git a/libatomic/configure.ac b/libatomic/configure.ac
index d74bd7c..2a37187 100644
--- a/libatomic/configure.ac
+++ b/libatomic/configure.ac
@@ -1,5 +1,5 @@
 # Process this file with autoreconf to produce a configure script.
-#  Copyright (C) 2012-2020 Free Software Foundation, Inc.
+#  Copyright (C) 2012-2021 Free Software Foundation, Inc.
 #
 #  This file is part of the GNU Atomic Library (libatomic).
 #
diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt
index 7834e0a..670b0d7 100644
--- a/libatomic/configure.tgt
+++ b/libatomic/configure.tgt
@@ -1,5 +1,5 @@
 # -*- shell-script -*-
-#  Copyright (C) 2012-2020 Free Software Foundation, Inc.
+#  Copyright (C) 2012-2021 Free Software Foundation, Inc.
 #  Contributed by Richard Henderson <rth@redhat.com>.
 #
 #  This file is part of the GNU Atomic Library (libatomic).
@@ -81,32 +81,40 @@ case "${target_cpu}" in
 	ARCH=sparc
 	;;
 
-  i[3456]86)
-	case " ${CC} ${CFLAGS} " in
-	  *" -m64 "*|*" -mx32 "*)
-	    ;;
-	  *)
-	    if test -z "$with_arch"; then
-	      XCFLAGS="${XCFLAGS} -march=i486 -mtune=${target_cpu}"
-	      XCFLAGS="${XCFLAGS} -fomit-frame-pointer"
-	    fi
-	esac
-	ARCH=x86
-	# ??? Detect when -march=i686 is already enabled.
-	try_ifunc=yes
-	;;
-  x86_64)
-	case " ${CC} ${CFLAGS} " in
-	  *" -m32 "*)
+  i[3456]86 | x86_64)
+	cat > conftestx.c <<EOF
+#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
+#error need -march=i486
+#endif
+EOF
+	if ${CC} ${CFLAGS} -E conftestx.c > /dev/null 2>&1; then
+	  :
+	else
+	  if test "${target_cpu}" = x86_64; then
 	    XCFLAGS="${XCFLAGS} -march=i486 -mtune=generic"
-	    XCFLAGS="${XCFLAGS} -fomit-frame-pointer"
-	    ;;
-	  *)
-	    ;;
-	esac
+	  else
+	    XCFLAGS="${XCFLAGS} -march=i486 -mtune=${target_cpu}"
+	  fi
+	  XCFLAGS="${XCFLAGS} -fomit-frame-pointer"
+	fi
+	cat > conftestx.c <<EOF
+#ifdef __x86_64__
+#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_16
+#error need -mcx16
+#endif
+#else
+#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8
+#error need -march=i686
+#endif
+#endif
+EOF
+	if ${CC} ${CFLAGS} -E conftestx.c > /dev/null 2>&1; then
+	  try_ifunc=no
+	else
+	  try_ifunc=yes
+	fi
+	rm -f conftestx.c
 	ARCH=x86
-	# ??? Detect when -mcx16 is already enabled.
-	try_ifunc=yes
 	;;
 
   *)			ARCH="${target_cpu}" ;;
diff --git a/libatomic/exch_n.c b/libatomic/exch_n.c
index 5e9edd09..58aeee0 100644
--- a/libatomic/exch_n.c
+++ b/libatomic/exch_n.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2012-2021 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
    This file is part of the GNU Atomic Library (libatomic).
diff --git a/libatomic/fadd_n.c b/libatomic/fadd_n.c
index 515b033..09e24ce 100644
--- a/libatomic/fadd_n.c
+++ b/libatomic/fadd_n.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2012-2021 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
    This file is part of the GNU Atomic Library (libatomic).
diff --git a/libatomic/fence.c b/libatomic/fence.c
index 12b79e4..dae3232 100644
--- a/libatomic/fence.c
+++ b/libatomic/fence.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2015-2021 Free Software Foundation, Inc.
 
    This file is part of the GNU Atomic Library (libatomic).
 
diff --git a/libatomic/fenv.c b/libatomic/fenv.c
index dd68a0e..e601165 100644
--- a/libatomic/fenv.c
+++ b/libatomic/fenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2012-2021 Free Software Foundation, Inc.
 
    This file is part of the GNU Atomic Library (libatomic).
 
diff --git a/libatomic/flag.c b/libatomic/flag.c
index 8a7f584..9fda9b7 100644
--- a/libatomic/flag.c
+++ b/libatomic/flag.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2015-2021 Free Software Foundation, Inc.
 
    This file is part of the GNU Atomic Library (libatomic).
 
diff --git a/libatomic/fop_n.c b/libatomic/fop_n.c
index 53beb46..3fe262e 100644
--- a/libatomic/fop_n.c
+++ b/libatomic/fop_n.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2012-2021 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
    This file is part of the GNU Atomic Library (libatomic).
diff --git a/libatomic/gcas.c b/libatomic/gcas.c
index 652d65e..c71b974 100644
--- a/libatomic/gcas.c
+++ b/libatomic/gcas.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2012-2021 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
    This file is part of the GNU Atomic Library (libatomic).
diff --git a/libatomic/gexch.c b/libatomic/gexch.c
index 3dfd081..4cf1781 100644
--- a/libatomic/gexch.c
+++ b/libatomic/gexch.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2012-2021 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
    This file is part of the GNU Atomic Library (libatomic).
diff --git a/libatomic/glfree.c b/libatomic/glfree.c
index 23bd472..3c3e53f 100644
--- a/libatomic/glfree.c
+++ b/libatomic/glfree.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2012-2021 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
    This file is part of the GNU Atomic Library (libatomic).
diff --git a/libatomic/gload.c b/libatomic/gload.c
index 0baaf18..2e5a0eb 100644
--- a/libatomic/gload.c
+++ b/libatomic/gload.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2012-2021 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
    This file is part of the GNU Atomic Library (libatomic).
diff --git a/libatomic/gstore.c b/libatomic/gstore.c
index 4283df5..260730a 100644
--- a/libatomic/gstore.c
+++ b/libatomic/gstore.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2012-2021 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
    This file is part of the GNU Atomic Library (libatomic).
diff --git a/libatomic/host-config.h b/libatomic/host-config.h
index 1ea1835..2d8a74b 100644
--- a/libatomic/host-config.h
+++ b/libatomic/host-config.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2012-2021 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
    This file is part of the GNU Atomic Library (libatomic).
diff --git a/libatomic/libatomic_i.h b/libatomic/libatomic_i.h
index 37de992..74e73b2 100644
--- a/libatomic/libatomic_i.h
+++ b/libatomic/libatomic_i.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2012-2021 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
    This file is part of the GNU Atomic Library (libatomic).
diff --git a/libatomic/load_n.c b/libatomic/load_n.c
index 5df5ab1..a5bc6ac 100644
--- a/libatomic/load_n.c
+++ b/libatomic/load_n.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2012-2021 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
    This file is part of the GNU Atomic Library (libatomic).
diff --git a/libatomic/store_n.c b/libatomic/store_n.c
index d9b03a0..496b4b7 100644
--- a/libatomic/store_n.c
+++ b/libatomic/store_n.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2012-2021 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
    This file is part of the GNU Atomic Library (libatomic).
diff --git a/libatomic/tas_n.c b/libatomic/tas_n.c
index e46c331..1c90ab4 100644
--- a/libatomic/tas_n.c
+++ b/libatomic/tas_n.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2012-2021 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
    This file is part of the GNU Atomic Library (libatomic).
diff --git a/libatomic/testsuite/config/default.exp b/libatomic/testsuite/config/default.exp
index cca2147..cfeb90e 100644
--- a/libatomic/testsuite/config/default.exp
+++ b/libatomic/testsuite/config/default.exp
@@ -1,4 +1,4 @@
-#   Copyright (C) 2011-2020 Free Software Foundation, Inc.
+#   Copyright (C) 2011-2021 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