Skip to content

Commit cc88a64

Browse files
committed
Imported readline 6.2, and upstream patch 001.
[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.
1 parent 4cab4ad commit cc88a64

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+11007
-5053
lines changed

gdb/ChangeLog

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
2011-05-11 Jan Kratochvil <[email protected]>
2+
3+
* config.in: Regenerate.
4+
* configure: Regenerate.
5+
* configure.ac <--with-system-readline> (for readline_echoing_p):
6+
Remove the test.
7+
* tui/tui-io.c (tui_old_readline_echoing_p): Rename to ...
8+
(tui_old_rl_echoing_p): ... here.
9+
(tui_setup_io): Rename extern declaration readline_echoing_p to
10+
_rl_echoing_p. Adjust assignments for the both renames.
11+
112
2011-05-11 Thiago Jung Bauermann <[email protected]>
213

314
* symtab.c (lookup_symtab): Run cleanup before returning.

gdb/config.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -953,9 +953,6 @@
953953
/* Define to `int' if <sys/types.h> does not define. */
954954
#undef pid_t
955955

956-
/* readline-6.0 started to use different name. */
957-
#undef readline_echoing_p
958-
959956
/* Define to the equivalent of the C99 'restrict' keyword, or to
960957
nothing if this is not supported. Do not define if restrict is
961958
supported directly. */

gdb/configure

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -9796,39 +9796,6 @@ if test "$with_system_readline" = yes; then
97969796
READLINE_DEPS=
97979797
READLINE_CFLAGS=
97989798
READLINE_TEXI_INCFLAG=
9799-
9800-
# readline-6.0 started to use the name `_rl_echoing_p'.
9801-
# `$(READLINE_DIR)/' of bundled readline would not resolve in configure.
9802-
9803-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline_echoing_p" >&5
9804-
$as_echo_n "checking for readline_echoing_p... " >&6; }
9805-
save_LIBS=$LIBS
9806-
LIBS="$LIBS $READLINE"
9807-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9808-
/* end confdefs.h. */
9809-
9810-
int
9811-
main ()
9812-
{
9813-
extern int readline_echoing_p;
9814-
return readline_echoing_p;
9815-
;
9816-
return 0;
9817-
}
9818-
_ACEOF
9819-
if ac_fn_c_try_link "$LINENO"; then :
9820-
READLINE_ECHOING_P=yes
9821-
else
9822-
READLINE_ECHOING_P=no
9823-
9824-
$as_echo "#define readline_echoing_p _rl_echoing_p" >>confdefs.h
9825-
9826-
fi
9827-
rm -f core conftest.err conftest.$ac_objext \
9828-
conftest$ac_exeext conftest.$ac_ext
9829-
LIBS="$save_LIBS"
9830-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINE_ECHOING_P" >&5
9831-
$as_echo "$READLINE_ECHOING_P" >&6; }
98329799
else
98339800
READLINE='$(READLINE_DIR)/libreadline.a'
98349801
READLINE_DEPS='$(READLINE)'

gdb/configure.ac

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -562,21 +562,6 @@ if test "$with_system_readline" = yes; then
562562
READLINE_DEPS=
563563
READLINE_CFLAGS=
564564
READLINE_TEXI_INCFLAG=
565-
566-
# readline-6.0 started to use the name `_rl_echoing_p'.
567-
# `$(READLINE_DIR)/' of bundled readline would not resolve in configure.
568-
569-
AC_MSG_CHECKING([for readline_echoing_p])
570-
save_LIBS=$LIBS
571-
LIBS="$LIBS $READLINE"
572-
AC_LINK_IFELSE(AC_LANG_PROGRAM(,[[extern int readline_echoing_p;
573-
return readline_echoing_p;]]),
574-
[READLINE_ECHOING_P=yes],
575-
[READLINE_ECHOING_P=no
576-
AC_DEFINE([readline_echoing_p], [_rl_echoing_p],
577-
[readline-6.0 started to use different name.])])
578-
LIBS="$save_LIBS"
579-
AC_MSG_RESULT([$READLINE_ECHOING_P])
580565
else
581566
READLINE='$(READLINE_DIR)/libreadline.a'
582567
READLINE_DEPS='$(READLINE)'

gdb/doc/ChangeLog

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
2011-05-11 Jan Kratochvil <[email protected]>
2+
3+
* Makefile.in (GDB_DOC_SOURCE_INCLUDES): Rename inc-hist.texinfo to
4+
hsuser.texi.
5+
* gdb.texinfo <!SYSTEM_READLINE>: Rename inc-hist.texinfo inclusion and
6+
comment to hsuser.texi. Change rluser.texi name in the comment.
7+
18
2011-05-10 Doug Evans <[email protected]>
29

