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 9215103e3b62c21d8412048fe9e2540aafe95dd9..17974d873b7dde6b57665f02b066c3da5ce221a5 100644 (file)
--- 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 4b822b306e9c78632be2405cef1db1ce438860e3..bc25f045740fecf77f3b491ebefc705c425e7a6b 100644 (file)
--- 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