about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJyun-Yan You <jyyou@cs.nctu.edu.tw>2013-01-29 13:04:51 +0800
committerBrian Anderson <banderson@mozilla.com>2013-03-03 19:27:01 -0800
commit0ecd9e03ff9a7f96d324b63e49c94d3c5d9a51cb (patch)
tree427595fd4675b4f3263ef0155e6efd8997d5d710
parentd30a4f4e677aa133b1a5ca50e69e4a241c58ab55 (diff)
downloadrust-0ecd9e03ff9a7f96d324b63e49c94d3c5d9a51cb.tar.gz
rust-0ecd9e03ff9a7f96d324b63e49c94d3c5d9a51cb.zip
rt: MIPS32 support
-rwxr-xr-xconfigure8
-rw-r--r--mk/libuv/mips/unix/linux/Makefile354
-rw-r--r--mk/libuv/mips/unix/linux/src/libuv/run-benchmarks.target.mk122
-rw-r--r--mk/libuv/mips/unix/linux/src/libuv/run-tests.target.mk165
-rw-r--r--mk/libuv/mips/unix/linux/src/libuv/uv.Makefile6
-rw-r--r--mk/libuv/mips/unix/linux/src/libuv/uv.target.mk191
-rw-r--r--mk/rt.mk6
-rw-r--r--src/rt/arch/mips/_context.S81
-rw-r--r--src/rt/arch/mips/ccall.S12
-rw-r--r--src/rt/arch/mips/context.cpp46
-rw-r--r--src/rt/arch/mips/context.h51
-rw-r--r--src/rt/arch/mips/gpr.cpp31
-rw-r--r--src/rt/arch/mips/gpr.h33
-rw-r--r--src/rt/arch/mips/record_sp.S44
-rw-r--r--src/rt/arch/mips/regs.h18
-rw-r--r--src/rt/rust_task.h3
16 files changed, 1166 insertions, 5 deletions
diff --git a/configure b/configure
index 3576e43468d..06dd148cc0e 100755
--- a/configure
+++ b/configure
@@ -577,9 +577,9 @@ make_dir rt
 for t in $CFG_TARGET_TRIPLES
 do
   make_dir rt/$t
-  for i in                                          \
-    isaac linenoise sync test arch/i386 arch/x86_64    \
-    libuv
+  for i in                                   \
+    isaac linenoise sync test libuv          \
+    arch/i386 arch/x86_64 arch/arm arch/mips
   do
     make_dir rt/$t/$i
   done
@@ -718,7 +718,7 @@ do
     then
         msg "configuring LLVM for $t"
 
-        LLVM_TARGETS="--enable-targets=x86,x86_64,arm"
+        LLVM_TARGETS="--enable-targets=x86,x86_64,arm,mips"
         LLVM_BUILD="--build=$t"
         LLVM_HOST="--host=$t"
         LLVM_TARGET="--target=$t"
