OSDN Git Service

* po/it.po: New Italian translation.
[pf3gnuchains/pf3gnuchains4x.git] / ld / ldexp.c
index 34d9eab..68617d8 100644 (file)
@@ -1,6 +1,6 @@
 /* This module handles expression trees.
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
    Written by Steve Chamberlain of Cygnus Support <sac@cygnus.com>.
 
@@ -44,7 +44,6 @@
 #include "safe-ctype.h"
 
 static void exp_fold_tree_1 (etree_type *);
-static void exp_fold_tree_no_dot (etree_type *);
 static bfd_vma align_n (bfd_vma, bfd_vma);
 
 segment_type *segments;
@@ -138,7 +137,8 @@ exp_print_token (token_code_type code, int infix_p)
 static void
 make_abs (void)
 {
-  expld.result.value += expld.result.section->vma;
+  if (expld.result.section != NULL)
+    expld.result.value += expld.result.section->vma;
   expld.result.section = bfd_abs_section_ptr;
 }
 
@@ -190,11 +190,20 @@ exp_relop (asection *section, bfd_vma value)
 }
 
 static void
-new_rel (bfd_vma value, char *str, asection *section)
+new_number (bfd_vma value)
 {
   expld.result.valid_p = TRUE;
   expld.result.value = value;
-  expld.result.str = str;
+  expld.result.str = NULL;
+  expld.result.section = NULL;
+}
+
+static void
+new_rel (bfd_vma value, asection *section)
+{
+  expld.result.valid_p = TRUE;
+  expld.result.value = value;
+  expld.result.str = NULL;
   expld.result.section = section;
 }
 
@@ -227,17 +236,14 @@ fold_unary (etree_type *tree)
          break;
 
        case '~':
-         make_abs ();
          expld.result.value = ~expld.result.value;
          break;
 
        case '!':
-         make_abs ();
          expld.result.value = !expld.result.value;
          break;
 
        case '-':
-         make_abs ();
          expld.result.value = -expld.result.value;
          break;
 
@@ -253,20 +259,22 @@ fold_unary (etree_type *tree)
          break;
 
        case DATA_SEGMENT_END:
-         if (expld.phase != lang_first_phase_enum
-             && expld.section == bfd_abs_section_ptr
-             && (expld.dataseg.phase == exp_dataseg_align_seen
-                 || expld.dataseg.phase == exp_dataseg_relro_seen
-                 || expld.dataseg.phase == exp_dataseg_adjust
-                 || expld.dataseg.phase == exp_dataseg_relro_adjust
-                 || expld.phase == lang_final_phase_enum))
+         if (expld.phase == lang_first_phase_enum
+             || expld.section != bfd_abs_section_ptr)
            {
-             if (expld.dataseg.phase == exp_dataseg_align_seen
-                 || expld.dataseg.phase == exp_dataseg_relro_seen)
-               {
-                 expld.dataseg.phase = exp_dataseg_end_seen;
-                 expld.dataseg.end = expld.result.value;
-               }
+             expld.result.valid_p = FALSE;
+           }
+         else if (expld.dataseg.phase == exp_dataseg_align_seen
+                  || expld.dataseg.phase == exp_dataseg_relro_seen)
+           {
+             expld.dataseg.phase = exp_dataseg_end_seen;
+             expld.dataseg.end = expld.result.value;
+           }
+         else if (expld.dataseg.phase == exp_dataseg_done
+                  || expld.dataseg.phase == exp_dataseg_adjust
+                  || expld.dataseg.phase == exp_dataseg_relro_adjust)
+           {
+             /* OK.  */
            }
          else
            expld.result.valid_p = FALSE;
