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

LibC+DynamicLoader: Move "transactional memory" GCC stubs to LibC

Browse source 
Instead of having a special case in the dynamic loader where we ignore
TM-related GCC symbols, just stub them out in LibC like we already do
for various other things we don't support.
This commit is contained in:
Andreas Kling 2021-02-24 14:54:26 +01:00
parent 069fd58381
commit 7db8ccc0e4
3 changed files with 38 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Userland/Libraries/LibC/CMakeLists.txt
View file

@ -32,6 +32,7 @@ set(LIBC_SOURCES
stdlib.cpp
string.cpp
strings.cpp
stubs.cpp
syslog.cpp
sys/prctl.cpp
sys/ptrace.cpp

37
Userland/Libraries/LibC/stubs.cpp Normal file
View file

@ -0,0 +1,37 @@
/*
* Copyright (c) 2021, Andreas Kling <kling@serenityos.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
extern "C" {
#define DO_STUB(name) \
void name(); \
void name() { }
DO_STUB(__register_frame_info);
DO_STUB(__deregister_frame_info);
DO_STUB(_ITM_registerTMCloneTable);
DO_STUB(_ITM_deregisterTMCloneTable);
}

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

@ -427,12 +427,6 @@ DynamicLoader::RelocationResult DynamicLoader::do_relocation(size_t total_tls_si
auto symbol = relocation.symbol();
auto res = lookup_symbol(symbol);
if (!res.has_value()) {
// We do not support these
// TODO: Can we tell gcc not to generate the piece of code that uses these?
// (--disable-tm-clone-registry flag in gcc configuration?)
if (symbol.name().is_one_of("__deregister_frame_info"sv, "_ITM_registerTMCloneTable"sv, "_ITM_deregisterTMCloneTable"sv, "__register_frame_info"sv))
break;
if (symbol.bind() == STB_WEAK)
return RelocationResult::ResolveLater;