diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 8abbfcb258..11fbdab1b2 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2017-04-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/21401
+	* elf64-x86-64.c (elf_x86_64_finish_dynamic_symbol): Don't abort
+	on on undefined IFUNC symbol in the second PLT.
+
 2017-04-19  Wedson Almeida Filho  <wedsonaf@gmail.com>
 
 	* peXXigen.c (pe_print_reloc): Correct chunk_end.
diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index bf10893da7..746b847744 100644
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -6013,7 +6013,7 @@ elf_x86_64_finish_dynamic_symbol (bfd *output_bfd,
       got_offset = h->got.offset;
 
       if (got_offset == (bfd_vma) -1
-	  || h->type == STT_GNU_IFUNC
+	  || (h->type == STT_GNU_IFUNC && h->def_regular)
 	  || plt == NULL
 	  || got == NULL)
 	abort ();
diff --git a/ld/ChangeLog b/ld/ChangeLog
index c20ed75f0c..bccd2becc6 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2017-04-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/21401
+	* testsuite/ld-ifunc/ifunc.exp: Add a libtest-2-now.so test with
+	-z now.
+
 2017-04-19  Alan Modra  <amodra@gmail.com>
 
 	* ld.texinfo (dynamic-undefined-weak): Document.
diff --git a/ld/testsuite/ld-ifunc/ifunc.exp b/ld/testsuite/ld-ifunc/ifunc.exp
index ffff2f1ae5..13d50a5b72 100644
--- a/ld/testsuite/ld-ifunc/ifunc.exp
+++ b/ld/testsuite/ld-ifunc/ifunc.exp
@@ -234,6 +234,10 @@ if ![ld_link $ld "tmpdir/libtest-2.so" "-shared tmpdir/test-2.o"] {
     fail "Could not link libtest-2.so"
     set fails [expr $fails + 1]
 }
+if ![ld_link $ld "tmpdir/libtest-2-now.so" "-shared -z now tmpdir/test-2.o"] {
+    fail "Could not link libtest-2-now.so"
+    set fails [expr $fails + 1]
+}
 
 if { $fails == 0 } {
   pass "Building ifunc binaries"
@@ -306,6 +310,10 @@ if {[contains_ifunc_symbol tmpdir/libtest-2.so] != 0} {
     fail "libtest-2.so contains IFUNC symbols"
     set fails [expr $fails + 1]
 }
+if {[contains_ifunc_symbol tmpdir/libtest-2-now.so] != 0} {
+    fail "libtest-2-now.so contains IFUNC symbols"
+    set fails [expr $fails + 1]
+}
 
 # The linked ifunc using executables and shared libraries should contain
 # a dynamic reloc referencing the IFUNC symbol.  (Even the static