@@ -293,16 +301,20 @@ fold_binary (etree_type *tree)
     {
       const char *segment_name;
       segment_type *seg;
+
       /* Check to see if the user has overridden the default
         value.  */
       segment_name = tree->binary.rhs->name.name;
       for (seg = segments; seg; seg = seg->next) 
        if (strcmp (seg->name, segment_name) == 0)
          {
+           if (!seg->used
+               && config.magic_demand_paged
+               && (seg->value % config.maxpagesize) != 0)
+             einfo (_("%P: warning: address of `%s' isn't multiple of maximum page size\n"),
+                    segment_name);
            seg->used = TRUE;
-           expld.result.value = seg->value;
-           expld.result.str = NULL;
-           expld.result.section = expld.section;
+           new_rel_from_abs (seg->value);
            break;
          }
       return;
@@ -314,42 +326,87 @@ fold_binary (etree_type *tree)
 
   if (expld.result.valid_p)
     {
-      /* If the values are from different sections, or this is an
-        absolute expression, make both the source arguments
-        absolute.  However, adding or subtracting an absolute
-        value from a relative value is meaningful, and is an
-        exception.  */
-      if (expld.section != bfd_abs_section_ptr
-         && lhs.section == bfd_abs_section_ptr
-         && tree->type.node_code == '+')
+      if (lhs.section != expld.result.section)
        {
-         /* Keep the section of the rhs term.  */
-         expld.result.value = lhs.value + expld.result.value;
-         return;
-       }
-      else if (expld.section != bfd_abs_section_ptr
-              && expld.result.section == bfd_abs_section_ptr
-              && (tree->type.node_code == '+'
-                  || tree->type.node_code == '-'))
-       {
-         /* Keep the section of the lhs term.  */
-         expld.result.section = lhs.section;
-       }
-      else if (expld.result.section != lhs.section
-              || expld.section == bfd_abs_section_ptr)
-       {
-         make_abs ();
-         lhs.value += lhs.section->vma;
+         /* If the values are from different sections, and neither is
+            just a number, make both the source arguments absolute.  */
+         if (expld.result.section != NULL
+             && lhs.section != NULL)
+           {
+             make_abs ();
+             lhs.value += lhs.section->vma;
+             lhs.section = bfd_abs_section_ptr;
+           }
+
+         /* If the rhs is just a number, keep the lhs section.  */
+         else if (expld.result.section == NULL)
+           {
+             expld.result.section = lhs.section;
+             /* Make this NULL so that we know one of the operands
+                was just a number, for later tests.  */
+             lhs.section = NULL;
+           }
        }
+      /* At this point we know that both operands have the same
+        section, or at least one of them is a plain number.  */
 
       switch (tree->type.node_code)
        {
+         /* Arithmetic operators, bitwise AND, bitwise OR and XOR
+            keep the section of one of their operands only when the
+            other operand is a plain number.  Losing the section when
+            operating on two symbols, ie. a result of a plain number,
+            is required for subtraction and XOR.  It's justifiable
+            for the other operations on the grounds that adding,
+            multiplying etc. two section relative values does not
+            really make sense unless they are just treated as
+            numbers.
+            The same argument could be made for many expressions
+            involving one symbol and a number.  For example,
+            "1 << x" and "100 / x" probably should not be given the
+            section of x.  The trouble is that if we fuss about such
+            things the rules become complex and it is onerous to
+            document ld expression evaluation.  */
+#define BOP(x, y) \
+       case x:                                                 \
+         expld.result.value = lhs.value y expld.result.value;  \
+         if (expld.result.section == lhs.section)              \
+           expld.result.section = NULL;                        \
+         break;
+
+         /* Comparison operators, logical AND, and logical OR always
+            return a plain number.  */
+#define BOPN(x, y) \
+       case x:                                                 \
+         expld.result.value = lhs.value y expld.result.value;  \
+         expld.result.section = NULL;                          \
+         break;
+
+         BOP ('+', +);
+         BOP ('*', *);
+         BOP ('-', -);
+         BOP (LSHIFT, <<);
+         BOP (RSHIFT, >>);
+         BOP ('&', &);
+         BOP ('^', ^);
+         BOP ('|', |);
+         BOPN (EQ, ==);
+         BOPN (NE, !=);
+         BOPN ('<', <);
+         BOPN ('>', >);
+         BOPN (LE, <=);
+         BOPN (GE, >=);
+         BOPN (ANDAND, &&);
+         BOPN (OROR, ||);
+
        case '%':
          if (expld.result.value != 0)
            expld.result.value = ((bfd_signed_vma) lhs.value
                                  % (bfd_signed_vma) expld.result.value);
          else if (expld.phase != lang_mark_phase_enum)
            einfo (_("%F%S %% by zero\n"));
+         if (expld.result.section == lhs.section)
+           expld.result.section = NULL;
          break;
 
        case '/':
@@ -358,30 +415,10 @@ fold_binary (etree_type *tree)
                                  / (bfd_signed_vma) expld.result.value);
          else if (expld.phase != lang_mark_phase_enum)
            einfo (_("%F%S / by zero\n"));
+         if (expld.result.section == lhs.section)
+           expld.result.section = NULL;
          break;
 
-#define BOP(x, y) \
-           case x:                                                     \
-             expld.result.value = lhs.value y expld.result.value;      \
-             break;
-
-         BOP ('+', +);
-         BOP ('*', *);
-         BOP ('-', -);
-         BOP (LSHIFT, <<);
-         BOP (RSHIFT, >>);
-         BOP (EQ, ==);
-         BOP (NE, !=);
-         BOP ('<', <);
-         BOP ('>', >);
-         BOP (LE, <=);
-         BOP (GE, >=);
-         BOP ('&', &);
-         BOP ('^', ^);
-         BOP ('|', |);
-         BOP (ANDAND, &&);
-         BOP (OROR, ||);
-
        case MAX_K:
          if (lhs.value > expld.result.value)
            expld.result.value = lhs.value;
@@ -398,12 +435,10 @@ fold_binary (etree_type *tree)
 
        case DATA_SEGMENT_ALIGN:
          expld.dataseg.relro = exp_dataseg_relro_start;
-         if (expld.phase != lang_first_phase_enum
-             && expld.section == bfd_abs_section_ptr
-             && (expld.dataseg.phase == exp_dataseg_none
-                 || expld.dataseg.phase == exp_dataseg_adjust
-                 || expld.dataseg.phase == exp_dataseg_relro_adjust
-                 || expld.phase == lang_final_phase_enum))
+         if (expld.phase == lang_first_phase_enum
+             || expld.section != bfd_abs_section_ptr)
+           expld.result.valid_p = FALSE;
+         else
            {
              bfd_vma maxpage = lhs.value;
              bfd_vma commonpage = expld.result.value;
@@ -411,10 +446,20 @@ fold_binary (etree_type *tree)
              expld.result.value = align_n (expld.dot, maxpage);
              if (expld.dataseg.phase == exp_dataseg_relro_adjust)
                expld.result.value = expld.dataseg.base;
-             else if (expld.dataseg.phase != exp_dataseg_adjust)
+             else if (expld.dataseg.phase == exp_dataseg_adjust)
+               {
+                 if (commonpage < maxpage)
+                   expld.result.value += ((expld.dot + commonpage - 1)
+                                          & (maxpage - commonpage));
+               }
+             else
                {
                  expld.result.value += expld.dot & (maxpage - 1);
-                 if (expld.phase == lang_allocating_phase_enum)
+                 if (expld.dataseg.phase == exp_dataseg_done)
+                   {
+                     /* OK.  */
+                   }
+                 else if (expld.dataseg.phase == exp_dataseg_none)
                    {
                      expld.dataseg.phase = exp_dataseg_align_seen;
                      expld.dataseg.min_base = expld.dot;
@@ -423,22 +468,21 @@ fold_binary (etree_type *tree)
                      expld.dataseg.maxpagesize = maxpage;
                      expld.dataseg.relro_end = 0;
                    }
+                 else
+                   expld.result.valid_p = FALSE;
                }
-             else if (commonpage < maxpage)
-               expld.result.value += ((expld.dot + commonpage - 1)
-                                      & (maxpage - commonpage));
            }
-         else
-           expld.result.valid_p = FALSE;
          break;
 
        case DATA_SEGMENT_RELRO_END:
          expld.dataseg.relro = exp_dataseg_relro_end;
-         if (expld.phase != lang_first_phase_enum
-             && (expld.dataseg.phase == exp_dataseg_align_seen
-                 || expld.dataseg.phase == exp_dataseg_adjust
-                 || expld.dataseg.phase == exp_dataseg_relro_adjust
-                 || expld.phase == lang_final_phase_enum))
+         if (expld.phase == lang_first_phase_enum
+             || expld.section != bfd_abs_section_ptr)
+           expld.result.valid_p = FALSE;
+         else if (expld.dataseg.phase == exp_dataseg_align_seen
+                  || expld.dataseg.phase == exp_dataseg_adjust
+                  || expld.dataseg.phase == exp_dataseg_relro_adjust
+                  || expld.dataseg.phase == exp_dataseg_done)
            {
              if (expld.dataseg.phase == exp_dataseg_align_seen
                  || expld.dataseg.phase == exp_dataseg_relro_adjust)
@@ -494,7 +538,7 @@ fold_name (etree_type *tree)
             The bfd function may cache incorrect data.  */
          if (expld.phase != lang_mark_phase_enum)
            hdr_size = bfd_sizeof_headers (link_info.output_bfd, &link_info);
-         new_abs (hdr_size);
+         new_number (hdr_size);
        }
       break;
 
@@ -511,14 +555,12 @@ fold_name (etree_type *tree)
                                            &link_info,
                                            tree->name.name,
                                            FALSE, FALSE, TRUE);
-         expld.result.value = (h != NULL
-                               && (h->type == bfd_link_hash_defined
-                                   || h->type == bfd_link_hash_defweak
-                                   || h->type == bfd_link_hash_common)
-                               && (def_iteration == lang_statement_iteration
-                                   || def_iteration == -1));
-         expld.result.section = expld.section;
-         expld.result.valid_p = TRUE;
+         new_number (h != NULL
+                     && (h->type == bfd_link_hash_defined
+                         || h->type == bfd_link_hash_defweak
+                         || h->type == bfd_link_hash_common)
+                     && (def_iteration == lang_statement_iteration
+                         || def_iteration == -1));
        }
       break;
 
