From: Ian Lance Taylor Date: Mon, 8 Mar 1993 06:00:50 +0000 (+0000) Subject: * Makefile.in (MAKEOVERRIDES): Define to be empty for GNU Make X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=aecc5459ab13f9524a0ade72df11ba4a3b522e5f;p=binutils-gdb.git * Makefile.in (MAKEOVERRIDES): Define to be empty for GNU Make 3.63. Also corrected the definitions of CC_FOR_TARGET, CXX_FOR_TARGET and CHILL_FOR_TARGET. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2972dc794f4..cece0b62f59 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,14 @@ +Sun Mar 7 21:58:53 1993 Ian Lance Taylor (ian@cygnus.com) + + * Makefile.in (MAKEOVERRIDES): Define to be empty for GNU Make + 3.63. + Fri Mar 5 17:39:45 1993 John Gilmore (gnu@cacophony.cygnus.com) + * printcmd.c (print_address_symbolic): Only print if offset + is shorter than max_symbolic_offset. + (initialize_printcmd): `set print max-symbolic-offset'. + * am29k-tdep.c (TAGWORD_ZERO_MASK): New #define. (examine_tag): Use it. (read_register_stack): Only look in the local registers for a diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 971aae242d9..e8aea6f5ec9 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -183,6 +183,13 @@ FLAGS_TO_PASS = \ "AR_FLAGS=$(AR_FLAGS)" \ "CC=$(CC)" \ "CFLAGS=$(CFLAGS)" \ +$(start-sanitize-chill)\ + "CHILLFLAGS=$(CHILLFLAGS)" \ + "CHILL=$(CHILL)" \ + "CHILL_LIB=$(CHILL_LIB)" \ +$(end-sanitize-chill)\ + "CXX=$(CXX)" \ + "CXXFLAGS=$(CXXFLAGS)" \ "RANLIB=$(RANLIB)" \ "MAKEINFO=$(MAKEINFO)" \ "INSTALL=$(INSTALL)" \ @@ -190,6 +197,67 @@ FLAGS_TO_PASS = \ "INSTALL_DATA=$(INSTALL_DATA)" \ "BISON=$(BISON)" +# Flags that we pass when building the testsuite. + +CC_FOR_TARGET = ` \ + if [ -f $${rootme}/../gcc/Makefile ] ; then \ + echo $${rootme}/../gcc/xgcc -B$${rootme}/../gcc/; \ + else \ + if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ + echo $(CC); \ + else \ + t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \ + fi; \ + fi` + +CXX = gcc + +CXX_FOR_TARGET = ` \ + if [ -f $${rootme}/../gcc/Makefile ] ; then \ + echo $${rootme}/../gcc/xgcc -B$${rootme}/../gcc/; \ + else \ + if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ + echo $(CXX); \ + else \ + t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \ + fi; \ + fi` + +$(start-sanitize-chill) +CHILLFLAGS = $(CFLAGS) +CHILL = gcc +CHILL_FOR_TARGET = ` \ + if [ -f $${rootme}/../gcc/Makefile ] ; then \ + echo $${rootme}/../gcc/xgcc -B$${rootme}/../gcc/ -L$${rootme}/../chillrt/; \ + else \ + if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ + echo $(CC); \ + else \ + t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \ + fi; \ + fi` +CHILL_LIB = -lchill +$(end-sanitize-chill) + +TARGET_FLAGS_TO_PASS = \ + "prefix=$(prefix)" \ + "exec_prefix=$(exec_prefix)" \ + "against=$(against)" \ + "CC=$(CC_FOR_TARGET)" \ + "CFLAGS=$(CFLAGS)" \ +$(start-sanitize-chill)\ + "CHILLFLAGS=$(CHILLFLAGS)" \ + "CHILL=$(CHILL_FOR_TARGET)" \ + "CHILL_LIB=$(CHILL_LIB)" \ +$(end-sanitize-chill)\ + "CXX=$(CXX_FOR_TARGET)" \ + "CXXFLAGS=$(CXXFLAGS)" \ + "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". @@ -322,7 +390,7 @@ TSSTART = /lib/crt0.o NTSSTART = kdb-start.o -SUBDIRS = doc +SUBDIRS = doc testsuite # For now, shortcut the "configure GDB for fewer languages" stuff. YYFILES = c-exp.tab.c m2-exp.tab.c ch-exp.tab.c @@ -334,7 +402,8 @@ YYOBJ = c-exp.tab.o m2-exp.tab.o ch-exp.tab.o ${CC} -c ${INTERNAL_CFLAGS} $< all: gdb - $(MAKE) $(FLAGS_TO_PASS) DO=all "DODIRS=$(SUBDIRS)" subdir_do + $(MAKE) $(FLAGS_TO_PASS) DO=all "DODIRS=`echo $(SUBDIRS) | sed 's/testsuite//'`" subdir_do + rootme=`pwd`; export rootme; $(MAKE) $(TARGET_FLAGS_TO_PASS) DO=all DODIRS=testsuite subdir_do check: ../dejagnu/runtest -to gdb $(DGFLAGS) @@ -820,6 +889,11 @@ force_update: # in GNU Make 4.0. .NOEXPORT: +# GNU Make 3.63 has a different problem: it keeps tacking command line +# overrides onto the definition of $(MAKE). This variable setting +# will remove them. +MAKEOVERRIDES= + # This is the end of "Makefile.in". When built into "Makefile" # by the configure script, two things are added below this point: # alldeps.mak -- defintions of all files that are used in