From: Alan Modra <amodra@gmail.com>
Date: Fri, 7 Nov 2014 10:52:02 +0000 (+1030)
Subject: tekhex architecure
X-Git-Tag: hjl/linux/release/2.25.51.0.1~3^2~44^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=56aedec7ab6a1da818ed900827e3a2eb1f5cc5d2;p=thirdparty%2Fbinutils-gdb.git

tekhex architecure

is a don't care.

	* tekhex.c (tekhex_set_arch_mach): Ignore unknown arch errors.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 6953e917018..9d0f0f1781a 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-07  Alan Modra  <amodra@gmail.com>
+
+	* tekhex.c (tekhex_set_arch_mach): Ignore unknown arch errors.
+
 2014-11-07  Alan Modra  <amodra@gmail.com>
 
 	* tekhex.c (CHUNK_SPAN): Define.
diff --git a/bfd/tekhex.c b/bfd/tekhex.c
index aaebceeb954..0328689c854 100644
--- a/bfd/tekhex.c
+++ b/bfd/tekhex.c
@@ -677,7 +677,9 @@ tekhex_set_arch_mach (bfd *abfd,
 		      enum bfd_architecture arch,
 		      unsigned long machine)
 {
-  return bfd_default_set_arch_mach (abfd, arch, machine);
+  /* Ignore errors about unknown architecture.  */
+  return (bfd_default_set_arch_mach (abfd, arch, machine)
+	  || arch == bfd_arch_unknown);
 }
 
 /* We have to save up all the Tekhexords for a splurge before output.  */