[1/9] Revert "dwarf2: Align relocation within .debug_line section"

Message ID 20191116232130.14278-2-ceggers@gmx.de
State Superseded
Headers show
Series
  • ELF support for targets with octets_per_byte>1
Related show

Commit Message

Christian Eggers Nov. 16, 2019, 11:21 p.m.
This reverts commit 204f543cae7a5dc908264b49d558191d0ceb989c.

	* dwarf2dbg.c (out_set_addr): Revert: Align relocation within
.debug_line.
---
 gas/dwarf2dbg.c | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

--
2.16.4

Patch

diff --git a/gas/dwarf2dbg.c b/gas/dwarf2dbg.c
index 90b47b02fc..37540decfd 100644
--- a/gas/dwarf2dbg.c
+++ b/gas/dwarf2dbg.c
@@ -1136,28 +1136,16 @@  get_frag_fix (fragS *frag, segT seg)

 /* Set an absolute address (may result in a relocation entry).  */

-static void
-out_inc_line_addr (int line_delta, addressT addr_delta);
-
 static void
 out_set_addr (symbolS *sym)
 {
   expressionS exp;
-  addressT expr_addr, expr_addr_aligned;

   memset (&exp, 0, sizeof exp);
+  out_opcode (DW_LNS_extended_op);
+  out_uleb128 (sizeof_address + 1);

-  /* The expression at the bottom must be aligned to OCTETS_PER_BYTE.  The
-     statements after the for loop will contribute 3 more octets.  */
-  expr_addr = frag_now_fix_octets () + 3;
-  expr_addr_aligned = (expr_addr + OCTETS_PER_BYTE - 1) & -OCTETS_PER_BYTE;
-  for ( ; expr_addr != expr_addr_aligned; expr_addr++)
-    out_inc_line_addr (0, 0);  /* NOP */
-
-  out_opcode (DW_LNS_extended_op);   /* 1 octet */
-  out_uleb128 (sizeof_address + 1);  /* 1 octet */
-
-  out_opcode (DW_LNE_set_address);   /* 1 octet */
+  out_opcode (DW_LNE_set_address);
   exp.X_op = O_symbol;
   exp.X_add_symbol = sym;
   exp.X_add_number = 0;