Fix symbol size computation

src/output-chunks.cc

@@ -1761,7 +1761,8 @@ static u64 get_symbol_size(Symbol<E> &sym) {
     if (esym.st_size > 0)
       if (InputSection<E> *isec = sym.get_input_section())
         if (!isec->extra.r_deltas.empty())
-          return esym.st_size - get_r_delta(*isec, esym.st_value + esym.st_size);
+          return esym.st_size + esym.st_value - sym.value -
+                 get_r_delta(*isec, esym.st_value + esym.st_size);
   return esym.st_size;
 }
 

test/arch-riscv64-symbol-size.sh

@@ -2,27 +2,39 @@
 . $(dirname $0)/common.inc
 
 cat <<EOF | $CC -o $t/a.o -c -xassembler -
-.globl get_foo
+.globl get_foo, get_bar
 .type get_foo @function
 get_foo:
   lui a0, %hi(foo)
   add a0, a0, %lo(foo)
   ret
 .size get_foo, .-get_foo
+
+.type get_bar @function
+get_bar:
+  lui a0, %hi(bar)
+  add a0, a0, %lo(bar)
+  ret
+.size get_bar, .-get_bar
 EOF
 
 cat <<EOF | $CC -o $t/b.o -c -xassembler -
-.globl foo, bar, baz
+.globl foo, bar
 foo = 0xf00
+bar = 0xf00
 EOF
 
 cat <<EOF | $CC -o $t/c.o -c -xc -
 #include <stdio.h>
 int get_foo();
-int main() { printf("%x\n", get_foo()); }
+int get_bar();
+int main() { printf("%x %x\n", get_foo(), get_bar()); }
 EOF
 
 $CC -B. -o $t/exe $t/a.o $t/b.o $t/c.o
 
 readelf --syms $t/a.o | grep -Eq ' 10 FUNC .* get_foo$'
+readelf --syms $t/a.o | grep -Eq ' 10 FUNC .* get_bar$'
+
 readelf --syms $t/exe | grep -Eq ' 8 FUNC .* get_foo$'
+readelf --syms $t/exe | grep -Eq ' 8 FUNC .* get_bar$'