diff options
| -rw-r--r-- | gdb/ChangeLog | 22 | ||||
| -rw-r--r-- | gdb/Makefile.in | 38 | ||||
| -rw-r--r-- | gdb/coffread.c | 19 | ||||
| -rwxr-xr-x | gdb/configure | 28 | ||||
| -rw-r--r-- | gdb/configure.in | 6 |
5 files changed, 79 insertions, 34 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 459a5d8..48e7885 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,25 @@ +Thu Jul 4 14:47:06 1991 John Gilmore (gnu at cygint.cygnus.com) + + * configure.in, Makefile.in: Avoid rebuilding "depend" as much. + Avoid declaring Makefile dependencies, because GNU Make stupidly + tries to update it if we do. + + * coffread.c: Revise for minor changes to bfd internal coff + indexes. + + * configure: If -template= is given a relative path, make it + absolute before recurring in subdirectories. + + * configure, configure.in, Makefile.in: Install "configure" script + as replacement for config.gdb. + * config.gdb, Makefile.dist, Makefile.sdir: Remove + * README: Update for configure, mostly. FIXME. + + * Add dec3100 as equivalent to littlemips. Indicate in all host & + target config files that they are for the host. When the lines + get copied into the Makefile, this makes it more obvious what's + up. + Mon Jun 24 23:49:07 1991 John Gilmore (gnu at cygint.cygnus.com) * sparc-opcode.h (trap opcodes): Avoid leading spaces or diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 9e5be7b..86c0c53 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -18,6 +18,7 @@ # Host and target-dependent makefile fragments come in here. #### +# End of host and target-dependent makefile fragments # Destination directory of the software tree build destdir = /usr/local @@ -342,11 +343,11 @@ rapp: $(RAPP_OBS) # generated dependencies, etc. Makefile.conf is built by configure, # and includes the body of Makefile.in as well as configuration # settings. We add alldeps.mak and depend to get Makefile. -Makefiles= Makefile.conf ${srcdir}/alldeps.mak +# See also "make-depend:", where we also rebuild Makefile after making depend. +Makefiles= Makefile.conf ${srcdir}/alldeps.mak depend -Makefile: $(Makefiles) - cat ${Makefiles} depend > Makefile - +make-Makefile: $(Makefiles) depend + cat ${Makefiles} > ./Makefile alldeps.mak: ${srcdir}/tconfig ${srcdir}/xconfig rm -f alldeps.mak alldeps.tmp allparam.tmp allconfig.tmp @@ -399,7 +400,7 @@ alldeps.mak: ${srcdir}/tconfig ${srcdir}/xconfig # The sed script makes everything which depends on {x,t}m.h depend on # config.status as well, in case someone reconfigures gdb out from # under an already compiled gdb. -depend: $(SOURCES) Makefile.in +make-depend: $(SOURCES) Makefile.in @echo Ignore errors about non-existent system-supplied include files @echo for systems other than the one you are using. @echo "If xm.h and tm.h don't exist, the error messages saying so" @@ -408,15 +409,28 @@ depend: $(SOURCES) Makefile.in @echo arm-convert.s. -$(GCC) -MM $(CFLAGS) -I$(BFD_DIR) \ `ls $(SOURCES) | grep -v \.h$$ |sort -u` >depend.tmp - <depend.tmp sed -e 's/ [xt]m.h/& config.status/g' \ - -e 's; vx-share/; $${srcdir}/vx-share/;g' \ - -e 's; nindy-share/; $${srcdir}/nindy-share/;g' \ +# If running in srcdir, translate "./foo.c" into "$srcdir/foo.c" except +# for xm.h and tm.h. This allows the same "depend" file to be used +# by the various subdirectories. + if [ "${srcdir}" = "." ] ; then \ + <depend.tmp sed \ + -e 's; ./xm.h; xm.h;g' \ + -e 's; ./tm.h; tm.h;g' \ + -e 's; \./; $${srcdir}/;g' \ + -e 's; vx-share/; $${srcdir}/vx-share/;g' \ + -e 's; nindy-share/; $${srcdir}/nindy-share/;g' \ + >depend.tm2; \ + rm depend.tmp; \ + mv depend.tm2 depend.tmp; \ + fi + <depend.tmp sed \ + -e 's; [xt]m.h;& config.status;g' \ -e 's; $(INCLUDE_DIR)/; $(INCLUDE_DEP)/;g' \ -e 's; $(READLINE_DIR)/; $(READLINE_DEP)/;g' \ -e 's; [a-z0-9./]*bfd/; $(BFD_DEP)/;g' \ - -e 's; \./; $${srcdir}/;g' \ + -e 's; ./xm.h; xm.h config.status;g' \ + -e 's; ./tm.h; tm.h config.status;g' \ >depend - $(MAKE_MAKEFILE) rm depend.tmp config.status: @@ -477,12 +491,12 @@ clean: distclean: clean expread.tab.c TAGS rm -f tm.h xm.h config.status rm -f y.output yacc.acts yacc.tmp - rm -f ${TESTS} Makefile + rm -f ${TESTS} Makefile Makefile.conf depend realclean: clean rm -f expread.tab.c TAGS rm -f tm.h xm.h config.status - rm -f Makefile + rm -f Makefile Makefile.conf depend rdl-apps.texinfo: ${READLINE_DIR}/inc-readline.texinfo \ ${READLINE_DIR}/inc-history.texinfo diff --git a/gdb/coffread.c b/gdb/coffread.c index 79a3240..54ca80b 100644 --- a/gdb/coffread.c +++ b/gdb/coffread.c @@ -38,6 +38,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <obstack.h> #include <string.h> +#include "internalcoff.h" /* Internal format of COFF symbols in BFD */ #include "libcoff.h" /* FIXME secret internal data from BFD */ static void add_symbol_to_list (); @@ -70,18 +71,6 @@ extern void free_all_psymtabs (); #define SDB_TYPE(type) (BTYPE(type) | (type & N_TMASK)) -/* external routines from the BFD library -- undocumented interface used - by GDB to read symbols. Move to libcoff.h. FIXME-SOMEDAY! */ -extern void bfd_coff_swap_sym_in (/* symfile_bfd, &sym */); -extern void bfd_coff_swap_aux_in (/* symfile_bfd, &aux, type, sclass */); -extern void bfd_coff_swap_lineno_in (/* symfile_bfd, &lineno */); -extern void bfd_coff_swap_scnhdr_in (/* bfd, scnhdr_ext, scnhdr_int */); - -extern void bfd_coff_swap_sym (/* symfile_bfd, &sym */); -extern void bfd_coff_swap_aux (/* symfile_bfd, &aux, type, sclass */); -extern void bfd_coff_swap_lineno (/* symfile_bfd, &lineno */); - - /* Name of source file whose symbol data we are now processing. This comes from a symbol named ".file". */ @@ -1682,7 +1671,7 @@ decode_type (cs, c_type, aux) /* Define an array type. */ /* auxent refers to array, not base type */ - if (aux->x_sym.x_tagndx == 0) + if (aux->x_sym.x_tagndx.l == 0) cs->c_nsyms = 1; /* shift the indices down */ @@ -1707,7 +1696,7 @@ decode_type (cs, c_type, aux) } /* Reference to existing type */ - if (cs->c_nsyms > 1 && aux->x_sym.x_tagndx != 0) + if (cs->c_nsyms > 1 && aux->x_sym.x_tagndx.l != 0) { type = coff_alloc_type (aux->x_sym.x_tagndx); return type; @@ -1726,7 +1715,7 @@ decode_function_type (cs, c_type, aux) unsigned int c_type; register union internal_auxent *aux; { - if (aux->x_sym.x_tagndx == 0) + if (aux->x_sym.x_tagndx.l == 0) cs->c_nsyms = 1; /* auxent refers to function, not base type */ return decode_type (cs, DECREF (c_type), aux); diff --git a/gdb/configure b/gdb/configure index cd45e9c..e52fc6a 100755 --- a/gdb/configure +++ b/gdb/configure @@ -246,6 +246,13 @@ if [ -n "${template}" ] ; then echo Rebuilt configure in `pwd` if [ -z "${norecurse}" ] ; then + # If template is relative path, make it absolute for recursing. + if echo "${template}" | grep -s '^/' ; then + true + else + template=`pwd`/${template} + fi + while [ -n "${configdirs}" ] ; do # set configdir to car of configdirs, configdirs to cdr of configdirs set ${configdirs}; configdir=$1; shift; configdirs=$* @@ -543,10 +550,10 @@ case ${srcdir} in esac rm -f Makefile -if [ ! -f depend ]; then - make -f Makefile.conf depend +if [ ! -f ${srcdir}/depend ]; then + make -f Makefile.conf make-depend fi -make -f Makefile.conf Makefile +make -f Makefile.conf make-Makefile ## end of post-target part. if [ "${host}" = "${target}" ] ; then @@ -661,7 +668,20 @@ exit 0 # # $Log$ -# Revision 1.7 1991/07/04 15:59:46 gnu +# Revision 1.8 1991/07/05 00:04:58 gnu +# Thu Jul 4 14:47:06 1991 John Gilmore (gnu at cygint.cygnus.com) +# +# * configure.in, Makefile.in: Avoid rebuilding "depend" as much. +# Avoid declaring Makefile dependencies, because GNU Make stupidly +# tries to update it if we do. +# +# * coffread.c: Revise for minor changes to bfd internal coff +# indexes. +# +# * configure: If -template= is given a relative path, make it +# absolute before recurring in subdirectories. +# +# Revision 1.7 1991/07/04 15:59:46 gnu # Make gdb work with configure. Only thing that doesn't work is the -list # option (as far as I know). # diff --git a/gdb/configure.in b/gdb/configure.in index 4e5957d..c25fb13 100644 --- a/gdb/configure.in +++ b/gdb/configure.in @@ -54,7 +54,7 @@ case ${srcdir} in esac rm -f Makefile -if [ ! -f depend ]; then - make -f Makefile.conf depend +if [ ! -f ${srcdir}/depend ]; then + make -f Makefile.conf make-depend fi -make -f Makefile.conf Makefile +make -f Makefile.conf make-Makefile |