@@ -681,37 +681,25 @@ const char *host_detect_local_cpu (int argc, const char **argv)
if (arch)
{
- if (has_cmpxchg16b)
- options = concat (options, " -mcx16", NULL);
- if (has_lahf_lm)
- options = concat (options, " -msahf", NULL);
- if (has_movbe)
- options = concat (options, " -mmovbe", NULL);
- if (has_aes)
- options = concat (options, " -maes", NULL);
- if (has_pclmul)
- options = concat (options, " -mpclmul", NULL);
- if (has_popcnt)
- options = concat (options, " -mpopcnt", NULL);
- if (has_abm)
- options = concat (options, " -mabm", NULL);
- if (has_lwp)
- options = concat (options, " -mlwp", NULL);
- if (has_fma4)
- options = concat (options, " -mfma4", NULL);
- if (has_xop)
- options = concat (options, " -mxop", NULL);
- if (has_bmi)
- options = concat (options, " -mbmi", NULL);
- if (has_tbm)
- options = concat (options, " -mtbm", NULL);
-
- if (has_avx)
- options = concat (options, " -mavx", NULL);
- else if (has_sse4_2)
- options = concat (options, " -msse4.2", NULL);
- else if (has_sse4_1)
- options = concat (options, " -msse4.1", NULL);
+ const char *cx16 = has_cmpxchg16b ? " -mcx16" : " -mno-cx16";
+ const char *sahf = has_lahf_lm ? " -msahf" : " -mno-sahf";
+ const char *movbe = has_movbe ? " -mmovbe" : " -mno-movbe";
+ const char *ase = has_aes ? " -maes" : " -mno-aes";
+ const char *pclmul = has_pclmul ? " -mpclmul" : " -mno-pclmul";
+ const char *popcnt = has_popcnt ? " -mpopcnt" : " -mno-popcnt";
+ const char *abm = has_abm ? " -mabm" : " -mno-abm";
+ const char *lwp = has_lwp ? " -mlwp" : " -mno-lwp";
+ const char *fma4 = has_fma4 ? " -mfma4" : " -mno-fma4";
+ const char *xop = has_xop ? " -mxop" : " -mno-xop";
+ const char *bmi = has_bmi ? " -mbmi" : " -mno-bmi";
+ const char *tbm = has_tbm ? " -mtbm" : " -mno-tbm";
+ const char *avx = has_avx ? " -mavx" : " -mno-avx";
+ const char *sse4_2 = has_sse4_2 ? " -msse4.2" : " -msse4.2";
+ const char *sse4_1 = has_sse4_1 ? " -msse4.1" : " -msse4.1";
+
+ options = concat (options, cx16, sahf, movbe, ase, pclmul,
+ popcnt, abm, lwp, fma4, xop, bmi, tbm, avx,
+ sse4_2, sse4_1, NULL);
}
done: