Merge from trunk revision 8e4a738d2540ab6aff77506d368bf4e3fa6963bd.

27 files changed, 125 insertions, 91 deletions

diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 83cbde3..99d5593 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,31 @@
+2021-01-27  liuhongt  <hongtao.liu@intel.com>
+
+	PR target/98833
+	* lex.c (search_line_sse2): Replace builtins with == operator.
+
+2021-01-26  Paul Fee  <paul.f.fee@gmail.com>
+
+	* include/cpplib.h (c_lang): Add CXX23 and GNUCXX23.
+	* init.c (lang_defaults): Add rows for CXX23 and GNUCXX23.
+	(cpp_init_builtins): Set __cplusplus to 202100L for C++23.
+
+2021-01-15  Nathan Sidwell  <nathan@acm.org>
+
+	PR preprocessor/95253
+	* mkdeps.c (munge): Do not escape ':'.
+
+2020-12-14  Nathan Sidwell  <nathan@acm.org>
+
+	* include/cpplib.h (struct cpp_macro): Add imported_p field.
+	(struct cpp_hashnode): Tweak deferred field documentation.
+	* macro.c (_cpp_new_macro): Clear new field.
+	(cpp_get_deferred_macro, get_deferred_or_lazy_macro): Assert
+	more.
+
+2020-12-10  Jason Merrill  <jason@redhat.com>
+
+	* init.c (cpp_init_builtins): Update __cplusplus for C++20.
+
 2020-12-01  JeanHeyd Meneide  <phdofthehouse@gmail.com>
 
 	* charset.c (init_iconv_desc): Initialize "to" and "from" fields.
@@ -6562,7 +6590,7 @@
 	* include/symtab.h: Moved from gcc/hashtable.h.  Change header
 	guard name.
 
-Copyright (C) 2004-2020 Free Software Foundation, Inc.
+Copyright (C) 2004-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/libcpp/Makefile.in b/libcpp/Makefile.in
index 5fbba9b..6c403a8 100644
--- a/libcpp/Makefile.in
+++ b/libcpp/Makefile.in
@@ -1,7 +1,7 @@
 # @configure_input@
 # Makefile for libcpp.  Run 'configure' to generate Makefile from Makefile.in
 
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 Free Software Foundation, Inc.
 
 #This file is part of libcpp.
 
