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

Merge pull request #1 from flatcar-linux/dongsu/merge-2.02-coreos

Browse source 
Merge upstream 2.02-coreos branch 2019-10-24
This commit is contained in:
Dongsu Park 2019-10-25 15:29:15 +02:00 committed by GitHub
commit 7ee80206a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
grub-core/efiemu/i386/loadcore64.c
View file

@ -98,6 +98,7 @@ grub_arch_efiemu_relocate_symbols64 (grub_efiemu_segment_t segs,
break; break;
case R_X86_64_PC32: case R_X86_64_PC32:
case R_X86_64_PLT32:
err = grub_efiemu_write_value (addr, err = grub_efiemu_write_value (addr,
*addr32 + rel->r_addend *addr32 + rel->r_addend
+ sym.off + sym.off

2
grub-core/fs/btrfs.c
View file

@ -175,7 +175,7 @@ struct grub_btrfs_time
{ {
grub_int64_t sec; grub_int64_t sec;
grub_uint32_t nanosec; grub_uint32_t nanosec;
} __attribute__ ((aligned (4))); } GRUB_PACKED;
struct grub_btrfs_inode struct grub_btrfs_inode
{ {

1
grub-core/kern/x86_64/dl.c
View file

@ -70,6 +70,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
break; break;
case R_X86_64_PC32: case R_X86_64_PC32:
case R_X86_64_PLT32:
{ {
grub_int64_t value; grub_int64_t value;
value = ((grub_int32_t) *addr32) + rel->r_addend + sym->st_value - value = ((grub_int32_t) *addr32) + rel->r_addend + sym->st_value -

2
grub-core/loader/i386/linux.c
View file

@ -826,7 +826,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
len = sizeof (linux_params) - sizeof (lh); len = sizeof (linux_params) - sizeof (lh);
grub_memcpy (&linux_params + sizeof (lh), kernel + kernel_offset, len); grub_memcpy ((char *) &linux_params + sizeof (lh), kernel + kernel_offset, len);
kernel_offset += len; kernel_offset += len;
linux_params.type_of_loader = GRUB_LINUX_BOOT_LOADER_TYPE; linux_params.type_of_loader = GRUB_LINUX_BOOT_LOADER_TYPE;

2
include/grub/efiemu/runtime.h
View file

@ -29,7 +29,7 @@ struct grub_efiemu_ptv_rel
struct efi_variable struct efi_variable
{ {
grub_efi_guid_t guid; grub_efi_packed_guid_t guid;
grub_uint32_t namelen; grub_uint32_t namelen;
grub_uint32_t size; grub_uint32_t size;
grub_efi_uint32_t attributes; grub_efi_uint32_t attributes;

2
include/grub/gpt_partition.h
View file

@ -29,7 +29,7 @@ struct grub_gpt_guid
grub_uint16_t data2; grub_uint16_t data2;
grub_uint16_t data3; grub_uint16_t data3;
grub_uint8_t data4[8]; grub_uint8_t data4[8];
} __attribute__ ((aligned(8))); } GRUB_PACKED;
typedef struct grub_gpt_guid grub_gpt_guid_t; typedef struct grub_gpt_guid grub_gpt_guid_t;
typedef struct grub_gpt_guid grub_gpt_part_type_t; typedef struct grub_gpt_guid grub_gpt_part_type_t;

1
util/grub-mkimagexx.c
View file

@ -832,6 +832,7 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections,
break; break;
case R_X86_64_PC32: case R_X86_64_PC32:
case R_X86_64_PLT32:
{ {
grub_uint32_t *t32 = (grub_uint32_t *) target; grub_uint32_t *t32 = (grub_uint32_t *) target;
*t32 = grub_host_to_target64 (grub_target_to_host32 (*t32) *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32)

1
util/grub-module-verifier.c
View file

@ -19,6 +19,7 @@ struct grub_module_verifier_arch archs[] = {
-1 -1
}, (int[]){ }, (int[]){
R_X86_64_PC32, R_X86_64_PC32,
R_X86_64_PLT32,
-1 -1
} }
}, },