michaelh/zephyr
1
0
Fork 0
Code Releases Activity

cmake: rename linker_final_pass.cmd to linker.cmd

Browse source 
Since linker_final_pass.cmd is the actual linker script being
used to link the final Zephyr binary, rename it to linker.cmd.

This also renames LINKER_PASS2 to LINKER_ZEPHYR_FINAL simply
to clarify what it is used for, instead of ambiguous pass #n.

Signed-off-by: Daniel Leung <daniel.leung@intel.com>
This commit is contained in:
Daniel Leung 2021-03-19 12:18:52 -07:00 • committed by Anas Nashif
commit cdd02a99a1
7 changed files with 37 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

26
include/arch/x86/ia32/linker.ld
View file

@ -141,15 +141,15 @@ SECTIONS
#ifndef CONFIG_DYNAMIC_INTERRUPTS
. = ALIGN(8);
_idt_base_address = .;
#ifdef LINKER_PASS2
#ifdef LINKER_ZEPHYR_FINAL
KEEP(*(staticIdt))
#else
. += CONFIG_IDT_NUM_VECTORS * 8;
#endif /* LINKER_PASS2 */
#endif /* LINKER_ZEPHYR_FINAL */
. = ALIGN(4);
_irq_to_interrupt_vector = .;
#ifdef LINKER_PASS2
#ifdef LINKER_ZEPHYR_FINAL
KEEP(*(irq_int_vector_map))
#else
. += CONFIG_MAX_IRQ_LINES;
@ -255,18 +255,18 @@ SECTIONS
#ifdef CONFIG_DYNAMIC_INTERRUPTS
. = ALIGN(4);
_irq_to_interrupt_vector = .;
#ifdef LINKER_PASS2
#ifdef LINKER_ZEPHYR_FINAL
KEEP(*(irq_int_vector_map))
#else
. += CONFIG_MAX_IRQ_LINES;
#endif /* LINKER_PASS2 */
#endif /* LINKER_ZEPHYR_FINAL */
z_interrupt_vectors_allocated = .;
#ifdef LINKER_PASS2
#ifdef LINKER_ZEPHYR_FINAL
KEEP(*(irq_vectors_alloc))
#else
. += (CONFIG_IDT_NUM_VECTORS + 7) / 8;
#endif /* LINKER_PASS2 */
#endif /* LINKER_ZEPHYR_FINAL */
#endif /* CONFIG_DYNAMIC_INTERRUPTS */
/* Located in generated directory. This file is populated by the
@ -288,20 +288,20 @@ SECTIONS
#ifdef CONFIG_DYNAMIC_INTERRUPTS
. = ALIGN(8);
_idt_base_address = .;
#ifdef LINKER_PASS2
#ifdef LINKER_ZEPHYR_FINAL
KEEP(*(staticIdt))
#else
. += CONFIG_IDT_NUM_VECTORS * 8;
#endif /* LINKER_PASS2 */
#endif /* LINKER_ZEPHYR_FINAL */
#endif /* CONFIG_DYNAMIC_INTERRUPTS */
#ifdef CONFIG_GDT_DYNAMIC
KEEP(*(.tss))
. = ALIGN(8);
_gdt = .;
#ifdef LINKER_PASS2
#ifdef LINKER_ZEPHYR_FINAL
KEEP(*(gdt))
#else /* LINKER_PASS2 */
#else /* LINKER_ZEPHYR_FINAL */
#ifdef CONFIG_USERSPACE
#define GDT_NUM_ENTRIES 7
@ -311,7 +311,7 @@ SECTIONS
#define GDT_NUM_ENTRIES 3
#endif /* CONFIG_X86_USERSPACE */
. += GDT_NUM_ENTRIES * 8;
#endif /* LINKER_PASS2 */
#endif /* LINKER_ZEPHYR_FINAL */
#endif /* CONFIG_GDT_DYNAMIC */
#ifdef CONFIG_X86_KPTI
@ -354,7 +354,7 @@ SECTIONS
GROUP_END(RAMABLE_REGION)
#ifndef LINKER_PASS2
#ifndef LINKER_ZEPHYR_FINAL
/* static interrupts */
SECTION_PROLOGUE(intList,,)
{

8
include/arch/x86/pagetables.ld
View file

@ -13,11 +13,11 @@
{
. = ALIGN(4096);
z_x86_pagetables_start = .;
#ifdef LINKER_PASS2
#ifdef LINKER_ZEPHYR_FINAL
KEEP(*(pagetables)) /* gen_mmu.py */
#else
KEEP(*(.dummy_pagetables)) /* from x86_mmu.c, just an empty array */
#endif /* LINKER_PASS2 */
#endif /* LINKER_ZEPHYR_FINAL */
/* Top-level paging structure is the last thing in this section */
#if CONFIG_X86_PAE
@ -29,11 +29,11 @@
#endif /* CONFIG_X86_PAE */
} GROUP_DATA_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
#ifdef LINKER_PASS2
#ifdef LINKER_ZEPHYR_FINAL
/DISCARD/ :
{
/* We have the real ones in this build */
*(.dummy_pagetables)
}
#endif /* LINKER_PASS2 */
#endif /* LINKER_ZEPHYR_FINAL */
#endif /* CONFIG_MMU */