diff --git a/clang/runtime/compiler-rt/Makefile b/clang/runtime/compiler-rt/Makefile
index a8cd2e981d64..3e047fcf6f24 100644
--- a/clang/runtime/compiler-rt/Makefile
+++ b/clang/runtime/compiler-rt/Makefile
@@ -82,10 +82,23 @@ RuntimeLibrary.darwin.Configs := \
 
 # On Darwin, fake Clang into using the iOS assembler (since compiler-rt wants to
 # build ARM bits).
-ifeq ($(OS),Darwin)
 CLANG_CCFLAGS += -ccc-install-dir \
 	/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/
 endif
+
+# On Linux, include a library which has all the runtime functions.
+ifeq ($(OS),Linux)
+RuntimeDirs += linux
+RuntimeLibrary.linux.Configs :=
+
+# We currently only try to generate runtime libraries on x86.
+ifeq ($(ARCH),x86)
+RuntimeLibrary.linux.Configs += full-i386
+endif
+ifeq ($(ARCH),x86_64)
+RuntimeLibrary.linux.Configs += full-x86_64
+endif
+
 endif
 
 ####