Index: cmake/config-ix.cmake
===================================================================
--- cmake/config-ix.cmake
+++ cmake/config-ix.cmake
@@ -91,7 +91,8 @@
   elseif("${LLVM_NATIVE_ARCH}" STREQUAL "PowerPC")
     test_target_arch(powerpc64 ${TARGET_64_BIT_CFLAGS})
   elseif("${LLVM_NATIVE_ARCH}" STREQUAL "Mips")
-    test_target_arch(mips "")
+    test_target_arch(mips ${TARGET_32_BIT_CFLAGS})
+    test_target_arch(mips64 ${TARGET_64_BIT_CFLAGS})
   endif()
   # Build ARM libraries if we are configured to test on ARM
   if("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "arm|aarch64")
@@ -115,7 +116,7 @@
 # Arhcitectures supported by compiler-rt libraries.
 # FIXME: add arm_android here
 filter_available_targets(SANITIZER_COMMON_SUPPORTED_ARCH
-  x86_64 i386 powerpc64 arm aarch64 mips arm_android)
+  x86_64 i386 powerpc64 arm aarch64 mips mips64 arm_android)
 filter_available_targets(ASAN_SUPPORTED_ARCH
   x86_64 i386 powerpc64 arm mips arm_android)
 filter_available_targets(DFSAN_SUPPORTED_ARCH x86_64)
@@ -125,7 +126,7 @@
 filter_available_targets(LSAN_COMMON_SUPPORTED_ARCH
   ${SANITIZER_COMMON_SUPPORTED_ARCH})
 filter_available_targets(MSAN_SUPPORTED_ARCH x86_64)
-filter_available_targets(PROFILE_SUPPORTED_ARCH x86_64 i386 arm aarch64)
+filter_available_targets(PROFILE_SUPPORTED_ARCH x86_64 i386 arm aarch64 mips mips64)
 filter_available_targets(TSAN_SUPPORTED_ARCH x86_64)
 filter_available_targets(UBSAN_SUPPORTED_ARCH x86_64 i386 arm aarch64)