tablet/grub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util/grub-mkimagexx: Explicitly move modules to __bss_start for MIPS targets

Browse Source 
Assembly code looks for modules at __bss_start. Make this position explicit
rather than matching BSS alignment and module alignment.

Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Vladimir Serbinenko 2024-09-03 20:58:52 +03:00 committed by Daniel Kiper
parent 34b7f37212
commit d333e8bb37
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
util/grub-mkimagexx.c
View File

@ -2431,6 +2431,8 @@ SUFFIX (grub_mkimage_load_image) (const char *kernel_path,
if (!is_relocatable (image_target))
{
Elf_Addr current_address = layout->kernel_size;
Elf_Addr bss_start = layout->kernel_size;
bool is_first = true;
for (i = 0, s = smd.sections;
i < smd.num_sections;
@ -2453,6 +2455,12 @@ SUFFIX (grub_mkimage_load_image) (const char *kernel_path,
current_address = grub_host_to_target_addr (s->sh_addr)
- image_target->link_addr;
if (is_first == true)
{
bss_start = current_address;
is_first = false;
}
smd.vaddrs[i] = current_address
+ image_target->vaddr_offset;
current_address += grub_host_to_target_addr (s->sh_size);
@ -2460,6 +2468,16 @@ SUFFIX (grub_mkimage_load_image) (const char *kernel_path,
current_address = ALIGN_UP (current_address + image_target->vaddr_offset,
image_target->section_align)
- image_target->vaddr_offset;
if (image_target->id == IMAGE_YEELOONG_FLASH
|| image_target->id == IMAGE_FULOONG2F_FLASH
|| image_target->id == IMAGE_LOONGSON_ELF
|| image_target->id == IMAGE_QEMU_MIPS_FLASH
|| image_target->id == IMAGE_MIPS_ARC)
{
layout->kernel_size = bss_start;
}
layout->bss_size = current_address - layout->kernel_size;
}
else