X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=ld%2Fldexp.h;h=265bb7bd655c235f8bf4500fb1d15ae2b4fc5c7c;hb=53a346d8236aec06f1d3c767716d3340fb0aa013;hp=6d98e756fdd3bb31a71b1cd2146b41b6dda05d96;hpb=01554a74b59e63cc487533b71d94a7606b76a871;p=deliverable%2Fbinutils-gdb.git

diff --git a/ld/ldexp.h b/ld/ldexp.h
index 6d98e756fd..265bb7bd65 100644
--- a/ld/ldexp.h
+++ b/ld/ldexp.h
@@ -1,6 +1,5 @@
 /* ldexp.h -
-   Copyright 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001, 2002,
-   2003, 2004, 2005, 2007, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1991-2017 Free Software Foundation, Inc.
 
    This file is part of the GNU Binutils.
 
@@ -46,6 +45,7 @@ enum node_tree_enum {
 typedef struct {
   int node_code;
   unsigned int lineno;
+  const char *filename;
   enum node_tree_enum node_class;
 } node_type;
 
@@ -66,6 +66,7 @@ typedef union etree_union {
     node_type type;
     const char *dst;
     union etree_union *src;
+    bfd_boolean defsym;
     bfd_boolean hidden;
   } assign;
   struct {
@@ -93,10 +94,19 @@ typedef union etree_union {
   } assert_s;
 } etree_type;
 
-typedef enum {
+/* Expression evaluation control.  */
+typedef enum
+{
+  /* Parsing linker script.  Will only return "valid" for expressions
+     that evaluate to a constant.  */
   lang_first_phase_enum,
+  /* Prior to section sizing.  */
   lang_mark_phase_enum,
+  /* During section sizing.  */
   lang_allocating_phase_enum,
+  /* During assignment of symbol values when relaxation in progress.  */
+  lang_assigning_phase_enum,
+  /* Final assignment of symbol values.  */
   lang_final_phase_enum
 } lang_phase_type;
 
@@ -129,6 +139,19 @@ struct ldexp_control {
   /* Principally used for diagnostics.  */
   bfd_boolean assigning_to_dot;
 
+  /* Set if the current expression used "dot", SEGMENT_START or
+     ORIGIN, but not ABSOLUTE or combined symbols in a way that forces
+     an absolute result.  Used in tracking symbols assigned from dot
+     outside of output section statements, in order to later convert
+     them from absolute.  */
+  bfd_boolean rel_from_abs;
+
+  /* If evaluating an assignment, the destination.  Cleared if an
+     etree_name NAME matches this, to signal a self-assignment.
+     Note that an etree_name DEFINED does not clear this field, nor
+     does the false branch of a trinary expression.  */
+  const char *assign_name;
+
   /* Working results.  */
   etree_value_type result;
   bfd_vma dot;
@@ -141,7 +164,7 @@ struct ldexp_control {
   struct {
     enum phase_enum phase;
 
-    bfd_vma base, min_base, relro_end, end, pagesize, maxpagesize;
+    bfd_vma base, relro_offset, relro_end, end, pagesize, maxpagesize;
 
     enum relro_enum relro;
 
@@ -189,7 +212,7 @@ etree_type *exp_unop
 etree_type *exp_nameop
   (int, const char *);
 etree_type *exp_assign
-  (const char *, etree_type *);
+  (const char *, etree_type *, bfd_boolean);
 etree_type *exp_defsym
   (const char *, etree_type *);
 etree_type *exp_provide
@@ -206,5 +229,8 @@ fill_type *exp_get_fill
   (etree_type *, fill_type *, char *);
 bfd_vma exp_get_abs_int
   (etree_type *, int, char *);
+void ldexp_init (void);
+void ldexp_finalize_syms (void);
+void ldexp_finish (void);
 
 #endif