Skip to content

Commit f589961

Browse files
targosRafaelGSS
authored andcommitted
Revert "deps: make V8 compilable with older glibc"
This reverts commit 84d455e. PR-URL: #45162 Refs: #45118 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Beth Griggs <[email protected]> Reviewed-By: Mohammed Keyvanzadeh <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent afa8291 commit f589961

File tree

2 files changed

+20
-1
lines changed

2 files changed

+20
-1
lines changed

common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
# Reset this number to 0 on major V8 upgrades.
3838
# Increment by one for each non-official patch applied to deps/v8.
39-
'v8_embedder_string': '-node.17',
39+
'v8_embedder_string': '-node.18',
4040

4141
##### V8 defaults for Node.js #####
4242

deps/v8/src/base/platform/platform-posix.cc

+19
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,26 @@ void OS::FreeAddressSpaceReservation(AddressSpaceReservation reservation) {
618618
// Need to disable CFI_ICALL due to the indirect call to memfd_create.
619619
DISABLE_CFI_ICALL
620620
PlatformSharedMemoryHandle OS::CreateSharedMemoryHandleForTesting(size_t size) {
621+
#if V8_OS_LINUX && !V8_OS_ANDROID
622+
// Use memfd_create if available, otherwise mkstemp.
623+
using memfd_create_t = int (*)(const char*, unsigned int);
624+
memfd_create_t memfd_create =
625+
reinterpret_cast<memfd_create_t>(dlsym(RTLD_DEFAULT, "memfd_create"));
626+
int fd = -1;
627+
if (memfd_create) {
628+
fd = memfd_create("V8MemFDForTesting", 0);
629+
}
630+
if (fd == -1) {
631+
char filename[] = "/tmp/v8_tmp_file_for_testing_XXXXXX";
632+
fd = mkstemp(filename);
633+
if (fd != -1) CHECK_EQ(0, unlink(filename));
634+
}
635+
if (fd == -1) return kInvalidSharedMemoryHandle;
636+
CHECK_EQ(0, ftruncate(fd, size));
637+
return SharedMemoryHandleFromFileDescriptor(fd);
638+
#else
621639
return kInvalidSharedMemoryHandle;
640+
#endif
622641
}
623642

624643
// static

0 commit comments

Comments
 (0)