diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index eb819200fe..1af35606f7 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2017-10-12  Alan Modra  <amodra@gmail.com>
+
+	* elf32-nds32.c (nds32_elf_size_dynamic_sections): Set .interp
+	when executable rather than non-PIC.
+	* elf32-score.c (s3_bfd_score_elf_size_dynamic_sections): Likewise.
+	* elf32-score7.c (s7_bfd_score_elf_size_dynamic_sections): Likewise.
+
 2017-10-11  Maciej W. Rozycki  <macro@imgtec.com>
 
 	* elf-bfd.h (elf_backend_data): Add `linux_prpsinfo64_ugid16'
diff --git a/bfd/elf32-nds32.c b/bfd/elf32-nds32.c
index ddf14650cd..4341007a08 100644
--- a/bfd/elf32-nds32.c
+++ b/bfd/elf32-nds32.c
@@ -3943,7 +3943,7 @@ nds32_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
   if (htab->root.dynamic_sections_created)
     {
       /* Set the contents of the .interp section to the interpreter.  */
-      if (!bfd_link_pic (info) && !info->nointerp)
+      if (bfd_link_executable (info) && !info->nointerp)
 	{
 	  s = bfd_get_section_by_name (dynobj, ".interp");
 	  BFD_ASSERT (s != NULL);
diff --git a/bfd/elf32-score.c b/bfd/elf32-score.c
index 5fc10b35d2..69a19ec4d2 100644
--- a/bfd/elf32-score.c
+++ b/bfd/elf32-score.c
@@ -3263,7 +3263,7 @@ s3_bfd_score_elf_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *i
   if (elf_hash_table (info)->dynamic_sections_created)
     {
       /* Set the contents of the .interp section to the interpreter.  */
-      if (!bfd_link_pic (info) && !info->nointerp)
+      if (bfd_link_executable (info) && !info->nointerp)
         {
           s = bfd_get_linker_section (dynobj, ".interp");
           BFD_ASSERT (s != NULL);
diff --git a/bfd/elf32-score7.c b/bfd/elf32-score7.c
index 5554cccbb5..17f5f9d290 100644
--- a/bfd/elf32-score7.c
+++ b/bfd/elf32-score7.c
@@ -3071,7 +3071,7 @@ s7_bfd_score_elf_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *i
   if (elf_hash_table (info)->dynamic_sections_created)
     {
       /* Set the contents of the .interp section to the interpreter.  */
-      if (!bfd_link_pic (info) && !info->nointerp)
+      if (bfd_link_executable (info) && !info->nointerp)
         {
           s = bfd_get_linker_section (dynobj, ".interp");
           BFD_ASSERT (s != NULL);