diff options
| author | Jim Wilson <jimw@sifive.com> | 2017-11-23 12:30:47 -0800 |
|---|---|---|
| committer | Jim Wilson <jimw@sifive.com> | 2017-11-23 12:30:47 -0800 |
| commit | 5f71e59e1a284eec67ba2a91851d0ec8319b0b95 (patch) | |
| tree | 5447ca328741a72cdd8e087ef38d3803bcf8fe95 | |
| parent | f45e2a7704c738ba8195a667f910297c4155924e (diff) | |
| download | binutils-gdb-5f71e59e1a284eec67ba2a91851d0ec8319b0b95.tar.gz | |
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.
| -rw-r--r-- | gas/ChangeLog | 6 | ||||
| -rw-r--r-- | gas/as.c | 4 | ||||
| -rw-r--r-- | gas/config/obj-multi.h | 3 |
3 files changed, 13 insertions, 0 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 6fe0983c33e..9d2eaea580f 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. @@ -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 74f254b14bb..5bde4266e13 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 |