Hardcode host-specific name for LTO plugin
[platform/upstream/binutils.git] / ld / ldexp.c
index 1e0969c..5c4f8dd 100644 (file)
@@ -1,25 +1,24 @@
 /* This module handles expression trees.
-   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2004, 2005, 2006, 2007
-   Free Software Foundation, Inc.
+   Copyright (C) 1991-2014 Free Software Foundation, Inc.
    Written by Steve Chamberlain of Cygnus Support <sac@cygnus.com>.
 
-   This file is part of GLD, the Gnu Linker.
+   This file is part of the GNU Binutils.
 
-   GLD is free software; you can redistribute it and/or modify
+   This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
-   GLD is distributed in the hope that it will be useful,
+   This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GLD; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
 
 /* This module is in charge of working out the contents of expressions.
 
@@ -28,8 +27,8 @@
    which contains a value, a section to which it is relative and a
    valid bit.  */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "bfdlink.h"
 
 #include "ld.h"
@@ -43,7 +42,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;
@@ -59,7 +57,7 @@ exp_print_token (token_code_type code, int infix_p)
   static const struct
   {
     token_code_type code;
-    char * name;
+    const char * name;
   }
   table[] =
   {
@@ -81,6 +79,7 @@ exp_print_token (token_code_type code, int infix_p)
     { GE, ">=" },
     { LSHIFT, "<<" },
     { RSHIFT, ">>" },
+    { LOG2CEIL, "LOG2CEIL" },
     { ALIGN_K, "ALIGN" },
     { BLOCK, "BLOCK" },
     { QUAD, "QUAD" },
@@ -97,11 +96,15 @@ exp_print_token (token_code_type code, int infix_p)
     { MAP, "MAP" },
     { ENTRY, "ENTRY" },
     { NEXT, "NEXT" },
+    { ALIGNOF, "ALIGNOF" },
     { SIZEOF, "SIZEOF" },
     { ADDR, "ADDR" },
     { LOADADDR, "LOADADDR" },
     { CONSTANT, "CONSTANT" },
-    { MAX_K, "MAX_K" },
+    { ABSOLUTE, "ABSOLUTE" },
+    { MAX_K, "MAX" },
+    { MIN_K, "MIN" },
+    { ASSERT_K, "ASSERT" },
     { REL, "relocatable" },
     { DATA_SEGMENT_ALIGN, "DATA_SEGMENT_ALIGN" },
     { DATA_SEGMENT_RELRO_END, "DATA_SEGMENT_RELRO_END" },
@@ -131,9 +134,32 @@ exp_print_token (token_code_type code, int infix_p)
 }
 
 static void
+make_log2ceil (void)
+{
+  bfd_vma value = expld.result.value;
+  bfd_vma result = -1;
+  bfd_boolean round_up = FALSE;
+
+  do
+    {
+      result++;
+      /* If more than one bit is set in the value we will need to round up.  */
+      if ((value > 1) && (value & 1))
+       round_up = TRUE;
+    }
+  while (value >>= 1);
+
+  if (round_up)
+    result += 1;
+  expld.result.section = NULL;
+  expld.result.value = result;
+}
+
+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;
 }
 
@@ -149,25 +175,27 @@ new_abs (bfd_vma value)
 etree_type *
 exp_intop (bfd_vma value)
 {
-  etree_type *new = stat_alloc (sizeof (new->value));
-  new->type.node_code = INT;
-  new->type.lineno = lineno;
-  new->value.value = value;
-  new->value.str = NULL;
-  new->type.node_class = etree_value;
-  return new;
+  etree_type *new_e = (etree_type *) stat_alloc (sizeof (new_e->value));
+  new_e->type.node_code = INT;
+  new_e->type.filename = ldlex_filename ();
+  new_e->type.lineno = lineno;
+  new_e->value.value = value;
+  new_e->value.str = NULL;
+  new_e->type.node_class = etree_value;
+  return new_e;
 }
 
 etree_type *
 exp_bigintop (bfd_vma value, char *str)
 {
-  etree_type *new = stat_alloc (sizeof (new->value));
-  new->type.node_code = INT;
-  new->type.lineno = lineno;
-  new->value.value = value;
-  new->value.str = str;
-  new->type.node_class = etree_value;
-  return new;
+  etree_type *new_e = (etree_type *) stat_alloc (sizeof (new_e->value));
+  new_e->type.node_code = INT;
+  new_e->type.filename = ldlex_filename ();
+  new_e->type.lineno = lineno;
+  new_e->value.value = value;
+  new_e->value.str = str;
+  new_e->type.node_class = etree_value;
+  return new_e;
 }
 
 /* Build an expression representing an unnamed relocatable value.  */
