[packages/gdb.git] / gdb-readline.patch

--- gdb-5.3/Makefile.in.orig	Tue Dec 10 22:30:40 2002
+++ gdb-5.3/Makefile.in	Sat Jan 11 13:22:38 2003
@@ -566,7 +566,6 @@
 	all-perl \
 	all-prms \
 	all-rcs \
-	all-readline \
 	all-release \
 	all-recode \
 	all-sed \
@@ -637,7 +636,6 @@
 	check-perl \
 	check-prms \
 	check-rcs \
-	check-readline \
 	check-recode \
 	check-sed \
 	check-send-pr \
@@ -707,7 +705,6 @@
 	install-perl \
 	install-prms \
 	install-rcs \
-	install-readline \
 	install-recode \
 	install-sed \
 	install-send-pr \
@@ -868,7 +865,6 @@
 	clean-perl \
 	clean-prms \
 	clean-rcs \
-	clean-readline \
 	clean-release \
 	clean-recode \
 	clean-sed \
@@ -1677,7 +1673,7 @@
 all-gcc: all-bison all-byacc all-binutils all-gas all-ld all-zlib
 all-bootstrap: all-libiberty all-texinfo all-bison all-byacc all-binutils all-gas all-ld all-zlib
 GDB_TK = all-tk all-tcl all-itcl all-tix all-libgui
-all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
+all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
 all-gettext:
 all-gnuserv:
 configure-target-gperf: $(ALL_GCC_CXX)
@@ -1724,13 +1720,12 @@
 configure-target-qthreads: $(ALL_GCC_C)
 all-target-qthreads: configure-target-qthreads
 all-rcs:
-all-readline:
 all-recode: all-libiberty
 all-sed: all-libiberty
 all-send-pr: all-prms
 all-shellutils:
 all-sid: all-tcl all-tk
-all-sim: all-libiberty all-bfd all-opcodes all-readline
+all-sim: all-libiberty all-bfd all-opcodes
 all-snavigator: all-tcl all-tk all-itcl all-tix all-db all-grep all-libgui
 all-tar: all-libiberty
 all-tcl:
@@ -2005,7 +2000,7 @@
 		SUPPORT_FILES="$(GNATS_SUPPORT_DIRS)"
 
 .PHONY: gdb.tar.bz2
-GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes readline sim utils intl
+GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes sim utils intl
 gdb.tar.bz2: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
 	$(MAKE) -f Makefile.in gdb-taz TOOL=gdb \
 		MD5PROG="$(MD5PROG)" \
diff -ur gdb-5.1.orig/gdb/Makefile.in gdb-5.1/gdb/Makefile.in
--- gdb-5.1.orig/gdb/Makefile.in	Sun Nov 18 06:08:36 2001
+++ gdb-5.1/gdb/Makefile.in	Tue Jan 22 23:54:56 2002
@@ -120,10 +120,10 @@
 BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC)
 
 # Where is the READLINE library?  Typically in ../readline.
-READLINE_DIR = ../readline
-READLINE = $(READLINE_DIR)/libreadline.a
-READLINE_SRC = $(srcdir)/$(READLINE_DIR)
-READLINE_CFLAGS = -I$(READLINE_SRC)/..
+READLINE_DIR = /usr/include/readline
+READLINE = -lreadline
+READLINE_SRC = /usr/include/readline
+READLINE_CFLAGS = -I/usr/include/readline
 
 WARN_CFLAGS = @WARN_CFLAGS@
 WERROR_CFLAGS = @WERROR_CFLAGS@
diff -ur gdb-5.1.orig/gdb/defs.h gdb-5.1/gdb/defs.h
--- gdb-5.1.orig/gdb/defs.h	Thu Aug  2 23:36:51 2001
+++ gdb-5.1/gdb/defs.h	Tue Jan 22 23:59:50 2002
@@ -800,7 +800,7 @@
 
 /* From readline (but not in any readline .h files).  */
 
