Skip to content

Commit

Permalink
Imported readline 6.2, and upstream patch 001.
Browse files Browse the repository at this point in the history
[patch 0/3] readline-6.2 rebase
http://sourceware.org/ml/gdb-patches/2011-05/msg00003.html
[patch 1/3] readline-6.2: Merge of already posted patches
http://sourceware.org/ml/gdb-patches/2011-05/msg00004.html
	=
	[Bug-readline] [RFC/readline] bind.c, rl_function_dumper, Free allocated
	http://lists.gnu.org/archive/html/bug-readline/2011-03/msg00000.html
	[Bug-readline] [patch] Fix underquotation in readline/examples/rlfe/conf
	http://lists.gnu.org/archive/html/bug-readline/2011-04/msg00001.html
	[Bug-readline] [patch] Makefile.in htm<->html
	http://lists.gnu.org/archive/html/bug-readline/2011-04/msg00002.html
	Re: [Bug-readline] [patch] Makefile.in dependency: callback.o: xmalloc.h
	http://lists.gnu.org/archive/html/bug-readline/2011-04/msg00004.html
	[Bug-readline] [patch] Remove . from the VPATH directive
	http://lists.gnu.org/archive/html/bug-readline/2011-04/msg00005.html
	Eli Zaretskii's __MSDOS__ / __GO32__ / __MINGW32__ / __DJGPP__ stuff:
	http://sourceware.org/ml/gdb/2011-04/msg00002.html
	Jan Kratochvil's patch for FSF GDB tree local-specific changes:
	http://sourceware.org/ml/gdb/2011-04/msg00006.html
	Preservation of existing ChangeLog.gdb files, their updates.
[patch 2/3] readline-6.2: Workaround "ask" regression
http://sourceware.org/ml/gdb-patches/2011-05/msg00005.html
[patch 3/3] readline-6.2: Revert 5.x compat., apply 6.x compat.
http://sourceware.org/ml/gdb-patches/2011-05/msg00006.html
[patch 4/3] readline-6.2: Substitute inc-hist.texinfo
http://sourceware.org/ml/gdb-patches/2011-05/msg00010.html

readline/
	Workaround gdb.base/completion.exp regression on readline-6.2.
	* complete.c (get_y_or_n): Disable the return on RL_STATE_CALLBACK.

	Imported readline 6.2, and upstream patch 001.
	* configure: Regenerate.

readline/doc/
	* hsuser.texi (Using History Interactively): Disable !BashFeatures
	@defcodeindex.  Make the `Programming with GNU History' reference
	external.
	* inc-hist.texinfo: Remove.

	Imported readline 6.2, and upstream patch 001.

readline/examples/
	Imported readline 6.2, and upstream patch 001.

readline/examples/rlfe/
	Imported readline 6.2, and upstream patch 001.

gdb/
	* config.in: Regenerate.
	* configure: Regenerate.
	* configure.ac <--with-system-readline> (for readline_echoing_p):
	Remove the test.
	* tui/tui-io.c (tui_old_readline_echoing_p): Rename to ...
	(tui_old_rl_echoing_p): ... here.
	(tui_setup_io): Rename extern declaration readline_echoing_p to
	_rl_echoing_p.  Adjust assignments for the both renames.

gdb/doc/
	* Makefile.in (GDB_DOC_SOURCE_INCLUDES): Rename inc-hist.texinfo to
	hsuser.texi.
	* gdb.texinfo <!SYSTEM_READLINE>: Rename inc-hist.texinfo inclusion and
	comment to hsuser.texi.  Change rluser.texi name in the comment.
  • Loading branch information
jankratochvil committed May 11, 2011
1 parent 4cab4ad commit cc88a64
Show file tree
Hide file tree
Showing 130 changed files with 11,007 additions and 5,053 deletions.
11 changes: 11 additions & 0 deletions gdb/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
2011-05-11 Jan Kratochvil <[email protected]>

* config.in: Regenerate.
* configure: Regenerate.
* configure.ac <--with-system-readline> (for readline_echoing_p):
Remove the test.
* tui/tui-io.c (tui_old_readline_echoing_p): Rename to ...
(tui_old_rl_echoing_p): ... here.
(tui_setup_io): Rename extern declaration readline_echoing_p to
_rl_echoing_p. Adjust assignments for the both renames.

2011-05-11 Thiago Jung Bauermann <[email protected]>

* symtab.c (lookup_symtab): Run cleanup before returning.
Expand Down
3 changes: 0 additions & 3 deletions gdb/config.in
Original file line number Diff line number Diff line change
Expand Up @@ -953,9 +953,6 @@
/* Define to `int' if <sys/types.h> does not define. */
#undef pid_t

/* readline-6.0 started to use different name. */
#undef readline_echoing_p

/* Define to the equivalent of the C99 'restrict' keyword, or to
nothing if this is not supported. Do not define if restrict is
supported directly. */
Expand Down
33 changes: 0 additions & 33 deletions gdb/configure
Original file line number Diff line number Diff line change
Expand Up @@ -9796,39 +9796,6 @@ if test "$with_system_readline" = yes; then
READLINE_DEPS=
READLINE_CFLAGS=
READLINE_TEXI_INCFLAG=

