From 28d36301e0198eb02f8932e0639a9ce4ec66d1fe Mon Sep 17 00:00:00 2001 From: ohk990102 Date: Thu, 4 Jun 2020 12:37:03 +0900 Subject: [PATCH 1/2] [Fix] add some entry in linker script --- arch/x86/boot/linker.cmake.ld | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/boot/linker.cmake.ld b/arch/x86/boot/linker.cmake.ld index 6f87ec23f..8f092a071 100644 --- a/arch/x86/boot/linker.cmake.ld +++ b/arch/x86/boot/linker.cmake.ld @@ -41,6 +41,7 @@ SECTIONS .rodata : AT ( (LOADADDR (.text) + SIZEOF (.text) + 0xFFF) & 0xFFFFFFFFFFFFF000 ) { *(.rodata) + *(.rodata.*) } . = ALIGN(0x1000); @@ -48,6 +49,7 @@ SECTIONS .data : AT ( (LOADADDR (.rodata) + SIZEOF (.rodata) + 0xFFF) & 0xFFFFFFFFFFFFF000 ) { *(.data) + *(.data.*) } . = ALIGN(0x1000); @@ -56,6 +58,7 @@ SECTIONS { *(COMMON) *(.bss) + *(.bss.*) } _kernel_virtual_end = .; From d5182668c3e8af9f2b503ecceb66b61f9d6f34cb Mon Sep 17 00:00:00 2001 From: ohk990102 Date: Thu, 4 Jun 2020 12:37:34 +0900 Subject: [PATCH 2/2] Revert "[Fix] eh_frame overlap issue resolved" This reverts commit bb797587c63a7594f1778867421829e503cc4bab. --- arch/x86/defconfig.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/defconfig.cmake b/arch/x86/defconfig.cmake index d9fdff50b..344c3c714 100644 --- a/arch/x86/defconfig.cmake +++ b/arch/x86/defconfig.cmake @@ -1,7 +1,6 @@ set(LINKER_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/boot/linker.cmake.ld) -# https://github.com/cliffordwolf/picorv32/issues/124 -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffreestanding -fomit-frame-pointer -fno-exceptions -fno-asynchronous-unwind-tables -fno-unwind-tables -fno-exceptions -fno-rtti -fPIC -fno-pie -no-pie -mcmodel=kernel") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffreestanding -fno-exceptions -fno-rtti -fPIC -fno-pie -no-pie -mcmodel=kernel") if(CMAKE_BUILD_TYPE EQUAL "RELEASE") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")