diff --git a/mk/libuv/mips/unix/linux/Makefile b/mk/libuv/mips/unix/linux/Makefile
new file mode 100644
index 00000000000..b17f5546016
--- /dev/null
+++ b/mk/libuv/mips/unix/linux/Makefile
@@ -0,0 +1,354 @@
+# We borrow heavily from the kernel build setup, though we are simpler since
+# we don't have Kconfig tweaking settings on us.
+
+# The implicit make rules have it looking for RCS files, among other things.
+# We instead explicitly write all the rules we care about.
+# It's even quicker (saves ~200ms) to pass -r on the command line.
+MAKEFLAGS=-r
+
+# The source directory tree.
+srcdir := ../../../../..
+abs_srcdir := $(abspath $(srcdir))
+
+# The name of the builddir.
+builddir_name ?= out
+
+# The V=1 flag on command line makes us verbosely print command lines.
+ifdef V
+  quiet=
+else
+  quiet=quiet_
+endif
+
+# Specify BUILDTYPE=Release on the command line for a release build.
+BUILDTYPE ?= Debug
+
+# Directory all our build output goes into.
+# Note that this must be two directories beneath src/ for unit tests to pass,
+# as they reach into the src/ directory for data with relative paths.
+builddir ?= $(builddir_name)/$(BUILDTYPE)
+abs_builddir := $(abspath $(builddir))
+depsdir := $(builddir)/.deps
+
+# Object output directory.
+obj := $(builddir)/obj
+abs_obj := $(abspath $(obj))
+
+# We build up a list of every single one of the targets so we can slurp in the
+# generated dependency rule Makefiles in one pass.
+all_deps :=
+
+
+
+# C++ apps need to be linked with g++.
+#
+# Note: flock is used to seralize linking. Linking is a memory-intensive
+# process so running parallel links can often lead to thrashing.  To disable
+# the serialization, override LINK via an envrionment variable as follows:
+#
+#   export LINK=g++
+#
+# This will allow make to invoke N linker processes as specified in -jN.
+LINK ?= flock $(builddir)/linker.lock $(CXX)
+
+CC.target ?= $(CC)
+CFLAGS.target ?= $(CFLAGS)
+CXX.target ?= $(CXX)
+CXXFLAGS.target ?= $(CXXFLAGS)
+LINK.target ?= $(LINK)
+LDFLAGS.target ?= $(LDFLAGS)
+AR.target ?= $(AR)
+ARFLAGS.target ?= crs
+
+# N.B.: the logic of which commands to run should match the computation done
+# in gyp's make.py where ARFLAGS.host etc. is computed.
+# TODO(evan): move all cross-compilation logic to gyp-time so we don't need
+# to replicate this environment fallback in make as well.
+CC.host ?= gcc
+CFLAGS.host ?=
+CXX.host ?= g++
+CXXFLAGS.host ?=
+LINK.host ?= g++
+LDFLAGS.host ?=
+AR.host ?= ar
+ARFLAGS.host := crs
+
+# Define a dir function that can handle spaces.
+# http://www.gnu.org/software/make/manual/make.html#Syntax-of-Functions
+# "leading spaces cannot appear in the text of the first argument as written.
+# These characters can be put into the argument value by variable substitution."
+empty :=
+space := $(empty) $(empty)
+
+# http://stackoverflow.com/questions/1189781/using-make-dir-or-notdir-on-a-path-with-spaces
+replace_spaces = $(subst $(space),?,$1)
+unreplace_spaces = $(subst ?,$(space),$1)
+dirx = $(call unreplace_spaces,$(dir $(call replace_spaces,$1)))
+
+# Flags to make gcc output dependency info.  Note that you need to be
+# careful here to use the flags that ccache and distcc can understand.
+# We write to a dep file on the side first and then rename at the end
+# so we can't end up with a broken dep file.
+depfile = $(depsdir)/$(call replace_spaces,$@).d
+DEPFLAGS = -MMD -MF $(depfile).raw
+
+# We have to fixup the deps output in a few ways.
+# (1) the file output should mention the proper .o file.
+# ccache or distcc lose the path to the target, so we convert a rule of
+# the form:
+#   foobar.o: DEP1 DEP2
+# into
+#   path/to/foobar.o: DEP1 DEP2
+# (2) we want missing files not to cause us to fail to build.
+# We want to rewrite
+#   foobar.o: DEP1 DEP2 \
+#               DEP3
+# to
+#   DEP1:
+#   DEP2:
+#   DEP3:
+# so if the files are missing, they're just considered phony rules.
+# We have to do some pretty insane escaping to get those backslashes
+# and dollar signs past make, the shell, and sed at the same time.
+# Doesn't work with spaces, but that's fine: .d files have spaces in
+# their names replaced with other characters.
+define fixup_dep
+# The depfile may not exist if the input file didn't have any #includes.
+touch $(depfile).raw
+# Fixup path as in (1).
+sed -e "s|^$(notdir $@)|$@|" $(depfile).raw >> $(depfile)
+# Add extra rules as in (2).
+# We remove slashes and replace spaces with new lines;
+# remove blank lines;
+# delete the first line and append a colon to the remaining lines.
+sed -e 's|\\||' -e 'y| |\n|' $(depfile).raw |\
+  grep -v '^$$'                             |\
+  sed -e 1d -e 's|$$|:|'                     \
+    >> $(depfile)
+rm $(depfile).raw
+endef
+
+# Command definitions:
+# - cmd_foo is the actual command to run;
+# - quiet_cmd_foo is the brief-output summary of the command.
+
+quiet_cmd_cc = CC($(TOOLSET)) $@
+cmd_cc = $(CC.$(TOOLSET)) $(GYP_CFLAGS) $(DEPFLAGS) $(CFLAGS.$(TOOLSET)) -c -o $@ $<
+
+quiet_cmd_cxx = CXX($(TOOLSET)) $@
+cmd_cxx = $(CXX.$(TOOLSET)) $(GYP_CXXFLAGS) $(DEPFLAGS) $(CXXFLAGS.$(TOOLSET)) -c -o $@ $<
+
+quiet_cmd_touch = TOUCH $@
+cmd_touch = touch $@
+
+quiet_cmd_copy = COPY $@
+# send stderr to /dev/null to ignore messages when linking directories.
+cmd_copy = ln -f "$<" "$@" 2>/dev/null || (rm -rf "$@" && cp -af "$<" "$@")
+
+quiet_cmd_alink = AR($(TOOLSET)) $@
+cmd_alink = rm -f $@ && $(AR.$(TOOLSET)) $(ARFLAGS.$(TOOLSET)) $@ $(filter %.o,$^)
+
+# Due to circular dependencies between libraries :(, we wrap the
+# special "figure out circular dependencies" flags around the entire
+# input list during linking.
+quiet_cmd_link = LINK($(TOOLSET)) $@
+cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) -Wl,--end-group $(LIBS)
+
+# We support two kinds of shared objects (.so):
+# 1) shared_library, which is just bundling together many dependent libraries
+# into a link line.
+# 2) loadable_module, which is generating a module intended for dlopen().
+#
+# They differ only slightly:
+# In the former case, we want to package all dependent code into the .so.
+# In the latter case, we want to package just the API exposed by the
+# outermost module.
+# This means shared_library uses --whole-archive, while loadable_module doesn't.
+# (Note that --whole-archive is incompatible with the --start-group used in
+# normal linking.)
+
+# Other shared-object link notes:
+# - Set SONAME to the library filename so our binaries don't reference
+# the local, absolute paths used on the link command-line.
+quiet_cmd_solink = SOLINK($(TOOLSET)) $@
+cmd_solink = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,-soname=$(@F) -o $@ -Wl,--whole-archive $(LD_INPUTS) -Wl,--no-whole-archive $(LIBS)
+
+quiet_cmd_solink_module = SOLINK_MODULE($(TOOLSET)) $@
+cmd_solink_module = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,-soname=$(@F) -o $@ -Wl,--start-group $(filter-out FORCE_DO_CMD, $^) -Wl,--end-group $(LIBS)
+
+
+# Define an escape_quotes function to escape single quotes.
+# This allows us to handle quotes properly as long as we always use
+# use single quotes and escape_quotes.
+escape_quotes = $(subst ','\'',$(1))
+# This comment is here just to include a ' to unconfuse syntax highlighting.
+# Define an escape_vars function to escape '$' variable syntax.
+# This allows us to read/write command lines with shell variables (e.g.
+# $LD_LIBRARY_PATH), without triggering make substitution.
+escape_vars = $(subst $$,$$$$,$(1))
+# Helper that expands to a shell command to echo a string exactly as it is in
+# make. This uses printf instead of echo because printf's behaviour with respect
+# to escape sequences is more portable than echo's across different shells
+# (e.g., dash, bash).
+exact_echo = printf '%s\n' '$(call escape_quotes,$(1))'
+
+# Helper to compare the command we're about to run against the command
+# we logged the last time we ran the command.  Produces an empty
+# string (false) when the commands match.
+# Tricky point: Make has no string-equality test function.
+# The kernel uses the following, but it seems like it would have false
+# positives, where one string reordered its arguments.
+#   arg_check = $(strip $(filter-out $(cmd_$(1)), $(cmd_$@)) \
+#                       $(filter-out $(cmd_$@), $(cmd_$(1))))
+# We instead substitute each for the empty string into the other, and
+# say they're equal if both substitutions produce the empty string.
+# .d files contain ? instead of spaces, take that into account.
+command_changed = $(or $(subst $(cmd_$(1)),,$(cmd_$(call replace_spaces,$@))),\
+                       $(subst $(cmd_$(call replace_spaces,$@)),,$(cmd_$(1))))
+
+# Helper that is non-empty when a prerequisite changes.
+# Normally make does this implicitly, but we force rules to always run
+# so we can check their command lines.
+#   $? -- new prerequisites
+#   $| -- order-only dependencies
+prereq_changed = $(filter-out FORCE_DO_CMD,$(filter-out $|,$?))
+
+# Helper that executes all postbuilds, and deletes the output file when done
+# if any of the postbuilds failed.
+define do_postbuilds
+  @E=0;\
+  for p in $(POSTBUILDS); do\
+    eval $$p;\
+    F=$$?;\
+    if [ $$F -ne 0 ]; then\
+      E=$$F;\
+    fi;\
+  done;\
+  if [ $$E -ne 0 ]; then\
+    rm -rf "$@";\
+    exit $$E;\
+  fi
+endef
+
+# do_cmd: run a command via the above cmd_foo names, if necessary.
+# Should always run for a given target to handle command-line changes.
+# Second argument, if non-zero, makes it do asm/C/C++ dependency munging.
+# Third argument, if non-zero, makes it do POSTBUILDS processing.
+# Note: We intentionally do NOT call dirx for depfile, since it contains ? for
+# spaces already and dirx strips the ? characters.
+define do_cmd
+$(if $(or $(command_changed),$(prereq_changed)),
+  @$(call exact_echo,  $($(quiet)cmd_$(1)))
+  @mkdir -p "$(call dirx,$@)" "$(dir $(depfile))"
+  $(if $(findstring flock,$(word 1,$(cmd_$1))),
+    @$(cmd_$(1))
+    @echo "  $(quiet_cmd_$(1)): Finished",
+    @$(cmd_$(1))
+  )
+  @$(call exact_echo,$(call escape_vars,cmd_$(call replace_spaces,$@) := $(cmd_$(1)))) > $(depfile)
+  @$(if $(2),$(fixup_dep))
+  $(if $(and $(3), $(POSTBUILDS)),
+    $(call do_postbuilds)
+  )
+)
+endef
+
+# Declare the "all" target first so it is the default,
+# even though we don't have the deps yet.
+.PHONY: all
+all:
+
+# Use FORCE_DO_CMD to force a target to run.  Should be coupled with
+# do_cmd.
+.PHONY: FORCE_DO_CMD
+FORCE_DO_CMD:
+
+TOOLSET := target
+# Suffix rules, putting all outputs into $(obj).
+$(obj).$(TOOLSET)/%.o: $(srcdir)/%.c FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+$(obj).$(TOOLSET)/%.o: $(srcdir)/%.cc FORCE_DO_CMD
+	@$(call do_cmd,cxx,1)
+$(obj).$(TOOLSET)/%.o: $(srcdir)/%.cpp FORCE_DO_CMD
+	@$(call do_cmd,cxx,1)
+$(obj).$(TOOLSET)/%.o: $(srcdir)/%.cxx FORCE_DO_CMD
+	@$(call do_cmd,cxx,1)
+$(obj).$(TOOLSET)/%.o: $(srcdir)/%.S FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+$(obj).$(TOOLSET)/%.o: $(srcdir)/%.s FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+
+# Try building from generated source, too.
+$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.c FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.cc FORCE_DO_CMD
+	@$(call do_cmd,cxx,1)
+$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.cpp FORCE_DO_CMD
+	@$(call do_cmd,cxx,1)
+$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.cxx FORCE_DO_CMD
+	@$(call do_cmd,cxx,1)
+$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.S FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.s FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+
+$(obj).$(TOOLSET)/%.o: $(obj)/%.c FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+$(obj).$(TOOLSET)/%.o: $(obj)/%.cc FORCE_DO_CMD
+	@$(call do_cmd,cxx,1)
+$(obj).$(TOOLSET)/%.o: $(obj)/%.cpp FORCE_DO_CMD
+	@$(call do_cmd,cxx,1)
+$(obj).$(TOOLSET)/%.o: $(obj)/%.cxx FORCE_DO_CMD
+	@$(call do_cmd,cxx,1)
+$(obj).$(TOOLSET)/%.o: $(obj)/%.S FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+$(obj).$(TOOLSET)/%.o: $(obj)/%.s FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+
+
+ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
+    $(findstring $(join ^,$(prefix)),\
+                 $(join ^,src/libuv/run-benchmarks.target.mk)))),)
+  include src/libuv/run-benchmarks.target.mk
+endif
+ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
+    $(findstring $(join ^,$(prefix)),\
+                 $(join ^,src/libuv/run-tests.target.mk)))),)
+  include src/libuv/run-tests.target.mk
+endif
+ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
+    $(findstring $(join ^,$(prefix)),\
+                 $(join ^,src/libuv/uv.target.mk)))),)
+  include src/libuv/uv.target.mk
+endif
+
+#quiet_cmd_regen_makefile = ACTION Regenerating $@
+#cmd_regen_makefile = ./src/libuv/build/gyp/gyp -fmake --ignore-environment "--toplevel-dir=." -Isrc/libuv/common.gypi "--depth=." "--generator-output=mk/libuv/mips/unix/linux" "-Ddefault_configuration=Default" "-Dcomponent=static_library" "-Dlibrary=static_library" "-Dtarget_arch=mips" "-DOS=linux" src/libuv/uv.gyp
+#Makefile: $(srcdir)/src/libuv/uv.gyp $(srcdir)/src/libuv/common.gypi
+#	$(call do_cmd,regen_makefile)
+
+# "all" is a concatenation of the "all" targets from all the included
+# sub-makefiles. This is just here to clarify.
+all:
+
+# Add in dependency-tracking rules.  $(all_deps) is the list of every single
+# target in our tree. Only consider the ones with .d (dependency) info:
+d_files := $(wildcard $(foreach f,$(all_deps),$(depsdir)/$(f).d))
+ifneq ($(d_files),)
+  # Rather than include each individual .d file, concatenate them into a
+  # single file which make is able to load faster.  We split this into
+  # commands that take 1000 files at a time to avoid overflowing the
+  # command line.
+  $(shell cat $(wordlist 1,1000,$(d_files)) > $(depsdir)/all.deps)
+
+  ifneq ($(word 1001,$(d_files)),)
+    $(error Found unprocessed dependency files (gyp didn't generate enough rules!))
+  endif
+
+  # make looks for ways to re-generate included makefiles, but in our case, we
+  # don't have a direct way. Explicitly telling make that it has nothing to do
+  # for them makes it go faster.
+  $(depsdir)/all.deps: ;
+
+  include $(depsdir)/all.deps
+endif
diff --git a/mk/libuv/mips/unix/linux/src/libuv/run-benchmarks.target.mk b/mk/libuv/mips/unix/linux/src/libuv/run-benchmarks.target.mk
new file mode 100644
index 00000000000..25b01014e79
--- /dev/null
+++ b/mk/libuv/mips/unix/linux/src/libuv/run-benchmarks.target.mk
@@ -0,0 +1,122 @@
+# This file is generated by gyp; do not edit.
+
+TOOLSET := target
+TARGET := run-benchmarks
+DEFS_Debug := '-D_LARGEFILE_SOURCE' \
+	'-D_FILE_OFFSET_BITS=64' \
+	'-D_GNU_SOURCE' \
+	'-DEIO_STACKSIZE=262144' \
+	'-DDEBUG' \
+	'-D_DEBUG' \
+	'-DEV_VERIFY=2'
+
+# Flags passed to all source files.
+CFLAGS_Debug := -pthread \
+	-Wall \
+	-ansi \
+	-pthread \
+	-fvisibility=hidden \
+	-g \
+	-O0
+
+# Flags passed to only C files.
+CFLAGS_C_Debug := 
+
+# Flags passed to only C++ files.
+CFLAGS_CC_Debug := -fno-rtti \
+	-fno-exceptions
+
+INCS_Debug := -I$(srcdir)/src/libuv/include
+
+DEFS_Release := '-D_LARGEFILE_SOURCE' \
+	'-D_FILE_OFFSET_BITS=64' \
+	'-D_GNU_SOURCE' \
+	'-DEIO_STACKSIZE=262144' \
+	'-DNDEBUG'
+
+# Flags passed to all source files.
+CFLAGS_Release := -pthread \
+	-Wall \
+	-ansi \
+	-pthread \
+	-fvisibility=hidden \
+	-O3 \
+	-fomit-frame-pointer \
+	-fdata-sections \
+	-ffunction-sections
+
+# Flags passed to only C files.
+CFLAGS_C_Release := 
+
+# Flags passed to only C++ files.
+CFLAGS_CC_Release := -fno-rtti \
+	-fno-exceptions
+
+INCS_Release := -I$(srcdir)/src/libuv/include
+
+OBJS := $(obj).target/$(TARGET)/src/libuv/test/benchmark-ares.o \
+	$(obj).target/$(TARGET)/src/libuv/test/benchmark-getaddrinfo.o \
+	$(obj).target/$(TARGET)/src/libuv/test/benchmark-ping-pongs.o \
+	$(obj).target/$(TARGET)/src/libuv/test/benchmark-pound.o \
+	$(obj).target/$(TARGET)/src/libuv/test/benchmark-pump.o \
+	$(obj).target/$(TARGET)/src/libuv/test/benchmark-sizes.o \
+	$(obj).target/$(TARGET)/src/libuv/test/benchmark-spawn.o \
+	$(obj).target/$(TARGET)/src/libuv/test/benchmark-thread.o \
+	$(obj).target/$(TARGET)/src/libuv/test/benchmark-tcp-write-batch.o \
+	$(obj).target/$(TARGET)/src/libuv/test/benchmark-udp-packet-storm.o \
+	$(obj).target/$(TARGET)/src/libuv/test/dns-server.o \
+	$(obj).target/$(TARGET)/src/libuv/test/echo-server.o \
+	$(obj).target/$(TARGET)/src/libuv/test/blackhole-server.o \
+	$(obj).target/$(TARGET)/src/libuv/test/run-benchmarks.o \
+	$(obj).target/$(TARGET)/src/libuv/test/runner.o \
+	$(obj).target/$(TARGET)/src/libuv/test/runner-unix.o
+
+# Add to the list of files we specially track dependencies for.
+all_deps += $(OBJS)
+
+# Make sure our dependencies are built before any of us.
+$(OBJS): | $(obj).target/src/libuv/libuv.a
+
+# CFLAGS et al overrides must be target-local.
+# See "Target-specific Variable Values" in the GNU Make manual.
+$(OBJS): TOOLSET := $(TOOLSET)
+$(OBJS): GYP_CFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE))  $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_C_$(BUILDTYPE))
+$(OBJS): GYP_CXXFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE))  $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_CC_$(BUILDTYPE))
+
+# Suffix rules, putting all outputs into $(obj).
+
+$(obj).$(TOOLSET)/$(TARGET)/%.o: $(srcdir)/%.c FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+
+# Try building from generated source, too.
+
+$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj).$(TOOLSET)/%.c FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+
+$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj)/%.c FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+
+# End of this set of suffix rules
+### Rules for final target.
+LDFLAGS_Debug := -pthread
+
+LDFLAGS_Release := -pthread
+
+LIBS := -lrt
+
+$(builddir)/run-benchmarks: GYP_LDFLAGS := $(LDFLAGS_$(BUILDTYPE))
+$(builddir)/run-benchmarks: LIBS := $(LIBS)
+$(builddir)/run-benchmarks: LD_INPUTS := $(OBJS) $(obj).target/src/libuv/libuv.a
+$(builddir)/run-benchmarks: TOOLSET := $(TOOLSET)
+$(builddir)/run-benchmarks: $(OBJS) $(obj).target/src/libuv/libuv.a FORCE_DO_CMD
+	$(call do_cmd,link)
+
+all_deps += $(builddir)/run-benchmarks
+# Add target alias
+.PHONY: run-benchmarks
+run-benchmarks: $(builddir)/run-benchmarks
+
+# Add executable to "all" target.
+.PHONY: all
+all: $(builddir)/run-benchmarks
+
diff --git a/mk/libuv/mips/unix/linux/src/libuv/run-tests.target.mk b/mk/libuv/mips/unix/linux/src/libuv/run-tests.target.mk
new file mode 100644
index 00000000000..a2fe0d2065e
--- /dev/null
+++ b/mk/libuv/mips/unix/linux/src/libuv/run-tests.target.mk
@@ -0,0 +1,165 @@
+# This file is generated by gyp; do not edit.
+
+TOOLSET := target
+TARGET := run-tests
+DEFS_Debug := '-D_LARGEFILE_SOURCE' \
+	'-D_FILE_OFFSET_BITS=64' \
+	'-D_GNU_SOURCE' \
+	'-DEIO_STACKSIZE=262144' \
+	'-DDEBUG' \
+	'-D_DEBUG' \
+	'-DEV_VERIFY=2'
+
+# Flags passed to all source files.
+CFLAGS_Debug := -pthread \
+	-Wall \
+	-ansi \
+	-pthread \
+	-fvisibility=hidden \
+	-g \
+	-O0
+
+# Flags passed to only C files.
+CFLAGS_C_Debug := 
+
+# Flags passed to only C++ files.
+CFLAGS_CC_Debug := -fno-rtti \
+	-fno-exceptions
+
+INCS_Debug := -I$(srcdir)/src/libuv/include
+
+DEFS_Release := '-D_LARGEFILE_SOURCE' \
+	'-D_FILE_OFFSET_BITS=64' \
+	'-D_GNU_SOURCE' \
+	'-DEIO_STACKSIZE=262144' \
+	'-DNDEBUG'
+
+# Flags passed to all source files.
+CFLAGS_Release := -pthread \
+	-Wall \
+	-ansi \
+	-pthread \
+	-fvisibility=hidden \
+	-O3 \
+	-fomit-frame-pointer \
+	-fdata-sections \
+	-ffunction-sections
+
+# Flags passed to only C files.
+CFLAGS_C_Release := 
+
+# Flags passed to only C++ files.
+CFLAGS_CC_Release := -fno-rtti \
+	-fno-exceptions
+
+INCS_Release := -I$(srcdir)/src/libuv/include
+
+OBJS := $(obj).target/$(TARGET)/src/libuv/test/blackhole-server.o \
+	$(obj).target/$(TARGET)/src/libuv/test/echo-server.o \
+	$(obj).target/$(TARGET)/src/libuv/test/run-tests.o \
+	$(obj).target/$(TARGET)/src/libuv/test/runner.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-get-loadavg.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-util.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-async.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-error.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-callback-stack.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-connection-fail.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-cwd-and-chdir.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-delayed-accept.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-eio-overflow.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-fail-always.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-fs.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-fs-event.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-get-currentexe.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-get-memory.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-getaddrinfo.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-gethostbyname.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-getsockname.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-hrtime.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-idle.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-ipc.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-ipc-threads.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-loop-handles.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-multiple-listen.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-pass-always.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-ping-pong.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-pipe-bind-error.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-pipe-connect-error.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-platform-output.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-process-title.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-ref.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-shutdown-eof.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-spawn.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-stdio-over-pipes.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-tcp-bind-error.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-tcp-bind6-error.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-tcp-close.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-tcp-flags.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-tcp-connect-error.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-tcp-connect6-error.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-tcp-write-error.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-tcp-write-to-half-open-connection.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-tcp-writealot.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-threadpool.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-mutexes.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-thread.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-timer-again.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-timer.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-tty.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-udp-dgram-too-big.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-udp-ipv6.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-udp-options.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-udp-send-and-recv.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-udp-multicast-join.o \
+	$(obj).target/$(TARGET)/src/libuv/test/test-counters-init.o \
+	$(obj).target/$(TARGET)/src/libuv/test/runner-unix.o
+
+# Add to the list of files we specially track dependencies for.
+all_deps += $(OBJS)
+
+# Make sure our dependencies are built before any of us.
+$(OBJS): | $(obj).target/src/libuv/libuv.a
+
+# CFLAGS et al overrides must be target-local.
+# See "Target-specific Variable Values" in the GNU Make manual.
+$(OBJS): TOOLSET := $(TOOLSET)
+$(OBJS): GYP_CFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE))  $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_C_$(BUILDTYPE))
+$(OBJS): GYP_CXXFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE))  $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_CC_$(BUILDTYPE))
+
+# Suffix rules, putting all outputs into $(obj).
+
+$(obj).$(TOOLSET)/$(TARGET)/%.o: $(srcdir)/%.c FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+
+# Try building from generated source, too.
+
+$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj).$(TOOLSET)/%.c FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+
+$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj)/%.c FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+
+# End of this set of suffix rules
+### Rules for final target.
+LDFLAGS_Debug := -pthread
+
+LDFLAGS_Release := -pthread
+
+LIBS := -lrt
+
+$(builddir)/run-tests: GYP_LDFLAGS := $(LDFLAGS_$(BUILDTYPE))
+$(builddir)/run-tests: LIBS := $(LIBS)
+$(builddir)/run-tests: LD_INPUTS := $(OBJS) $(obj).target/src/libuv/libuv.a
+$(builddir)/run-tests: TOOLSET := $(TOOLSET)
+$(builddir)/run-tests: $(OBJS) $(obj).target/src/libuv/libuv.a FORCE_DO_CMD
+	$(call do_cmd,link)
+
+all_deps += $(builddir)/run-tests
+# Add target alias
+.PHONY: run-tests
+run-tests: $(builddir)/run-tests
+
+# Add executable to "all" target.
+.PHONY: all
+all: $(builddir)/run-tests
+
diff --git a/mk/libuv/mips/unix/linux/src/libuv/uv.Makefile b/mk/libuv/mips/unix/linux/src/libuv/uv.Makefile
new file mode 100644
index 00000000000..38379e25001
--- /dev/null
+++ b/mk/libuv/mips/unix/linux/src/libuv/uv.Makefile
@@ -0,0 +1,6 @@
+# This file is generated by gyp; do not edit.
+
+export builddir_name ?= mk/libuv/mips/unix/linux/./src/libuv/out
+.PHONY: all
+all:
+	$(MAKE) -C ../.. uv run-benchmarks run-tests
diff --git a/mk/libuv/mips/unix/linux/src/libuv/uv.target.mk b/mk/libuv/mips/unix/linux/src/libuv/uv.target.mk
new file mode 100644
index 00000000000..9404769e238
--- /dev/null
+++ b/mk/libuv/mips/unix/linux/src/libuv/uv.target.mk
@@ -0,0 +1,191 @@
+# This file is generated by gyp; do not edit.
+
+TOOLSET := target
+TARGET := uv
+DEFS_Debug := '-D_LARGEFILE_SOURCE' \
+	'-D_FILE_OFFSET_BITS=64' \
+	'-D_GNU_SOURCE' \
+	'-DEIO_STACKSIZE=262144' \
+	'-DHAVE_CONFIG_H' \
+	'-DEV_CONFIG_H="config_linux.h"' \
+	'-DEIO_CONFIG_H="config_linux.h"' \
+	'-DDEBUG' \
+	'-D_DEBUG' \
+	'-DEV_VERIFY=2'
+
+# Flags passed to all source files.
+CFLAGS_Debug := -pthread \
+	-Wall \
+	-ansi \
+	-pthread \
+	-fvisibility=hidden \
+	-g \
+	--std=gnu89 \
+	-pedantic \
+	-Wall \
+	-Wextra \
+	-Wno-unused-parameter \
+	-g \
+	-O0 \
+	-fPIC
+
+# Flags passed to only C files.
+CFLAGS_C_Debug := 
+
+# Flags passed to only C++ files.
+CFLAGS_CC_Debug := -fno-rtti \
+	-fno-exceptions
+
+INCS_Debug := -I$(srcdir)/src/libuv/include \
+	-I$(srcdir)/src/libuv/include/uv-private \
+	-I$(srcdir)/src/libuv/src \
+	-I$(srcdir)/src/libuv/src/unix/ev \
+	-I$(srcdir)/src/libuv/src/ares/config_linux
+
+DEFS_Release := '-D_LARGEFILE_SOURCE' \
+	'-D_FILE_OFFSET_BITS=64' \
+	'-D_GNU_SOURCE' \
+	'-DEIO_STACKSIZE=262144' \
+	'-DHAVE_CONFIG_H' \
+	'-DEV_CONFIG_H="config_linux.h"' \
+	'-DEIO_CONFIG_H="config_linux.h"' \
+	'-DNDEBUG'
+
+# Flags passed to all source files.
+CFLAGS_Release := -pthread \
+	-Wall \
+	-ansi \
+	-pthread \
+	-fvisibility=hidden \
+	-g \
+	--std=gnu89 \
+	-pedantic \
+	-Wall \
+	-Wextra \
+	-Wno-unused-parameter \
+	-O3 \
+	-fomit-frame-pointer \
+	-fdata-sections \
+	-ffunction-sections \
+	-fPIC
+
+# Flags passed to only C files.
+CFLAGS_C_Release := 
+
+# Flags passed to only C++ files.
+CFLAGS_CC_Release := -fno-rtti \
+	-fno-exceptions
+
+INCS_Release := -I$(srcdir)/src/libuv/include \
+	-I$(srcdir)/src/libuv/include/uv-private \
+	-I$(srcdir)/src/libuv/src \
+	-I$(srcdir)/src/libuv/src/unix/ev \
+	-I$(srcdir)/src/libuv/src/ares/config_linux
+
+OBJS := $(obj).target/$(TARGET)/src/libuv/src/uv-common.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_cancel.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares__close_sockets.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_data.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_destroy.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_expand_name.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_expand_string.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_fds.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_free_hostent.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_free_string.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_gethostbyaddr.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_gethostbyname.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares__get_hostent.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_getnameinfo.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_getopt.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_getsock.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_init.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_library_init.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_llist.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_mkquery.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_nowarn.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_options.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_parse_aaaa_reply.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_parse_a_reply.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_parse_mx_reply.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_parse_ns_reply.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_parse_ptr_reply.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_parse_srv_reply.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_parse_txt_reply.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_process.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_query.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares__read_line.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_search.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_send.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_strcasecmp.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_strdup.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_strerror.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_timeout.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares__timeval.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_version.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/ares_writev.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/bitncmp.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/inet_net_pton.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/inet_ntop.o \
+	$(obj).target/$(TARGET)/src/libuv/src/ares/windows_port.o \
+	$(obj).target/$(TARGET)/src/libuv/src/unix/core.o \
+	$(obj).target/$(TARGET)/src/libuv/src/unix/uv-eio.o \
+	$(obj).target/$(TARGET)/src/libuv/src/unix/fs.o \
+	$(obj).target/$(TARGET)/src/libuv/src/unix/udp.o \
+	$(obj).target/$(TARGET)/src/libuv/src/unix/tcp.o \
+	$(obj).target/$(TARGET)/src/libuv/src/unix/pipe.o \
+	$(obj).target/$(TARGET)/src/libuv/src/unix/tty.o \
+	$(obj).target/$(TARGET)/src/libuv/src/unix/stream.o \
+	$(obj).target/$(TARGET)/src/libuv/src/unix/cares.o \
+	$(obj).target/$(TARGET)/src/libuv/src/unix/dl.o \
+	$(obj).target/$(TARGET)/src/libuv/src/unix/error.o \
+	$(obj).target/$(TARGET)/src/libuv/src/unix/thread.o \
+	$(obj).target/$(TARGET)/src/libuv/src/unix/process.o \
+	$(obj).target/$(TARGET)/src/libuv/src/unix/eio/eio.o \
+	$(obj).target/$(TARGET)/src/libuv/src/unix/ev/ev.o \
+	$(obj).target/$(TARGET)/src/libuv/src/unix/linux.o
+
+# Add to the list of files we specially track dependencies for.
+all_deps += $(OBJS)
+
+# CFLAGS et al overrides must be target-local.
+# See "Target-specific Variable Values" in the GNU Make manual.
+$(OBJS): TOOLSET := $(TOOLSET)
+$(OBJS): GYP_CFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE))  $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_C_$(BUILDTYPE))
+$(OBJS): GYP_CXXFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE))  $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_CC_$(BUILDTYPE))
+
+# Suffix rules, putting all outputs into $(obj).
+
+$(obj).$(TOOLSET)/$(TARGET)/%.o: $(srcdir)/%.c FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+
+# Try building from generated source, too.
+
+$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj).$(TOOLSET)/%.c FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+
+$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj)/%.c FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+
+# End of this set of suffix rules
+### Rules for final target.
+LDFLAGS_Debug := -pthread
+
+LDFLAGS_Release := -pthread
+
+LIBS := -lm
+
+$(obj).target/src/libuv/libuv.a: GYP_LDFLAGS := $(LDFLAGS_$(BUILDTYPE))
+$(obj).target/src/libuv/libuv.a: LIBS := $(LIBS)
+$(obj).target/src/libuv/libuv.a: TOOLSET := $(TOOLSET)
+$(obj).target/src/libuv/libuv.a: $(OBJS) FORCE_DO_CMD
+	$(call do_cmd,alink)
+
+all_deps += $(obj).target/src/libuv/libuv.a
+# Add target alias
+.PHONY: uv
+uv: $(obj).target/src/libuv/libuv.a
+
+# Add target alias to "all" target.
+.PHONY: all
+all: uv
+
diff --git a/mk/rt.mk b/mk/rt.mk
index e6e0f1e0cd7..504d5bc963e 100644
--- a/mk/rt.mk
+++ b/mk/rt.mk
@@ -83,8 +83,12 @@ RUNTIME_S_$(1) := rt/arch/$$(HOST_$(1))/_context.S \
 
 ifeq ($$(HOST_$(1)), i386)
   LIBUV_ARCH_$(1) := ia32