-extern char *tilde_expand (char *);
+extern char *tilde_expand (const char *);
 
 /* Control types for commands */
 
diff -ur gdb-5.1.orig/gdb/event-top.c gdb-5.1/gdb/event-top.c
--- gdb-5.1.orig/gdb/event-top.c	Sat Jul 14 20:59:07 2001
+++ gdb-5.1/gdb/event-top.c	Tue Jan 22 23:59:50 2002
@@ -32,6 +32,7 @@
 #include "gdbcmd.h"
 
 /* readline include files */
+#define savestring
 #include <readline/readline.h>
 #include <readline/history.h>
 
diff -ur gdb-5.1.orig/gdb/gdbserver/Makefile.in gdb-5.1/gdb/gdbserver/Makefile.in
--- gdb-5.1.orig/gdb/gdbserver/Makefile.in	Tue Mar  6 09:21:43 2001
+++ gdb-5.1/gdb/gdbserver/Makefile.in	Tue Jan 22 23:59:50 2002
@@ -88,7 +88,7 @@
 
 # Where is the source dir for the READLINE library?  Traditionally in .. or .
 # (For the binary library built from it, we use ${READLINE_DIR}${subdir}.)
-READLINE_DIR = ${srcdir}/../readline
+READLINE_DIR = /usr/lib
 READLINE_DEP = $$(READLINE_DIR)
 
 # All the includes used for CFLAGS and for lint.
diff -ur gdb-5.1.orig/gdb/top.c gdb-5.1/gdb/top.c
--- gdb-5.1.orig/gdb/top.c	Sun Oct 21 21:41:19 2001
+++ gdb-5.1/gdb/top.c	Tue Jan 22 23:59:50 2002
@@ -42,6 +42,7 @@
 #include "serial.h"
 
 /* readline include files */
+#define savestring
 #include <readline/readline.h>
 #include <readline/history.h>
 
diff -ur gdb-5.1.orig/gdb/tracepoint.c gdb-5.1/gdb/tracepoint.c
--- gdb-5.1.orig/gdb/tracepoint.c	Thu Aug  2 14:05:57 2001
+++ gdb-5.1/gdb/tracepoint.c	Tue Jan 22 23:59:50 2002
@@ -40,6 +40,7 @@
 #include "ax-gdb.h"
 
 /* readline include files */
+#define savestring
 #include <readline/readline.h>
 #include <readline/history.h>
 
diff -ur gdb-5.1.orig/gdb/utils.c gdb-5.1/gdb/utils.c
--- gdb-5.1.orig/gdb/utils.c	Fri Nov  2 23:06:29 2001
+++ gdb-5.1/gdb/utils.c	Tue Jan 22 23:59:50 2002
@@ -54,6 +54,7 @@
 
 #include "inferior.h" /* for signed_pointer_to_address */
 
+#define savestring
 #include <readline/readline.h>
 
 #ifndef MALLOC_INCOMPATIBLE
