aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog15
-rw-r--r--Makefile.in25
-rw-r--r--configure.in15
3 files changed, 46 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index ae76e1f..13e162e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Fri Jul 24 08:43:36 1998 Doug Evans <devans@canuck.cygnus.com>
+
+start-sanitize-sky
+ * configure.in (mips64r5900-sky-elf*): Use config/mt-sky.
+ Set extraconfigdirs to build dvp-elf-as.
+end-sanitize-sky
+ * configure (extraconfigdirs): New variable.
+ (SUBDIRS): Add extraconfigdirs and recurse on them too.
+ * Makefile.in (all): Move higher in file.
+ (EXTRA_TARGET_HOST_ALL_MODULES): New variable.
+ (EXTRA_TARGET_HOST_{INSTALL,CHECK}_MODULES): New variables.
+ (ALL_MODULES): Add EXTRA_TARGET_HOST_ALL_MODULES.
+ (CROSS_CHECK_MODULES): Add EXTRA_TARGET_HOST_CHECK_MODULES.
+ (INSTALL_MODULES): Add EXTRA_TARGET_HOST_INSTALL_MODULES.
+
1998-07-23 Brendan Kehoe <brendan@cygnus.com>
* Makefile.in (all-target-libjava): Depend on all-gcc and
diff --git a/Makefile.in b/Makefile.in
index 0bd6fb3..f35233b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -329,6 +329,18 @@ NM_FOR_TARGET = ` \
fi; \
fi`
+# The first rule in the file had better be this one. Don't put any above it.
+# This lives here to allow makefile fragments to contain dependencies.
+all: all.normal
+.PHONY: all
+
+# These can be overridden by config/mt-*.
+# The _TARGET_ is because they're specified in mt-foo.
+# The _HOST_ is because they're programs that run on the host.
+EXTRA_TARGET_HOST_ALL_MODULES =
+EXTRA_TARGET_HOST_INSTALL_MODULES =
+EXTRA_TARGET_HOST_CHECK_MODULES =
+
#### host and target specific makefile fragments come in here.
###
@@ -560,7 +572,8 @@ ALL_MODULES = \
$(start-sanitize-ide) \
all-vmake \
$(end-sanitize-ide) \
- all-wdiff
+ all-wdiff \
+ $(EXTRA_TARGET_HOST_ALL_MODULES)
# This is a list of the check targets for all of the modules which are
# compiled using $(FLAGS_TO_PASS).
@@ -646,7 +659,8 @@ CROSS_CHECK_MODULES = \
$(start-sanitize-ide) \
check-vmake \
$(end-sanitize-ide) \
- check-wdiff
+ check-wdiff \
+ $(EXTRA_TARGET_HOST_CHECK_MODULES)
CHECK_MODULES=$(NATIVE_CHECK_MODULES) $(CROSS_CHECK_MODULES)
@@ -735,7 +749,8 @@ INSTALL_MODULES = \
$(start-sanitize-ide) \
install-vmake \
$(end-sanitize-ide) \
- install-wdiff
+ install-wdiff \
+ $(EXTRA_TARGET_HOST_INSTALL_MODULES)
# This is a list of the targets for all of the modules which are compiled
# using $(X11_FLAGS_TO_PASS).
@@ -962,10 +977,6 @@ CLEAN_X11_MODULES = \
clean-tk \
clean-tix
-# The first rule in the file had better be this one. Don't put any above it.
-all: all.normal
-.PHONY: all
-
# The target built for a native build.
.PHONY: all.normal
all.normal: \
diff --git a/configure.in b/configure.in
index f592b84..74b4afb 100644
--- a/configure.in
+++ b/configure.in
@@ -335,6 +335,11 @@ case "${target}" in
powerpc-*-netware*)
target_makefile_frag="${target_makefile_frag} config/mt-netware"
;;
+# start-sanitize-sky
+ mips64r59*-sky-elf*)
+ target_makefile_frag="${target_makefile_frag} config/mt-r5900 config/mt-sky"
+ ;;
+# end-sanitize-sky
# start-sanitize-r5900
mips64r59*)
target_makefile_frag="${target_makefile_frag} config/mt-r5900"
@@ -784,10 +789,16 @@ case "${target}" in
mips*-*-bsd*)
noconfigdirs="$noconfigdirs gprof target-libgloss"
;;
- mipstx39-*-*)
- noconfigdirs="$noconfigdirs gprof" # same as generic mips
+ mipstx39-*-*)
+ noconfigdirs="$noconfigdirs gprof" # same as generic mips
target_configdirs="${target_configdirs} target-libstub target-cygmon"
;;
+# start-sanitize-sky
+ mips64r5900-sky-elf*)
+ noconfigdirs="$noconfigdirs gprof"
+ extraconfigdirs="$extraconfigdirs gas,dvp-gas,dvp-elf"
+ ;;
+# end-sanitize-sky
mips*-*-*)
noconfigdirs="$noconfigdirs gprof"
;;