diff --git a/ld/ChangeLog b/ld/ChangeLog
index 7f12bc7d5b..f703b31e3c 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/1263
+	* emultempl/elf32.em (gld${EMULATION_NAME}_load_symbols): Check
+	--just-symbols on DSO.
+
 2005-08-18  Alan Modra  <amodra@bigpond.net.au>
 
 	* scripttempl/elf.sc: Remove commented out defines.
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 2764a59d96..15d27227fb 100644
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -124,6 +124,11 @@ gld${EMULATION_NAME}_load_symbols (lang_input_statement_type *entry)
   if (!entry->add_needed)
     class |= DYN_NO_ADD_NEEDED;
 
+  if (entry->just_syms_flag
+      && (bfd_get_file_flags (entry->the_bfd) & DYNAMIC) != 0)
+    einfo (_("%P%F: --just-symbols may not be used on DSO: %B\n"),
+	   entry->the_bfd);
+
   if (!class
       || (bfd_get_file_flags (entry->the_bfd) & DYNAMIC) == 0)
     return FALSE;