Replace MINUS_G by CFLAGS.
[deliverable/binutils-gdb.git] / ld / ldlang.c
index 1fccbc29f0e327fa09b29b1f0166d48c42a064df..191dd484814de38f0fe0623996d186daef6c80e3 100644 (file)
@@ -18,142 +18,83 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* $Id$ 
  *
- * $Log$
- * Revision 1.1  1991/03/21 21:28:45  gumby
- * Initial revision
- *
- * Revision 1.3  1991/03/16  22:19:21  rich
- * pop
- *
- * Revision 1.2  1991/03/15  18:52:42  rich
- * pop
- *
- * Revision 1.1  1991/03/13  00:48:23  chrisb
- * Initial revision
- *
- * Revision 1.8  1991/03/10  09:31:28  rich
- *  Modified Files:
- *     Makefile config.h ld-emul.c ld-emul.h ld-gld.c ld-gld960.c
- *     ld-lnk960.c ld.h lddigest.c ldexp.c ldexp.h ldfile.c ldfile.h
- *     ldgram.y ldinfo.h ldlang.c ldlang.h ldlex.h ldlex.l ldmain.c
- *     ldmain.h ldmisc.c ldmisc.h ldsym.c ldsym.h ldversion.c
- *     ldversion.h ldwarn.h ldwrite.c ldwrite.h y.tab.h
- *
- * As of this round of changes, ld now builds on all hosts of (Intel960)
- * interest and copy passes my copy test on big endian hosts again.
- *
- * Revision 1.7  1991/03/09  03:31:03  sac
- * After a fatal info message, the output file is deleted.
- *
- * Revision 1.6  1991/03/09  03:25:06  sac
- * Added support for LONG, SHORT and BYTE keywords in scripts
- *
- * Revision 1.5  1991/03/06  21:59:31  sac
- * Completed G++ support
- *
- * Revision 1.4  1991/03/06  02:26:02  sac
- * Added support for constructor sections.
- * Remove parsing ambiguity.
- * Lint
- *
- * Revision 1.3  1991/02/22  17:15:01  sac
- * Added RCS keywords and copyrights
- *
 */
 
-
-
-#include "sysdep.h" 
 #include "bfd.h"
+#include "sysdep.h" 
 
 #include "ld.h"
 #include "ldmain.h"
 #include "ldsym.h"
-#include "ldgram.tab.h"
-#include "ldmisc.h"
+#include "ldgram.h"
+#include "ldwarn.h"
 #include "ldlang.h"
 #include "ldexp.h"
-#include "ld-emul.h"
+#include "ldemul.h"
 #include "ldlex.h"
+#include "ldmisc.h"
+#include "ldindr.h"
+#include "ldctor.h"
+/* FORWARDS */
+PROTO(static void, print_statements,(void));
+PROTO(static void, print_statement,(lang_statement_union_type *,
+                                    lang_output_section_statement_type *));
 
-/* EXPORTS */
 
+/* LOCALS */
+static CONST  char *startup_file;
+static lang_statement_list_type input_file_chain;
 
+/* Points to the last statement in the .data section, so we can add
+   stuff to the data section without pain */
+static lang_statement_list_type end_of_data_section_statement_list;
 
-extern unsigned int undefined_global_sym_count;
+/* List of statements needed to handle constructors */
+extern lang_statement_list_type constructor_list;
 
-static char *startup_file;
-static lang_input_statement_type *first_file;
-lang_statement_list_type statement_list;
-lang_statement_list_type *stat_ptr = &statement_list;
-lang_statement_list_type lang_output_section_statement;
-lang_statement_list_type input_file_chain;
-lang_statement_list_type file_chain;
-extern char *current_file;
 static boolean placed_commons = false;
-
-boolean lang_float_flag;
-
 static lang_output_section_statement_type *default_common_section;
-
-
-/* FORWARDS */
-PROTO(static void, print_statements,(void));
-PROTO(static void, print_statement,(lang_statement_union_type *,
-                                    lang_output_section_statement_type *));
-
-
+static boolean map_option_f;
+static bfd_vma print_dot;
+static lang_input_statement_type *first_file;
+static lang_statement_list_type lang_output_section_statement;
+static CONST char *current_target;
+static CONST char *output_target;
+static size_t longest_section_name = 8;
+static asection common_section;
+static section_userdata_type common_section_userdata;
+static lang_statement_list_type statement_list;
 
 /* EXPORTS */
+boolean relaxing;
+lang_output_section_statement_type *abs_output_section;
+lang_statement_list_type *stat_ptr = &statement_list;
+lang_input_statement_type *script_file = 0;
+boolean option_longmap = false;
+lang_statement_list_type file_chain = {0};
+CONST char *entry_symbol = 0;
+bfd_size_type largest_section = 0;
 boolean lang_has_input_file = false;
+lang_output_section_statement_type *create_object_symbols = 0;
+boolean had_output_filename = false;
+boolean lang_float_flag = false;
+/* IMPORTS */
+extern char  *default_target;
 
-
+extern unsigned int undefined_global_sym_count;
+extern char *current_file;
 extern bfd *output_bfd;
-size_t largest_section;
-
-
 extern enum bfd_architecture ldfile_output_architecture;
 extern unsigned long ldfile_output_machine;
 extern char *ldfile_output_machine_name;
-
-
 extern ldsym_type *symbol_head;
-
-bfd_vma print_dot;
-unsigned int commons_pending;
-
-
-
-
+extern unsigned int commons_pending;
 extern args_type command_line;
 extern ld_config_type config;
-
-char *entry_symbol;
-
-
-
-lang_output_section_statement_type *create_object_symbols;
-
 extern boolean had_script;
-static boolean map_option_f;
-
-
-boolean had_output_filename = false;
 extern boolean write_map;
 
 
-
-
-
-
-size_t longest_section_name = 8;
-
-
-lang_input_statement_type *script_file;
-
-section_userdata_type common_section_userdata;
-asection common_section;
-
 #ifdef __STDC__
 #define cat(a,b) a##b
 #else
@@ -166,76 +107,135 @@ asection common_section;
 
 #define outside_symbol_address(q) ((q)->value +   outside_section_address(q->section))
 
-boolean option_longmap = false;
-
-static void lang_list_init(list)
-lang_statement_list_type *list;
-{
-list->head = (lang_statement_union_type *)NULL;
-list->tail = &list->head;
-}
+void EXFUN(lang_add_data,( int type ,   union etree_union *exp));
 
 static void 
-print_section(name)
-char *name;
+DEFUN(print_size,(value),
+      size_t value)
 {
-  printf("%*s", -longest_section_name, name);
+  fprintf(config.map_file, "%5x", (unsigned)value);
 }
 static void 
-print_space()
+DEFUN(print_alignment,(value),
+      unsigned int value)
 {
-  printf(" ");
+  fprintf(config.map_file, "2**%1u",value);
 }
 static void 
-print_nl()
+DEFUN(print_fill,(value),
+      fill_type value)
 {
-  printf("\n");
+  fprintf(config.map_file, "%04x",(unsigned)value);
 }
+
+
 static void 
-print_address(value)
-bfd_vma value;
+DEFUN(print_section,(name),
+      CONST char *CONST name)
 {
-  printf("%8lx", value);
+  fprintf(config.map_file, "%*s", -longest_section_name, name);
 }
+
+/*----------------------------------------------------------------------
+  lang_for_each_statement walks the parse tree and calls the provided
+  function for each node
+*/
+
 static void 
-print_size(value)
-size_t value;
+DEFUN(lang_for_each_statement_worker,(func,  s),
+      void (*func)() AND
+      lang_statement_union_type *s)
 {
-  printf("%5x", (unsigned)value);
+  for (; s != (lang_statement_union_type *)NULL ; s = s->next) 
+      {
+       func(s);
+
+       switch (s->header.type) {
+       case lang_constructors_statement_enum:
+         lang_for_each_statement_worker(func, constructor_list.head);
+         break;
+       case lang_output_section_statement_enum:
+         lang_for_each_statement_worker
+           (func, 
+            s->output_section_statement.children.head);
+         break;
+       case lang_wild_statement_enum:
+         lang_for_each_statement_worker
+           (func, 
+            s->wild_statement.children.head);
+         break;
+       case lang_data_statement_enum:
+       case lang_object_symbols_statement_enum:
+       case lang_output_statement_enum:
+       case lang_target_statement_enum:
+       case lang_input_section_enum:
+       case lang_input_statement_enum:
+       case lang_fill_statement_enum:
+       case lang_assignment_statement_enum:
+       case lang_padding_statement_enum:
+       case lang_address_statement_enum:
+         break;
+       default:
+         FAIL();
+         break;
+       }
+      }
 }
-static void 
-print_alignment(value)
-unsigned int value;
+
+void
+DEFUN(lang_for_each_statement,(func),
+      void (*func)())
 {
-  printf("2**%2u",value);
+  lang_for_each_statement_worker(func,
+                                statement_list.head);
 }
-static void 
-print_fill(value)
-fill_type value;
+/*----------------------------------------------------------------------*/
+void 
+DEFUN(lang_list_init,(list),
+      lang_statement_list_type *list)
 {
-  printf("%04x",(unsigned)value);
+list->head = (lang_statement_union_type *)NULL;
+list->tail = &list->head;
 }
 
 
+/*----------------------------------------------------------------------
+  
+  build a new statement node for the parse tree
+
+ */
+
 static
-lang_statement_union_type *new_statement(type, size, list)
-enum statement_enum type;
-size_t size;
-lang_statement_list_type *list;
+lang_statement_union_type*
+DEFUN(new_statement,(type, size, list),
+      enum statement_enum type AND
+      bfd_size_type size AND
+      lang_statement_list_type *list)
 {
   lang_statement_union_type *new = (lang_statement_union_type *)
     ldmalloc(size);
   new->header.type = type;
   new->header.next = (lang_statement_union_type *)NULL;
- lang_statement_append(list, new, &new->header.next);
 lang_statement_append(list, new, &new->header.next);
   return new;
 }
 
+/*
+  Build a new input file node for the language. There are several ways
+  in which we treat an input file, eg, we only look at symbols, or
+  prefix it with a -l etc.
+
+  We can be supplied with requests for input files more than once;
+  they may, for example be split over serveral lines like foo.o(.text)
+  foo.o(.data) etc, so when asked for a file we check that we havn't
+  got it already so we don't duplicate the bfd.
+
+ */
 static lang_input_statement_type *
-new_afile(name, file_type, target)
-char *name;
-lang_input_file_enum_type file_type;
-char *target;
+DEFUN(new_afile, (name, file_type, target),
+      CONST char *CONST name AND
+      CONST lang_input_file_enum_type file_type AND
+      CONST char *CONST target)
 {
   lang_input_statement_type *p = new_stat(lang_input_statement, 
                                          stat_ptr);
@@ -257,7 +257,6 @@ char *target;
     p->local_sym_name= name;
     p->just_syms_flag = false;
     p->search_dirs_flag =false;
-
     break;
   case lang_input_file_is_l_enum:
     p->is_archive = true;
@@ -267,7 +266,6 @@ char *target;
     p->just_syms_flag = false;
     p->search_dirs_flag = true;
     break;
-
   case lang_input_file_is_search_file_enum:
   case lang_input_file_is_marker_enum:
     p->filename = name;
@@ -277,9 +275,6 @@ char *target;
     p->just_syms_flag = false;
     p->search_dirs_flag =true;
     break;
-
-
-
   case lang_input_file_is_file_enum:
     p->filename = name;
     p->is_archive =false;
@@ -288,54 +283,52 @@ char *target;
     p->just_syms_flag = false;
     p->search_dirs_flag =false;
     break;
-
-
   default:
     FAIL();
   }
   p->asymbols = (asymbol **)NULL;
   p->superfile = (lang_input_statement_type *)NULL;
-
   p->next_real_file = (lang_statement_union_type*)NULL;
   p->next = (lang_statement_union_type*)NULL;
   p->symbol_count = 0;
   p->common_output_section = (asection *)NULL;
-
   lang_statement_append(&input_file_chain,
                        (lang_statement_union_type *)p,
                        &p->next_real_file);
   return p;
 }
 
+
+
 lang_input_statement_type *