--- gdb-5.3/gdb/tui/tuiWin.c.orig	Fri Oct 25 21:46:41 2002
+++ gdb-5.3/gdb/tui/tuiWin.c	Sat Jan 11 13:24:57 2003
@@ -633,10 +633,10 @@
 tuiResizeAll (void)
 {
   int heightDiff, widthDiff;
-  extern int screenheight, screenwidth;		/* in readline */
+  extern int _rl_screenheight, _rl_screenwidth;		/* in readline */
 
-  widthDiff = screenwidth - termWidth ();
-  heightDiff = screenheight - termHeight ();
+  widthDiff = _rl_screenwidth - termWidth ();
+  heightDiff = _rl_screenheight - termHeight ();
   if (heightDiff || widthDiff)
     {
       TuiLayoutType curLayout = currentLayout ();
@@ -650,8 +650,8 @@
       if (winWithFocus != cmdWin)
 	keypad (cmdWin->generic.handle, FALSE);
       tui_update_gdb_sizes ();
-      setTermHeightTo (screenheight);
-      setTermWidthTo (screenwidth);
+      setTermHeightTo (_rl_screenheight);
+      setTermWidthTo (_rl_screenwidth);
       if (curLayout == SRC_DISASSEM_COMMAND ||
 	curLayout == SRC_DATA_COMMAND || curLayout == DISASSEM_DATA_COMMAND)
 	numWinsDisplayed++;
@@ -678,8 +678,8 @@
 	  if (heightDiff == 0)
 	    newHeight = firstWin->generic.height;
 	  else if ((firstWin->generic.height + splitDiff) >=
-		   (screenheight - MIN_CMD_WIN_HEIGHT - 1))
-	    newHeight = screenheight - MIN_CMD_WIN_HEIGHT - 1;
+		   (_rl_screenheight - MIN_CMD_WIN_HEIGHT - 1))
+	    newHeight = _rl_screenheight - MIN_CMD_WIN_HEIGHT - 1;
 	  else if ((firstWin->generic.height + splitDiff) <= 0)
 	    newHeight = MIN_WIN_HEIGHT;
 	  else
@@ -688,7 +688,7 @@
 	  _makeInvisibleAndSetNewHeight (firstWin, newHeight);
 	  cmdWin->generic.origin.y = locator->origin.y + 1;
 	  cmdWin->generic.width += widthDiff;
-	  newHeight = screenheight - cmdWin->generic.origin.y;
+	  newHeight = _rl_screenheight - cmdWin->generic.origin.y;
 	  _makeInvisibleAndSetNewHeight (cmdWin, newHeight);
 	  _makeVisibleWithNewHeight (firstWin);
 	  _makeVisibleWithNewHeight (cmdWin);
@@ -716,8 +716,8 @@
 	    newHeight = firstWin->generic.height;
 	  else if ((firstWin->generic.height +
 		    secondWin->generic.height + (splitDiff * 2)) >=
-		   (screenheight - MIN_CMD_WIN_HEIGHT - 1))
-	    newHeight = (screenheight - MIN_CMD_WIN_HEIGHT - 1) / 2;
+		   (_rl_screenheight - MIN_CMD_WIN_HEIGHT - 1))
+	    newHeight = (_rl_screenheight - MIN_CMD_WIN_HEIGHT - 1) / 2;
 	  else if ((firstWin->generic.height + splitDiff) <= 0)
 	    newHeight = MIN_WIN_HEIGHT;
 	  else
