vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* util/grub-mkimagexx.c (locate_sections): Support non-standard

Browse source 
ELF section gap.
	(load_image): Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-29 18:57:43 +01:00
parent f04a9a216c
commit 9d742bd431
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2012-02-29 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-mkimagexx.c (locate_sections): Support non-standard
ELF section gap.
(load_image): Likewise.
2012-02-29 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-29 Vladimir Serbinenko <phcoder@gmail.com>
* configure.ac: Fix a typo in previous commit. * configure.ac: Fix a typo in previous commit.

10
util/grub-mkimagexx.c
View file

@ -871,6 +871,9 @@ SUFFIX (locate_sections) (Elf_Shdr *sections, Elf_Half section_entsize,
align) - image_target->vaddr_offset; align) - image_target->vaddr_offset;
grub_util_info ("locating the section %s at 0x%llx", grub_util_info ("locating the section %s at 0x%llx",
name, (unsigned long long) current_address); name, (unsigned long long) current_address);
if (image_target->id != IMAGE_EFI)
current_address = grub_host_to_target_addr (s->sh_addr)
- image_target->link_addr;
section_addresses[i] = current_address; section_addresses[i] = current_address;
current_address += grub_host_to_target_addr (s->sh_size); current_address += grub_host_to_target_addr (s->sh_size);
} }
@ -896,6 +899,9 @@ SUFFIX (locate_sections) (Elf_Shdr *sections, Elf_Half section_entsize,
grub_util_info ("locating the section %s at 0x%llx", grub_util_info ("locating the section %s at 0x%llx",
name, (unsigned long long) current_address); name, (unsigned long long) current_address);
if (image_target->id != IMAGE_EFI)
current_address = grub_host_to_target_addr (s->sh_addr)
- image_target->link_addr;
section_addresses[i] = current_address; section_addresses[i] = current_address;
current_address += grub_host_to_target_addr (s->sh_size); current_address += grub_host_to_target_addr (s->sh_size);
} }
@ -985,6 +991,10 @@ SUFFIX (load_image) (const char *kernel_path, grub_size_t *exec_size,
grub_util_info ("locating the section %s at 0x%llx", grub_util_info ("locating the section %s at 0x%llx",
name, (unsigned long long) current_address); name, (unsigned long long) current_address);
if (image_target->id != IMAGE_EFI)
current_address = grub_host_to_target_addr (s->sh_addr)
- image_target->link_addr;
section_vaddresses[i] = current_address section_vaddresses[i] = current_address
+ image_target->vaddr_offset; + image_target->vaddr_offset;
current_address += grub_host_to_target_addr (s->sh_size); current_address += grub_host_to_target_addr (s->sh_size);