-lang_add_input_file(name,
-                   file_type, 
-                   target)
-char *name;
-lang_input_file_enum_type file_type;
-char *target;
+DEFUN(lang_add_input_file,(name, file_type, target),
+     CONST char *name AND
+      lang_input_file_enum_type file_type AND
+     CONST char *target)
 {
   /* Look it up or build a new one */
-
+  lang_has_input_file = true;
+#if 0
   lang_input_statement_type *p;
 
   for (p = (lang_input_statement_type *)input_file_chain.head;
        p != (lang_input_statement_type *)NULL;
        p = (lang_input_statement_type *)(p->next_real_file))
-    {
-      /* Sometimes we have incomplete entries in here */
-      if (p->filename != (char *)NULL) {
-       if(strcmp(name,p->filename) == 0)  return p;
-      }
-    }
-
+      {
+       /* Sometimes we have incomplete entries in here */
+       if (p->filename != (char *)NULL) {
+         if(strcmp(name,p->filename) == 0)  return p;
+       }
+     
+ }
+#endif
   return  new_afile(name, file_type, target);
 }
 
 
-
+/* Build enough state so that the parser can build its tree */
 void
-lang_init()
+DEFUN_VOID(lang_init)
 {
 
   stat_ptr= &statement_list;
@@ -347,71 +340,67 @@ lang_init()
   first_file = lang_add_input_file((char *)NULL, 
                                   lang_input_file_is_marker_enum,
                                   (char *)NULL);
+abs_output_section = lang_output_section_statement_lookup(BFD_ABS_SECTION_NAME);
 
-}
-
-static void 
-lang_init2()
-{
-  script_file = lang_add_input_file("script file",
-                                   lang_input_file_is_fake_enum,
-                                   (char *)NULL);
-  script_file->the_bfd = bfd_create("script file", output_bfd);
-  script_file->symbol_count = 0;
-
-  common_section.userdata = &common_section_userdata;
+abs_output_section->bfd_section = &bfd_abs_section;
 
 }
 
 
+/*----------------------------------------------------------------------
+ A region is an area of memory declared with the 
+ MEMORY {  name:org=exp, len=exp ... } 
+ syntax. 
+
+ We maintain a list of all the regions here
 
-/*  this function mainains a dictionary of regions. If the *default*
-    region is asked for then a pointer to the first region is
-    returned. If there is no first pointer then one is created 
+ If no regions are specified in the script, then the default is used
+ which is created when looked up to be the entire data space
 */
 
 static lang_memory_region_type *lang_memory_region_list;
 static lang_memory_region_type **lang_memory_region_list_tail = &lang_memory_region_list;
 
 lang_memory_region_type *