@@ -175,31 +203,45 @@ exp_bigintop (bfd_vma value, char *str)
 etree_type *
 exp_relop (asection *section, bfd_vma value)
 {
-  etree_type *new = stat_alloc (sizeof (new->rel));
-  new->type.node_code = REL;
-  new->type.lineno = lineno;
-  new->type.node_class = etree_rel;
-  new->rel.section = section;
-  new->rel.value = value;
-  return new;
+  etree_type *new_e = (etree_type *) stat_alloc (sizeof (new_e->rel));
+  new_e->type.node_code = REL;
+  new_e->type.filename = ldlex_filename ();
+  new_e->type.lineno = lineno;
+  new_e->type.node_class = etree_rel;
+  new_e->rel.section = section;
+  new_e->rel.value = value;
+  return new_e;
+}
+
+static void
+new_number (bfd_vma value)
+{
+  expld.result.valid_p = TRUE;
+  expld.result.value = value;
+  expld.result.str = NULL;
+  expld.result.section = NULL;
 }
 
 static void
-new_rel (bfd_vma value, char *str, asection *section)
+new_rel (bfd_vma value, asection *section)
 {
   expld.result.valid_p = TRUE;
   expld.result.value = value;
-  expld.result.str = str;
+  expld.result.str = NULL;
   expld.result.section = section;
 }
 
 static void
 new_rel_from_abs (bfd_vma value)
 {
+  asection *s = expld.section;
+
+  if (s == bfd_abs_section_ptr && expld.phase == lang_final_phase_enum)
+    s = section_for_dot ();
   expld.result.valid_p = TRUE;
-  expld.result.value = value - expld.section->vma;
+  expld.result.value = value - s->vma;
   expld.result.str = NULL;
-  expld.result.section = expld.section;
+  expld.result.section = s;
 }
 
 static void
@@ -221,18 +263,19 @@ fold_unary (etree_type *tree)
          make_abs ();
          break;
 
+       case LOG2CEIL:
+         make_log2ceil ();
+         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;
 
@@ -248,20 +291,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;
@@ -277,187 +322,226 @@ fold_unary (etree_type *tree)
 static void
 fold_binary (etree_type *tree)
 {
+  etree_value_type lhs;
   exp_fold_tree_1 (tree->binary.lhs);
 
   /* The SEGMENT_START operator is special because its first
-     operand is a string, not the name of a symbol.  */
+     operand is a string, not the name of a symbol.  Note that the
+     operands have been swapped, so binary.lhs is second (default)
+     operand, binary.rhs is first operand.  */
   if (expld.result.valid_p && tree->type.node_code == SEGMENT_START)
     {
       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) 
+      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 = NULL;
+           new_rel_from_abs (seg->value);
            break;
          }
+      return;
     }