# readline-6.0 started to use the name `_rl_echoing_p'.
# `$(READLINE_DIR)/' of bundled readline would not resolve in configure.

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline_echoing_p" >&5
$as_echo_n "checking for readline_echoing_p... " >&6; }
save_LIBS=$LIBS
LIBS="$LIBS $READLINE"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
main ()
{
extern int readline_echoing_p;
return readline_echoing_p;
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
READLINE_ECHOING_P=yes
else
READLINE_ECHOING_P=no

$as_echo "#define readline_echoing_p _rl_echoing_p" >>confdefs.h

fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$save_LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINE_ECHOING_P" >&5
$as_echo "$READLINE_ECHOING_P" >&6; }
else
READLINE='$(READLINE_DIR)/libreadline.a'
READLINE_DEPS='$(READLINE)'
Expand Down
15 changes: 0 additions & 15 deletions gdb/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -562,21 +562,6 @@ if test "$with_system_readline" = yes; then
READLINE_DEPS=
READLINE_CFLAGS=
READLINE_TEXI_INCFLAG=

# readline-6.0 started to use the name `_rl_echoing_p'.
# `$(READLINE_DIR)/' of bundled readline would not resolve in configure.

AC_MSG_CHECKING([for readline_echoing_p])
save_LIBS=$LIBS
LIBS="$LIBS $READLINE"
AC_LINK_IFELSE(AC_LANG_PROGRAM(,[[extern int readline_echoing_p;
return readline_echoing_p;]]),
[READLINE_ECHOING_P=yes],
[READLINE_ECHOING_P=no
AC_DEFINE([readline_echoing_p], [_rl_echoing_p],
[readline-6.0 started to use different name.])])
LIBS="$save_LIBS"
AC_MSG_RESULT([$READLINE_ECHOING_P])
else
READLINE='$(READLINE_DIR)/libreadline.a'
READLINE_DEPS='$(READLINE)'
Expand Down
7 changes: 7 additions & 0 deletions gdb/doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
2011-05-11 Jan Kratochvil <[email protected]>

* Makefile.in (GDB_DOC_SOURCE_INCLUDES): Rename inc-hist.texinfo to
hsuser.texi.
* gdb.texinfo <!SYSTEM_READLINE>: Rename inc-hist.texinfo inclusion and
comment to hsuser.texi. Change rluser.texi name in the comment.

2011-05-10 Doug Evans <[email protected]>

* gdb.texinfo (Threads): If an empty path is provided for
Expand Down
2 changes: 1 addition & 1 deletion gdb/doc/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ GDB_DOC_SOURCE_INCLUDES = \
$(srcdir)/gpl.texi \
$(srcdir)/agentexpr.texi \
$(READLINE_DIR)/rluser.texi \
$(READLINE_DIR)/inc-hist.texinfo
$(READLINE_DIR)/hsuser.texi
GDB_DOC_BUILD_INCLUDES = \
gdb-cfg.texi \
GDBvn.texi
Expand Down
6 changes: 3 additions & 3 deletions gdb/doc/gdb.texinfo
Original file line number Diff line number Diff line change
Expand Up @@ -31025,13 +31025,13 @@ things without first using the debugger to find the facts.

@c The readline documentation is distributed with the readline code
@c and consists of the two following files:
@c rluser.texinfo
@c inc-hist.texinfo
@c rluser.texi
@c hsuser.texi
@c Use -I with makeinfo to point to the appropriate directory,
@c environment var TEXINPUTS with TeX.
@ifclear SYSTEM_READLINE
@include rluser.texi
@include inc-hist.texinfo
@include hsuser.texi
@end ifclear

@node In Memoriam
Expand Down
12 changes: 6 additions & 6 deletions gdb/tui/tui-io.c
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ static Function *tui_old_rl_getc_function;
static VFunction *tui_old_rl_redisplay_function;
static VFunction *tui_old_rl_prep_terminal;
static VFunction *tui_old_rl_deprep_terminal;
static int tui_old_readline_echoing_p;
static int tui_old_rl_echoing_p;

