Index: ELF/Config.h
===================================================================
--- ELF/Config.h
+++ ELF/Config.h
@@ -110,6 +110,7 @@
   bool Mips64EL = false;
   bool MipsN32Abi = false;
   bool NoGnuUnique;
+  bool NoRosegment;
   bool NoUndefinedVersion;
   bool Nostdlib;
   bool OFormatBinary;
Index: ELF/Driver.cpp
===================================================================
--- ELF/Driver.cpp
+++ ELF/Driver.cpp
@@ -494,6 +494,7 @@
   Config->GdbIndex = Args.hasArg(OPT_gdb_index);
   Config->ICF = Args.hasArg(OPT_icf);
   Config->NoGnuUnique = Args.hasArg(OPT_no_gnu_unique);
+  Config->NoRosegment = Args.hasArg(OPT_no_rosegment);
   Config->NoUndefinedVersion = Args.hasArg(OPT_no_undefined_version);
   Config->Nostdlib = Args.hasArg(OPT_nostdlib);
   Config->Pie = getArg(Args, OPT_pie, OPT_nopie, false);
Index: ELF/Options.td
===================================================================
--- ELF/Options.td
+++ ELF/Options.td
@@ -138,6 +138,8 @@
 
 def nopie: F<"nopie">, HelpText<"Do not create a position independent executable">;
 
+def no_rosegment: F<"no-rosegment">, HelpText<"Do not put read-only non-executable sections in their own segment">;
+
 def no_undefined: F<"no-undefined">,
   HelpText<"Report unresolved symbols even if the linker is creating a shared library">;
 
Index: ELF/Writer.cpp
===================================================================
--- ELF/Writer.cpp
+++ ELF/Writer.cpp
@@ -1095,6 +1095,15 @@
   return F;
 }
 
