diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-04-28 14:43:40 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-05-11 10:25:53 +0200 |
commit | c6c324c9044095c1cb93e4973d324e47f7e9e44e (patch) | |
tree | 24dbfaeaaaad972d90843457713f868e3f1860b9 /meta-oe/recipes-devtools/nodejs | |
parent | f28cf96518c0ba4641abb008fcc72b8138ea04cb (diff) | |
download | meta-openembedded-contrib-c6c324c9044095c1cb93e4973d324e47f7e9e44e.tar.gz |
nodejs: fix qemuarm build without thumb and drop unused patch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/nodejs')
3 files changed, 25 insertions, 61 deletions
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-gcc-has-a-builtin-define-to-denote-hard-abi-when-in-.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-gcc-has-a-builtin-define-to-denote-hard-abi-when-in-.patch deleted file mode 100644 index 6268d6940e..0000000000 --- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-gcc-has-a-builtin-define-to-denote-hard-abi-when-in-.patch +++ /dev/null @@ -1,60 +0,0 @@ -From bf701e7cb3616631a354ed9ecbed6dd16f60c60d Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Wed, 30 Jan 2013 10:43:47 +0100 -Subject: [PATCH] gcc has a builtin define to denote hard abi when in use, e.g. - when using -mfloat-abi=hard it will define __ARM_PCS_VFP to 1 and therefore - we should check that to determine which calling convention is in use and not - __VFP_FP__ which merely indicates presence of VFP unit - -The fix has been provided by Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Forwarded - -Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> ---- - deps/v8/src/arm/assembler-arm.cc | 4 ++-- - deps/v8/src/platform-linux.cc | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/deps/v8/src/arm/assembler-arm.cc b/deps/v8/src/arm/assembler-arm.cc -index 1787d15..c64ef58 100644 ---- a/deps/v8/src/arm/assembler-arm.cc -+++ b/deps/v8/src/arm/assembler-arm.cc -@@ -71,10 +71,10 @@ static unsigned CpuFeaturesImpliedByCompiler() { - // If the compiler is allowed to use VFP then we can use VFP too in our code - // generation even when generating snapshots. ARMv7 and hardware floating - // point support implies VFPv3, see ARM DDI 0406B, page A1-6. --#if defined(CAN_USE_ARMV7_INSTRUCTIONS) && defined(__VFP_FP__) \ -+#if defined(CAN_USE_ARMV7_INSTRUCTIONS) && defined(__ARM_PCS_VFP) \ - && !defined(__SOFTFP__) - answer |= 1u << VFP3 | 1u << ARMv7 | 1u << VFP2; --#endif // defined(CAN_USE_ARMV7_INSTRUCTIONS) && defined(__VFP_FP__) -+#endif // defined(CAN_USE_ARMV7_INSTRUCTIONS) && defined(__ARM_PCS_VFP) - // && !defined(__SOFTFP__) - #endif // _arm__ - -diff --git a/deps/v8/src/platform-linux.cc b/deps/v8/src/platform-linux.cc -index ed9eb79..10d1879 100644 ---- a/deps/v8/src/platform-linux.cc -+++ b/deps/v8/src/platform-linux.cc -@@ -170,7 +170,7 @@ bool OS::ArmCpuHasFeature(CpuFeature feature) { - // calling this will return 1.0 and otherwise 0.0. - static void ArmUsingHardFloatHelper() { - asm("mov r0, #0":::"r0"); --#if defined(__VFP_FP__) && !defined(__SOFTFP__) -+#if defined(__ARM_PCS_VFP) && !defined(__SOFTFP__) - // Load 0x3ff00000 into r1 using instructions available in both ARM - // and Thumb mode. - asm("mov r1, #3":::"r1"); -@@ -195,7 +195,7 @@ static void ArmUsingHardFloatHelper() { - #else - asm("vmov d0, r0, r1"); - #endif // __thumb__ --#endif // defined(__VFP_FP__) && !defined(__SOFTFP__) -+#endif // defined(__ARM_PCS_VFP) && !defined(__SOFTFP__) - asm("mov r1, #0":::"r1"); - } - --- -1.8.1 - diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/enable-armv5e-build.patch b/meta-oe/recipes-devtools/nodejs/nodejs/enable-armv5e-build.patch new file mode 100644 index 0000000000..cc7c9ab570 --- /dev/null +++ b/meta-oe/recipes-devtools/nodejs/nodejs/enable-armv5e-build.patch @@ -0,0 +1,22 @@ +Building for qemuarm without thumb enabled is using -march=armv5e which isn't +recognized here. Fix it by adding __ARM_ARCH_5E__. + +v0.12.2 branch of node doesn't seem to be affected, because it's using +different version of v8 + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + +diff -uNr node-v0.12.2/deps/v8/src/base/atomicops_internals_arm_gcc.h node-v0.12.2-fix/deps/v8/src/base/atomicops_internals_arm_gcc.h +--- node-v0.12.2/deps/v8/src/base/atomicops_internals_arm_gcc.h 2015-04-01 00:13:01.000000000 +0200 ++++ node-v0.12.2-fix/deps/v8/src/base/atomicops_internals_arm_gcc.h 2015-04-28 14:30:43.119509207 +0200 +@@ -156,7 +156,7 @@ + + // This tests against any known ARMv5 variant. + #elif defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || \ +- defined(__ARM_ARCH_5TE__) || defined(__ARM_ARCH_5TEJ__) ++ defined(__ARM_ARCH_5E__) || defined(__ARM_ARCH_5TE__) || defined(__ARM_ARCH_5TEJ__) + + // The kernel also provides a helper function to perform an atomic + // compare-and-swap operation at the hard-wired address 0xffff0fc0. diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_0.12.2.bb b/meta-oe/recipes-devtools/nodejs/nodejs_0.12.2.bb index 945d9b4025..0e789f976c 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_0.12.2.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_0.12.2.bb @@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=14115ff11211df04b031ec7d40b6d31b" DEPENDS = "openssl" -SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz" +SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz \ + file://enable-armv5e-build.patch \ +" SRC_URI[md5sum] = "b7f4a9f2e361a7026789a7d6c45a6d30" SRC_URI[sha256sum] = "ac7e78ade93e633e7ed628532bb8e650caba0c9c33af33581957f3382e2a772d" |