diff --git a/ld/ChangeLog b/ld/ChangeLog
index 10ac41c02c..b7c97ba223 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,9 @@
 2003-11-05  Alan Modra  <amodra@bigpond.net.au>
 
+	* emultempl/pe.em (gld_${EMULATION_NAME}_after_open): Only do
+	pe_dll_extra_pe_debug stuff when DLL_SUPPORT defined.
+	(pr_sym): Move inside #ifdef DLL_SUPPORT.
+
 	* emultempl/ppc64elf.em (gld${EMULATION_NAME}_new_vers_pattern): Zap
 	unused variable.
 
diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em
index 109c4c1b54..7da7349ac5 100644
--- a/ld/emultempl/pe.em
+++ b/ld/emultempl/pe.em
@@ -916,7 +916,6 @@ pe_find_data_imports (void)
         }
     }
 }
-#endif /* DLL_SUPPORT */
 
 static bfd_boolean
 pr_sym (struct bfd_hash_entry *h, void *inf ATTRIBUTE_UNUSED)
@@ -926,11 +925,13 @@ pr_sym (struct bfd_hash_entry *h, void *inf ATTRIBUTE_UNUSED)
 
   return TRUE;
 }
+#endif /* DLL_SUPPORT */
 
 
 static void
 gld_${EMULATION_NAME}_after_open (void)
 {
+#ifdef DLL_SUPPORT
   if (pe_dll_extra_pe_debug)
     {
       bfd *a;
@@ -945,6 +946,7 @@ gld_${EMULATION_NAME}_after_open (void)
       for (a = link_info.input_bfds; a; a = a->link_next)
 	printf ("*%s\n",a->filename);
     }
+#endif
 
   /* Pass the wacky PE command line options into the output bfd.
      FIXME: This should be done via a function, rather than by