From: Pedro Alves Date: Thu, 26 Feb 2015 17:13:58 +0000 (+0000) Subject: Rename windows-termcap.c -> stub-termcap.c X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=532f44ed674a74edc1ef1aa6fd7fed911413e1ba;p=binutils-gdb.git Rename windows-termcap.c -> stub-termcap.c Preparation for using this on all hosts. Confirmed that --host=x86_64-w64-mingw32 still builds the stub termcap. gdb/ChangeLog: 2015-02-26 Pedro Alves * windows-termcap.c: Rename to ... * stub-termcap.c: ... this. Adjust header line. * Makefile.in (SFILES): Refer to stub-termcap.c instead of windows-termcap.c. * configure: Regenerate. * configure.ac: Refer to stub-termcap.o instead of windows-termcap.o. * gdb_curses.h: Mention stub-termcap.c instead of windows-termcap.c. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3b21d8c3729..1804b2170a6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,15 @@ +2015-02-26 Pedro Alves + + * windows-termcap.c: Rename to ... + * stub-termcap.c: ... this. Adjust header line. + * Makefile.in (SFILES): Refer to stub-termcap.c instead of + windows-termcap.c. + * configure: Regenerate. + * configure.ac: Refer to stub-termcap.o instead of + windows-termcap.o. + * gdb_curses.h: Mention stub-termcap.c instead of + windows-termcap.c. + 2015-02-26 Jan Kratochvil * compile/compile-c-symbols.c (convert_one_symbol, convert_symbol_bmsym) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 16e2f1c946b..e9f22d6a4ba 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -868,7 +868,7 @@ SFILES = ada-exp.y ada-lang.c ada-typeprint.c ada-valprint.c ada-tasks.c \ jit.c \ xml-syscall.c \ annotate.c common/signals.c copying.c dfp.c gdb.c inf-child.c \ - sol-thread.c windows-termcap.c \ + sol-thread.c stub-termcap.c \ common/gdb_vecs.c common/common-utils.c common/xml-utils.c \ common/ptid.c common/buffer.c gdb-dlfcn.c common/agent.c \ common/format.c common/filestuff.c btrace.c record-btrace.c ctf.c \ diff --git a/gdb/configure b/gdb/configure index bb9697d481e..88fbaab5e24 100755 --- a/gdb/configure +++ b/gdb/configure @@ -7190,7 +7190,7 @@ case $host_os in *mingw32*) if test x"$curses_found" != xyes; then ac_cv_search_tgetent="none required" - CONFIG_OBS="$CONFIG_OBS windows-termcap.o" + CONFIG_OBS="$CONFIG_OBS stub-termcap.o" fi ;; esac diff --git a/gdb/configure.ac b/gdb/configure.ac index 90bf71cd73e..6ac8adb4fac 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -613,7 +613,7 @@ case $host_os in *mingw32*) if test x"$curses_found" != xyes; then ac_cv_search_tgetent="none required" - CONFIG_OBS="$CONFIG_OBS windows-termcap.o" + CONFIG_OBS="$CONFIG_OBS stub-termcap.o" fi ;; esac diff --git a/gdb/gdb_curses.h b/gdb/gdb_curses.h index f575a016fa2..9b3707ae6d1 100644 --- a/gdb/gdb_curses.h +++ b/gdb/gdb_curses.h @@ -48,7 +48,7 @@ #include #else /* On MinGW, a real termcap library is usually not present. Stub versions - of the termcap functions will be built from windows-termcap.c. Readline + of the termcap functions will be built from stub-termcap.c. Readline provides its own extern declarations when there's no termcap.h; do the same here for the termcap functions used in GDB. */ extern int tgetnum (const char *); diff --git a/gdb/stub-termcap.c b/gdb/stub-termcap.c new file mode 100644 index 00000000000..cc8632ca192 --- /dev/null +++ b/gdb/stub-termcap.c @@ -0,0 +1,76 @@ +/* A very minimal do-nothing termcap emulation stub. + + Copyright (C) 2005-2015 Free Software Foundation, Inc. + + Contributed by CodeSourcery, LLC. + + This file is part of GDB. + + 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 Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + + +#include "defs.h" + +#include + +/* -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 char *tgoto (const char *cap, int col, int row); + +/* 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. */ + +int +tgetent (char *buffer, char *termtype) +{ + return -1; +} + +int +tgetnum (char *name) +{ + return -1; +} + +int +tgetflag (char *name) +{ + return -1; +} + +char * +tgetstr (char *name, char **area) +{ + return NULL; +} + +int +tputs (char *string, int nlines, int (*outfun) ()) +{ + while (*string) + outfun (*string++); + + return 0; +} + +char * +tgoto (const char *cap, int col, int row) +{ + return NULL; +} diff --git a/gdb/windows-termcap.c b/gdb/windows-termcap.c deleted file mode 100644 index caafc47bf39..00000000000 --- a/gdb/windows-termcap.c +++ /dev/null @@ -1,76 +0,0 @@ -/* Win32 termcap emulation. - - Copyright (C) 2005-2015 Free Software Foundation, Inc. - - Contributed by CodeSourcery, LLC. - - This file is part of GDB. - - 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 Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - - -#include "defs.h" - -#include - -/* -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 char *tgoto (const char *cap, int col, int row); - -/* 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. */ - -int -tgetent (char *buffer, char *termtype) -{ - return -1; -} - -int -tgetnum (char *name) -{ - return -1; -} - -int -tgetflag (char *name) -{ - return -1; -} - -char * -tgetstr (char *name, char **area) -{ - return NULL; -} - -int -tputs (char *string, int nlines, int (*outfun) ()) -{ - while (*string) - outfun (*string++); - - return 0; -} - -char * -tgoto (const char *cap, int col, int row) -{ - return NULL; -}