@@ -736,9 +736,9 @@
 	    newHeight = secondWin->generic.height;
 	  else if ((firstWin->generic.height +
 		    secondWin->generic.height + (splitDiff * 2)) >=
-		   (screenheight - MIN_CMD_WIN_HEIGHT - 1))
+		   (_rl_screenheight - MIN_CMD_WIN_HEIGHT - 1))
 	    {
-	      newHeight = screenheight - MIN_CMD_WIN_HEIGHT - 1;
+	      newHeight = _rl_screenheight - MIN_CMD_WIN_HEIGHT - 1;
 	      if (newHeight % 2)
 		newHeight = (newHeight / 2) + 1;
 	      else
Commit	Line	Data
e816ba84 JB	1	--- gdb-5.3/Makefile.in.orig Tue Dec 10 22:30:40 2002
	2	+++ gdb-5.3/Makefile.in Sat Jan 11 13:22:38 2003
	3	@@ -566,7 +566,6 @@
1013231d AM	4	all-perl \
	5	all-prms \
	6	all-rcs \
	7	- all-readline \
	8	all-release \
	9	all-recode \
	10	all-sed \
e816ba84	11	@@ -637,7 +636,6 @@
1013231d AM	12	check-perl \
	13	check-prms \
	14	check-rcs \
	15	- check-readline \
	16	check-recode \
	17	check-sed \
	18	check-send-pr \
e816ba84	19	@@ -707,7 +705,6 @@
1013231d AM	20	install-perl \
	21	install-prms \
	22	install-rcs \
	23	- install-readline \
	24	install-recode \
	25	install-sed \
	26	install-send-pr \
e816ba84	27	@@ -868,7 +865,6 @@
1013231d AM	28	clean-perl \
	29	clean-prms \
	30	clean-rcs \
	31	- clean-readline \
	32	clean-release \
	33	clean-recode \
	34	clean-sed \
e816ba84	35	@@ -1677,7 +1673,7 @@
5f1c61ac	36	all-gcc: all-bison all-byacc all-binutils all-gas all-ld all-zlib
5f1c61ac	37	all-bootstrap: all-libiberty all-texinfo all-bison all-byacc all-binutils all-gas all-ld all-zlib
1013231d AM	38	GDB_TK = all-tk all-tcl all-itcl all-tix all-libgui
	39	-all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
	40	+all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
	41	all-gettext:
	42	all-gnuserv:
e816ba84 JB	43	configure-target-gperf: $(ALL_GCC_CXX)
e816ba84 JB	44	@@ -1724,13 +1720,12 @@
5f1c61ac	45	configure-target-qthreads: $(ALL_GCC_C)
5f1c61ac	46	all-target-qthreads: configure-target-qthreads
1013231d AM	47	all-rcs:
	48	-all-readline:
	49	all-recode: all-libiberty
	50	all-sed: all-libiberty
	51	all-send-pr: all-prms
	52	all-shellutils:
5f1c61ac	53	all-sid: all-tcl all-tk
e816ba84 JB	54	-all-sim: all-libiberty all-bfd all-opcodes all-readline
e816ba84 JB	55	+all-sim: all-libiberty all-bfd all-opcodes
3610a833	56	all-snavigator: all-tcl all-tk all-itcl all-tix all-db all-grep all-libgui
1013231d AM	57	all-tar: all-libiberty
1013231d AM	58	all-tcl:
e816ba84	59	@@ -2005,7 +2000,7 @@
1013231d AM	60	SUPPORT_FILES="$(GNATS_SUPPORT_DIRS)"
	61
	62	.PHONY: gdb.tar.bz2
	63	-GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes readline sim utils intl
	64	+GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes sim utils intl
	65	gdb.tar.bz2: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
	66	$(MAKE) -f Makefile.in gdb-taz TOOL=gdb \
	67	MD5PROG="$(MD5PROG)" \
5f1c61ac	68	diff -ur gdb-5.1.orig/gdb/Makefile.in gdb-5.1/gdb/Makefile.in
	69	--- gdb-5.1.orig/gdb/Makefile.in Sun Nov 18 06:08:36 2001
	70	+++ gdb-5.1/gdb/Makefile.in Tue Jan 22 23:54:56 2002
	71	@@ -120,10 +120,10 @@
1013231d AM	72	BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC)
	73
	74	# Where is the READLINE library? Typically in ../readline.
	75	-READLINE_DIR = ../readline
	76	-READLINE = $(READLINE_DIR)/libreadline.a
	77	-READLINE_SRC = $(srcdir)/$(READLINE_DIR)
	78	-READLINE_CFLAGS = -I$(READLINE_SRC)/..
	79	+READLINE_DIR = /usr/include/readline
	80	+READLINE = -lreadline
	81	+READLINE_SRC = /usr/include/readline
	82	+READLINE_CFLAGS = -I/usr/include/readline
	83
	84	WARN_CFLAGS = @WARN_CFLAGS@
	85	WERROR_CFLAGS = @WERROR_CFLAGS@
5f1c61ac	86	diff -ur gdb-5.1.orig/gdb/defs.h gdb-5.1/gdb/defs.h
	87	--- gdb-5.1.orig/gdb/defs.h Thu Aug 2 23:36:51 2001
	88	+++ gdb-5.1/gdb/defs.h Tue Jan 22 23:59:50 2002
	89	@@ -800,7 +800,7 @@
	90
	91	/* From readline (but not in any readline .h files). */
	92
	93	-extern char tilde_expand (char );
	94	+extern char tilde_expand (const char );
	95
	96	/* Control types for commands */
	97
	98	diff -ur gdb-5.1.orig/gdb/event-top.c gdb-5.1/gdb/event-top.c
	99	--- gdb-5.1.orig/gdb/event-top.c Sat Jul 14 20:59:07 2001
	100	+++ gdb-5.1/gdb/event-top.c Tue Jan 22 23:59:50 2002
1013231d AM	101	@@ -32,6 +32,7 @@
	102	#include "gdbcmd.h"
	103
	104	/* readline include files */
	105	+#define savestring
	106	#include <readline/readline.h>
	107	#include <readline/history.h>
	108
5f1c61ac	109	diff -ur gdb-5.1.orig/gdb/gdbserver/Makefile.in gdb-5.1/gdb/gdbserver/Makefile.in
	110	--- gdb-5.1.orig/gdb/gdbserver/Makefile.in Tue Mar 6 09:21:43 2001
	111	+++ gdb-5.1/gdb/gdbserver/Makefile.in Tue Jan 22 23:59:50 2002
	112	@@ -88,7 +88,7 @@
1013231d AM	113
	114	# Where is the source dir for the READLINE library? Traditionally in .. or .
	115	# (For the binary library built from it, we use ${READLINE_DIR}${subdir}.)
	116	-READLINE_DIR = ${srcdir}/../readline
	117	+READLINE_DIR = /usr/lib
	118	READLINE_DEP = $$(READLINE_DIR)
	119
	120	# All the includes used for CFLAGS and for lint.
5f1c61ac	121	diff -ur gdb-5.1.orig/gdb/top.c gdb-5.1/gdb/top.c
	122	--- gdb-5.1.orig/gdb/top.c Sun Oct 21 21:41:19 2001
	123	+++ gdb-5.1/gdb/top.c Tue Jan 22 23:59:50 2002
	124	@@ -42,6 +42,7 @@
	125	#include "serial.h"
1013231d AM	126
	127	/* readline include files */
	128	+#define savestring
	129	#include <readline/readline.h>
	130	#include <readline/history.h>
	131
5f1c61ac	132	diff -ur gdb-5.1.orig/gdb/tracepoint.c gdb-5.1/gdb/tracepoint.c
	133	--- gdb-5.1.orig/gdb/tracepoint.c Thu Aug 2 14:05:57 2001
	134	+++ gdb-5.1/gdb/tracepoint.c Tue Jan 22 23:59:50 2002
	135	@@ -40,6 +40,7 @@
1013231d AM	136	#include "ax-gdb.h"
	137
	138	/* readline include files */
	139	+#define savestring
	140	#include <readline/readline.h>
	141	#include <readline/history.h>
	142
5f1c61ac	143	diff -ur gdb-5.1.orig/gdb/utils.c gdb-5.1/gdb/utils.c
	144	--- gdb-5.1.orig/gdb/utils.c Fri Nov 2 23:06:29 2001
	145	+++ gdb-5.1/gdb/utils.c Tue Jan 22 23:59:50 2002
	146	@@ -54,6 +54,7 @@
1013231d	147
5f1c61ac	148	#include "inferior.h" /* for signed_pointer_to_address */
1013231d AM	149
	150	+#define savestring
	151	#include <readline/readline.h>
	152
5f1c61ac	153	#ifndef MALLOC_INCOMPATIBLE
e816ba84 JB	154	--- gdb-5.3/gdb/tui/tuiWin.c.orig Fri Oct 25 21:46:41 2002
	155	+++ gdb-5.3/gdb/tui/tuiWin.c Sat Jan 11 13:24:57 2003
	156	@@ -633,10 +633,10 @@
