From: H.J. Lu <hjl.tools@gmail.com>
Date: Tue, 16 Jan 2001 21:04:29 +0000 (+0000)
Subject: 2001-01-16  H.J. Lu  <hjl@gnu.org>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b92473047e3f3148974325dd7537726749eae45a;p=binutils-gdb.git

2001-01-16  H.J. Lu  <hjl@gnu.org>

	* ldlang.c (lang_check): Merge the private data only if the
	input file has contents.
---

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 9215103e3b6..17974d873b7 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-16  H.J. Lu  <hjl@gnu.org>
+
+	* ldlang.c (lang_check): Merge the private data only if the
+	input file has contents.
+
 2001-01-14  Alan Modra  <alan@linuxcare.com.au>
 
 	* emulparams/hppalinux.sh (OUTPUT_FORMAT): Set to elf32-hppa-linux.
diff --git a/ld/ldlang.c b/ld/ldlang.c
index 4b822b306e9..bc25f045740 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -3474,8 +3474,11 @@ lang_check ()
 		   bfd_printable_name (input_bfd), input_bfd,
 		   bfd_printable_name (output_bfd));
 	}
-      else
+      else if (bfd_count_sections (input_bfd))
 	{
+	  /* If the input bfd has no contents, it shouldn't set the
+	     private data of the output bfd. */
+
 	  bfd_error_handler_type pfn = NULL;
 
 	  /* If we aren't supposed to warn about mismatched input