aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog4
-rw-r--r--bfd/tekhex.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 6953e91..9d0f0f1 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,9 @@
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.
(struct data_struct <chunk_init>): Use one byte per span, update
all code accessing this field.
diff --git a/bfd/tekhex.c b/bfd/tekhex.c
index aaebcee..0328689 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. */