gdb-readline.patch

   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 @@
   4         all-perl \
   5         all-prms \
   6         all-rcs \
   7 -       all-readline \
   8         all-release \
   9         all-recode \
  10         all-sed \
  11 @@ -637,7 +636,6 @@
  12         check-perl \
  13         check-prms \
  14         check-rcs \
  15 -       check-readline \
  16         check-recode \
  17         check-sed \
  18         check-send-pr \
  19 @@ -707,7 +705,6 @@
  20         install-perl \
  21         install-prms \
  22         install-rcs \
  23 -       install-readline \
  24         install-recode \
  25         install-sed \
  26         install-send-pr \
  27 @@ -868,7 +865,6 @@
  28         clean-perl \
  29         clean-prms \
  30         clean-rcs \
  31 -       clean-readline \
  32         clean-release \
  33         clean-recode \
  34         clean-sed \
  35 @@ -1677,7 +1673,7 @@
  36  all-gcc: all-bison all-byacc all-binutils all-gas all-ld all-zlib
  37  all-bootstrap: all-libiberty all-texinfo all-bison all-byacc all-binutils all-gas all-ld all-zlib
  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:
  43  configure-target-gperf: $(ALL_GCC_CXX)
  44 @@ -1724,13 +1720,12 @@
  45  configure-target-qthreads: $(ALL_GCC_C)
  46  all-target-qthreads: configure-target-qthreads
  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:
  53  all-sid: all-tcl all-tk
  54 -all-sim: all-libiberty all-bfd all-opcodes all-readline
  55 +all-sim: all-libiberty all-bfd all-opcodes
  56  all-snavigator: all-tcl all-tk all-itcl all-tix all-db all-grep all-libgui
  57  all-tar: all-libiberty
  58  all-tcl:
  59 @@ -2005,7 +2000,7 @@
  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)" \
  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 @@
  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@
  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
 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
 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 @@
 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.
 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"
 126
 127  /* readline include files */
 128 +#define savestring
 129  #include <readline/readline.h>
 130  #include <readline/history.h>
 131
 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 @@
 136  #include "ax-gdb.h"
 137
 138  /* readline include files */
 139 +#define savestring
 140  #include <readline/readline.h>
 141  #include <readline/history.h>
 142
 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 @@
 147
 148  #include "inferior.h" /* for signed_pointer_to_address */
 149
 150 +#define savestring
 151  #include <readline/readline.h>
 152
 153  #ifndef MALLOC_INCOMPATIBLE
 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 @@
 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 ();
 170 @@ -650,8 +650,8 @@
 171        if (winWithFocus != cmdWin)
 172         keypad (cmdWin->generic.handle, FALSE);
 173        tui_update_gdb_sizes ();
 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++;
 181 @@ -678,8 +678,8 @@
 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
 192 @@ -688,7 +688,7 @@
 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);
 201 @@ -716,8 +716,8 @@
 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
 212 @@ -736,9 +736,9 @@
 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