@@ -540,24 +582,23 @@ fold_name (etree_type *tree)
          else if (h->type == bfd_link_hash_defined
                   || h->type == bfd_link_hash_defweak)
            {
-             if (bfd_is_abs_section (h->u.def.section))
-               new_abs (h->u.def.value);
-             else
-               {
-                 asection *output_section;
+             asection *output_section;
 
-                 output_section = h->u.def.section->output_section;
-                 if (output_section == NULL)
-                   {
-                     if (expld.phase != lang_mark_phase_enum)
-                       einfo (_("%X%S: unresolvable symbol `%s'"
-                                " referenced in expression\n"),
-                              tree->name.name);
-                   }
-                 else
-                   new_rel (h->u.def.value + h->u.def.section->output_offset,
-                            NULL, output_section);
+             output_section = h->u.def.section->output_section;
+             if (output_section == NULL)
+               {
+                 if (expld.phase != lang_mark_phase_enum)
+                   einfo (_("%X%S: unresolvable symbol `%s'"
+                            " referenced in expression\n"),
+                          tree->name.name);
                }
+             else if (output_section == bfd_abs_section_ptr
+                      && (expld.section != bfd_abs_section_ptr
+                          || config.sane_expr))
+               new_number (h->u.def.value + h->u.def.section->output_offset);
+             else
+               new_rel (h->u.def.value + h->u.def.section->output_offset,
+                        output_section);
            }
          else if (expld.phase == lang_final_phase_enum
                   || expld.assigning_to_dot)
@@ -586,7 +627,7 @@ fold_name (etree_type *tree)
                       tree->name.name);
            }
          else if (os->processed_vma)
