mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-09-30 00:31:14 +00:00
Kernel: Use the C preprocessor to avoid two copies of the linker script
This commit is contained in:
parent
56f952a5f2
commit
2019cf3289
Notes:
sideshowbarker
2024-07-18 08:41:46 +09:00
Author: https://github.com/gunnarbeutner Commit: https://github.com/SerenityOS/serenity/commit/2019cf3289e Pull-request: https://github.com/SerenityOS/serenity/pull/8891 Reviewed-by: https://github.com/ADKaster Reviewed-by: https://github.com/dascandy
|
@ -356,11 +356,9 @@ endif()
|
||||||
if ("${SERENITY_ARCH}" STREQUAL "x86_64")
|
if ("${SERENITY_ARCH}" STREQUAL "x86_64")
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcmodel=large -fno-pic -mno-red-zone")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcmodel=large -fno-pic -mno-red-zone")
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -faligned-new=8")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -faligned-new=8")
|
||||||
set(KERNEL_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/linker_amd64.ld)
|
|
||||||
else()
|
else()
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pie -fPIE")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pie -fPIE")
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -faligned-new=4")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -faligned-new=4")
|
||||||
set(KERNEL_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/linker_i386.ld)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Kernel Undefined Behavior Sanitizer (KUBSAN)
|
# Kernel Undefined Behavior Sanitizer (KUBSAN)
|
||||||
|
@ -396,8 +394,18 @@ endif()
|
||||||
add_executable(Kernel ${SOURCES})
|
add_executable(Kernel ${SOURCES})
|
||||||
add_dependencies(Kernel generate_EscapeSequenceStateMachine.h)
|
add_dependencies(Kernel generate_EscapeSequenceStateMachine.h)
|
||||||
|
|
||||||
target_link_options(Kernel PRIVATE LINKER:-T ${KERNEL_LINKER_SCRIPT} -nostdlib)
|
add_custom_command(
|
||||||
set_target_properties(Kernel PROPERTIES LINK_DEPENDS ${KERNEL_LINKER_SCRIPT})
|
OUTPUT linker.ld
|
||||||
|
COMMAND "${CMAKE_CXX_COMPILER}" -E -P -x c -I${CMAKE_CURRENT_SOURCE_DIR}/.. "${CMAKE_CURRENT_SOURCE_DIR}/linker.ld" -o "${CMAKE_CURRENT_BINARY_DIR}/linker.ld"
|
||||||
|
MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/linker.ld"
|
||||||
|
COMMENT "Preprocessing linker.ld"
|
||||||
|
VERBATIM
|
||||||
|
)
|
||||||
|
|
||||||
|
add_custom_target(generate_kernel_linker_script DEPENDS linker.ld)
|
||||||
|
|
||||||
|
target_link_options(Kernel PRIVATE LINKER:-T ${CMAKE_CURRENT_BINARY_DIR}/linker.ld -nostdlib)
|
||||||
|
set_target_properties(Kernel PROPERTIES LINK_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/linker.ld")
|
||||||
|
|
||||||
if (ENABLE_KERNEL_LTO)
|
if (ENABLE_KERNEL_LTO)
|
||||||
include(CheckIPOSupported)
|
include(CheckIPOSupported)
|
||||||
|
|
|
@ -1,6 +1,14 @@
|
||||||
|
#include <AK/Platform.h>
|
||||||
|
|
||||||
ENTRY(init)
|
ENTRY(init)
|
||||||
|
|
||||||
KERNEL_VIRTUAL_BASE = 0x2000000000;
|
#if ARCH(I386)
|
||||||
|
# define KERNEL_BASE 0xc0000000
|
||||||
|
#else
|
||||||
|
# define KERNEL_BASE 0x2000000000
|
||||||
|
#endif
|
||||||
|
|
||||||
|
KERNEL_VIRTUAL_BASE = KERNEL_BASE;
|
||||||
|
|
||||||
PHDRS
|
PHDRS
|
||||||
{
|
{
|
|
@ -1,96 +0,0 @@
|
||||||
ENTRY(init)
|
|
||||||
|
|
||||||
KERNEL_VIRTUAL_BASE = 0xc0000000;
|
|
||||||
|
|
||||||
PHDRS
|
|
||||||
{
|
|
||||||
super_pages PT_LOAD ;
|
|
||||||
text PT_LOAD ;
|
|
||||||
data PT_LOAD ;
|
|
||||||
bss PT_LOAD ;
|
|
||||||
ksyms PT_LOAD ;
|
|
||||||
}
|
|
||||||
|
|
||||||
SECTIONS
|
|
||||||
{
|
|
||||||
. = KERNEL_VIRTUAL_BASE + 0x00200000;
|
|
||||||
|
|
||||||
start_of_kernel_image = .;
|
|
||||||
|
|
||||||
.super_pages ALIGN(4K) (NOLOAD) : AT (ADDR(.super_pages) - KERNEL_VIRTUAL_BASE)
|
|
||||||
{
|
|
||||||
*(.super_pages)
|
|
||||||
} :super_pages
|
|
||||||
|
|
||||||
.text ALIGN(4K) : AT (ADDR(.text) - KERNEL_VIRTUAL_BASE)
|
|
||||||
{
|
|
||||||
start_of_kernel_text = .;
|
|
||||||
|
|
||||||
start_of_safemem_text = .;
|
|
||||||
KEEP(*(.text.safemem))
|
|
||||||
end_of_safemem_text = .;
|
|
||||||
start_of_safemem_atomic_text = .;
|
|
||||||
KEEP(*(.text.safemem.atomic))
|
|
||||||
end_of_safemem_atomic_text = .;
|
|
||||||
|
|
||||||
*(.text*)
|
|
||||||
} :text
|
|
||||||
|
|
||||||
.unmap_after_init ALIGN(4K) : AT (ADDR(.unmap_after_init) - KERNEL_VIRTUAL_BASE)
|
|
||||||
{
|
|
||||||
start_of_unmap_after_init = .;
|
|
||||||
*(.unmap_after_init*);
|
|
||||||
end_of_unmap_after_init = .;
|
|
||||||
|
|
||||||
end_of_kernel_text = .;
|
|
||||||
} :text
|
|
||||||
|
|
||||||
.rodata ALIGN(4K) : AT (ADDR(.rodata) - KERNEL_VIRTUAL_BASE)
|
|
||||||
{
|
|
||||||
start_heap_ctors = .;
|
|
||||||
*libkernel_heap.a:*(.ctors)
|
|
||||||
end_heap_ctors = .;
|
|
||||||
|
|
||||||
start_ctors = .;
|
|
||||||
*(.ctors)
|
|
||||||
end_ctors = .;
|
|
||||||
|
|
||||||
*(.rodata*)
|
|
||||||
} :data
|
|
||||||
|
|
||||||
.data ALIGN(4K) : AT (ADDR(.data) - KERNEL_VIRTUAL_BASE)
|
|
||||||
{
|
|
||||||
start_of_kernel_data = .;
|
|
||||||
*(.data*)
|
|
||||||
end_of_kernel_data = .;
|
|
||||||
} :data
|
|
||||||
|
|
||||||
.ro_after_init ALIGN(4K) (NOLOAD) : AT(ADDR(.ro_after_init) - KERNEL_VIRTUAL_BASE)
|
|
||||||
{
|
|
||||||
start_of_ro_after_init = .;
|
|
||||||
*(.ro_after_init);
|
|
||||||
end_of_ro_after_init = .;
|
|
||||||
} :data
|
|
||||||
|
|
||||||
.bss ALIGN(4K) (NOLOAD) : AT (ADDR(.bss) - KERNEL_VIRTUAL_BASE)
|
|
||||||
{
|
|
||||||
start_of_kernel_bss = .;
|
|
||||||
*(page_tables)
|
|
||||||
*(COMMON)
|
|
||||||
*(.bss)
|
|
||||||
end_of_kernel_bss = .;
|
|
||||||
|
|
||||||
. = ALIGN(4K);
|
|
||||||
*(.heap)
|
|
||||||
} :bss
|
|
||||||
|
|
||||||
|
|
||||||
.ksyms ALIGN(4K) : AT (ADDR(.ksyms) - KERNEL_VIRTUAL_BASE)
|
|
||||||
{
|
|
||||||
start_of_kernel_ksyms = .;
|
|
||||||
*(.kernel_symbols)
|
|
||||||
end_of_kernel_ksyms = .;
|
|
||||||
} :ksyms
|
|
||||||
|
|
||||||
end_of_kernel_image = .;
|
|
||||||
}
|
|
Loading…
Reference in a new issue