summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex deVries <Alex.deVries@windriver.com>1999-02-09 23:11:30 +0000
committerAlex deVries <Alex.deVries@windriver.com>1999-02-09 23:11:30 +0000
commit3f50b44b5b0f36fbe0aec72861171265c4e0f43e (patch)
tree5276f28d792f1fbb4da43dac422b753139761aa4
parent8737fdad8c995b30da688846493001b4f2707dac (diff)
Undoing my last stupid changes.
Sorry. - Alex
-rw-r--r--Makefile2
-rw-r--r--arch/mips/Makefile25
2 files changed, 24 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index bc3643919..7f3baf949 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ CROSS_COMPILE =
AS =$(CROSS_COMPILE)as
LD =$(CROSS_COMPILE)ld
-CC =$(CROSS_COMPILE)egcs -D__KERNEL__ -I$(HPATH)
+CC =$(CROSS_COMPILE)gcc -D__KERNEL__ -I$(HPATH)
CPP =$(CC) -E
AR =$(CROSS_COMPILE)ar
NM =$(CROSS_COMPILE)nm
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 7de407b66..9dc992778 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.13 1998/10/18 13:37:31 tsbogend Exp $
+# $Id: Makefile,v 1.14 1999/01/27 23:59:02 ralf Exp $
#
# This file is subject to the terms and conditions of the GNU General Public
# License. See the file "COPYING" in the main directory of this archive
@@ -36,7 +36,7 @@ ifdef CONFIG_CROSSCOMPILE
CROSS_COMPILE = $(tool-prefix)
endif
-LINKFLAGS = -static
+LINKFLAGS = -static -N
MODFLAGS += -mlong-calls
#
@@ -97,6 +97,17 @@ CORE_FILES += arch/mips/algor/algor.o
SUBDIRS += arch/mips/algor
#LOADADDR += 0x80000000
endif
+
+#
+# DECstation family
+#
+ifdef CONFIG_DECSTATION
+CORE_FILES += arch/mips/dec/dec.o
+SUBDIRS += arch/mips/dec arch/mips/dec/prom
+LIBS += arch/mips/dec/prom/rexlib.a
+LOADADDR += 0x80040000
+endif
+
#
# Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
#
@@ -106,12 +117,14 @@ SUBDIRS += arch/mips/jazz arch/mips/arc
LIBS += arch/mips/arc/arclib.a
LOADADDR += 0x80080000
endif
+
ifdef CONFIG_SNI_RM200_PCI
CORE_FILES += arch/mips/sni/sni.o
SUBDIRS += arch/mips/sni arch/mips/arc
LIBS += arch/mips/arc/arclib.a
LOADADDR += 0x80080000
endif
+
ifdef CONFIG_SGI
LIBS += arch/mips/sgi/kernel/sgikern.a arch/mips/arc/arclib.a
SUBDIRS += arch/mips/sgi/kernel arch/mips/arc
@@ -125,6 +138,14 @@ HOSTCC = cc
endif
#
+# Baget/MIPS
+#
+ifdef CONFIG_BAGET_MIPS
+SUBDIRS += arch/mips/baget arch/mips/baget/prom
+LIBS += arch/mips/baget/baget.a arch/mips/baget/prom/bagetlib.a
+endif
+
+#
# Choosing incompatible machines durings configuration will result in
# error messages during linking. Select a default linkscript if
# none has been choosen above.