diff --git a/compiler-rt/lib/Makefile.mk b/compiler-rt/lib/Makefile.mk
index 0855879ea870..70ccbeb00cc5 100644
--- a/compiler-rt/lib/Makefile.mk
+++ b/compiler-rt/lib/Makefile.mk
@@ -8,7 +8,7 @@
 #===------------------------------------------------------------------------===#
 
 Dir := lib
-SubDirs := i386 ppc x86_64
+SubDirs := i386 ppc x86_64 arm
 
 Sources := $(foreach file,$(wildcard $(Dir)/*.c),$(notdir $(file)))
 ObjNames := $(Sources:%.c=%.o)
diff --git a/compiler-rt/lib/arm/Makefile.mk b/compiler-rt/lib/arm/Makefile.mk
new file mode 100644
index 000000000000..7f9a98220247
--- /dev/null
+++ b/compiler-rt/lib/arm/Makefile.mk
@@ -0,0 +1,22 @@
+#===- lib/arm/Makefile.mk ----------------------------------*- Makefile -*--===#
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+#===------------------------------------------------------------------------===#
+
+Dir := lib/arm
+SubDirs := 
+OnlyArchs := armv6 armv7
+
+AsmSources := $(foreach file,$(wildcard $(Dir)/*.S),$(notdir $(file)))
+Sources := $(foreach file,$(wildcard $(Dir)/*.c),$(notdir $(file)))
+ObjNames := $(Sources:%.c=%.o) $(AsmSources:%.S=%.o)
+Target := Optimized
+
+# FIXME: use automatic dependencies?
+Dependencies := $(wildcard $(Dir)/*.h)
+
+include make/subdir.mk
diff --git a/compiler-rt/make/config.mk b/compiler-rt/make/config.mk
index d2c614c9a21b..43716af58353 100644
--- a/compiler-rt/make/config.mk
+++ b/compiler-rt/make/config.mk
@@ -12,7 +12,7 @@ ProjObjRoot := $(ProjSrcRoot)
 Configs := Debug Release Profile
 
 # The full list of architectures we support.
-Archs := i386 ppc x86_64
+Archs := i386 ppc x86_64 armv6 armv7
 
 # If TargetArch is defined, only build for that architecture (and don't use
 # -arch).