From ef131e13159a6d2825d4ae0dd93587bcc8a9c8eb Mon Sep 17 00:00:00 2001 From: John Gilmore Date: Fri, 28 Aug 1992 04:58:27 +0000 Subject: [PATCH] * configure.in (target configurations): Reformat into table. Remove unsupp. Amigados host and target. Ditto Mach 386 target. * tm-altosgas.h, tm-i386v-g.h: Remove ancient coff encap configs. * config/{altosgas.mt, i386v-g.mt, i386v32-g.mt}: Ditto. * config/{i386sco.mt,i386v32.mt}: Remove; identical to i386v.mt. * config/{go32.mt,i960.mt}: Remove; they only printed error msgs. * config/nindy960.mt: Remove useless MT_CFLAGS setting. * config/i386aout.mt: Use tm-i386v.h, not tm-i386v-g.h. * Makefile.in (config-check): Add command to check whether configure.in is consistent with config/*. --- gdb/ChangeLog | 15 +++ gdb/Makefile.in | 72 +++++++---- gdb/configure.in | 313 ++++++++++++++++++----------------------------- 3 files changed, 181 insertions(+), 219 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b3bb7611147..59cc3c3a36e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,18 @@ +Thu Aug 27 20:04:56 1992 John Gilmore (gnu@cygnus.com) + + * configure.in (target configurations): Reformat into table. + Remove unsupp. Amigados host and target. Ditto Mach 386 target. + + * tm-altosgas.h, tm-i386v-g.h: Remove ancient coff encap configs. + * config/{altosgas.mt, i386v-g.mt, i386v32-g.mt}: Ditto. + * config/{i386sco.mt,i386v32.mt}: Remove; identical to i386v.mt. + * config/{go32.mt,i960.mt}: Remove; they only printed error msgs. + * config/nindy960.mt: Remove useless MT_CFLAGS setting. + * config/i386aout.mt: Use tm-i386v.h, not tm-i386v-g.h. + + * Makefile.in (config-check): Add command to check whether + configure.in is consistent with config/*. + Wed Aug 26 21:10:52 1992 John Gilmore (gnu@cygnus.com) * configure.in (host configurations): Reformat nested cases into diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 39241dd9977..6de68c223a4 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -178,6 +178,19 @@ DEMANGLER = cplus-dem #### # End of host and target-dependent makefile fragments +FLAGS_TO_PASS = \ + "against=$(against)" \ + "AR=$(AR)" \ + "AR_FLAGS=$(AR_FLAGS)" \ + "CC=$(CC)" \ + "CFLAGS=$(CFLAGS)" \ + "RANLIB=$(RANLIB)" \ + "MAKEINFO=$(MAKEINFO)" \ + "INSTALL=$(INSTALL)" \ + "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ + "INSTALL_DATA=$(INSTALL_DATA)" \ + "BISON=$(BISON)" + # Source files in the main directory. # Files which are included via a config/* Makefile fragment # should *not* be specified here; they're in "ALLDEPFILES". @@ -302,14 +315,14 @@ YYOBJ = c-exp.tab.o m2-exp.tab.o ${CC} -c ${INTERNAL_CFLAGS} $< all: gdb - $(MAKE) subdir_do DO=all "DODIRS=$(SUBDIRS)" + $(MAKE) subdir_do DO=all "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) check: info: force - $(MAKE) subdir_do DO=info "DODIRS=$(SUBDIRS)" "MAKEINFO=$(MAKEINFO)" + $(MAKE) subdir_do DO=info "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) install-info: force - $(MAKE) subdir_do DO=install-info "DODIRS=$(SUBDIRS)" + $(MAKE) subdir_do DO=install-info "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) clean-info: force - $(MAKE) subdir_do DO=clean-info "DODIRS=$(SUBDIRS)" + $(MAKE) subdir_do DO=clean-info "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) gdb.z:gdb.1 nroff -man $(srcdir)/gdb.1 | col -b > gdb.t @@ -317,10 +330,16 @@ gdb.z:gdb.1 mv gdb.t.z gdb.z install: gdb + -parent=`echo $(bindir)|sed -e 's@/[^/]*$$@@'`; \ + if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi + -if [ -d $(bindir) ] ; then true ; else mkdir $(bindir) ; fi + -parent=`echo $(man1dir)|sed -e 's@/[^/]*$$@@'`; \ + if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi + -if [ -d $(man1dir) ] ; then true ; else mkdir $(man1dir) ; fi $(INSTALL_PROGRAM) gdb $(bindir)/$(program_prefix)gdb $(INSTALL_DATA) $(srcdir)/gdb.1 $(man1dir)/$(program_prefix)gdb.1 $(M_INSTALL) - $(MAKE) subdir_do DO=install "DODIRS=$(SUBDIRS)" + $(MAKE) subdir_do DO=install "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) init.c: $(srcdir)/munch $(OBS) $(TSOBS) $(srcdir)/munch ${MUNCH_DEFINE} $(OBS) $(TSOBS) > init.c @@ -458,6 +477,20 @@ config.status: @echo "You must configure gdb. Look at the README file for details." @false +# This checks the configure.in file versus the config/ directory. +config-check: config-check-hosts config-check-targets +config-check-hosts: + grep gdb_host= ${srcdir}/configure.in | \ + sed -e 's/.*gdb_host=//' -e 's/ ;;$$/.mh/' | sort -u >HOSTconf.o + (cd ${srcdir}/config; ls *.mh) >HOSTdir.o + diff -u HOSTconf.o HOSTdir.o + +config-check-targets: + grep gdb_target= ${srcdir}/configure.in | \ + sed -e 's/.*gdb_target=//' -e 's/ ;;$$/.mh/' | sort -u >TARGconf.o + (cd ${srcdir}/config; ls *.mt) >TARGdir.o + diff -u HOSTconf.o HOSTdir.o + # These are not generated by "make depend" because they only are there # for some machines. # But these rules don't do what we want; we want to hack the foo.o: tm.h @@ -548,19 +581,19 @@ clean: rm -f init.c version.c rm -f gdb core gdb.tar gdb.tar.Z make.log rm -f gdb[0-9] - @$(MAKE) subdir_do DO=clean "DODIRS=$(SUBDIRS)" + @$(MAKE) subdir_do DO=clean "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) distclean: clean c-exp.tab.c m2-exp.tab.c TAGS rm -f tm.h xm.h config.status rm -f y.output yacc.acts yacc.tmp rm -f ${TESTS} Makefile depend - @$(MAKE) subdir_do DO=distclean "DODIRS=$(SUBDIRS)" + @$(MAKE) subdir_do DO=distclean "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) realclean: clean rm -f c-exp.tab.c m2-exp.tab.c TAGS rm -f tm.h xm.h config.status rm -f Makefile depend - @$(MAKE) subdir_do DO=realclean "DODIRS=$(SUBDIRS)" + @$(MAKE) subdir_do DO=realclean "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) STAGESTUFF=${OBS} ${TSOBS} ${NTSOBS} ${ADD_FILES} init.c init.o version.c gdb @@ -568,18 +601,7 @@ subdir_do: force @for i in $(DODIRS); do \ if [ -d ./$$i ] ; then \ if (cd ./$$i; \ - $(MAKE) \ - "against=$(against)" \ - "AR=$(AR)" \ - "AR_FLAGS=$(AR_FLAGS)" \ - "CC=$(CC)" \ - "CFLAGS=$(CFLAGS)" \ - "RANLIB=$(RANLIB)" \ - "MAKEINFO=$(MAKEINFO)" \ - "INSTALL=$(INSTALL)" \ - "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ - "INSTALL_DATA=$(INSTALL_DATA)" \ - "BISON=$(BISON)" $(DO)) ; then true ; \ + $(MAKE) $(FLAGS_TO_PASS) $(DO)) ; then true ; \ else exit 1 ; fi ; \ else true ; fi ; \ done @@ -592,26 +614,26 @@ force: # Documentation! # GDB QUICK REFERENCE (TeX dvi file, CM fonts) refcard.dvi: $(srcdir)/doc/refcard.tex - ( cd ./doc; $(MAKE) refcard.dvi ) + ( cd ./doc; $(MAKE) refcard.dvi $(FLAGS_TO_PASS) ) mv ./doc/refcard.dvi . # GDB QUICK REFERENCE (PostScript output, common PS fonts) refcard.ps: $(srcdir)/doc/refcard.tex - ( cd ./doc; $(MAKE) refcard.ps ) + ( cd ./doc; $(MAKE) refcard.ps $(FLAGS_TO_PASS) ) mv ./doc/refcard.ps . # GDB MANUAL: TeX dvi file gdb.dvi: ./doc/gdb-all.texi - ( cd ./doc; $(MAKE) M4=$(M4) gdb.dvi ) + ( cd ./doc; $(MAKE) M4=$(M4) gdb.dvi $(FLAGS_TO_PASS) ) mv ./doc/gdb.dvi . # GDB MANUAL: info file gdb.info: ./doc/gdb-all.texi - ( cd ./doc; $(MAKE) M4=$(M4) gdb.info ) + ( cd ./doc; $(MAKE) M4=$(M4) gdb.info $(FLAGS_TO_PASS) ) mv ./doc/gdb.info* . ./doc/gdb-all.texi: - (cd $(srcdir)/doc; $(MAKE) M4=$(M4) gdb-all.texi) + (cd $(srcdir)/doc; $(MAKE) M4=$(M4) gdb-all.texi $(FLAGS_TO_PASS) ) # Make copying.c from COPYING copying.c: ${srcdir}/COPYING ${srcdir}/copying.awk diff --git a/gdb/configure.in b/gdb/configure.in index cf56439795e..b9bbe2d0d20 100644 --- a/gdb/configure.in +++ b/gdb/configure.in @@ -15,62 +15,63 @@ arm-*-*) gdb_host=arm ;; c[12]-*-*) gdb_host=convex ;; -hppa*-hp-hpux) gdb_host=hppahpux ;; hppa*-hp-bsd) gdb_host=hppabsd ;; +hppa*-hp-hpux) gdb_host=hppahpux ;; -i[34]86-sequent-*) gdb_host=symmetry ;; i[34]86-ncr-*) gdb_host=ncr3000 ;; +i[34]86-sequent-*) gdb_host=symmetry ;; i[34]86-*-go32) gdb_host=go32 ;; -i[34]86-*-sysv32) gdb_host=i386v32 ;; +i[34]86-*-linux) gdb_host=linux ;; +i[34]86-*-mach) gdb_host=i386mach ;; +i[34]86-*-scosysv*) gdb_host=i386sco ;; i[34]86-*-sunos*) gdb_host=sun386 ;; +i[34]86-*-sysv32) gdb_host=i386v32 ;; i[34]86-*-sysv4*) gdb_host=i386v4 ;; i[34]86-*-sysv*) gdb_host=i386v ;; -i[34]86-*-scosysv*) gdb_host=i386sco ;; -i[34]86-*-mach) gdb_host=i386mach ;; -i[34]86-*-linux) gdb_host=linux ;; i860-*-*) gdb_host=stratus ;; -m68k-apollo*-sysv*) gdb_host=apollo68v ;; +m68000-sun-sunos3) gdb_host=sun2os3 ;; +m68000-sun-sunos4) gdb_host=sun2os4 ;; -m68k-att-*) gdb_host=3b1 ;; +m68030-sony-*) gdb_host=news1000 ;; m68k-altos-*) gdb_host=altos ;; +m68k-apollo*-sysv*) gdb_host=apollo68v ;; + +m68k-att-*) gdb_host=3b1 ;; + m68k-cbm-sysv4*) gdb_host=amix ;; -m68k-hp-hpux) gdb_host=hp300hpux ;; m68k-hp-bsd) gdb_host=hp300bsd ;; +m68k-hp-hpux) gdb_host=hp300hpux ;; m68k-isi-*) gdb_host=isi ;; + m68k-sony-*) gdb_host=news ;; m68k-sun-sunos3) gdb_host=sun3os3 ;; m68k-sun-sunos4) gdb_host=sun3os4 ;; m68k-sun-*) gdb_host=sun3 ;; -m68000-sun-sunos3) gdb_host=sun2os3 ;; -m68000-sun-sunos4) gdb_host=sun2os4 ;; - -m68030-sony-*) gdb_host=news1000 ;; - m88k-motorola-*) gdb_host=delta88 ;; m88k-*-*) gdb_host=m88k ;; -mips-sony-*) gdb_host=bigmips ;; mips-dec-*) gdb_host=decstation ;; mips-little-*) gdb_host=littlemips ;; mips-sgi-irix3) gdb_host=irix3 ;; mips-sgi-irix4) gdb_host=irix4 ;; +mips-sony-*) gdb_host=bigmips ;; none-*-*) gdb_host=none ;; + np1-*-*) gdb_host=np1 ;; ns32k-umax-*) gdb_host=umax ;; ns32k-utek-sysv) gdb_host=merlin ;; - pn-*-*) gdb_host=pn ;; pyramid-*-*) gdb_host=pyramid ;; @@ -79,9 +80,9 @@ romp-*-*) gdb_host=rtbsd ;; rs6000-*-*) gdb_host=rs6000 ;; +sparc-*-solaris2*) gdb_host=sun4sol2 ;; sparc-*-sunos3) gdb_host=sun4os3 ;; sparc-*-sunos4) gdb_host=sun4os4 ;; -sparc-*-solaris2*) gdb_host=sun4sol2 ;; sparc-*-*) gdb_host=sun4 ;; tahoe-*-*) gdb_host=tahoe ;; @@ -89,11 +90,6 @@ tahoe-*-*) gdb_host=tahoe ;; vax-*-bsd*) gdb_host=vaxbsd ;; vax-*-ultrix*) gdb_host=vaxult ;; -### unhandled hosts -#altosgas -#i386v-g -#i386v32-g - esac @@ -107,178 +103,107 @@ hostfile=`awk '$1 == "XM_FILE=" { print $2 }' <${srcdir}/config/${gdb_host}.mh` # per-target: -case "${target_cpu}" in - -m68k) - case "${target_vendor}" in - att) gdb_target=3b1 ;; - altos) gdb_target=altos ;; - cbm) - case ${target_os} in - amigados) gdb_target=amigados ;; - sysv4*) gdb_target=amix ;; - esac - ;; - ericsson) gdb_target=es1800 ;; - hp) - case "${target_os}" in - bsd) gdb_target=hp300bsd ;; - hpux) gdb_target=hp300hpux ;; - esac - ;; - sun) - case "${target_os}" in - sunos3) gdb_target=sun3os3 ;; - sunos4) gdb_target=sun3os4 ;; - *) gdb_target=sun3 ;; - esac - ;; - wrs) gdb_target=vxworks68 ;; - netx) gdb_target=vxworks68 ;; - isi) gdb_target=isi ;; - sony) gdb_target=news ;; - esac - case "${target_os}" in - os68k) gdb_target=os68k ;; - esac - ;; - -m68000) - case "${target_vendor}" in - sun) - case "${target_os}" in - sunos3) gdb_target=sun2os3 ;; - sunos4) gdb_target=sun2os4 ;; - *) gdb_target=sun2 ;; - esac - ;; - ericsson) gdb_target=es1800 ;; - wrs) gdb_target=vxworks68 ;; - esac - ;; - -m680[124]0) - case "${target_vendor}" in - wrs) gdb_target=vxworks68 ;; - esac - ;; - -m68030) - case "${target_vendor}" in - sony) gdb_target=news1000 ;; - wrs) gdb_target=vxworks68 ;; - esac - ;; - -m68kmote) - case "${target_vendor}" in - tandem) gdb_target=st2000 ;; - esac - ;; - -none | arm | tahoe | vax | np1 | pn | np1 | pn | pyramid | merlin) - gdb_target=${target_cpu} ;; - -m88k) - case "${target_vendor}" in - motorola) gdb_target=delta88 ;; - *) gdb_target=dgux ;; - esac - ;; -a29k) - case "${target_os}" in - none|aout|coff) gdb_target=a29k ;; - sym1) gdb_target=ultra3 ;; - kern) gdb_target=a29k-kern ;; - ebmon) gdb_target=a29k;; - udi) gdb_target=a29k-udi;; - esac - ;; - -mips) - case "${target_vendor}" in - sony) gdb_target=bigmips ;; - big) gdb_target=bigmips ;; - dec) gdb_target=decstation ;; - little) gdb_target=littlemips ;; - sgi) gdb_target=irix3 ;; - esac - ;; - -c1 | c2) gdb_target=convex ;; - -sparc*) - case "${target_vendor}" in - sun | fujitsu) - case "${target_os}" in - sunos3) gdb_target=sun4os3 ;; - sunos4) gdb_target=sun4os4 ;; - solaris2*) gdb_target=sun4sol2 ;; - *) gdb_target=sun4 ;; - esac - ;; - esac - ;; - -h8300) - gdb_target=h8300hms - ;; - -i860) gdb_target=stratus - ;; - -i386 | i486) - case "${target_vendor}" in - sco) gdb_target=i386sco ;; - sun) gdb_target=sun386 ;; - sequent) gdb_target=symmetry ;; - ncr) gdb_target=ncr3000 ;; - *) - case "${target_os}" in - sysv32) gdb_target=i386v32 ;; - scosysv3*) gdb_target=i386v32 ;; - sysv4*) gdb_target=i386v4 ;; - sysv*) gdb_target=i386v ;; - mach) gdb_target=i386mach ;; - coff) gdb_target=i386v ;; - aout) gdb_target=i386aout ;; - linux) gdb_target=linux ;; - esac - esac - ;; - -i960) - case "${target_vendor}" in - bout | wrs) gdb_target=vxworks960 ;; - coff | intel) gdb_target=nindy960 ;; - esac - ;; - -ns32k) - case "${target_vendor}" in - utek) gdb_target=umax ;; - esac - ;; - -rs6000) - gdb_target=rs6000 - ;; - -hppa*) - case "${target_vendor}" in - hp) - case "${target_os}" in - hpux) gdb_target=hppahpux ;; - bsd) gdb_target=hppabsd ;; - esac - ;; - esac - ;; - -### unhandled targets -# altosgas -# i386v-g -# i386v32-g +case "${target}" in + +a29k-*-aout) gdb_target=a29k ;; +a29k-*-coff) gdb_target=a29k ;; +a29k-*-ebmon) gdb_target=a29k ;; +a29k-*-kern) gdb_target=a29k-kern ;; +a29k-*-none) gdb_target=a29k ;; +a29k-*-sym1) gdb_target=ultra3 ;; +a29k-*-udi) gdb_target=a29k-udi ;; + +arm-*-*) gdb_target=arm ;; + +c1-*-*) gdb_target=convex ;; +c2-*-*) gdb_target=convex ;; + +h8300-*-*) gdb_target=h8300hms ;; + +hppa*-*-bsd) gdb_target=hppabsd ;; +hppa*-*-hpux) gdb_target=hppahpux ;; + +i[34]86-sequent-*) gdb_target=symmetry ;; +i[34]86-ncr-*) gdb_target=ncr3000 ;; +i[34]86-*-sunos*) gdb_target=sun386 ;; +i[34]86-*-sysv4*) gdb_target=i386v4 ;; +i[34]86-*-scosysv3*) gdb_target=i386v ;; +i[34]86-*-sysv*) gdb_target=i386v ;; +i[34]86-*-coff) gdb_target=i386v ;; +i[34]86-*-aout) gdb_target=i386aout ;; +i[34]86-*-linux) gdb_target=linux ;; + +i860-*-*) gdb_target=stratus ;; + +i960-*-bout) gdb_target=vxworks960 ;; +i960-*-coff) gdb_target=nindy960 ;; +i960-*-nindy) gdb_target=nindy960 ;; +i960-*-vxworks) gdb_target=vxworks960 ;; + +m68000-ericsson-*) gdb_target=es1800 ;; + +m68000-*-sunos3) gdb_target=sun2os3 ;; +m68000-*-sunos4) gdb_target=sun2os4 ;; + +m680[01234]0-*-vxworks) gdb_target=vxworks68 ;; + +m68030-sony-*) gdb_target=news1000 ;; + +m68k-altos-*) gdb_target=altos ;; +m68k-att-*) gdb_target=3b1 ;; + +m68k-cbm-sysv4*) gdb_target=amix ;; + +m68k-ericsson-*) gdb_target=es1800 ;; + +m68k-hp-bsd) gdb_target=hp300bsd ;; +m68k-hp-hpux) gdb_target=hp300hpux ;; + +m68k-isi-*) gdb_target=isi ;; + +m68k-netx-*) gdb_target=vxworks68 ;; + +m68k-sony-*) gdb_target=news ;; + +m68k-*-sunos3*) gdb_target=sun3os3 ;; +m68k-*-sunos4*) gdb_target=sun3os4 ;; +m68k-sun-*) gdb_target=sun3 ;; + +m68k-*-vxworks*) gdb_target=vxworks68 ;; + +m68k-*-os68k) gdb_target=os68k ;; + +m68kmote-tandem-*) gdb_target=st2000 ;; + +m88k-motorola-*) gdb_target=delta88 ;; +m88k-*-*) gdb_target=m88k ;; + +mips-big-*) gdb_target=bigmips ;; +mips-dec-*) gdb_target=decstation ;; +mips-little-*) gdb_target=littlemips ;; +mips-sgi-*) gdb_target=irix3 ;; +mips-sony-*) gdb_target=bigmips ;; + +none-*-*) gdb_target=none ;; + +np1-*-*) gdb_target=np1 ;; + +ns32k-utek-sysv) gdb_target=merlin ;; +ns32k-utek-*) gdb_target=umax ;; + +pn-*-*) gdb_target=pn ;; + +pyramid-*-*) gdb_target=pyramid ;; + +rs6000-*-*) gdb_target=rs6000 ;; + +sparc-*-solaris2*) gdb_target=sun4sol2 ;; +sparc-*-sunos3) gdb_target=sun4os3 ;; +sparc-*-sunos4) gdb_target=sun4os4 ;; +sparc-*-*) gdb_target=sun4 ;; + +tahoe-*-*) gdb_target=tahoe ;; +vax-*-*) gdb_target=vax ;; esac -- 2.30.2