diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-04-06 14:21:47 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-04-06 14:21:47 +0000 |
| commit | 753435f2c9dad50fb4449084c2fee5bfc6178c77 (patch) | |
| tree | 65c026fd11a607944f667cf26d97c89a43f328ae | |
| parent | 5e4acd14d9941cb3113ff1d8ee8234e09c39d6d1 (diff) | |
| download | packages-753435f2c9dad50fb4449084c2fee5bfc6178c77.tar.gz packages-753435f2c9dad50fb4449084c2fee5bfc6178c77.tar.bz2 packages-753435f2c9dad50fb4449084c2fee5bfc6178c77.tar.xz packages-753435f2c9dad50fb4449084c2fee5bfc6178c77.zip | |
user/node: ensure PPC32 fix doesn't break PPC64
| -rw-r--r-- | user/node/APKBUILD | 2 | ||||
| -rw-r--r-- | user/node/ppc32.patch | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/user/node/APKBUILD b/user/node/APKBUILD index f4dbbbbf0..ba3ff6807 100644 --- a/user/node/APKBUILD +++ b/user/node/APKBUILD @@ -66,6 +66,6 @@ package() { sha512sums="cf741f733af7a7e1fbd37b0f98110078494b4771dbdfccacfda95a5ea4cda6cdcea4f8d31dddcf27477213614e4ab6cf7d1a1f900cb92936333730737ac4f9e8 node-v10.15.3.tar.xz 27ea43eb45fc68f3d2469d5f07636e10801dee11635a430ec8ec922ed790bb426b072da94df885e4dfa1ea8b7a24f2f56dd92f9b0f51e162330f161216bd6de6 Python-2.7.15.tar.xz 8f64922d586bce9d82c83042a989739cc55ecc5e015778cdfbda21c257aa50527ddb18740985bcb2068e4a749b71eb8a135d9a8152b374d361589df7f33c9b60 libatomic.patch -afe6ced1d6dc56ef1be9fba03b84eb23ff21949939dda5b84543a14e34c987d37a0067fdc38c45a622aa2e74d6572fea393c05e59e3c1799f23d87f6e2495302 ppc32.patch +d369cd9685e372368af11ea763defdde7afc789ce5e2f617b47174fb4d45003d6e494a00ef92c9ed098c49c189d1690edf9ce780448a5b4a5b072c20ea35ab95 ppc32.patch 583326353de5b0ac14a6c42321f6b031bd943a80550624794e15bd7526470f67bfa14a66558db3c94b4ee2db3053d2e4efed2117f4e7b6dca3c59c171048c094 ppc64.patch 3ea09e36ed0cc31e0475ebc9c92b7609b70e9c1637c5db6c92cf1d6363fb8c6f884ffa20dd81054ca390b721695185327d80c9eeff0688a959e9d46947602471 stack-silliness.patch" diff --git a/user/node/ppc32.patch b/user/node/ppc32.patch index 35270fba6..80b97993c 100644 --- a/user/node/ppc32.patch +++ b/user/node/ppc32.patch @@ -1,15 +1,18 @@ --- node-v10.15.3/deps/v8/src/libsampler/sampler.cc.old 2019-03-05 15:16:28.000000000 +0000 +++ node-v10.15.3/deps/v8/src/libsampler/sampler.cc 2019-04-06 13:44:07.224653262 +0000 -@@ -502,9 +502,9 @@ +@@ -502,9 +502,15 @@ reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]); #else // Some C libraries, notably Musl, define the regs member as a void pointer -- state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]); -- state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]); -- state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]); ++ #if !V8_TARGET_ARCH_32_BIT + state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]); + state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]); + state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]); ++ #else + state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]); + state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]); + state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]); ++ #endif #endif #elif V8_HOST_ARCH_S390 #if V8_TARGET_ARCH_32_BIT |