Add some relocation overflow checks for x86_64.

2016-02-05  Cary Coutant  <ccoutant@gmail.com>
	    Andrew Senkevich  <andrew.senkevich@intel.com>

gold/
	PR gold/18695
	* x86_64.cc (Target_x86_64::Relocate::relocate): Add overflow
	checking for R_X86_64_32, R_X86_64_32S, R_X86_64_PC32, and
	R_X86_64_PLT32.
	* testsuite/Makefile.am (x86_64_overflow_pc32): New test.
	* testsuite/x86_64_overflow_pc32.sh: New test script.
	* testsuite/x86_64_overflow_pc32.s: New source file.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index ecb50577ecd30bf1238ee13d5e4ac22cd11a3443..a90ffa41f3314d932bb612324056537be5dcc13a 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,4 +1,15 @@
-2016-02-06  Cary Coutant  <ccoutant@gmail.com>
+2016-02-05  Cary Coutant  <ccoutant@gmail.com>
+           Andrew Senkevich  <andrew.senkevich@intel.com>
+
+       PR gold/18695
+       * x86_64.cc (Target_x86_64::Relocate::relocate): Add overflow
+       checking for R_X86_64_32, R_X86_64_32S, R_X86_64_PC32, and
+       R_X86_64_PLT32.
+       * testsuite/Makefile.am (x86_64_overflow_pc32): New test.
+       * testsuite/x86_64_overflow_pc32.sh: New test script.
+       * testsuite/x86_64_overflow_pc32.s: New source file.
+
+2016-02-05  Cary Coutant  <ccoutant@gmail.com>
 
        PR gold/18695
        * reloc.h (Relocate_functions::Address): New typedef.

diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am
index 96d2b19d0579bc21650de89e8d584ad636c9adfe..81f3464dbdb80eb780cf2a2eac9aab5c667205a8 100644 (file)
--- a/gold/testsuite/Makefile.am
+++ b/gold/testsuite/Makefile.am
@@ -1074,6 +1074,20 @@ x86_64_mov_to_lea13.stdout: x86_64_mov_to_lea13
 x86_64_mov_to_lea14.stdout: x86_64_mov_to_lea14
        $(TEST_OBJDUMP) -dw $< > $@
 
+check_SCRIPTS += x86_64_overflow_pc32.sh
+check_DATA += x86_64_overflow_pc32.err
+MOSTLYCLEANFILES += x86_64_overflow_pc32.err
+x86_64_overflow_pc32.o: x86_64_overflow_pc32.s
+       $(TEST_AS) -o $@ $<
+x86_64_overflow_pc32.err: x86_64_overflow_pc32.o gcctestdir/ld
+       @echo $(CXXLINK) -Bgcctestdir/ -shared -o x86_64_overflow_pc32 x86_64_overflow_pc32.o "2>$@"
+       @if $(CXXLINK) -Bgcctestdir/ -shared -o x86_64_overflow_pc32 x86_64_overflow_pc32.o 2>$@; \
+       then \
+         echo 1>&2 "Link of x86_64_overflow_pc32 should have failed"; \
+         rm -f $@; \
+         exit 1; \
+       fi
+
 endif DEFAULT_TARGET_X86_64
 
 if DEFAULT_TARGET_I386

diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in
index c771a42d3e97e74ade78bf800477a22134d27169..49f36837973306d6c24443ed97287022016e827d 100644 (file)
--- a/gold/testsuite/Makefile.in
+++ b/gold/testsuite/Makefile.in
@@ -199,21 +199,38 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
 @GCC_TRUE@@HAVE_STATIC_TRUE@@NATIVE_LINKER_TRUE@@STATIC_TLS_TRUE@@TLS_TRUE@am__append_24 = tls_static_test \
 @GCC_TRUE@@HAVE_STATIC_TRUE@@NATIVE_LINKER_TRUE@@STATIC_TLS_TRUE@@TLS_TRUE@    tls_static_pic_test
 @FN_PTRS_IN_SO_WITHOUT_PIC_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@@TLS_TRUE@am__append_25 = tls_shared_nonpic_test
