diff --git a/legacy/evas/src/lib/engines/common/evas_cpu.c b/legacy/evas/src/lib/engines/common/evas_cpu.c
index f8a3f60456..375eb289a4 100644
--- a/legacy/evas/src/lib/engines/common/evas_cpu.c
+++ b/legacy/evas/src/lib/engines/common/evas_cpu.c
@@ -69,29 +69,19 @@ evas_common_cpu_init(void)
    if (called) return;
    called = 1;
 #ifdef __i386__
-
-   if (evas_common_cpu_feature_test(evas_common_cpu_mmx_test))
-      cpu_feature_mask |= CPU_FEATURE_MMX;
-
-   if (evas_common_cpu_feature_test(evas_common_cpu_sse_test))
-      cpu_feature_mask |= CPU_FEATURE_SSE;
-
+   cpu_feature_mask |= CPU_FEATURE_MMX * 
+     evas_common_cpu_feature_test(evas_common_cpu_mmx_test);
+     evas_common_cpu_feature_test(evas_common_cpu_sse_test);
 #endif /* __i386__ */
-
 #ifdef __POWERPC__
 #ifdef __VEC__
-
-   if (evas_common_cpu_feature_test(evas_common_cpu_altivec_test))
-      cpu_feature_mask |= CPU_FEATURE_ALTIVEC;
-
+   cpu_feature_mask |= CPU_FEATURE_ALTIVEC *
+   evas_common_cpu_feature_test(evas_common_cpu_altivec_test);
 #endif /* __VEC__ */
 #endif /* __POWERPC__ */
-
 #ifdef __SPARC__
-
-   if (evas_common_cpu_feature_test(evas_common_cpu_vis_test))
-      cpu_feature_mask |= CPU_FEATURE_VIS;
-
+   cpu_feature_mask |= CPU_FEATURE_VIS *
+   evas_common_cpu_feature_test(evas_common_cpu_vis_test);
 #endif /* __SPARC__ */
 
    printf("Cpu mask set to %08x\n", cpu_feature_mask);