svn commit: r486508 - head/www/chromium/files
Emmanuel Vadot
manu at FreeBSD.org
Mon Dec 3 10:05:33 UTC 2018
Author: manu
Date: Mon Dec 3 10:05:32 2018
New Revision: 486508
URL: https://svnweb.freebsd.org/changeset/ports/486508
Log:
www/chromium: Really unbreak on arm64
r486198 didn't include the correct patch for boringssl.
Fix this.
Pointy Hat: manu
Tested On: Pinebook
Approved by: bapt (mentor, implicit)
Modified:
head/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c
Modified: head/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c
==============================================================================
--- head/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c Mon Dec 3 09:38:25 2018 (r486507)
+++ head/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c Mon Dec 3 10:05:32 2018 (r486508)
@@ -1,11 +1,54 @@
---- third_party/boringssl/src/crypto/cpu-aarch64-linux.c.orig 2018-09-11 22:58:51 UTC
-+++ third_party/boringssl/src/crypto/cpu-aarch64-linux.c
-@@ -60,3 +60,8 @@ void OPENSSL_cpuid_setup(void) {
- }
+--- third_party/boringssl/src/crypto/cpu-aarch64-linux.c.orig 2018-08-08 21:13:09.000000000 +0200
++++ third_party/boringssl/src/crypto/cpu-aarch64-linux.c 2018-12-02 10:28:41.672362000 +0100
+@@ -14,49 +14,7 @@
- #endif // OPENSSL_AARCH64 && !OPENSSL_STATIC_ARMCAP
-+
+ #include <openssl/cpu.h>
+
+-#if defined(OPENSSL_AARCH64) && defined(OPENSSL_LINUX) && \
+- !defined(OPENSSL_STATIC_ARMCAP)
+-
+-#include <sys/auxv.h>
+-
+-#include <openssl/arm_arch.h>
+-
+-#include "internal.h"
+-
+-
+-extern uint32_t OPENSSL_armcap_P;
+-
+#ifdef __FreeBSD__
-+void OPENSSL_cpuid_setup(void) {
-+}
+ void OPENSSL_cpuid_setup(void) {
+- unsigned long hwcap = getauxval(AT_HWCAP);
+-
+- // See /usr/include/asm/hwcap.h on an aarch64 installation for the source of
+- // these values.
+- static const unsigned long kNEON = 1 << 1;
+- static const unsigned long kAES = 1 << 3;
+- static const unsigned long kPMULL = 1 << 4;
+- static const unsigned long kSHA1 = 1 << 5;
+- static const unsigned long kSHA256 = 1 << 6;
+-
+- if ((hwcap & kNEON) == 0) {
+- // Matching OpenSSL, if NEON is missing, don't report other features
+- // either.
+- return;
+- }
+-
+- OPENSSL_armcap_P |= ARMV7_NEON;
+-
+- if (hwcap & kAES) {
+- OPENSSL_armcap_P |= ARMV8_AES;
+- }
+- if (hwcap & kPMULL) {
+- OPENSSL_armcap_P |= ARMV8_PMULL;
+- }
+- if (hwcap & kSHA1) {
+- OPENSSL_armcap_P |= ARMV8_SHA1;
+- }
+- if (hwcap & kSHA256) {
+- OPENSSL_armcap_P |= ARMV8_SHA256;
+- }
+ }
+-
+-#endif // OPENSSL_AARCH64 && !OPENSSL_STATIC_ARMCAP
+#endif
More information about the svn-ports-all
mailing list