X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=ld%2Femultempl%2Fbeos.em;h=4da5eeef6d2376eb93269ce243d1dbecf9382660;hb=607b483327fdfc75fb193870b3c4e7445ce3f64d;hp=2071d8ef99e74dc1ba301188586cf6f525c10c92;hpb=b9c361e0ad33f2c841067fd4bf0959a72ad5a265;p=deliverable%2Fbinutils-gdb.git

diff --git a/ld/emultempl/beos.em b/ld/emultempl/beos.em
index 2071d8ef99..4da5eeef6d 100644
--- a/ld/emultempl/beos.em
+++ b/ld/emultempl/beos.em
@@ -7,8 +7,7 @@ else
 fi
 fragment <<EOF
 /* This file is part of GLD, the Gnu Linker.
-   Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
    This file is part of the GNU Binutils.
 
@@ -38,6 +37,7 @@ fragment <<EOF
 #include "sysdep.h"
 #include "bfd.h"
 #include "bfdlink.h"
+#include "ctf-api.h"
 #include "getopt.h"
 #include "libiberty.h"
 #include "filenames.h"
@@ -82,8 +82,8 @@ gld_${EMULATION_NAME}_before_parse (void)
 #define OPTION_MINOR_OS_VERSION		(OPTION_MINOR_IMAGE_VERSION + 1)
 #define OPTION_MINOR_SUBSYSTEM_VERSION	(OPTION_MINOR_OS_VERSION + 1)
 #define OPTION_SECTION_ALIGNMENT	(OPTION_MINOR_SUBSYSTEM_VERSION + 1)
-#define OPTION_STACK                    (OPTION_SECTION_ALIGNMENT + 1)
-#define OPTION_SUBSYSTEM                (OPTION_STACK + 1)
+#define OPTION_STACK			(OPTION_SECTION_ALIGNMENT + 1)
+#define OPTION_SUBSYSTEM		(OPTION_STACK + 1)
 #define OPTION_HEAP			(OPTION_SUBSYSTEM + 1)
 
 static void
@@ -210,7 +210,7 @@ set_pe_subsystem (void)
 	set_pe_name ("__minor_subsystem_version__",
 		     strtoul (end + 1, &end, 0));
       if (*end != '\0')
-	einfo ("%P: warning: bad version number in -subsystem option\n");
+	einfo (_("%P: warning: bad version number in -subsystem option\n"));
     }
 
   for (i = 0; v[i].name; i++)
@@ -227,7 +227,7 @@ set_pe_subsystem (void)
 	  return;
 	}
     }
-  einfo ("%P%F: invalid subsystem type %s\n", optarg);
+  einfo (_("%F%P: invalid subsystem type %s\n"), optarg);
 }
 
 
@@ -238,7 +238,7 @@ set_pe_value (char *name)
   set_pe_name (name,  strtoul (optarg, &end, 0));
   if (end == optarg)
     {
-      einfo ("%P%F: invalid hex number for PE parameter '%s'\n", optarg);
+      einfo (_("%F%P: invalid hex number for PE parameter '%s'\n"), optarg);
     }
 
   optarg = end;
@@ -255,7 +255,7 @@ set_pe_stack_heap (char *resname, char *comname)
     }
   else if (*optarg)
     {
-      einfo ("%P%F: strange hex info for PE parameter '%s'\n", optarg);
+      einfo (_("%F%P: strange hex info for PE parameter '%s'\n"), optarg);
     }
 }
 
@@ -330,7 +330,7 @@ gld_${EMULATION_NAME}_set_symbols (void)
 
   if (!init[IMAGEBASEOFF].inited)
     {
-      if (link_info.relocatable)
+      if (bfd_link_relocatable (&link_info))
 	init[IMAGEBASEOFF].value = 0;
       else if (init[DLLOFF].value)
 	init[IMAGEBASEOFF].value = BEOS_DLL_IMAGE_BASE;
@@ -339,7 +339,7 @@ gld_${EMULATION_NAME}_set_symbols (void)
     }
 
   /* Don't do any symbol assignments if this is a relocatable link.  */
-  if (link_info.relocatable)
+  if (bfd_link_relocatable (&link_info))
     return;
 
   /* Glue the assignments into the abs section */
@@ -348,7 +348,8 @@ gld_${EMULATION_NAME}_set_symbols (void)
   for (j = 0; init[j].ptr; j++)
     {
       long val = init[j].value;
-      lang_add_assignment (exp_assign (init[j].symbol, exp_intop (val)));
+      lang_add_assignment (exp_assign (init[j].symbol, exp_intop (val),
+				       FALSE));
       if (init[j].size == sizeof(short))
 	*(short *)init[j].ptr = val;
       else if (init[j].size == sizeof(int))
@@ -366,7 +367,7 @@ gld_${EMULATION_NAME}_set_symbols (void)
   if (pe.FileAlignment >
       pe.SectionAlignment)
     {
-      einfo ("%P: warning, file alignment > section alignment.\n");
+      einfo (_("%P: warning, file alignment > section alignment\n"));
     }
 }
 
