diff --git a/src/librustc_platform_intrinsics/x86.rs b/src/librustc_platform_intrinsics/x86.rs
index 6fda7f18e3e..bc4428d2cb5 100644
--- a/src/librustc_platform_intrinsics/x86.rs
+++ b/src/librustc_platform_intrinsics/x86.rs
@@ -18,48 +18,46 @@ macro_rules! p {
 }
 
 pub fn find<'tcx>(_tcx: &ty::ctxt<'tcx>, name: &str) -> Option<Intrinsic> {
-    Some(match name {
-        "mm_movemask_ps" => p!("sse.movmsk.ps", (f32x4) -> i32),
-        "mm_movemask_pd" => p!("sse2.movmsk.pd", (f64x2) -> i32),
-        "mm_movemask_epi8" => p!("sse2.pmovmskb.128", (i8x16) -> i32),
+    if !name.starts_with("mm_") { return None }
 
-        "mm_rsqrt_ps" => p!("sse.rsqrt.ps", (f32x4) -> f32x4),
-        "mm_rcp_ps" => p!("sse.rcp.ps", (f32x4) -> f32x4),
+    Some(match &name["mm_".len()..] {
+        "sqrt_ps" => plain!("llvm.sqrt.v4f32", (f32x4) -> f32x4),
+        "sqrt_pd" => plain!("llvm.sqrt.v2f64", (f64x2) -> f64x2),
 
-        "mm_sqrt_ps" => plain!("llvm.sqrt.v4f32", (f32x4) -> f32x4),
-        "mm_sqrt_pd" => plain!("llvm.sqrt.v2f64", (f64x2) -> f64x2),
+        "movemask_ps" => p!("sse.movmsk.ps", (f32x4) -> i32),
+        "max_ps" => p!("sse.max.ps", (f32x4, f32x4) -> f32x4),
+        "min_ps" => p!("sse.min.ps", (f32x4, f32x4) -> f32x4),
+        "rsqrt_ps" => p!("sse.rsqrt.ps", (f32x4) -> f32x4),
+        "rcp_ps" => p!("sse.rcp.ps", (f32x4) -> f32x4),
 
-        "mm_max_ps" => p!("sse.max.ps", (f32x4, f32x4) -> f32x4),
-        "mm_max_pd" => p!("sse2.max.pd", (f64x2, f64x2) -> f64x2),
-
-        "mm_min_ps" => p!("sse.min.ps", (f32x4, f32x4) -> f32x4),
-        "mm_min_pd" => p!("sse2.min.pd", (f64x2, f64x2) -> f64x2),
-
-        "mm_shuffle_epi8" => p!("ssse3.pshuf.b.128", (i8x16, i8x16) -> i8x16),
-
-        "mm_adds_epi16" => p!("sse2.padds.w", (i16x8, i16x8) -> i16x8),
-        "mm_adds_epi8" => p!("sse2.padds.b", (i8x16, i8x16) -> i8x16),
-        "mm_adds_epu16" => p!("sse2.paddus.w", (i16x8, i16x8) -> i16x8),
-        "mm_adds_epu8" => p!("sse2.paddus.b", (i8x16, i8x16) -> i8x16),
-        "mm_avg_epu16" => p!("sse2.pavg.w", (i16x8, i16x8) -> i16x8),
-        "mm_avg_epu8" => p!("sse2.pavg.b", (i8x16, i8x16) -> i8x16),
-        "mm_madd_epi16" => p!("sse2.pmadd.wd", (i16x8, i16x8) -> i32x4),
-        "mm_max_epi16" => p!("sse2.pmaxs.w", (i16x8, i16x8) -> i16x8),
-        "mm_max_epu8" => p!("sse2.pmaxu.b", (i8x16, i8x16) -> i8x16),
-        "mm_min_epi16" => p!("sse2.pmins.w", (i16x8, i16x8) -> i16x8),
-        "mm_min_epu8" => p!("sse2.pminu.b", (i8x16, i8x16) -> i8x16),
-        "mm_mul_epu32" => p!("sse2.pmulu.dq", (i32x4, i32x4) -> i64x2),
-        "mm_mulhi_epi16" => p!("sse2.pmulh.w", (i8x16, i8x16) -> i8x16),
-        "mm_mulhi_epu16" => p!("sse2.pmulhu.w", (i8x16, i8x16) -> i8x16),
-        "mm_packs_epi16" => p!("sse2.packsswb.128", (i16x8, i16x8) -> i8x16),
-        "mm_packs_epi32" => p!("sse2.packssdw.128", (i32x4, i32x4) -> i16x8),
-        "mm_packus_epi16" => p!("sse2.packuswb.128", (i16x8, i16x8) -> i8x16),
-        "mm_sad_epu8" => p!("sse2.psad.bw", (i8x16, i8x16) -> i64x2),
-        "mm_subs_epi16" => p!("sse2.psubs.w", (i16x8, i16x8) -> i16x8),
-        "mm_subs_epi8" => p!("sse2.psubs.b", (i8x16, i8x16) -> i8x16),
-        "mm_subs_epu16" => p!("sse2.psubus.w", (i16x8, i16x8) -> i16x8),
-        "mm_subs_epu8" => p!("sse2.psubus.b", (i8x16, i8x16) -> i8x16),
+        "adds_epi16" => p!("sse2.padds.w", (i16x8, i16x8) -> i16x8),
+        "adds_epi8" => p!("sse2.padds.b", (i8x16, i8x16) -> i8x16),
+        "adds_epu16" => p!("sse2.paddus.w", (i16x8, i16x8) -> i16x8),
+        "adds_epu8" => p!("sse2.paddus.b", (i8x16, i8x16) -> i8x16),
+        "avg_epu16" => p!("sse2.pavg.w", (i16x8, i16x8) -> i16x8),
+        "avg_epu8" => p!("sse2.pavg.b", (i8x16, i8x16) -> i8x16),
+        "madd_epi16" => p!("sse2.pmadd.wd", (i16x8, i16x8) -> i32x4),
+        "max_epi16" => p!("sse2.pmaxs.w", (i16x8, i16x8) -> i16x8),
+        "max_epu8" => p!("sse2.pmaxu.b", (i8x16, i8x16) -> i8x16),
+        "max_pd" => p!("sse2.max.pd", (f64x2, f64x2) -> f64x2),
+        "min_epi16" => p!("sse2.pmins.w", (i16x8, i16x8) -> i16x8),
+        "min_epu8" => p!("sse2.pminu.b", (i8x16, i8x16) -> i8x16),
+        "min_pd" => p!("sse2.min.pd", (f64x2, f64x2) -> f64x2),
+        "movemask_pd" => p!("sse2.movmsk.pd", (f64x2) -> i32),
+        "movemask_epi8" => p!("sse2.pmovmskb.128", (i8x16) -> i32),
+        "mul_epu32" => p!("sse2.pmulu.dq", (i32x4, i32x4) -> i64x2),
+        "mulhi_epi16" => p!("sse2.pmulh.w", (i8x16, i8x16) -> i8x16),
+        "mulhi_epu16" => p!("sse2.pmulhu.w", (i8x16, i8x16) -> i8x16),
+        "packs_epi16" => p!("sse2.packsswb.128", (i16x8, i16x8) -> i8x16),
+        "packs_epi32" => p!("sse2.packssdw.128", (i32x4, i32x4) -> i16x8),
+        "packus_epi16" => p!("sse2.packuswb.128", (i16x8, i16x8) -> i8x16),
+        "sad_epu8" => p!("sse2.psad.bw", (i8x16, i8x16) -> i64x2),
+        "subs_epi16" => p!("sse2.psubs.w", (i16x8, i16x8) -> i16x8),
+        "subs_epi8" => p!("sse2.psubs.b", (i8x16, i8x16) -> i8x16),
+        "subs_epu16" => p!("sse2.psubus.w", (i16x8, i16x8) -> i16x8),
+        "subs_epu8" => p!("sse2.psubus.b", (i8x16, i8x16) -> i8x16),
 
+        "shuffle_epi8" => p!("ssse3.pshuf.b.128", (i8x16, i8x16) -> i8x16),
         _ => return None
     })
 }