Avoid arm_acle.h header guard in feature tests (GH #950)

11 files changed, 11 insertions, 70 deletions

diff --git a/TestPrograms/test_arm_acle.cxx b/TestPrograms/test_arm_acle.cxx
index 63073be3..ea3d04b9 100644
--- a/TestPrograms/test_arm_acle.cxx
+++ b/TestPrograms/test_arm_acle.cxx
@@ -1,4 +1,5 @@
 #include <arm_acle.h>

+

 int main(int argc, char* argv[])

 {

 	return 0;

diff --git a/TestPrograms/test_arm_aes.cxx b/TestPrograms/test_arm_aes.cxx
index a64294db..e41ce865 100644
--- a/TestPrograms/test_arm_aes.cxx
+++ b/TestPrograms/test_arm_aes.cxx
@@ -1,13 +1,7 @@
 #include <arm_neon.h>

+#include <arm_acle.h>

 #include <stdint.h>

 

-// test_acle.h determines if this is available. Then,

-// -DCRYPTOPP_ARM_ACLE_HEADER=0 is added to CXXFLAGS

-// if the ACLE header is not available.

-#if (CRYPTOPP_ARM_ACLE_HEADER)

-#  include <arm_acle.h>

-#endif

-

 int main(int argc, char* argv[])

 {

 	uint8x16_t x={0};

diff --git a/TestPrograms/test_arm_asimd.cxx b/TestPrograms/test_arm_asimd.cxx
index 1f9d670f..2a150e10 100644
--- a/TestPrograms/test_arm_asimd.cxx
+++ b/TestPrograms/test_arm_asimd.cxx
@@ -1,13 +1,7 @@
 #include <arm_neon.h>

+#include <arm_acle.h>

 #include <stdint.h>

 

-// test_acle.h determines if this is available. Then,

-// -DCRYPTOPP_ARM_ACLE_HEADER=0 is added to CXXFLAGS

-// if the ACLE header is not available.

-#if (CRYPTOPP_ARM_ACLE_HEADER)

-#  include <arm_acle.h>

-#endif

-

 int main(int argc, char* argv[])

 {

 	uint32x4_t x={0};

diff --git a/TestPrograms/test_arm_crc.cxx b/TestPrograms/test_arm_crc.cxx
index 205f5b5c..e1d797ef 100644
--- a/TestPrograms/test_arm_crc.cxx
+++ b/TestPrograms/test_arm_crc.cxx
@@ -1,13 +1,7 @@
 #include <arm_neon.h>

+#include <arm_acle.h>

 #include <stdint.h>

 

-// test_acle.h determines if this is available. Then,

-// -DCRYPTOPP_ARM_ACLE_HEADER=0 is added to CXXFLAGS

-// if the ACLE header is not available.

-#if (CRYPTOPP_ARM_ACLE_HEADER)

-#  include <arm_acle.h>

-#endif

-

 int main(int argc, char* argv[])

 {

 	uint32_t w=0xffffffff;

diff --git a/TestPrograms/test_arm_pmull.cxx b/TestPrograms/test_arm_pmull.cxx
index fee6f1ba..3c219cb4 100644
--- a/TestPrograms/test_arm_pmull.cxx
+++ b/TestPrograms/test_arm_pmull.cxx
@@ -1,13 +1,7 @@
 #include <arm_neon.h>

+#include <arm_acle.h>

 #include <stdint.h>

 

-// test_acle.h determines if this is available. Then,

-// -DCRYPTOPP_ARM_ACLE_HEADER=0 is added to CXXFLAGS

-// if the ACLE header is not available.

-#if (CRYPTOPP_ARM_ACLE_HEADER)

-#  include <arm_acle.h>

-#endif

-

 int main(int argc, char* argv[])

 {

 	const poly64_t   a=0x60606060, b=0x90909090, c=0xb0b0b0b0;

diff --git a/TestPrograms/test_arm_sha1.cxx b/TestPrograms/test_arm_sha1.cxx
index fb395642..a8e1765c 100644
--- a/TestPrograms/test_arm_sha1.cxx
+++ b/TestPrograms/test_arm_sha1.cxx
@@ -1,13 +1,7 @@
 #include <arm_neon.h>

+#include <arm_acle.h>

 #include <stdint.h>

 

-// test_acle.h determines if this is available. Then,

-// -DCRYPTOPP_ARM_ACLE_HEADER=0 is added to CXXFLAGS

-// if the ACLE header is not available.

-#if (CRYPTOPP_ARM_ACLE_HEADER)

-#  include <arm_acle.h>

-#endif

-

 int main(int argc, char* argv[])

 {

 	uint32x4_t y = {0};

diff --git a/TestPrograms/test_arm_sha256.cxx b/TestPrograms/test_arm_sha256.cxx
index b98c10b6..50704dd1 100644
--- a/TestPrograms/test_arm_sha256.cxx
+++ b/TestPrograms/test_arm_sha256.cxx
@@ -1,13 +1,7 @@
 #include <arm_neon.h>

+#include <arm_acle.h>

 #include <stdint.h>

 

-// test_acle.h determines if this is available. Then,

-// -DCRYPTOPP_ARM_ACLE_HEADER=0 is added to CXXFLAGS

-// if the ACLE header is not available.

-#if (CRYPTOPP_ARM_ACLE_HEADER)

-#  include <arm_acle.h>

-#endif

-

 int main(int argc, char* argv[])

 {

 	uint32x4_t y = {0};

diff --git a/TestPrograms/test_arm_sha3.cxx b/TestPrograms/test_arm_sha3.cxx
index ad6cb97c..e2940142 100644
--- a/TestPrograms/test_arm_sha3.cxx
+++ b/TestPrograms/test_arm_sha3.cxx
@@ -1,13 +1,7 @@
 #include <arm_neon.h>

+#include <arm_acle.h>

 #include <stdint.h>

 

-// test_acle.h determines if this is available. Then,

-// -DCRYPTOPP_ARM_ACLE_HEADER=0 is added to CXXFLAGS

-// if the ACLE header is not available.

-#if (CRYPTOPP_ARM_ACLE_HEADER)

-#  include <arm_acle.h>

-#endif

-

 int main(int argc, char* argv[])

 {

 	// SM4 block cipher

diff --git a/TestPrograms/test_arm_sha512.cxx b/TestPrograms/test_arm_sha512.cxx
index ad6cb97c..e2940142 100644
--- a/TestPrograms/test_arm_sha512.cxx
+++ b/TestPrograms/test_arm_sha512.cxx
@@ -1,13 +1,7 @@
 #include <arm_neon.h>

+#include <arm_acle.h>

 #include <stdint.h>

 

-// test_acle.h determines if this is available. Then,

-// -DCRYPTOPP_ARM_ACLE_HEADER=0 is added to CXXFLAGS

-// if the ACLE header is not available.

-#if (CRYPTOPP_ARM_ACLE_HEADER)

-#  include <arm_acle.h>

-#endif

-

 int main(int argc, char* argv[])

 {

 	// SM4 block cipher

diff --git a/TestPrograms/test_arm_sm3.cxx b/TestPrograms/test_arm_sm3.cxx
index 9fdbc58b..b62b2ba2 100644
--- a/TestPrograms/test_arm_sm3.cxx
+++ b/TestPrograms/test_arm_sm3.cxx
@@ -1,13 +1,7 @@
 #include <arm_neon.h>

+#include <arm_acle.h>

 #include <stdint.h>

 

-// test_acle.h determines if this is available. Then,

-// -DCRYPTOPP_ARM_ACLE_HEADER=0 is added to CXXFLAGS

-// if the ACLE header is not available.

-#if (CRYPTOPP_ARM_ACLE_HEADER)

-#  include <arm_acle.h>

-#endif

-

 int main(int argc, char* argv[])

 {

 	// SM3 hash

diff --git a/TestPrograms/test_arm_sm4.cxx b/TestPrograms/test_arm_sm4.cxx
index eb5466bf..349b11a7 100644
--- a/TestPrograms/test_arm_sm4.cxx
+++ b/TestPrograms/test_arm_sm4.cxx
@@ -1,13 +1,7 @@
 #include <arm_neon.h>

+#include <arm_acle.h>

 #include <stdint.h>

 

-// test_acle.h determines if this is available. Then,

-// -DCRYPTOPP_ARM_ACLE_HEADER=0 is added to CXXFLAGS

-// if the ACLE header is not available.

-#if (CRYPTOPP_ARM_ACLE_HEADER)

-#  include <arm_acle.h>

-#endif

-

 int main(int argc, char* argv[])

 {

 	// SM4 block cipher