[rtems-libbsd commit] openssl: Workaround for ARM-specific files

Sebastian Huber sebh at rtems.org
Wed Aug 23 08:55:14 UTC 2017


Module:    rtems-libbsd
Branch:    master
Commit:    885ac75710f810ea766491304b2c511816c26479
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=885ac75710f810ea766491304b2c511816c26479

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Wed Aug 23 10:54:04 2017 +0200

openssl: Workaround for ARM-specific files

Update #3110.

---

 freebsd/crypto/openssl/crypto/arm_arch.h | 2 ++
 freebsd/crypto/openssl/crypto/armcap.c   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/freebsd/crypto/openssl/crypto/arm_arch.h b/freebsd/crypto/openssl/crypto/arm_arch.h
index 9d6e588..b84bfc4 100644
--- a/freebsd/crypto/openssl/crypto/arm_arch.h
+++ b/freebsd/crypto/openssl/crypto/arm_arch.h
@@ -1,6 +1,7 @@
 #ifndef __ARM_ARCH_H__
 # define __ARM_ARCH_H__
 
+#if defined(__rtems__) && defined(__arm__)
 # if !defined(__ARM_ARCH__)
 #  if defined(__CC_ARM)
 #   define __ARM_ARCH__ __TARGET_ARCH_ARM
@@ -75,4 +76,5 @@ extern unsigned int OPENSSL_armcap_P;
 # define ARMV8_SHA256    (1<<4)
 # define ARMV8_PMULL     (1<<5)
 
+#endif /* __rtems__ */
 #endif
diff --git a/freebsd/crypto/openssl/crypto/armcap.c b/freebsd/crypto/openssl/crypto/armcap.c
index 05f3749..824d5ee 100644
--- a/freebsd/crypto/openssl/crypto/armcap.c
+++ b/freebsd/crypto/openssl/crypto/armcap.c
@@ -9,6 +9,7 @@
 
 #include "arm_arch.h"
 
+#if defined(__rtems__) && defined(__arm__)
 unsigned int OPENSSL_armcap_P = 0;
 
 #if __ARM_MAX_ARCH__<7
@@ -164,3 +165,4 @@ void OPENSSL_cpuid_setup(void)
     sigprocmask(SIG_SETMASK, &oset, NULL);
 }
 #endif
+#endif /* __rtems__ */



More information about the vc mailing list