summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej W. Rozycki <macro@imgtec.com>2016-06-28 17:33:38 +0100
committerMaciej W. Rozycki <macro@imgtec.com>2016-06-29 01:49:53 +0100
commit6d44f09a7645d7a2cb2f712c4d2f1f3512e848f5 (patch)
tree56e0298751b4608e013414796b52e35d6389ae82
parent2fafa20b344ef572d2e1b5002ba9a39e10d1c44c (diff)
downloadbinutils-6d44f09a7645d7a2cb2f712c4d2f1f3512e848f5.tar.gz
binutils-6d44f09a7645d7a2cb2f712c4d2f1f3512e848f5.tar.bz2
binutils-6d44f09a7645d7a2cb2f712c4d2f1f3512e848f5.zip
GAS: Fix `abort' expansion in write.c
Remove an internal diagnostic regression introduced with the inclusion of "libbfd.h" from write.c, added with: commit e7ff5c732e7b95aafccd0910ea1a5cb8251a1033 Author: Alan Modra <amodra@gmail.com> Date: Fri Feb 16 03:40:17 2007 +0000 That change made "libbfd.h" override the `abort' definition provided by "as.h" earlier on, making the message produced by any calls reached from write.c, which is a part of the GAS proper, look like they came from BFD, e.g.: .../gas/testsuite/gas/elf/type.s: Assembler messages: .../gas/testsuite/gas/elf/type.s:30: Error: symbol type "gnu_unique_object" is supported only by GNU targets ../as-new: BFD (GNU Binutils) 2.26.51.20160628 internal error, aborting at .../gas/write.c:608 in size_seg ../as-new: Please report this bug. vs: .../gas/testsuite/gas/elf/type.s: Assembler messages: .../gas/testsuite/gas/elf/type.s:30: Error: symbol type "gnu_unique_object" is supported only by GNU targets .../gas/testsuite/gas/elf/type.s: Internal error, aborting at .../gas/write.c:602 in size_seg Please report this bug. With the removal of "libbfd.h" restore the latter message format. gas/ * write.c: Remove "libbfd.h" inclusion.
-rw-r--r--gas/ChangeLog4
-rw-r--r--gas/write.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index c49d9dc45a7..4e94fd976a3 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2016-06-29 Maciej W. Rozycki <macro@imgtec.com>
+
+ * write.c: Remove "libbfd.h" inclusion.
+
2016-06-28 Maciej W. Rozycki <macro@imgtec.com>
* testsuite/gas/elf/elf.exp: Use `supports_gnu_unique' with the
diff --git a/gas/write.c b/gas/write.c
index 9af1f80f08f..8873e5519f4 100644
--- a/gas/write.c
+++ b/gas/write.c
@@ -25,7 +25,6 @@
#include "obstack.h"
#include "output-file.h"
#include "dwarf2dbg.h"
-#include "libbfd.h"
#include "compress-debug.h"
#ifndef TC_FORCE_RELOCATION