310
* gdb.texinfo (Threads): If an empty path is provided for

gdb/doc/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ GDB_DOC_SOURCE_INCLUDES = \
117117
$(srcdir)/gpl.texi \
118118
$(srcdir)/agentexpr.texi \
119119
$(READLINE_DIR)/rluser.texi \
120-
$(READLINE_DIR)/inc-hist.texinfo
120+
$(READLINE_DIR)/hsuser.texi
121121
GDB_DOC_BUILD_INCLUDES = \
122122
gdb-cfg.texi \
123123
GDBvn.texi

gdb/doc/gdb.texinfo

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31025,13 +31025,13 @@ things without first using the debugger to find the facts.
3102531025

3102631026
@c The readline documentation is distributed with the readline code
3102731027
@c and consists of the two following files:
31028-
@c rluser.texinfo
31029-
@c inc-hist.texinfo
31028+
@c rluser.texi
31029+
@c hsuser.texi
3103031030
@c Use -I with makeinfo to point to the appropriate directory,
3103131031
@c environment var TEXINPUTS with TeX.
3103231032
@ifclear SYSTEM_READLINE
3103331033
@include rluser.texi
31034-
@include inc-hist.texinfo
31034+
@include hsuser.texi
3103531035
@end ifclear
3103631036

3103731037
@node In Memoriam

gdb/tui/tui-io.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ static Function *tui_old_rl_getc_function;
133133
static VFunction *tui_old_rl_redisplay_function;
134134
static VFunction *tui_old_rl_prep_terminal;
135135
static VFunction *tui_old_rl_deprep_terminal;
136-
static int tui_old_readline_echoing_p;
136+
static int tui_old_rl_echoing_p;
137137

