]>
Commit | Line | Data |
---|---|---|
5f1c61ac | 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 | |
4 | @@ -530,7 +530,6 @@ | |
1013231d AM |
5 | all-perl \ |
6 | all-prms \ | |
7 | all-rcs \ | |
8 | - all-readline \ | |
9 | all-release \ | |
10 | all-recode \ | |
11 | all-sed \ | |
5f1c61ac | 12 | @@ -607,7 +606,6 @@ |
1013231d AM |
13 | check-perl \ |
14 | check-prms \ | |
15 | check-rcs \ | |
16 | - check-readline \ | |
17 | check-recode \ | |
18 | check-sed \ | |
19 | check-send-pr \ | |
5f1c61ac | 20 | @@ -684,7 +682,6 @@ |
1013231d AM |
21 | install-perl \ |
22 | install-prms \ | |
23 | install-rcs \ | |
24 | - install-readline \ | |
25 | install-recode \ | |
26 | install-sed \ | |
27 | install-send-pr \ | |
5f1c61ac | 28 | @@ -886,7 +883,6 @@ |
1013231d AM |
29 | clean-perl \ |
30 | clean-prms \ | |
31 | clean-rcs \ | |
32 | - clean-readline \ | |
33 | clean-release \ | |
34 | clean-recode \ | |
35 | clean-sed \ | |
5f1c61ac | 36 | @@ -1602,7 +1598,7 @@ |
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 | |
1013231d AM |
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) | |
42 | all-gettext: | |
43 | all-gnuserv: | |
5f1c61ac | 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 | |
1013231d AM |
48 | all-rcs: |
49 | -all-readline: | |
50 | all-recode: all-libiberty | |
51 | all-sed: all-libiberty | |
52 | all-send-pr: all-prms | |
53 | all-shellutils: | |
5f1c61ac | 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 | |
1013231d AM |
58 | all-tar: all-libiberty |
59 | all-tcl: | |
5f1c61ac | 60 | @@ -1925,7 +1920,7 @@ |
1013231d AM |
61 | SUPPORT_FILES="$(GNATS_SUPPORT_DIRS)" |
62 | ||
63 | .PHONY: gdb.tar.bz2 | |
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)" \ | |
5f1c61ac | 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 | |
72 | @@ -120,10 +120,10 @@ | |
1013231d AM |
73 | BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC) |
74 | ||
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 | |
84 | ||
85 | WARN_CFLAGS = @WARN_CFLAGS@ | |
86 | WERROR_CFLAGS = @WERROR_CFLAGS@ | |
5f1c61ac | 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 | |
90 | @@ -800,7 +800,7 @@ | |
91 | ||
92 | /* From readline (but not in any readline .h files). */ | |
93 | ||
94 | -extern char *tilde_expand (char *); | |
95 | +extern char *tilde_expand (const char *); | |
96 | ||
97 | /* Control types for commands */ | |
98 | ||
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 | |
1013231d AM |
102 | @@ -32,6 +32,7 @@ |
103 | #include "gdbcmd.h" | |
104 | ||
105 | /* readline include files */ | |
106 | +#define savestring | |
107 | #include <readline/readline.h> | |
108 | #include <readline/history.h> | |
109 | ||
5f1c61ac | 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 | |
113 | @@ -88,7 +88,7 @@ | |
1013231d AM |
114 | |
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) | |
120 | ||
121 | # All the includes used for CFLAGS and for lint. | |
5f1c61ac | 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 | |
125 | @@ -42,6 +42,7 @@ | |
126 | #include "serial.h" | |
1013231d AM |
127 | |
128 | /* readline include files */ | |
129 | +#define savestring | |
130 | #include <readline/readline.h> | |
131 | #include <readline/history.h> | |
132 | ||
5f1c61ac | 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 | |
136 | @@ -40,6 +40,7 @@ | |
1013231d AM |
137 | #include "ax-gdb.h" |
138 | ||
139 | /* readline include files */ | |
140 | +#define savestring | |
141 | #include <readline/readline.h> | |
142 | #include <readline/history.h> | |
143 | ||
5f1c61ac | 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 | |
147 | @@ -54,6 +54,7 @@ | |
1013231d | 148 | |
5f1c61ac | 149 | #include "inferior.h" /* for signed_pointer_to_address */ |
1013231d AM |
150 | |
151 | +#define savestring | |
152 | #include <readline/readline.h> | |
153 | ||
5f1c61ac | 154 | #ifndef MALLOC_INCOMPATIBLE |
2b2459c9 JB |
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 @@ | |
158 | tuiResizeAll (void) | |
159 | { | |
160 | int heightDiff, widthDiff; | |
161 | - extern int screenheight, screenwidth; /* in readline */ | |
162 | + extern int _rl_screenheight, _rl_screenwidth; /* in readline */ | |
163 | ||
164 | - widthDiff = screenwidth - termWidth (); | |
165 | - heightDiff = screenheight - termHeight (); | |
166 | + widthDiff = _rl_screenwidth - termWidth (); | |
167 | + heightDiff = _rl_screenheight - termHeight (); | |
168 | if (heightDiff || widthDiff) | |
169 | { | |
170 | TuiLayoutType curLayout = currentLayout (); | |
171 | @@ -636,8 +636,8 @@ | |
172 | if (winWithFocus != cmdWin) | |
173 | keypad (cmdWin->generic.handle, FALSE); | |
174 | init_page_info (); | |
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) | |
181 | numWinsDisplayed++; | |
182 | @@ -664,8 +664,8 @@ | |
183 | if (heightDiff == 0) | |
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; | |
192 | else | |
193 | @@ -674,7 +674,7 @@ | |
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); | |
202 | @@ -702,8 +702,8 @@ | |
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; | |
212 | else | |
213 | @@ -722,9 +722,9 @@ | |
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)) | |
219 | { | |
220 | - newHeight = screenheight - MIN_CMD_WIN_HEIGHT - 1; | |
221 | + newHeight = _rl_screenheight - MIN_CMD_WIN_HEIGHT - 1; | |
222 | if (newHeight % 2) | |
223 | newHeight = (newHeight / 2) + 1; | |
224 | else |