From 5eed4f27694914b24cec59029b57f0d7a25b0c34 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 24 May 2011 17:38:34 +0000 Subject: [PATCH] Always add -mno-XXX for -march=native. 2011-05-24 H.J. Lu PR target/49128 * config/i386/driver-i386.c (host_detect_local_cpu): Always add -mno-XXX. Handle FMA. From-SVN: r174126 --- gcc/ChangeLog | 6 ++++ gcc/config/i386/driver-i386.c | 54 ++++++++++++++--------------------- 2 files changed, 28 insertions(+), 32 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 91e550ae3be..4d4aa0d8562 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2011-05-24 H.J. Lu + + PR target/49128 + * config/i386/driver-i386.c (host_detect_local_cpu): Always + add -mno-XXX. Handle FMA. + 2011-05-24 Vladimir Makarov PR rtl-optimization/48633 diff --git a/gcc/config/i386/driver-i386.c b/gcc/config/i386/driver-i386.c index 35962c802fe..747122b16ec 100644 --- a/gcc/config/i386/driver-i386.c +++ b/gcc/config/i386/driver-i386.c @@ -395,7 +395,7 @@ const char *host_detect_local_cpu (int argc, const char **argv) unsigned int has_movbe = 0, has_sse4_1 = 0, has_sse4_2 = 0; unsigned int has_popcnt = 0, has_aes = 0, has_avx = 0; unsigned int has_pclmul = 0, has_abm = 0, has_lwp = 0; - unsigned int has_fma4 = 0, has_xop = 0; + unsigned int has_fma = 0, has_fma4 = 0, has_xop = 0; unsigned int has_bmi = 0, has_tbm = 0; bool arch; @@ -443,6 +443,7 @@ const char *host_detect_local_cpu (int argc, const char **argv) has_popcnt = ecx & bit_POPCNT; has_aes = ecx & bit_AES; has_pclmul = ecx & bit_PCLMUL; + has_fma = ecx & bit_FMA; has_cmpxchg8b = edx & bit_CMPXCHG8B; has_cmov = edx & bit_CMOV; @@ -681,37 +682,26 @@ 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 *fma = has_fma ? " -mfma" : " -mno-fma"; + 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" : " -mno-msse4.2"; + const char *sse4_1 = has_sse4_1 ? " -msse4.1" : " -mno-sse4.1"; + + options = concat (options, cx16, sahf, movbe, ase, pclmul, + popcnt, abm, lwp, fma, fma4, xop, bmi, tbm, + avx, sse4_2, sse4_1, NULL); } done: -- 2.30.2