2b2459c9 JB	157	tuiResizeAll (void)
	158	{
	159	int heightDiff, widthDiff;
	160	- extern int screenheight, screenwidth; /* in readline */
	161	+ extern int _rl_screenheight, _rl_screenwidth; /* in readline */
	162
	163	- widthDiff = screenwidth - termWidth ();
	164	- heightDiff = screenheight - termHeight ();
	165	+ widthDiff = _rl_screenwidth - termWidth ();
	166	+ heightDiff = _rl_screenheight - termHeight ();
	167	if (heightDiff \|\| widthDiff)
	168	{
	169	TuiLayoutType curLayout = currentLayout ();
e816ba84	170	@@ -650,8 +650,8 @@
2b2459c9 JB	171	if (winWithFocus != cmdWin)
2b2459c9 JB	172	keypad (cmdWin->generic.handle, FALSE);
e816ba84	173	tui_update_gdb_sizes ();
2b2459c9 JB	174	- setTermHeightTo (screenheight);
	175	- setTermWidthTo (screenwidth);
	176	+ setTermHeightTo (_rl_screenheight);
	177	+ setTermWidthTo (_rl_screenwidth);
	178	if (curLayout == SRC_DISASSEM_COMMAND \|\|
	179	curLayout == SRC_DATA_COMMAND \|\| curLayout == DISASSEM_DATA_COMMAND)
	180	numWinsDisplayed++;
e816ba84	181	@@ -678,8 +678,8 @@
2b2459c9 JB	182	if (heightDiff == 0)
	183	newHeight = firstWin->generic.height;
	184	else if ((firstWin->generic.height + splitDiff) >=
	185	- (screenheight - MIN_CMD_WIN_HEIGHT - 1))
	186	- newHeight = screenheight - MIN_CMD_WIN_HEIGHT - 1;
	187	+ (_rl_screenheight - MIN_CMD_WIN_HEIGHT - 1))
	188	+ newHeight = _rl_screenheight - MIN_CMD_WIN_HEIGHT - 1;
	189	else if ((firstWin->generic.height + splitDiff) <= 0)
	190	newHeight = MIN_WIN_HEIGHT;
	191	else
e816ba84	192	@@ -688,7 +688,7 @@
2b2459c9 JB	193	_makeInvisibleAndSetNewHeight (firstWin, newHeight);
	194	cmdWin->generic.origin.y = locator->origin.y + 1;
	195	cmdWin->generic.width += widthDiff;
	196	- newHeight = screenheight - cmdWin->generic.origin.y;
	197	+ newHeight = _rl_screenheight - cmdWin->generic.origin.y;
	198	_makeInvisibleAndSetNewHeight (cmdWin, newHeight);
	199	_makeVisibleWithNewHeight (firstWin);
	200	_makeVisibleWithNewHeight (cmdWin);
e816ba84	201	@@ -716,8 +716,8 @@
2b2459c9 JB	202	newHeight = firstWin->generic.height;
	203	else if ((firstWin->generic.height +
	204	secondWin->generic.height + (splitDiff * 2)) >=
	205	- (screenheight - MIN_CMD_WIN_HEIGHT - 1))
	206	- newHeight = (screenheight - MIN_CMD_WIN_HEIGHT - 1) / 2;
	207	+ (_rl_screenheight - MIN_CMD_WIN_HEIGHT - 1))
	208	+ newHeight = (_rl_screenheight - MIN_CMD_WIN_HEIGHT - 1) / 2;
	209	else if ((firstWin->generic.height + splitDiff) <= 0)
	210	newHeight = MIN_WIN_HEIGHT;
	211	else
e816ba84	212	@@ -736,9 +736,9 @@
2b2459c9 JB	213	newHeight = secondWin->generic.height;
	214	else if ((firstWin->generic.height +
	215	secondWin->generic.height + (splitDiff * 2)) >=
	216	- (screenheight - MIN_CMD_WIN_HEIGHT - 1))
	217	+ (_rl_screenheight - MIN_CMD_WIN_HEIGHT - 1))
	218	{
	219	- newHeight = screenheight - MIN_CMD_WIN_HEIGHT - 1;
	220	+ newHeight = _rl_screenheight - MIN_CMD_WIN_HEIGHT - 1;
	221	if (newHeight % 2)
	222	newHeight = (newHeight / 2) + 1;
	223	else