1From d52f78def1b9c4f435fdbf6b24fd899208580c76 Mon Sep 17 00:00:00 2001 2From: Javier Martinez Canillas <javierm@redhat.com> 3Date: Thu, 11 Feb 2021 17:06:49 +0100 4Subject: [PATCH] util/mkimage: Remove unused code to add BSS section 5 6The code is compiled out so there is no reason to keep it. 7 8Additionally, don't set bss_size field since we do not add a BSS section. 9 10Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> 11Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> 12Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com> 13--- 14 util/mkimage.c | 17 ----------------- 15 1 file changed, 17 deletions(-) 16 17diff --git a/util/mkimage.c b/util/mkimage.c 18index 37d6249..32bb8ea 100644 19--- a/util/mkimage.c 20+++ b/util/mkimage.c 21@@ -1304,7 +1304,6 @@ grub_install_generate_image (const char *dir, const char *prefix, 22 o->code_size = grub_host_to_target32 (layout.exec_size); 23 o->data_size = grub_cpu_to_le32 (reloc_addr - layout.exec_size 24 - header_size); 25- o->bss_size = grub_cpu_to_le32 (layout.bss_size); 26 o->entry_addr = grub_cpu_to_le32 (layout.start_address); 27 o->code_base = grub_cpu_to_le32 (header_size); 28 29@@ -1342,7 +1341,6 @@ grub_install_generate_image (const char *dir, const char *prefix, 30 o->code_size = grub_host_to_target32 (layout.exec_size); 31 o->data_size = grub_cpu_to_le32 (reloc_addr - layout.exec_size 32 - header_size); 33- o->bss_size = grub_cpu_to_le32 (layout.bss_size); 34 o->entry_addr = grub_cpu_to_le32 (layout.start_address); 35 o->code_base = grub_cpu_to_le32 (header_size); 36 o->image_base = 0; 37@@ -1387,21 +1385,6 @@ grub_install_generate_image (const char *dir, const char *prefix, 38 = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_CNT_INITIALIZED_DATA 39 | GRUB_PE32_SCN_MEM_READ 40 | GRUB_PE32_SCN_MEM_WRITE); 41- 42-#if 0 43- bss_section = data_section + 1; 44- strcpy (bss_section->name, ".bss"); 45- bss_section->virtual_size = grub_cpu_to_le32 (layout.bss_size); 46- bss_section->virtual_address = grub_cpu_to_le32 (header_size + layout.kernel_size); 47- bss_section->raw_data_size = 0; 48- bss_section->raw_data_offset = 0; 49- bss_section->characteristics 50- = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_MEM_READ 51- | GRUB_PE32_SCN_MEM_WRITE 52- | GRUB_PE32_SCN_ALIGN_64BYTES 53- | GRUB_PE32_SCN_CNT_INITIALIZED_DATA 54- | 0x80); 55-#endif 56 57 mods_section = data_section + 1; 58 strcpy (mods_section->name, "mods"); 59-- 602.14.2 61 62