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

LibC: Link statically with libstdc++

Browse source 
This allows us to have the implementation of __cxa_demangle in libc.so.
This commit is contained in:
Itamar 2020-11-13 14:47:00 +02:00 • committed by Andreas Kling
parent 706a8c05fd
commit dfdd977a82
3 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Libraries/LibC/CMakeLists.txt
View file

@ -66,7 +66,7 @@ add_custom_command(
) )
set(SOURCES ${LIBC_SOURCES} ${AK_SOURCES} ${ELF_SOURCES}) set(SOURCES ${LIBC_SOURCES} ${AK_SOURCES} ${ELF_SOURCES})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdlib") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libstdc++")
serenity_libc(LibC c) serenity_libc(LibC c)
target_link_libraries(LibC crt0) target_link_libraries(LibC crt0)
add_dependencies(LibC LibM) add_dependencies(LibC LibM)

5
Libraries/LibELF/DynamicObject.cpp
View file

@ -420,11 +420,6 @@ Elf32_Addr DynamicObject::patch_plt_entry(u32 relocation_offset)
ASSERT(relocation.type() == R_386_JMP_SLOT); ASSERT(relocation.type() == R_386_JMP_SLOT);
auto sym = relocation.symbol(); auto sym = relocation.symbol();
if (StringView { sym.name() } == "__cxa_demangle") {
dbgln("__cxa_demangle is currently not supported for shared objects");
// FIXME: Where is it defined?
ASSERT_NOT_REACHED();
}
u8* relocation_address = relocation.address().as_ptr(); u8* relocation_address = relocation.address().as_ptr();
auto res = lookup_symbol(sym); auto res = lookup_symbol(sym);

5
Libraries/LibELF/Loader.cpp
View file

@ -264,10 +264,7 @@ String Loader::symbolicate(u32 address, u32* out_offset) const
#else #else
auto& demangled_name = symbol.demangled_name; auto& demangled_name = symbol.demangled_name;
if (demangled_name.is_null()) { if (demangled_name.is_null()) {
demangled_name = demangle(symbol.name);
// FIXME: Temporarily disabled demangling since it is currently not supported with shared libraries
demangled_name = symbol.name;
// demangled_name = demangle(symbol.name);
} }
#endif #endif