MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove gdb workaround from readline/xfree.c

Browse Source 
There is a gdb-local patch to deal with interrupts during completion.
The original thread adding this patch is here:

https://sourceware.org/ml/gdb-patches/2011-06/msg00147.html

I believe readline now implements the approach suggested by
Chet Ramey:

https://sourceware.org/ml/gdb-patches/2011-06/msg00493.html

So, I believe this patch can be removed.

readline/ChangeLog.gdb
2018-10-07  Tom Tromey  <tom@tromey.com>

	* Makefile.in (xfree.o): Don't depend on readline.h.
	* xfree.c (xfree): Remove gdb workaround.
	* xmalloc.h (xfree): Remove #define.
This commit is contained in:
Tom Tromey 2018-10-07 15:29:57 -06:00
parent a2d4e4b709
commit c15a79c78c
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
readline/ChangeLog.gdb
View File

@ -1,5 +1,11 @@
2019-08-12 Tom Tromey <tom@tromey.com> 2019-08-12 Tom Tromey <tom@tromey.com>
* Makefile.in (xfree.o): Don't depend on readline.h.
* xfree.c (xfree): Remove gdb workaround.
* xmalloc.h (xfree): Remove #define.
2018-08-12 Tom Tromey <tom@tromey.com>
* emacs_keymap.c: Remove gdb workaround. * emacs_keymap.c: Remove gdb workaround.
2018-08-12 Tom Tromey <tom@tromey.com> 2018-08-12 Tom Tromey <tom@tromey.com>

2
readline/Makefile.in
View File

@ -437,7 +437,7 @@ vi_mode.o: rldefs.h ${BUILD_DIR}/config.h rlconf.h
vi_mode.o: readline.h keymaps.h rltypedefs.h chardefs.h tilde.h vi_mode.o: readline.h keymaps.h rltypedefs.h chardefs.h tilde.h
vi_mode.o: history.h ansi_stdlib.h rlstdc.h vi_mode.o: history.h ansi_stdlib.h rlstdc.h
xfree.o: ${BUILD_DIR}/config.h xfree.o: ${BUILD_DIR}/config.h
xfree.o: ansi_stdlib.h readline.h xfree.o: ansi_stdlib.h
xmalloc.o: ${BUILD_DIR}/config.h xmalloc.o: ${BUILD_DIR}/config.h
xmalloc.o: ansi_stdlib.h xmalloc.o: ansi_stdlib.h

7
readline/xfree.c
View File

@ -31,10 +31,7 @@
# include "ansi_stdlib.h" # include "ansi_stdlib.h"
#endif /* HAVE_STDLIB_H */ #endif /* HAVE_STDLIB_H */
#include <stdio.h>
#include "xmalloc.h" #include "xmalloc.h"
#include "readline.h"
/* **************************************************************** */ /* **************************************************************** */
/* */ /* */
@ -48,10 +45,6 @@ void
xfree (string) xfree (string)
PTR_T string; PTR_T string;
{ {
/* Leak a bit. */
if (RL_ISSTATE(RL_STATE_SIGHANDLER))
return;
if (string) if (string)
free (string); free (string);
} }

3
readline/xmalloc.h
View File

@ -38,9 +38,6 @@
#endif /* !PTR_T */ #endif /* !PTR_T */
/* xmalloc and xrealloc should be also protected from RL_STATE_SIGHANDLER. */
#define xfree xfree_readline
extern PTR_T xmalloc PARAMS((size_t)); extern PTR_T xmalloc PARAMS((size_t));
extern PTR_T xrealloc PARAMS((void *, size_t)); extern PTR_T xrealloc PARAMS((void *, size_t));
extern void xfree PARAMS((void *)); extern void xfree PARAMS((void *));