diff options
author | Christian Eggers <ceggers@gmx.de> | 2019-11-21 22:17:24 +0100 |
---|---|---|
committer | Alan Modra <amodra@gmail.com> | 2019-11-25 14:32:20 +1030 |
commit | e2b9a97eda81ff2565aa5c783088215fab12fc9b (patch) | |
tree | fa10a22f4f7d7c1f0b4d31ab31150acbfd8a3be3 /gas/symbols.c | |
parent | b5470a3c4a81ad60bc1a18683ac6a01f64b60854 (diff) | |
download | gdb-e2b9a97eda81ff2565aa5c783088215fab12fc9b.zip gdb-e2b9a97eda81ff2565aa5c783088215fab12fc9b.tar.gz gdb-e2b9a97eda81ff2565aa5c783088215fab12fc9b.tar.bz2 |
Reverts patches providing octet support in dwarf
Reverts "dwarf2: Align relocation within .debug_line section"
commit 204f543cae7a5dc908264b49d558191d0ceb989c,
Reverts "dwarf2: Pad size of .debug_line section."
commit 145c4477d239fef4e31a457ff8a1ba7153e9a448,
Reverts "dwarf2: Use octets for .debug_line prologue"
commit 38c24f42c97af59ad83505ed735e689c63d3ca45,
Mostly reverts "dwarf2: Use octets for dwarf2 headers"
commit 7235427998571b6d8267e7ac72a52d7b082f4c2b,
Mostly reverts "Symbols with octets value"
commit d18d199917337537713f9fc4b7ae4d6568f740cf.
* dwarf2dbg.c (out_set_addr): Revert 2019-03-13 change.
(out_debug_line, out_debug_aranges, out_debug_info): Likewise.
* symbols.h (symbol_set_value_now_octets, symbol_octets_p): Remove.
* symbols.c (struct symbol_flags): Remove member sy_octets.
(symbol_temp_new_now_octets): Don't set symbol_flags::sy_octets.
(resolve_symbol_value): Revert: Return octets instead of bytes if
sy_octets is set.
(symbol_set_value_now_octets): Remove.
(symbol_octets_p): Remove.
Diffstat (limited to 'gas/symbols.c')
-rw-r--r-- | gas/symbols.c | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/gas/symbols.c b/gas/symbols.c index 34ec145..cff2405 100644 --- a/gas/symbols.c +++ b/gas/symbols.c @@ -73,10 +73,6 @@ struct symbol_flags before. It is cleared as soon as any direct reference to the symbol is present. */ unsigned int sy_weakrefd : 1; - - /* This if set if the unit of the symbol value is "octets" instead - of "bytes". */ - unsigned int sy_octets : 1; }; /* The information we keep for a symbol. Note that the symbol table @@ -850,9 +846,7 @@ symbol_temp_new_now (void) symbolS * symbol_temp_new_now_octets (void) { - symbolS * symb = symbol_temp_new (now_seg, frag_now_fix_octets (), frag_now); - symb->sy_flags.sy_octets = 1; - return symb; + return symbol_temp_new (now_seg, frag_now_fix_octets (), frag_now); } symbolS * @@ -1336,10 +1330,7 @@ resolve_symbol_value (symbolS *symp) /* Fall through. */ case O_constant: - if (symp->sy_flags.sy_octets) - final_val += symp->sy_frag->fr_address; - else - final_val += symp->sy_frag->fr_address / OCTETS_PER_BYTE; + final_val += symp->sy_frag->fr_address / OCTETS_PER_BYTE; if (final_seg == expr_section) final_seg = absolute_section; /* Fall through. */ @@ -2651,18 +2642,6 @@ symbol_set_value_now (symbolS *sym) symbol_set_frag (sym, frag_now); } -/* Set the value of SYM to the current position in the current segment, - in octets. */ - -void -symbol_set_value_now_octets (symbolS *sym) -{ - S_SET_SEGMENT (sym, now_seg); - S_SET_VALUE (sym, frag_now_fix_octets ()); - symbol_set_frag (sym, frag_now); - sym->sy_flags.sy_octets = 1; -} - /* Set the frag of a symbol. */ void @@ -2934,13 +2913,6 @@ symbol_set_bfdsym (symbolS *s, asymbol *bsym) /* else XXX - What do we do now ? */ } -/* Return whether symbol unit is "octets" (instead of "bytes"). */ - -int symbol_octets_p (symbolS *s) -{ - return s->sy_flags.sy_octets; -} - #ifdef OBJ_SYMFIELD_TYPE /* Get a pointer to the object format information for a symbol. */ |