/* Readline output stream.
Should be removed when readline is clean. */
Expand Down Expand Up @@ -506,8 +506,8 @@ tui_rl_display_match_list (char **matches, int len, int max)
void
tui_setup_io (int mode)
{
extern int readline_echoing_p;
extern int _rl_echoing_p;

if (mode)
{
/* Redirect readline to TUI. */
Expand All @@ -516,12 +516,12 @@ tui_setup_io (int mode)
tui_old_rl_prep_terminal = rl_prep_term_function;
tui_old_rl_getc_function = rl_getc_function;
tui_old_rl_outstream = rl_outstream;
tui_old_readline_echoing_p = readline_echoing_p;
tui_old_rl_echoing_p = _rl_echoing_p;
rl_redisplay_function = tui_redisplay_readline;
rl_deprep_term_function = tui_deprep_terminal;
rl_prep_term_function = tui_prep_terminal;
rl_getc_function = tui_getc;
readline_echoing_p = 0;
_rl_echoing_p = 0;
rl_outstream = tui_rl_outstream;
rl_prompt = 0;
rl_completion_display_matches_hook = tui_rl_display_match_list;
Expand Down Expand Up @@ -560,7 +560,7 @@ tui_setup_io (int mode)
rl_getc_function = tui_old_rl_getc_function;
rl_outstream = tui_old_rl_outstream;
rl_completion_display_matches_hook = 0;
readline_echoing_p = tui_old_readline_echoing_p;
_rl_echoing_p = tui_old_rl_echoing_p;
rl_already_prompted = 0;

/* Save tty for SIGCONT. */
Expand Down
175 changes: 175 additions & 0 deletions readline/CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -918,3 +918,178 @@ configure.in
- changed release status to `release'

[readline-5.1 frozen]

12/9
----
[readline-5.1 released]

12/14
-----
examples/rlfe/Makefile.in
- add @LIBS@ to LIBS assignment to pick up extra libraries from
configure

1/3/2006
--------
support/shlib-install
- Install shared libraries with execute bit set on Linux

6/9
---
[readline-5.2-alpha frozen]

6/26
----
configure.in
- set CROSS_COMPILE to the empty string by default, so we don't inherit
a random value from the environment

7/8
---
[readline-5.2-alpha released]


[readline-5.2-beta released]

9/12
----
config.h.in
- add defines for wcscoll, iswctype, iswupper, iswlower, towupper,
towlower functions
- replace define for wctomb with one for wcrtomb
- add defines for wchar_t, wint_t, wctype_t types

10/11
-----
[readline-5.2 released]

11/9
----
examples/rlfe/{configure.in,Makefile.in,config.h.in,rlfe.c,pty.c}
- portability fixes from Mike Frysinger <[email protected]>

11/21
-----
Makefile.in
- add `install-examples' and `uninstall-examples' targets

examples/Makefile.in
- add correct variables to build examples on Windows
- add appropriate rules to install and uninstall example sources in
$(datadir)/readline

11/27
-----
config.h.in
- move #undef of HAVE_STRCOLL out of config.h.in, since autoconf tries
to substitute it based on configure tests

4/27/2007
---------
examples/autoconf
- new directory with example autoconf macros to detect readline and
return information about the installed version

6/13
----
support/shlib-install
- changes to support AIX 5.x shared library installation

3/20/2008
---------
support/shlib-install
- add support for NetBSD and Interix shared library installation

4/22
----
support/wcwidth.c
- updated implementation from 2007-05

7/18
----
support/shlib-install
- support for mingw32, contributed by Carlo Bramix <[email protected]>

8/4
---
configure.in
- changed to readline-6.0

8/18
----
support/config.{guess,sub}
- updated to newer versions from autoconf-2.62 distribution

3/5/2009
--------
support/shlib-install
- take a new -V host_vendor argument
- add ${host_vendor} to string tested in case statement for symlink
creation section
- add support for FreeBSD/gentoo, which uses Linux library naming
scheme
- change FreeBSD symlink rules, since FreeBSD 7+ has only ELF shared
libraries. DragonflyBSD rules are the same. Fix from Timothy
Redaelli <[email protected]>

shlib/Makefile.in
- add definition of host_vendor, substituted by configure
- add -V host_vendor argument to all invocations of shlib-install.
Fix from Timothy Redaelli <[email protected]>

3/10
----
configure.in
- add call to AC_SYS_LARGEFILE for readdir and largefile support on
Linux

config.h.in
- add _FILE_OFFSET_BITS define

4/19
----
Makefile.in
- add targets for making and installing documentation required by GNU
coding standards. Fix from Joseph Myers <[email protected]>

posixselect.h
- pick up from bash. Inspired by Mike Frysinger <[email protected]>

10/28
-----
support/shlib-install
- decrease the default version of FreeBSD that installs shared libraries
to 4.x. Advice from Peter Jeremy <[email protected]>

12/18
-----
[readline-6.1-rc1 released]

12/23
-----
doc/Makefile.in
- make sure $(topdir) is not ".." before removing all of the formatted
documentation in `make distclean'. $(topdir) is set to `..' if
readline is being built in the source directory. Fixes problem
noticed by THOUMIN Damien <[email protected]>

12/29
-----
[readline-6.1 frozen]

2/5/2010
--------
examples/Makefile.in
- make sure to install example C files using $(srcdir)/$$f in case
we're building outside the source directory. Bug report and fix
from Peter Breitenlohner <[email protected]>

7/25
----
xfree.c
- new file with xfree() implementation, moved from xmalloc.c

12/28
-----
{examples,shlib}/Makefile.in
- Cygwin-based changes from Eric Blake <[email protected]>
Loading

0 comments on commit cc88a64

Please sign in to comment.