From owner-svn-ports-all@freebsd.org Mon Dec 3 10:05:33 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 760C013226FF; Mon, 3 Dec 2018 10:05:33 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 19E367B102; Mon, 3 Dec 2018 10:05:33 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EA585146EE; Mon, 3 Dec 2018 10:05:32 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wB3A5WPp070778; Mon, 3 Dec 2018 10:05:32 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wB3A5WW7070777; Mon, 3 Dec 2018 10:05:32 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201812031005.wB3A5WW7070777@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Mon, 3 Dec 2018 10:05:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r486508 - head/www/chromium/files X-SVN-Group: ports-head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: head/www/chromium/files X-SVN-Commit-Revision: 486508 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 19E367B102 X-Spamd-Result: default: False [0.01 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.34)[-0.338,0]; NEURAL_SPAM_LONG(0.05)[0.050,0]; NEURAL_SPAM_SHORT(0.29)[0.293,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Dec 2018 10:05:33 -0000 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 + +-#if defined(OPENSSL_AARCH64) && defined(OPENSSL_LINUX) && \ +- !defined(OPENSSL_STATIC_ARMCAP) +- +-#include +- +-#include +- +-#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