Add readahead cache to gdb's vFile:pread

[binutils-gdb.git] / ld / ldctor.c

diff --git a/ld/ldctor.c b/ld/ldctor.c
index 1a86eb38e893412a1cd18097c058fc59254942a6..dc3124062128b7f808781541476712de66daf0ac 100644 (file)
--- a/ld/ldctor.c
+++ b/ld/ldctor.c
@@ -1,7 +1,5 @@
 /* ldctor.c -- constructor support routines
-   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011
-   Free Software Foundation, Inc.
+   Copyright (C) 1991-2015 Free Software Foundation, Inc.
    By Steve Chamberlain <sac@cygnus.com>
 
    This file is part of the GNU Binutils.
@@ -276,7 +274,7 @@ ldctor_build_sets (void)
       howto = bfd_reloc_type_lookup (link_info.output_bfd, p->reloc);
       if (howto == NULL)
        {
-         if (link_info.relocatable)
+         if (bfd_link_relocatable (&link_info))
            {
              einfo (_("%P%X: %s does not support reloc %s for set %s\n"),
                     bfd_get_target (link_info.output_bfd),
@@ -321,9 +319,11 @@ ldctor_build_sets (void)
 
       lang_add_assignment (exp_assign (".",
                                       exp_unop (ALIGN_K,
-                                                exp_intop (reloc_size))));
+                                                exp_intop (reloc_size)),
+                                      FALSE));
       lang_add_assignment (exp_assign (p->h->root.string,
-                                      exp_nameop (NAME, ".")));
+                                      exp_nameop (NAME, "."),
+                                      FALSE));
       lang_add_data (size, exp_intop (p->count));
 
       for (e = p->elements; e != NULL; e = e->next)
@@ -362,7 +362,7 @@ ldctor_build_sets (void)
          if (! bfd_is_abs_section (e->section))
            e->section->flags |= SEC_KEEP;
 
-         if (link_info.relocatable)
+         if (bfd_link_relocatable (&link_info))
            lang_add_reloc (p->reloc, howto, e->section, e->name,
                            exp_intop (e->value));
          else