-  else if (expld.result.valid_p)
-    {
-      etree_value_type lhs = expld.result;
 
-      exp_fold_tree_1 (tree->binary.rhs);
-      if (expld.result.valid_p)
+  lhs = expld.result;
+  exp_fold_tree_1 (tree->binary.rhs);
+  expld.result.valid_p &= lhs.valid_p;
+
+  if (expld.result.valid_p)
+    {
+      if (lhs.section != expld.result.section)
        {
-         /* 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 == '+')
-           {
-             /* 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)
+         /* 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;
            }
 
-         switch (tree->type.node_code)
+         /* If the rhs is just a number, keep the lhs section.  */
+         else if (expld.result.section == NULL)
            {
-           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"));
-             break;
-
-           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"));
-             break;
+             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;      \
-             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;
-             break;
+       case x:                                                 \
+         expld.result.value = lhs.value y expld.result.value;  \
+         if (expld.result.section == lhs.section)              \
+           expld.result.section = NULL;                        \
+         break;
 
-           case MIN_K:
-             if (lhs.value < expld.result.value)
-               expld.result.value = lhs.value;
-             break;
-
-           case ALIGN_K:
-             expld.result.value = align_n (lhs.value, expld.result.value);
-             break;
-
-           case DATA_SEGMENT_ALIGN:
-             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))
-               {
-                 bfd_vma maxpage = lhs.value;
-                 bfd_vma commonpage = expld.result.value;
+         /* 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;
 
-                 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)
-                   {
-                     expld.result.value += expld.dot & (maxpage - 1);
-                     if (expld.phase == lang_allocating_phase_enum)
-                       {
-                         expld.dataseg.phase = exp_dataseg_align_seen;
-                         expld.dataseg.min_base = align_n (expld.dot, maxpage);
-                         expld.dataseg.base = expld.result.value;
-                         expld.dataseg.pagesize = commonpage;
-                         expld.dataseg.maxpagesize = maxpage;
-                         expld.dataseg.relro_end = 0;
-                       }
-                   }
-                 else if (commonpage < maxpage)
+         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"), tree->binary.rhs);
+         if (expld.result.section == lhs.section)
+           expld.result.section = NULL;
+         break;
+
+       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"), tree->binary.rhs);
+         if (expld.result.section == lhs.section)
+           expld.result.section = NULL;
+         break;
+
+       case MAX_K:
+         if (lhs.value > expld.result.value)
+           expld.result.value = lhs.value;
+         break;
+
+       case MIN_K:
+         if (lhs.value < expld.result.value)
+           expld.result.value = lhs.value;
+         break;
+
+       case ALIGN_K:
+         expld.result.value = align_n (lhs.value, expld.result.value);
+         break;
+
+       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.result.valid_p = FALSE;
+         else
+           {
+             bfd_vma maxpage = lhs.value;
+             bfd_vma commonpage = expld.result.value;
+
+             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)
+               {
+                 if (commonpage < maxpage)
                    expld.result.value += ((expld.dot + commonpage - 1)
                                           & (maxpage - commonpage));
                }
              else
-               expld.result.valid_p = FALSE;
-             break;
-
-           case DATA_SEGMENT_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.dataseg.phase == exp_dataseg_align_seen
-                     || expld.dataseg.phase == exp_dataseg_relro_adjust)
-                   expld.dataseg.relro_end = lhs.value + expld.result.value;
-
-                 if (expld.dataseg.phase == exp_dataseg_relro_adjust
-                     && (expld.dataseg.relro_end
-                         & (expld.dataseg.pagesize - 1)))
+                 expld.result.value += expld.dot & (maxpage - 1);
+                 if (expld.dataseg.phase == exp_dataseg_done)
+                   {
+                     /* OK.  */
+                   }
+                 else if (expld.dataseg.phase == exp_dataseg_none)
                    {
-                     expld.dataseg.relro_end += expld.dataseg.pagesize - 1;
-                     expld.dataseg.relro_end &= ~(expld.dataseg.pagesize - 1);
-                     expld.result.value = (expld.dataseg.relro_end
-                                           - expld.result.value);
+                     expld.dataseg.phase = exp_dataseg_align_seen;
+                     expld.dataseg.min_base = expld.dot;
+                     expld.dataseg.base = expld.result.value;
+                     expld.dataseg.pagesize = commonpage;
+                     expld.dataseg.maxpagesize = maxpage;
+                     expld.dataseg.relro_end = 0;
                    }
                  else
-                   expld.result.value = lhs.value;
+                   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.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)
+               expld.dataseg.relro_end = lhs.value + expld.result.value;
 
-                 if (expld.dataseg.phase == exp_dataseg_align_seen)
-                   expld.dataseg.phase = exp_dataseg_relro_seen;
+             if (expld.dataseg.phase == exp_dataseg_relro_adjust
+                 && (expld.dataseg.relro_end
+                     & (expld.dataseg.pagesize - 1)))
+               {
+                 expld.dataseg.relro_end += expld.dataseg.pagesize - 1;
+                 expld.dataseg.relro_end &= ~(expld.dataseg.pagesize - 1);
+                 expld.result.value = (expld.dataseg.relro_end
+                                       - expld.result.value);
                }
              else
-               expld.result.valid_p = FALSE;
-             break;
+               expld.result.value = lhs.value;
 
-           default:
-             FAIL ();
+             if (expld.dataseg.phase == exp_dataseg_align_seen)
+               expld.dataseg.phase = exp_dataseg_relro_seen;
            }
+         else
+           expld.result.valid_p = FALSE;
+         break;
+
+       default:
+         FAIL ();
        }
-      else
-       expld.result.valid_p = FALSE;
     }
 }
 
@@ -485,35 +569,52 @@ fold_name (etree_type *tree)
          /* Don't find the real header size if only marking sections;
             The bfd function may cache incorrect data.  */
          if (expld.phase != lang_mark_phase_enum)
-           hdr_size = bfd_sizeof_headers (output_bfd, &link_info);
-         new_abs (hdr_size);
+           hdr_size = bfd_sizeof_headers (link_info.output_bfd, &link_info);
+         new_number (hdr_size);
        }
       break;
 
     case DEFINED:
-      if (expld.phase == lang_first_phase_enum)
-       lang_track_definedness (tree->name.name);
-      else
+      if (expld.phase != lang_first_phase_enum)
        {
          struct bfd_link_hash_entry *h;
-         int def_iteration
-           = lang_symbol_definition_iteration (tree->name.name);
+         struct lang_definedness_hash_entry *def;
 
-         h = bfd_wrapped_link_hash_lookup (output_bfd, &link_info,
+         h = bfd_wrapped_link_hash_lookup (link_info.output_bfd,
+                                           &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 = bfd_abs_section_ptr;
-         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 = lang_symbol_defined (tree->name.name)) == NULL
+                         || def->by_object
+                         || def->iteration == (lang_statement_iteration & 1)));
        }
       break;
 
     case NAME:
+      if (expld.assign_name != NULL
+         && strcmp (expld.assign_name, tree->name.name) == 0)
+       {
+         /* Self-assignment is only allowed for absolute symbols
+            defined in a linker script.  */
+         struct bfd_link_hash_entry *h;
+         struct lang_definedness_hash_entry *def;
+
+         h = bfd_wrapped_link_hash_lookup (link_info.output_bfd,
+                                           &link_info,
+                                           tree->name.name,
+                                           FALSE, FALSE, TRUE);
+         if (!(h != NULL
+               && (h->type == bfd_link_hash_defined
+                   || h->type == bfd_link_hash_defweak)
+               && h->u.def.section == bfd_abs_section_ptr
+               && (def = lang_symbol_defined (tree->name.name)) != NULL
+               && def->iteration == (lang_statement_iteration & 1)))
+           expld.assign_name = NULL;
+       }
       if (expld.phase == lang_first_phase_enum)
        ;
       else if (tree->name.name[0] == '.' && tree->name.name[1] == 0)
@@ -522,7 +623,8 @@ fold_name (etree_type *tree)
        {
          struct bfd_link_hash_entry *h;
 
-         h = bfd_wrapped_link_hash_lookup (output_bfd, &link_info,
+         h = bfd_wrapped_link_hash_lookup (link_info.output_bfd,
+                                           &link_info,
                                            tree->name.name,
                                            TRUE, FALSE, TRUE);
          if (!h)
@@ -530,29 +632,32 @@ 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);
-                   }
+             output_section = h->u.def.section->output_section;
+             if (output_section == NULL)
+               {
+                 if (expld.phase == lang_mark_phase_enum)
+                   new_rel (h->u.def.value, h->u.def.section);
                  else
-                   new_rel (h->u.def.value + h->u.def.section->output_offset,
-                            NULL, output_section);
+                   einfo (_("%X%S: unresolvable symbol `%s'"
+                            " referenced in expression\n"),
+                          tree, 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)
-           einfo (_("%F%S: undefined symbol `%s' referenced in expression\n"),
-                  tree->name.name);
+                  || (expld.phase != lang_mark_phase_enum
+                      && expld.assigning_to_dot))
+           einfo (_("%F%S: undefined symbol `%s'"
+                    " referenced in expression\n"),
+                  tree, tree->name.name);
          else if (h->type == bfd_link_hash_new)
            {
              h->type = bfd_link_hash_undefined;
@@ -572,11 +677,12 @@ fold_name (etree_type *tree)
          if (os == NULL)
            {
              if (expld.phase == lang_final_phase_enum)
-               einfo (_("%F%S: undefined section `%s' referenced in expression\n"),
-                      tree->name.name);
+               einfo (_("%F%S: undefined section `%s'"
+                        " referenced in expression\n"),
+                      tree, tree->name.name);
            }
          else if (os->processed_vma)
-           new_rel (0, NULL, os->bfd_section);
+           new_rel (0, os->bfd_section);
        }
       break;
 
@@ -589,8 +695,9 @@ fold_name (etree_type *tree)
          if (os == NULL)
            {
              if (expld.phase == lang_final_phase_enum)
-               einfo (_("%F%S: undefined section `%s' referenced in expression\n"),
-                      tree->name.name);
+               einfo (_("%F%S: undefined section `%s'"
+                        " referenced in expression\n"),
+                      tree, tree->name.name);
            }
          else if (os->processed_lma)
            {
@@ -599,65 +706,82 @@ fold_name (etree_type *tree)
              else
                {
                  exp_fold_tree_1 (os->load_base);
-                 make_abs ();
+                 if (expld.result.valid_p)
+                   make_abs ();
                }
            }
        }
       break;
 
     case SIZEOF:
