mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2025-01-18 12:24:38 +08:00
6999161a2a
readline turns out to be a bit of a stumbling block for the project to
move gdbsupport (and then gdbserver) to the top-level.
The issue is that readline headers are intended to be included with
names like "readline/readline.h". To support this, gdb effectively
adds a -I option pointing to the top-level source directory -- but,
importantly, this option is not used when the system readline is used.
For gdbsupport, a -I option like this would always be needed, but that
in turn would break the system readline case. This was PR build/17077,
fixed in commit a8a5dbcab8.
Previously, we had discussed this on the gdb-patches list in terms of
removing readline from the tree
https://sourceware.org/ml/gdb-patches/2019-09/msg00317.html
However, Eli expressed some concerns, and Joel did as well (off-list).
Given those concerns, and the fact that a patch-free local readline is
relatively new in gdb (it was locally patched for years), I changed my
mind and decided to handle this situation by moving the readline
sources down a level.
That is, upstream readline is now in readline/readline, and the
top-level readline directory just contains the minimal configury
needed to build that.
This fixes the problem because, when gdb unconditionally adds a
-I$(top_srcdir), this will not find readline headers. A separate -I
will be needed instead, which is exactly what's needed for
--with-system-readline.
gdb/ChangeLog
2019-10-23 Tom Tromey <tom@tromey.com>
* Makefile.in (READLINE_DIR): Update.
gdb/doc/ChangeLog
2019-10-23 Tom Tromey <tom@tromey.com>
* Makefile.in (READLINE_DIR): Update.
readline/ChangeLog
2019-10-23 Tom Tromey <tom@tromey.com>
Move old contents to readline/ subdirectory.
* aclocal.m4, configure, configure.ac, .gitignore, Makefile.am,
Makefile.in, README: New files.
Change-Id: Ice156a2ee09ea68722b48f64d97146d7428ea9e4
81 lines
2.5 KiB
C
81 lines
2.5 KiB
C
/* rltty.h - tty driver-related definitions used by some library files. */
|
|
|
|
/* Copyright (C) 1995-2009 Free Software Foundation, Inc.
|
|
|
|
This file is part of the GNU Readline Library (Readline), a library
|
|
for reading lines of text with interactive input and history editing.
|
|
|
|
Readline 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.
|
|
|
|
Readline 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 Readline. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#if !defined (_RLTTY_H_)
|
|
#define _RLTTY_H_
|
|
|
|
/* Posix systems use termios and the Posix signal functions. */
|
|
#if defined (TERMIOS_TTY_DRIVER)
|
|
# include <termios.h>
|
|
#endif /* TERMIOS_TTY_DRIVER */
|
|
|
|
/* System V machines use termio. */
|
|
#if defined (TERMIO_TTY_DRIVER)
|
|
# include <termio.h>
|
|
# if !defined (TCOON)
|
|
# define TCOON 1
|
|
# endif
|
|
#endif /* TERMIO_TTY_DRIVER */
|
|
|
|
/* Other (BSD) machines use sgtty. */
|
|
#if defined (NEW_TTY_DRIVER)
|
|
# include <sgtty.h>
|
|
#endif
|
|
|
|
#include "rlwinsize.h"
|
|
|
|
/* Define _POSIX_VDISABLE if we are not using the `new' tty driver and
|
|
it is not already defined. It is used both to determine if a
|
|
special character is disabled and to disable certain special
|
|
characters. Posix systems should set to 0, USG systems to -1. */
|
|
#if !defined (NEW_TTY_DRIVER) && !defined (_POSIX_VDISABLE)
|
|
# if defined (_SVR4_VDISABLE)
|
|
# define _POSIX_VDISABLE _SVR4_VDISABLE
|
|
# else
|
|
# if defined (_POSIX_VERSION)
|
|
# define _POSIX_VDISABLE 0
|
|
# else /* !_POSIX_VERSION */
|
|
# define _POSIX_VDISABLE -1
|
|
# endif /* !_POSIX_VERSION */
|
|
# endif /* !_SVR4_DISABLE */
|
|
#endif /* !NEW_TTY_DRIVER && !_POSIX_VDISABLE */
|
|
|
|
typedef struct _rl_tty_chars {
|
|
unsigned char t_eof;
|
|
unsigned char t_eol;
|
|
unsigned char t_eol2;
|
|
unsigned char t_erase;
|
|
unsigned char t_werase;
|
|
unsigned char t_kill;
|
|
unsigned char t_reprint;
|
|
unsigned char t_intr;
|
|
unsigned char t_quit;
|
|
unsigned char t_susp;
|
|
unsigned char t_dsusp;
|
|
unsigned char t_start;
|
|
unsigned char t_stop;
|
|
unsigned char t_lnext;
|
|
unsigned char t_flush;
|
|
unsigned char t_status;
|
|
} _RL_TTY_CHARS;
|
|
|
|
#endif /* _RLTTY_H_ */
|