Now compiles with gcc too.

diff --git a/ld/ldmain.c b/ld/ldmain.c
index a83385e690b0e6339efbc7b034ca299ff5bd2f77..d9380b578e513a14f1d75bd2aaf3e7d56f36444c 100644 (file)
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -219,13 +219,13 @@ main (argc, argv)
   if (config.relocateable_output) {
     output_bfd->flags &= ~EXEC_P;
 
-    ldwrite(write_map);
+    ldwrite();
     bfd_close(output_bfd);
   }
   else {
     output_bfd->flags |= EXEC_P;
 
-    ldwrite(write_map);
+    ldwrite();
 
     if (config.make_executable == false && force_make_executable ==false) {
 

diff --git a/ld/ldwrite.c b/ld/ldwrite.c
index 0f545d09d1995255508fb22bf1715c53b15809b0..fc7759f3586a019075845e370a48d29cdd8e11ce 100644 (file)
--- a/ld/ldwrite.c
+++ b/ld/ldwrite.c
@@ -387,8 +387,7 @@ DEFUN_VOID(write_rel)
 }
 
 void
-DEFUN(ldwrite, (write_map),
-      boolean write_map)
+DEFUN_VOID(ldwrite)
 {
   data_area = (PTR) ldmalloc(largest_section);
   if (config.relocateable_output == true)
@@ -404,9 +403,9 @@ DEFUN(ldwrite, (write_map),
 
   /* Print a map, if requested.  */
 
-  if (write_map) {
+  if (config.map_file) {
     ldsym_print_symbol_table ();
-    lang_map(stdout);
+    lang_map();
   }
 
   ldsym_write ();