* Makefile.in: Roll VERSION to 4.5.4.

* Makefile.in, config/*.mh, config/*.mt:  Rename TM_CFLAGS
to MT_CFLAGS, XM_CFLAGS to MH_CFLAGS to match file names.
* config/sun4os5.mh:  Add MH_CFLAGS=-xs to save debug info.

16 files changed, 30 insertions, 21 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5e0dcadead..fe7e49616c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jun  8 21:59:08 1992  John Gilmore  (gnu at cygnus.com)
+
+	* Makefile.in:  Roll VERSION to 4.5.4.
+	* Makefile.in, config/*.mh, config/*.mt:  Rename TM_CFLAGS
+	to MT_CFLAGS, XM_CFLAGS to MH_CFLAGS to match file names.
+	* config/sun4os5.mh:  Add MH_CFLAGS=-xs to save debug info.
+
 Mon Jun  8 14:17:42 1992  Stu Grossman  (grossman at cygnus.com)
 
 	* configure.in:  Tandem debug monitor (st2000) support.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 5ec73b46a7..8b9f58da99 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -74,9 +74,7 @@ srcdir = .
 # CFLAGS section if your system doesn't have fcntl.h in /usr/include (which 
 # is where it should be according to Posix).
 
-BISON=bison -y
-BISONFLAGS=
-YACC=$(BISON) $(BISONFLAGS)
+YACC=byacc
 # YACC=yacc
 MAKE=make
 
@@ -131,9 +129,9 @@ RL_LIB = ./../readline${subdir}/libreadline.a
 # -I${srcdir} possibly for regex.h also.
 INCLUDE_CFLAGS = -I. -I${srcdir} -I$(INCLUDE_DIR) -I$(READLINE_DIR)
 
-# {X,T}M_CFLAGS, if defined, has system-dependent CFLAGS.
-# CFLAGS for GDB
-GLOBAL_CFLAGS = ${TM_CFLAGS} ${XM_CFLAGS}
+# M{H,T}_CFLAGS, if defined, has host- and target-dependent CFLAGS
+# from the config/ directory.
+GLOBAL_CFLAGS = ${MT_CFLAGS} ${MH_CFLAGS}
 #PROFILE_CFLAGS = -pg
 
 # CFLAGS is specifically reserved for setting from the command line
@@ -165,7 +163,7 @@ CDEPS = ${XM_CDEPS} ${TM_CDEPS} ${BFD_LIB} ${MMALLOC_LIB} ${LIBIBERTY} \
 ADD_FILES = ${REGEX} ${ALLOCA} ${XM_ADD_FILES} ${TM_ADD_FILES}
 ADD_DEPS = ${REGEX1} ${ALLOCA1} ${XM_ADD_FILES} ${TM_ADD_FILES}
 
-VERSION = 4.5.3
+VERSION = 4.5.4
 DIST=gdb
 
 LINT=/usr/5bin/lint
@@ -642,7 +640,7 @@ gdb.info: ./doc/gdb-all.texi
 copying.c: ${srcdir}/COPYING ${srcdir}/copying.awk
 	awk -f ${srcdir}/copying.awk < ${srcdir}/COPYING > copying.c
 
-version.c: Makefile.in
+version.c: Makefile
 	echo 'char *version = "$(VERSION)";' >version.c
 
 # c-exp.tab.c is generated in target dir from c-exp.y if it doesn't exist
diff --git a/gdb/config/a29k-kern.mt b/gdb/config/a29k-kern.mt
index bdc9490a83..0ecf14fcb6 100644
--- a/gdb/config/a29k-kern.mt
+++ b/gdb/config/a29k-kern.mt
@@ -7,4 +7,4 @@
 # the upage.
 TDEPFILES= exec.o am29k-pinsn.o am29k-tdep.o remote-mm.o remote-adapt.o
 TM_FILE= tm-ultra3.h
-TM_CFLAGS = -DKERNEL_DEBUGGING -DNO_HIF_SUPPORT
+MT_CFLAGS = -DKERNEL_DEBUGGING -DNO_HIF_SUPPORT
diff --git a/gdb/config/a29k-udi.mt b/gdb/config/a29k-udi.mt
index b6d85b8e00..376c1b368f 100644
--- a/gdb/config/a29k-udi.mt
+++ b/gdb/config/a29k-udi.mt
@@ -2,4 +2,4 @@
 TDEPFILES= exec.o am29k-pinsn.o remote-udi.o am29k-tdep.o yank.o udip2soc.o udr.o mini2udi.o
 TM_FILE= tm-29k.h
 # The following is for ../include/a.out.encap.h
-TM_CFLAGS = -Da29k -DREMOTE -DTARGET=TARGET_AM29K -DAMD_COFF
+MT_CFLAGS = -Da29k -DREMOTE -DTARGET=TARGET_AM29K -DAMD_COFF
diff --git a/gdb/config/a29k.mt b/gdb/config/a29k.mt
index aa1db16b74..29ae63b5d0 100644
--- a/gdb/config/a29k.mt
+++ b/gdb/config/a29k.mt
@@ -7,4 +7,4 @@
 # Or run native on an Ultracomputer.
 TDEPFILES= exec.o am29k-pinsn.o am29k-tdep.o remote-eb.o remote-mm.o remote-adapt.o 
 TM_FILE= tm-29k.h
-TM_CFLAGS = -DNO_HIF_SUPPORT
+MT_CFLAGS = -DNO_HIF_SUPPORT
diff --git a/gdb/config/go32.mh b/gdb/config/go32.mh
index 93a8e2a982..89d548cfcf 100644
--- a/gdb/config/go32.mh
+++ b/gdb/config/go32.mh
@@ -1,4 +1,4 @@
 
-XM_CFLAGS=-D__GO32__ -D__MSDOS__
+MH_CFLAGS=-D__GO32__ -D__MSDOS__
 XDEPFILES= go32-xdep.o ser-go32.o
 XM_FILE= xm-go32.h
diff --git a/gdb/config/h8300hms.mt b/gdb/config/h8300hms.mt
index 0c7c0c7dbe..1a2c765337 100644
--- a/gdb/config/h8300hms.mt
+++ b/gdb/config/h8300hms.mt
@@ -1,4 +1,3 @@
 # Target: H8300 with HMS monitor 
 TDEPFILES= exec.o h8300-tdep.o  remote-hms.o
 TM_FILE= tm-h8300.h
-TM_CFLAGS=
diff --git a/gdb/config/hp300hpux.mt b/gdb/config/hp300hpux.mt
index d061486ad1..d1837ac822 100644
--- a/gdb/config/hp300hpux.mt
+++ b/gdb/config/hp300hpux.mt
@@ -6,6 +6,6 @@
 
 # The headers in the directory hp-include override system headers
 # and tell GDB to use BSD executable file format (hence -Ihp-include)
-TM_CFLAGS=-Ihp-include
+MT_CFLAGS=-Ihp-include
 TDEPFILES= exec.o m68k-pinsn.o
 TM_FILE= tm-hp300hpux.h
diff --git a/gdb/config/i386v32.mt b/gdb/config/i386v32.mt
index 190a8cf3d8..1ca4cae768 100644
--- a/gdb/config/i386v32.mt
+++ b/gdb/config/i386v32.mt
@@ -1,4 +1,4 @@
 # Target: Intel 386 running System V release 3.2
 TDEPFILES= exec.o i386-tdep.o i386-pinsn.o
 TM_FILE= tm-i386v.h
-TM_CFLAGS=
+MT_CFLAGS=
diff --git a/gdb/config/nindy960.mt b/gdb/config/nindy960.mt
index 0751bd6fb7..d04818f570 100644
--- a/gdb/config/nindy960.mt
+++ b/gdb/config/nindy960.mt
@@ -1,4 +1,4 @@
 # Target: Intel 80960, in an embedded system under the NINDY monitor
 TDEPFILES= exec.o i960-pinsn.o i960-tdep.o nindy-tdep.o remote-nindy.o nindy.o Onindy.o ttybreak.o ttyflush.o
 TM_FILE= tm-nindy960.h
-TM_CFLAGS=
+MT_CFLAGS=
diff --git a/gdb/config/rs6000.mh b/gdb/config/rs6000.mh
index 8f5f05ef7c..5cf39081f0 100644
--- a/gdb/config/rs6000.mh
+++ b/gdb/config/rs6000.mh
@@ -19,7 +19,7 @@
 
 XDEPFILES= xcoffexec.o infptrace.o rs6000-xdep.o
 XM_FILE= xm-rs6000.h
-XM_CFLAGS = -bnodelcsect
+MH_CFLAGS = -bnodelcsect
 
 # Because of shared libraries, we risk ending up with *two*
 # incompatible versions of malloc if we use GNU malloc ...
diff --git a/gdb/config/rtbsd.mh b/gdb/config/rtbsd.mh
index d6310db997..3c86cdfa35 100644
--- a/gdb/config/rtbsd.mh
+++ b/gdb/config/rtbsd.mh
@@ -3,6 +3,6 @@
 # debug a 29k running unix.  No attempt, as of 7/16/91, has been made
 # to support debugging of RT executables.
 XDEPFILES=coredep.o infptrace.o
-XM_CFLAGS=-DHOSTING_ONLY	# No debugging of RT executables 
+MH_CFLAGS=-DHOSTING_ONLY	# No debugging of RT executables 
 XM_FILE= xm-rtbsd.h
 CC=gcc -traditional		# hc/pcc just can't cut it.
diff --git a/gdb/config/sun4os5.mh b/gdb/config/sun4os5.mh
index 10f7c467bd..60e965db13 100755
--- a/gdb/config/sun4os5.mh
+++ b/gdb/config/sun4os5.mh
@@ -19,3 +19,8 @@ REGEX1=regex.o
 # old termcap descriptions are incomplete.  So ensure that we use the
 # new terminfo interface and latest terminal descriptions.
 TERMCAP=-ltermlib
+
+# Sun's compilers require the -xs option to produce debug information
+# in the final linked executable.  Otherwise they leave it in the .o
+# files only, with undocumented pointers to it in the linked executable.
+MH_CFLAGS=-xs
diff --git a/gdb/config/ultra3.mh b/gdb/config/ultra3.mh
index d7b227ffa0..e3b998f74d 100644
--- a/gdb/config/ultra3.mh
+++ b/gdb/config/ultra3.mh
@@ -3,5 +3,5 @@ CC=u3cc
 MUNCH_DEFINE="MUNCH_NM=u3nm"
 XDEPFILES= ultra3-xdep.o infptrace.o
 XM_FILE= xm-ultra3.h
-XM_CFLAGS = -DSYM1
+MH_CFLAGS = -DSYM1
 XM_CLIBS = -lsysv -ljobs -ltermlib 
diff --git a/gdb/config/ultra3.mt b/gdb/config/ultra3.mt
index d2d3876b3e..b4f46d7ac6 100644
--- a/gdb/config/ultra3.mt
+++ b/gdb/config/ultra3.mt
@@ -2,4 +2,4 @@
 TDEPFILES= exec.o am29k-pinsn.o am29k-tdep.o
 TM_FILE= tm-ultra3.h
 # SYM1 is some OS they have.
-TM_CFLAGS = -DSYM1
+MT_CFLAGS = -DSYM1
diff --git a/gdb/config/vxworks960.mt b/gdb/config/vxworks960.mt
index 3f3c059fd0..d2a14e0095 100644
--- a/gdb/config/vxworks960.mt
+++ b/gdb/config/vxworks960.mt
@@ -2,4 +2,4 @@
 TDEPFILES= exec.o i960-pinsn.o i960-tdep.o remote-vx.o xdr_ld.o xdr_ptrace.o xdr_rdb.o xdr_regs.o
 TM_FILE= tm-vx960.h
 # Define this for the vx-share routines, which don't see param.h.
-TM_CFLAGS= -DI80960
+MT_CFLAGS= -DI80960