138138
/* Readline output stream.
139139
Should be removed when readline is clean. */
@@ -506,8 +506,8 @@ tui_rl_display_match_list (char **matches, int len, int max)
506506
void
507507
tui_setup_io (int mode)
508508
{
509-
extern int readline_echoing_p;
510-
509+
extern int _rl_echoing_p;
510+
511511
if (mode)
512512
{
513513
/* Redirect readline to TUI. */
@@ -516,12 +516,12 @@ tui_setup_io (int mode)
516516
tui_old_rl_prep_terminal = rl_prep_term_function;
517517
tui_old_rl_getc_function = rl_getc_function;
518518
tui_old_rl_outstream = rl_outstream;
519-
tui_old_readline_echoing_p = readline_echoing_p;
519+
tui_old_rl_echoing_p = _rl_echoing_p;
520520
rl_redisplay_function = tui_redisplay_readline;
521521
rl_deprep_term_function = tui_deprep_terminal;
522522
rl_prep_term_function = tui_prep_terminal;
523523
rl_getc_function = tui_getc;
524-
readline_echoing_p = 0;
524+
_rl_echoing_p = 0;
525525
rl_outstream = tui_rl_outstream;
526526
rl_prompt = 0;
527527
rl_completion_display_matches_hook = tui_rl_display_match_list;
@@ -560,7 +560,7 @@ tui_setup_io (int mode)
560560
rl_getc_function = tui_old_rl_getc_function;
561561
rl_outstream = tui_old_rl_outstream;
562562
rl_completion_display_matches_hook = 0;
563-
readline_echoing_p = tui_old_readline_echoing_p;
563+
_rl_echoing_p = tui_old_rl_echoing_p;
564564
rl_already_prompted = 0;
565565

566566
/* Save tty for SIGCONT. */

readline/CHANGELOG

Lines changed: 175 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -918,3 +918,178 @@ configure.in
918918
- changed release status to `release'
919919

920920
[readline-5.1 frozen]
921+
922+
12/9
923+
----
924+
[readline-5.1 released]
925+
926+
12/14
927+
-----
928+
examples/rlfe/Makefile.in
929+
- add @LIBS@ to LIBS assignment to pick up extra libraries from
930+
configure
931+
932+
1/3/2006
933+
--------
934+
support/shlib-install
935+
- Install shared libraries with execute bit set on Linux
936+
937+
6/9
938+
---
939+
[readline-5.2-alpha frozen]
940+
941+
6/26
942+
----
943+
configure.in
944+
- set CROSS_COMPILE to the empty string by default, so we don't inherit
945+
a random value from the environment
946+
947+
7/8
948+
---
949+
[readline-5.2-alpha released]
950+
951+
952+
[readline-5.2-beta released]
953+
954+
9/12
955+
----
956+
config.h.in
957+
- add defines for wcscoll, iswctype, iswupper, iswlower, towupper,
958+
towlower functions
959+
- replace define for wctomb with one for wcrtomb
960+
- add defines for wchar_t, wint_t, wctype_t types
961+
962+
10/11
963+
-----
964+
[readline-5.2 released]
965+
966+
11/9
967+
----
968+
examples/rlfe/{configure.in,Makefile.in,config.h.in,rlfe.c,pty.c}
969+
- portability fixes from Mike Frysinger <[email protected]>
970+
971+
11/21
972+
-----
973+
Makefile.in
974+
- add `install-examples' and `uninstall-examples' targets
975+
976+
examples/Makefile.in
977+
- add correct variables to build examples on Windows
978+
- add appropriate rules to install and uninstall example sources in
979+
$(datadir)/readline
980+
981+
11/27
982+
-----
983+
config.h.in
984+
- move #undef of HAVE_STRCOLL out of config.h.in, since autoconf tries
985+
to substitute it based on configure tests
986+
987+
4/27/2007
988+
---------
989+
examples/autoconf
990+
- new directory with example autoconf macros to detect readline and
991+
return information about the installed version
992+
993+
6/13
994+
----
995+
support/shlib-install
996+
- changes to support AIX 5.x shared library installation
997+
998+
3/20/2008
999+
---------
1000+
support/shlib-install
1001+
- add support for NetBSD and Interix shared library installation
1002+
1003+
4/22
1004+
----
1005+
support/wcwidth.c
1006+
- updated implementation from 2007-05
1007+
1008+
7/18
1009+
----
1010+
support/shlib-install
1011+
- support for mingw32, contributed by Carlo Bramix <[email protected]>
1012+
1013+
8/4
1014+
---
1015+
configure.in
1016+
- changed to readline-6.0
1017+
1018+
8/18
1019+
----
1020+
support/config.{guess,sub}
1021+
- updated to newer versions from autoconf-2.62 distribution
1022+
1023+
3/5/2009
1024+
--------
1025+
support/shlib-install
1026+
- take a new -V host_vendor argument
1027+
- add ${host_vendor} to string tested in case statement for symlink
1028+
creation section
1029+
- add support for FreeBSD/gentoo, which uses Linux library naming
1030+
scheme
1031+
- change FreeBSD symlink rules, since FreeBSD 7+ has only ELF shared
1032+
libraries. DragonflyBSD rules are the same. Fix from Timothy
1033+
Redaelli <[email protected]>
1034+
1035+
shlib/Makefile.in
1036+
- add definition of host_vendor, substituted by configure
1037+
- add -V host_vendor argument to all invocations of shlib-install.
1038+
Fix from Timothy Redaelli <[email protected]>
1039+
1040+
3/10
1041+
----
1042+
configure.in
1043+
- add call to AC_SYS_LARGEFILE for readdir and largefile support on
1044+
Linux
1045+
1046+
config.h.in
1047+
- add _FILE_OFFSET_BITS define
1048+
1049+
4/19
1050+
----
1051+
Makefile.in
1052+
- add targets for making and installing documentation required by GNU
1053+
coding standards. Fix from Joseph Myers <[email protected]>
1054+
1055+
posixselect.h
1056+
- pick up from bash. Inspired by Mike Frysinger <[email protected]>
1057+
1058+
10/28
1059+
-----
1060+
support/shlib-install
1061+
- decrease the default version of FreeBSD that installs shared libraries
1062+
to 4.x. Advice from Peter Jeremy <[email protected]>
1063+
1064+
12/18
1065+
-----
1066+
[readline-6.1-rc1 released]
1067+
1068+
12/23
1069+
-----
1070+
doc/Makefile.in
1071+
- make sure $(topdir) is not ".." before removing all of the formatted
1072+
documentation in `make distclean'. $(topdir) is set to `..' if
1073+
readline is being built in the source directory. Fixes problem
1074+
noticed by THOUMIN Damien <[email protected]>
1075+
1076+
12/29
1077+
-----
1078+
[readline-6.1 frozen]
1079+
1080+
2/5/2010
1081+
--------
1082+
examples/Makefile.in
1083+
- make sure to install example C files using $(srcdir)/$$f in case
1084+
we're building outside the source directory. Bug report and fix
1085+
from Peter Breitenlohner <[email protected]>
1086+
1087+
7/25
1088+
----
1089+
xfree.c
1090+
- new file with xfree() implementation, moved from xmalloc.c
1091+
1092+
12/28
1093+
-----
1094+
{examples,shlib}/Makefile.in
1095+
- Cygwin-based changes from Eric Blake <[email protected]>

0 commit comments

Comments
 (0)