patches/binutils/2.38/binutils-gas-loc-view.patch

   1 diff -rup binutils.orig/gas/symbols.c binutils-2.38/gas/symbols.c
   2 --- binutils.orig/gas/symbols.c 2022-03-09 11:43:34.706610216 +0000
   3 +++ binutils-2.38/gas/symbols.c 2022-03-09 11:45:57.540686508 +0000
   4 @@ -61,8 +61,10 @@ struct symbol_flags
   5    /* Whether the symbol can be re-defined.  */
   6    unsigned int volatil : 1;
   7
   8 -  /* Whether the symbol is a forward reference.  */
   9 +  /* Whether the symbol is a forward reference, and whether such has
  10 +     been determined.  */
  11    unsigned int forward_ref : 1;
  12 +  unsigned int forward_resolved : 1;
  13
  14    /* This is set if the symbol is defined in an MRI common section.
  15       We handle such sections as single common symbols, so symbols
  16 @@ -202,7 +204,7 @@ static void *
  17  symbol_entry_find (htab_t table, const char *name)
  18  {
  19    hashval_t hash = htab_hash_string (name);
  20 -  symbol_entry_t needle = { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
  21 +  symbol_entry_t needle = { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
  22                               hash, name, 0, 0, 0 } };
  23    return htab_find_with_hash (table, &needle, hash);
  24  }
  25 @@ -784,7 +786,9 @@ symbol_clone (symbolS *orgsymP, int repl
  26  symbolS *
  27  symbol_clone_if_forward_ref (symbolS *symbolP, int is_forward)
  28  {
  29 -  if (symbolP && !symbolP->flags.local_symbol)
  30 +  if (symbolP
  31 +      && !symbolP->flags.local_symbol
  32 +      && !symbolP->flags.forward_resolved)
  33      {
  34        symbolS *orig_add_symbol = symbolP->x->value.X_add_symbol;
  35        symbolS *orig_op_symbol = symbolP->x->value.X_op_symbol;
  36 @@ -837,6 +841,7 @@ symbol_clone_if_forward_ref (symbolS *sy
  37
  38        symbolP->x->value.X_add_symbol = add_symbol;
  39        symbolP->x->value.X_op_symbol = op_symbol;
  40 +      symbolP->flags.forward_resolved = 1;
  41      }
  42
  43    return symbolP;
  44 diff -rup binutils.orig/gas/testsuite/gas/elf/dwarf2-18.d binutils-2.38/gas/testsuite/gas/elf/dwarf2-18.d
  45 --- binutils.orig/gas/testsuite/gas/elf/dwarf2-18.d     2022-03-09 11:43:34.487611632 +0000
  46 +++ binutils-2.38/gas/testsuite/gas/elf/dwarf2-18.d     2022-03-09 11:48:03.298873228 +0000
  47 @@ -2,9 +2,8 @@
  48  #readelf: -x.rodata -wL
  49  #name: DWARF2 18
  50  # The am33 cr16 crx ft32 mn10 msp430 nds32 and rl78 targets do not evaluate the subtraction of symbols at assembly time.
  51 -# The mep targets turns some view computations into complex relocations.
  52  # The riscv targets do not support the subtraction of symbols.
  53 -#xfail: am3*-* cr16-* crx-* ft32*-* mep-* mn10*-* msp430-* nds32*-* riscv*-* rl78-*
  54 +#xfail: am3*-* cr16-* crx-* ft32*-* mn10*-* msp430-* nds32*-* riscv*-* rl78-*
  55
  56  Hex dump of section '\.rodata':
  57    0x00000000 0100 *.*
  58 --- binutils.orig/gas/dwarf2dbg.c       2022-03-10 09:13:18.516639363 +0000
  59 +++ binutils-2.38/gas/dwarf2dbg.c       2022-03-10 12:45:25.191933733 +0000
  60 @@ -402,18 +402,27 @@ set_or_check_view (struct line_entry *e,
  61    if (viewx.X_op != O_constant || viewx.X_add_number)
  62      {
  63        expressionS incv;
  64 +      expressionS *p_view;
  65
  66        if (!p->loc.u.view)
  67 -       {
  68 -         p->loc.u.view = symbol_temp_make ();
  69 -         gas_assert (!S_IS_DEFINED (p->loc.u.view));
  70 -       }
  71 +       p->loc.u.view = symbol_temp_make ();
  72
  73        memset (&incv, 0, sizeof (incv));
  74        incv.X_unsigned = 1;
  75        incv.X_op = O_symbol;
  76        incv.X_add_symbol = p->loc.u.view;
  77        incv.X_add_number = 1;
  78 +      p_view = symbol_get_value_expression (p->loc.u.view);
  79 +      if (p_view->X_op == O_constant || p_view->X_op == O_symbol)
  80 +       {
  81 +         /* If we can, constant fold increments so that a chain of
  82 +            expressions v + 1 + 1 ... + 1 is not created.
  83 +            resolve_expression isn't ideal for this purpose.  The
  84 +            base v might not be resolvable until later.  */
  85 +         incv.X_op = p_view->X_op;
  86 +         incv.X_add_symbol = p_view->X_add_symbol;
  87 +         incv.X_add_number = p_view->X_add_number + 1;
  88 +       }
  89
  90        if (viewx.X_op == O_constant)
  91         {