Index: lib/Transforms/Instrumentation/EfficiencySanitizer.cpp
===================================================================
--- lib/Transforms/Instrumentation/EfficiencySanitizer.cpp
+++ lib/Transforms/Instrumentation/EfficiencySanitizer.cpp
@@ -99,12 +99,23 @@
 // FIXME: Try to place these shadow constants, the names of the __esan_*
 // interface functions, and the ToolType enum into a header shared between
 // llvm and compiler-rt.
-static const uint64_t ShadowMask = 0x00000fffffffffffull;
-static const uint64_t ShadowOffs[3] = { // Indexed by scale
-  0x0000130000000000ull,
-  0x0000220000000000ull,
-  0x0000440000000000ull,
-};
+struct ShadowMemoryParams {
+  uint64_t ShadowMask;
+  uint64_t ShadowOffs[3];
+} ShadowParams;
+
+static const ShadowMemoryParams ShadowParams48 = {
+    0x00000fffffffffffull,
+    {
+        0x0000130000000000ull, 0x0000220000000000ull, 0x0000440000000000ull,
+    }};
+
+static const ShadowMemoryParams ShadowParams40 = {
+    0x0fffffffffull,
+    {
+        0x1300000000ull, 0x2200000000ull, 0x4400000000ull,
+    }};
+
 // This array is indexed by the ToolType enum.
 static const int ShadowScale[] = {
   0, // ESAN_None.
@@ -528,6 +539,20 @@
 }
 
 bool EfficiencySanitizer::initOnModule(Module &M) {
+
+  Triple TargetTriple(M.getTargetTriple());
+  switch (TargetTriple.getArch()) {
+    case Triple::x86_64:
+      ShadowParams = ShadowParams48;
+      break;
+    case Triple::mips64:
+    case Triple::mips64el:
+      ShadowParams = ShadowParams40;
+      break;
+    default:
+      report_fatal_error("unsupported architecture");
+  }
+
   Ctx = &M.getContext();
   const DataLayout &DL = M.getDataLayout();
   IRBuilder<> IRB(M.getContext());
@@ -559,13 +584,13 @@
 
 Value *EfficiencySanitizer::appToShadow(Value *Shadow, IRBuilder<> &IRB) {
   // Shadow = ((App & Mask) + Offs) >> Scale
-  Shadow = IRB.CreateAnd(Shadow, ConstantInt::get(IntptrTy, ShadowMask));
+  Shadow = IRB.CreateAnd(Shadow, ConstantInt::get(IntptrTy, ShadowParams.ShadowMask));
   uint64_t Offs;
   int Scale = ShadowScale[Options.ToolType];
   if (Scale <= 2)
-    Offs = ShadowOffs[Scale];
+    Offs = ShadowParams.ShadowOffs[Scale];
   else
-    Offs = ShadowOffs[0] << Scale;
+    Offs = ShadowParams.ShadowOffs[0] << Scale;
   Shadow = IRB.CreateAdd(Shadow, ConstantInt::get(IntptrTy, Offs));
   if (Scale > 0)
     Shadow = IRB.CreateLShr(Shadow, Scale);
Index: test/Instrumentation/EfficiencySanitizer/struct_field_count_basic.ll
===================================================================
--- test/Instrumentation/EfficiencySanitizer/struct_field_count_basic.ll
+++ test/Instrumentation/EfficiencySanitizer/struct_field_count_basic.ll
@@ -2,6 +2,8 @@
 ;
 ; RUN: opt < %s -esan -esan-cache-frag -S | FileCheck %s
 
+; REQUIRES: x86, mips
+
 %struct.A = type { i32, i32 }
 %union.U = type { double }
 %struct.C = type { %struct.anon, %union.anon, [10 x i8] }
Index: test/Instrumentation/EfficiencySanitizer/struct_field_gep.ll
===================================================================
--- test/Instrumentation/EfficiencySanitizer/struct_field_gep.ll
+++ test/Instrumentation/EfficiencySanitizer/struct_field_gep.ll
@@ -3,6 +3,8 @@
 ;
 ; RUN: opt < %s -esan -esan-cache-frag -S | FileCheck %s
 
+; REQUIRES: x86, mips
+
 ; Code from http://llvm.org/docs/LangRef.html#getelementptr-instruction
 ; struct RT {
 ;   char A;
Index: test/Instrumentation/EfficiencySanitizer/struct_field_small.ll
===================================================================
--- test/Instrumentation/EfficiencySanitizer/struct_field_small.ll
+++ test/Instrumentation/EfficiencySanitizer/struct_field_small.ll
@@ -2,6 +2,8 @@
 ;
 ; RUN: opt < %s -esan -esan-cache-frag -esan-aux-field-info=false -S | FileCheck %s
 
+; REQUIRES: x86, mips
+
 %struct.A = type { i32, i32 }
 %union.U = type { double }
 %struct.C = type { %struct.anon, %union.anon, [10 x i8] }
Index: test/Instrumentation/EfficiencySanitizer/working_set_basic.ll
===================================================================
--- test/Instrumentation/EfficiencySanitizer/working_set_basic.ll
+++ test/Instrumentation/EfficiencySanitizer/working_set_basic.ll
@@ -2,6 +2,8 @@
 ;
 ; RUN: opt < %s -esan -esan-working-set -S | FileCheck %s
 
+; REQUIRES: x86, mips
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Intra-cache-line
 
Index: test/Instrumentation/EfficiencySanitizer/working_set_slow.ll
===================================================================
--- test/Instrumentation/EfficiencySanitizer/working_set_slow.ll
+++ test/Instrumentation/EfficiencySanitizer/working_set_slow.ll
@@ -2,6 +2,8 @@
 ;
 ; RUN: opt < %s -esan -esan-working-set -esan-instrument-fastpath=false -S | FileCheck %s
 
+; REQUIRES: x86, mips
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Aligned loads:
 
Index: test/Instrumentation/EfficiencySanitizer/working_set_strict.ll
===================================================================
--- test/Instrumentation/EfficiencySanitizer/working_set_strict.ll
+++ test/Instrumentation/EfficiencySanitizer/working_set_strict.ll
@@ -3,6 +3,8 @@
 ;
 ; RUN: opt < %s -esan -esan-working-set -esan-assume-intra-cache-line=0 -S | FileCheck %s
 
+; REQUIRES: x86, mips
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Intra-cache-line