From d515315a8627b4e8f3f189c9ad0b4a529c0b2b13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20B=C3=B8e?= Date: Tue, 12 Feb 2019 16:19:05 +0100 Subject: [PATCH] ld: Change the name of input section irq_vectors_alloc_data 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 irq_vectors_alloc_data. 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 3d4729e3041..ef38371d73c 100644 --- a/arch/x86/CMakeLists.txt +++ b/arch/x86/CMakeLists.txt @@ -108,7 +108,7 @@ add_custom_command( -I binary -B ${OUTPUT_ARCH} -O ${OUTPUT_FORMAT} - --rename-section .data=irq_vectors_alloc_data + --rename-section .data=irq_vectors_alloc irq_vectors_alloc.bin irq_vectors_alloc.o DEPENDS gen_idt_output irq_vectors_alloc.bin diff --git a/include/arch/x86/linker.ld b/include/arch/x86/linker.ld index 7924df82560..c553201633a 100644 --- a/include/arch/x86/linker.ld +++ b/include/arch/x86/linker.ld @@ -290,7 +290,7 @@ SECTIONS z_interrupt_vectors_allocated = .; #ifdef LINKER_PASS2 - KEEP(*(irq_vectors_alloc_data)) + KEEP(*(irq_vectors_alloc)) #else . += (CONFIG_IDT_NUM_VECTORS + 7) / 8; #endif /* LINKER_PASS2 */