diff options
| author | Khem Raj <khem.raj@oss.qualcomm.com> | 2026-05-24 08:28:18 -0700 |
|---|---|---|
| committer | Khem Raj <khem.raj@oss.qualcomm.com> | 2026-06-07 18:21:34 -0700 |
| commit | f3521aa7abfd48fb4d70c79bd707c08ce0efb6db (patch) | |
| tree | 8368bc5797f1e603ece22c4fb0099a3b7246de4c /meta-oe | |
| parent | 1f265bd73deee6142a6dca9fd80d0708715cbc5b (diff) | |
| download | meta-openembedded-f3521aa7abfd48fb4d70c79bd707c08ce0efb6db.tar.gz | |
nodejs: Delete clang libatomic patch
This patch is not right and moreover not needed anymore
with latest clang
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs-24/0005-libatomic.patch | 95 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs_24.16.0.bb | 1 |
2 files changed, 0 insertions, 96 deletions
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-24/0005-libatomic.patch b/meta-oe/recipes-devtools/nodejs/nodejs-24/0005-libatomic.patch deleted file mode 100644 index a61b28f2f8..0000000000 --- a/meta-oe/recipes-devtools/nodejs/nodejs-24/0005-libatomic.patch +++ /dev/null | |||
| @@ -1,95 +0,0 @@ | |||
| 1 | From 15e751e4b79475fb34e4b32a3ca54119b20c564a Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 3 | Date: Sat, 17 Aug 2024 21:33:18 +0800 | ||
| 4 | Subject: [PATCH] link libatomic for clang conditionally | ||
| 5 | |||
| 6 | Clang emits atomic builtin, explicitly link libatomic conditionally: | ||
| 7 | - For target build, always link -latomic for clang as usual | ||
| 8 | - For host build, if host and target have same bit width, cross compiling | ||
| 9 | is enabled, and host toolchain is gcc which does not link -latomic; | ||
| 10 | if host and target have different bit width, no cross compiling, | ||
| 11 | host build is the same with target build that requires to link | ||
| 12 | -latomic; | ||
| 13 | |||
| 14 | Fix: | ||
| 15 | |tmp-glibc/work/core2-64-wrs-linux/nodejs/20.13.0/node-v20.13.0/out/Release/node_js2c: error while loading shared libraries: libatomic.so.1: cannot open shared object file: No such file or directory | ||
| 16 | |||
| 17 | Upstream-Status: Inappropriate [OE specific] | ||
| 18 | |||
| 19 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 20 | |||
| 21 | Added libatomic library explicitly to x86 targets. | ||
| 22 | |||
| 23 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 24 | --- | ||
| 25 | node.gyp | 13 ++++++++++++- | ||
| 26 | tools/v8_gypfiles/v8.gyp | 29 ++++++++++++++++++++++++----- | ||
| 27 | 2 files changed, 36 insertions(+), 6 deletions(-) | ||
| 28 | |||
| 29 | --- a/node.gyp | ||
| 30 | +++ b/node.gyp | ||
| 31 | @@ -503,7 +503,18 @@ | ||
| 32 | ], | ||
| 33 | }], | ||
| 34 | ['OS=="linux" and clang==1', { | ||
| 35 | - 'libraries': ['-latomic'], | ||
| 36 | + 'target_conditions': [ | ||
| 37 | + ['_toolset=="host"', { | ||
| 38 | + 'conditions': [ | ||
| 39 | + ['"<!(echo $HOST_AND_TARGET_SAME_WIDTH)"=="0"', { | ||
| 40 | + 'libraries': ['-latomic'], | ||
| 41 | + }], | ||
| 42 | + ], | ||
| 43 | + }], | ||
| 44 | + ['_toolset=="target"', { | ||
| 45 | + 'libraries': ['-latomic'], | ||
| 46 | + }], | ||
| 47 | + ], | ||
| 48 | }], | ||
| 49 | ], | ||
| 50 | }, | ||
| 51 | --- a/tools/v8_gypfiles/v8.gyp | ||
| 52 | +++ b/tools/v8_gypfiles/v8.gyp | ||
| 53 | @@ -1324,10 +1324,24 @@ | ||
| 54 | # Platforms that don't have Compare-And-Swap (CAS) support need to link atomic library | ||
| 55 | # to implement atomic memory access. | ||
| 56 | # Clang needs it for some atomic operations (https://clang.llvm.org/docs/Toolchain.html#atomics-library). | ||
| 57 | - ['(OS=="linux" and clang==1) or (v8_current_cpu in ["mips64", "mips64el", "arm", "riscv64", "loong64"])', { | ||
| 58 | - 'link_settings': { | ||
| 59 | - 'libraries': ['-latomic', ], | ||
| 60 | - }, | ||
| 61 | + ['(OS=="linux" and clang==1) or \ | ||
| 62 | + (v8_current_cpu in ["mips64", "mips64el", "arm", "riscv64", "loong64"])', { | ||
| 63 | + 'target_conditions': [ | ||
| 64 | + ['_toolset=="host"', { | ||
| 65 | + 'conditions': [ | ||
| 66 | + ['"<!(echo $HOST_AND_TARGET_SAME_WIDTH)"=="0"', { | ||
| 67 | + 'link_settings': { | ||
| 68 | + 'libraries': ['-latomic'], | ||
| 69 | + }, | ||
| 70 | + }], | ||
| 71 | + ], | ||
| 72 | + }], | ||
| 73 | + ['_toolset=="target"', { | ||
| 74 | + 'link_settings': { | ||
| 75 | + 'libraries': ['-latomic', ], | ||
| 76 | + }, | ||
| 77 | + }], | ||
| 78 | + ], | ||
| 79 | }], | ||
| 80 | ], | ||
| 81 | }, # v8_base_without_compiler | ||
| 82 | @@ -1793,6 +1805,13 @@ | ||
| 83 | ['enable_lto=="true"', { | ||
| 84 | 'ldflags': [ '-fno-lto' ], | ||
| 85 | }], | ||
| 86 | + # For future patch-rebases: this hunk is in mksnapshot target. | ||
| 87 | + # ia32 includes x86 also | ||
| 88 | + ['v8_target_arch=="ia32"', { | ||
| 89 | + 'link_settings': { | ||
| 90 | + 'libraries': ['-latomic'] | ||
| 91 | + } | ||
| 92 | + }], | ||
| 93 | ], | ||
| 94 | }, # mksnapshot | ||
| 95 | { | ||
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_24.16.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_24.16.0.bb index 4b9d9c7e19..af12dd3c10 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_24.16.0.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_24.16.0.bb | |||
| @@ -26,7 +26,6 @@ SRC_URI = "https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ | |||
| 26 | file://0002-v8-don-t-override-ARM-CFLAGS.patch \ | 26 | file://0002-v8-don-t-override-ARM-CFLAGS.patch \ |
| 27 | file://0003-system-c-ares.patch \ | 27 | file://0003-system-c-ares.patch \ |
| 28 | file://0004-liftoff-Correct-function-signatures.patch \ | 28 | file://0004-liftoff-Correct-function-signatures.patch \ |
| 29 | file://0005-libatomic.patch \ | ||
| 30 | file://0006-deps-disable-io_uring-support-in-libuv.patch \ | 29 | file://0006-deps-disable-io_uring-support-in-libuv.patch \ |
| 31 | file://0007-positional-args.patch \ | 30 | file://0007-positional-args.patch \ |
| 32 | file://0008-custom-env.patch \ | 31 | file://0008-custom-env.patch \ |