+    case ALIGNOF:
       if (expld.phase != lang_first_phase_enum)
        {
-         int opb = bfd_octets_per_byte (output_bfd);
          lang_output_section_statement_type *os;
 
          os = lang_output_section_find (tree->name.name);
          if (os == NULL)
            {
              if (expld.phase == lang_final_phase_enum)
-               einfo (_("%F%S: undefined section `%s' referenced in expression\n"),
-                      tree->name.name);
-             new_abs (0);
+               einfo (_("%F%S: undefined section `%s'"
+                        " referenced in expression\n"),
+                      tree, tree->name.name);
+             new_number (0);
            }
-         else if (os->processed_vma)
-           new_abs (os->bfd_section->size / opb);
+         else if (os->bfd_section != NULL)
+           {
+             bfd_vma val;
+
+             if (tree->type.node_code == SIZEOF)
+               val = (os->bfd_section->size
+                      / bfd_octets_per_byte (link_info.output_bfd));
+             else
+               val = (bfd_vma)1 << os->bfd_section->alignment_power;
+
+             new_number (val);
+           }
+         else
+           new_number (0);
        }
       break;
 
     case LENGTH:
       {
         lang_memory_region_type *mem;
-        
-        mem = lang_memory_region_lookup (tree->name.name, FALSE);  
-        if (mem != NULL) 
-          new_abs (mem->length);
-        else          
+
+        mem = lang_memory_region_lookup (tree->name.name, FALSE);
+        if (mem != NULL)
+          new_number (mem->length);
+        else
           einfo (_("%F%S: undefined MEMORY region `%s'"
-                  " referenced in expression\n"), tree->name.name);
+                  " referenced in expression\n"),
+                tree, tree->name.name);
       }
       break;
 
     case ORIGIN:
-      {
-        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);
-      }
+      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_rel_from_abs (mem->origin);
+         else
+           einfo (_("%F%S: undefined MEMORY region `%s'"
+                    " referenced in expression\n"),
+                  tree, tree->name.name);
+       }
       break;
 
     case CONSTANT:
       if (strcmp (tree->name.name, "MAXPAGESIZE") == 0)
-       new_abs (bfd_emul_get_maxpagesize (default_target));
+       new_number (config.maxpagesize);
       else if (strcmp (tree->name.name, "COMMONPAGESIZE") == 0)
-       new_abs (bfd_emul_get_commonpagesize (default_target));
+       new_number (config.commonpagesize);
       else
        einfo (_("%F%S: unknown constant `%s' referenced in expression\n"),
-              tree->name.name);
+              tree, tree->name.name);
       break;
 
     default:
@@ -666,6 +790,89 @@ fold_name (etree_type *tree)
     }
 }
 
