From 431df2ebacd5349884e9cb4b116bc193f59717a6 Mon Sep 17 00:00:00 2001
From: Fred Fish <fnf@specifix.com>
Date: Mon, 23 Dec 1991 03:43:48 +0000
Subject: [PATCH] 	* solib.c (locate_base):  Fix uninitialized variable
 that was 	causing return of random value to callee.

	* config/mh-amix, config/mh-i386v4:  Change to find alloca by
	compiling and linking alloca.c, even when it is not strictly
	required.  Also arrange to link with -ltermlib rather than
	-ltermcap.

	* Makefile.in:  Move TERMCAP definition to prior to inclusion
	of host makefile fragments so it can be overridden.
---
 gdb/ChangeLog   | 13 +++++++++++++
 gdb/Makefile.in | 10 +++++-----
 gdb/solib.c     |  2 +-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cf99117db3f..08c3300ca34 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,16 @@
+Sun Dec 22 19:31:04 1991  Fred Fish  (fnf at cygnus.com)
+
+	* solib.c (locate_base):  Fix uninitialized variable that was 
+	causing return of random value to callee.
+
+	* config/mh-amix, config/mh-i386v4:  Change to find alloca by
+	compiling and linking alloca.c, even when it is not strictly
+	required.  Also arrange to link with -ltermlib rather than
+	-ltermcap.
+
+	* Makefile.in:  Move TERMCAP definition to prior to inclusion
+	of host makefile fragments so it can be overridden.
+
 Fri Dec 20 16:33:39 1991  John Gilmore  (gnu at cygnus.com)
 
 	* xcoffread.c (read_symbol_lineno):  Logic error in incrementing
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index bf84c42b0cc..b796a766664 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -31,7 +31,7 @@ man6dir = $(mandir)/man6
 man7dir = $(mandir)/man7
 man8dir = $(mandir)/man8
 man9dir = $(mandir)/man9
-infodir = $(prefix)/info
+infodir = $(datadir)/info
 includedir = $(prefix)/include
 docdir = $(datadir)/doc
 
@@ -45,6 +45,10 @@ AR = ar
 AR_FLAGS = qv
 RANLIB = ranlib
 
+# Flags that describe where you can find the termcap library.
+# This can be overridden in the host Makefile fragment file.
+TERMCAP = -ltermcap
+
 #### Host, target, and site specific Makefile fragments come in here.
 ###
 
@@ -140,10 +144,6 @@ LDFLAGS = $(CFLAGS)
 LIBIBERTY_DIR = ${srcdir}/../libiberty
 LIBIBERTY = $(unsubdir)/../libiberty${subdir}/libiberty.a
 
-# Flags that describe where you can find the termcap library.
-# You may need to make other arrangements for USG.
-TERMCAP = -ltermcap
-
 # The config/mh-* file must define REGEX and REGEX1 on USG machines.
 # If your sysyem is missing alloca(), or, more likely, it's there but
 # it doesn't work, define ALLOCA & ALLOCA1 too.
diff --git a/gdb/solib.c b/gdb/solib.c
index b1c78a43116..1c6717b2bd8 100644
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -301,7 +301,7 @@ FIXME
 static CORE_ADDR
 locate_base ()
 {
-  CORE_ADDR address;
+  CORE_ADDR address = 0;
 
 #ifdef sun
 
-- 
2.30.2