gdb-readline.patch

   1 diff -urN gdb-6.0.org/gdb/gdbserver/Makefile.in gdb-6.0/gdb/gdbserver/Makefile.in
   2 --- gdb-6.0.org/gdb/gdbserver/Makefile.in       2003-10-09 19:42:41.000000000 +0200
   3 +++ gdb-6.0/gdb/gdbserver/Makefile.in   2003-10-09 19:48:08.000000000 +0200
   4 @@ -76,7 +76,7 @@
   5
   6  # Where is the source dir for the READLINE library?  Traditionally in .. or .
   7  # (For the binary library built from it, we use ${READLINE_DIR}${subdir}.)
   8 -READLINE_DIR = ${srcdir}/../readline
   9 +READLINE_DIR = /usr/lib
  10  READLINE_DEP = $$(READLINE_DIR)
  11
  12  # All the includes used for CFLAGS and for lint.
  13 diff -urN gdb-6.0.org/gdb/Makefile.in gdb-6.0/gdb/Makefile.in
  14 --- gdb-6.0.org/gdb/Makefile.in 2003-10-09 19:42:39.000000000 +0200
  15 +++ gdb-6.0/gdb/Makefile.in     2003-10-09 19:48:08.000000000 +0200
  16 @@ -116,10 +116,10 @@
  17  BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC)
  18
  19  # Where is the READLINE library?  Typically in ../readline.
  20 -READLINE_DIR = ../readline
  21 -READLINE = $(READLINE_DIR)/libreadline.a
  22 -READLINE_SRC = $(srcdir)/$(READLINE_DIR)
  23 -READLINE_CFLAGS = -I$(READLINE_SRC)/..
  24 +READLINE_DIR = /usr/include/readline
  25 +READLINE = -lreadline
  26 +READLINE_SRC = /usr/include/readline
  27 +READLINE_CFLAGS = -I/usr/include/readline
  28
  29  WARN_CFLAGS = @WARN_CFLAGS@
  30  WERROR_CFLAGS = @WERROR_CFLAGS@
  31 @@ -369,7 +369,7 @@
  32         $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) @LIBS@ \
  33         $(LIBICONV) \
  34         $(LIBIBERTY) $(WIN32LIBS)
  35 -CDEPS = $(XM_CDEPS) $(TM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE) \
  36 +CDEPS = $(XM_CDEPS) $(TM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) \
  37         $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS)
  38
  39  ADD_FILES = $(XM_ADD_FILES) $(TM_ADD_FILES) $(NAT_ADD_FILES)
  40 --- gdb-6.1/Makefile.in.orig    2004-04-03 18:52:09.000000000 +0200
  41 +++ gdb-6.1/Makefile.in 2004-04-17 22:43:50.603804248 +0200
  42 @@ -571,7 +571,6 @@
  43      maybe-configure-perl \
  44      maybe-configure-prms \
  45      maybe-configure-rcs \
  46 -    maybe-configure-readline \
  47      maybe-configure-release \
  48      maybe-configure-recode \
  49      maybe-configure-sed \
  50 @@ -661,7 +660,6 @@
  51      maybe-all-perl \
  52      maybe-all-prms \
  53      maybe-all-rcs \
  54 -    maybe-all-readline \
  55      maybe-all-release \
  56      maybe-all-recode \
  57      maybe-all-sed \
  58 @@ -755,7 +753,6 @@
  59      maybe-info-perl \
  60      maybe-info-prms \
  61      maybe-info-rcs \
  62 -    maybe-info-readline \
  63      maybe-info-release \
  64      maybe-info-recode \
  65      maybe-info-sed \
  66 @@ -1724,28 +1721,6 @@
  67           || exit 1
  68
  69
  70 -.PHONY: maybe-info-readline info-readline
  71 -maybe-info-readline:
  72 -
  73 -info-readline: \
  74 -    configure-readline
  75 -       @[ -f ./readline/Makefile ] || exit 0; \
  76 -       r=`${PWD_COMMAND}`; export r; \
  77 -       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  78 -       $(SET_LIB_PATH) \
  79 -       for flag in $(EXTRA_HOST_FLAGS); do \
  80 -         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
  81 -       done; \
  82 -       echo "Doing info in readline" ; \
  83 -       (cd readline && \
  84 -         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
  85 -                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
  86 -                 "RANLIB=$${RANLIB}" \
  87 -                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
  88 -                 info) \
  89 -         || exit 1
  90 -
  91 -
  92  .PHONY: maybe-info-release info-release
  93  maybe-info-release:
  94
  95 @@ -2654,7 +2629,6 @@
  96      maybe-dvi-perl \
  97      maybe-dvi-prms \
  98      maybe-dvi-rcs \
  99 -    maybe-dvi-readline \
 100      maybe-dvi-release \
 101      maybe-dvi-recode \
 102      maybe-dvi-sed \
 103 @@ -3623,28 +3597,6 @@
 104           || exit 1
 105
 106
 107 -.PHONY: maybe-dvi-readline dvi-readline
 108 -maybe-dvi-readline:
 109 -
 110 -dvi-readline: \
 111 -    configure-readline
 112 -       @[ -f ./readline/Makefile ] || exit 0; \
 113 -       r=`${PWD_COMMAND}`; export r; \
 114 -       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 115 -       $(SET_LIB_PATH) \
 116 -       for flag in $(EXTRA_HOST_FLAGS); do \
 117 -         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 118 -       done; \
 119 -       echo "Doing dvi in readline" ; \
 120 -       (cd readline && \
 121 -         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 122 -                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 123 -                 "RANLIB=$${RANLIB}" \
 124 -                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
 125 -                 dvi) \
 126 -         || exit 1
 127 -
 128 -
 129  .PHONY: maybe-dvi-release dvi-release
 130  maybe-dvi-release:
 131
 132 @@ -4553,7 +4505,6 @@
 133      maybe-TAGS-perl \
 134      maybe-TAGS-prms \
 135      maybe-TAGS-rcs \
 136 -    maybe-TAGS-readline \
 137      maybe-TAGS-release \
 138      maybe-TAGS-recode \
 139      maybe-TAGS-sed \
 140 @@ -5522,28 +5473,6 @@
 141           || exit 1
 142
 143
 144 -.PHONY: maybe-TAGS-readline TAGS-readline
 145 -maybe-TAGS-readline:
 146 -
 147 -TAGS-readline: \
 148 -    configure-readline
 149 -       @[ -f ./readline/Makefile ] || exit 0; \
 150 -       r=`${PWD_COMMAND}`; export r; \
 151 -       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 152 -       $(SET_LIB_PATH) \
 153 -       for flag in $(EXTRA_HOST_FLAGS); do \
 154 -         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 155 -       done; \
 156 -       echo "Doing TAGS in readline" ; \
 157 -       (cd readline && \
 158 -         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 159 -                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 160 -                 "RANLIB=$${RANLIB}" \
 161 -                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
 162 -                 TAGS) \
 163 -         || exit 1
 164 -
 165 -
 166  .PHONY: maybe-TAGS-release TAGS-release
 167  maybe-TAGS-release:
 168
 169 @@ -6452,7 +6381,6 @@
 170      maybe-install-info-perl \
 171      maybe-install-info-prms \
 172      maybe-install-info-rcs \
 173 -    maybe-install-info-readline \
 174      maybe-install-info-release \
 175      maybe-install-info-recode \
 176      maybe-install-info-sed \
 177 @@ -7463,29 +7391,6 @@
 178           || exit 1
 179
 180
 181 -.PHONY: maybe-install-info-readline install-info-readline
 182 -maybe-install-info-readline:
 183 -
 184 -install-info-readline: \
 185 -    configure-readline \
 186 -    info-readline
 187 -       @[ -f ./readline/Makefile ] || exit 0; \
 188 -       r=`${PWD_COMMAND}`; export r; \
 189 -       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 190 -       $(SET_LIB_PATH) \
 191 -       for flag in $(EXTRA_HOST_FLAGS); do \
 192 -         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 193 -       done; \
 194 -       echo "Doing install-info in readline" ; \
 195 -       (cd readline && \
 196 -         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 197 -                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 198 -                 "RANLIB=$${RANLIB}" \
 199 -                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
 200 -                 install-info) \
 201 -         || exit 1
 202 -
 203 -
 204  .PHONY: maybe-install-info-release install-info-release
 205  maybe-install-info-release:
 206
 207 @@ -8433,7 +8338,6 @@
 208      maybe-installcheck-perl \
 209      maybe-installcheck-prms \
 210      maybe-installcheck-rcs \
 211 -    maybe-installcheck-readline \
 212      maybe-installcheck-release \
 213      maybe-installcheck-recode \
 214      maybe-installcheck-sed \
 215 @@ -9402,28 +9306,6 @@
 216           || exit 1
 217
 218
 219 -.PHONY: maybe-installcheck-readline installcheck-readline
 220 -maybe-installcheck-readline:
 221 -
 222 -installcheck-readline: \
 223 -    configure-readline
 224 -       @[ -f ./readline/Makefile ] || exit 0; \
 225 -       r=`${PWD_COMMAND}`; export r; \
 226 -       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 227 -       $(SET_LIB_PATH) \
 228 -       for flag in $(EXTRA_HOST_FLAGS); do \
 229 -         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 230 -       done; \
 231 -       echo "Doing installcheck in readline" ; \
 232 -       (cd readline && \
 233 -         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 234 -                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 235 -                 "RANLIB=$${RANLIB}" \
 236 -                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
 237 -                 installcheck) \
 238 -         || exit 1
 239 -
 240 -
 241  .PHONY: maybe-installcheck-release installcheck-release
 242  maybe-installcheck-release:
 243
 244 @@ -10332,7 +10214,6 @@
 245      maybe-mostlyclean-perl \
 246      maybe-mostlyclean-prms \
 247      maybe-mostlyclean-rcs \
 248 -    maybe-mostlyclean-readline \
 249      maybe-mostlyclean-release \
 250      maybe-mostlyclean-recode \
 251      maybe-mostlyclean-sed \
 252 @@ -11245,27 +11126,6 @@
 253           || exit 1
 254
 255
 256 -.PHONY: maybe-mostlyclean-readline mostlyclean-readline
 257 -maybe-mostlyclean-readline:
 258 -
 259 -mostlyclean-readline:
 260 -       @[ -f ./readline/Makefile ] || exit 0; \
 261 -       r=`${PWD_COMMAND}`; export r; \
 262 -       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 263 -       $(SET_LIB_PATH) \
 264 -       for flag in $(EXTRA_HOST_FLAGS); do \
 265 -         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 266 -       done; \
 267 -       echo "Doing mostlyclean in readline" ; \
 268 -       (cd readline && \
 269 -         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 270 -                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 271 -                 "RANLIB=$${RANLIB}" \
 272 -                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
 273 -                 mostlyclean) \
 274 -         || exit 1
 275 -
 276 -
 277  .PHONY: maybe-mostlyclean-release mostlyclean-release
 278  maybe-mostlyclean-release:
 279
 280 @@ -12107,7 +11967,6 @@
 281      maybe-clean-perl \
 282      maybe-clean-prms \
 283      maybe-clean-rcs \
 284 -    maybe-clean-readline \
 285      maybe-clean-release \
 286      maybe-clean-recode \
 287      maybe-clean-sed \
 288 @@ -13034,27 +12893,6 @@
 289           || exit 1
 290
 291
 292 -.PHONY: maybe-clean-readline clean-readline
 293 -maybe-clean-readline:
 294 -
 295 -clean-readline:
 296 -       @[ -f ./readline/Makefile ] || exit 0; \
 297 -       r=`${PWD_COMMAND}`; export r; \
 298 -       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 299 -       $(SET_LIB_PATH) \
 300 -       for flag in $(EXTRA_HOST_FLAGS); do \
 301 -         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 302 -       done; \
 303 -       echo "Doing clean in readline" ; \
 304 -       (cd readline && \
 305 -         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 306 -                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 307 -                 "RANLIB=$${RANLIB}" \
 308 -                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
 309 -                 clean) \
 310 -         || exit 1
 311 -
 312 -
 313  .PHONY: maybe-clean-release clean-release
 314  maybe-clean-release:
 315
 316 @@ -13896,7 +13734,6 @@
 317      maybe-distclean-perl \
 318      maybe-distclean-prms \
 319      maybe-distclean-rcs \
 320 -    maybe-distclean-readline \
 321      maybe-distclean-release \
 322      maybe-distclean-recode \
 323      maybe-distclean-sed \
 324 @@ -14823,27 +14660,6 @@
 325           || exit 1
 326
 327
 328 -.PHONY: maybe-distclean-readline distclean-readline
 329 -maybe-distclean-readline:
 330 -
 331 -distclean-readline:
 332 -       @[ -f ./readline/Makefile ] || exit 0; \
 333 -       r=`${PWD_COMMAND}`; export r; \
 334 -       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 335 -       $(SET_LIB_PATH) \
 336 -       for flag in $(EXTRA_HOST_FLAGS); do \
 337 -         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 338 -       done; \
 339 -       echo "Doing distclean in readline" ; \
 340 -       (cd readline && \
 341 -         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 342 -                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 343 -                 "RANLIB=$${RANLIB}" \
 344 -                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
 345 -                 distclean) \
 346 -         || exit 1
 347 -
 348 -
 349  .PHONY: maybe-distclean-release distclean-release
 350  maybe-distclean-release:
 351
 352 @@ -15685,7 +15501,6 @@
 353      maybe-maintainer-clean-perl \
 354      maybe-maintainer-clean-prms \
 355      maybe-maintainer-clean-rcs \
 356 -    maybe-maintainer-clean-readline \
 357      maybe-maintainer-clean-release \
 358      maybe-maintainer-clean-recode \
 359      maybe-maintainer-clean-sed \
 360 @@ -16612,27 +16427,6 @@
 361           || exit 1
 362
 363
 364 -.PHONY: maybe-maintainer-clean-readline maintainer-clean-readline
 365 -maybe-maintainer-clean-readline:
 366 -
 367 -maintainer-clean-readline:
 368 -       @[ -f ./readline/Makefile ] || exit 0; \
 369 -       r=`${PWD_COMMAND}`; export r; \
 370 -       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 371 -       $(SET_LIB_PATH) \
 372 -       for flag in $(EXTRA_HOST_FLAGS); do \
 373 -         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 374 -       done; \
 375 -       echo "Doing maintainer-clean in readline" ; \
 376 -       (cd readline && \
 377 -         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 378 -                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 379 -                 "RANLIB=$${RANLIB}" \
 380 -                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
 381 -                 maintainer-clean) \
 382 -         || exit 1
 383 -
 384 -
 385  .PHONY: maybe-maintainer-clean-release maintainer-clean-release
 386  maybe-maintainer-clean-release:
 387
 388 @@ -17531,7 +17325,6 @@
 389      maybe-check-perl \
 390      maybe-check-prms \
 391      maybe-check-rcs \
 392 -    maybe-check-readline \
 393      maybe-check-release \
 394      maybe-check-recode \
 395      maybe-check-sed \
 396 @@ -17641,7 +17434,6 @@
 397      maybe-install-perl \
 398      maybe-install-prms \
 399      maybe-install-rcs \
 400 -    maybe-install-readline \
 401      maybe-install-release \
 402      maybe-install-recode \
 403      maybe-install-sed \
 404 @@ -17708,7 +17500,6 @@
 405      maybe-install-perl \
 406      maybe-install-prms \
 407      maybe-install-rcs \
 408 -    maybe-install-readline \
 409      maybe-install-release \
 410      maybe-install-recode \
 411      maybe-install-sed \
 412 @@ -20631,73 +20422,6 @@
 413         (cd rcs && $(MAKE) $(FLAGS_TO_PASS) install)
 414
 415
 416 -.PHONY: configure-readline maybe-configure-readline
 417 -maybe-configure-readline:
 418 -configure-readline:
 419 -       @test ! -f readline/Makefile || exit 0; \
 420 -       [ -d readline ] || mkdir readline; \
 421 -       r=`${PWD_COMMAND}`; export r; \
 422 -       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 423 -       CC="$(CC)"; export CC; \
 424 -       CFLAGS="$(CFLAGS)"; export CFLAGS; \
 425 -       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
 426 -       CXX="$(CXX)"; export CXX; \
 427 -       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
 428 -       AR="$(AR)"; export AR; \
 429 -       AS="$(AS)"; export AS; \
 430 -       CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
 431 -       DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
 432 -       LD="$(LD)"; export LD; \
 433 -       NM="$(NM)"; export NM; \
 434 -       RANLIB="$(RANLIB)"; export RANLIB; \
 435 -       WINDRES="$(WINDRES)"; export WINDRES; \
 436 -       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
 437 -       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
 438 -       echo Configuring in readline; \
 439 -       cd readline || exit 1; \
 440 -       case $(srcdir) in \
 441 -         \.) \
 442 -           srcdiroption="--srcdir=."; \
 443 -           libsrcdir=".";; \
 444 -         /* | [A-Za-z]:[\\/]*) \
 445 -           srcdiroption="--srcdir=$(srcdir)/readline"; \
 446 -           libsrcdir="$$s/readline";; \
 447 -         *) \
 448 -           srcdiroption="--srcdir=../$(srcdir)/readline"; \
 449 -           libsrcdir="$$s/readline";; \
 450 -       esac; \
 451 -       $(SHELL) $${libsrcdir}/configure \
 452 -         $(HOST_CONFIGARGS) $${srcdiroption} \
 453 -         || exit 1
 454 -
 455 -.PHONY: all-readline maybe-all-readline
 456 -maybe-all-readline:
 457 -all-readline: configure-readline
 458 -       @r=`${PWD_COMMAND}`; export r; \
 459 -       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 460 -       $(SET_LIB_PATH) \
 461 -       (cd readline && $(MAKE) $(FLAGS_TO_PASS) all)
 462 -
 463 -.PHONY: check-readline maybe-check-readline
 464 -maybe-check-readline:
 465 -
 466 -check-readline:
 467 -       @r=`${PWD_COMMAND}`; export r; \
 468 -       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 469 -       $(SET_LIB_PATH) \
 470 -       (cd readline && $(MAKE) $(FLAGS_TO_PASS) check)
 471 -
 472 -
 473 -.PHONY: install-readline maybe-install-readline
 474 -maybe-install-readline:
 475 -
 476 -install-readline: installdirs
 477 -       @r=`${PWD_COMMAND}`; export r; \
 478 -       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 479 -       $(SET_LIB_PATH) \
 480 -       (cd readline && $(MAKE) $(FLAGS_TO_PASS) install)
 481 -
 482 -
 483  .PHONY: configure-release maybe-configure-release
 484  maybe-configure-release:
 485  configure-release:
 486 @@ -23771,7 +23495,7 @@
 487  # GDB needs to know that the simulator is being built.
 488  configure-gdb: maybe-configure-itcl maybe-configure-tcl maybe-configure-tk maybe-configure-sim
 489  GDB_TK = @GDB_TK@
 490 -all-gdb: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-mmalloc maybe-all-readline maybe-all-bison maybe-all-byacc maybe-all-sim $(gdbnlmrequirements) $(GDB_TK)
 491 +all-gdb: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-mmalloc maybe-all-bison maybe-all-byacc maybe-all-sim $(gdbnlmrequirements) $(GDB_TK)
 492  install-gdb: maybe-install-tcl maybe-install-tk maybe-install-itcl maybe-install-tix maybe-install-libgui
 493  configure-libgui: maybe-configure-tcl maybe-configure-tk
 494  all-libgui: maybe-all-tcl maybe-all-tk maybe-all-itcl
 495 @@ -23802,7 +23526,7 @@
 496  install-itcl: maybe-install-tcl
 497  all-sid: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-tcl maybe-all-tk
 498  install-sid: maybe-install-tcl maybe-install-tk
 499 -all-sim: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-readline maybe-configure-gdb
 500 +all-sim: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-configure-gdb
 501  configure-tk: maybe-configure-tcl
 502  all-tk: maybe-all-tcl
 503  configure-tix: maybe-configure-tcl maybe-configure-tk