RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 07:07:34 +00:00
Code Issues Activity Actions

LibC: Add libc.so

Browse source 
We now compile everything with -static flag so libc.a would be use
This commit is contained in:
Itamar 2020-10-16 12:57:15 +03:00 • committed by Andreas Kling
parent 09ccdc697b
commit 58c583f584
5 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -135,6 +135,16 @@ function(serenity_libc target_name fs_name)
serenity_generated_sources(${target_name}) serenity_generated_sources(${target_name})
endfunction() endfunction()
function(serenity_libc_shared target_name fs_name)
serenity_install_headers("")
serenity_install_sources("Libraries/LibC")
add_library(${target_name} SHARED ${SOURCES})
install(TARGETS ${target_name} DESTINATION usr/lib)
set_target_properties(${target_name} PROPERTIES OUTPUT_NAME ${fs_name})
target_link_directories(LibC PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
serenity_generated_sources(${target_name})
endfunction()
function(serenity_bin target_name) function(serenity_bin target_name)
add_executable(${target_name} ${SOURCES}) add_executable(${target_name} ${SOURCES})
install(TARGETS ${target_name} RUNTIME DESTINATION bin) install(TARGETS ${target_name} RUNTIME DESTINATION bin)
@ -210,6 +220,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Os -g1 -fno-exceptions -fno-rtti -Wno-a
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffile-prefix-map=${CMAKE_SOURCE_DIR}=.") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffile-prefix-map=${CMAKE_SOURCE_DIR}=.")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDEBUG -DSANITIZE_PTRS") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDEBUG -DSANITIZE_PTRS")
set(CMAKE_CXX_FLAGS_WITHOUT_STATIC ${CMAKE_CXX_FLAGS})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static")
add_link_options(--sysroot ${CMAKE_BINARY_DIR}/Root) add_link_options(--sysroot ${CMAKE_BINARY_DIR}/Root)
include_directories(Libraries/LibC) include_directories(Libraries/LibC)

2
Demos/DynamicObject/CMakeLists.txt
View file

@ -3,7 +3,7 @@ set(SOURCES
../../Libraries/LibC/crt0_shared.cpp ../../Libraries/LibC/crt0_shared.cpp
) )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostartfiles -pie -fpic") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_WITHOUT_STATIC} -nostartfiles -pie -fpic")
serenity_bin(DynamicObjectDemo) serenity_bin(DynamicObjectDemo)
target_link_libraries(DynamicObjectDemo SampleLib LibCShared) target_link_libraries(DynamicObjectDemo SampleLib LibCShared)

2
Demos/DynamicObject/SampleLib/CMakeLists.txt
View file

@ -3,7 +3,7 @@ set(SOURCES
lib.cpp lib.cpp
) )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdlib -fpic") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_WIHTOUT_STATIC} -nostdlib -fpic")
add_library(SampleLib SHARED ${SOURCES}) add_library(SampleLib SHARED ${SOURCES})
target_link_libraries(SampleLib LibCShared) target_link_libraries(SampleLib LibCShared)

7
Libraries/LibC/CMakeLists.txt
View file

@ -70,5 +70,8 @@ serenity_libc(LibC c)
target_link_libraries(LibC crt0) target_link_libraries(LibC crt0)
add_dependencies(LibC LibM) add_dependencies(LibC LibM)
add_library(LibCShared SHARED ${SOURCES}) set(SOURCES ${SOURCES} "crt0_shared.cpp")
install(TARGETS LibCShared DESTINATION usr/lib) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdlib")
serenity_libc_shared(LibCShared c)
#add_library(LibCShared SHARED ${SOURCES})
#install(TARGETS LibCShared DESTINATION usr/lib)

4
Libraries/LibC/crt0_shared.cpp
View file

@ -22,9 +22,11 @@ int _start(int argc, char** argv, char** env)
__environ_is_malloced = false; __environ_is_malloced = false;
__libc_init(); __libc_init();
_init(); // _init();
int status = main(argc, argv, environ); int status = main(argc, argv, environ);
return status; return status;
} }
} }
void* __dso_handle = nullptr;