Skip to content

fix(linker): fix broken linker symbols #257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(linker): fix broken linker symbols #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/arch/armv8/aarch32/boot.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ _set_master_cpu:
/* Copy data from RX to RWX */
ldr r7, =_data_lma_start // LMA start
ldr r11, =_data_vma_start // VMA start
ldr r12, =_image_load_end // LMA end
ldr r12, =_data_lma_end // LMA end
bl copy_data

ldr r1, =_data_vma_start
Expand Down
8 changes: 6 additions & 2 deletions src/linker.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ SECTIONS
_ipi_cpumsg_handlers_id_end = .;
}

_image_load_end = .;
_data_vma_end = .;

.datanocopy : ALIGN(PAGE_SIZE) {
/**
Expand All @@ -71,9 +71,12 @@ SECTIONS
. = ALIGN(PAGE_SIZE);
}

_image_load_end = .;

#ifdef MEM_NON_UNIFIED
/* Save the current location counter (VMA) and switch to LMA for .vm_images */
_vma_before_vm_images = .;
_data_lma_end = ALIGN((_data_lma_start + (_data_vma_end - _data_vma_start)), PAGE_SIZE);
_image_load_end = ALIGN((_data_lma_start + (_image_load_end - _data_vma_start)), PAGE_SIZE);
. = _image_load_end;
#endif
Expand Down Expand Up @@ -122,8 +125,9 @@ SECTIONS
. = ALIGN(PAGE_SIZE);
_image_end = ABSOLUTE(.);

#ifdef MEM_PROT_MMU
_dmem_phys_beg = ABSOLUTE(.) + extra_allocated_phys_mem;
#ifdef MEM_NON_UNIFIED
#else
_dmem_phys_beg = ABSOLUTE(.);
#endif

Expand Down