master 5a2125b 1/5: Merge from origin/emacs-27

[Glenn Morris]

branch: master
commit 5a2125b854b58d52554ad545f66a74e21caa6d32
Merge: ec6254e 694acda
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>

    Merge from origin/emacs-27
    
    694acda5f2 Fix compilation on TERMINFO platforms with GCC 10
    f3373901e5 Fix the font-lock-debug-fontify NEWS entry
    
    # Conflicts:
    #   etc/NEWS
---
 etc/NEWS.27    | 2 +-
 src/terminfo.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/etc/NEWS.27 b/etc/NEWS.27
index 5ef5430..32ac05d 100644
--- a/etc/NEWS.27
+++ b/etc/NEWS.27
@@ -622,7 +622,7 @@ same as the 'C-x C-+' and 'C-x C--' commands.
 This new command (which inserts an <a id="foo">_</a> skeleton) is
 bound to 'C-c C-c #'.
 
-** New command 'font-lock-refontify'.
+** New command 'font-lock-debug-fontify'.
 This is an interactive convenience function to be used when developing
 font locking for a mode.  It recomputes the font locking data and then
 re-fontifies the buffer.
diff --git a/src/terminfo.c b/src/terminfo.c
index 51fd32e..0765996 100644
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -23,9 +23,12 @@ along with GNU Emacs.  If not, see 
<https://www.gnu.org/licenses/>.  */
 
 /* Define these variables that serve as global parameters to termcap,
    so that we do not need to conditionalize the places in Emacs
-   that set them.  */
+   that set them.  But don't do that for terminfo, as that could
+   cause link errors when using -fno-common.  */
 
+#if !TERMINFO
 char *UP, *BC, PC;
+#endif
 
 /* Interface to curses/terminfo library.
    Turns out that all of the terminfo-level routines look