boot/grub2/0140-util-mkimage-Refactor-section-setup-to-use-a-helper.patch

90 +          ALIGN_UP (layout.reloc_size, GRUB_PE32_FILE_ALIGNMENT);
93 -	pe_size = ALIGN_UP (reloc_addr + layout.reloc_size,
95 -	pe_img = xmalloc (reloc_addr + layout.reloc_size);
99 -	memcpy ((char *) pe_img + reloc_addr, layout.reloc_section, layout.reloc_size);
107  	    o32->data_base = grub_host_to_target32 (header_size + layout.exec_size);
132  	PE_OHDR (o32, o64, code_size) = grub_host_to_target32 (layout.exec_size);
135 -	text_section->virtual_size = grub_host_to_target32 (layout.exec_size);
137 -	text_section->raw_data_size = grub_host_to_target32 (layout.exec_size);
144 +				   &vma, layout.exec_size,
146 +				   &raw_data, layout.exec_size,
151  	scn_size = ALIGN_UP (layout.kernel_size - layout.exec_size, GRUB_PE32_FILE_ALIGNMENT);
158 -	data_section->virtual_size = grub_host_to_target32 (layout.kernel_size - layout.exec_size);
159 -	data_section->virtual_address = grub_host_to_target32 (header_size + layout.exec_size);
160 -	data_section->raw_data_size = grub_host_to_target32 (layout.kernel_size - layout.exec_size);
161 -	data_section->raw_data_offset = grub_host_to_target32 (header_size + layout.exec_size);
169 -	mods_section->virtual_size = grub_host_to_target32 (reloc_addr - layout.kernel_size - header_size…
170 -	mods_section->virtual_address = grub_host_to_target32 (header_size + layout.kernel_size + layout.…
171 -	mods_section->raw_data_size = grub_host_to_target32 (reloc_addr - layout.kernel_size - header_siz…
172 -	mods_section->raw_data_offset = grub_host_to_target32 (header_size + layout.kernel_size);
179 -	PE_OHDR (o32, o64, base_relocation_table.size) = grub_host_to_target32 (layout.reloc_size);
182 -	reloc_section->virtual_size = grub_host_to_target32 (layout.reloc_size);
183 -	reloc_section->virtual_address = grub_host_to_target32 (reloc_addr + layout.bss_size);
184 -	reloc_section->raw_data_size = grub_host_to_target32 (layout.reloc_size);
197 +	scn_size = pe_size - layout.reloc_size - raw_data;
205 +	scn_size = layout.reloc_size;
208 +	memcpy (pe_img + raw_data, layout.reloc_section, scn_size);