RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 08:48:11 +00:00
Code Issues Activity Actions

Meta: Install 64-bit libgcc_s.so for x86_64 targets

Browse source
This commit is contained in:
Gunnar Beutner 2021-06-28 21:25:18 +02:00 • committed by Andreas Kling
parent 086b7a4537
commit 0cb937416b
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Meta/build-root-filesystem.sh
View file

@ -40,7 +40,8 @@ else
$CP -PdR "$SERENITY_SOURCE_DIR"/Base/* mnt/ $CP -PdR "$SERENITY_SOURCE_DIR"/Base/* mnt/
$CP -PdR Root/* mnt/ $CP -PdR Root/* mnt/
fi fi
$CP "$SERENITY_SOURCE_DIR"/Toolchain/Local/i686/i686-pc-serenity/lib/libgcc_s.so mnt/usr/lib/ SERENITY_ARCH="${SERENITY_ARCH:-i686}"
$CP "$SERENITY_SOURCE_DIR"/Toolchain/Local/"$SERENITY_ARCH"/"$SERENITY_ARCH"-pc-serenity/lib/libgcc_s.so mnt/usr/lib/
# If umask was 027 or similar when the repo was cloned, # If umask was 027 or similar when the repo was cloned,
# file permissions in Base/ are too restrictive. Restore # file permissions in Base/ are too restrictive. Restore
# the permissions needed in the image. # the permissions needed in the image.

2
Userland/Libraries/LibELF/DynamicLoader.cpp
View file

@ -70,6 +70,8 @@ DynamicLoader::DynamicLoader(int fd, String filename, void* data, size_t size)
m_valid = validate(); m_valid = validate();
if (m_valid) if (m_valid)
m_tls_size_of_current_object = calculate_tls_size(); m_tls_size_of_current_object = calculate_tls_size();
else
dbgln("Image validation failed for file {}", m_filename);
} }
DynamicLoader::~DynamicLoader() DynamicLoader::~DynamicLoader()