@@ -380,7 +381,7 @@ gld_${EMULATION_NAME}_after_open (void)
      including an internal BFD header.  */
   if (!coff_data(link_info.output_bfd)->pe)
     {
-      einfo ("%F%P: PE operations on non PE file.\n");
+      einfo (_("%F%P: PE operations on non PE file\n"));
     }
 
   pe_data(link_info.output_bfd)->pe_opthdr = pe;
@@ -393,17 +394,19 @@ gld_${EMULATION_NAME}_after_open (void)
 static int
 sort_by_file_name (const void *a, const void *b)
 {
-  const lang_statement_union_type *const *ra = a;
-  const lang_statement_union_type *const *rb = b;
+  const lang_input_section_type *const *ra = a;
+  const lang_input_section_type *const *rb = b;
+  asection *sa = (*ra)->section;
+  asection *sb = (*rb)->section;
   int i, a_sec, b_sec;
 
-  i = filename_cmp ((*ra)->input_section.section->owner->my_archive->filename,
-		    (*rb)->input_section.section->owner->my_archive->filename);
+  i = filename_cmp (bfd_get_filename (sa->owner->my_archive),
+		    bfd_get_filename (sb->owner->my_archive));
   if (i != 0)
     return i;
 
-  i = filename_cmp ((*ra)->input_section.section->owner->filename,
-		    (*rb)->input_section.section->owner->filename);
+  i = filename_cmp (bfd_get_filename (sa->owner),
+		    bfd_get_filename (sb->owner));
   if (i != 0)
     return i;
   /* the tail idata4/5 are the only ones without relocs to an
@@ -412,55 +415,55 @@ sort_by_file_name (const void *a, const void *b)
      and HNT properly. if no reloc this one is import by ordinal
      so we have to sort by section contents */
 
-  if ( ((*ra)->input_section.section->reloc_count + (*rb)->input_section.section->reloc_count) )
+  if (sa->reloc_count + sb->reloc_count != 0)
     {
-       i =  (((*ra)->input_section.section->reloc_count >
-		 (*rb)->input_section.section->reloc_count) ? -1 : 0);
-       if ( i != 0)
-         return i;
+      i = sa->reloc_count > sb->reloc_count ? -1 : 0;
+      if (i != 0)
+	return i;
 
-        return  (((*ra)->input_section.section->reloc_count >
-		 (*rb)->input_section.section->reloc_count) ? 0 : 1);
+      return sa->reloc_count > sb->reloc_count ? 0 : 1;
     }
   else
     {
-       if ( (strcmp( (*ra)->input_section.section->name, ".idata$6") == 0) )
-          return 0; /* don't sort .idata$6 or .idata$7 FIXME dlltool eliminate .idata$7 */
-
-       if (! bfd_get_section_contents ((*ra)->input_section.section->owner,
-         (*ra)->input_section.section, &a_sec, (file_ptr) 0, (bfd_size_type)sizeof(a_sec)))
-            einfo ("%F%B: Can't read contents of section .idata: %E\n",
-                 (*ra)->input_section.section->owner);
-
-       if (! bfd_get_section_contents ((*rb)->input_section.section->owner,
-        (*rb)->input_section.section, &b_sec, (file_ptr) 0, (bfd_size_type)sizeof(b_sec) ))
-           einfo ("%F%B: Can't read contents of section .idata: %E\n",
-                (*rb)->input_section.section->owner);
-
-      i =  ((a_sec < b_sec) ? -1 : 0);
-      if ( i != 0)
-        return i;
-      return  ((a_sec < b_sec) ? 0 : 1);
-   }
-return 0;
+      /* don't sort .idata$6 or .idata$7 FIXME dlltool eliminate .idata$7 */
+      if ((strcmp (sa->name, ".idata$6") == 0))
+	return 0;
+
+      if (!bfd_get_section_contents (sa->owner, sa, &a_sec, (file_ptr) 0,
+				     (bfd_size_type) sizeof (a_sec)))
+	einfo (_("%F%P: %pB: can't read contents of section .idata: %E\n"),
+	       sa->owner);
+
+      if (!bfd_get_section_contents (sb->owner, sb, &b_sec, (file_ptr) 0,
+				     (bfd_size_type) sizeof (b_sec)))
+	einfo (_("%F%P: %pB: can't read contents of section .idata: %E\n"),
+	       sb->owner);
+
+      i = a_sec < b_sec ? -1 : 0;
+      if (i != 0)
+	return i;
+      return a_sec < b_sec ? 0 : 1;
+    }
+  return 0;
 }
 
 static int
 sort_by_section_name (const void *a, const void *b)
 {
-  const lang_statement_union_type *const *ra = a;
-  const lang_statement_union_type *const *rb = b;
+  const lang_input_section_type *const *ra = a;
+  const lang_input_section_type *const *rb = b;
+  const char *sna = (*ra)->section->name;
+  const char *snb = (*rb)->section->name;
   int i;
-  i = strcmp ((*ra)->input_section.section->name,
-	      (*rb)->input_section.section->name);
+  i = strcmp (sna, snb);
   /* This is a hack to make .stab and .stabstr last, so we don't have
      to fix strip/objcopy for .reloc sections.
      FIXME stripping images with a .rsrc section still needs to be fixed.  */
   if (i != 0)
     {
-      if ((CONST_STRNEQ ((*ra)->input_section.section->name, ".stab"))
-           && (! CONST_STRNEQ ((*rb)->input_section.section->name, ".stab")))
-         return 1;
+      if ((CONST_STRNEQ (sna, ".stab"))
+	  && (!CONST_STRNEQ (snb, ".stab")))
+	return 1;
     }
   return i;
 }