+/* Return true if TREE is '.'.  */
+static bfd_boolean
+is_dot (const etree_type *tree)
+{
+  return (tree->type.node_class == etree_name
+         && tree->type.node_code == NAME
+         && tree->name.name[0] == '.'
+         && tree->name.name[1] == 0);
+}
+
+/* Return true if TREE is a constant equal to VAL.  */
+
+static bfd_boolean
+is_value (const etree_type *tree, bfd_vma val)
+{
+  return (tree->type.node_class == etree_value
+         && tree->value.value == val);
+}
+
+/* Return true if TREE is an absolute symbol equal to VAL defined in
+   a linker script.  */
+
+static bfd_boolean
+is_sym_value (const etree_type *tree, bfd_vma val)
+{
+  struct bfd_link_hash_entry *h;
+  struct lang_definedness_hash_entry *def;
+
+  return (tree->type.node_class == etree_name
+         && tree->type.node_code == NAME
+         && (def = lang_symbol_defined (tree->name.name)) != NULL
+         && def->by_script
+         && def->iteration == (lang_statement_iteration & 1)
+         && (h = bfd_wrapped_link_hash_lookup (link_info.output_bfd,
+                                               &link_info,
+                                               tree->name.name,
+                                               FALSE, FALSE, TRUE)) != NULL
+         && h->type == bfd_link_hash_defined
+         && h->u.def.section == bfd_abs_section_ptr
+         && h->u.def.value == val);
+}
+
+/* Return true if TREE is ". != 0".  */
+
+static bfd_boolean
+is_dot_ne_0 (const etree_type *tree)
+{
+  return (tree->type.node_class == etree_binary
+         && tree->type.node_code == NE
+         && is_dot (tree->binary.lhs)
+         && is_value (tree->binary.rhs, 0));
+}
+
+/* Return true if TREE is ". = . + 0" or ". = . + sym" where sym is an
+   absolute constant with value 0 defined in a linker script.  */
+
+static bfd_boolean
+is_dot_plus_0 (const etree_type *tree)
+{
+  return (tree->type.node_class == etree_binary
+         && tree->type.node_code == '+'
+         && is_dot (tree->binary.lhs)
+         && (is_value (tree->binary.rhs, 0)
+             || is_sym_value (tree->binary.rhs, 0)));
+}
+
+/* Return true if TREE is "ALIGN (. != 0 ? some_expression : 1)".  */
+
+static bfd_boolean
+is_align_conditional (const etree_type *tree)
+{
+  if (tree->type.node_class == etree_unary
+      && tree->type.node_code == ALIGN_K)
+    {
+      tree = tree->unary.child;
+      return (tree->type.node_class == etree_trinary
+             && is_dot_ne_0 (tree->trinary.cond)
+             && is_value (tree->trinary.rhs, 1));
+    }
+  return 0;
+}
+
 static void
 exp_fold_tree_1 (etree_type *tree)
 {
@@ -678,7 +885,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:
@@ -686,7 +898,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));
@@ -715,36 +927,59 @@ 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"));
-         if (expld.phase == lang_mark_phase_enum
-             || expld.phase == lang_allocating_phase_enum
-             || (expld.phase == lang_final_phase_enum
-                 && expld.section == bfd_abs_section_ptr))
+           einfo (_("%F%S can not PROVIDE assignment to"
+                    " location counter\n"), tree);
+         if (expld.phase != lang_first_phase_enum)
            {
              /* Notify the folder that this is an assignment to dot.  */
              expld.assigning_to_dot = TRUE;
              exp_fold_tree_1 (tree->assign.src);
              expld.assigning_to_dot = FALSE;
 
+             /* If we are assigning to dot inside an output section
+                arrange to keep the section, except for certain
+                expressions that evaluate to zero.  We ignore . = 0,
+                . = . + 0, and . = ALIGN (. != 0 ? expr : 1).  */
+             if (expld.phase == lang_mark_phase_enum
+                 && expld.section != bfd_abs_section_ptr
+                 && !(expld.result.valid_p
+                      && expld.result.value == 0
+                      && (is_value (tree->assign.src, 0)
+                          || is_sym_value (tree->assign.src, 0)
+                          || is_dot_plus_0 (tree->assign.src)
+                          || is_align_conditional (tree->assign.src))))
+               expld.section->flags |= SEC_KEEP;
+
              if (!expld.result.valid_p)
                {
                  if (expld.phase != lang_mark_phase_enum)
-                   einfo (_("%F%S invalid assignment to location counter\n"));
+                   einfo (_("%F%S invalid assignment to"
+                            " location counter\n"), tree);
                }
              else if (expld.dotp == NULL)
                einfo (_("%F%S assignment to location counter"
-                        " invalid outside of SECTION\n"));
-             else
+                        " invalid outside of SECTIONS\n"), tree);
+
+             /* After allocation, assignment to dot should not be
+                done inside an output section since allocation adds a
+                padding statement that effectively duplicates the
+                assignment.  */
+             else if (expld.phase <= lang_allocating_phase_enum
+                      || expld.section == bfd_abs_section_ptr)
                {
                  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"
-                            " (from %V to %V)\n"), expld.dot, nextdot);
+                            " (from %V to %V)\n"),
+                          tree, expld.dot, nextdot);
                  else
                    {
                      expld.dot = nextdot;
@@ -766,7 +1001,10 @@ exp_fold_tree_1 (etree_type *tree)
              if (h == NULL
                  || (h->type != bfd_link_hash_new
                      && h->type != bfd_link_hash_undefined
-                     && h->type != bfd_link_hash_common))
+                     && h->type != bfd_link_hash_common
+                     && !(h->type == bfd_link_hash_defined
+                          && (h->u.def.section->flags
+                              & SEC_LINKER_CREATED) != 0)))
                {
                  /* Do nothing.  The symbol was never referenced, or was
                     defined by some object.  */
@@ -774,8 +1012,23 @@ exp_fold_tree_1 (etree_type *tree)
                }
            }
 
+         expld.assign_name = tree->assign.dst;
          exp_fold_tree_1 (tree->assign.src);
-         if (expld.result.valid_p)
+         /* expld.assign_name remaining equal to tree->assign.dst
+            below indicates the evaluation of tree->assign.src did
+            not use the value of tree->assign.dst.  We don't allow
+            self assignment until the final phase for two reasons:
+            1) Expressions are evaluated multiple times.  With
+            relaxation, the number of times may vary.
+            2) Section relative symbol values cannot be correctly
+            converted to absolute values, as is required by many
+            expressions, until final section sizing is complete.  */
+         if ((expld.result.valid_p
+              && (expld.phase == lang_final_phase_enum
+                  || expld.assign_name != NULL))
+             || (expld.phase <= lang_mark_phase_enum
+                 && tree->type.node_class == etree_assign
+                 && tree->assign.defsym))
            {
              if (h == NULL)
                {
@@ -791,10 +1044,36 @@ 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 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;
+
+                 hsrc = bfd_link_hash_lookup (link_info.hash,
+                                              tree->assign.src->name.name,
+                                              FALSE, FALSE, TRUE);
+                 if (hsrc)
+                   bfd_copy_link_hash_symbol_type (link_info.output_bfd, h,
+                                                   hsrc);
+               }
            }