-           new_rel (0, NULL, os->bfd_section);
+           new_rel (0, os->bfd_section);
        }
       break;
 
@@ -628,7 +669,7 @@ fold_name (etree_type *tree)
              if (expld.phase == lang_final_phase_enum)
                einfo (_("%F%S: undefined section `%s' referenced in expression\n"),
                       tree->name.name);
-             new_abs (0);
+             new_number (0);
            }
          else if (os->processed_vma)
            {
@@ -640,7 +681,7 @@ fold_name (etree_type *tree)
              else
                val = (bfd_vma)1 << os->bfd_section->alignment_power;
              
-             new_abs (val);
+             new_number (val);
            }
        }
       break;
@@ -651,7 +692,7 @@ fold_name (etree_type *tree)
         
         mem = lang_memory_region_lookup (tree->name.name, FALSE);  
         if (mem != NULL) 
-          new_abs (mem->length);
+          new_number (mem->length);
         else          
           einfo (_("%F%S: undefined MEMORY region `%s'"
                   " referenced in expression\n"), tree->name.name);
@@ -659,23 +700,24 @@ fold_name (etree_type *tree)
       break;
 
     case ORIGIN:
-      {
-        lang_memory_region_type *mem;
+      if (expld.phase != lang_first_phase_enum)
+       {
+         lang_memory_region_type *mem;
         
-        mem = lang_memory_region_lookup (tree->name.name, FALSE);  
-        if (mem != NULL) 
-          new_abs (mem->origin);
-        else          
-          einfo (_("%F%S: undefined MEMORY region `%s'"
-                  " referenced in expression\n"), tree->name.name);
-      }
+         mem = lang_memory_region_lookup (tree->name.name, FALSE);  
+         if (mem != NULL) 
+           new_rel_from_abs (mem->origin);
+         else          
+           einfo (_("%F%S: undefined MEMORY region `%s'"
+                    " referenced in expression\n"), tree->name.name);
+       }
       break;
 
     case CONSTANT:
       if (strcmp (tree->name.name, "MAXPAGESIZE") == 0)
