This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] Fix build error with --enable-targets=all.
- From: Jim Wilson <wilson at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 23 Nov 2017 20:31:58 -0000
- Subject: [binutils-gdb] Fix build error with --enable-targets=all.
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=5f71e59e1a284eec67ba2a91851d0ec8319b0b95
commit 5f71e59e1a284eec67ba2a91851d0ec8319b0b95
Author: Jim Wilson <jimw@sifive.com>
Date: Thu Nov 23 12:30:47 2017 -0800
Fix build error with --enable-targets=all.
gas/
* as.c (INITIALIZING_EMULS): Define.
* config/obj-multi.h (FAKE_LABEL_NAME): When INITIALIZING_EMULS set,
don't define it.
Diff:
---
gas/ChangeLog | 6 ++++++
gas/as.c | 4 ++++
gas/config/obj-multi.h | 3 +++
3 files changed, 13 insertions(+)
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 6fe0983..9d2eaea 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2017-11-23 Jim Wilson <jimw@sifive.com>
+
+ * as.c (INITIALIZING_EMULS): Define.
+ * config/obj-multi.h (FAKE_LABEL_NAME): When INITIALIZING_EMULS set,
+ don't define it.
+
2017-11-23 Igor Tsimbalist <igor.v.tsimbalist@intel.com>
* testsuite/gas/i386/avx512f_vaes-intel.d: Regenerate.
diff --git a/gas/as.c b/gas/as.c
index fbf3257..5c9c07e 100644
--- a/gas/as.c
+++ b/gas/as.c
@@ -31,6 +31,10 @@
#define COMMON
+/* Disable code to set FAKE_LABEL_NAME in obj-multi.h, to avoid circular
+ reference. */
+#define INITIALIZING_EMULS
+
#include "as.h"
#include "subsegs.h"
#include "output-file.h"
diff --git a/gas/config/obj-multi.h b/gas/config/obj-multi.h
index 74f254b..5bde426 100644
--- a/gas/config/obj-multi.h
+++ b/gas/config/obj-multi.h
@@ -155,7 +155,10 @@
#define EMIT_SECTION_SYMBOLS (this_format->emit_section_symbols)
+#ifndef INITIALIZING_EMULS
+/* We want to use the default FAKE_LABEL_NAME in as.c. */
#define FAKE_LABEL_NAME (this_emulation->fake_label_name)
+#endif
#ifdef OBJ_MAYBE_ELF
/* We need OBJ_SYMFIELD_TYPE so that symbol_get_obj is defined in symbol.c