consolidate special compiler options

Signed-off-by: Stephan Mueller <[email protected]>
smuellerDD · Feb 2, 2024 · 7b45cd4 · 7b45cd4
1 parent 266f5e2
commit 7b45cd4
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 85 deletions.
diff --git a/aead/src/meson.build b/aead/src/meson.build
@@ -10,11 +10,7 @@ if get_option('hash_crypt').enabled()
 			'leancrypto_aead_avx2_lib',
 			[ 'cshake_crypt.c',
 			  'kmac_crypt.c' ],
-			c_args: [
-				'-mavx2',
-				'-mbmi2',
-				'-mpopcnt',
-			],
+			c_args: cc_avx2_args,
 			include_directories: [ include_dirs,
 					       include_internal_dirs ],
 		)
@@ -26,10 +22,7 @@ if get_option('hash_crypt').enabled()
 			'leancrypto_aead_neon_armv8_lib',
 			[ 'cshake_crypt.c',
 			  'kmac_crypt.c' ],
-			c_args: [
-				'-march=armv8-a+simd',
-				'-Wno-unused-result',
-			],
+			c_args: cc_armv8_neon_simd_args,
 			include_directories: [ include_dirs,
 					       include_internal_dirs ],
 		)
@@ -41,12 +34,7 @@ if get_option('hash_crypt').enabled()
 			'leancrypto_aead_neon_armv7_lib',
 			[ 'cshake_crypt.c',
 			  'kmac_crypt.c' ],
-			c_args: [
-				'-mfpu=neon-vfpv4',
-				'-mthumb',
-				'-march=armv7-a+vfpv4',
-				'-funsafe-math-optimizations'
-			],
+			c_args: cc_armv7_neon_simd_args,
 			include_directories: [ include_dirs,
 					       include_internal_dirs ],
 		)

diff --git a/curve25519/src/avx/meson.build b/curve25519/src/avx/meson.build
@@ -14,11 +14,7 @@ leancrypto_curve25519_avx_lib = static_library(
 			'../',
 			include_internal_dirs
 		],
-		c_args: [
-			'-mavx2',
-			'-mpopcnt',
-			'-Wno-unused-command-line-argument'
-		]
+		c_args: cc_avx2_args
 	)
 
 leancrypto_support_libs += leancrypto_curve25519_avx_lib
diff --git a/hash/src/meson.build b/hash/src/meson.build
@@ -31,11 +31,7 @@ if get_option('sha3').enabled()
 			'leancrypto_keccak_avx2_4x_lib',
 			[ 'shake_4x_avx2.c',
 			  'asm/AVX2_4x/KeccakP-1600-times4-SIMD256.c' ],
-			c_args: [
-				'-mavx2',
-				'-mbmi2',
-				'-mpopcnt',
-			],
+			c_args: cc_avx2_args,
 			include_directories: [ include_dirs,
 					       include_internal_dirs ],
 		)
@@ -52,12 +48,7 @@ if get_option('sha3').enabled()
 			'leancrypto_keccak_arm7a_neon_lib',
 			[ 'sha3_arm_neon.c',
 			  'asm/ARMv7A-NEON/KeccakP-1600-armv7a-le-neon-gcc.S' ],
-			c_args: [
-				'-mfpu=neon-vfpv4',
-				'-mthumb',
-				'-march=armv7-a+vfpv4',
-				'-funsafe-math-optimizations'
-			],
+			c_args: cc_armv7_neon_simd_args,
 			include_directories: [
 				include_directories(['asm/ARMv7A-NEON/']),
 				include_dirs,
@@ -71,10 +62,7 @@ if get_option('sha3').enabled()
 			'leancrypto_keccak_arm8a_neon_lib',
 			[ 'sha3_arm_neon.c',
 			  'asm/ARMv8A/KeccakP-1600-armv8a-neon.S' ],
-			c_args: [
-				'-march=armv8-a+simd',
-				'-funsafe-math-optimizations'
-			],
+			c_args: cc_armv8_neon_simd_args,
 			include_directories: [
 				include_directories(['asm/ARMv8A/']),
 				include_dirs,
@@ -94,10 +82,7 @@ if get_option('sha3').enabled()
 		leancrypto_keccak_armv8_2x_ce_lib = static_library(
 			'leancrypto_keccak_armv8_2x_ce_lib',
 			[ 'asm/ARMv8_2x/keccakx2_armce.S' ],
-			c_args: [
-				'-march=armv8-a+crypto',
-				'-Wno-unused-result',
-			],
+			c_args: cc_armv8_neon_simd_args,
 			include_directories: [ include_dirs,
 					       include_internal_dirs ],
 		)
@@ -107,10 +92,7 @@ if get_option('sha3').enabled()
 		leancrypto_keccak_armv8_2x_c_lib = static_library(
 			'leancrypto_keccak_armv8_2x_c_lib',
 			[ 'shake_2x_armv8.c' ],
-			c_args: [
-				'-march=armv8-a+simd',
-				'-Wno-unused-result',
-			],
+			c_args: cc_armv8_neon_simd_args,
 			include_directories: [ include_dirs,
 					       include_internal_dirs ],
 		)

diff --git a/internal/src/meson.build b/internal/src/meson.build
@@ -22,10 +22,7 @@ if (x86_64_asm)
 			include_dirs,
 			include_internal_dirs
 		],
-		c_args: [
-			'-mavx2',
-			'-Wno-unused-command-line-argument'
-		]
+		c_args: cc_avx2_args
 	)
 	leancrypto_support_libs += leancrypto_memcmp_secure_avx2_lib
 else

