mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-06-12 11:28:21 +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 a8a5dbcab8df0b3a9e04745d4fe8d64740acb323.
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
101 lines
3.1 KiB
C
101 lines
3.1 KiB
C
/* rltypedefs.h -- Type declarations for readline functions. */
|
|
|
|
/* Copyright (C) 2000-2011 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/>.
|
|
*/
|
|
|
|
#ifndef _RL_TYPEDEFS_H_
|
|
#define _RL_TYPEDEFS_H_
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
/* Old-style, attempt to mark as deprecated in some way people will notice. */
|
|
|
|
#if !defined (_FUNCTION_DEF)
|
|
# define _FUNCTION_DEF
|
|
|
|
#if defined(__GNUC__) || defined(__clang__)
|
|
typedef int Function () __attribute__ ((deprecated));
|
|
typedef void VFunction () __attribute__ ((deprecated));
|
|
typedef char *CPFunction () __attribute__ ((deprecated));
|
|
typedef char **CPPFunction () __attribute__ ((deprecated));
|
|
#else
|
|
typedef int Function ();
|
|
typedef void VFunction ();
|
|
typedef char *CPFunction ();
|
|
typedef char **CPPFunction ();
|
|
#endif
|
|
|
|
#endif /* _FUNCTION_DEF */
|
|
|
|
/* New style. */
|
|
|
|
#if !defined (_RL_FUNCTION_TYPEDEF)
|
|
# define _RL_FUNCTION_TYPEDEF
|
|
|
|
/* Bindable functions */
|
|
typedef int rl_command_func_t PARAMS((int, int));
|
|
|
|
/* Typedefs for the completion system */
|
|
typedef char *rl_compentry_func_t PARAMS((const char *, int));
|
|
typedef char **rl_completion_func_t PARAMS((const char *, int, int));
|
|
|
|
typedef char *rl_quote_func_t PARAMS((char *, int, char *));
|
|
typedef char *rl_dequote_func_t PARAMS((char *, int));
|
|
|
|
typedef int rl_compignore_func_t PARAMS((char **));
|
|
|
|
typedef void rl_compdisp_func_t PARAMS((char **, int, int));
|
|
|
|
/* Type for input and pre-read hook functions like rl_event_hook */
|
|
typedef int rl_hook_func_t PARAMS((void));
|
|
|
|
/* Input function type */
|
|
typedef int rl_getc_func_t PARAMS((FILE *));
|
|
|
|
/* Generic function that takes a character buffer (which could be the readline
|
|
line buffer) and an index into it (which could be rl_point) and returns
|
|
an int. */
|
|
typedef int rl_linebuf_func_t PARAMS((char *, int));
|
|
|
|
/* `Generic' function pointer typedefs */
|
|
typedef int rl_intfunc_t PARAMS((int));
|
|
#define rl_ivoidfunc_t rl_hook_func_t
|
|
typedef int rl_icpfunc_t PARAMS((char *));
|
|
typedef int rl_icppfunc_t PARAMS((char **));
|
|
|
|
typedef void rl_voidfunc_t PARAMS((void));
|
|
typedef void rl_vintfunc_t PARAMS((int));
|
|
typedef void rl_vcpfunc_t PARAMS((char *));
|
|
typedef void rl_vcppfunc_t PARAMS((char **));
|
|
|
|
typedef char *rl_cpvfunc_t PARAMS((void));
|
|
typedef char *rl_cpifunc_t PARAMS((int));
|
|
typedef char *rl_cpcpfunc_t PARAMS((char *));
|
|
typedef char *rl_cpcppfunc_t PARAMS((char **));
|
|
|
|
#endif /* _RL_FUNCTION_TYPEDEF */
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* _RL_TYPEDEFS_H_ */
|