[lfs-patches] r3648 - trunk/chromium

dj at higgs.linuxfromscratch.org dj at higgs.linuxfromscratch.org
Thu Oct 12 22:04:55 PDT 2017


Author: dj
Date: Thu Oct 12 22:04:55 2017
New Revision: 3648

Log:
Add chromium-61.0.3163.100 patches.

Added:
   trunk/chromium/chromium-61.0.3163.100-gcc7-1.patch
   trunk/chromium/chromium-61.0.3163.100-glibc-2.26-1.patch

Added: trunk/chromium/chromium-61.0.3163.100-gcc7-1.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/chromium/chromium-61.0.3163.100-gcc7-1.patch	Thu Oct 12 22:04:55 2017	(r3648)
@@ -0,0 +1,129 @@
+Submitted By:            DJ Lucas <dj_AT_linuxfromscratch_DOT_org>
+Date:                    2017-10-13
+Initial Package Version: 61.0.3163.100
+Upstream Status:         Pending
+Origin:                  upstream
+Description:             Allows building with GCC-7.2.0.
+
+
+diff -Naurp chromium-61.0.3163.100-orig/base/numerics/safe_math_shared_impl.h chromium-61.0.3163.100/base/numerics/safe_math_shared_impl.h
+--- chromium-61.0.3163.100-orig/base/numerics/safe_math_shared_impl.h	2017-09-21 17:04:50.000000000 -0500
++++ chromium-61.0.3163.100/base/numerics/safe_math_shared_impl.h	2017-10-11 23:30:39.809656293 -0500
+@@ -21,8 +21,7 @@
+ #if !defined(__native_client__) &&                         \
+     ((defined(__clang__) &&                                \
+       ((__clang_major__ > 3) ||                            \
+-       (__clang_major__ == 3 && __clang_minor__ >= 4))) || \
+-     (defined(__GNUC__) && __GNUC__ >= 5))
++       (__clang_major__ == 3 && __clang_minor__ >= 4))))
+ #include "base/numerics/safe_math_clang_gcc_impl.h"
+ #define BASE_HAS_OPTIMIZED_SAFE_MATH (1)
+ #else
+diff -Naurp chromium-61.0.3163.100-orig/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h chromium-61.0.3163.100/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h
+--- chromium-61.0.3163.100-orig/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h	2017-09-21 17:05:18.000000000 -0500
++++ chromium-61.0.3163.100/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h	2017-10-11 23:30:39.806323020 -0500
+@@ -8,6 +8,7 @@
+ #include "platform/PlatformExport.h"
+ #include "platform/wtf/ThreadSpecific.h"
+ 
++#include <functional>
+ #include <memory>
+ 
+ namespace gpu {
+diff -Naurp chromium-61.0.3163.100-orig/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h chromium-61.0.3163.100/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h
+--- chromium-61.0.3163.100-orig/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h	2017-09-21 17:05:18.000000000 -0500
++++ chromium-61.0.3163.100/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h	2017-10-11 23:30:39.806323020 -0500
+@@ -685,6 +685,31 @@ inline LinkedHashSet<T, U, V, W>& Linked
+   return *this;
+ }
+ 
++inline void SwapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b) {
++  DCHECK(a.prev_);
++  DCHECK(a.next_);
++  DCHECK(b.prev_);
++  DCHECK(b.next_);
++  swap(a.prev_, b.prev_);
++  swap(a.next_, b.next_);
++  if (b.next_ == &a) {
++    DCHECK_EQ(b.prev_, &a);
++    b.next_ = &b;
++    b.prev_ = &b;
++  } else {
++    b.next_->prev_ = &b;
++    b.prev_->next_ = &b;
++  }
++  if (a.next_ == &b) {
++    DCHECK_EQ(a.prev_, &b);
++    a.next_ = &a;
++    a.prev_ = &a;
++  } else {
++    a.next_->prev_ = &a;
++    a.prev_->next_ = &a;
++  }
++}
++
+ template <typename T, typename U, typename V, typename W>
+ inline void LinkedHashSet<T, U, V, W>::Swap(LinkedHashSet& other) {
+   impl_.swap(other.impl_);
+@@ -877,31 +902,6 @@ inline void LinkedHashSet<T, U, V, W>::e
+   erase(find(value));
+ }
+ 
+-inline void SwapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b) {
+-  DCHECK(a.prev_);
+-  DCHECK(a.next_);
+-  DCHECK(b.prev_);
+-  DCHECK(b.next_);
+-  swap(a.prev_, b.prev_);
+-  swap(a.next_, b.next_);
+-  if (b.next_ == &a) {
+-    DCHECK_EQ(b.prev_, &a);
+-    b.next_ = &b;
+-    b.prev_ = &b;
+-  } else {
+-    b.next_->prev_ = &b;
+-    b.prev_->next_ = &b;
+-  }
+-  if (a.next_ == &b) {
+-    DCHECK_EQ(a.prev_, &b);
+-    a.next_ = &a;
+-    a.prev_ = &a;
+-  } else {
+-    a.next_->prev_ = &a;
+-    a.prev_->next_ = &a;
+-  }
+-}
+-
+ inline void swap(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b) {
+   DCHECK_NE(a.next_, &a);
+   DCHECK_NE(b.next_, &b);
+diff -Naurp chromium-61.0.3163.100-orig/chrome/browser/devtools/devtools_file_system_indexer.cc chromium-61.0.3163.100/chrome/browser/devtools/devtools_file_system_indexer.cc
+--- chromium-61.0.3163.100-orig/chrome/browser/devtools/devtools_file_system_indexer.cc
++++ chromium-61.0.3163.100/chrome/browser/devtools/devtools_file_system_indexer.cc
+@@ -34,12 +34,13 @@
+ using base::TimeTicks;
+ using content::BrowserThread;
+ using std::map;
+-using std::set;
+ using std::string;
+ using std::vector;
+ 
+ namespace {
+ 
++using std::set;
++
+ base::SequencedTaskRunner* impl_task_runner() {
+   constexpr base::TaskTraits kBlockingTraits = {base::MayBlock(),
+                                                 base::TaskPriority::BACKGROUND};
+diff -Naurp chromium-61.0.3163.100-orig/ui/views/examples/box_layout_example.h chromium-61.0.3163.100/ui/views/examples/box_layout_example.h
+--- chromium-61.0.3163.100-orig/ui/views/examples/box_layout_example.h
++++ chromium-61.0.3163.100/ui/views/examples/box_layout_example.h
+@@ -38,7 +38,7 @@
+   void CreateExampleView(View* container) override;
+ 
+  private:
+-  friend class ChildPanel;
++  friend class views::examples::ChildPanel;
+   // ButtonListener
+   void ButtonPressed(Button* sender, const ui::Event& event) override;
+ 

Added: trunk/chromium/chromium-61.0.3163.100-glibc-2.26-1.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/chromium/chromium-61.0.3163.100-glibc-2.26-1.patch	Thu Oct 12 22:04:55 2017	(r3648)
@@ -0,0 +1,201 @@
+Submitted By:            DJ Lucas <dj_AT_linuxfromscratch_DOT_org>
+Date:                    2017-10-12
+Initial Package Version: 61.0.3163.100
+Upstream Status:         Committed
+Origin:                  https://hg.mozilla.org/integration/autoland/rev/d3970338a22b
+Description:             Allows building with GlibC-2.26.
+
+
+diff -Naurp chromium-61.0.3163.100-orig/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc chromium-61.0.3163.100/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+--- chromium-61.0.3163.100-orig/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc	2017-09-21 17:07:24.000000000 -0500
++++ chromium-61.0.3163.100/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc	2017-10-11 23:25:53.978959111 -0500
+@@ -40,11 +40,11 @@ namespace google_breakpad {
+ 
+ #if defined(__i386__)
+ 
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.gregs[REG_ESP];
+ }
+ 
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.gregs[REG_EIP];
+ }
+ 
+@@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawC
+ 
+ #elif defined(__x86_64)
+ 
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.gregs[REG_RSP];
+ }
+ 
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.gregs[REG_RIP];
+ }
+ 
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+                                     const struct _libc_fpstate* fpregs) {
+   const greg_t* regs = uc->uc_mcontext.gregs;
+ 
+@@ -145,11 +145,11 @@ void UContextReader::FillCPUContext(RawC
+ 
+ #elif defined(__ARM_EABI__)
+ 
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.arm_sp;
+ }
+ 
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.arm_pc;
+ }
+ 
+@@ -184,11 +184,11 @@ void UContextReader::FillCPUContext(RawC
+ 
+ #elif defined(__aarch64__)
+ 
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.sp;
+ }
+ 
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.pc;
+ }
+ 
+@@ -210,11 +210,11 @@ void UContextReader::FillCPUContext(RawC
+ 
+ #elif defined(__mips__)
+ 
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP];
+ }
+ 
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.pc;
+ }
+ 
+diff -Naurp chromium-61.0.3163.100-orig/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h chromium-61.0.3163.100/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+--- chromium-61.0.3163.100-orig/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h	2017-09-21 17:07:24.000000000 -0500
++++ chromium-61.0.3163.100/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h	2017-10-11 23:25:53.978959111 -0500
+@@ -41,21 +41,21 @@ namespace google_breakpad {
+ 
+ // Wraps platform-dependent implementations of accessors to ucontext structs.
+ struct UContextReader {
+-  static uintptr_t GetStackPointer(const struct ucontext* uc);
++  static uintptr_t GetStackPointer(const ucontext_t* uc);
+ 
+-  static uintptr_t GetInstructionPointer(const struct ucontext* uc);
++  static uintptr_t GetInstructionPointer(const ucontext_t* uc);
+ 
+   // Juggle a arch-specific ucontext into a minidump format
+   //   out: the minidump structure
+   //   info: the collection of register structures.
+ #if defined(__i386__) || defined(__x86_64)
+-  static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+                              const struct _libc_fpstate* fp);
+ #elif defined(__aarch64__)
+-  static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+                              const struct fpsimd_context* fpregs);
+ #else
+-  static void FillCPUContext(RawContextCPU *out, const ucontext *uc);
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc);
+ #endif
+ };
+ 
+diff -Naurp chromium-61.0.3163.100-orig/breakpad/src/client/linux/handler/exception_handler.cc chromium-61.0.3163.100/breakpad/src/client/linux/handler/exception_handler.cc
+--- chromium-61.0.3163.100-orig/breakpad/src/client/linux/handler/exception_handler.cc	2017-09-21 17:07:24.000000000 -0500
++++ chromium-61.0.3163.100/breakpad/src/client/linux/handler/exception_handler.cc	2017-10-11 23:25:53.978959111 -0500
+@@ -457,9 +457,9 @@ bool ExceptionHandler::HandleSignal(int
+   // Fill in all the holes in the struct to make Valgrind happy.
+   memset(&g_crash_context_, 0, sizeof(g_crash_context_));
+   memcpy(&g_crash_context_.siginfo, info, sizeof(siginfo_t));
+-  memcpy(&g_crash_context_.context, uc, sizeof(struct ucontext));
++  memcpy(&g_crash_context_.context, uc, sizeof(ucontext_t));
+ #if defined(__aarch64__)
+-  struct ucontext* uc_ptr = (struct ucontext*)uc;
++  ucontext_t* uc_ptr = (ucontext_t*)uc;
+   struct fpsimd_context* fp_ptr =
+       (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved;
+   if (fp_ptr->head.magic == FPSIMD_MAGIC) {
+@@ -468,9 +468,9 @@ bool ExceptionHandler::HandleSignal(int
+   }
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+   // FP state is not part of user ABI on ARM Linux.
+-  // In case of MIPS Linux FP state is already part of struct ucontext
++  // In case of MIPS Linux FP state is already part of ucontext_t
+   // and 'float_state' is not a member of CrashContext.
+-  struct ucontext* uc_ptr = (struct ucontext*)uc;
++  ucontext_t* uc_ptr = (ucontext_t*)uc;
+   if (uc_ptr->uc_mcontext.fpregs) {
+     memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs,
+            sizeof(g_crash_context_.float_state));
+@@ -494,7 +494,7 @@ bool ExceptionHandler::SimulateSignalDel
+   // ExceptionHandler::HandleSignal().
+   siginfo.si_code = SI_USER;
+   siginfo.si_pid = getpid();
+-  struct ucontext context;
++  ucontext_t context;
+   getcontext(&context);
+   return HandleSignal(sig, &siginfo, &context);
+ }
+diff -Naurp chromium-61.0.3163.100-orig/breakpad/src/client/linux/handler/exception_handler.h chromium-61.0.3163.100/breakpad/src/client/linux/handler/exception_handler.h
+--- chromium-61.0.3163.100-orig/breakpad/src/client/linux/handler/exception_handler.h	2017-09-21 17:07:24.000000000 -0500
++++ chromium-61.0.3163.100/breakpad/src/client/linux/handler/exception_handler.h	2017-10-11 23:25:53.978959111 -0500
+@@ -191,7 +191,7 @@ class ExceptionHandler {
+   struct CrashContext {
+     siginfo_t siginfo;
+     pid_t tid;  // the crashing thread.
+-    struct ucontext context;
++    ucontext_t context;
+ #if !defined(__ARM_EABI__) && !defined(__mips__)
+     // #ifdef this out because FP state is not part of user ABI for Linux ARM.
+     // In case of MIPS Linux FP state is already part of struct
+diff -Naurp chromium-61.0.3163.100-orig/breakpad/src/client/linux/microdump_writer/microdump_writer.cc chromium-61.0.3163.100/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+--- chromium-61.0.3163.100-orig/breakpad/src/client/linux/microdump_writer/microdump_writer.cc	2017-09-21 17:07:24.000000000 -0500
++++ chromium-61.0.3163.100/breakpad/src/client/linux/microdump_writer/microdump_writer.cc	2017-10-11 23:25:53.978959111 -0500
+@@ -593,7 +593,7 @@ class MicrodumpWriter {
+ 
+   void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
+ 
+-  const struct ucontext* const ucontext_;
++  const ucontext_t* const ucontext_;
+ #if !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;
+ #endif
+diff -Naurp chromium-61.0.3163.100-orig/breakpad/src/client/linux/minidump_writer/minidump_writer.cc chromium-61.0.3163.100/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+--- chromium-61.0.3163.100-orig/breakpad/src/client/linux/minidump_writer/minidump_writer.cc	2017-09-21 17:07:24.000000000 -0500
++++ chromium-61.0.3163.100/breakpad/src/client/linux/minidump_writer/minidump_writer.cc	2017-10-11 23:25:53.978959111 -0500
+@@ -1323,7 +1323,7 @@ class MinidumpWriter {
+   const int fd_;  // File descriptor where the minidum should be written.
+   const char* path_;  // Path to the file where the minidum should be written.
+ 
+-  const struct ucontext* const ucontext_;  // also from the signal handler
++  const ucontext_t* const ucontext_;  // also from the signal handler
+ #if !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;  // ditto
+ #endif
+diff -Naurp chromium-61.0.3163.100-orig/buildtools/third_party/libc++/trunk/include/__locale chromium-61.0.3163.100/buildtools/third_party/libc++/trunk/include/__locale
+--- chromium-61.0.3163.100-orig/buildtools/third_party/libc++/trunk/include/__locale	2017-09-21 17:07:34.000000000 -0500
++++ chromium-61.0.3163.100/buildtools/third_party/libc++/trunk/include/__locale	2017-10-11 23:27:04.847682982 -0500
+@@ -34,9 +34,6 @@
+ # include <support/solaris/xlocale.h>
+ #elif defined(_NEWLIB_VERSION)
+ # include <support/newlib/xlocale.h>
+-#elif (defined(__GLIBC__) || defined(__APPLE__)      || defined(__FreeBSD__) \
+-    || defined(__EMSCRIPTEN__) || defined(__IBMCPP__))
+-# include <xlocale.h>
+ #elif defined(__Fuchsia__)
+ # include <support/fuchsia/xlocale.h>
+ #elif defined(_LIBCPP_HAS_MUSL_LIBC)


More information about the patches mailing list