@@ -609,12 +612,13 @@ gld_${EMULATION_NAME}_before_allocation (void)
   /* Here we rummage through the found bfds to collect toc information */
   {
     LANG_FOR_EACH_INPUT_STATEMENT (is)
-      {
-	if (!ppc_process_before_allocation(is->the_bfd, &link_info))
-	  {
-	    einfo("Errors encountered processing file %s\n", is->filename);
-	  }
-      }
+    {
+      if (!ppc_process_before_allocation(is->the_bfd, &link_info))
+	{
+	  einfo (_("%P: errors encountered processing file %s\n"),
+		 is->filename);
+	}
+    }
   }
 
   /* We have seen it all. Allocate it, and carry on */
@@ -629,12 +633,13 @@ gld_${EMULATION_NAME}_before_allocation (void)
      option?  krk@cygnus.com */
   {
     LANG_FOR_EACH_INPUT_STATEMENT (is)
-      {
-	if (!arm_process_before_allocation (is->the_bfd, & link_info))
-	  {
-	    einfo ("Errors encountered processing file %s", is->filename);
-	  }
-      }
+    {
+      if (!arm_process_before_allocation (is->the_bfd, & link_info))
+	{
+	  einfo (_("%P: errors encountered processing file %s\n"),
+		 is->filename);
+	}
+    }
   }
 
   /* We have seen it all. Allocate it, and carry on */
@@ -674,13 +679,13 @@ gld${EMULATION_NAME}_place_orphan (asection *s,
      If they're marked as COMDAT sections, we don't want .text\$foo to
      end up in .text and then have .text disappear because it's marked
      link-once-discard.  */
-  if (link_info.relocatable)
+  if (bfd_link_relocatable (&link_info))
     return NULL;
 
   /* Everything from the '\$' on gets deleted so don't allow '\$' as the
      first character.  */
   if (*secname == '\$')
-    einfo ("%P%F: section %s has '\$' as first character\n", secname);
+    einfo (_("%F%P: section %s has '\$' as first character\n"), secname);
   if (strchr (secname + 1, '\$') == NULL)
     return NULL;
 
@@ -712,7 +717,7 @@ gld${EMULATION_NAME}_place_orphan (asection *s,
       }
   ps[0] = 0;
   if (l == NULL)
-    einfo ("%P%F: *(%s\$) missing from linker script\n", output_secname);
+    einfo (_("%F%P: *(%s\$) missing from linker script\n"), output_secname);
 
   /* Link the input section in and we're done for now.
      The sections still have to be sorted, but that has to wait until
@@ -734,11 +739,11 @@ fragment <<EOF
 {
   *isfile = 0;
 
-  if (link_info.relocatable && config.build_constructors)
+  if (bfd_link_relocatable (&link_info) && config.build_constructors)
     return
 EOF
 sed $sc ldscripts/${EMULATION_NAME}.xu                 >> e${EMULATION_NAME}.c
-echo '  ; else if (link_info.relocatable) return'     >> e${EMULATION_NAME}.c
+echo '  ; else if (bfd_link_relocatable (&link_info)) return' >> e${EMULATION_NAME}.c
 sed $sc ldscripts/${EMULATION_NAME}.xr                 >> e${EMULATION_NAME}.c
 echo '  ; else if (!config.text_read_only) return'     >> e${EMULATION_NAME}.c
 sed $sc ldscripts/${EMULATION_NAME}.xbn                >> e${EMULATION_NAME}.c
@@ -758,6 +763,8 @@ struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation =
   hll_default,
   after_parse_default,
   gld_${EMULATION_NAME}_after_open,
+  after_check_relocs_default,
+  before_place_orphans_default,
   after_allocation_default,
   set_output_arch_default,
   ldemul_default_target,
@@ -777,6 +784,10 @@ struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation =
   NULL,	/* list options */
   NULL,	/* recognized file */
   NULL,	/* find_potential_libraries */
-  NULL	/* new_vers_pattern */
+  NULL,	/* new_vers_pattern */
+  NULL,	/* extra_map_file_text */
+  ${LDEMUL_EMIT_CTF_EARLY-NULL},
+  ${LDEMUL_EXAMINE_STRTAB_FOR_CTF-NULL},
+  ${LDEMUL_PRINT_SYMBOL-NULL}
 };
 EOF