From: Maciej W. Rozycki <macro@imgtec.com>
Date: Tue, 28 Jun 2016 16:33:38 +0000 (+0100)
Subject: GAS: Fix `abort' expansion in write.c
X-Git-Tag: binutils-2_26_1~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1aa66afd9949d9f3e4869edc144b37320826b594;p=thirdparty%2Fbinutils-gdb.git

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.

(cherry picked from commit 6d44f09a7645d7a2cb2f712c4d2f1f3512e848f5)
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 49b6de6c7f3..49feb4346af 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2016-06-29  Maciej W. Rozycki  <macro@imgtec.com>
+
+	Backport from master
+	2016-06-29  Maciej W. Rozycki  <macro@imgtec.com>
+
+	* write.c: Remove "libbfd.h" inclusion.
+
 2016-06-23  Peter Bergner  <bergner@vnet.ibm.com>
 
 	Apply from master.
diff --git a/gas/write.c b/gas/write.c
index a76813dac11..1ce8a8d87e0 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