X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=config%2Fx86%2Fmeson.build;h=8b0fa3e6f135640da59bd17957626f3f2c6a97a6;hb=cba806e07d6f7e6cfa9749346f2dc75288f984f7;hp=0a7bed75e2d69da31d89bc319ffcd95e30929b6d;hpb=e19c6de3f2f12d0f49bdf9e787b3f43612c1df3c;p=dpdk.git

diff --git a/config/x86/meson.build b/config/x86/meson.build
index 0a7bed75e2..8b0fa3e6f1 100644
--- a/config/x86/meson.build
+++ b/config/x86/meson.build
@@ -4,11 +4,9 @@
 # get binutils version for the workaround of Bug 97
 if not is_windows
 	ldver = run_command('ld', '-v').stdout().strip()
-	if ldver.contains('2.30')
-		if cc.has_argument('-mno-avx512f')
-			machine_args += '-mno-avx512f'
-			message('Binutils 2.30 detected, disabling AVX512 support as workaround for bug #97')
-		endif
+	if ldver.contains('2.30') and cc.has_argument('-mno-avx512f')
+		machine_args += '-mno-avx512f'
+		message('Binutils 2.30 detected, disabling AVX512 support as workaround for bug #97')
 	endif
 	if ldver.contains('2.31') and cc.has_argument('-mno-avx512f')
 		machine_args += '-mno-avx512f'
@@ -30,6 +28,22 @@ foreach f:base_flags
 	compile_time_cpuflags += ['RTE_CPUFLAG_' + f]
 endforeach
 
+optional_flags = ['AES', 'PCLMUL',
+		'AVX', 'AVX2', 'AVX512F',
+		'RDRND', 'RDSEED']
+foreach f:optional_flags
+	if cc.get_define('__@0@__'.format(f), args: machine_args) == '1'
+		if f == 'PCLMUL' # special case flags with different defines
+			f = 'PCLMULQDQ'
+		elif f == 'RDRND'
+			f = 'RDRAND'
+		endif
+		dpdk_conf.set('RTE_MACHINE_CPUFLAG_' + f, 1)
+		compile_time_cpuflags += ['RTE_CPUFLAG_' + f]
+	endif
+endforeach
+
+
 dpdk_conf.set('RTE_ARCH_X86', 1)
 if dpdk_conf.get('RTE_ARCH_64')
 	dpdk_conf.set('RTE_ARCH_X86_64', 1)
@@ -39,25 +53,4 @@ else
 	dpdk_conf.set('RTE_ARCH', 'i686')
 endif
 
-if cc.get_define('__AES__', args: machine_args) != ''
-	dpdk_conf.set('RTE_MACHINE_CPUFLAG_AES', 1)
-	compile_time_cpuflags += ['RTE_CPUFLAG_AES']
-endif
-if cc.get_define('__PCLMUL__', args: machine_args) != ''
-	dpdk_conf.set('RTE_MACHINE_CPUFLAG_PCLMULQDQ', 1)
-	compile_time_cpuflags += ['RTE_CPUFLAG_PCLMULQDQ']
-endif
-if cc.get_define('__AVX__', args: machine_args) != ''
-	dpdk_conf.set('RTE_MACHINE_CPUFLAG_AVX', 1)
-	compile_time_cpuflags += ['RTE_CPUFLAG_AVX']
-endif
-if cc.get_define('__AVX2__', args: machine_args) != ''
-	dpdk_conf.set('RTE_MACHINE_CPUFLAG_AVX2', 1)
-	compile_time_cpuflags += ['RTE_CPUFLAG_AVX2']
-endif
-if cc.get_define('__AVX512F__', args: machine_args) != ''
-	dpdk_conf.set('RTE_MACHINE_CPUFLAG_AVX512F', 1)
-	compile_time_cpuflags += ['RTE_CPUFLAG_AVX512F']
-endif
-
 dpdk_conf.set('RTE_CACHE_LINE_SIZE', 64)