-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_26 = x86_64_mov_to_lea.sh
-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_27 = x86_64_mov_to_lea1.stdout x86_64_mov_to_lea2.stdout \
-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea3.stdout x86_64_mov_to_lea4.stdout \
-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea5.stdout x86_64_mov_to_lea6.stdout \
-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea7.stdout x86_64_mov_to_lea8.stdout \
-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea9.stdout x86_64_mov_to_lea10.stdout \
-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea11.stdout x86_64_mov_to_lea12.stdout \
-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea13.stdout x86_64_mov_to_lea14.stdout
-
-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_28 = x86_64_mov_to_lea1 x86_64_mov_to_lea2 \
-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea3 x86_64_mov_to_lea4 x86_64_mov_to_lea5 \
-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea6 x86_64_mov_to_lea7 x86_64_mov_to_lea8 \
-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea9 x86_64_mov_to_lea10 x86_64_mov_to_lea11 \
-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea12 x86_64_mov_to_lea13 x86_64_mov_to_lea14
-
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_26 = x86_64_mov_to_lea.sh \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_overflow_pc32.sh
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_27 = x86_64_mov_to_lea1.stdout \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea2.stdout \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea3.stdout \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea4.stdout \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea5.stdout \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea6.stdout \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea7.stdout \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea8.stdout \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea9.stdout \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea10.stdout \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea11.stdout \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea12.stdout \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea13.stdout \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea14.stdout \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_overflow_pc32.err
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_28 = x86_64_mov_to_lea1 \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea2 \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea3 \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea4 \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea5 \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea6 \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea7 \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea8 \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea9 \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea10 \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea11 \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea12 \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea13 \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_mov_to_lea14 \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     x86_64_overflow_pc32.err
 @DEFAULT_TARGET_I386_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_29 = i386_mov_to_lea.sh
 @DEFAULT_TARGET_I386_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_30 = i386_mov_to_lea1.stdout  i386_mov_to_lea2.stdout \
 @DEFAULT_TARGET_I386_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@       i386_mov_to_lea3.stdout  i386_mov_to_lea4.stdout \
@@ -4426,6 +4443,8 @@ tls_pie_test.sh.log: tls_pie_test.sh
        @p='tls_pie_test.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
 x86_64_mov_to_lea.sh.log: x86_64_mov_to_lea.sh
        @p='x86_64_mov_to_lea.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+x86_64_overflow_pc32.sh.log: x86_64_overflow_pc32.sh
+       @p='x86_64_overflow_pc32.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
 i386_mov_to_lea.sh.log: i386_mov_to_lea.sh
        @p='i386_mov_to_lea.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
 debug_msg.sh.log: debug_msg.sh
@@ -5469,6 +5488,16 @@ uninstall-am:
 @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     $(TEST_OBJDUMP) -dw $< > $@
 @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@x86_64_mov_to_lea14.stdout: x86_64_mov_to_lea14
 @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     $(TEST_OBJDUMP) -dw $< > $@
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@x86_64_overflow_pc32.o: x86_64_overflow_pc32.s
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     $(TEST_AS) -o $@ $<
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@x86_64_overflow_pc32.err: x86_64_overflow_pc32.o gcctestdir/ld
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     @echo $(CXXLINK) -Bgcctestdir/ -shared -o x86_64_overflow_pc32 x86_64_overflow_pc32.o "2>$@"
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     @if $(CXXLINK) -Bgcctestdir/ -shared -o x86_64_overflow_pc32 x86_64_overflow_pc32.o 2>$@; \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     then \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@       echo 1>&2 "Link of x86_64_overflow_pc32 should have failed"; \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@       rm -f $@; \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@       exit 1; \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@     fi
 
 @DEFAULT_TARGET_I386_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@i386_mov_to_lea1.o: i386_mov_to_lea1.s
 @DEFAULT_TARGET_I386_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@       $(TEST_AS) --32 -o $@ $<

diff --git a/gold/testsuite/x86_64_overflow_pc32.s b/gold/testsuite/x86_64_overflow_pc32.s
new file mode 100644 (file)
index 0000000..7494c53
--- /dev/null
+++ b/gold/testsuite/x86_64_overflow_pc32.s
@@ -0,0 +1,15 @@
+       .data
+       .space 0x8ff00000
+       .hidden foo
+       .globl  foo
+foo:
+       .byte 20
+local:
+       .byte 20
+       .text
+       .globl  bar
+       .type   bar, @function
+bar:
+       lea     foo(%rip), %rax
+       lea     local(%rip), %rax
+       .size   bar, .-bar

