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

1 files changed, 76 insertions, 2 deletions

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 971aae2..e8aea6f 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