From c5837eabcbba507757ec86da364519198c16a6d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20B=C3=B8e?= Date: Tue, 12 Feb 2019 16:16:54 +0100 Subject: [PATCH] ld: Change the name of input section .gdt_ram_data to gdt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The arch/x86/CMakeLists.txt build scripts names five sections that are generated from .bin files. Two of them are named the same as the .bin file, and the other three are named inconsistently. To be consistent, we will rename the three that are named inconistenly to align with the two that are named as the .bin file. Being consistent simplifies the system and fosters code-reuse. This patch renames gdt. Signed-off-by: Sebastian Bøe --- arch/x86/CMakeLists.txt | 2 +- include/arch/x86/linker.ld | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/CMakeLists.txt b/arch/x86/CMakeLists.txt index 049f6e52be1..3d4729e3041 100644 --- a/arch/x86/CMakeLists.txt +++ b/arch/x86/CMakeLists.txt @@ -234,7 +234,7 @@ if(CONFIG_GDT_DYNAMIC) -I binary -B ${OUTPUT_ARCH} -O ${OUTPUT_FORMAT} - --rename-section .data=gdt_ram_data + --rename-section .data=gdt gdt.bin gdt.o WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} diff --git a/include/arch/x86/linker.ld b/include/arch/x86/linker.ld index d5ca64886aa..7924df82560 100644 --- a/include/arch/x86/linker.ld +++ b/include/arch/x86/linker.ld @@ -331,7 +331,7 @@ SECTIONS . = ALIGN(8); _gdt = .; #ifdef LINKER_PASS2 - KEEP(*(gdt_ram_data)) + KEEP(*(gdt)) #else /* LINKER_PASS2 */ #ifdef CONFIG_USERSPACE