Attachment 171861 Details for Bug 210619 – patch from a git commit, apply with patch -p1

patch from a git commit, apply with patch -p1

nodejs-regenerate-patches.diff (text/plain), 5.83 KB, created by Bradley T. Hughes on 2016-06-27 10:52:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bradley T. Hughes

Created: 2016-06-27 10:52:26 UTC

Size: 5.83 KB

patch

obsolete

>commit a2f0c11f488ffca1721ff1262bd18210eeef1e4b
>Author: Bradley T. Hughes <bradleythughes@fastmail.fm>
>Date:   Mon Jun 27 10:46:37 2016 +0000
>
>    www/node: regenerate patches with 'make makepatch'
>    
>    Make portlint happy.
>
>diff --git a/www/node/files/patch-deps_v8_src_arm_cpu-arm.cc b/www/node/files/patch-deps_v8_src_arm_cpu-arm.cc
>index 3ae7b8b..48cc14d 100644
>--- a/www/node/files/patch-deps_v8_src_arm_cpu-arm.cc
>+++ b/www/node/files/patch-deps_v8_src_arm_cpu-arm.cc
>@@ -1,5 +1,5 @@
>---- deps/v8/src/arm/cpu-arm.cc.orig	2016-05-06 17:09:05.953032000 +0200
>-+++ deps/v8/src/arm/cpu-arm.cc	2016-05-06 17:10:42.094376000 +0200
>+--- deps/v8/src/arm/cpu-arm.cc.orig	2016-06-02 21:53:45 UTC
>++++ deps/v8/src/arm/cpu-arm.cc
> @@ -7,6 +7,9 @@
>  #ifdef __QNXNTO__
>  #include <sys/mman.h>  // for cache flushing.
>diff --git a/www/node/files/patch-deps_v8_src_base_atomicops__internals__arm__gcc.h b/www/node/files/patch-deps_v8_src_base_atomicops__internals__arm__gcc.h
>new file mode 100644
>index 0000000..bfa64ff
>--- /dev/null
>+++ b/www/node/files/patch-deps_v8_src_base_atomicops__internals__arm__gcc.h
>@@ -0,0 +1,35 @@
>+--- deps/v8/src/base/atomicops_internals_arm_gcc.h.orig	2016-06-02 21:53:45 UTC
>++++ deps/v8/src/base/atomicops_internals_arm_gcc.h
>+@@ -13,6 +13,11 @@
>+ #include <sys/cpuinline.h>
>+ #endif
>+ 
>++#if defined(__FreeBSD__)
>++#include <sys/types.h>
>++#include <machine/sysarch.h>
>++#endif
>++
>+ namespace v8 {
>+ namespace base {
>+ 
>+@@ -48,6 +53,8 @@ inline void MemoryBarrier() {
>+   // Note: This is a function call, which is also an implicit compiler barrier.
>+   typedef void (*KernelMemoryBarrierFunc)();
>+   ((KernelMemoryBarrierFunc)0xffff0fa0)();
>++#elif defined(__FreeBSD__)
>++  sysarch(ARM_DRAIN_WRITEBUF, (void *)0);
>+ #elif defined(__QNXNTO__)
>+   __cpu_membarrier();
>+ #else
>+@@ -63,8 +70,9 @@ inline void MemoryBarrier() {
>+     defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) ||  \
>+     defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || \
>+     defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) ||  \
>+-    defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || \
>+-    defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__)
>++    defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6KZ__) || \
>++    defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || \
>++    defined(__ARM_ARCH_6T2__)
>+ 
>+ inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
>+                                          Atomic32 old_value,
>diff --git a/www/node/files/patch-deps_v8_src_base_atomicops_internals_arm_gcc.h b/www/node/files/patch-deps_v8_src_base_atomicops_internals_arm_gcc.h
>deleted file mode 100644
>index 97d04a0..0000000
>--- a/www/node/files/patch-deps_v8_src_base_atomicops_internals_arm_gcc.h
>+++ /dev/null
>@@ -1,35 +0,0 @@
>---- deps/v8/src/base/atomicops_internals_arm_gcc.h.orig	2016-01-19 17:14:41 UTC
>-+++ deps/v8/src/base/atomicops_internals_arm_gcc.h
>-@@ -13,6 +13,11 @@
>- #include <sys/cpuinline.h>
>- #endif
>- 
>-+#if defined(__FreeBSD__)
>-+#include <sys/types.h>
>-+#include <machine/sysarch.h>
>-+#endif
>-+
>- namespace v8 {
>- namespace base {
>- 
>-@@ -48,6 +53,8 @@ inline void MemoryBarrier() {
>-   // Note: This is a function call, which is also an implicit compiler barrier.
>-   typedef void (*KernelMemoryBarrierFunc)();
>-   ((KernelMemoryBarrierFunc)0xffff0fa0)();
>-+#elif defined(__FreeBSD__)
>-+  sysarch(ARM_DRAIN_WRITEBUF, (void *)0);
>- #elif defined(__QNXNTO__)
>-   __cpu_membarrier();
>- #else
>-@@ -63,8 +70,9 @@ inline void MemoryBarrier() {
>-     defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) ||  \
>-     defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || \
>-     defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) ||  \
>--    defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || \
>--    defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__)
>-+    defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6KZ__) || \
>-+    defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || \
>-+    defined(__ARM_ARCH_6T2__)
>- 
>- inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
>-                                          Atomic32 old_value,
>diff --git a/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc b/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc
>index aad1b10..ee23dc8a 100644
>--- a/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc
>+++ b/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc
>@@ -1,6 +1,6 @@
>---- deps/v8/src/base/platform/platform-freebsd.cc.orig	2016-01-19 17:19:28 UTC
>+--- deps/v8/src/base/platform/platform-freebsd.cc.orig	2016-06-02 21:53:45 UTC
> +++ deps/v8/src/base/platform/platform-freebsd.cc
>-@@ -36,6 +36,48 @@
>+@@ -35,6 +35,48 @@
>  namespace v8 {
>  namespace base {
>  
>diff --git a/www/node/files/patch-deps_v8_src_log-utils.h b/www/node/files/patch-deps_v8_src_log-utils.h
>index c681953..df91005 100644
>--- a/www/node/files/patch-deps_v8_src_log-utils.h
>+++ b/www/node/files/patch-deps_v8_src_log-utils.h
>@@ -1,8 +1,8 @@
>---- deps/v8/src/log-utils.h.orig	2015-12-09 04:12:52 UTC
>+--- deps/v8/src/log-utils.h.orig	2016-06-02 21:53:46 UTC
> +++ deps/v8/src/log-utils.h
>-@@ -5,6 +5,9 @@
>- #ifndef V8_LOG_UTILS_H_
>- #define V8_LOG_UTILS_H_
>+@@ -9,6 +9,9 @@
>+ 
>+ #include <cstdarg>
>  
> +#include <cstdio>
> +#include <cstdarg>
>diff --git a/www/node/files/patch-deps_v8_src_profiler_sampler.cc b/www/node/files/patch-deps_v8_src_profiler_sampler.cc
>index dc300f5..f59a561 100644
>--- a/www/node/files/patch-deps_v8_src_profiler_sampler.cc
>+++ b/www/node/files/patch-deps_v8_src_profiler_sampler.cc
>@@ -1,5 +1,5 @@
>---- ./deps/v8/src/profiler/sampler.cc.orig	2016-05-06 11:58:26 UTC
>-+++ ./deps/v8/src/profiler/sampler.cc
>+--- deps/v8/src/profiler/sampler.cc.orig	2016-06-02 21:53:46 UTC
>++++ deps/v8/src/profiler/sampler.cc
> @@ -515,9 +515,9 @@ void SignalHandler::HandleProfilerSignal
>    state.sp = reinterpret_cast<Address>(mcontext.mc_rsp);
>    state.fp = reinterpret_cast<Address>(mcontext.mc_rbp);

Flags:

bhughes: maintainer-approval+

Actions: View

Attachments on bug 210619: 171861