* 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.

2 files changed, 29 insertions, 5 deletions

diff --git a/gdb/config/amix.mh b/gdb/config/amix.mh
index f110dcc..945a50f 100644
--- a/gdb/config/amix.mh
+++ b/gdb/config/amix.mh
@@ -4,3 +4,18 @@ XM_FILE= xm-amix.h
 SYSV_DEFINE=-DSYSV
 REGEX=regex.o
 REGEX1=regex.o
+
+# We need to find alloca() somewhere.  Gcc has one built in, but most other
+# compilers don't.  Using the one in /usr/ucblib/libucb.a is tricky because
+# we have to be careful not to pull in anything else from the library (lots
+# of things are broken in most SVR4 versions).  The best solution is to just
+# compile alloca.c and link it into the executable.  If we end up not needing
+# it, then the code is just dead.  Once alloca.c moves to libiberty, then we
+# can eliminate this semi-kludge.
+ALLOCA=alloca.o
+ALLOCA1=alloca.o
+
+# SVR4 comes standard with terminfo, and in some implementations, the
+# old termcap descriptions are incomplete.  So ensure that we use the
+# new terminfo interface and latest terminal descriptions.
+TERMCAP=-ltermlib
diff --git a/gdb/config/i386v4.mh b/gdb/config/i386v4.mh
index 4259512..6a5ef06 100644
--- a/gdb/config/i386v4.mh
+++ b/gdb/config/i386v4.mh
@@ -1,13 +1,22 @@
 # Host: Intel 386 running SVR4.
 XDEPFILES= procfs.o i386-xdep.o
 XM_FILE= xm-i386v4.h
+XM_CLIBS=
 SYSV_DEFINE=-DSYSV
 REGEX=regex.o
 REGEX1=regex.o
 
 # We need to find alloca() somewhere.  Gcc has one built in, but most other
-# compilers don't.  We can find one in /usr/ucblib/libucb.a, but we don't
-# want to link against the ucb libraries until after we have linked against
-# the standard libc, or we will pick up broken versions of lots of other things
-# that should come from libc.  So we explicitly specify a link with libc first.
-XM_CLIBS=-lc /usr/ucblib/libucb.a
+# compilers don't.  Using the one in /usr/ucblib/libucb.a is tricky because
+# we have to be careful not to pull in anything else from the library (lots
+# of things are broken in most SVR4 versions).  The best solution is to just
+# compile alloca.c and link it into the executable.  If we end up not needing
+# it, then the code is just dead.  Once alloca.c moves to libiberty, then we
+# can eliminate this semi-kludge.
+ALLOCA=alloca.o
+ALLOCA1=alloca.o
+
+# SVR4 comes standard with terminfo, and in some implementations, the
+# old termcap descriptions are incomplete.  So ensure that we use the
+# new terminfo interface and latest terminal descriptions.
+TERMCAP=-ltermlib