FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Re: Add support for AArch64 EFI (efi-*-aarch64)

Browse source 
Commit b69c9d41e8 was broken in multiple ways regarding the realloc
of the target string, most notably in that "-little" wasn't actually
appended to the input_target or output_target.  This caused asan
errors and "FAIL: Check if efi app format is recognized".  I also
noticed that the input_target string wasn't being copied but rather
the output_target when dealing with the input target.  Fix that too.

	PR 26206
	* objcopy.c (convert_efi_target): Rewrite.  Allocate modified
	target strings here..
	(copy_main): ..rather than here.  Do handle input_target,
	not output_target for input.
This commit is contained in:
Alan Modra 2021-12-07 12:36:31 +10:30
parent 43908c1653
commit d91c67e873
1 changed files with 40 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

86
binutils/objcopy.c
View file

@ -4974,32 +4974,55 @@ set_pe_subsystem (const char *s)
/* Convert EFI target to PEI target. */
static void
convert_efi_target (char *efi)
static int
convert_efi_target (char **targ)
{
efi[0] = 'p';
efi[1] = 'e';
efi[2] = 'i';
size_t len;
char *pei;
char *efi = *targ + 4;
int subsys = -1;
if (startswith (efi, "app-"))
subsys = IMAGE_SUBSYSTEM_EFI_APPLICATION;
else if (startswith (efi, "bsdrv-"))
{
subsys = IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER;
efi += 2;
}
else if (startswith (efi, "rtdrv-"))
{
subsys = IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER;
efi += 2;
}
else
return subsys;
len = strlen (efi);
pei = xmalloc (len + sizeof ("-little"));
memcpy (pei, efi, len + 1);
pei[0] = 'p';
pei[1] = 'e';
pei[2] = 'i';
if (strcmp (efi + 4, "ia32") == 0)
{
/* Change ia32 to i386. */
efi[5]= '3';
efi[6]= '8';
efi[7]= '6';
pei[5]= '3';
pei[6]= '8';
pei[7]= '6';
}
else if (strcmp (efi + 4, "x86_64") == 0)
{
/* Change x86_64 to x86-64. */
efi[7] = '-';
pei[7] = '-';
}
else if (strcmp (efi + 4, "aarch64") == 0)
{
/* Change aarch64 to aarch64-little. */
efi = (char *) xrealloc (efi, strlen (efi) + 7);
char *t = "aarch64-little";
strcpy (efi + 4, t);
memcpy (pei + 4 + sizeof ("aarch64") - 1, "-little", sizeof ("-little"));
}
*targ = pei;
return subsys;
}
/* Allocate and return a pointer to a struct section_add, initializing the
@ -5882,53 +5905,24 @@ copy_main (int argc, char *argv[])
if (input_target != NULL
&& startswith (input_target, "efi-"))
{
char *efi;
efi = xstrdup (output_target + 4);
if (startswith (efi, "bsdrv-")
|| startswith (efi, "rtdrv-"))
efi += 2;
else if (!startswith (efi, "app-"))
if (convert_efi_target (&input_target) < 0)
fatal (_("unknown input EFI target: %s"), input_target);
input_target = efi;
convert_efi_target (efi);
}
/* Convert output EFI target to PEI target. */
if (output_target != NULL
&& startswith (output_target, "efi-"))
{
char *efi;
int subsys = convert_efi_target (&output_target);
efi = xstrdup (output_target + 4);
if (startswith (efi, "app-"))
{
if (pe_subsystem == -1)
pe_subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION;
}
else if (startswith (efi, "bsdrv-"))
{
if (pe_subsystem == -1)
pe_subsystem = IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER;
efi += 2;
}
else if (startswith (efi, "rtdrv-"))
{
if (pe_subsystem == -1)
pe_subsystem = IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER;
efi += 2;
}
else
if (subsys < 0)
fatal (_("unknown output EFI target: %s"), output_target);
if (pe_subsystem == -1)
pe_subsystem = subsys;
if (pe_file_alignment == (bfd_vma) -1)
pe_file_alignment = PE_DEF_FILE_ALIGNMENT;
if (pe_section_alignment == (bfd_vma) -1)
pe_section_alignment = PE_DEF_SECTION_ALIGNMENT;
output_target = efi;
convert_efi_target (efi);
}
/* If there is no destination file, or the source and destination files