diff --git a/libcpp/charset.c b/libcpp/charset.c
index 3e5578b..99a9b73 100644
--- a/libcpp/charset.c
+++ b/libcpp/charset.c
@@ -1,5 +1,5 @@
 /* CPP Library - charsets
-   Copyright (C) 1998-2020 Free Software Foundation, Inc.
+   Copyright (C) 1998-2021 Free Software Foundation, Inc.
 
    Broken out of c-lex.c Apr 2003, adding valid C99 UCN ranges.
 
diff --git a/libcpp/directives.c b/libcpp/directives.c
index 0d09da7..f4aa17d 100644
--- a/libcpp/directives.c
+++ b/libcpp/directives.c
@@ -1,5 +1,5 @@
 /* CPP Library. (Directive handling.)
-   Copyright (C) 1986-2020 Free Software Foundation, Inc.
+   Copyright (C) 1986-2021 Free Software Foundation, Inc.
    Contributed by Per Bothner, 1994-95.
    Based on CCCP program by Paul Rubin, June 1986
    Adapted to ANSI C, Richard Stallman, Jan 1987
diff --git a/libcpp/errors.c b/libcpp/errors.c
index 275e4af..5e1bf33 100644
--- a/libcpp/errors.c
+++ b/libcpp/errors.c
@@ -1,5 +1,5 @@
 /* Default error handlers for CPP Library.
-   Copyright (C) 1986-2020 Free Software Foundation, Inc.
+   Copyright (C) 1986-2021 Free Software Foundation, Inc.
    Written by Per Bothner, 1994.
    Based on CCCP program by Paul Rubin, June 1986
    Adapted to ANSI C, Richard Stallman, Jan 1987
diff --git a/libcpp/expr.c b/libcpp/expr.c
index 2ba7726..474ea4d 100644
--- a/libcpp/expr.c
+++ b/libcpp/expr.c
@@ -1,5 +1,5 @@
 /* Parse C expressions for cpplib.
-   Copyright (C) 1987-2020 Free Software Foundation, Inc.
+   Copyright (C) 1987-2021 Free Software Foundation, Inc.
    Contributed by Per Bothner, 1994.
 
 This program is free software; you can redistribute it and/or modify it
diff --git a/libcpp/files.c b/libcpp/files.c
index 301b237..5ea3f8e 100644
--- a/libcpp/files.c
+++ b/libcpp/files.c
@@ -1,5 +1,5 @@
 /* Part of CPP library.  File handling.
-   Copyright (C) 1986-2020 Free Software Foundation, Inc.
+   Copyright (C) 1986-2021 Free Software Foundation, Inc.
    Written by Per Bothner, 1994.
    Based on CCCP program by Paul Rubin, June 1986
    Adapted to ANSI C, Richard Stallman, Jan 1987
diff --git a/libcpp/identifiers.c b/libcpp/identifiers.c
index 9627e1b..dc0df11 100644
--- a/libcpp/identifiers.c
+++ b/libcpp/identifiers.c
@@ -1,5 +1,5 @@
 /* Hash tables for the CPP library.
-   Copyright (C) 1986-2020 Free Software Foundation, Inc.
+   Copyright (C) 1986-2021 Free Software Foundation, Inc.
    Written by Per Bothner, 1994.
    Based on CCCP program by Paul Rubin, June 1986
    Adapted to ANSI C, Richard Stallman, Jan 1987
diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h
index 692aee5..4467c73 100644
--- a/libcpp/include/cpplib.h
+++ b/libcpp/include/cpplib.h
@@ -1,5 +1,5 @@
 /* Definitions for CPP library.
-   Copyright (C) 1995-2020 Free Software Foundation, Inc.
+   Copyright (C) 1995-2021 Free Software Foundation, Inc.
    Written by Per Bothner, 1994-95.
 
 This program is free software; you can redistribute it and/or modify it
@@ -173,7 +173,8 @@ enum c_lang {CLK_GNUC89 = 0, CLK_GNUC99, CLK_GNUC11, CLK_GNUC17, CLK_GNUC2X,
 	     CLK_STDC2X,
 	     CLK_GNUCXX, CLK_CXX98, CLK_GNUCXX11, CLK_CXX11,
 	     CLK_GNUCXX14, CLK_CXX14, CLK_GNUCXX17, CLK_CXX17,
-	     CLK_GNUCXX20, CLK_CXX20, CLK_ASM};
+	     CLK_GNUCXX20, CLK_CXX20, CLK_GNUCXX23, CLK_CXX23,
+	     CLK_ASM};
 
 /* Payload of a NUMBER, STRING, CHAR or COMMENT token.  */
 struct GTY(()) cpp_string {
@@ -826,7 +827,10 @@ struct GTY(()) cpp_macro {
      tokens.  */
   unsigned int extra_tokens : 1;
 
-  /* 1 bits spare (32-bit). 33 on 64-bit target.  */
+  /* Imported C++20 macro (from a header unit).  */
+  unsigned int imported_p : 1;
+
+  /* 0 bits spare (32-bit). 32 on 64-bit target.  */
 
   union cpp_exp_u
   {
@@ -921,9 +925,11 @@ struct GTY(()) cpp_hashnode {
 
   /* 5 bits spare.  */
 
-  /* On a 64-bit system there would be 32-bits of padding to the value
+  /* The deferred cookie is applicable to NT_USER_MACRO or NT_VOID.
+     The latter for when a macro had a prevailing undef.
+     On a 64-bit system there would be 32-bits of padding to the value
      field.  So placing the deferred index here is not costly.   */
-  unsigned deferred;			/* Deferred index, (unless zero).  */
+  unsigned deferred;			/* Deferred cookie  */
 
   union _cpp_hashnode_value GTY ((desc ("%1.type"))) value;
 };
diff --git a/libcpp/include/line-map.h b/libcpp/include/line-map.h
index 50b2e4f..d5fc118 100644
--- a/libcpp/include/line-map.h
+++ b/libcpp/include/line-map.h
@@ -1,5 +1,5 @@
 /* Map (unsigned int) keys to (source file, line, column) triples.
-   Copyright (C) 2001-2020 Free Software Foundation, Inc.
+   Copyright (C) 2001-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 the
diff --git a/libcpp/include/mkdeps.h b/libcpp/include/mkdeps.h
index 9f10327..007f74e 100644
--- a/libcpp/include/mkdeps.h
+++ b/libcpp/include/mkdeps.h
@@ -1,5 +1,5 @@
 /* Dependency generator for Makefile fragments.
-   Copyright (C) 2000-2020 Free Software Foundation, Inc.
+   Copyright (C) 2000-2021 Free Software Foundation, Inc.
    Contributed by Zack Weinberg, Mar 2000
 
 This program is free software; you can redistribute it and/or modify it
diff --git a/libcpp/include/symtab.h b/libcpp/include/symtab.h
index 2fd542e..6905753 100644
--- a/libcpp/include/symtab.h
+++ b/libcpp/include/symtab.h
@@ -1,5 +1,5 @@
 /* Hash tables.
-   Copyright (C) 2000-2020 Free Software Foundation, Inc.
+   Copyright (C) 2000-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 the
diff --git a/libcpp/init.c b/libcpp/init.c
index f77dc26..ecd3d5b 100644
--- a/libcpp/init.c
+++ b/libcpp/init.c
@@ -1,5 +1,5 @@
 /* CPP Library.
-   Copyright (C) 1986-2020 Free Software Foundation, Inc.
+   Copyright (C) 1986-2021 Free Software Foundation, Inc.
    Contributed by Per Bothner, 1994-95.
    Based on CCCP program by Paul Rubin, June 1986
    Adapted to ANSI C, Richard Stallman, Jan 1987
@@ -119,6 +119,8 @@ static const struct lang_flags lang_defaults[] =
   /* CXX17    */  { 1,  1,  1,  1,  1,  1,  1,   1,   1,   1,    1,     1,     0,   1,      0,   1,     0 },
   /* GNUCXX20 */  { 1,  1,  1,  1,  1,  0,  1,   1,   1,   1,    1,     1,     0,   1,      1,   1,     0 },
   /* CXX20    */  { 1,  1,  1,  1,  1,  1,  1,   1,   1,   1,    1,     1,     0,   1,      1,   1,     0 },
+  /* GNUCXX23 */  { 1,  1,  1,  1,  1,  0,  1,   1,   1,   1,    1,     1,     0,   1,      1,   1,     0 },
+  /* CXX23    */  { 1,  1,  1,  1,  1,  1,  1,   1,   1,   1,    1,     1,     0,   1,      1,   1,     0 },
   /* ASM      */  { 0,  0,  1,  0,  0,  0,  0,   0,   0,   0,    0,     0,     0,   0,      0,   0,     0 }
 };
 
@@ -540,9 +542,14 @@ cpp_init_builtins (cpp_reader *pfile, int hosted)
 
   if (CPP_OPTION (pfile, cplusplus))
     {
-      if (CPP_OPTION (pfile, lang) == CLK_CXX20
+      /* C++23 is not yet a standard.  For now, use an invalid
+       * year/month, 202100L, which is larger than 202002L.  */
+      if (CPP_OPTION (pfile, lang) == CLK_CXX23
+	  || CPP_OPTION (pfile, lang) == CLK_GNUCXX23)
+	_cpp_define_builtin (pfile, "__cplusplus 202100L");
+      else if (CPP_OPTION (pfile, lang) == CLK_CXX20
 	  || CPP_OPTION (pfile, lang) == CLK_GNUCXX20)
-	_cpp_define_builtin (pfile, "__cplusplus 201709L");
+	_cpp_define_builtin (pfile, "__cplusplus 202002L");
       else if (CPP_OPTION (pfile, lang) == CLK_CXX17
 	  || CPP_OPTION (pfile, lang) == CLK_GNUCXX17)
 	_cpp_define_builtin (pfile, "__cplusplus 201703L");
diff --git a/libcpp/internal.h b/libcpp/internal.h
index 4010af8..32f9f50 100644
--- a/libcpp/internal.h
+++ b/libcpp/internal.h
@@ -1,5 +1,5 @@
 /* Part of CPP library.
-   Copyright (C) 1997-2020 Free Software Foundation, Inc.
+   Copyright (C) 1997-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 the
diff --git a/libcpp/lex.c b/libcpp/lex.c
index 07d5a4f..6af1404 100644
--- a/libcpp/lex.c
+++ b/libcpp/lex.c
@@ -1,5 +1,5 @@
 /* CPP Library - lexical analysis.
-   Copyright (C) 2000-2020 Free Software Foundation, Inc.
+   Copyright (C) 2000-2021 Free Software Foundation, Inc.
    Contributed by Per Bothner, 1994-95.
    Based on CCCP program by Paul Rubin, June 1986
    Adapted to ANSI C, Richard Stallman, Jan 1987
@@ -391,10 +391,10 @@ search_line_sse2 (const uchar *s, const uchar *end ATTRIBUTE_UNUSED)
       mask = -1;
 
     start:
-      t  = __builtin_ia32_pcmpeqb128(data, repl_nl);
-      t |= __builtin_ia32_pcmpeqb128(data, repl_cr);
-      t |= __builtin_ia32_pcmpeqb128(data, repl_bs);
-      t |= __builtin_ia32_pcmpeqb128(data, repl_qm);
+      t  = data == repl_nl;
+      t |= data == repl_cr;
+      t |= data == repl_bs;
+      t |= data == repl_qm;
       found = __builtin_ia32_pmovmskb128 (t);
       found &= mask;
     }
diff --git a/libcpp/line-map.c b/libcpp/line-map.c
index bbb6963..2432cd5 100644
--- a/libcpp/line-map.c
+++ b/libcpp/line-map.c
@@ -1,5 +1,5 @@
 /* Map (unsigned int) keys to (source file, line, column) triples.
-   Copyright (C) 2001-2020 Free Software Foundation, Inc.
+   Copyright (C) 2001-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 the
diff --git a/libcpp/macro.c b/libcpp/macro.c
index 0575585..fa6acff 100644
--- a/libcpp/macro.c
+++ b/libcpp/macro.c
@@ -1,5 +1,5 @@
 /* Part of CPP library.  (Macro and #define handling.)
-   Copyright (C) 1986-2020 Free Software Foundation, Inc.
+   Copyright (C) 1986-2021 Free Software Foundation, Inc.
    Written by Per Bothner, 1994.
    Based on CCCP program by Paul Rubin, June 1986
    Adapted to ANSI C, Richard Stallman, Jan 1987
@@ -3708,6 +3708,7 @@ _cpp_new_macro (cpp_reader *pfile, cpp_macro_kind kind, void *placement)
   macro->used = !CPP_OPTION (pfile, warn_unused_macros);
   macro->count = 0;
   macro->fun_like = 0;
+  macro->imported_p = false;
   macro->extra_tokens = 0;
   /* To suppress some diagnostics.  */
   macro->syshdr = pfile->buffer && pfile->buffer->sysp != 0;
@@ -3791,6 +3792,8 @@ cpp_macro *
 cpp_get_deferred_macro (cpp_reader *pfile, cpp_hashnode *node,
 			location_t loc)
 {
+  gcc_checking_assert (node->type == NT_USER_MACRO);
+
   node->value.macro = pfile->cb.user_deferred_macro (pfile, loc, node);
 
   if (!node->value.macro)
@@ -3807,11 +3810,9 @@ get_deferred_or_lazy_macro (cpp_reader *pfile, cpp_hashnode *node,
   if (!macro)
     {
       macro = cpp_get_deferred_macro (pfile, node, loc);
-      if (!macro)
-	return NULL;
+      gcc_checking_assert (!macro || !macro->lazy);
     }
-
-  if (macro->lazy)
+  else if (macro->lazy)
     {
       pfile->cb.user_lazy_macro (pfile, macro, macro->lazy - 1);
       macro->lazy = 0;
diff --git a/libcpp/makeucnid.c b/libcpp/makeucnid.c
index cb529b9..66d251d 100644
--- a/libcpp/makeucnid.c
+++ b/libcpp/makeucnid.c
@@ -1,5 +1,5 @@
 /* Make ucnid.h from various sources.
-   Copyright (C) 2005-2020 Free Software Foundation, Inc.
+   Copyright (C) 2005-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 the
@@ -378,7 +378,7 @@ write_copyright (void)
 {
   static const char copyright[] = "\
 /* Unicode characters and various properties.\n\
-   Copyright (C) 2003-2020 Free Software Foundation, Inc.\n\
+   Copyright (C) 2003-2021 Free Software Foundation, Inc.\n\
 \n\
    This program is free software; you can redistribute it and/or modify it\n\
    under the terms of the GNU General Public License as published by the\n\
diff --git a/libcpp/mkdeps.c b/libcpp/mkdeps.c
index 4a8e101..1867e00 100644
--- a/libcpp/mkdeps.c
+++ b/libcpp/mkdeps.c
@@ -1,5 +1,5 @@
 /* Dependency generator for Makefile fragments.
-   Copyright (C) 2000-2020 Free Software Foundation, Inc.
+   Copyright (C) 2000-2021 Free Software Foundation, Inc.
    Contributed by Zack Weinberg, Mar 2000
 
 This program is free software; you can redistribute it and/or modify it
@@ -162,7 +162,6 @@ munge (const char *str, const char *trail = nullptr)
 	      /* FALLTHROUGH  */
 
 	    case '#':
-	    case ':':
 	      buf[dst++] = '\\';
 	      /* FALLTHROUGH  */
 
diff --git a/libcpp/pch.c b/libcpp/pch.c
index fcdf387..bb80964 100644
--- a/libcpp/pch.c
+++ b/libcpp/pch.c
@@ -1,5 +1,5 @@
 /* Part of CPP library.  (Precompiled header reading/writing.)
-   Copyright (C) 2000-2020 Free Software Foundation, Inc.
+   Copyright (C) 2000-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 the
diff --git a/libcpp/po/ChangeLog b/libcpp/po/ChangeLog
index ef050aac..543b93e 100644
--- a/libcpp/po/ChangeLog
+++ b/libcpp/po/ChangeLog
@@ -1,3 +1,7 @@
+2021-01-07  Joseph Myers  <joseph@codesourcery.com>
+
+	* es.po: Update.
+
 2020-07-20  Joseph Myers  <joseph@codesourcery.com>
 
 	* cpplib.pot: Regenerate.
diff --git a/libcpp/po/es.po b/libcpp/po/es.po
index f74e627..9163229 100644
--- a/libcpp/po/es.po
+++ b/libcpp/po/es.po
@@ -1,22 +1,22 @@
-# Spanish localization for cpplib-8.1-b20180128.
-# Copyright (C) 2001 - 2018 Free Software Foundation, Inc.
+# Spanish localization for cppli
+# Copyright (C) 2001 - 2021 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gcc package.
 # Cristian Othón Martínez Vera <cfuga@cfuga.mx>, 2001 - 2012.
 # Francisco Javier Serrador <fserrador@gmail.com>, 2018.
+# Antonio Ceballos Roa <aceballos@gmail.com>, 2021.
 msgid ""
 msgstr ""
-"Project-Id-Version: cpplib 8.1-b20180128\n"
+"Project-Id-Version: cpplib 10.1-b20200209\n"
 "Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
 "POT-Creation-Date: 2020-02-07 22:33+0000\n"
-"PO-Revision-Date: 2018-03-23 19:16+0100\n"
-"Last-Translator: Francisco Javier Serrador <fserrador@gmail.com>\n"
+"PO-Revision-Date: 2021-01-07 11:33+0100\n"
+"Last-Translator: Antonio Ceballos Roa <aceballos@gmail.com>\n"
 "Language-Team: Spanish <es@tp.org.es>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
-"X-Generator: Poedit 2.0.4\n"
 
 #: charset.c:674
 #, c-format
@@ -90,7 +90,7 @@ msgstr "el carácter universal %.*s no es válido al inicio de un identificador"
 #: charset.c:1149
 #, c-format
 msgid "%.*s is outside the UCS codespace"
-msgstr ""
+msgstr "%.*s está fuera del espacio de código UCS"
 
 #: charset.c:1194 charset.c:2113
 msgid "converting UCN to source character set"
@@ -101,16 +101,14 @@ msgid "converting UCN to execution character set"
 msgstr "convirtiendo un NUC al conjunto de caracteres de ejecución"
 
 #: charset.c:1265
-#, fuzzy, c-format
-#| msgid "universal character %.*s is not valid in an identifier"
+#, c-format
 msgid "extended character %.*s is not valid in an identifier"
-msgstr "el carácter universal %.*s no es válido en un identificador"
+msgstr "el carácter extendido %.*s no es válido en un identificador"
 
 #: charset.c:1282
-#, fuzzy, c-format
-#| msgid "universal character %.*s is not valid at the start of an identifier"
+#, c-format
 msgid "extended character %.*s is not valid at the start of an identifier"
-msgstr "el carácter universal %.*s no es válido al inicio de un identificador"
+msgstr "el carácter extendido %.*s no es válido al inicio de un identificador"
 
 #: charset.c:1368
 msgid "the meaning of '\\x' is different in traditional C"
@@ -215,10 +213,9 @@ msgid "invalid preprocessing directive #%s"
 msgstr "directiva de preprocesamiento #%s inválida"
 
 #: directives.c:601
-#, fuzzy, c-format
-#| msgid "\"defined\" cannot be used as a macro name"
+#, c-format
 msgid "\"%s\" cannot be used as a macro name"
-msgstr "«defined» no se puede utilizarse como un nombre de macro"
+msgstr "«%s» no puede utilizarse como nombre de macro"
 
 #: directives.c:608
 #, c-format
@@ -256,7 +253,7 @@ msgstr "nombre de fichero vacío en #%s"
 #: directives.c:838
 #, c-format
 msgid "#include nested depth %u exceeds maximum of %u (use -fmax-include-depth=DEPTH to increase the maximum)"
-msgstr ""
+msgstr "la profundidad anidada %u de #include excede el máximo %u (utilice -fmax-include-depth=PROFUNDIDAD para aumentar el máximo)"
 
 #: directives.c:883
 msgid "#include_next in primary source file"
@@ -372,7 +369,7 @@ msgstr "el fichero actual es más antiguo que %s"
 #: directives.c:1749
 #, c-format
 msgid "invalid \"#pragma GCC %s\" directive"
-msgstr "directiva \"#pragma GCC %s\" inválida"
+msgstr "directiva «#pragma GCC %s» inválida"
 
 #: directives.c:1950
 msgid "_Pragma takes a parenthesized string literal"
@@ -451,7 +448,7 @@ msgstr "las constantes de coma fija son una extensión GCC"
 
 #: expr.c:651
 msgid "invalid prefix \"0b\" for floating constant"
-msgstr "prefijo \"0b\" inválido en la constante de coma flotante"
+msgstr "prefijo «0b» inválido en la constante de coma flotante"
 
 #: expr.c:664
 msgid "use of C++17 hexadecimal floating constant"
@@ -464,7 +461,7 @@ msgstr "uso de una constante de coma flotante hexadecimal C99"
 #: expr.c:711
 #, c-format
 msgid "invalid suffix \"%.*s\" on floating constant"
-msgstr "sufijo \"%.*s\" inválido en la constante de coma flotante"
+msgstr "sufijo «%.*s» inválido en la constante de coma flotante"
 
 #: expr.c:722 expr.c:789
 #, c-format
@@ -478,18 +475,16 @@ msgstr "el sufijo para una constante doble es una extensión GCC"
 #: expr.c:736
 #, c-format
 msgid "invalid suffix \"%.*s\" with hexadecimal floating constant"
-msgstr "sufijo \"%.*s\" inválido en la constante de coma flotante hexadecimal"
+msgstr "sufijo «%.*s» inválido en la constante de coma flotante hexadecimal"
 
 #: expr.c:749 expr.c:753
-#, fuzzy
-#| msgid "decimal float constants are a GCC extension"
 msgid "decimal float constants are a C2X feature"
-msgstr "las constantes de coma flotante decimal son una extensión GCC"
+msgstr "las constantes de coma flotante decimal son una característica de C2X"
 
 #: expr.c:772
 #, c-format
 msgid "invalid suffix \"%.*s\" on integer constant"
-msgstr "sufijo \"%.*s\" inválido en la constante entera"
+msgstr "sufijo «%.*s» inválido en la constante entera"
 
 #: expr.c:797
 msgid "use of C++11 long long integer constant"
@@ -521,11 +516,11 @@ msgstr "la constante entera es tan grande que es unsigned"
 
 #: expr.c:1043
 msgid "missing ')' after \"defined\""
-msgstr "falta ')' después de \"defined\""
+msgstr "falta ')' después de «defined»"
 
 #: expr.c:1050
 msgid "operator \"defined\" requires an identifier"
-msgstr "el operador \"defined\" requiere un identificador"
+msgstr "el operador «defined» requiere un identificador"
 
 #: expr.c:1058
 #, c-format
@@ -534,7 +529,7 @@ msgstr "(«%s» es una marca alternativa para «%s» en C++)"
 
 #: expr.c:1070
 msgid "this use of \"defined\" may not be portable"
-msgstr "este uso de \"defined\" puede no ser transportable"
+msgstr "este uso de «defined» puede no ser transportable"
 
 #: expr.c:1113
 msgid "user-defined literal in preprocessor expression"
@@ -680,7 +675,7 @@ msgstr "se ignora el trigrafo ??%c, use -trigraphs para reconocerlo"
 
 #: lex.c:1204
 msgid "\"/*\" within comment"
-msgstr "\"/*\" dentro de un comentario"
+msgstr "«/*» dentro de un comentario"
 
 #: lex.c:1262
 #, c-format
@@ -787,28 +782,24 @@ msgid "'##' cannot appear at either end of __VA_OPT__"
 msgstr "'##' no puede aparecer o en el final de una __VA_OPT__"
 
 #: macro.c:364
-#, fuzzy, c-format
-#| msgid "%s in preprocessing directive"
+#, c-format
 msgid "\"%s\" used outside of preprocessing directive"
-msgstr "%s en la directiva de preprocesamiento"
+msgstr "se ha utilizado «%s» fuera de directiva de preprocesamiento"
 
 #: macro.c:374
-#, fuzzy, c-format
-#| msgid "missing '(' in expression"
+#, c-format
 msgid "missing '(' before \"%s\" operand"
-msgstr "falta '(' en la expresión"
+msgstr "falta '(' antes del operando «%s»"
 
 #: macro.c:389
-#, fuzzy, c-format
-#| msgid "operator \"__has_include__\" requires a header string"
+#, c-format
 msgid "operator \"%s\" requires a header-name"
-msgstr "el operador \"__has_include__\" requiere una cadena cabecera"
+msgstr "el operador «%s» requiere un nombre cabecera"
 
 #: macro.c:406
-#, fuzzy, c-format
-#| msgid "missing ')' after \"defined\""
+#, c-format
 msgid "missing ')' after \"%s\" operand"
-msgstr "falta ')' después de \"defined\""
+msgstr "falta ')' después del operando «%s»"
 
 #: macro.c:426
 #, c-format
@@ -848,11 +839,11 @@ msgstr "pegar «%s» y «%s» no da un elemento válido de preprocesamiento"
 
 #: macro.c:1030
 msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
-msgstr "ISO C++ requiere al menos un argumento: para la \"...\" en una macro variadic"
+msgstr "ISO C++ requiere al menos un argumento: para la «...» en una macro variadic"
 
 #: macro.c:1034
 msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
-msgstr "ISO C99 requiere al menos un argumento para la \"...\" en una macro variadic"
+msgstr "ISO C99 requiere al menos un argumento para la «...» en una macro variadic"
 
 #: macro.c:1041
 #, c-format
@@ -892,26 +883,24 @@ msgstr "parámetro de macro «%s» duplicado"
 #: macro.c:3223
 #, c-format
 msgid "expected parameter name, found \"%s\""
-msgstr ""
+msgstr "se esperaba un nombre de parámetro; se ha encontrado «%s»"
 
 #: macro.c:3224
 #, c-format
 msgid "expected ',' or ')', found \"%s\""
-msgstr ""
+msgstr "se esperaba ',' o ')'; se ha encontrado «%s»"
 
 #: macro.c:3225
 msgid "expected parameter name before end of line"
-msgstr ""
+msgstr "se esperaba un nombre de parámetro antes del fin de línea"
 
 #: macro.c:3226
-#, fuzzy
-#| msgid "unexpected end of file after #line"
 msgid "expected ')' before end of line"
-msgstr "fin de fichero inesperado después de #line"
+msgstr "se esperaba ')' antes del fin de línea"
 
 #: macro.c:3227
 msgid "expected ')' after \"...\""
-msgstr ""
+msgstr "se esperaba ')' después de «...»"
 
 #: macro.c:3284
 msgid "anonymous variadic macros were introduced in C++11"
diff --git a/libcpp/symtab.c b/libcpp/symtab.c
index b2f1833..9a2fae0 100644
--- a/libcpp/symtab.c
+++ b/libcpp/symtab.c
@@ -1,5 +1,5 @@
 /* Hash tables.
-   Copyright (C) 2000-2020 Free Software Foundation, Inc.
+   Copyright (C) 2000-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 the
diff --git a/libcpp/system.h b/libcpp/system.h
index 0a0629d..ee5fbe2 100644
--- a/libcpp/system.h
+++ b/libcpp/system.h
@@ -1,6 +1,6 @@
 /* Get common system includes and various definitions and declarations based
    on autoconf macros.
-   Copyright (C) 1998-2020 Free Software Foundation, Inc.
+   Copyright (C) 1998-2021 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
diff --git a/libcpp/traditional.c b/libcpp/traditional.c
index 225e3c2..92d0dd1 100644
--- a/libcpp/traditional.c
+++ b/libcpp/traditional.c
@@ -1,5 +1,5 @@
 /* CPP Library - traditional lexical analysis and macro expansion.
-   Copyright (C) 2002-2020 Free Software Foundation, Inc.
+   Copyright (C) 2002-2021 Free Software Foundation, Inc.
    Contributed by Neil Booth, May 2002
 
 This program is free software; you can redistribute it and/or modify it
diff --git a/libcpp/ucnid.h b/libcpp/ucnid.h
index 153b3d7..24419ad 100644
--- a/libcpp/ucnid.h
+++ b/libcpp/ucnid.h
@@ -1,5 +1,5 @@
 /* Unicode characters and various properties.
-   Copyright (C) 2003-2020 Free Software Foundation, Inc.
+   Copyright (C) 2003-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 the
diff --git a/libcpp/ucnid.tab b/libcpp/ucnid.tab
index 1499661..6542d11 100644
--- a/libcpp/ucnid.tab
+++ b/libcpp/ucnid.tab
@@ -1,5 +1,5 @@
 ; Table of UCNs which are valid in identifiers.
-; Copyright (C) 2003-2020 Free Software Foundation, Inc.
+; Copyright (C) 2003-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 the