From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C2F57138334 for ; Mon, 10 Dec 2018 15:31:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9F1B6E0A04; Mon, 10 Dec 2018 15:31:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5D845E0A04 for ; Mon, 10 Dec 2018 15:31:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7081A335CC0 for ; Mon, 10 Dec 2018 15:31:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C20B844F for ; Mon, 10 Dec 2018 15:31:14 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1544455865.c007723d59cc377de003e291c4614d36c4e51a41.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/gn/files/, dev-util/gn/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/gn/files/gn-numerics-arm.patch dev-util/gn/gn-0.1479.ebuild X-VCS-Directories: dev-util/gn/files/ dev-util/gn/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: c007723d59cc377de003e291c4614d36c4e51a41 X-VCS-Branch: master Date: Mon, 10 Dec 2018 15:31:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 56035433-1267-4205-981b-c5c56fbb56f7 X-Archives-Hash: 67eaf78130f7b1520d2d16458decc6c0 commit: c007723d59cc377de003e291c4614d36c4e51a41 Author: Mike Gilbert gentoo org> AuthorDate: Mon Dec 10 15:31:05 2018 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon Dec 10 15:31:05 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c007723d dev-util/gn: restore missing headers to fix ARM build Bug: https://bugs.gentoo.org/672862 Package-Manager: Portage-2.3.52_p8, Repoman-2.3.12_p20 Signed-off-by: Mike Gilbert gentoo.org> dev-util/gn/files/gn-numerics-arm.patch | 201 ++++++++++++++++++++++++++++++++ dev-util/gn/gn-0.1479.ebuild | 1 + 2 files changed, 202 insertions(+) diff --git a/dev-util/gn/files/gn-numerics-arm.patch b/dev-util/gn/files/gn-numerics-arm.patch new file mode 100644 index 00000000000..f822cdb4085 --- /dev/null +++ b/dev-util/gn/files/gn-numerics-arm.patch @@ -0,0 +1,201 @@ +From 8952cb06749d4bd390991878281bc7e72a6eef2c Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Mon, 10 Dec 2018 10:27:20 -0500 +Subject: [PATCH] Add missing headers for ARM + +Bug: https://bugs.gentoo.org/672862 +--- + base/numerics/safe_conversions_arm_impl.h | 51 +++++++++ + base/numerics/safe_math_arm_impl.h | 122 ++++++++++++++++++++++ + 2 files changed, 173 insertions(+) + create mode 100644 base/numerics/safe_conversions_arm_impl.h + create mode 100644 base/numerics/safe_math_arm_impl.h + +diff --git a/base/numerics/safe_conversions_arm_impl.h b/base/numerics/safe_conversions_arm_impl.h +new file mode 100644 +index 00000000..da5813f6 +--- /dev/null ++++ b/base/numerics/safe_conversions_arm_impl.h +@@ -0,0 +1,51 @@ ++// Copyright 2017 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#ifndef BASE_NUMERICS_SAFE_CONVERSIONS_ARM_IMPL_H_ ++#define BASE_NUMERICS_SAFE_CONVERSIONS_ARM_IMPL_H_ ++ ++#include ++#include ++#include ++ ++#include "base/numerics/safe_conversions_impl.h" ++ ++namespace base { ++namespace internal { ++ ++// Fast saturation to a destination type. ++template ++struct SaturateFastAsmOp { ++ static const bool is_supported = ++ std::is_signed::value && std::is_integral::value && ++ std::is_integral::value && ++ IntegerBitsPlusSign::value <= IntegerBitsPlusSign::value && ++ IntegerBitsPlusSign::value <= IntegerBitsPlusSign::value && ++ !IsTypeInRangeForNumericType::value; ++ ++ __attribute__((always_inline)) static Dst Do(Src value) { ++ int32_t src = value; ++ typename std::conditional::value, int32_t, ++ uint32_t>::type result; ++ if (std::is_signed::value) { ++ asm("ssat %[dst], %[shift], %[src]" ++ : [dst] "=r"(result) ++ : [src] "r"(src), [shift] "n"(IntegerBitsPlusSign::value <= 32 ++ ? IntegerBitsPlusSign::value ++ : 32)); ++ } else { ++ asm("usat %[dst], %[shift], %[src]" ++ : [dst] "=r"(result) ++ : [src] "r"(src), [shift] "n"(IntegerBitsPlusSign::value < 32 ++ ? IntegerBitsPlusSign::value ++ : 31)); ++ } ++ return static_cast(result); ++ } ++}; ++ ++} // namespace internal ++} // namespace base ++ ++#endif // BASE_NUMERICS_SAFE_CONVERSIONS_ARM_IMPL_H_ +diff --git a/base/numerics/safe_math_arm_impl.h b/base/numerics/safe_math_arm_impl.h +new file mode 100644 +index 00000000..a7cda1bb +--- /dev/null ++++ b/base/numerics/safe_math_arm_impl.h +@@ -0,0 +1,122 @@ ++// Copyright 2017 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#ifndef BASE_NUMERICS_SAFE_MATH_ARM_IMPL_H_ ++#define BASE_NUMERICS_SAFE_MATH_ARM_IMPL_H_ ++ ++#include ++#include ++#include ++ ++#include "base/numerics/safe_conversions.h" ++ ++namespace base { ++namespace internal { ++ ++template ++struct CheckedMulFastAsmOp { ++ static const bool is_supported = ++ FastIntegerArithmeticPromotion::is_contained; ++ ++ // The following is much more efficient than the Clang and GCC builtins for ++ // performing overflow-checked multiplication when a twice wider type is ++ // available. The below compiles down to 2-3 instructions, depending on the ++ // width of the types in use. ++ // As an example, an int32_t multiply compiles to: ++ // smull r0, r1, r0, r1 ++ // cmp r1, r1, asr #31 ++ // And an int16_t multiply compiles to: ++ // smulbb r1, r1, r0 ++ // asr r2, r1, #16 ++ // cmp r2, r1, asr #15 ++ template ++ __attribute__((always_inline)) static bool Do(T x, U y, V* result) { ++ using Promotion = typename FastIntegerArithmeticPromotion::type; ++ Promotion presult; ++ ++ presult = static_cast(x) * static_cast(y); ++ *result = static_cast(presult); ++ return IsValueInRangeForNumericType(presult); ++ } ++}; ++ ++template ++struct ClampedAddFastAsmOp { ++ static const bool is_supported = ++ BigEnoughPromotion::is_contained && ++ IsTypeInRangeForNumericType< ++ int32_t, ++ typename BigEnoughPromotion::type>::value; ++ ++ template ++ __attribute__((always_inline)) static V Do(T x, U y) { ++ // This will get promoted to an int, so let the compiler do whatever is ++ // clever and rely on the saturated cast to bounds check. ++ if (IsIntegerArithmeticSafe::value) ++ return saturated_cast(x + y); ++ ++ int32_t result; ++ int32_t x_i32 = x; ++ int32_t y_i32 = y; ++ ++ asm("qadd %[result], %[first], %[second]" ++ : [result] "=r"(result) ++ : [first] "r"(x_i32), [second] "r"(y_i32)); ++ return saturated_cast(result); ++ } ++}; ++ ++template ++struct ClampedSubFastAsmOp { ++ static const bool is_supported = ++ BigEnoughPromotion::is_contained && ++ IsTypeInRangeForNumericType< ++ int32_t, ++ typename BigEnoughPromotion::type>::value; ++ ++ template ++ __attribute__((always_inline)) static V Do(T x, U y) { ++ // This will get promoted to an int, so let the compiler do whatever is ++ // clever and rely on the saturated cast to bounds check. ++ if (IsIntegerArithmeticSafe::value) ++ return saturated_cast(x - y); ++ ++ int32_t result; ++ int32_t x_i32 = x; ++ int32_t y_i32 = y; ++ ++ asm("qsub %[result], %[first], %[second]" ++ : [result] "=r"(result) ++ : [first] "r"(x_i32), [second] "r"(y_i32)); ++ return saturated_cast(result); ++ } ++}; ++ ++template ++struct ClampedMulFastAsmOp { ++ static const bool is_supported = CheckedMulFastAsmOp::is_supported; ++ ++ template ++ __attribute__((always_inline)) static V Do(T x, U y) { ++ // Use the CheckedMulFastAsmOp for full-width 32-bit values, because ++ // it's fewer instructions than promoting and then saturating. ++ if (!IsIntegerArithmeticSafe::value && ++ !IsIntegerArithmeticSafe::value) { ++ V result; ++ if (CheckedMulFastAsmOp::Do(x, y, &result)) ++ return result; ++ return CommonMaxOrMin(IsValueNegative(x) ^ IsValueNegative(y)); ++ } ++ ++ assert((FastIntegerArithmeticPromotion::is_contained)); ++ using Promotion = typename FastIntegerArithmeticPromotion::type; ++ return saturated_cast(static_cast(x) * ++ static_cast(y)); ++ } ++}; ++ ++} // namespace internal ++} // namespace base ++ ++#endif // BASE_NUMERICS_SAFE_MATH_ARM_IMPL_H_ +-- +2.20.0.rc2 + diff --git a/dev-util/gn/gn-0.1479.ebuild b/dev-util/gn/gn-0.1479.ebuild index fc369d2c0db..89fd565c959 100644 --- a/dev-util/gn/gn-0.1479.ebuild +++ b/dev-util/gn/gn-0.1479.ebuild @@ -22,6 +22,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/gn-gen-r2.patch + "${FILESDIR}"/gn-numerics-arm.patch ) pkg_setup() {