2e4410
diff -rup binutils.orig/gold/layout.cc binutils-2.32/gold/layout.cc
2e4410
--- binutils.orig/gold/layout.cc	2019-06-24 14:37:36.013086899 +0100
2e4410
+++ binutils-2.32/gold/layout.cc	2019-06-24 14:41:40.054517479 +0100
2e4410
@@ -868,6 +868,7 @@ Layout::get_output_section(const char* n
2e4410
 		  && (same_name->flags() & elfcpp::SHF_TLS) == 0)
2e4410
 		os = same_name;
2e4410
 	    }
2e4410
+#if 0 /* BZ 1722715, PR 17556.  */
2e4410
 	  else if ((flags & elfcpp::SHF_TLS) == 0)
2e4410
 	    {
2e4410
 	      elfcpp::Elf_Xword zero_flags = 0;
2e4410
@@ -878,6 +879,7 @@ Layout::get_output_section(const char* n
2e4410
 	      if (p != this->section_name_map_.end())
2e4410
 		os = p->second;
2e4410
 	    }
2e4410
+#endif
2e4410
 	}
2e4410
 
2e4410
       if (os == NULL)
2e4410
diff -rup binutils.orig/gold/object.cc binutils-2.32/gold/object.cc
2e4410
--- binutils.orig/gold/object.cc	2019-06-24 14:37:36.012086906 +0100
2e4410
+++ binutils-2.32/gold/object.cc	2019-06-24 14:39:59.287165501 +0100
2e4410
@@ -1644,6 +1644,13 @@ Sized_relobj_file<size, big_endian>::do_
2e4410
 	      omit[i] = true;
2e4410
 	    }
2e4410
 
2e4410
+	  // Skip empty sections without flags.
2e4410
+	  if (!(shdr.get_sh_flags() & ~elfcpp::SHF_GROUP)
2e4410
+	      && !shdr.get_sh_size())
2e4410
+	    {
2e4410
+	      omit[i] = true;
2e4410
+	    }
2e4410
+
2e4410
 	  bool discard = omit[i];
2e4410
 	  if (!discard)
2e4410
 	    {