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 = .;
diff --git a/arch/x86/defconfig.cmake b/arch/x86/defconfig.cmake
index b0deb0c9f..06f9db87f 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")