Commit: 6765ee1825d92d25d9b3f6260de3f8a2a27e4998 - binutils_os216 (git)

GNU Binutils with patches for OS216

Commit MetaInfo

• Revisión: 6765ee1825d92d25d9b3f6260de3f8a2a27e4998 (tree)
• Tiempo: 2019-11-19 17:56:40
• Autor: Alan Modra <amodra@gmai...>
• Commiter: Alan Modra

Log Message

PR24968, make objcopy use output ELF arch if -B not given

This should make objcopy -B redundant for the common case of producing
ELF output where the -O target defaults to the desired arch:mach.

PR 24968
* objcopy.c (copy_object): For ELF output and non-ELF input without
arch, take arch from output file if not given by -B. Don't
bfd_get_arch_info when we already have iarch.

Cambiar Resumen

• modified: binutils/ChangeLog
• modified: binutils/objcopy.c

Diferencia incremental

--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,5 +1,12 @@
 2019-11-19  Alan Modra  <[e-mail]>
 
+	PR 24968
+	* objcopy.c (copy_object): For ELF output and non-ELF input without
+	arch, take arch from output file if not given by -B.  Don't
+	bfd_get_arch_info when we already have iarch.
+
[phone]  Alan Modra  <[e-mail]>
+
 	PR 25191
 	* objcopy.c (is_nondebug_keep_contents_section): Use bfd_get_flavour.
 	(copy_object): Likewise.

--- a/binutils/objcopy.c
+++ b/binutils/objcopy.c
@@ -2646,8 +2646,7 @@ copy_object (bfd *ibfd, bfd *obfd, const bfd_arch_info_type *input_arch)
   imach = bfd_get_mach (ibfd);
   if (input_arch)
     {
-      if (bfd_get_arch_info (ibfd) == NULL
-	  || bfd_get_arch_info (ibfd)->arch == bfd_arch_unknown)
+      if (iarch == bfd_arch_unknown)
 	{
 	  iarch = input_arch->arch;
 	  imach = input_arch->mach;
@@ -2656,6 +2655,14 @@ copy_object (bfd *ibfd, bfd *obfd, const bfd_arch_info_type *input_arch)
 	non_fatal (_("Input file `%s' ignores binary architecture parameter."),
 		   bfd_get_archive_filename (ibfd));
     }
+  if (iarch == bfd_arch_unknown
+      && bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      && bfd_get_flavour (obfd) == bfd_target_elf_flavour)
+    {
+      const struct elf_backend_data *bed = get_elf_backend_data (obfd);
+      iarch = bed->arch;
+      imach = 0;
+    }
   if (!bfd_set_arch_mach (obfd, iarch, imach)
       && (ibfd->target_defaulted
 	  || bfd_get_arch (ibfd) != bfd_get_arch (obfd)))