0134-util-mkimage-Remove-unused-code-to-add-BSS-section.patch 2.4 KB

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