-       new_abs (config.maxpagesize);
+       new_number (config.maxpagesize);
       else if (strcmp (tree->name.name, "COMMONPAGESIZE") == 0)
-       new_abs (config.commonpagesize);
+       new_number (config.commonpagesize);
       else
        einfo (_("%F%S: unknown constant `%s' referenced in expression\n"),
               tree->name.name);
@@ -699,7 +741,12 @@ exp_fold_tree_1 (etree_type *tree)
   switch (tree->type.node_class)
     {
     case etree_value:
-      new_rel (tree->value.value, tree->value.str, expld.section);
+      if (expld.section == bfd_abs_section_ptr
+         && !config.sane_expr)
+       new_abs (tree->value.value);
+      else
+       new_number (tree->value.value);
+      expld.result.str = tree->value.str;
       break;
 
     case etree_rel:
@@ -707,7 +754,7 @@ exp_fold_tree_1 (etree_type *tree)
        {
          asection *output_section = tree->rel.section->output_section;
          new_rel (tree->rel.value + tree->rel.section->output_offset,
-                  NULL, output_section);
+                  output_section);
        }
       else
        memset (&expld.result, 0, sizeof (expld.result));
@@ -736,12 +783,15 @@ exp_fold_tree_1 (etree_type *tree)
     case etree_provided:
       if (tree->assign.dst[0] == '.' && tree->assign.dst[1] == 0)
        {
-         /* Assignment to dot can only be done during allocation.  */
          if (tree->type.node_class != etree_assign)
            einfo (_("%F%S can not PROVIDE assignment to location counter\n"));
+         /* After allocation, assignment to dot should not be done inside
+            an output section since allocation adds a padding statement
+            that effectively duplicates the assignment.  */
          if (expld.phase == lang_mark_phase_enum
              || expld.phase == lang_allocating_phase_enum
-             || (expld.phase == lang_final_phase_enum
+             || ((expld.phase == lang_assigning_phase_enum
+                  || expld.phase == lang_final_phase_enum)
                  && expld.section == bfd_abs_section_ptr))
            {
              /* Notify the folder that this is an assignment to dot.  */
@@ -761,7 +811,11 @@ exp_fold_tree_1 (etree_type *tree)
                {
                  bfd_vma nextdot;
 
-                 nextdot = expld.result.value + expld.section->vma;
+                 nextdot = expld.result.value;
+                 if (expld.result.section != NULL)
+                   nextdot += expld.result.section->vma;
+                 else
+                   nextdot += expld.section->vma;
                  if (nextdot < expld.dot
                      && expld.section != bfd_abs_section_ptr)
                    einfo (_("%F%S cannot move location counter backwards"
@@ -778,6 +832,8 @@ exp_fold_tree_1 (etree_type *tree)
        }
       else
        {
+         etree_type *name;
+
          struct bfd_link_hash_entry *h = NULL;
 
          if (tree->type.node_class == etree_provide)
@@ -795,8 +851,28 @@ exp_fold_tree_1 (etree_type *tree)
                }
            }
 
+         name = tree->assign.src;
+         if (name->type.node_class == etree_trinary)
+           {
+             exp_fold_tree_1 (name->trinary.cond);
+             if (expld.result.valid_p)
+               name = (expld.result.value
+                       ? name->trinary.lhs : name->trinary.rhs);
+           }
+
+         if (name->type.node_class == etree_name
+             && name->type.node_code == NAME
+             && strcmp (tree->assign.dst, name->name.name) == 0)
+           /* Leave it alone.  Do not replace a symbol with its own
+              output address, in case there is another section sizing
+              pass.  Folding does not preserve input sections.  */
+           break;
+
          exp_fold_tree_1 (tree->assign.src);
-         if (expld.result.valid_p)
+         if (expld.result.valid_p
+             || (expld.phase == lang_first_phase_enum
+                 && tree->type.node_class == etree_assign
+                 && tree->assign.hidden))
            {
              if (h == NULL)
                {
@@ -812,12 +888,15 @@ exp_fold_tree_1 (etree_type *tree)
              lang_update_definedness (tree->assign.dst, h);
              h->type = bfd_link_hash_defined;
              h->u.def.value = expld.result.value;
+             if (expld.result.section == NULL)
+               expld.result.section = expld.section;
              h->u.def.section = expld.result.section;
              if (tree->type.node_class == etree_provide)
                tree->type.node_class = etree_provided;
 
              /* Copy the symbol type if this is a simple assignment of
-                one symbol to annother.  */
+                one symbol to another.  This could be more general
+                (e.g. a ?: operator with NAMEs in each branch).  */
              if (tree->assign.src->type.node_class == etree_name)
                {
                  struct bfd_link_hash_entry *hsrc;
@@ -861,7 +940,7 @@ exp_fold_tree (etree_type *tree, asection *current_section, bfd_vma *dotp)
   exp_fold_tree_1 (tree);
 }
 
-static void
+void
 exp_fold_tree_no_dot (etree_type *tree)
 {
   expld.dot = 0;
@@ -947,37 +1026,44 @@ exp_nameop (int code, const char *name)
 
 }
 
-etree_type *
-exp_assop (int code, const char *dst, etree_type *src)
-{
-  etree_type *new_e;
-
-  new_e = (etree_type *) stat_alloc (sizeof (new_e->assign));
-  new_e->type.node_code = code;
-  new_e->type.lineno = src->type.lineno;
-  new_e->type.node_class = etree_assign;
-  new_e->assign.src = src;
-  new_e->assign.dst = dst;
-  return new_e;
-}
-
-/* Handle PROVIDE.  */
-
-etree_type *
-exp_provide (const char *dst, etree_type *src, bfd_boolean hidden)
+static etree_type *
+exp_assop (const char *dst,
+          etree_type *src,
+          enum node_tree_enum class,
+          bfd_boolean hidden)
 {
   etree_type *n;
 
   n = (etree_type *) stat_alloc (sizeof (n->assign));
   n->assign.type.node_code = '=';
   n->assign.type.lineno = src->type.lineno;
-  n->assign.type.node_class = etree_provide;
+  n->assign.type.node_class = class;
   n->assign.src = src;
   n->assign.dst = dst;
   n->assign.hidden = hidden;
   return n;
 }
 
+etree_type *
+exp_assign (const char *dst, etree_type *src)
+{
+  return exp_assop (dst, src, etree_assign, FALSE);
+}
+
+etree_type *
+exp_defsym (const char *dst, etree_type *src)
+{
+  return exp_assop (dst, src, etree_assign, TRUE);
+}
+
+/* Handle PROVIDE.  */
+
+etree_type *
+exp_provide (const char *dst, etree_type *src, bfd_boolean hidden)
+{
+  return exp_assop (dst, src, etree_provide, hidden);
+}
+
 /* Handle ASSERT.  */
 
 etree_type *
@@ -997,6 +1083,8 @@ exp_assert (etree_type *exp, const char *message)
 void
 exp_print_tree (etree_type *tree)
 {
+  bfd_boolean function_like;
+
   if (config.map_file == NULL)
     config.map_file = stderr;
 
@@ -1017,7 +1105,7 @@ exp_print_tree (etree_type *tree)
       minfo ("%s+0x%v", tree->rel.section->name, tree->rel.value);
       return;
     case etree_assign:
-      fprintf (config.map_file, "%s", tree->assign.dst);
+      fputs (tree->assign.dst, config.map_file);
       exp_print_token (tree->type.node_code, TRUE);
       exp_print_tree (tree->assign.src);
       break;
@@ -1025,20 +1113,38 @@ exp_print_tree (etree_type *tree)
     case etree_provided:
       fprintf (config.map_file, "PROVIDE (%s, ", tree->assign.dst);
       exp_print_tree (tree->assign.src);
-      fprintf (config.map_file, ")");
+      fputc (')', config.map_file);
       break;
     case etree_binary:
-      fprintf (config.map_file, "(");
+      function_like = FALSE;
+      switch (tree->type.node_code)
+       {
+       case MAX_K:
+       case MIN_K:
+       case ALIGN_K:
+       case DATA_SEGMENT_ALIGN:
+       case DATA_SEGMENT_RELRO_END:
+         function_like = TRUE;
+       }
+      if (function_like)
+       {
+         exp_print_token (tree->type.node_code, FALSE);
+         fputc (' ', config.map_file);
+       }
+      fputc ('(', config.map_file);
       exp_print_tree (tree->binary.lhs);
-      exp_print_token (tree->type.node_code, TRUE);
+      if (function_like)
+       fprintf (config.map_file, ", ");
+      else
+       exp_print_token (tree->type.node_code, TRUE);
       exp_print_tree (tree->binary.rhs);
-      fprintf (config.map_file, ")");
+      fputc (')', config.map_file);
       break;
     case etree_trinary:
       exp_print_tree (tree->trinary.cond);
-      fprintf (config.map_file, "?");
+      fputc ('?', config.map_file);
       exp_print_tree (tree->trinary.lhs);
-      fprintf (config.map_file, ":");
+      fputc (':', config.map_file);
       exp_print_tree (tree->trinary.rhs);
       break;
     case etree_unary:
@@ -1047,7 +1153,7 @@ exp_print_tree (etree_type *tree)
        {
          fprintf (config.map_file, " (");
          exp_print_tree (tree->unary.child);
-         fprintf (config.map_file, ")");
+         fputc (')', config.map_file);
        }
       break;
 
@@ -1059,9 +1165,7 @@ exp_print_tree (etree_type *tree)
 
     case etree_name:
       if (tree->type.node_code == NAME)
-       {
-         fprintf (config.map_file, "%s", tree->name.name);
-       }
+       fputs (tree->name.name, config.map_file);
       else
        {
          exp_print_token (tree->type.node_code, FALSE);
@@ -1162,7 +1266,8 @@ exp_get_abs_int (etree_type *tree, int def, char *name)
 
       if (expld.result.valid_p)
        {
-         expld.result.value += expld.result.section->vma;
+         if (expld.result.section != NULL)
+           expld.result.value += expld.result.section->vma;
          return expld.result.value;
        }
       else if (name != NULL && expld.phase != lang_mark_phase_enum)