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 --git a/gas/ChangeLog b/gas/ChangeLog
index 6fe0983c33ed39121c4e84ea84de4a05b7e5fd4c..9d2eaea580f51091907d3d9c8f2ad49f03fc1508 100644 (file)
--- 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 fbf3257fbbf3eb2751887dc9275cfc4ca3a5b1ea..5c9c07e5e0d5606bfe75d19db875009775ac929b 100644 (file)
--- 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 74f254b14bbdfff782881a4a9010f9a769a19068..5bde4266e1343bb6171bd0b7ca751d20d60b41ef 100644 (file)
--- 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