1 files changed, 23 insertions, 6 deletions

diff --git a/contrib/binutils/ld/ldexp.h b/contrib/binutils/ld/ldexp.h
index 36f88f8..3f3508e 100644
--- a/contrib/binutils/ld/ldexp.h
+++ b/contrib/binutils/ld/ldexp.h
@@ -1,5 +1,5 @@
 /* ldexp.h -
-   Copyright 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001
+   Copyright 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001, 2002
    Free Software Foundation, Inc.
 
    This file is part of GLD, the Gnu Linker.
@@ -25,6 +25,7 @@
 /* The result of an expression tree */
 typedef struct {
   bfd_vma value;
+  char *str;
   struct lang_output_section_statement_struct *section;
   boolean valid_p;
 } etree_value_type;
@@ -60,21 +61,21 @@ typedef union etree_union {
   } trinary;
   struct {
     node_type type;
-    CONST char *dst;
+    const char *dst;
     union etree_union *src;
   } assign;
-
   struct {
     node_type type;
     union etree_union *child;
   } unary;
   struct {
     node_type type;
-    CONST char *name;
+    const char *name;
   } name;
   struct {
     node_type type;
     bfd_vma value;
+    char *str;
   } value;
   struct {
     node_type type;
@@ -88,7 +89,20 @@ typedef union etree_union {
   } assert_s;
 } etree_type;
 
+extern struct exp_data_seg {
+  enum {
+    exp_dataseg_none,
+    exp_dataseg_align_seen,
+    exp_dataseg_end_seen,
+    exp_dataseg_adjust
+  } phase;
+  bfd_vma base, end, pagesize;
+} exp_data_seg;
+
+typedef struct _fill_type fill_type;
+
 etree_type *exp_intop PARAMS ((bfd_vma));
+etree_type *exp_bigintop PARAMS ((bfd_vma, char *));
 etree_type *exp_relop PARAMS ((asection *, bfd_vma));
 etree_value_type invalid PARAMS ((void));
 etree_value_type exp_fold_tree PARAMS ((etree_type *, struct
@@ -98,13 +112,16 @@ etree_value_type exp_fold_tree PARAMS ((etree_type *, struct
 etree_type *exp_binop PARAMS ((int, etree_type *, etree_type *));
 etree_type *exp_trinop PARAMS ((int,etree_type *, etree_type *, etree_type *));
 etree_type *exp_unop PARAMS ((int, etree_type *));
-etree_type *exp_nameop PARAMS ((int, CONST char *));
-etree_type *exp_assop PARAMS ((int, CONST char *, etree_type *));
+etree_type *exp_nameop PARAMS ((int, const char *));
+etree_type *exp_assop PARAMS ((int, const char *, etree_type *));
 etree_type *exp_provide PARAMS ((const char *, etree_type *));
 etree_type *exp_assert PARAMS ((etree_type *, const char *));
 void exp_print_tree PARAMS ((etree_type *));
 bfd_vma exp_get_vma PARAMS ((etree_type *, bfd_vma, char *, lang_phase_type));
 int exp_get_value_int PARAMS ((etree_type *, int, char *, lang_phase_type));
+fill_type *exp_get_fill PARAMS ((etree_type *, fill_type *, char *,
+				 lang_phase_type));
 bfd_vma exp_get_abs_int PARAMS ((etree_type *, int, char *, lang_phase_type));
+bfd_vma align_n PARAMS ((bfd_vma, bfd_vma));
 
 #endif