-lang_memory_region_lookup(name)
-char *name;
+DEFUN(lang_memory_region_lookup,(name),
+      CONST char *CONST name)
 {
 
-    lang_memory_region_type *p  = lang_memory_region_list;
-    for (p = lang_memory_region_list;
-        p != ( lang_memory_region_type *)NULL;
-        p = p->next) {
-       if (strcmp(p->name, name) == 0) {
-           return p;
-       }
+  lang_memory_region_type *p  = lang_memory_region_list;
+  for (p = lang_memory_region_list;
+       p != ( lang_memory_region_type *)NULL;
+       p = p->next) {
+    if (strcmp(p->name, name) == 0) {
+      return p;
     }
-    if (strcmp(name,"*default*")==0) {
-       /* This is the default region, dig out first one on the list */
-       if (lang_memory_region_list != (lang_memory_region_type*)NULL){
-           return lang_memory_region_list;
-       }
+  }
+  if (strcmp(name,"*default*")==0) {
+    /* This is the default region, dig out first one on the list */
+    if (lang_memory_region_list != (lang_memory_region_type*)NULL){
+      return lang_memory_region_list;
     }
+  }
     {
-       lang_memory_region_type *new =
-           (lang_memory_region_type *)ldmalloc(sizeof(lang_memory_region_type));
-       new->name = name;
-       new->next = (lang_memory_region_type *)NULL;
-
-       *lang_memory_region_list_tail = new;
-       lang_memory_region_list_tail = &new->next;
-       new->origin = 0;
-       new->length = ~0;
-       new->current = 0;
-       return new;
+      lang_memory_region_type *new =
+       (lang_memory_region_type *)ldmalloc((bfd_size_type)(sizeof(lang_memory_region_type)));
+      new->name = buystring(name);
+      new->next = (lang_memory_region_type *)NULL;
+
+      *lang_memory_region_list_tail = new;
+      lang_memory_region_list_tail = &new->next;
+      new->origin = 0;
+      new->length = ~0;
+      new->current = 0;
+      new->had_full_message = false;
+      
+      return new;
     }
 }
 
 
-
 lang_output_section_statement_type *
-lang_output_section_find(name)
-char *name;
+DEFUN(lang_output_section_find,(name),
+      CONST char * CONST name)
 {
   lang_statement_union_type *u;
   lang_output_section_statement_type *lookup;
@@ -419,19 +408,18 @@ char *name;
   for (u = lang_output_section_statement.head;
        u != (lang_statement_union_type *)NULL;
        u = lookup->next)
-    {
-      lookup = &u->output_section_statement;
-      if (strcmp(name, lookup->name)==0) {
-       return lookup;
+      {
+       lookup = &u->output_section_statement;
+       if (strcmp(name, lookup->name)==0) {
+         return lookup;
+       }
       }
-    }
   return (lang_output_section_statement_type *)NULL;
 }
 
 lang_output_section_statement_type *
-lang_output_section_statement_lookup(name)
-char *name;
-
+DEFUN(lang_output_section_statement_lookup,(name),
+      CONST char * CONST name)
 {
   lang_output_section_statement_type *lookup;
   lookup =lang_output_section_find(name);
@@ -460,43 +448,46 @@ char *name;
 
 
 
-
+/*ARGSUSED*/
 static void
-  print_flags(outfile, ignore_flags)
-FILE *outfile;
-lang_section_flags_type *ignore_flags;
+DEFUN(print_flags, ( ignore_flags),
+      int  *ignore_flags)
 {
-  fprintf(outfile,"(");
+  fprintf(config.map_file, "(");
 #if 0
   if (flags->flag_read) fprintf(outfile,"R");
   if (flags->flag_write) fprintf(outfile,"W");
   if (flags->flag_executable) fprintf(outfile,"X");
   if (flags->flag_loadable) fprintf(outfile,"L");
 #endif
-  fprintf(outfile,")");
+  fprintf(config.map_file, ")");
 }
 
 void
-lang_map(outfile)
-     FILE *outfile;
+DEFUN_VOID(lang_map)
 {
   lang_memory_region_type *m;
-  fprintf(outfile,"**MEMORY CONFIGURATION**\n\n");
-
-  fprintf(outfile,"name\t\torigin\t\tlength\t\tattributes\n");
+  fprintf(config.map_file,"**MEMORY CONFIGURATION**\n\n");
+#ifdef HOST_64_BIT
+  fprintf(config.map_file,"name\t\torigin\t\tlength\t\tattributes\n");
+#else
+  fprintf(config.map_file,"name\t\torigin   length\t\tattributes\n");
+#endif
   for (m = lang_memory_region_list;
        m != (lang_memory_region_type *)NULL;
        m = m->next) 
     {
-      fprintf(outfile,"%-16s", m->name);
-
-      fprintf(outfile,"%08lx\t%08lx\t", m->origin, m->length);
-      print_flags(outfile, &m->flags);
-      fprintf(outfile,"\n");
+      fprintf(config.map_file,"%-16s", m->name);
+      print_address(m->origin);
+      print_space();
+      print_address(m->length);
+      print_space();
+      print_flags( &m->flags);
+      fprintf(config.map_file,"\n");
     }
-  fprintf(outfile,"\n\n**LINK EDITOR MEMORY MAP**\n\n");
-  fprintf(outfile,"output\t\tinput\t\tvirtual\n");
-  fprintf(outfile,"section\t\tsection\t\taddress\tsize\n\n");
+  fprintf(config.map_file,"\n\n**LINK EDITOR MEMORY MAP**\n\n");
+  fprintf(config.map_file,"output   input     virtual\n");
+  fprintf(config.map_file,"section  section   address    tsize\n\n");
 
   print_statements();
 
@@ -505,28 +496,52 @@ lang_map(outfile)
 /*
  *
  */
-static void init_os(s) 
-lang_output_section_statement_type *s;
+static void 
+DEFUN(init_os,(s),
+      lang_output_section_statement_type *s)
 {
+/*  asection *section = bfd_get_section_by_name(output_bfd, s->name);*/
   section_userdata_type *new =
-    (section_userdata_type *)
-      ldmalloc(sizeof(section_userdata_type));
-
-  s->bfd_section = bfd_make_section(output_bfd, s->name);
+   (section_userdata_type *)
+    ldmalloc((bfd_size_type)(sizeof(section_userdata_type)));
+
+  s->bfd_section = bfd_get_section_by_name(output_bfd, s->name);
+  if (s->bfd_section == (asection *)NULL)
+   s->bfd_section = bfd_make_section(output_bfd, s->name);
+  if (s->bfd_section == (asection *)NULL) {
+      einfo("%P%F output format %s cannot represent section called %s\n",
+           output_bfd->xvec->name, s->name);
+    }
   s->bfd_section->output_section = s->bfd_section;
-  s->bfd_section->flags = SEC_NO_FLAGS;
+  /* s->bfd_section->flags = s->flags;*/
+
   /* We initialize an output sections output offset to minus its own */
   /* vma to allow us to output a section through itself */
   s->bfd_section->output_offset = 0;
-  get_userdata( s->bfd_section) = new;
+  get_userdata( s->bfd_section) = (PTR)new;
+
 }
 
+/***********************************************************************
+  The wild routines.
+
+  These expand statements like *(.text) and foo.o to a list of
+  explicit actions, like foo.o(.text), bar.o(.text) and
+  foo.o(.text,.data) .
+
+  The toplevel routine, wild, takes a statement, section, file and
+  target. If either the section or file is null it is taken to be the
+  wildcard. Seperate lang_input_section statements are created for
+  each part of the expanstion, and placed after the statement provided.
+
+*/
 static void
-wild_doit(ptr, section,output, file)
-lang_statement_list_type *ptr;
-asection *section;
-lang_output_section_statement_type *output;
-lang_input_statement_type *file;
+DEFUN(wild_doit,(ptr, section, output, file),
+      lang_statement_list_type *ptr AND
+      asection *section AND
+      lang_output_section_statement_type *output AND
+      lang_input_statement_type *file)
 {
   if(output->bfd_section == (asection *)NULL)
     {
@@ -545,82 +560,88 @@ lang_input_statement_type *file;
     if (section->alignment_power > output->bfd_section->alignment_power) {
        output->bfd_section->alignment_power = section->alignment_power;
       }
-      
   }
 }
 
 static asection *
-our_bfd_get_section_by_name(abfd, section)
-bfd *abfd;
-char *section;
+DEFUN(our_bfd_get_section_by_name,(abfd, section),
+bfd *abfd AND
+CONST char *section)
 {
   return bfd_get_section_by_name(abfd, section);
-
 }
+
 static void 
-wild_section(ptr, section, file , output)
-lang_wild_statement_type *ptr;
-char *section;
-lang_input_statement_type *file;
-lang_output_section_statement_type *output;
+DEFUN(wild_section,(ptr, section, file , output),
+      lang_wild_statement_type *ptr AND
+      CONST char *section AND
+      lang_input_statement_type *file AND
+      lang_output_section_statement_type *output)
 {
   asection *s;
-  if (section == (char *)NULL) {
-    /* Do the creation to all sections in the file */
-    for (s = file->the_bfd->sections; s != (asection *)NULL; s=s->next)  {
-      wild_doit(&ptr->children, s, output, file);
+  if (file->just_syms_flag == false) {
+    if (section == (char *)NULL) {
+      /* Do the creation to all sections in the file */
+      for (s = file->the_bfd->sections; s != (asection *)NULL; s=s->next)  {
+       wild_doit(&ptr->children, s, output, file);
+      }
+    }
+    else {
+      /* Do the creation to the named section only */
+      wild_doit(&ptr->children,
+               our_bfd_get_section_by_name(file->the_bfd, section),
+               output, file);
     }
   }
-  else {
-    /* Do the creation to the named section only */
-    wild_doit(&ptr->children,
-             our_bfd_get_section_by_name(file->the_bfd, section),
-             output, file);
-  }
-
-
-
 }
 
 
+/* passed a file name (which must have been seen already and added to
+   the statement tree. We will see if it has been opened already and
+   had its symbols read. If not then we'll read it.
 
+   Archives are pecuilar here. We may open them once, but if they do
+   not define anything we need at the time, they won't have all their
+   symbols read. If we need them later, we'll have to redo it.
+   */
 static
-lang_input_statement_type *lookup_name(name, target)
-char *name;
-char *target;
+lang_input_statement_type *
+DEFUN(lookup_name,(name),
+      CONST char * CONST name)
 {
   lang_input_statement_type *search;
   for(search = (lang_input_statement_type *)input_file_chain.head;
       search != (lang_input_statement_type *)NULL;
       search = (lang_input_statement_type *)search->next_real_file)
-    {
-      if (search->filename == (char *)NULL && name == (char *)NULL) {
-       return search;
-      }
-      if (search->filename != (char *)NULL && name != (char *)NULL) {
-       if (strcmp(search->filename, name) == 0)  {
-         Q_read_file_symbols(search);
+      {
+       if (search->filename == (char *)NULL && name == (char *)NULL) {
          return search;
        }
+       if (search->filename != (char *)NULL && name != (char *)NULL) {
+         if (strcmp(search->filename, name) == 0)  {
+           ldmain_open_file_read_symbol(search);
+           return search;
+         }
+       }
       }
-    }
 
-  /* There isn't an afile entry for this file yet, this must be */
-  /* because the name has only appeared inside a load script and not */
-  /* on the command line */
-  search = new_afile(name, lang_input_file_is_file_enum, target);
-  Q_read_file_symbols(search);
+  /* There isn't an afile entry for this file yet, this must be 
+     because the name has only appeared inside a load script and not 
+     on the command line  */
+  search = new_afile(name, lang_input_file_is_file_enum, default_target);
+  ldmain_open_file_read_symbol(search);
   return search;
+
+
 }
 
 static void
-
-wild(s, section, file, target, output)
-lang_wild_statement_type *s;
-char *section;
-char *file;
-char *target;
-lang_output_section_statement_type *output;
+DEFUN(wild,(s, section, file, target, output),
+      lang_wild_statement_type *s AND
+      CONST char *CONST section AND
+      CONST char *CONST file AND
+      CONST char *CONST target AND
+      lang_output_section_statement_type *output)
 {
   lang_input_statement_type *f;
   if (file == (char *)NULL) {
@@ -633,106 +654,122 @@ lang_output_section_statement_type *output;
   }
   else {
     /* Perform the iteration over a single file */
-    wild_section( s, section, lookup_name(file, target), output);
+    wild_section( s, section, lookup_name(file), output);
   }
+  if (section != (char *)NULL
+      && strcmp(section,"COMMON") == 0         
+      && default_common_section == (lang_output_section_statement_type*)NULL) 
+      {
+       /* Remember the section that common is going to incase we later
+          get something which doesn't know where to put it */
+       default_common_section = output;
+      }
 }
 
 /*
   read in all the files 
   */
 static bfd *   
-open_output(name, target)
-char *name;
-char *target;
-{
-  extern char *output_filename;
-  bfd * output = bfd_openw(name, target);
+DEFUN(open_output,(name),
+      CONST char *CONST name)
+{
+  extern CONST char *output_filename;
+  bfd *output;
+  if (output_target == (char *)NULL) {
+    if (current_target != (char *)NULL)
+      output_target = current_target;
+    else
+      output_target = default_target;
+  }
+  output = bfd_openw(name, output_target);
   output_filename = name;          
+
   if (output == (bfd *)NULL) 
-    {
-      if (bfd_error == invalid_target) {
-       info("%P%F target %s not found\n", target);
+      {
+       if (bfd_error == invalid_target) {
+         einfo("%P%F target %s not found\n", output_target);
+       }
+       einfo("%P%F problem opening output file %s, %E", name);
       }
-      info("%P%F problem opening output file %s, %E", name);
-    }
   
-  output->flags |= D_PAGED;
+/*  output->flags |= D_PAGED;*/
   bfd_set_format(output, bfd_object);
   return output;
 }
-extern char  *default_target;
+
+
+
+
 static void
-lang_phase_0(sh,target)
-lang_statement_union_type *sh;
-char *target;
+DEFUN(ldlang_open_output,(statement),
+      lang_statement_union_type *statement)
 {
-  lang_statement_union_type *s = (lang_statement_union_type *)sh;
-  for (; s != (lang_statement_union_type *)NULL ; s = s->next) 
-    {
-      switch (s->header.type) {
-      case lang_output_section_statement_enum:
-       lang_phase_0(s->output_section_statement.children.head,
-                    target);
-       break;
-      case lang_output_statement_enum:
-#if 1
-       output_bfd = open_output(s->output_statement.name,
-                                target == (char *)NULL ?
-                                default_target : target);
+  switch (statement->header.type) 
+      {
+      case  lang_output_statement_enum:
+       output_bfd = open_output(statement->output_statement.name);
        ldemul_set_output_arch();
-#endif
+       if (config.magic_demand_paged && !config.relocateable_output)
+         output_bfd->flags |=  D_PAGED;
+       else
+         output_bfd->flags &=  ~D_PAGED;
+       if (config.text_read_only)
+         output_bfd->flags |= WP_TEXT;
+       else
+         output_bfd->flags &= ~WP_TEXT;
        break;
+
       case lang_target_statement_enum:
-       target = s->target_statement.target;
-       break;
-      case lang_wild_statement_enum:
-       /* Maybe we should load the file's symbols */
-       if (s->wild_statement.filename) {
-         (void)  lookup_name(s->wild_statement.filename, target);
-       }
+       current_target = statement->target_statement.target;
        break;
-       /* Attatch this to the current output section */
-      case lang_common_statement_enum:
-      case lang_fill_statement_enum:
-      case lang_input_section_enum:
-      case lang_object_symbols_statement_enum:
-      case lang_address_statement_enum:
-      case lang_data_statement_enum:
+      default:
        break;
-      case lang_afile_asection_pair_statement_enum:
+      }
+}
 
-       FAIL();
+static void
+DEFUN(open_input_bfds,(statement),
+      lang_statement_union_type *statement)
+{
+  switch (statement->header.type) 
+      {
+      case lang_target_statement_enum:
+       current_target = statement->target_statement.target;
        break;
-          
-      case lang_input_statement_enum:
-       if (s->input_statement.real == true) {
-         s->input_statement.target = target;
-         lookup_name(s->input_statement.filename, target);
-       }
+      case lang_wild_statement_enum:
+       /* Maybe we should load the file's symbols */
+       if (statement->wild_statement.filename) 
+           {
+             (void)  lookup_name(statement->wild_statement.filename);
+           }
        break;
-      case lang_assignment_statement_enum:
-#if 0
-       (void)    exp_fold_tree(s->assignment_statement.exp,
-                               output_section,
-                               false);
-#endif
+      case lang_input_statement_enum:
+       if (statement->input_statement.real == true) 
+           {
+             statement->input_statement.target = current_target;
+             lookup_name(statement->input_statement.filename);
+           }
        break;
-
-      case lang_padding_statement_enum:
-       
+      default:
        break;
       }
-    }
-
 }
-
 /* If there are [COMMONS] statements, put a wild one into the bss section */
 
 static void
 lang_reasonable_defaults()
 {
+
+
+  
+#if 0
+      lang_output_section_statement_lookup(".text");
+      lang_output_section_statement_lookup(".data");
+
   default_common_section = 
     lang_output_section_statement_lookup(".bss");
+
+
   if (placed_commons == false) {
     lang_wild_statement_type *new =
       new_stat(lang_wild_statement,
@@ -741,38 +778,118 @@ lang_reasonable_defaults()
     new->filename = (char *)NULL;
     lang_list_init(&new->children);
   }
+#endif
+
 }
 
-static void lang()
+/*
+ Add the supplied name to the symbol table as an undefined reference.
+ Remove items from the chain as we open input bfds
+ */
+typedef struct ldlang_undef_chain_list {
+  struct ldlang_undef_chain_list *next;
+  char *name;
+} ldlang_undef_chain_list_type;
+
+static ldlang_undef_chain_list_type *ldlang_undef_chain_list_head;
+
+void
+DEFUN(ldlang_add_undef,(name), 
+      CONST char *CONST name)
 {
-  if (had_script == false) {
-    parse_line(ldemul_get_script());
+  ldlang_undef_chain_list_type *new =
+    (ldlang_undef_chain_list_type
+     *)ldmalloc((bfd_size_type)(sizeof(ldlang_undef_chain_list_type)));
+
+  new->next = ldlang_undef_chain_list_head;
+  ldlang_undef_chain_list_head = new;
+
+  new->name = buystring(name);
+}
+/* Run through the list of undefineds created above and place them
+   into the linker hash table as undefined symbols belonging to the
+   script file.
+*/
+static void
+DEFUN_VOID(lang_place_undefineds)
+{
+  ldlang_undef_chain_list_type *ptr = ldlang_undef_chain_list_head;
+  while (ptr != (ldlang_undef_chain_list_type*)NULL) {
+    ldsym_type *sy = ldsym_get(ptr->name);
+    asymbol *def;
+    asymbol **def_ptr = (asymbol **)ldmalloc((bfd_size_type)(sizeof(asymbol **)));
+    def = (asymbol *)bfd_make_empty_symbol(script_file->the_bfd);
+    *def_ptr= def;
+    def->name = ptr->name;
+    def->section = &bfd_und_section;
+    Q_enter_global_ref(def_ptr);
+    ptr = ptr->next;
   }
+}
+
+
+
+/* Copy important data from out internal form to the bfd way. Also
+   create a section for the dummy file
+ */
+
+static void
+DEFUN_VOID(lang_create_output_section_statements)
+{
+  lang_statement_union_type*os;
+  for (os = lang_output_section_statement.head;
+       os != (lang_statement_union_type*)NULL;
+       os = os->output_section_statement.next) {
+    lang_output_section_statement_type *s =
+      &os->output_section_statement;
+    init_os(s);
+  }
+
+}
+
+static void
+DEFUN_VOID(lang_init_script_file)
+{
+  script_file = lang_add_input_file("script file",
+                                   lang_input_file_is_fake_enum,
+                                   (char *)NULL);
+  script_file->the_bfd = bfd_create("script file", output_bfd);
+  script_file->symbol_count = 0;
+  script_file->the_bfd->sections = output_bfd->sections;
+abs_output_section = lang_output_section_statement_lookup(BFD_ABS_SECTION_NAME);
+
+abs_output_section->bfd_section = &bfd_abs_section;
 
-  lang_reasonable_defaults();
-  lang_phase_0(statement_list.head,default_target);
 }
 
 
+
+
 /* Open input files and attatch to output sections */
 static void
-lang_open_input(s, target, output_section_statement)
-lang_statement_union_type *s;
-char *target;
-lang_output_section_statement_type *output_section_statement;
+DEFUN(map_input_to_output_sections,(s, target, output_section_statement),
+      lang_statement_union_type *s AND
+      CONST char *target AND
+      lang_output_section_statement_type *output_section_statement)
 {
   for (; s != (lang_statement_union_type *)NULL ; s = s->next) 
     {
       switch (s->header.type) {
+
+
       case lang_wild_statement_enum:
        wild(&s->wild_statement, s->wild_statement.section_name,
             s->wild_statement.filename, target,
             output_section_statement);
 
        break;
-
+      case lang_constructors_statement_enum:
+       map_input_to_output_sections(constructor_list.head,
+                                    target,
+                                    output_section_statement);
+       break;
       case lang_output_section_statement_enum:
-       lang_open_input(s->output_section_statement.children.head,
+       map_input_to_output_sections(s->output_section_statement.children.head,
                        target,
                        &s->output_section_statement);
        break;
@@ -781,20 +898,16 @@ lang_output_section_statement_type *output_section_statement;
       case lang_target_statement_enum:
        target = s->target_statement.target;
        break;
-      case lang_common_statement_enum:
       case lang_fill_statement_enum:
       case lang_input_section_enum:
       case lang_object_symbols_statement_enum:
       case lang_data_statement_enum:
+      case lang_assignment_statement_enum:
+      case lang_padding_statement_enum:
        break;
       case lang_afile_asection_pair_statement_enum:
        FAIL();
        break;
-
-      case lang_assignment_statement_enum:
-      case lang_padding_statement_enum:
-
-       break;
       case lang_address_statement_enum:
        /* Mark the specified section with the supplied address */
        {
@@ -802,11 +915,15 @@ lang_output_section_statement_type *output_section_statement;
            lang_output_section_statement_lookup
              (s->address_statement.section_name);
          os->addr_tree = s->address_statement.address;
+         if (os->bfd_section == (asection *)NULL) {
+           einfo("%P%F can't set the address of undefined section %s\n",
+                 s->address_statement.section_name);
+         }
        }
        break;
       case lang_input_statement_enum:
        /* A standard input statement, has no wildcards */
-       /*      Q_read_file_symbols(&s->input_statement);*/
+       /*      ldmain_open_file_read_symbol(&s->input_statement);*/
        break;
       }
     }
@@ -817,8 +934,8 @@ lang_output_section_statement_type *output_section_statement;
 
 
 static void 
-print_output_section_statement(output_section_statement)
-lang_output_section_statement_type *output_section_statement;
+DEFUN(print_output_section_statement,(output_section_statement),
+      lang_output_section_statement_type *output_section_statement)
 {
   asection *section = output_section_statement->bfd_section;
   print_nl();
@@ -831,18 +948,26 @@ lang_output_section_statement_type *output_section_statement;
     print_space();
     print_address(section->vma);
     print_space();
-    print_size(section->size);
+    print_size(bfd_get_section_size_before_reloc(section));
     print_space();
     print_alignment(section->alignment_power);
     print_space();
 #if 0
-    printf("%s flags", output_section_statement->region->name);
+    fprintf(config.map_file, "%s flags", output_section_statement->region->name);
     print_flags(stdout, &output_section_statement->flags);
 #endif
+    if (section->flags & SEC_LOAD)
+      fprintf(config.map_file, "load ");
+    if (section->flags & SEC_ALLOC)
+      fprintf(config.map_file, "alloc ");
+    if (section->flags & SEC_RELOC)
+      fprintf(config.map_file, "reloc ");
+    if (section->flags & SEC_HAS_CONTENTS)
+      fprintf(config.map_file, "contents ");
 
   }
   else {
-    printf("No attached output section");
+    fprintf(config.map_file, "No attached output section");
   }
   print_nl();
   print_statement(output_section_statement->children.head,
@@ -851,9 +976,9 @@ lang_output_section_statement_type *output_section_statement;
 }
 
 static void 
-print_assignment(assignment, output_section)
-lang_assignment_statement_type *assignment;
-lang_output_section_statement_type *output_section;
+DEFUN(print_assignment,(assignment, output_section),
+      lang_assignment_statement_type *assignment AND
+      lang_output_section_statement_type *output_section)
 {
   etree_value_type result;
   print_section("");
@@ -872,166 +997,149 @@ lang_output_section_statement_type *output_section;
     print_address(result.value);
   }
   else 
-    {
-      printf("*undefined*");
-    }
+      {
+       fprintf(config.map_file, "*undefined*");
+      }
   print_space();
-  exp_print_tree(stdout, assignment->exp);
-  printf("\n");
+  exp_print_tree(assignment->exp);
+  
+  fprintf(config.map_file, "\n");
 }
 
 static void
-print_input_statement(statm)
-lang_input_statement_type *statm;
+DEFUN(print_input_statement,(statm),
+      lang_input_statement_type *statm)
 {
-  printf("LOAD %s\n",statm->filename);
+  if (statm->filename != (char *)NULL) {
+    fprintf(config.map_file, "LOAD %s\n",statm->filename);
+  }
 }
 
-static void print_symbol(q)
-asymbol *q;
+static void 
+DEFUN(print_symbol,(q),
+      asymbol *q)
 {
   print_section("");
-  printf(" ");
+  fprintf(config.map_file, " ");
   print_section("");
-  printf(" ");
+  fprintf(config.map_file, " ");
   print_address(outside_symbol_address(q));
-  printf("              %s", q->name ? q->name : " ");
+  fprintf(config.map_file, "              %s", q->name ? q->name : " ");
   print_nl();
 }
+
 static void 
-print_input_section(in)
-lang_input_section_type *in;
+DEFUN(print_input_section,(in),
+      lang_input_section_type *in)
 {
   asection *i = in->section;
+  int size = i->reloc_done ?
+   bfd_get_section_size_after_reloc(i) :
+    bfd_get_section_size_before_reloc(i);
+  
 
-  if(i->size != 0) {
+  if(size != 0) {
     print_section("");
-    printf(" ");
+    fprintf(config.map_file, " ");
     print_section(i->name);
-    printf(" ");
+    fprintf(config.map_file, " ");
     if (i->output_section) {
       print_address(i->output_section->vma + i->output_offset);
-      printf(" ");
-      print_size(i->size);
-      printf(" ");
+      fprintf(config.map_file, " ");
+      print_size(size);
+      fprintf(config.map_file, " ");
       print_alignment(i->alignment_power);
-      printf(" ");
+      fprintf(config.map_file, " ");
       if (in->ifile) {
+
        bfd *abfd = in->ifile->the_bfd;
-       printf(" %s ",abfd->xvec->name);
+       if (in->ifile->just_syms_flag == true) {
+         fprintf(config.map_file, "symbols only ");
+       }
+
+       fprintf(config.map_file, " %s ",abfd->xvec->name);
        if(abfd->my_archive != (bfd *)NULL) {
-         printf("[%s]%s", abfd->my_archive->filename,
+         fprintf(config.map_file, "[%s]%s", abfd->my_archive->filename,
                 abfd->filename);
        }
        else {
-         printf("%s", abfd->filename);
+         fprintf(config.map_file, "%s", abfd->filename);
        }
+       fprintf(config.map_file, "(overhead %d bytes)", (int)bfd_alloc_size(abfd));
        print_nl();
 
        /* Find all the symbols in this file defined in this section */
-       {
-         asymbol **p;
-         for (p = in->ifile->asymbols; *p; p++) {
-           asymbol *q = *p;
+         {
+           asymbol **p;
+           for (p = in->ifile->asymbols; *p; p++) {
+             asymbol *q = *p;
        
-           if (bfd_get_section(q) == i && q->flags & BSF_GLOBAL) {
-             print_symbol(q);
+             if (bfd_get_section(q) == i && q->flags & BSF_GLOBAL) {
+               print_symbol(q);
+             }
            }
          }
-       }
       }
       else {
        print_nl();
       }
 
 
-      print_dot = outside_section_address(i) + i->size;
+      print_dot = outside_section_address(i) + size;
     }
     else {
-      printf("No output section allocated\n");
+      fprintf(config.map_file, "No output section allocated\n");
     }
   }
 }
-static void
-print_common_statement()
-{
-  ldsym_type *lgs;
-  print_section("");
-  print_space();
-  print_section(common_section.output_section->name);
-  print_space();
-  print_address(common_section.output_offset +
-               common_section.output_section->vma);
-  print_space();
-  print_size(common_section.size);
-  print_space();
-  printf("(common)");
-  print_nl();
-  /* Print out all the global symbols */
 
-
-  for (lgs = symbol_head; lgs != (ldsym_type *)NULL; lgs =
-       lgs->next) {
-    if (lgs->sdefs_chain) {
-      asymbol *def = *(lgs->sdefs_chain);
-      if (def->section == &common_section) {
-       print_symbol(def);
-      }
-    }
-
-  }
-  print_dot = common_section.output_offset +
-    common_section.output_section->vma + common_section.size;
-
-
-}
 static void
-print_fill_statement(fill)
-lang_fill_statement_type *fill;
+DEFUN(print_fill_statement,(fill),
+      lang_fill_statement_type *fill)
 {
-  printf("FILL mask ");
+  fprintf(config.map_file, "FILL mask ");
   print_fill( fill->fill);
 }
 
 static void
-print_data_statement(data)
-lang_data_statement_type *data;
+DEFUN(print_data_statement,(data),
+      lang_data_statement_type *data)
 {
 /*  bfd_vma value; */
   print_section("");
   print_space();
   print_section("");
   print_space();
-  ASSERT(print_dot == data->output_vma);
+/*  ASSERT(print_dot == data->output_vma);*/
 
-  print_address(data->output_vma);
+  print_address(data->output_vma + data->output_section->vma);
   print_space();
   print_address(data->value);
   print_space();
   switch (data->type) {
   case BYTE :
-    printf("BYTE ");
+    fprintf(config.map_file, "BYTE ");
     print_dot += BYTE_SIZE;
     break;
   case SHORT:
-    printf("SHORT ");
+    fprintf(config.map_file, "SHORT ");
     print_dot += SHORT_SIZE;
     break;  
   case LONG:
-    printf("LONG ");
+    fprintf(config.map_file, "LONG ");
     print_dot += LONG_SIZE;
     break;
   }
 
-  exp_print_tree(stdout, data->exp);
+  exp_print_tree(data->exp);
   
-  printf("\n");
+  fprintf(config.map_file, "\n");
 }
 
 
 static void
-print_padding_statement(s)
-lang_padding_statement_type *s;
+DEFUN(print_padding_statement,(s),
+      lang_padding_statement_type *s)
 {
   print_section("");
   print_space();
@@ -1043,106 +1151,114 @@ lang_padding_statement_type *s;
   print_space();
   print_fill(s->fill);
   print_nl();
+
+  print_dot = s->output_offset + s->output_section->vma + s->size;
+
 }
 
-static void print_wild_statement(w,os)
-lang_wild_statement_type *w;
-lang_output_section_statement_type *os;
+static void 
+DEFUN(print_wild_statement,(w,os),
+      lang_wild_statement_type *w AND
+      lang_output_section_statement_type *os)
 {
+  fprintf(config.map_file, " from ");
   if (w->filename != (char *)NULL) {
-    printf("%s",w->filename);
+    fprintf(config.map_file, "%s",w->filename);
   }
   else {
-    printf("*");
+    fprintf(config.map_file, "*");
   }
   if (w->section_name != (char *)NULL) {
-    printf("(%s)",w->section_name);
+    fprintf(config.map_file, "(%s)",w->section_name);
   }
   else {
-    printf("(*)");
+    fprintf(config.map_file, "(*)");
   }
   print_nl();
   print_statement(w->children.head, os);
 
 }
 static void
-print_statement(s, os)
-lang_statement_union_type *s;
-lang_output_section_statement_type *os;
+DEFUN(print_statement,(s, os),
+      lang_statement_union_type *s AND
+      lang_output_section_statement_type *os)
 {
-  while (s) {
-    switch (s->header.type) {
-    case lang_wild_statement_enum:
-     print_wild_statement(&s->wild_statement, os);
-     break;
-    default:
-     printf("Fail with %d\n",s->header.type);
-      FAIL();
-      break;
-   case lang_address_statement_enum:
-     printf("address\n");
-     break;
-    case lang_common_statement_enum:
-      print_common_statement();
-      break;
-    case lang_object_symbols_statement_enum:
-      printf("object symbols\n");
-      break;
-    case lang_fill_statement_enum:
-      print_fill_statement(&s->fill_statement);
-      break;
-    case lang_data_statement_enum:
-      print_data_statement(&s->data_statement);
-      break;
-
-
-    case lang_input_section_enum:
-      print_input_section(&s->input_section);
-      break;
-    case lang_padding_statement_enum:
-      print_padding_statement(&s->padding_statement);
-      break;
-    case lang_output_section_statement_enum:
-      print_output_section_statement(&s->output_section_statement);
-      break;
-    case lang_assignment_statement_enum:
-      print_assignment(&s->assignment_statement,
-                    os);
-      break;
-
-
-    case lang_target_statement_enum:
-      printf("TARGET(%s)\n", s->target_statement.target);
-      break;
-    case lang_output_statement_enum:
-      printf("OUTPUT(%s)\n", s->output_statement.name);
-      break;
-    case lang_input_statement_enum:
-      print_input_statement(&s->input_statement);
-      break;
-    case lang_afile_asection_pair_statement_enum:
-      FAIL();
-      break;
+    while (s) 
+    {
+       switch (s->header.type) 
+       {
+          case lang_constructors_statement_enum:
+           fprintf(config.map_file, "constructors:\n");
+           print_statement(constructor_list.head, os);
+           break;      
+          case lang_wild_statement_enum:
+           print_wild_statement(&s->wild_statement, os);
+           break;
+          default:
+           fprintf(config.map_file, "Fail with %d\n",s->header.type);
+           FAIL();
+           break;
+          case lang_address_statement_enum:
+           fprintf(config.map_file, "address\n");
+           break;
+           break;
+          case lang_object_symbols_statement_enum:
+           fprintf(config.map_file, "object symbols\n");
+           break;
+          case lang_fill_statement_enum:
+           print_fill_statement(&s->fill_statement);
+           break;
+          case lang_data_statement_enum:
+           print_data_statement(&s->data_statement);
+           break;
+          case lang_input_section_enum:
+           print_input_section(&s->input_section);
+           break;
+          case lang_padding_statement_enum:
+           print_padding_statement(&s->padding_statement);
+           break;
+          case lang_output_section_statement_enum:
+           print_output_section_statement(&s->output_section_statement);
+           break;
+          case lang_assignment_statement_enum:
+           print_assignment(&s->assignment_statement,
+                            os);
+           break;
+          case lang_target_statement_enum:
+           fprintf(config.map_file, "TARGET(%s)\n", s->target_statement.target);
+           break;
+          case lang_output_statement_enum:
+           fprintf(config.map_file, "OUTPUT(%s %s)\n",
+                  s->output_statement.name,
+                  output_target);
+           break;
+          case lang_input_statement_enum:
+           print_input_statement(&s->input_statement);
+           break;
+          case lang_afile_asection_pair_statement_enum:
+           FAIL();
+           break;
+       }
+       s = s->next;
     }
-    s = s->next;
-  }
 }
 
 
 static void
-print_statements()
+DEFUN_VOID(print_statements)
 {
   print_statement(statement_list.head,
-                 (lang_output_section_statement_type *)NULL);
+                 abs_output_section);
+  
 }
 
 static bfd_vma
-insert_pad(this_ptr, fill, power, output_section_statement, dot)
-lang_statement_union_type **this_ptr;
-fill_type fill;
-unsigned int power;
-asection * output_section_statement;
-bfd_vma dot;
+DEFUN(insert_pad,(this_ptr, fill, power, output_section_statement, dot),
+      lang_statement_union_type **this_ptr AND
+      fill_type fill AND
+      unsigned int power AND
+      asection * output_section_statement AND
+      bfd_vma dot)
 {
   /* Align this section first to the 
      input sections requirement, then
@@ -1158,7 +1274,7 @@ bfd_vma dot;
     {
       lang_statement_union_type *new = 
        (lang_statement_union_type *)
-         ldmalloc(sizeof(lang_padding_statement_type));
+         ldmalloc((bfd_size_type)(sizeof(lang_padding_statement_type)));
       /* Link into existing chain */
       new->header.next = *this_ptr;
       *this_ptr = new;
@@ -1175,240 +1291,187 @@ bfd_vma dot;
   if (power > output_section_statement->alignment_power) {
     output_section_statement->alignment_power = power;
   }
-  output_section_statement->size += alignment_needed;
+  output_section_statement->_raw_size += alignment_needed;
   return alignment_needed + dot;
 
 }
 
-/*
- size_common runs run though each global symboxl, and works
- out how big the common section will be.
- */
-
+/* Work out how much this section will move the dot point */
 static bfd_vma 
-size_common(output_section_statement, this_ptr, dot)
-lang_output_section_statement_type *output_section_statement;
-lang_statement_union_type **this_ptr;
-bfd_vma dot;
-{
-  extern ldsym_type *symbol_head;
-  ldsym_type *sp;
-  /* Make sure that each symbol is only defined once.
-     Allocate common symbols
-     Make the ref chain point to the defining asymbol.
-     */
-  /* Now, for each symbol, verify that it is defined globally at most once.
-     Put the global value into the symbol entry.
-     Common symbols are allocated here, in the BSS section.
-     Each defined symbol is given a '->defined' field
-     which is the correct N_ code for its definition,
-     except in the case of common symbols with -r.
-     Then make all the references point at the symbol entry
-     instead of being chained together. */
-  
-
-  common_section.name = output_section_statement->bfd_section->name;
-  common_section.output_section = output_section_statement->bfd_section;
-  common_section.output_offset =
-    dot - output_section_statement->bfd_section->vma;
-  if (config.relocateable_output == false ||
-      command_line.force_common_definition== true) {
-    dot = insert_pad(this_ptr,
-                    0x0, 4, output_section_statement->bfd_section, dot);
-
-    for (sp = symbol_head; sp != (ldsym_type *)NULL; sp = sp->next)  
-      {
-       /* Attatch this symbol to the correct output section*/
-
-       /* Allocate as common if wanted */
-
-       if (sp->scoms_chain )
-
-         {
-           unsigned long com = (*(sp->scoms_chain))->value;
-           /* Work out what alignment this common item s
-              hould be put on. Anything < int is int aligned,
-              anything bigger is  self aligned,
-              up to the restriction of the machine */
-
-           unsigned int align = sizeof(int);
-
-           /* Round up size of object to nearest int */
-           com = ALIGN(com, sizeof(int));
-           /* See what alignment is necessary -*/
-           if (com) {          
-             while ((com & align)==0) align <<=1;
-             /* FIXME */
-             if (align > 8)  {
-               align = 8;
-             }
-           }
-           dot =  ALIGN(dot, align);
-               
-
-           /* Transmogrify this from a common symbol
-              into a definition of a symbol in common
-              */
-           sp->sdefs_chain = sp->scoms_chain;
-
-           {
-             asymbol *com_ptr = *(sp->sdefs_chain);
-
-             sp->scoms_chain = (asymbol **)NULL;
-             commons_pending--;
-             /* Assign address, but keep section relative */
-
-             /* Force the symbol to belong in the bss section */
-             com_ptr->flags = BSF_EXPORT | BSF_GLOBAL ;
-             com_ptr->section = &common_section;
-             common_section.size += com;
-             if (write_map) 
-               {
-                 printf ("Allocating common %s: %lx at %lx\n",
-                         sp->name, 
-                         com,
-                         com_ptr->value);
-               }
-             com_ptr->value = common_section.size;
-           }
-         }
-      }
-  }
-  if (dot >
-      (common_section.output_section->vma +
-       common_section.output_section->size)) {
-    common_section.output_section->size =
-      dot - common_section.output_section->vma;
-  }
-  return dot + common_section.size;
-}
-
-static bfd_vma 
-size_input_section( this_ptr, output_section_statement, fill,  dot)
-lang_statement_union_type **this_ptr;
-lang_output_section_statement_type*output_section_statement;
-unsigned short fill;
-bfd_vma dot;
+DEFUN(size_input_section, (this_ptr, output_section_statement, fill,  dot),
+      lang_statement_union_type **this_ptr AND
+      lang_output_section_statement_type*output_section_statement AND
+      unsigned short fill AND
+      bfd_vma dot)
 {
   lang_input_section_type *is = &((*this_ptr)->input_section);
   asection *i = is->section;
-           
-  dot =  insert_pad(this_ptr, fill, i->alignment_power,
-                   output_section_statement->bfd_section, dot);
-
-  /* remember the largest size so we can malloc the largest area */
-  /* needed for the output stage */
-  if (i->size > largest_section) {
-    largest_section = i->size;
-  }
+  if (is->ifile->just_syms_flag == false) {        
+    dot =  insert_pad(this_ptr, fill, i->alignment_power,
+                     output_section_statement->bfd_section, dot);
+
+    /* remember the largest size so we can malloc the largest area 
+       needed for the output stage. Only remember the size of sections
+       which we will actually allocate  */
+    if (((i->flags & 
+        (SEC_HAS_CONTENTS | SEC_LOAD)) == (SEC_HAS_CONTENTS | SEC_LOAD))
+       && (bfd_get_section_size_before_reloc(i) > largest_section)) {
+      largest_section = bfd_get_section_size_before_reloc(i);
+    }
 
-  /* Remember where in the output section this input section goes */
-  i->output_offset = dot - output_section_statement->bfd_section->vma;
+    /* Remember where in the output section this input section goes */
 
-  /* Mark how big the output section must be to contain this now */
-  dot += i->size;
-  output_section_statement->bfd_section->size =
-    dot - output_section_statement->bfd_section->vma;
+    i->output_offset = dot - output_section_statement->bfd_section->vma;
 
+    /* Mark how big the output section must be to contain this now */
+    dot += bfd_get_section_size_before_reloc(i);
+output_section_statement->bfd_section->_raw_size =
+      dot - output_section_statement->bfd_section->vma;
+  }
+  else
+      {
+       i->output_offset = i->vma - output_section_statement->bfd_section->vma;
+      }
 
   return dot ;
 }
 
 
-/* Work out the size of the output sections 
- from the sizes of the input sections */
+/* Sizing happens in two passes, first pass we allocate worst case
+   stuff. The second pass (if relaxing), we use what we learnt to
+   change the size of some relocs from worst case to better
+   */
+static boolean had_relax;
+
 static bfd_vma
-lang_size_sections(s, output_section_statement, prev, fill, dot)
-lang_statement_union_type *s;
-lang_output_section_statement_type * output_section_statement;
-lang_statement_union_type **prev;
-unsigned short fill;
-bfd_vma dot;
+DEFUN(lang_size_sections,(s, output_section_statement, prev, fill,
+                         dot, relax),
+      lang_statement_union_type *s AND
+      lang_output_section_statement_type * output_section_statement AND
+      lang_statement_union_type **prev AND
+      unsigned short fill AND
+      bfd_vma dot AND
+      boolean relax)
 {
   /* Size up the sections from their constituent parts */
   for (; s != (lang_statement_union_type *)NULL ; s = s->next) 
-    {
-      switch (s->header.type) {
+  {
+    switch (s->header.type) {
+         
       case lang_output_section_statement_enum:
+      {
+       bfd_vma after;
+       lang_output_section_statement_type *os =&(s->output_section_statement);
+
+       if (os->bfd_section == &bfd_abs_section)
        {
-         bfd_vma after;
-         lang_output_section_statement_type *os =
-           &(s->output_section_statement);
-         /* The start of a section */
-         
-         if (os->addr_tree == (etree_type *)NULL) {
+         /* No matter what happens, an abs section starts at zero */
+         os->bfd_section->vma = 0;
+       }
+       else 
+       {         
+         if (os->addr_tree == (etree_type *)NULL) 
+         {
            /* No address specified for this section, get one
               from the region specification
               */
-             if (os->region == (lang_memory_region_type *)NULL) {
-                 os->region = lang_memory_region_lookup("*default*");
+           if (os->region == (lang_memory_region_type *)NULL) {
+               os->region = lang_memory_region_lookup("*default*");
              }
-             dot = os->region->current;
+           dot = os->region->current;
          }
-         else {
+         else 
+         {
            etree_value_type r ;
            r = exp_fold_tree(os->addr_tree,
-                             (lang_output_section_statement_type *)NULL,
+                             abs_output_section,
                              lang_allocating_phase_enum,
                              dot, &dot);
-           if (r.valid == false) {
-             info("%F%S: non constant address expression for section %s\n",
-                  os->name);
+           if (r.valid == false) 
+           {
+             einfo("%F%S: non constant address expression for section %s\n",
+                   os->name);
            }
            dot = r.value;
          }
          /* The section starts here */
          /* First, align to what the section needs */
 
+
          dot = align_power(dot, os->bfd_section->alignment_power);
          os->bfd_section->vma = dot;
-         os->bfd_section->output_offset = 0;
+       }
+       
+       
+       os->bfd_section->output_offset = 0;
 
-         (void)  lang_size_sections(os->children.head, os, &os->children.head,
-                                    os->fill, dot);
-         /* Ignore the size of the input sections, use the vma and size to */
-         /* align against */
+       (void)  lang_size_sections(os->children.head, os, &os->children.head,
+                                  os->fill, dot, relax);
+       /* Ignore the size of the input sections, use the vma and size to */
+       /* align against */
 
 
-         after = ALIGN(os->bfd_section->vma +
-                       os->bfd_section->size,
-                       os->block_value) ;
+       after = ALIGN(os->bfd_section->vma +
+                     os->bfd_section->_raw_size,
+                     os->block_value) ;
 
 
-         os->bfd_section->size = after - os->bfd_section->vma;
-         dot = os->bfd_section->vma + os->bfd_section->size;
-         os->processed = true;
+       os->bfd_section->_raw_size = after - os->bfd_section->vma;
+       dot = os->bfd_section->vma + os->bfd_section->_raw_size;
+       os->processed = true;
 
-         /* Replace into region ? */
-         if (os->addr_tree == (etree_type *)NULL 
-             && os->region !=(lang_memory_region_type*)NULL ) {
+       /* Replace into region ? */
+       if (os->addr_tree == (etree_type *)NULL 
+           && os->region !=(lang_memory_region_type*)NULL ) {
            os->region->current = dot;
+           /* Make sure this isn't silly */
+           if (os->region->current  >
+               os->region->origin +
+               os->region->length) 
+           {
+             einfo("%X%P: Region %s is full (%B section %s)\n",
+                   os->region->name,
+                   os->bfd_section->owner,
+                   os->bfd_section->name);
+             /* Reset the region pointer */
+             os->region->current = 0;
+
+           }
+               
          }
-       }
+      }
 
        break;
-
+      case lang_constructors_statement_enum:
+       dot = lang_size_sections(constructor_list.head,
+                                output_section_statement,
+                                &s->wild_statement.children.head,
+                                fill,
+                                dot, relax);
+       break;
+                                     
       case lang_data_statement_enum: 
-       {
-       unsigned int size;
-       s->data_statement.output_vma = dot;
+      {
+       unsigned int size = 0;
+       s->data_statement.output_vma = dot - output_section_statement->bfd_section->vma;
        s->data_statement.output_section =
-         output_section_statement->bfd_section;
+        output_section_statement->bfd_section;
 
        switch (s->data_statement.type) {
-       case LONG:
-         size = LONG_SIZE;
-         break;
-       case SHORT:
-         size = SHORT_SIZE;
-         break;
-       case BYTE:
-         size = BYTE_SIZE;
-         break;
+         case LONG:
+           size = LONG_SIZE;
+           break;
+         case SHORT:
+           size = SHORT_SIZE;
+           break;
+         case BYTE:
+           size = BYTE_SIZE;
+           break;
 
-       }
+         }
        dot += size;
-       output_section_statement->bfd_section->size += size;
+       output_section_statement->bfd_section->_raw_size += size;
       }
        break;
 
@@ -1418,7 +1481,7 @@ bfd_vma dot;
                                   output_section_statement,
                                   &s->wild_statement.children.head,
 
-                                  fill, dot);
+                                  fill, dot, relax);
 
        break;
 
@@ -1426,16 +1489,20 @@ bfd_vma dot;
        create_object_symbols = output_section_statement;
        break;
       case lang_output_statement_enum:
-
       case lang_target_statement_enum:
        break;
-      case lang_common_statement_enum:
-       dot =   size_common(output_section_statement, prev, dot);
+      case lang_input_section_enum:
+       if (relax)
+       {
+         relaxing = true;
+  
 
-       break;
+         had_relax |=  relax_section(prev);
+         relaxing = false;
+  
+       }
 
-      case lang_input_section_enum:
-       dot =   size_input_section(prev,
+       dot =   size_input_section(prev,
                                   output_section_statement,
                                   output_section_statement->fill, dot);
        break;
@@ -1445,70 +1512,77 @@ bfd_vma dot;
        fill = s->fill_statement.fill;
        break;
       case lang_assignment_statement_enum:
+      {
+       bfd_vma newdot = dot;
+       exp_fold_tree(s->assignment_statement.exp,
+                     output_section_statement,
+                     lang_allocating_phase_enum,
+                     dot,
+                     &newdot);
+
+       if (newdot != dot && !relax) 
+        /* We've been moved ! so insert a pad */
        {
-         bfd_vma newdot = dot;
-         exp_fold_tree(s->assignment_statement.exp,
-                       output_section_statement,
-                       lang_allocating_phase_enum,
-                       dot,
-                       &newdot);
-
-         if (newdot != dot) 
-           /* We've been moved ! so insert a pad */
-           {
-             lang_statement_union_type *new = 
-               (lang_statement_union_type *)
-                 ldmalloc(sizeof(lang_padding_statement_type));
-             /* Link into existing chain */
-             new->header.next = *prev;
-             *prev = new;
-             new->header.type = lang_padding_statement_enum;
-             new->padding_statement.output_section =
-               output_section_statement->bfd_section;
-             new->padding_statement.output_offset =
-               dot - output_section_statement->bfd_section->vma;
-             new->padding_statement.fill = fill;
-             new->padding_statement.size = newdot - dot;
-             output_section_statement->bfd_section->size +=
-               new->padding_statement.size;
-             dot =   newdot;
-           }
+         lang_statement_union_type *new = 
+          (lang_statement_union_type *)
+           ldmalloc((bfd_size_type)(sizeof(lang_padding_statement_type)));
+         /* Link into existing chain */
+         new->header.next = *prev;
+         *prev = new;
+         new->header.type = lang_padding_statement_enum;
+         new->padding_statement.output_section =
+          output_section_statement->bfd_section;
+         new->padding_statement.output_offset =
+          dot - output_section_statement->bfd_section->vma;
+         new->padding_statement.fill = fill;
+         new->padding_statement.size = newdot - dot;
+         output_section_statement->bfd_section->_raw_size +=
+          new->padding_statement.size;
+         dot =   newdot;
        }
+      }
 
-       break;
-      case lang_padding_statement_enum:
-       FAIL();
        break;
       default:
        FAIL();
        break;
+       /* This can only get here when relaxing is turned on */
+      case lang_padding_statement_enum:
+
       case lang_address_statement_enum:
        break;
       }
-      prev = &s->header.next;      
-    }
+    prev = &s->header.next;      
+  }
   return dot;
 }
 
 
 static bfd_vma
-lang_do_assignments(s, output_section_statement, fill, dot)
-lang_statement_union_type *s;
-lang_output_section_statement_type * output_section_statement;
-unsigned short fill;
-bfd_vma dot;
+DEFUN(lang_do_assignments,(s, output_section_statement, fill, dot),
+      lang_statement_union_type *s AND
+      lang_output_section_statement_type * output_section_statement AND
+      unsigned short fill AND
+      bfd_vma dot)
 {
 
   for (; s != (lang_statement_union_type *)NULL ; s = s->next) 
     {
       switch (s->header.type) {
+      case lang_constructors_statement_enum:
+       dot = lang_do_assignments(constructor_list.head,
+                           output_section_statement,
+                           fill,
+                           dot);
+       break;
+
       case lang_output_section_statement_enum:
        {
          lang_output_section_statement_type *os =
            &(s->output_section_statement);
          dot = os->bfd_section->vma;
          (void) lang_do_assignments(os->children.head, os, os->fill, dot);
-         dot = os->bfd_section->vma + os->bfd_section->size;
+         dot = os->bfd_section->vma + os->bfd_section->_raw_size;
        }
        break;
       case lang_wild_statement_enum:
@@ -1522,15 +1596,18 @@ bfd_vma dot;
       case lang_object_symbols_statement_enum:
       case lang_output_statement_enum:
       case lang_target_statement_enum:
+#if 0
       case lang_common_statement_enum:
+#endif
        break;
       case lang_data_statement_enum:
        {
          etree_value_type value ;
          value =   exp_fold_tree(s->data_statement.exp,
-                                 0, lang_final_phase_enum, dot, &dot);
+                                 abs_output_section,
+                                 lang_final_phase_enum, dot, &dot);
          s->data_statement.value = value.value;
-         if (value.valid == false) info("%F%P: Invalid data statement\n");
+         if (value.valid == false) einfo("%F%P: Invalid data statement\n");
        }
        switch (s->data_statement.type) {
        case LONG:
@@ -1547,7 +1624,7 @@ bfd_vma dot;
       case lang_input_section_enum:
        {
          asection *in =    s->input_section.section;
-         dot += in->size;
+         dot += bfd_get_section_size_before_reloc(in);
        }
        break;
 
@@ -1582,16 +1659,17 @@ bfd_vma dot;
 
 
 
-static void lang_relocate_globals() 
+static void 
+DEFUN_VOID(lang_relocate_globals) 
 { 
 
   /*
-     Each ldsym_type maintains a chain of pointers to asymbols which
-     references the definition.  Replace each pointer to the referenence
-     with a pointer to only one place, preferably the definition. If
-     the defintion isn't available then the common symbol, and if
-     there isn't one of them then choose one reference.
-     */
+    Each ldsym_type maintains a chain of pointers to asymbols which
+    references the definition.  Replace each pointer to the referenence
+    with a pointer to only one place, preferably the definition. If
+    the defintion isn't available then the common symbol, and if
+    there isn't one of them then choose one reference.
+    */
 
   FOR_EACH_LDSYM(lgs) {
     asymbol *it;
@@ -1605,44 +1683,31 @@ static void lang_relocate_globals()
       it = *(lgs->srefs_chain);
     }
     else {
-      FAIL();
+      /* This can happen when the command line asked for a symbol to
+        be -u */
+      it = (asymbol *)NULL;
     }
     if (it != (asymbol *)NULL)
-      {
-       asymbol **ptr= lgs->srefs_chain;
+       {
+         asymbol **ptr = lgs->srefs_chain;;
+         if (lgs->flags & SYM_WARNING) 
+             {
+               produce_warnings(lgs, it);
+             }
 
-       while (ptr != (asymbol **)NULL) {
-         asymbol *ref = *ptr;
-         *ptr = it;
-         ptr = (asymbol **)(ref->udata);
+         while (ptr != (asymbol **)NULL) {
+           asymbol *ref = *ptr;
+           *ptr = it;
+           ptr = (asymbol **)(ref->udata);
+         }
        }
-      }
   }
 }
 
 
 
-/* now that all the jiggery pokery is finished, copy important data from
- * out internal form to the bfd way. Also create a section
- * for each dummy file
- */
-
 static void
-lang_create_output_section_statements()
-{
-  lang_statement_union_type*os;
-  for (os = lang_output_section_statement.head;
-       os != (lang_statement_union_type*)NULL;
-       os = os->output_section_statement.next) {
-    lang_output_section_statement_type *s =
-      &os->output_section_statement;
-    init_os(s);
-  }
-  script_file->the_bfd->sections = output_bfd->sections;
-}
-
-static void
-lang_finish()
+DEFUN_VOID(lang_finish)
 {
   ldsym_type *lgs;
 
@@ -1672,108 +1737,155 @@ lang_finish()
 /* By now we know the target architecture, and we may have an */
 /* ldfile_output_machine_name */
 static void
-lang_check()
+DEFUN_VOID(lang_check)
 {
   lang_statement_union_type *file;
 
-  
+  bfd * input_bfd;
+  unsigned long input_machine;
+  enum bfd_architecture input_architecture;
+
+  CONST  bfd_arch_info_type *compatible;
+
   for (file = file_chain.head;
        file != (lang_statement_union_type *)NULL;
        file=file->input_statement.next) 
-    {
-      /* Inspect the architecture and ensure we're linking like
-        with like
-        */
-
-      if (bfd_arch_compatible( file->input_statement.the_bfd,
-                             output_bfd,
-                             &ldfile_output_architecture,
-                             &ldfile_output_machine)) {
-       bfd_set_arch_mach(output_bfd,
-                         ldfile_output_architecture, ldfile_output_machine);
-      }
-      else {
-       enum bfd_architecture this_architecture =
-         bfd_get_architecture(file->input_statement.the_bfd);
-       unsigned long this_machine =
-         bfd_get_machine(file->input_statement.the_bfd);
-       
-       info("%I: architecture %s",
-            file,
-            bfd_printable_arch_mach(this_architecture, this_machine));
-       info(" incompatible with output %s\n",
-            bfd_printable_arch_mach(ldfile_output_architecture,
-                                    ldfile_output_machine));
-       ldfile_output_architecture = this_architecture;
-       ldfile_output_machine = this_machine;
-       bfd_set_arch_mach(output_bfd,
-                         ldfile_output_architecture,
-                         ldfile_output_machine);
+      {
+       unsigned long ldfile_new_output_machine = 0;
+       enum bfd_architecture ldfile_new_output_architecture = bfd_arch_unknown;
+
+       input_bfd = file->input_statement.the_bfd;
 
+       input_machine = bfd_get_mach(input_bfd);
+       input_architecture = bfd_get_arch(input_bfd);  
+
+       /* Inspect the architecture and ensure we're linking like with
+          like */
+
+       compatible=bfd_arch_get_compatible(input_bfd,
+                                          output_bfd);
+
+       if (compatible)  
+           {
+             ldfile_output_machine = compatible->mach;
+             ldfile_output_architecture = compatible->arch;
+           }                           
+       else
+           {
+
+             info("%P: warning, %s architecture of input file `%B' incompatible with %s output\n",
+                  bfd_printable_name(input_bfd), input_bfd,
+                  bfd_printable_name(output_bfd));
+
+             bfd_set_arch_mach(output_bfd,
+                               ldfile_new_output_architecture,
+                               ldfile_new_output_machine);
+           }
 
       }
-    }
 }
 
 
 /*
  * run through all the global common symbols and tie them 
- * to the output section requested.
- */
+ * to the output section requested. 
+ *
+ As an experiment we do this 4 times, once for all the byte sizes,
+ then all the two  bytes, all the four bytes and then everything else
+  */
 
 static void
-lang_common()
+DEFUN_VOID(lang_common)
 {
   ldsym_type *lgs;
+  size_t power;
   if (config.relocateable_output == false ||
       command_line.force_common_definition== true) {
-    for (lgs = symbol_head;
-        lgs != (ldsym_type *)NULL;
-        lgs=lgs->next)
-      {
-       asymbol *com ;
-       size_t size;
-       size_t align;
-       if (lgs->scoms_chain != (asymbol **)NULL) {
-
-         com = *(lgs->scoms_chain);
-         size = com->value;
-         align = sizeof(int);
-         /* Round up size of object to nearest int */
-         size = ALIGN(size, sizeof(int));
-         /* Force alignment */
-         if (size) {
-           while ((size & align)==0) align<<=1;
-           if (align > 8) {
+    for (power = 1; (config.sort_common == true && power == 1) || (power <= 16); power <<=1) {
+      for (lgs = symbol_head;
+          lgs != (ldsym_type *)NULL;
+          lgs=lgs->next)
+       {
+         asymbol *com ;
+         unsigned  int power_of_two;
+         size_t size;
+         size_t align;
+         if (lgs->scoms_chain != (asymbol **)NULL) {
+           com = *(lgs->scoms_chain);
+           size = com->value;
+           switch (size) {
+           case 0:
+           case 1:
+             align = 1;
+             power_of_two = 0;
+             break;
+           case 2:
+             power_of_two = 1;
+             align = 2;
+             break;
+           case 3:
+           case 4:
+             power_of_two =2;
+             align = 4;
+             break;
+           case 5:
+           case 6:
+           case 7:
+           case 8:
+             power_of_two = 3;
              align = 8;
+             break;
+           default:
+             power_of_two = 4;
+             align = 16;
+             break;
            }
-         }
-         /* Change from a common symbol into a definition of
-            a symbol */
-         lgs->sdefs_chain = lgs->scoms_chain;
-         lgs->scoms_chain = (asymbol **)NULL;
-         commons_pending--;
-         /* Point to the correct common section */
-         com->section =
-           ((lang_input_statement_type *)
-            (com->the_bfd->usrdata))->common_section;
-         /*  Fix the size of the common section */
+           if (config.sort_common == false || align == power) {
+             /* Change from a common symbol into a definition of
+                a symbol */
+             lgs->sdefs_chain = lgs->scoms_chain;
+             lgs->scoms_chain = (asymbol **)NULL;
+             commons_pending--;
+             /* Point to the correct common section */
+             com->section =
+               ((lang_input_statement_type *)
+                (com->the_bfd->usrdata))->common_section;
+             /*  Fix the size of the common section */
+
+              com->section->_raw_size =
+               ALIGN(com->section->_raw_size, align);
+
+             /* Remember if this is the biggest alignment ever seen */
+             if (power_of_two > com->section->alignment_power) {
+               com->section->alignment_power = power_of_two;
+             }
 
+             /* Symbol stops being common and starts being global, but
+                we remember that it was common once. */
 
-         com->flags = BSF_EXPORT | BSF_GLOBAL;
+             com->flags = BSF_EXPORT | BSF_GLOBAL | BSF_OLD_COMMON;
+             com->value = com->section->_raw_size;
+
+             if (write_map) 
+               {
+                 fprintf (config.map_file, "Allocating common %s: %x at %x %s\n",
+                         lgs->name, 
+                         (unsigned) size,
+                         (unsigned) com->value,
+                         com->the_bfd->filename);
+               }
+
+             com->section->_raw_size += size;
 
-         if (write_map) 
-           {
-             printf ("Allocating common %s: %x at %x\n",
-                     lgs->name, 
-                     (unsigned) size,
-                     (unsigned)  com->section->size);
            }
-         com->value = com->section->size;
-         com->section->size += size;
+         }
+
        }
-      }
+    }
   }
+
+
 }
 
 /*
@@ -1783,7 +1895,8 @@ a destination then create an input request and place it
 into the statement tree.
 */
 
-static void lang_place_orphans()
+static void 
+DEFUN_VOID(lang_place_orphans)
 {
   lang_input_statement_type *file;
   for (file = (lang_input_statement_type*)file_chain.head;
@@ -1801,8 +1914,19 @@ static void lang_place_orphans()
          /* This is a lonely common section which must
             have come from an archive. We attatch to the
             section with the wildcard  */
-         wild_doit(&default_common_section->children, s, 
-                   default_common_section, file);        
+         if (config.relocateable_output != true 
+             && command_line.force_common_definition == false) {
+           if (default_common_section ==
+               (lang_output_section_statement_type *)NULL) {
+             info("%P: No [COMMON] command, defaulting to .bss\n");
+
+             default_common_section = 
+               lang_output_section_statement_lookup(".bss");
+
+           }
+           wild_doit(&default_common_section->children, s, 
+                     default_common_section, file);      
+         }
        }
        else {
          lang_output_section_statement_type *os = 
@@ -1812,109 +1936,65 @@ static void lang_place_orphans()
        }
       }
     }
-
   }
 }
 
 
-/*
- * phase_2
- *
- * peformed after every file has been opened and symbols read
- */
-static void
-lang_phase_2()
-{
-  lang_init2();
-  lang_create_output_section_statements();
-  lang_open_input(statement_list.head, (char *)NULL, 
-                 ( lang_output_section_statement_type *)NULL);
-  lang_place_orphans();
-  lang_common();
-
-  ldemul_before_allocation();
-
-  lang_size_sections(statement_list.head,
-                    (lang_output_section_statement_type *)NULL,
-                    &(statement_list.head), 0, (bfd_vma)0);
-  ldemul_after_allocation();
-  /* Do it once again now that we know the sizes of everything */
-
-  lang_do_assignments(statement_list.head,
-                     (lang_output_section_statement_type *)NULL,
-                     0, (bfd_vma)0);
-
-
-
-  lang_check();
-
-  lang_relocate_globals();
-
-
-  lang_finish();
-}
-
-
-
-
 void
-lang_set_flags(ptr, flags)
-lang_section_flags_type *ptr;
-char *flags;
+DEFUN(lang_set_flags,(ptr, flags),
+      int  *ptr AND
+      CONST char *flags)
 {
   boolean state = true;
-  ptr->flag_read = false;
-  ptr->flag_write = false;
-  ptr->flag_executable = false;
-  ptr->flag_loadable= false;
+*ptr= 0;
   while (*flags)
-    {
-      if (*flags == '!') {
-       state = false;
+      {
+       if (*flags == '!') {
+         state = false;
+         flags++;
+       }
+       else state = true;
+       switch (*flags) {
+       case 'R':
+/*       ptr->flag_read = state; */
+         break;
+       case 'W':
+/*       ptr->flag_write = state; */
+         break;
+       case 'X':
+/*       ptr->flag_executable= state;*/
+         break;
+       case 'L':
+       case 'I':
+/*       ptr->flag_loadable= state;*/
+         break;
+       default:
+         einfo("%P%F illegal syntax in flags\n");
+         break;
+       }
        flags++;
       }
-      else state = true;
-      switch (*flags) {
-      case 'R':
-       ptr->flag_read = state; 
-       break;
-      case 'W':
-       ptr->flag_write = state; 
-       break;
-      case 'X':
-       ptr->flag_executable= state;
-       break;
-      case 'L':
-       ptr->flag_loadable= state;
-       break;
-      default:
-       info("%P%F illegal syntax in flags\n");
-       break;
-      }
-      flags++;
-    }
 }
 
 
 
 void
-lang_for_each_file(func)
-void (*func)();
+DEFUN(lang_for_each_file,(func),
+      PROTO(void, (*func),(lang_input_statement_type *)))
 {
   lang_input_statement_type *f;
   for (f = (lang_input_statement_type *)file_chain.head; 
        f != (lang_input_statement_type *)NULL;
        f = (lang_input_statement_type *)f->next)  
-    {
-      func(f);
-    }
+      {
+       func(f);
+      }
 }
 
 
 void
-lang_for_each_input_section(func)
-void (*func)();
+DEFUN(lang_for_each_input_section, (func),
+      PROTO(void ,(*func),(bfd *ab, asection*as)))
 {
   lang_input_statement_type *f;
   for (f = (lang_input_statement_type *)file_chain.head; 
@@ -1933,10 +2013,10 @@ void (*func)();
 
 
 void 
-ldlang_add_file(entry)
-lang_input_statement_type *entry;
+DEFUN(ldlang_add_file,(entry),
+      lang_input_statement_type *entry)
 {
-  lang_has_input_file = true;
+
   lang_statement_append(&file_chain,
                        (lang_statement_union_type *)entry,
                        &entry->next);
@@ -1945,8 +2025,8 @@ lang_input_statement_type *entry;
 
 
 void
-lang_add_output(name)
-char *name;
+DEFUN(lang_add_output,(name),
+      CONST char *name)
 {
   lang_output_statement_type *new = new_stat(lang_output_statement,
                                             stat_ptr);
@@ -1958,19 +2038,23 @@ char *name;
 static lang_output_section_statement_type *current_section;
 
 void
-lang_enter_output_section_statement(output_section_statement_name,
-address_exp,
-block_value)
-char *output_section_statement_name;
-etree_type *address_exp;
-bfd_vma block_value;
+DEFUN(lang_enter_output_section_statement,
+      (output_section_statement_name,
+       address_exp,
+       flags,
+       block_value),
+      char *output_section_statement_name AND
+      etree_type *address_exp AND
+      int flags AND
+      bfd_vma block_value)
 {
   lang_output_section_statement_type *os;
   current_section = 
     os =
       lang_output_section_statement_lookup(output_section_statement_name);
 
-
+  
+  
   /* Add this statement to tree */
   /*  add_statement(lang_output_section_statement_enum,
       output_section_statement);*/
@@ -1981,6 +2065,7 @@ bfd_vma block_value;
     os->addr_tree =
       address_exp;
   }
+  os->flags = flags;
   os->block_value = block_value;
   stat_ptr = & os->children;
 
@@ -1988,29 +2073,41 @@ bfd_vma block_value;
 
 
 void 
-lang_final()
+DEFUN_VOID(lang_final)
 {
   if (had_output_filename == false) {
-    lang_add_output("a.out");
+    extern CONST char *output_filename;
+    lang_add_output(output_filename);
   }
-
-
 }
 
 
 
+/* Reset the current counters in the regions */
+static void
+ DEFUN_VOID(reset_memory_regions) 
+{
+  lang_memory_region_type *p  = lang_memory_region_list;
+  for (p = lang_memory_region_list;
+       p != ( lang_memory_region_type *)NULL;
+       p = p->next) 
+  {
+    p->current = p->origin;
+  }
+}
 
 
-asymbol *create_symbol(name, flags, section)
-char *name;
-flagword flags;
-asection *section;
+asymbol *
+DEFUN(create_symbol,(name, flags, section),
+      CONST char *name AND
+      flagword flags AND
+      asection *section)
 {
   extern lang_input_statement_type *script_file;
-  asymbol **def_ptr = (asymbol **)ldmalloc(sizeof(asymbol **));
+  asymbol **def_ptr = (asymbol **)ldmalloc((bfd_size_type)(sizeof(asymbol **)));
   /* Add this definition to script file */
   asymbol *def =  (asymbol  *)bfd_make_empty_symbol(script_file->the_bfd);
-  def->name = name;
+  def->name = buystring(name);
   def->udata = 0;
   def->flags = flags;
   def->section = section;
@@ -2021,59 +2118,166 @@ asection *section;
 }
 
 
+
 void
-lang_process()
-{
-  lang();
-  lang_phase_2();
+DEFUN_VOID(lang_process)
+{               
+
+  if (had_script == false) {
+      parse_line(ldemul_get_script(),1);
+    }
+  lang_reasonable_defaults();
+  current_target = default_target;
+
+  lang_for_each_statement(ldlang_open_output); /* Open the output file */
+  /* For each output section statement, create a section in the output
+     file */
+  lang_create_output_section_statements();
+
+  /* Create a dummy bfd for the script */
+  lang_init_script_file();     
+
+  /* Add to the hash table all undefineds on the command line */
+  lang_place_undefineds();
+
+  /* Create a bfd for each input file */
+  current_target = default_target;
+  lang_for_each_statement(open_input_bfds);
+
+  common_section.userdata = (PTR)&common_section_userdata;
+
+
+  /* Run through the contours of the script and attatch input sections
+     to the correct output sections 
+     */
+  find_constructors();
+  map_input_to_output_sections(statement_list.head, (char *)NULL, 
+                              ( lang_output_section_statement_type *)NULL);
+
+
+  /* Find any sections not attatched explicitly and handle them */
+  lang_place_orphans();
+
+  /* Size up the common data */
+  lang_common();
+
+  ldemul_before_allocation();
+
+
+  /* Size up the sections */
+  lang_size_sections(statement_list.head,
+                    abs_output_section,
+                    &(statement_list.head), 0, (bfd_vma)0, false);
+
+
+  /* Now run around and relax if we can */
+  if (command_line.relax) 
+  {
+    reset_memory_regions();
+
+  /* Move the global symbols around */
+  lang_relocate_globals();
+    
+    had_relax = true;
+    while (had_relax) 
+    {
+      
+      had_relax = false;
+      
+      lang_size_sections(statement_list.head,
+                        (lang_output_section_statement_type *)NULL,
+                        &(statement_list.head), 0, (bfd_vma)0, true);
+      /* FIXME. Until the code in relax is fixed so that it only reads in
+        stuff once, we cant iterate since there is no way for the linker to
+        know what has been patched and what hasn't */
+      break;
+      
+    }
+    
+    
+
+
+  }
+  
+
+  /* See if anything special should be done now we know how big
+     everything is */
+  ldemul_after_allocation();
+
+  /* Do all the assignments, now that we know the final restingplaces
+     of all the symbols */
+
+  lang_do_assignments(statement_list.head,
+                     abs_output_section,
+                     0, (bfd_vma)0);
+
+
+  /* Move the global symbols around */
+  lang_relocate_globals();
+
+  /* Make sure that we're not mixing architectures */
+
+  lang_check();
+
+  /* Final stuffs */
+  lang_finish();
 }
 
 
 /* EXPORTED TO YACC */
+
 void
-lang_section_start(name, address)
-char *name;
-etree_type *address;
+DEFUN(lang_add_wild,(section_name, filename),
+      CONST char *CONST section_name AND
+      CONST char *CONST filename)
+{
+  lang_wild_statement_type *new = new_stat(lang_wild_statement,
+                                          stat_ptr);
+
+  if (section_name != (char *)NULL && strcmp(section_name,"COMMON") == 0)
+      {
+       placed_commons = true;
+      }
+  if (filename != (char *)NULL) {
+    lang_has_input_file = true;
+  }
+  new->section_name = section_name;
+  new->filename = filename;
+  lang_list_init(&new->children);
+}
+void
+DEFUN(lang_section_start,(name, address),
+      CONST char *name AND
+      etree_type *address)
 {
   lang_address_statement_type *ad =new_stat(lang_address_statement, stat_ptr);
   ad->section_name = name;
   ad->address = address;
 }
-void lang_add_entry(name)
-char *name;
+
+void 
+DEFUN(lang_add_entry,(name),
+      CONST char *name)
 {
   entry_symbol = name;
 }
 
 void
-lang_add_target(name)
-char *name;
+DEFUN(lang_add_target,(name),
+      CONST char *name)
 {
   lang_target_statement_type *new = new_stat(lang_target_statement,
                                            stat_ptr);
   new->target = name;
 
 }
-void
-lang_add_wild(section_name, filename)
-char *section_name;
-char *filename;
-{
-  lang_wild_statement_type *new = new_stat(lang_wild_statement,
-                                          stat_ptr);
 
-  if (section_name != (char *)NULL && strcmp(section_name,"COMMON") == 0)
-    {
-      placed_commons = true;
-    }
-  new->section_name = section_name;
-  new->filename = filename;
-  lang_list_init(&new->children);
-}
+
+
 
 void
-lang_add_map(name)
-char *name;
+DEFUN(lang_add_map,(name),
+      CONST char *name)
 {
   while (*name) {
     switch (*name) {
@@ -2085,17 +2289,19 @@ char *name;
   }
 }
 
-void lang_add_fill(exp)
-int exp;
+void 
+DEFUN(lang_add_fill,(exp),
+      int exp)
 {
   lang_fill_statement_type *new =   new_stat(lang_fill_statement, 
                                              stat_ptr);
   new->fill = exp;
 }
 
-void lang_add_data(type, exp)
-int type;
-union etree_union *exp;
+void 
+DEFUN(lang_add_data,(type, exp),
+      int type AND
+      union etree_union *exp)
 {
 
  lang_data_statement_type *new = new_stat(lang_data_statement,
@@ -2105,8 +2311,8 @@ union etree_union *exp;
 
 }
 void
-lang_add_assignment(exp)
-etree_type *exp;
+DEFUN(lang_add_assignment,(exp),
+      etree_type *exp)
 {
   lang_assignment_statement_type *new = new_stat(lang_assignment_statement,
                                            stat_ptr);
@@ -2114,8 +2320,8 @@ etree_type *exp;
 }
 
 void
-lang_add_attribute(attribute)
-enum statement_enum attribute;
+DEFUN(lang_add_attribute,(attribute),
+      enum statement_enum attribute)
 {
   new_statement(attribute, sizeof(lang_statement_union_type),stat_ptr);
 }
@@ -2123,11 +2329,11 @@ enum statement_enum attribute;
 
 
 void 
-lang_startup(name)
-char *name;
+DEFUN(lang_startup,(name),
+      CONST char *name)
 {
   if (startup_file != (char *)NULL) {
-   info("%P%FMultiple STARTUP files\n");
+   einfo("%P%FMultiple STARTUP files\n");
   }
   first_file->filename = name;
   first_file->local_sym_name = name;
@@ -2135,97 +2341,97 @@ char *name;
   startup_file= name;
 }
 void 
-lang_float(maybe)
-boolean maybe;
+DEFUN(lang_float,(maybe),
+      boolean maybe)
 {
   lang_float_flag = maybe;
 }
 
 void 
-lang_leave_output_section_statement(fill, memspec)
-bfd_vma fill;
-char *memspec;
+DEFUN(lang_leave_output_section_statement,(fill, memspec),
+      bfd_vma fill AND
+      CONST char *memspec)
 {
   current_section->fill = fill;
   current_section->region = lang_memory_region_lookup(memspec);
   stat_ptr = &statement_list;
+
+  /* We remember if we are closing a .data section, since we use it to
+     store constructors in */
+  if (strcmp(current_section->name, ".data") ==0) {
+   end_of_data_section_statement_list = statement_list;
+
+  }
 }
+/*
+ Create an absolute symbol with the given name with the value of the
+ address of first byte of the section named.
 
+ If the symbol already exists, then do nothing.
+*/
 void
-lang_abs_symbol_at_end_of(section, name)
-char *section;
-char *name;
-{
-  extern bfd *output_bfd;
-  extern asymbol *create_symbol();
-  asection *s = bfd_get_section_by_name(output_bfd, section);
-  /* Add a symbol called _end */
-  asymbol *def = create_symbol(name,
-                              BSF_GLOBAL | BSF_EXPORT |
-                              BSF_ABSOLUTE,
-                              (asection *)NULL);
-  if (s != (asection *)NULL) {
-    def->value = s->vma + s->size;
+DEFUN(lang_abs_symbol_at_beginning_of,(section, name),
+      CONST char *section AND
+      CONST char *name)
+{
+  if (ldsym_undefined(name)) {
+    asection *s = bfd_get_section_by_name(output_bfd, section);
+    asymbol *def = create_symbol(name,
+                                BSF_GLOBAL | BSF_EXPORT ,
+                                &bfd_abs_section);
+    
+
+    if (s != (asection *)NULL) {
+      def->value = s->vma;
+    }
+    else {
+      def->value = 0;
+    }
   }
-  else {
-    def->value = 0;
+}
+
+/*
+ Create an absolute symbol with the given name with the value of the
+ address of the first byte after the end of the section named.
+
+ If the symbol already exists, then do nothing.
+*/
+void
+DEFUN(lang_abs_symbol_at_end_of,(section, name),
+      CONST char *section AND
+      CONST char *name)
+{
+  if (ldsym_undefined(name)){
+    asection *s = bfd_get_section_by_name(output_bfd, section);
+    /* Add a symbol called _end */
+    asymbol *def = create_symbol(name,
+                                BSF_GLOBAL | BSF_EXPORT ,
+                                &bfd_abs_section);
+
+    if (s != (asection *)NULL) {
+      def->value = s->vma + s->_raw_size;
+    }
+    else {
+      def->value = 0;
+    }
   }
 }
 
 void 
-lang_statement_append(list, element, field)
-lang_statement_list_type *list;
-lang_statement_union_type *element;
-lang_statement_union_type **field;
+DEFUN(lang_statement_append,(list, element, field),
+      lang_statement_list_type *list AND
+      lang_statement_union_type *element AND
+      lang_statement_union_type **field)
 {
   *(list->tail) = element;
   list->tail = field;
 }
 
-
-static void 
-lang_for_each_statement_worker(func,  s)
-void (*func)();
-lang_statement_union_type *s;
+/* Set the output format type */
+void
+DEFUN(lang_add_output_format,(format),
+CONST char *format)
 {
-  for (; s != (lang_statement_union_type *)NULL ; s = s->next) 
-    {
-      func(s);
-
-      switch (s->header.type) {
-      case lang_output_section_statement_enum:
-       lang_for_each_statement_worker
-         (func, 
-          s->output_section_statement.children.head);
-       break;
-      case lang_wild_statement_enum:
-       lang_for_each_statement_worker
-         (func, 
-          s->wild_statement.children.head);
-       break;
-      case lang_data_statement_enum:
-      case lang_object_symbols_statement_enum:
-      case lang_output_statement_enum:
-      case lang_target_statement_enum:
-      case lang_common_statement_enum:
-      case lang_input_section_enum:
-      case lang_input_statement_enum:
-      case lang_fill_statement_enum:
-      case lang_assignment_statement_enum:
-      case lang_padding_statement_enum:
-      case lang_address_statement_enum:
-       break;
-      default:
-       FAIL();
-       break;
-      }
-    }
+  output_target = format;
 }
 
-void lang_for_each_statement(func)
-void (*func)();
-{
-  lang_for_each_statement_worker(func,
-                                statement_list.head);
-
-}
This page took 0.077909 seconds and 4 git commands to generate.