1 diff -ur gdb-5.1.orig/Makefile.in gdb-5.1/Makefile.in
2 --- gdb-5.1.orig/Makefile.in Sun Nov 18 20:37:49 2001
3 +++ gdb-5.1/Makefile.in Tue Jan 22 23:52:34 2002
37 all-gcc: all-bison all-byacc all-binutils all-gas all-ld all-zlib
38 all-bootstrap: all-libiberty all-texinfo all-bison all-byacc all-binutils all-gas all-ld all-zlib
39 GDB_TK = all-tk all-tcl all-itcl all-tix all-libgui
40 -all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
41 +all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
44 configure-target-gperf: $(ALL_GCC_C)
45 @@ -1662,13 +1658,12 @@
46 configure-target-qthreads: $(ALL_GCC_C)
47 all-target-qthreads: configure-target-qthreads
50 all-recode: all-libiberty
51 all-sed: all-libiberty
54 all-sid: all-tcl all-tk
55 -all-sim: all-libiberty all-bfd all-opcodes all-readline all-cgen
56 +all-sim: all-libiberty all-bfd all-opcodes all-cgen
57 all-snavigator: all-tcl all-tk all-itcl all-db all-grep all-libgui
58 all-tar: all-libiberty
61 SUPPORT_FILES="$(GNATS_SUPPORT_DIRS)"
64 -GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes readline sim utils intl
65 +GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes sim utils intl
66 gdb.tar.bz2: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
67 $(MAKE) -f Makefile.in gdb-taz TOOL=gdb \
68 MD5PROG="$(MD5PROG)" \
69 diff -ur gdb-5.1.orig/gdb/Makefile.in gdb-5.1/gdb/Makefile.in
70 --- gdb-5.1.orig/gdb/Makefile.in Sun Nov 18 06:08:36 2001
71 +++ gdb-5.1/gdb/Makefile.in Tue Jan 22 23:54:56 2002
73 BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC)
75 # Where is the READLINE library? Typically in ../readline.
76 -READLINE_DIR = ../readline
77 -READLINE = $(READLINE_DIR)/libreadline.a
78 -READLINE_SRC = $(srcdir)/$(READLINE_DIR)
79 -READLINE_CFLAGS = -I$(READLINE_SRC)/..
80 +READLINE_DIR = /usr/include/readline
81 +READLINE = -lreadline
82 +READLINE_SRC = /usr/include/readline
83 +READLINE_CFLAGS = -I/usr/include/readline
85 WARN_CFLAGS = @WARN_CFLAGS@
86 WERROR_CFLAGS = @WERROR_CFLAGS@
87 diff -ur gdb-5.1.orig/gdb/defs.h gdb-5.1/gdb/defs.h
88 --- gdb-5.1.orig/gdb/defs.h Thu Aug 2 23:36:51 2001
89 +++ gdb-5.1/gdb/defs.h Tue Jan 22 23:59:50 2002
92 /* From readline (but not in any readline .h files). */
94 -extern char *tilde_expand (char *);
95 +extern char *tilde_expand (const char *);
97 /* Control types for commands */
99 diff -ur gdb-5.1.orig/gdb/event-top.c gdb-5.1/gdb/event-top.c
100 --- gdb-5.1.orig/gdb/event-top.c Sat Jul 14 20:59:07 2001
101 +++ gdb-5.1/gdb/event-top.c Tue Jan 22 23:59:50 2002
105 /* readline include files */
107 #include <readline/readline.h>
108 #include <readline/history.h>
110 diff -ur gdb-5.1.orig/gdb/gdbserver/Makefile.in gdb-5.1/gdb/gdbserver/Makefile.in
111 --- gdb-5.1.orig/gdb/gdbserver/Makefile.in Tue Mar 6 09:21:43 2001
112 +++ gdb-5.1/gdb/gdbserver/Makefile.in Tue Jan 22 23:59:50 2002
115 # Where is the source dir for the READLINE library? Traditionally in .. or .
116 # (For the binary library built from it, we use ${READLINE_DIR}${subdir}.)
117 -READLINE_DIR = ${srcdir}/../readline
118 +READLINE_DIR = /usr/lib
119 READLINE_DEP = $$(READLINE_DIR)
121 # All the includes used for CFLAGS and for lint.
122 diff -ur gdb-5.1.orig/gdb/top.c gdb-5.1/gdb/top.c
123 --- gdb-5.1.orig/gdb/top.c Sun Oct 21 21:41:19 2001
124 +++ gdb-5.1/gdb/top.c Tue Jan 22 23:59:50 2002
128 /* readline include files */
130 #include <readline/readline.h>
131 #include <readline/history.h>
133 diff -ur gdb-5.1.orig/gdb/tracepoint.c gdb-5.1/gdb/tracepoint.c
134 --- gdb-5.1.orig/gdb/tracepoint.c Thu Aug 2 14:05:57 2001
135 +++ gdb-5.1/gdb/tracepoint.c Tue Jan 22 23:59:50 2002
139 /* readline include files */
141 #include <readline/readline.h>
142 #include <readline/history.h>
144 diff -ur gdb-5.1.orig/gdb/utils.c gdb-5.1/gdb/utils.c
145 --- gdb-5.1.orig/gdb/utils.c Fri Nov 2 23:06:29 2001
146 +++ gdb-5.1/gdb/utils.c Tue Jan 22 23:59:50 2002
149 #include "inferior.h" /* for signed_pointer_to_address */
152 #include <readline/readline.h>
154 #ifndef MALLOC_INCOMPATIBLE
155 --- gdb-5.1.1/gdb/tui/tuiWin.c.orig Sat Jul 28 21:30:54 2001
156 +++ gdb-5.1.1/gdb/tui/tuiWin.c Sat Feb 2 15:19:33 2002
157 @@ -619,10 +619,10 @@
160 int heightDiff, widthDiff;
161 - extern int screenheight, screenwidth; /* in readline */
162 + extern int _rl_screenheight, _rl_screenwidth; /* in readline */
164 - widthDiff = screenwidth - termWidth ();
165 - heightDiff = screenheight - termHeight ();
166 + widthDiff = _rl_screenwidth - termWidth ();
167 + heightDiff = _rl_screenheight - termHeight ();
168 if (heightDiff || widthDiff)
170 TuiLayoutType curLayout = currentLayout ();
172 if (winWithFocus != cmdWin)
173 keypad (cmdWin->generic.handle, FALSE);
175 - setTermHeightTo (screenheight);
176 - setTermWidthTo (screenwidth);
177 + setTermHeightTo (_rl_screenheight);
178 + setTermWidthTo (_rl_screenwidth);
179 if (curLayout == SRC_DISASSEM_COMMAND ||
180 curLayout == SRC_DATA_COMMAND || curLayout == DISASSEM_DATA_COMMAND)
184 newHeight = firstWin->generic.height;
185 else if ((firstWin->generic.height + splitDiff) >=
186 - (screenheight - MIN_CMD_WIN_HEIGHT - 1))
187 - newHeight = screenheight - MIN_CMD_WIN_HEIGHT - 1;
188 + (_rl_screenheight - MIN_CMD_WIN_HEIGHT - 1))
189 + newHeight = _rl_screenheight - MIN_CMD_WIN_HEIGHT - 1;
190 else if ((firstWin->generic.height + splitDiff) <= 0)
191 newHeight = MIN_WIN_HEIGHT;
194 _makeInvisibleAndSetNewHeight (firstWin, newHeight);
195 cmdWin->generic.origin.y = locator->origin.y + 1;
196 cmdWin->generic.width += widthDiff;
197 - newHeight = screenheight - cmdWin->generic.origin.y;
198 + newHeight = _rl_screenheight - cmdWin->generic.origin.y;
199 _makeInvisibleAndSetNewHeight (cmdWin, newHeight);
200 _makeVisibleWithNewHeight (firstWin);
201 _makeVisibleWithNewHeight (cmdWin);
203 newHeight = firstWin->generic.height;
204 else if ((firstWin->generic.height +
205 secondWin->generic.height + (splitDiff * 2)) >=
206 - (screenheight - MIN_CMD_WIN_HEIGHT - 1))
207 - newHeight = (screenheight - MIN_CMD_WIN_HEIGHT - 1) / 2;
208 + (_rl_screenheight - MIN_CMD_WIN_HEIGHT - 1))
209 + newHeight = (_rl_screenheight - MIN_CMD_WIN_HEIGHT - 1) / 2;
210 else if ((firstWin->generic.height + splitDiff) <= 0)
211 newHeight = MIN_WIN_HEIGHT;
214 newHeight = secondWin->generic.height;
215 else if ((firstWin->generic.height +
216 secondWin->generic.height + (splitDiff * 2)) >=
217 - (screenheight - MIN_CMD_WIN_HEIGHT - 1))
218 + (_rl_screenheight - MIN_CMD_WIN_HEIGHT - 1))
220 - newHeight = screenheight - MIN_CMD_WIN_HEIGHT - 1;
221 + newHeight = _rl_screenheight - MIN_CMD_WIN_HEIGHT - 1;
223 newHeight = (newHeight / 2) + 1;