Pass dwarf2_cu objects to dwo-related functions, instead of dwarf2_per_cu_data

[deliverable/binutils-gdb.git] / gdb / stub-termcap.c

diff --git a/gdb/stub-termcap.c b/gdb/stub-termcap.c
index cc8632ca192d1dd47e745271142dc9dc68b3b536..3f868b4b2f9b5797736fbccf17c591772ca28dbd 100644 (file)
--- a/gdb/stub-termcap.c
+++ b/gdb/stub-termcap.c
@@ -1,6 +1,6 @@
 /* A very minimal do-nothing termcap emulation stub.
 
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2020 Free Software Foundation, Inc.
 
    Contributed by CodeSourcery, LLC.
 
@@ -22,19 +22,40 @@
 
 #include "defs.h"
 
-#include <stdlib.h>
+extern "C" {
 
 /* -Wmissing-prototypes */
 extern int tgetent (char *buffer, char *termtype);
 extern int tgetnum (char *name);
 extern int tgetflag (char *name);
 extern char* tgetstr (char *name, char **area);
-extern int tputs (char *string, int nlines, int (*outfun) ());
+extern int tputs (char *string, int nlines, int (*outfun) (int));
 extern char *tgoto (const char *cap, int col, int row);
 
+}
+
+/* These globals below are global termcap variables that readline
+   references.
+
+   Actually, depending on preprocessor conditions that we don't want
+   to mirror here (as they may change depending on readline versions),
+   readline may define these globals as well, relying on the linker
+   merging them if needed (-fcommon).  That doesn't work with
+   -fno-common or C++, so instead we define the symbols as weak.
+   Don't do this on Windows though, as MinGW gcc 3.4.2 doesn't support
+   weak (later versions, e.g., 4.8, do support it).  Given this stub
+   file originally was Windows only, and we only needed this when we
+   made it work on other hosts, it should be OK.  */
+#ifndef __MINGW32__
+char PC __attribute__((weak));
+char *BC __attribute__((weak));
+char *UP __attribute__((weak));
+#endif
+
 /* Each of the files below is a minimal implementation of the standard
    termcap function with the same name, suitable for use in a Windows
-   console window.  */
+   console window, or when a real termcap/curses library isn't
+   available.  */
 
 int
 tgetent (char *buffer, char *termtype)
@@ -61,7 +82,7 @@ tgetstr (char *name, char **area)
 }
 
 int
-tputs (char *string, int nlines, int (*outfun) ())
+tputs (char *string, int nlines, int (*outfun) (int))
 {
   while (*string)
     outfun (*string++);