+         else if (expld.phase == lang_final_phase_enum)
+           {
+             h = bfd_link_hash_lookup (link_info.hash, tree->assign.dst,
+                                       FALSE, FALSE, TRUE);
+             if (h != NULL
+                 && h->type == bfd_link_hash_new)
+               h->type = bfd_link_hash_undefined;
+           }
+         expld.assign_name = NULL;
        }
       break;
 
@@ -818,7 +1097,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;
@@ -830,9 +1109,10 @@ exp_fold_tree_no_dot (etree_type *tree)
 etree_type *
 exp_binop (int code, etree_type *lhs, etree_type *rhs)
 {
-  etree_type value, *new;
+  etree_type value, *new_e;
 
   value.type.node_code = code;
+  value.type.filename = lhs->type.filename;
   value.type.lineno = lhs->type.lineno;
   value.binary.lhs = lhs;
   value.binary.rhs = rhs;
@@ -841,18 +1121,19 @@ exp_binop (int code, etree_type *lhs, etree_type *rhs)
   if (expld.result.valid_p)
     return exp_intop (expld.result.value);
 
-  new = stat_alloc (sizeof (new->binary));
-  memcpy (new, &value, sizeof (new->binary));
-  return new;
+  new_e = (etree_type *) stat_alloc (sizeof (new_e->binary));
+  memcpy (new_e, &value, sizeof (new_e->binary));
+  return new_e;
 }
 
 etree_type *
 exp_trinop (int code, etree_type *cond, etree_type *lhs, etree_type *rhs)
 {
-  etree_type value, *new;
+  etree_type value, *new_e;
 
   value.type.node_code = code;
-  value.type.lineno = lhs->type.lineno;
+  value.type.filename = cond->type.filename;
+  value.type.lineno = cond->type.lineno;
   value.trinary.lhs = lhs;
   value.trinary.cond = cond;
   value.trinary.rhs = rhs;
@@ -861,17 +1142,18 @@ exp_trinop (int code, etree_type *cond, etree_type *lhs, etree_type *rhs)
   if (expld.result.valid_p)
     return exp_intop (expld.result.value);
 
-  new = stat_alloc (sizeof (new->trinary));
-  memcpy (new, &value, sizeof (new->trinary));
-  return new;
+  new_e = (etree_type *) stat_alloc (sizeof (new_e->trinary));
+  memcpy (new_e, &value, sizeof (new_e->trinary));
+  return new_e;
 }
 
 etree_type *
 exp_unop (int code, etree_type *child)
 {
-  etree_type value, *new;
+  etree_type value, *new_e;
 
   value.unary.type.node_code = code;
+  value.unary.type.filename = child->type.filename;
   value.unary.type.lineno = child->type.lineno;
   value.unary.child = child;
   value.unary.type.node_class = etree_unary;
@@ -879,17 +1161,18 @@ exp_unop (int code, etree_type *child)
   if (expld.result.valid_p)
     return exp_intop (expld.result.value);
 
-  new = stat_alloc (sizeof (new->unary));
-  memcpy (new, &value, sizeof (new->unary));
-  return new;
+  new_e = (etree_type *) stat_alloc (sizeof (new_e->unary));
+  memcpy (new_e, &value, sizeof (new_e->unary));
+  return new_e;
 }
 
 etree_type *
 exp_nameop (int code, const char *name)
 {
-  etree_type value, *new;
+  etree_type value, *new_e;
 
   value.name.type.node_code = code;
+  value.name.type.filename = ldlex_filename ();
   value.name.type.lineno = lineno;
   value.name.name = name;
   value.name.type.node_class = etree_name;
@@ -898,43 +1181,57 @@ exp_nameop (int code, const char *name)
   if (expld.result.valid_p)
     return exp_intop (expld.result.value);
 
-  new = stat_alloc (sizeof (new->name));
-  memcpy (new, &value, sizeof (new->name));
-  return new;
-
-}
+  new_e = (etree_type *) stat_alloc (sizeof (new_e->name));
+  memcpy (new_e, &value, sizeof (new_e->name));
+  return new_e;
 
-etree_type *
-exp_assop (int code, const char *dst, etree_type *src)
-{
-  etree_type *new;
-
-  new = stat_alloc (sizeof (new->assign));
-  new->type.node_code = code;
-  new->type.lineno = src->type.lineno;
-  new->type.node_class = etree_assign;
-  new->assign.src = src;
-  new->assign.dst = dst;
-  return new;
 }
 
