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

Allow _start == 0 with relocatable images

Browse source
This commit is contained in:
Vladimir Serbinenko 2016-02-18 20:58:38 +01:00
parent df21fff504
commit 5bcb7d394c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
util/grub-mkimagexx.c
View file

@ -495,7 +495,7 @@ SUFFIX (relocate_symbols) (Elf_Ehdr *e, Elf_Shdr *sections,
{ {
Elf_Word symtab_size, sym_size, num_syms; Elf_Word symtab_size, sym_size, num_syms;
Elf_Off symtab_offset; Elf_Off symtab_offset;
Elf_Addr start_address = 0; Elf_Addr start_address = (Elf_Addr) -1;
Elf_Sym *sym; Elf_Sym *sym;
Elf_Word i; Elf_Word i;
Elf_Shdr *strtab_section; Elf_Shdr *strtab_section;
@ -560,7 +560,7 @@ SUFFIX (relocate_symbols) (Elf_Ehdr *e, Elf_Shdr *sections,
(unsigned long long) sym->st_value, (unsigned long long) sym->st_value,
(unsigned long long) section_addresses[cur_index]); (unsigned long long) section_addresses[cur_index]);
if (! start_address) if (start_address == (Elf_Addr)-1)
if (strcmp (name, "_start") == 0 || strcmp (name, "start") == 0) if (strcmp (name, "_start") == 0 || strcmp (name, "start") == 0)
start_address = sym->st_value; start_address = sym->st_value;
} }
@ -1797,7 +1797,7 @@ SUFFIX (grub_mkimage_load_image) (const char *kernel_path,
layout->ia64jmp_off layout->ia64jmp_off
+ image_target->vaddr_offset, + image_target->vaddr_offset,
image_target); image_target);
if (layout->start_address == 0) if (layout->start_address == (Elf_Addr) -1)
grub_util_error ("start symbol is not defined"); grub_util_error ("start symbol is not defined");
SUFFIX (entry_point) = (Elf_Addr) layout->start_address; SUFFIX (entry_point) = (Elf_Addr) layout->start_address;