-else
+else ifeq  ($$(HOST_$(1)), x86_64)
   LIBUV_ARCH_$(1) := x86_64
+else ifeq  ($$(HOST_$(1)), arm)
+  LIBUV_ARCH_$(1) := arm
+else ifeq  ($$(HOST_$(1)), mips)
+  LIBUV_ARCH_$(1) := mips
 endif
 
 ifeq ($$(CFG_WINDOWSY), 1)
diff --git a/src/rt/arch/mips/_context.S b/src/rt/arch/mips/_context.S
new file mode 100644
index 00000000000..a903557ba6c
--- /dev/null
+++ b/src/rt/arch/mips/_context.S
@@ -0,0 +1,81 @@
+.text
+.globl swap_registers
+.align 2
+.set nomips16
+.ent swap_registers
+swap_registers:
+        .set noreorder
+        .set nomacro
+        .set noat
+        sw $1, 1 * 4($4)
+        sw $2, 2 * 4($4)
+        sw $3, 3 * 4($4)
+        sw $4, 4 * 4($4)
+        sw $5, 5 * 4($4)
+        sw $6, 6 * 4($4)
+        sw $7, 7 * 4($4)
+
+        sw $8, 8 * 4($4)
+        sw $9, 9 * 4($4)
+        sw $10, 10 * 4($4)
+        sw $11, 11 * 4($4)
+        sw $12, 12 * 4($4)
+        sw $13, 13 * 4($4)
+        sw $14, 14 * 4($4)
+        sw $15, 15 * 4($4)
+
+        sw $16, 16 * 4($4)
+        sw $17, 17 * 4($4)
+        sw $18, 18 * 4($4)
+        sw $19, 19 * 4($4)
+        sw $20, 20 * 4($4)
+        sw $21, 21 * 4($4)
+        sw $22, 22 * 4($4)
+        sw $23, 23 * 4($4)
+
+        sw $24, 24 * 4($4)
+        sw $25, 25 * 4($4)
+        sw $26, 26 * 4($4)
+        sw $27, 27 * 4($4)
+        sw $28, 28 * 4($4)
+        sw $29, 29 * 4($4)
+        sw $30, 30 * 4($4)
+        sw $31, 31 * 4($4)
+
+        lw $1, 1 * 4($5)
+        lw $2, 2 * 4($5)
+        lw $3, 3 * 4($5)
+        lw $4, 4 * 4($5)
+        lw $5, 5 * 4($5)
+        lw $6, 6 * 4($5)
+        lw $7, 7 * 4($5)
+
+        lw $8, 8 * 4($5)
+        lw $9, 9 * 4($5)
+        lw $10, 10 * 4($5)
+        lw $11, 11 * 4($5)
+        lw $12, 12 * 4($5)
+        lw $13, 13 * 4($5)
+        lw $14, 14 * 4($5)
+        lw $15, 15 * 4($5)
+
+        lw $16, 16 * 4($5)
+        lw $17, 17 * 4($5)
+        lw $18, 18 * 4($5)
+        lw $19, 19 * 4($5)
+        lw $20, 20 * 4($5)
+        lw $21, 21 * 4($5)
+        lw $22, 22 * 4($5)
+        lw $23, 23 * 4($5)
+
+        lw $24, 24 * 4($5)
+        lw $25, 25 * 4($5)
+        lw $26, 26 * 4($5)
+        lw $27, 27 * 4($5)
+        lw $28, 28 * 4($5)
+        lw $29, 29 * 4($5)
+        lw $30, 30 * 4($5)
+        lw $31, 31 * 4($5)
+
+        jr $31
+.end swap_registers
diff --git a/src/rt/arch/mips/ccall.S b/src/rt/arch/mips/ccall.S
new file mode 100644
index 00000000000..184c4cd7e45
--- /dev/null
+++ b/src/rt/arch/mips/ccall.S
@@ -0,0 +1,12 @@
+.text
+
+.globl __morestack
+.hidden __morestack
+.align 2
+.set nomips16
+.ent __morestack
+__morestack:
+        .set noreorder
+        .set nomacro
+
+.end __morestack
diff --git a/src/rt/arch/mips/context.cpp b/src/rt/arch/mips/context.cpp
new file mode 100644
index 00000000000..d8c3c38daa6
--- /dev/null
+++ b/src/rt/arch/mips/context.cpp
@@ -0,0 +1,46 @@
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#include "context.h"
+#include "../../rust_globals.h"
+
+extern "C" void CDECL swap_registers(registers_t *oregs,
+                                     registers_t *regs)
+asm ("swap_registers");
+
+context::context()
+{
+    assert((void*)&regs == (void*)this);
+    memset(&regs, 0, sizeof(regs));
+}
+
+void context::swap(context &out)
+{
+    swap_registers(&out.regs, &regs);
+}
+
+void context::call(void *f, void *arg, void *stack)
+{
+  // Get the current context, which we will then modify to call the
+  // given function.
+  swap(*this);
+
+  // set up the stack
+  uint32_t *sp = (uint32_t *)stack;
+  //sp = align_down(sp);
+  // The final return address. 0 indicates the bottom of the stack
+  *--sp = 0;
+
+  regs.data[4] = (uint32_t)arg;
+  regs.data[29] = (uint32_t)sp;
+  regs.data[31] = (uint32_t)f;
+
+  // Last base pointer on the stack should be 0
+}
diff --git a/src/rt/arch/mips/context.h b/src/rt/arch/mips/context.h
new file mode 100644
index 00000000000..5e2364437ec
--- /dev/null
+++ b/src/rt/arch/mips/context.h
@@ -0,0 +1,51 @@
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#ifndef CONTEXT_H
+#define CONTEXT_H
+
+#include <cstdlib>
+#include <inttypes.h>
+#include <stdint.h>
+//#include <xmmintrin.h>
+
+#include "vg/memcheck.h"
+
+template<typename T>
+T align_down(T sp)
+{
+    // There is no platform we care about that needs more than a
+    // 16-byte alignment.
+    return (T)((uint32_t)sp & ~(16 - 1));
+}
+
+// The struct in which we store the saved data.  This is mostly the
+// volatile registers and instruction pointer, but it also includes
+// RCX/RDI which are used to pass arguments.  The indices for each
+// register are found in "regs.h".  Note that the alignment must be
+// 16 bytes so that SSE instructions can be used.
+#include "regs.h"
+struct registers_t {
+    uint32_t data[RUSTRT_MAX];
+} __attribute__((aligned(16)));
+
+class context {
+public:
+    registers_t regs;
+
+    context();
+
+    context *next;
+
+    void swap(context &out);
+    void call(void *f, void *arg, void *sp);
+};
+
+#endif
diff --git a/src/rt/arch/mips/gpr.cpp b/src/rt/arch/mips/gpr.cpp
new file mode 100644
index 00000000000..da2f515999f
--- /dev/null
+++ b/src/rt/arch/mips/gpr.cpp
@@ -0,0 +1,31 @@
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#include "gpr.h"
+
+#define LOAD(n) do { \
+    uintptr_t tmp; \
+    asm(".set noat; move %0, $" #n : "=r" (tmp) :); \
+    this->r##n = tmp; \
+} while (0)
+
+void rust_gpr::load() {
+              LOAD(1); LOAD(2); LOAD(3);
+    LOAD(4); LOAD(5); LOAD(6); LOAD(7);
+
+    LOAD(8); LOAD(9); LOAD(10); LOAD(11);
+    LOAD(12); LOAD(13); LOAD(14); LOAD(15);
+
+    LOAD(16); LOAD(17); LOAD(18); LOAD(19);
+    LOAD(20); LOAD(21); LOAD(22); LOAD(23);
+
+    LOAD(24); LOAD(25); LOAD(26); LOAD(27);
+    LOAD(28); LOAD(29); LOAD(30); LOAD(31);
+}
diff --git a/src/rt/arch/mips/gpr.h b/src/rt/arch/mips/gpr.h
new file mode 100644
index 00000000000..a174146e692
--- /dev/null
+++ b/src/rt/arch/mips/gpr.h
@@ -0,0 +1,33 @@
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#ifndef GPR_H
+#define GPR_H
+
+#include "rust_gpr_base.h"
+
+class rust_gpr : public rust_gpr_base {
+public:
+    uintptr_t r0, r1, r2, r3, r4, r5, r6, r7;
+    uintptr_t r8,  r9, r10, r11, r12, r13, r14, r15;
+    uintptr_t r16, r17, r18, r19, r20, r21, r22, r23;
+    uintptr_t r24, r25, r26, r27, r28, r29, r30, r31;
+
+    inline uintptr_t get_fp() { return r30; }
+    inline uintptr_t get_ip() { return r0; }
+
+    inline void set_fp(uintptr_t new_fp) { r30 = new_fp; }
+    inline void set_ip(uintptr_t new_ip) { r0 = new_ip; }
+
+    void load();
+};
+
+#endif
+
diff --git a/src/rt/arch/mips/record_sp.S b/src/rt/arch/mips/record_sp.S
new file mode 100644
index 00000000000..6821b175c9e
--- /dev/null
+++ b/src/rt/arch/mips/record_sp.S
@@ -0,0 +1,44 @@
+.text
+
+.globl record_sp_limit
+.align 2
+.set nomips16
+.ent record_sp_limit
+record_sp_limit:
+        .set noreorder
+        .set nomacro
+        .set push
+        .set mips32r2
+        rdhwr $3, $29
+        .set pop
+        addiu $3, $3, -0x7008
+        sw $4, 4($3)
+        jr $31
+.end record_sp_limit
+
+.globl get_sp_limit
+.align 2
+.set nomips16
+.ent get_sp_limit
+get_sp_limit:
+        .set noreorder
+        .set nomacro
+        .set push
+        .set mips32r2
+        rdhwr $3, $29
+        .set pop
+        addiu $3, $3, -0x7008
+        lw $2, 4($3)
+        jr $31
+.end get_sp_limit
+
+.globl get_sp
+.align 2
+.set nomips16
+.ent get_sp
+get_sp:
+        .set noreorder
+        .set nomacro
+        move $2, $29
+        jr $31
+.end get_sp
diff --git a/src/rt/arch/mips/regs.h b/src/rt/arch/mips/regs.h
new file mode 100644
index 00000000000..2f38e1507ad
--- /dev/null
+++ b/src/rt/arch/mips/regs.h
@@ -0,0 +1,18 @@
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#define RUSTRT_MAX  32
+
+// ARG0 is the register in which the first argument goes.
+// Naturally this depends on your operating system.
+#define RUSTRT_ARG0_S r4
+#define RUSTRT_ARG1_S r5
+#define RUSTRT_ARG2_S r6
+#define RUSTRT_ARG3_S r7
diff --git a/src/rt/rust_task.h b/src/rt/rust_task.h
index 23354918c50..8c9ec172c45 100644
--- a/src/rt/rust_task.h
+++ b/src/rt/rust_task.h
@@ -139,6 +139,9 @@
 #ifdef __x86_64__
 #define RED_ZONE_SIZE RZ_LINUX_64
 #endif
+#ifdef __mips__
+#define RED_ZONE_SIZE RZ_LINUX_32
+#endif
 #endif
 #ifdef __APPLE__
 #ifdef __i386__