-/* 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 defsym,
+          bfd_boolean hidden)
 {
   etree_type *n;
 
-  n = stat_alloc (sizeof (n->assign));
+  n = (etree_type *) stat_alloc (sizeof (n->assign));
   n->assign.type.node_code = '=';
+  n->assign.type.filename = src->type.filename;
   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.defsym = defsym;
   n->assign.hidden = hidden;
   return n;
 }
 
+/* Handle linker script assignments and HIDDEN.  */
+
+etree_type *
+exp_assign (const char *dst, etree_type *src, bfd_boolean hidden)
+{
+  return exp_assop (dst, src, etree_assign, FALSE, hidden);
+}
+
+/* Handle --defsym command-line option.  */
+
+etree_type *
+exp_defsym (const char *dst, etree_type *src)
+{
+  return exp_assop (dst, src, etree_assign, TRUE, FALSE);
+}
+
+/* Handle PROVIDE.  */
+
+etree_type *
+exp_provide (const char *dst, etree_type *src, bfd_boolean hidden)
+{
+  return exp_assop (dst, src, etree_provide, FALSE, hidden);
+}
+
 /* Handle ASSERT.  */
 
 etree_type *
@@ -942,8 +1239,9 @@ exp_assert (etree_type *exp, const char *message)
 {
   etree_type *n;
 
-  n = stat_alloc (sizeof (n->assert_s));
+  n = (etree_type *) stat_alloc (sizeof (n->assert_s));
   n->assert_s.type.node_code = '!';
+  n->assert_s.type.filename = exp->type.filename;
   n->assert_s.type.lineno = exp->type.lineno;
   n->assert_s.type.node_class = etree_assert;
   n->assert_s.child = exp;
@@ -954,6 +1252,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;
 
@@ -974,7 +1274,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;
@@ -982,20 +1282,49 @@ 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;
+         break;
+       case SEGMENT_START:
+         /* Special handling because arguments are in reverse order and
+            the segment name is quoted.  */
+         exp_print_token (tree->type.node_code, FALSE);
+         fputs (" (\"", config.map_file);
+         exp_print_tree (tree->binary.rhs);
+         fputs ("\", ", config.map_file);
+         exp_print_tree (tree->binary.lhs);
+         fputc (')', config.map_file);
+         return;
+       }
+      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:
@@ -1004,7 +1333,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;
 
@@ -1016,9 +1345,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);
@@ -1041,7 +1368,8 @@ exp_get_vma (etree_type *tree, bfd_vma def, char *name)
       if (expld.result.valid_p)
        return expld.result.value;
       else if (name != NULL && expld.phase != lang_mark_phase_enum)
-       einfo (_("%F%S nonconstant expression for %s\n"), name);
+       einfo (_("%F%S: nonconstant expression for %s\n"),
+              tree, name);
     }
   return def;
 }
@@ -1066,7 +1394,8 @@ exp_get_fill (etree_type *tree, fill_type *def, char *name)
   if (!expld.result.valid_p)
     {
       if (name != NULL && expld.phase != lang_mark_phase_enum)
-       einfo (_("%F%S nonconstant expression for %s\n"), name);
+       einfo (_("%F%S: nonconstant expression for %s\n"),
+              tree, name);
       return def;
     }
 
@@ -1074,7 +1403,7 @@ exp_get_fill (etree_type *tree, fill_type *def, char *name)
     {
       unsigned char *dst;
       unsigned char *s;
-      fill = xmalloc ((len + 1) / 2 + sizeof (*fill) - 1);
+      fill = (fill_type *) xmalloc ((len + 1) / 2 + sizeof (*fill) - 1);
       fill->size = (len + 1) / 2;
       dst = fill->data;
       s = (unsigned char *) expld.result.str;
@@ -1099,7 +1428,7 @@ exp_get_fill (etree_type *tree, fill_type *def, char *name)
     }
   else
     {
-      fill = xmalloc (4 + sizeof (*fill) - 1);
+      fill = (fill_type *) xmalloc (4 + sizeof (*fill) - 1);
       val = expld.result.value;
       fill->data[0] = (val >> 24) & 0xff;
       fill->data[1] = (val >> 16) & 0xff;
@@ -1119,13 +1448,14 @@ 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)
        {
-         lineno = tree->type.lineno;
-         einfo (_("%F%S: nonconstant expression for %s\n"), name);
+         einfo (_("%F%S: nonconstant expression for %s\n"),
+                tree, name);
        }
     }
   return def;