From 0f43b4090eeddc42c7d1d89585e47a68d6a8d3b1 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 12 Dec 2020 05:06:49 +0000 Subject: [PATCH] removed extra/gn --- extra/gn/0001-Add-ARM-headers-back.patch | 200 ----------------------- extra/gn/PKGBUILD | 56 ------- extra/gn/chromium-gn-version.sh | 8 - 3 files changed, 264 deletions(-) delete mode 100644 extra/gn/0001-Add-ARM-headers-back.patch delete mode 100644 extra/gn/PKGBUILD delete mode 100755 extra/gn/chromium-gn-version.sh diff --git a/extra/gn/0001-Add-ARM-headers-back.patch b/extra/gn/0001-Add-ARM-headers-back.patch deleted file mode 100644 index 926c4ce62..000000000 --- a/extra/gn/0001-Add-ARM-headers-back.patch +++ /dev/null @@ -1,200 +0,0 @@ -From 65fd24e06b2f1b559a7c788d5b90afacf9dba9a4 Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich -Date: Sun, 12 Aug 2018 18:11:42 -0600 -Subject: [PATCH] Add ARM headers back - ---- - 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.18.0 - diff --git a/extra/gn/PKGBUILD b/extra/gn/PKGBUILD deleted file mode 100644 index df56eaf27..000000000 --- a/extra/gn/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# Maintainer: Evangelos Foutras - -# ALARM: Kevin Mihelich -# - add ARM headers back that were removed upstream - -buildarch=28 - -pkgname=gn -pkgver=0.1819.e327ffdc -_commit=e327ffdc503815916db2543ec000226a8df45163 -pkgrel=2 -pkgdesc="Meta-build system that generates build files for Ninja" -arch=('x86_64') -url="https://gn.googlesource.com/gn/" -license=('BSD') -depends=('gcc-libs') -makedepends=('clang' 'ninja' 'python' 'git') -source=(git+https://gn.googlesource.com/gn#commit=$_commit - 0001-Add-ARM-headers-back.patch) -md5sums=('SKIP' - '9948af7a864a8e57697c49d15cdcb395') - -pkgver() { - cd $pkgname - echo 0.$(git rev-list --count initial-commit..).$(git rev-parse --short HEAD) -} - -prepare() { - cd $pkgname - patch -p1 -i ../0001-Add-ARM-headers-back.patch -} - -build() { - cd $pkgname - ./build/gen.py - ninja -C out -} - -check() { - cd $pkgname - ./out/gn_unittests -} - -package() { - cd $pkgname - install -D out/gn "$pkgdir/usr/bin/gn" - install -Dm644 -t "$pkgdir/usr/share/doc/$pkgname" docs/* - install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE - - mkdir -p "$pkgdir/usr/share/vim/vimfiles" - cp -r misc/vim/{autoload,ftdetect,ftplugin,syntax} \ - "$pkgdir/usr/share/vim/vimfiles/" - install -Dm644 -t "$pkgdir/usr/share/emacs/site-lisp" misc/emacs/gn-mode.el -} - -# vim:set ts=2 sw=2 et: diff --git a/extra/gn/chromium-gn-version.sh b/extra/gn/chromium-gn-version.sh deleted file mode 100755 index 57d007ea7..000000000 --- a/extra/gn/chromium-gn-version.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -set -eo pipefail - -chromium_version=${1:-$(curl -s https://omahaproxy.appspot.com/linux)} - -curl -s https://chromium.googlesource.com/chromium/src/+/$chromium_version/DEPS?format=TEXT | - base64 -d | grep -Po "'gn_version': 'git_revision:\K[^']*"