gentoo resync : 24.03.2019

4 files changed, 48 insertions, 322 deletions

diff --git a/dev-util/gn/files/gn-gen-r0.patch b/dev-util/gn/files/gn-gen-r0.patch
deleted file mode 100644
index d30af3ab4ac6..000000000000
--- a/dev-util/gn/files/gn-gen-r0.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/build/gen.py b/build/gen.py
-index fce8fb18..2927da5f 100755
---- a/build/gen.py
-+++ b/build/gen.py
-@@ -260,17 +260,12 @@ def WriteGNNinja(path, options, linux_sysroot):
-     if options.debug:
-       cflags.extend(['-O0', '-g'])
-     else:
--      cflags.append('-DNDEBUG')
--      cflags.append('-O3')
--      ldflags.append('-O3')
-       # Use -fdata-sections and -ffunction-sections to place each function
-       # or data item into its own section so --gc-sections can eliminate any
-       # unused functions and data items.
-       cflags.extend(['-fdata-sections', '-ffunction-sections'])
-       ldflags.extend(['-fdata-sections', '-ffunction-sections'])
-       ldflags.append('-Wl,-dead_strip' if is_mac else '-Wl,--gc-sections')
--      # Omit all symbol information from the output file.
--      ldflags.append('-Wl,-S' if is_mac else '-Wl,-strip-all')
-       # Enable identical code-folding.
-       if options.use_icf:
-         ldflags.append('-Wl,--icf=all')
-@@ -279,11 +274,11 @@ def WriteGNNinja(path, options, linux_sysroot):
-         '-D_FILE_OFFSET_BITS=64',
-         '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS',
-         '-pthread',
--        '-pipe',
-         '-fno-exceptions',
-         '-fno-rtti',
-     ])
-     cflags_cc.extend(['-std=c++14', '-Wno-c++11-narrowing'])
-+    ldflags.append('-pthread')
- 
-     if is_linux:
-       if linux_sysroot:
-@@ -293,15 +288,6 @@ def WriteGNNinja(path, options, linux_sysroot):
-         # probably resolve this and (re-)add a way to build against libc++.
-         cflags.append('--sysroot=' + linux_sysroot)
-         ldflags.append('--sysroot=' + linux_sysroot)
--      cflags.append('-stdlib=libstdc++')
--      ldflags.extend(['-static-libstdc++',
--                      '-stdlib=libstdc++',
--                      '-Wl,--as-needed',
--                     ])
--      libs.extend([
--          '-lgcc_s',
--          '-lpthread',
--      ])
-     elif is_mac:
-       min_mac_version_flag = '-mmacosx-version-min=10.9'
-       cflags.append(min_mac_version_flag)
diff --git a/dev-util/gn/files/gn-gen-r2.patch b/dev-util/gn/files/gn-gen-r2.patch
deleted file mode 100644
index 701a317bf023..000000000000
--- a/dev-util/gn/files/gn-gen-r2.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 00e907811ea7fc56de73ad44903946a9179b1c4f Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 14 Oct 2018 20:34:07 -0400
-Subject: [PATCH] Remove unwanted cflags/ldflags parameters
-
----
- build/gen.py | 19 +------------------
- 1 file changed, 1 insertion(+), 18 deletions(-)
-
-diff --git a/build/gen.py b/build/gen.py
-index 11c92460..b186e3b0 100755
---- a/build/gen.py
-+++ b/build/gen.py
-@@ -326,9 +326,6 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
-     if options.debug:
-       cflags.extend(['-O0', '-g'])
-     else:
--      cflags.append('-DNDEBUG')
--      cflags.append('-O3')
--      ldflags.append('-O3')
-       # Use -fdata-sections and -ffunction-sections to place each function
-       # or data item into its own section so --gc-sections can eliminate any
-       # unused functions and data items.
-@@ -340,14 +337,6 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
-         # Garbage collection is done by default on aix.
-         ldflags.append('-Wl,--gc-sections')
- 
--      # Omit all symbol information from the output file.
--      if platform.is_darwin():
--        ldflags.append('-Wl,-S')
--      elif platform.is_aix():
--        ldflags.append('-Wl,-s')
--      else:
--        ldflags.append('-Wl,-strip-all')
--
-       # Enable identical code-folding.
-       if options.use_icf:
-         ldflags.append('-Wl,--icf=all')
-@@ -356,12 +345,12 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
-         '-D_FILE_OFFSET_BITS=64',
-         '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS',
-         '-pthread',
--        '-pipe',
-         '-fno-exceptions',
-         '-fno-rtti',
-         '-fdiagnostics-color',
-     ])
-     cflags_cc.extend(['-std=c++14', '-Wno-c++11-narrowing'])
-+    ldflags.extend(['-pthread'])
- 
-     if platform.is_linux():
-       if linux_sysroot:
-@@ -369,14 +358,8 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
-         cflags.append('--sysroot=' + linux_sysroot)
-         ldflags.append('--sysroot=' + linux_sysroot)
-       ldflags.extend([
--          '-static-libstdc++',
-           '-Wl,--as-needed',
-       ])
--      libs.extend([
--          # These are needed by libc++.
--          '-ldl',
--          '-lpthread',
--      ])
-     elif platform.is_darwin():
-       min_mac_version_flag = '-mmacosx-version-min=10.9'
-       cflags.append(min_mac_version_flag)
--- 
-2.19.1
-
diff --git a/dev-util/gn/files/gn-gen-r3.patch b/dev-util/gn/files/gn-gen-r3.patch
new file mode 100644
index 000000000000..362a6854a264
--- /dev/null
+++ b/dev-util/gn/files/gn-gen-r3.patch
@@ -0,0 +1,48 @@
+From bedf2161dea8cf4813fd14891feee2e8e8d5bf28 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sun, 14 Oct 2018 20:34:07 -0400
+Subject: [PATCH] Remove unwanted cflags/ldflags parameters
+
+---
+ build/gen.py | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/build/gen.py b/build/gen.py
+index a7142fab..06d5e2b3 100755
+--- a/build/gen.py
++++ b/build/gen.py
+@@ -278,11 +278,6 @@ def WriteGNNinja(path, platform, host, options):
+     if options.debug:
+       cflags.extend(['-O0', '-g'])
+     else:
+-      cflags.append('-DNDEBUG')
+-      cflags.append('-O3')
+-      if options.no_strip:
+-        cflags.append('-g')
+-      ldflags.append('-O3')
+       # Use -fdata-sections and -ffunction-sections to place each function
+       # or data item into its own section so --gc-sections can eliminate any
+       # unused functions and data items.
+@@ -311,7 +306,6 @@ def WriteGNNinja(path, platform, host, options):
+         '-D_FILE_OFFSET_BITS=64',
+         '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS',
+         '-pthread',
+-        '-pipe',
+         '-fno-exceptions',
+         '-fno-rtti',
+         '-fdiagnostics-color',
+@@ -320,11 +314,8 @@ def WriteGNNinja(path, platform, host, options):
+ 
+     if platform.is_linux():
+       ldflags.extend([
+-          '-static-libstdc++',
+           '-Wl,--as-needed',
+       ])
+-      # This is needed by libc++.
+-      libs.append('-ldl')
+     elif platform.is_darwin():
+       min_mac_version_flag = '-mmacosx-version-min=10.9'
+       cflags.append(min_mac_version_flag)
+-- 
+2.21.0
+
diff --git a/dev-util/gn/files/gn-numerics-arm.patch b/dev-util/gn/files/gn-numerics-arm.patch
deleted file mode 100644
index f822cdb40852..000000000000
--- a/dev-util/gn/files/gn-numerics-arm.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-From 8952cb06749d4bd390991878281bc7e72a6eef2c Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppymaster@gmail.com>
-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 <cassert>
-+#include <limits>
-+#include <type_traits>
-+
-+#include "base/numerics/safe_conversions_impl.h"
-+
-+namespace base {
-+namespace internal {
-+
-+// Fast saturation to a destination type.
-+template <typename Dst, typename Src>
-+struct SaturateFastAsmOp {
-+  static const bool is_supported =
-+      std::is_signed<Src>::value && std::is_integral<Dst>::value &&
-+      std::is_integral<Src>::value &&
-+      IntegerBitsPlusSign<Src>::value <= IntegerBitsPlusSign<int32_t>::value &&
-+      IntegerBitsPlusSign<Dst>::value <= IntegerBitsPlusSign<int32_t>::value &&
-+      !IsTypeInRangeForNumericType<Dst, Src>::value;
-+
-+  __attribute__((always_inline)) static Dst Do(Src value) {
-+    int32_t src = value;
-+    typename std::conditional<std::is_signed<Dst>::value, int32_t,
-+                              uint32_t>::type result;
-+    if (std::is_signed<Dst>::value) {
-+      asm("ssat %[dst], %[shift], %[src]"
-+          : [dst] "=r"(result)
-+          : [src] "r"(src), [shift] "n"(IntegerBitsPlusSign<Dst>::value <= 32
-+                                            ? IntegerBitsPlusSign<Dst>::value
-+                                            : 32));
-+    } else {
-+      asm("usat %[dst], %[shift], %[src]"
-+          : [dst] "=r"(result)
-+          : [src] "r"(src), [shift] "n"(IntegerBitsPlusSign<Dst>::value < 32
-+                                            ? IntegerBitsPlusSign<Dst>::value
-+                                            : 31));
-+    }
-+    return static_cast<Dst>(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 <cassert>
-+#include <limits>
-+#include <type_traits>
-+
-+#include "base/numerics/safe_conversions.h"
-+
-+namespace base {
-+namespace internal {
-+
-+template <typename T, typename U>
-+struct CheckedMulFastAsmOp {
-+  static const bool is_supported =
-+      FastIntegerArithmeticPromotion<T, U>::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 <typename V>
-+  __attribute__((always_inline)) static bool Do(T x, U y, V* result) {
-+    using Promotion = typename FastIntegerArithmeticPromotion<T, U>::type;
-+    Promotion presult;
-+
-+    presult = static_cast<Promotion>(x) * static_cast<Promotion>(y);
-+    *result = static_cast<V>(presult);
-+    return IsValueInRangeForNumericType<V>(presult);
-+  }
-+};
-+
-+template <typename T, typename U>
-+struct ClampedAddFastAsmOp {
-+  static const bool is_supported =
-+      BigEnoughPromotion<T, U>::is_contained &&
-+      IsTypeInRangeForNumericType<
-+          int32_t,
-+          typename BigEnoughPromotion<T, U>::type>::value;
-+
-+  template <typename V>
-+  __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<int, T, U>::value)
-+      return saturated_cast<V>(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<V>(result);
-+  }
-+};
-+
-+template <typename T, typename U>
-+struct ClampedSubFastAsmOp {
-+  static const bool is_supported =
-+      BigEnoughPromotion<T, U>::is_contained &&
-+      IsTypeInRangeForNumericType<
-+          int32_t,
-+          typename BigEnoughPromotion<T, U>::type>::value;
-+
-+  template <typename V>
-+  __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<int, T, U>::value)
-+      return saturated_cast<V>(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<V>(result);
-+  }
-+};
-+
-+template <typename T, typename U>
-+struct ClampedMulFastAsmOp {
-+  static const bool is_supported = CheckedMulFastAsmOp<T, U>::is_supported;
-+
-+  template <typename V>
-+  __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<int32_t, T, U>::value &&
-+        !IsIntegerArithmeticSafe<uint32_t, T, U>::value) {
-+      V result;
-+      if (CheckedMulFastAsmOp<T, U>::Do(x, y, &result))
-+        return result;
-+      return CommonMaxOrMin<V>(IsValueNegative(x) ^ IsValueNegative(y));
-+    }
-+
-+    assert((FastIntegerArithmeticPromotion<T, U>::is_contained));
-+    using Promotion = typename FastIntegerArithmeticPromotion<T, U>::type;
-+    return saturated_cast<V>(static_cast<Promotion>(x) *
-+                             static_cast<Promotion>(y));
-+  }
-+};
-+
-+}  // namespace internal
-+}  // namespace base
-+
-+#endif  // BASE_NUMERICS_SAFE_MATH_ARM_IMPL_H_
--- 
-2.20.0.rc2
-