diff --git a/bfd/elf.c b/bfd/elf.c
index 74236a658fd..1414c973532 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -5443,6 +5443,14 @@ _bfd_elf_map_sections_to_segments (bfd *abfd,
 	    }
 	  else if (info != NULL
 		   && info->separate_code
+		   && info->rodata_in_code
+		   && executable != ((hdr->flags & (SEC_CODE | SEC_READONLY)) != 0))
+	    {
+	      new_segment = true;
+	    }
+	  else if (info != NULL
+		   && info->separate_code
+		   && ! info->rodata_in_code
 		   && executable != ((hdr->flags & SEC_CODE) != 0))
 	    {
 	      new_segment = true;
diff --git a/include/bfdlink.h b/include/bfdlink.h
index eac07d78364..2411b53485f 100644
--- a/include/bfdlink.h
+++ b/include/bfdlink.h
@@ -420,9 +420,12 @@ struct bfd_link_info
      relocations.  */
   unsigned int enable_dt_relr: 1;
 
-  /* TRUE if separate code segment should be created.  */
+  /* TRUE if a separate code segment should be created.  */
   unsigned int separate_code: 1;
 
+  /* TRUE if a read-only data is allowed in the code segment.  */
+  unsigned int rodata_in_code: 1;
+
   /* Nonzero if .eh_frame_hdr section and PT_GNU_EH_FRAME ELF segment
      should be created.  1 for DWARF2 tables, 2 for compact tables.  */
   unsigned int eh_frame_hdr_type: 2;
diff --git a/ld/emultempl/elf.em b/ld/emultempl/elf.em
index 55a870f7d2d..617581308ad 100644
--- a/ld/emultempl/elf.em
+++ b/ld/emultempl/elf.em
@@ -852,6 +852,10 @@ fragment <<EOF
 	link_info.separate_code = true;
       else if (strcmp (optarg, "noseparate-code") == 0)
 	link_info.separate_code = false;
+      else if (strcmp (optarg, "rodata-in-code") == 0)
+	link_info.rodata_in_code = true;
+      else if (strcmp (optarg, "no-rodata-in-code") == 0)
+	link_info.rodata_in_code = false;
       else if (strcmp (optarg, "common") == 0)
 	link_info.elf_stt_common = elf_stt_common;
       else if (strcmp (optarg, "nocommon") == 0)
diff --git a/ld/lexsup.c b/ld/lexsup.c
index 4125d849f2c..7b0710c2001 100644
--- a/ld/lexsup.c
+++ b/ld/lexsup.c
@@ -2234,6 +2234,10 @@ elf_shlib_list_options (FILE *file)
   fprintf (file, _("\
   -z noseparate-code          Don't create separate code program header (default)\n"));
 #endif
+  fprintf (file, _("\
+  -z rodata-in-code           If separate-code is active, allow read-only data in the code segment\n"));
+  fprintf (file, _("\
+  -z no-rodata-in-code        If separate-code is active place read-only data in its own segment (default)\n"));
   fprintf (file, _("\
   -z common                   Generate common symbols with STT_COMMON type\n"));
   fprintf (file, _("\