diff --git a/gold/testsuite/x86_64_overflow_pc32.sh b/gold/testsuite/x86_64_overflow_pc32.sh
new file mode 100755 (executable)
index 0000000..3a5bcba
--- /dev/null
+++ b/gold/testsuite/x86_64_overflow_pc32.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+# x86_64_overflow_pc32.sh -- a test case for overflow checking.
+
+# Copyright (C) 2016 Free Software Foundation, Inc.
+# Written by Cary Coutant <ccoutant@gmail.com>.
+
+# This file is part of gold.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+check()
+{
+    if ! grep -q "$2" "$1"
+    then
+       echo "Did not find expected error in $1:"
+       echo "   $2"
+       echo ""
+       echo "Actual error output below:"
+       cat "$1"
+       exit 1
+    fi
+}
+
+# We don't know how the compiler might order these variables, so we
+# can't test for the actual offset from .data, hence the regexp.
+check x86_64_overflow_pc32.err "function bar: error: relocation overflow"
+
+exit 0

diff --git a/gold/x86_64.cc b/gold/x86_64.cc
index 4ad5afc7e0e8af3a639ddf1dfe7e7f6d51d61ce5..82bb65819fda4f0c553f7dcfa088f8ac24080fc5 100644 (file)
--- a/gold/x86_64.cc
+++ b/gold/x86_64.cc
@@ -3364,6 +3364,7 @@ Target_x86_64<size>::Relocate::relocate(
     typename elfcpp::Elf_types<size>::Elf_Addr address,
     section_size_type view_size)
 {
+  typedef Relocate_functions<size, false> Reloc_funcs;
   const elfcpp::Rela<size, false> rela(preloc);
   unsigned int r_type = elfcpp::elf_r_type<size>(rela.get_r_info());
 
@@ -3444,6 +3445,8 @@ Target_x86_64<size>::Relocate::relocate(
       break;
     }
 
+  typename Reloc_funcs::Reloc_status rstatus = Reloc_funcs::RELOC_OK;
+
   switch (r_type)
     {
     case elfcpp::R_X86_64_NONE:
@@ -3452,51 +3455,44 @@ Target_x86_64<size>::Relocate::relocate(
       break;
 
     case elfcpp::R_X86_64_64:
-      Relocate_functions<size, false>::rela64(view, object, psymval, addend);
+      Reloc_funcs::rela64(view, object, psymval, addend);
       break;
 
     case elfcpp::R_X86_64_PC64:
-      Relocate_functions<size, false>::pcrela64(view, object, psymval, addend,
+      Reloc_funcs::pcrela64(view, object, psymval, addend,
                                              address);
       break;
 
     case elfcpp::R_X86_64_32:
-      // FIXME: we need to verify that value + addend fits into 32 bits:
-      //    uint64_t x = value + addend;
-      //    x == static_cast<uint64_t>(static_cast<uint32_t>(x))
-      // Likewise for other <=32-bit relocations (but see R_X86_64_32S).
-      Relocate_functions<size, false>::rela32(view, object, psymval, addend);
+      rstatus = Reloc_funcs::rela32_check(view, object, psymval, addend,
+                                         Reloc_funcs::CHECK_UNSIGNED);
       break;
 
     case elfcpp::R_X86_64_32S:
-      // FIXME: we need to verify that value + addend fits into 32 bits:
-      //    int64_t x = value + addend;   // note this quantity is signed!
-      //    x == static_cast<int64_t>(static_cast<int32_t>(x))
-      Relocate_functions<size, false>::rela32(view, object, psymval, addend);
+      rstatus = Reloc_funcs::rela32_check(view, object, psymval, addend,
+                                         Reloc_funcs::CHECK_SIGNED);
       break;
 
     case elfcpp::R_X86_64_PC32:
     case elfcpp::R_X86_64_PC32_BND:
-      Relocate_functions<size, false>::pcrela32(view, object, psymval, addend,
-                                               address);
+      rstatus = Reloc_funcs::pcrela32_check(view, object, psymval, addend,
+                                           address, Reloc_funcs::CHECK_SIGNED);
       break;
 
     case elfcpp::R_X86_64_16:
-      Relocate_functions<size, false>::rela16(view, object, psymval, addend);
+      Reloc_funcs::rela16(view, object, psymval, addend);
       break;
 
     case elfcpp::R_X86_64_PC16:
-      Relocate_functions<size, false>::pcrela16(view, object, psymval, addend,
-                                               address);
+      Reloc_funcs::pcrela16(view, object, psymval, addend, address);
       break;
 
     case elfcpp::R_X86_64_8:
-      Relocate_functions<size, false>::rela8(view, object, psymval, addend);
+      Reloc_funcs::rela8(view, object, psymval, addend);
       break;
 
     case elfcpp::R_X86_64_PC8:
-      Relocate_functions<size, false>::pcrela8(view, object, psymval, addend,
-                                              address);
+      Reloc_funcs::pcrela8(view, object, psymval, addend, address);
       break;
 
     case elfcpp::R_X86_64_PLT32:
@@ -3510,8 +3506,8 @@ Target_x86_64<size>::Relocate::relocate(
       // Note: while this code looks the same as for R_X86_64_PC32, it
       // behaves differently because psymval was set to point to
       // the PLT entry, rather than the symbol, in Scan::global().
-      Relocate_functions<size, false>::pcrela32(view, object, psymval, addend,
-                                               address);
+      rstatus = Reloc_funcs::pcrela32_check(view, object, psymval, addend,
+                                           address, Reloc_funcs::CHECK_SIGNED);
       break;
 
     case elfcpp::R_X86_64_PLTOFF64:
@@ -3522,14 +3518,13 @@ Target_x86_64<size>::Relocate::relocate(
        typename elfcpp::Elf_types<size>::Elf_Addr got_address;
        // This is the address of GLOBAL_OFFSET_TABLE.
        got_address = target->got_plt_section()->address();
-       Relocate_functions<size, false>::rela64(view, object, psymval,
-                                               addend - got_address);
+       Reloc_funcs::rela64(view, object, psymval, addend - got_address);
       }
       break;
 
     case elfcpp::R_X86_64_GOT32:
       gold_assert(have_got_offset);
-      Relocate_functions<size, false>::rela32(view, got_offset, addend);
+      Reloc_funcs::rela32(view, got_offset, addend);
       break;
 
     case elfcpp::R_X86_64_GOTPC32:
@@ -3537,7 +3532,7 @@ Target_x86_64<size>::Relocate::relocate(
        gold_assert(gsym);
        typename elfcpp::Elf_types<size>::Elf_Addr value;
        value = target->got_plt_section()->address();
-       Relocate_functions<size, false>::pcrela32(view, value, addend, address);
+       Reloc_funcs::pcrela32(view, value, addend, address);
       }
       break;
 
@@ -3546,7 +3541,7 @@ Target_x86_64<size>::Relocate::relocate(
       // R_X86_64_GOTPLT64 is obsolete and treated the the same as
       // GOT64.
       gold_assert(have_got_offset);
-      Relocate_functions<size, false>::rela64(view, got_offset, addend);
+      Reloc_funcs::rela64(view, got_offset, addend);
       break;
 
     case elfcpp::R_X86_64_GOTPC64:
@@ -3554,7 +3549,7 @@ Target_x86_64<size>::Relocate::relocate(
        gold_assert(gsym);
        typename elfcpp::Elf_types<size>::Elf_Addr value;
        value = target->got_plt_section()->address();
-       Relocate_functions<size, false>::pcrela64(view, value, addend, address);
+       Reloc_funcs::pcrela64(view, value, addend, address);
       }
       break;
 
@@ -3563,7 +3558,7 @@ Target_x86_64<size>::Relocate::relocate(
        typename elfcpp::Elf_types<size>::Elf_Addr value;
        value = (psymval->value(object, 0)
                 - target->got_plt_section()->address());
-       Relocate_functions<size, false>::rela64(view, value, addend);
+       Reloc_funcs::rela64(view, value, addend);
       }
       break;
 
@@ -3582,7 +3577,7 @@ Target_x86_64<size>::Relocate::relocate(
                  && Target_x86_64<size>::can_convert_mov_to_lea(gsym))))
        {
          view[-2] = 0x8d;
-         Relocate_functions<size, false>::pcrela32(view, object, psymval, addend,
+         Reloc_funcs::pcrela32(view, object, psymval, addend,
                                                    address);
        }
       else
@@ -3601,7 +3596,7 @@ Target_x86_64<size>::Relocate::relocate(
            }
          typename elfcpp::Elf_types<size>::Elf_Addr value;
          value = target->got_plt_section()->address() + got_offset;
-         Relocate_functions<size, false>::pcrela32(view, value, addend, address);
+         Reloc_funcs::pcrela32(view, value, addend, address);
        }
       }
       break;
@@ -3611,7 +3606,7 @@ Target_x86_64<size>::Relocate::relocate(
        gold_assert(have_got_offset);
        typename elfcpp::Elf_types<size>::Elf_Addr value;
        value = target->got_plt_section()->address() + got_offset;
-       Relocate_functions<size, false>::pcrela64(view, value, addend, address);
+       Reloc_funcs::pcrela64(view, value, addend, address);
       }
       break;
 
@@ -3651,6 +3646,10 @@ Target_x86_64<size>::Relocate::relocate(
       break;
     }
 
+  if (rstatus == Reloc_funcs::RELOC_OVERFLOW)
+    gold_error_at_location(relinfo, relnum, rela.get_r_offset(),
+                          _("relocation overflow"));
+
   return true;
 }