diff --git a/kem/src/armv7/meson.build b/kem/src/armv7/meson.build
@@ -15,12 +15,7 @@ leancrypto_kyber_armv7_lib = static_library(
 			include_dirs,
 			include_internal_dirs
 		],
-# 		c_args: [
-# 			'-mfpu=neon-vfpv4',
-# 			'-mthumb',
-# 			'-march=armv7-a+vfpv4',
-# 			'-funsafe-math-optimizations'
-# 		],
+# 		c_args: cc_armv7_neon_simd_args,
 	)
 
 leancrypto_support_libs += leancrypto_kyber_armv7_lib
diff --git a/kem/src/avx2/meson.build b/kem/src/avx2/meson.build
@@ -23,11 +23,6 @@ leancrypto_kyber_avx2_lib = static_library(
 			include_dirs,
 			include_internal_dirs
 		],
-		c_args: [
-			'-mavx2',
-			'-mbmi2',
-			'-mpopcnt',
-			'-Wno-unused-command-line-argument'
-		]
+		c_args: cc_avx2_args
 	)
 leancrypto_support_libs += leancrypto_kyber_avx2_lib
diff --git a/meson.build b/meson.build
@@ -259,6 +259,13 @@ if (host_machine.cpu_family() == 'x86_64' and
 	# 64 bit AVX2 / AVX512 support
 	x86_64_asm = true
 	add_global_arguments([ '-DLC_HOST_X86_64' ], language: 'c')
+
+	cc_avx2_args = [
+		'-mavx2',
+		'-mbmi2',
+		'-mpopcnt',
+		'-Wno-unused-command-line-argument'
+	]
 endif
 
 if (host_machine.cpu_family() == 'arm' and
@@ -269,11 +276,23 @@ if (host_machine.cpu_family() == 'arm' and
 
 	add_global_arguments([ '-DLC_HOST_ARM32_NEON' ], language: 'c')
 
+	cc_armv7_neon_simd_args = [
+		'-mfpu=neon-vfpv4',
+		'-mthumb',
+		'-march=armv7-a+vfpv4',
+		'-funsafe-math-optimizations'
+	]
+
 elif (host_machine.cpu_family() == 'aarch64')
 
 	arm64_asm = true
 	add_global_arguments([ '-DLC_HOST_AARCH64' ], language: 'c')
 
+	cc_armv8_neon_simd_args = [
+		'-march=armv8-a+simd',
+		'-Wno-unused-result',
+	]
+
 	if (cc.get_id() == 'gcc')
 
 		# 64 bit ARM processor and GCC

diff --git a/signature/src/armv7/meson.build b/signature/src/armv7/meson.build
@@ -17,12 +17,7 @@ leancrypto_dilithium_armv7_lib = static_library(
 			include_dirs,
 			include_internal_dirs
 		],
-# 		c_args: [
-# 			'-mfpu=neon-vfpv4',
-# 			'-mthumb',
-# 			'-march=armv7-a+vfpv4',
-# 			'-funsafe-math-optimizations'
-# 		],
+# 		c_args: cc_armv7_neon_simd_args,
 	)
 
 leancrypto_support_libs += leancrypto_dilithium_armv7_lib
diff --git a/signature/src/avx2/meson.build b/signature/src/avx2/meson.build
@@ -22,11 +22,7 @@ leancrypto_dilithium_avx2_lib = static_library(
 			include_dirs,
 			include_internal_dirs
 		],
-		c_args: [
-			'-mavx2',
-			'-mpopcnt',
-			'-Wno-unused-command-line-argument'
-		]
+		c_args: cc_avx2_args
 	)
 
 #-Wl,--whole-archive kem/src/avx2/libleancrypto_kyber_avx2_lib.a -Wl,--no-whole-archive

diff --git a/sym/src/meson.build b/sym/src/meson.build
@@ -13,11 +13,7 @@ if get_option('chacha20').enabled()
 		leancrypto_chacha20_avx2_lib = static_library(
 			'leancrypto_chacha20_avx2_lib',
 			[ 'chacha20.c' ],
-			c_args: [
-				'-mavx2',
-				'-mbmi2',
-				'-mpopcnt',
-			],
+			c_args: cc_avx2_args,
 			include_directories: [ include_dirs,
 					       include_internal_dirs ],
 		)
@@ -28,10 +24,7 @@ if get_option('chacha20').enabled()
 		leancrypto_chacha20_neon_armv8_lib = static_library(
 			'leancrypto_chacha20_neon_armv8_lib',
 			[ 'chacha20.c' ],
-			c_args: [
-				'-march=armv8-a+simd',
-				'-Wno-unused-result',
-			],
+			c_args: cc_armv8_neon_simd_args,
 			include_directories: [ include_dirs,
 					       include_internal_dirs ],
 		)
@@ -42,12 +35,7 @@ if get_option('chacha20').enabled()
 		leancrypto_chacha20_neon_armv7_lib = static_library(
 			'leancrypto_chacha20_neon_armv7_lib',
 			[ 'chacha20.c' ],
-			c_args: [
-				'-mfpu=neon-vfpv4',
-				'-mthumb',
-				'-march=armv7-a+vfpv4',
-				'-funsafe-math-optimizations'
-			],
+			c_args: cc_armv7_neon_simd_args,
 			include_directories: [ include_dirs,
 					       include_internal_dirs ],
 		)