+// We apply -rosegment by default, -no-rosegment is used to avoid placing read
+// only non-executable sections in their own segment.
+template <class ELFT>
+static bool shouldEmitLoad(typename ELFT::uint Old, typename ELFT::uint New) {
+  if (Config->NoRosegment)
+    return (Old & PF_W) != (New & PF_W);
+  return Old != New;
+}
+
 // Decide which program headers to create and which sections to include in each
 // one.
 template <class ELFT> std::vector<PhdrEntry<ELFT>> Writer<ELFT>::createPhdrs() {
@@ -1141,13 +1150,16 @@
 
     // Segments are contiguous memory regions that has the same attributes
     // (e.g. executable or writable). There is one phdr for each segment.
-    // Therefore, we need to create a new phdr when the next section has
+    // Therefore, usually we need to create a new phdr when the next section has
     // different flags or is loaded at a discontiguous address using AT linker
-    // script command.
+    // script command. This can be changed using -norosegment option.
     uintX_t NewFlags = computeFlags<ELFT>(Sec->getPhdrFlags());
-    if (Script<ELFT>::X->hasLMA(Sec->getName()) || Flags != NewFlags) {
+    if (Script<ELFT>::X->hasLMA(Sec->getName()) ||
+        shouldEmitLoad<ELFT>(Flags, NewFlags)) {
       Load = AddHdr(PT_LOAD, NewFlags);
       Flags = NewFlags;
+    } else {
+      Load->H.p_flags |= NewFlags;
     }
 
     Load->add(Sec);
Index: test/ELF/segments.s
===================================================================
--- test/ELF/segments.s
+++ test/ELF/segments.s
@@ -0,0 +1,88 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
+# RUN: ld.lld %t -o %t1
+# RUN: llvm-readobj --program-headers %t1 | FileCheck --check-prefix=ROSEGMENT %s
+
+# ROSEGMENT:      ProgramHeader {
+# ROSEGMENT:        Type: PT_LOAD
+# ROSEGMENT-NEXT:    Offset: 0x0
+# ROSEGMENT-NEXT:    VirtualAddress: 0x10000
+# ROSEGMENT-NEXT:    PhysicalAddress: 0x10000
+# ROSEGMENT-NEXT:    FileSize:
+# ROSEGMENT-NEXT:    MemSize:
+# ROSEGMENT-NEXT:    Flags [
+# ROSEGMENT-NEXT:      PF_R
+# ROSEGMENT-NEXT:    ]
+# ROSEGMENT-NEXT:    Alignment: 4096
+# ROSEGMENT-NEXT:  }
+# ROSEGMENT-NEXT:  ProgramHeader {
+# ROSEGMENT-NEXT:    Type: PT_LOAD
+# ROSEGMENT-NEXT:    Offset: 0x1000
+# ROSEGMENT-NEXT:    VirtualAddress: 0x11000
+# ROSEGMENT-NEXT:    PhysicalAddress: 0x11000
+# ROSEGMENT-NEXT:    FileSize:
+# ROSEGMENT-NEXT:    MemSize:
+# ROSEGMENT-NEXT:    Flags [
+# ROSEGMENT-NEXT:      PF_R
+# ROSEGMENT-NEXT:      PF_X
+# ROSEGMENT-NEXT:    ]
+# ROSEGMENT-NEXT:    Alignment: 4096
+# ROSEGMENT-NEXT:  }
+# ROSEGMENT-NEXT:  ProgramHeader {
+# ROSEGMENT-NEXT:    Type: PT_LOAD
+# ROSEGMENT-NEXT:    Offset: 0x2000
+# ROSEGMENT-NEXT:    VirtualAddress: 0x12000
+# ROSEGMENT-NEXT:    PhysicalAddress: 0x12000
+# ROSEGMENT-NEXT:    FileSize: 1
+# ROSEGMENT-NEXT:    MemSize: 1
+# ROSEGMENT-NEXT:    Flags [
+# ROSEGMENT-NEXT:      PF_R
+# ROSEGMENT-NEXT:      PF_W
+# ROSEGMENT-NEXT:    ]
+# ROSEGMENT-NEXT:    Alignment: 4096
+# ROSEGMENT-NEXT:  }
+
+# RUN: ld.lld -no-rosegment %t -o %t2
+# RUN: llvm-readobj --program-headers %t2 | FileCheck --check-prefix=NOROSEGMENT %s
+
+# NOROSEGMENT:     ProgramHeader {
+# NOROSEGMENT:       Type: PT_LOAD
+# NOROSEGMENT-NEXT:   Offset: 0x0
+# NOROSEGMENT-NEXT:   VirtualAddress: 0x10000
+# NOROSEGMENT-NEXT:   PhysicalAddress: 0x10000
+# NOROSEGMENT-NEXT:   FileSize:
+# NOROSEGMENT-NEXT:   MemSize:
+# NOROSEGMENT-NEXT:   Flags [
+# NOROSEGMENT-NEXT:     PF_R
+# NOROSEGMENT-NEXT:     PF_X
+# NOROSEGMENT-NEXT:   ]
+# NOROSEGMENT-NEXT:   Alignment: 4096
+# NOROSEGMENT-NEXT: }
+# NOROSEGMENT-NEXT: ProgramHeader {
+# NOROSEGMENT-NEXT:   Type: PT_LOAD
+# NOROSEGMENT-NEXT:   Offset: 0x1000
+# NOROSEGMENT-NEXT:   VirtualAddress: 0x11000
+# NOROSEGMENT-NEXT:   PhysicalAddress: 0x11000
+# NOROSEGMENT-NEXT:   FileSize:
+# NOROSEGMENT-NEXT:   MemSize:
+# NOROSEGMENT-NEXT:   Flags [
+# NOROSEGMENT-NEXT:     PF_R
+# NOROSEGMENT-NEXT:     PF_W
+# NOROSEGMENT-NEXT:   ]
+# NOROSEGMENT-NEXT:   Alignment: 4096
+# NOROSEGMENT-NEXT: }
+# NOROSEGMENT-NEXT: ProgramHeader {
+# NOROSEGMENT-NEXT:   Type: PT_GNU_STACK
+
+.global _start
+_start:
+ nop
+
+.section .ro,"a"
+nop
+
+.section .rw,"aw"
+nop
+
+.section .rx,"ax"
+nop