]> git.ipfire.org Git - thirdparty/binutils-gdb.git/blobdiff - ld/emultempl/elf32.em
Add -z globalaudit linker command line option to set the DF_GLOBALAUDIT flag bit...
[thirdparty/binutils-gdb.git] / ld / emultempl / elf32.em
index 312f935e6a12b1741e0c541b6901b0acbadd2d19..748f56b844f24199581c4cc6cb2377619b22c0fd 100644 (file)
@@ -12,7 +12,7 @@ fragment <<EOF
 /* This file is is generated by a shell script.  DO NOT EDIT! */
 
 /* ${ELFSIZE} bit ELF emulation code for ${EMULATION_NAME}
-   Copyright (C) 1991-2016 Free Software Foundation, Inc.
+   Copyright (C) 1991-2017 Free Software Foundation, Inc.
    Written by Steve Chamberlain <sac@cygnus.com>
    ELF support by Ian Lance Taylor <ian@cygnus.com>
 
@@ -105,6 +105,7 @@ gld${EMULATION_NAME}_before_parse (void)
   config.separate_code = `if test "x${SEPARATE_CODE}" = xyes ; then echo TRUE ; else echo FALSE ; fi`;
   `if test -n "$CALL_NOP_BYTE" ; then echo link_info.call_nop_byte = $CALL_NOP_BYTE; fi`;
   link_info.check_relocs_after_open_input = `if test "x${CHECK_RELOCS_AFTER_OPEN_INPUT}" = xyes ; then echo TRUE ; else echo FALSE ; fi`;
+  link_info.relro = DEFAULT_LD_Z_RELRO;
 }
 
 EOF
@@ -336,7 +337,11 @@ gld${EMULATION_NAME}_try_needed (struct dt_needed *needed,
 
   abfd = bfd_openr (name, bfd_get_target (link_info.output_bfd));
   if (abfd == NULL)
-    return FALSE;
+    {
+      if (verbose)
+       info_msg (_("attempt to open %s failed\n"), name);
+      return FALSE;
+    }
 
   /* Linker needs to decompress sections.  */
   abfd->flags |= BFD_DECOMPRESS;
@@ -467,7 +472,6 @@ fragment <<EOF
   return TRUE;
 }
 
-
 /* Search for a needed file in a path.  */
 
 static bfd_boolean
@@ -491,6 +495,8 @@ gld${EMULATION_NAME}_search_needed (const char *path,
   len = strlen (name);
   while (1)
     {
+      unsigned offset = 0;
+      char * var;
       char *filename, *sset;
 
       s = strchr (path, config.rpath_separator);
@@ -519,7 +525,155 @@ gld${EMULATION_NAME}_search_needed (const char *path,
        }
       strcpy (sset, name);
 
+      /* PR 20535: Support the same pseudo-environment variables that
+        are supported by ld.so.  Namely, $ORIGIN, $LIB and $PLATFORM.
+         Since there can be more than one occurrence of these tokens in
+        the path we loop until no more are found.  Since we might not
+        be able to substitute some of the tokens we maintain an offset
+        into the filename for where we should begin our scan.  */
+      while ((var = strchr (filename + offset, '$')) != NULL)
+       {
+         /* The ld.so manual page does not say, but I am going to assume that
+            these tokens are terminated by a directory separator character
+            (/) or the end of the string.  There is also an implication that
+            $ORIGIN should only be used at the start of a path, but that is
+            not enforced here.
+
+            The ld.so manual page also states that it allows ${ORIGIN},
+            ${LIB} and ${PLATFORM}, so these are supported as well.
+
+            FIXME: The code could be a lot cleverer about allocating space
+            for the processed string.  */
+         char *    end = strchr (var, '/');
+         char *    replacement = NULL;
+         char *    v = var + 1;
+         char *    freeme = NULL;
+         unsigned  flen = strlen (filename);
+
+         if (end != NULL)
+           /* Temporarily terminate the filename at the end of the token.  */
+           * end = 0;
+
+         if (*v == '{')
+           ++ v;
+         switch (*v++)
+           {
+           case 'O':
+             if (strcmp (v, "RIGIN") == 0 || strcmp (v, "RIGIN}") == 0)
+               {
+                 /* ORIGIN - replace with the full path to the directory
+                    containing the program or shared object.  */
+                 if (needed.by == NULL)
+                   {
+                     if (link_info.output_bfd == NULL)
+                       {
+                         break;
+                       }
+                     else
+                       replacement = bfd_get_filename (link_info.output_bfd);
+                   }
+                 else
+                   replacement = bfd_get_filename (needed.by);
+
+                 if (replacement)
+                   {
+                     char * slash;
+
+                     if (replacement[0] == '/')
+                       freeme = xstrdup (replacement);
+                     else
+                       {
+                         char * current_dir = getpwd ();
+
+                         freeme = xmalloc (strlen (replacement) + strlen (current_dir) + 2);
+                         sprintf (freeme, "%s/%s", current_dir, replacement);
+                       }
+
+                     replacement = freeme;
+                     if ((slash = strrchr (replacement, '/')) != NULL)
+                       * slash = 0;
+                   }
+               }
+             break;
+
+           case 'L':
+             if (strcmp (v, "IB") == 0 || strcmp (v, "IB}") == 0)
+               {
+                 /* LIB - replace with "lib" in 32-bit environments
+                    and "lib64" in 64-bit environments.  */
+
+                 /* Note - we could replace this switch statement by
+                    conditional fragments of shell script, but that is messy.
+                    Any compiler worth its salt is going to optimize away
+                    all but one of these case statements anyway.  */
+                 switch ($ELFSIZE)
+                   {
+                   case 32: replacement = "lib"; break;
+                   case 64: replacement = "lib64"; break;
+                   default:
+                     /* $ELFSIZE is not 32 or 64 ...  */
+                     abort ();
+                   }
+               }
+             break;
+
+           case 'P':
+             /* Supporting $PLATFORM in a cross-hosted environment is not
+                possible.  Supporting it in a native environment involves
+                loading the <sys/auxv.h> header file which loads the
+                system <elf.h> header file, which conflicts with the
+                "include/elf/mips.h" header file.  */
+             /* Fall through.  */
+           default:
+             break;
+           }
+
+         if (replacement)
+           {
+             char * filename2 = xmalloc (flen + strlen (replacement));
+
+             if (end)
+               {
+                 sprintf (filename2, "%.*s%s/%s",
+                          (int)(var - filename), filename,
+                          replacement, end + 1);
+                 offset = (var - filename) + 1 + strlen (replacement);
+               }
+             else
+               {
+                 sprintf (filename2, "%.*s%s",
+                          (int)(var - filename), filename,
+                          replacement);
+                 offset = var - filename + strlen (replacement);
+               }
+
+             free (filename);
+             filename = filename2;
+             /* There is no need to restore the path separator (when
+                end != NULL) as we have replaced the entire string.  */
+           }
+         else
+           {
+             if (verbose)
+               /* We only issue an "unrecognised" message in verbose mode
+                  as the $<foo> token might be a legitimate component of
+                  a path name in the target's file system.  */
+               info_msg (_("unrecognised or unsupported token '%s' in search path\n"), var);
+
+             if (end)
+               /* Restore the path separator.  */
+               * end = '/';
+
+             /* PR 20784: Make sure that we resume the scan
+                *after* the token that we could not replace.  */
+             offset = (var + 1) - filename;
+           }
+
+         free (freeme);
+       }
+
       needed.name = filename;
+
       if (gld${EMULATION_NAME}_try_needed (&needed, force))
        return TRUE;
 
@@ -537,41 +691,85 @@ EOF
 if [ "x${USE_LIBPATH}" = xyes ] ; then
   fragment <<EOF
 
-/* Add the sysroot to every entry in a path separated by
-   config.rpath_separator.  */
+/* Prefix the sysroot to absolute paths in PATH, a string containing
+   paths separated by config.rpath_separator.  If running on a DOS
+   file system, paths containing a drive spec won't have the sysroot
+   prefix added, unless the sysroot also specifies the same drive.  */
 
-static char *
+static const char *
 gld${EMULATION_NAME}_add_sysroot (const char *path)
 {
-  int len, colons, i;
-  char *ret, *p;
-
-  len = strlen (path);
-  colons = 0;
-  i = 0;
-  while (path[i])
-    if (path[i++] == config.rpath_separator)
-      colons++;
-
-  if (path[i])
-    colons++;
-
-  len = len + (colons + 1) * strlen (ld_sysroot);
-  ret = xmalloc (len + 1);
-  strcpy (ret, ld_sysroot);
-  p = ret + strlen (ret);
-  i = 0;
-  while (path[i])
-    if (path[i] == config.rpath_separator)
-      {
-       *p++ = path[i++];
-       strcpy (p, ld_sysroot);
-       p = p + strlen (p);
-      }
-    else
-      *p++ = path[i++];
+  size_t len, extra;
+  const char *p;
+  char *ret, *q;
+  int dos_drive_sysroot = HAS_DRIVE_SPEC (ld_sysroot);
+
+  len = strlen (ld_sysroot);
+  for (extra = 0, p = path; ; )
+    {
+      int dos_drive = HAS_DRIVE_SPEC (p);
+
+      if (dos_drive)
+       p += 2;
+      if (IS_DIR_SEPARATOR (*p)
+         && (!dos_drive
+             || (dos_drive_sysroot
+                 && ld_sysroot[0] == p[-2])))
+       {
+         if (dos_drive && dos_drive_sysroot)
+           extra += len - 2;
+         else
+           extra += len;
+       }
+      p = strchr (p, config.rpath_separator);
+      if (!p)
+       break;
+      ++p;
+    }
+
+  ret = xmalloc (strlen (path) + extra + 1);
+
+  for (q = ret, p = path; ; )
+    {
+      const char *end;
+      int dos_drive = HAS_DRIVE_SPEC (p);
+
+      if (dos_drive)
+       {
+         *q++ = *p++;
+         *q++ = *p++;
+       }
+      if (IS_DIR_SEPARATOR (*p)
+         && (!dos_drive
+             || (dos_drive_sysroot
+                 && ld_sysroot[0] == p[-2])))
+       {
+         if (dos_drive && dos_drive_sysroot)
+           {
+             strcpy (q, ld_sysroot + 2);
+             q += len - 2;
+           }
+         else
+           {
+             strcpy (q, ld_sysroot);
+             q += len;
+           }
+       }
+      end = strchr (p, config.rpath_separator);
+      if (end)
+       {
+         size_t n = end - p + 1;
+         strncpy (q, p, n);
+         q += n;
+         p += n;
+       }
+      else
+       {
+         strcpy (q, p);
+         break;
+       }
+    }
 
-  *p = 0;
   return ret;
 }
 
@@ -591,7 +789,7 @@ gld${EMULATION_NAME}_check_ld_elf_hints (const struct bfd_link_needed_list *l,
                                         int force)
 {
   static bfd_boolean initialized;
-  static char *ld_elf_hints;
+  static const char *ld_elf_hints;
   struct dt_needed needed;
 
   if (!initialized)
@@ -809,7 +1007,7 @@ gld${EMULATION_NAME}_check_ld_so_conf (const struct bfd_link_needed_list *l,
                                       int force)
 {
   static bfd_boolean initialized;
-  static char *ld_so_conf;
+  static const char *ld_so_conf;
   struct dt_needed needed;
 
   if (! initialized)
@@ -832,9 +1030,8 @@ gld${EMULATION_NAME}_check_ld_so_conf (const struct bfd_link_needed_list *l,
 
       if (info.path)
        {
-         char *d = gld${EMULATION_NAME}_add_sysroot (info.path);
+         ld_so_conf = gld${EMULATION_NAME}_add_sysroot (info.path);
          free (info.path);
-         ld_so_conf = d;
        }
       initialized = TRUE;
     }
@@ -1019,6 +1216,8 @@ gld${EMULATION_NAME}_after_open (void)
 {
   struct bfd_link_needed_list *needed, *l;
   struct elf_link_hash_table *htab;
+  asection *s;
+  bfd *abfd;
 
   after_open_default ();
 
@@ -1026,29 +1225,28 @@ gld${EMULATION_NAME}_after_open (void)
   if (!is_elf_hash_table (htab))
     return;
 
-  if (link_info.check_relocs_after_open_input)
+  if (command_line.out_implib_filename)
     {
-      bfd *abfd;
+      unlink_if_ordinary (command_line.out_implib_filename);
+      link_info.out_implib_bfd
+       = bfd_openw (command_line.out_implib_filename,
+                    bfd_get_target (link_info.output_bfd));
 
-      for (abfd = link_info.input_bfds;
-          abfd != (bfd *) NULL; abfd = abfd->link.next)
-       if (!_bfd_elf_link_check_relocs (abfd, &link_info))
-         {
-           /* no object output, fail return */
-           config.make_executable = FALSE;
-           return;
-         }
+      if (link_info.out_implib_bfd == NULL)
+       {
+         einfo ("%F%s: Can't open for writing: %E\n",
+                command_line.out_implib_filename);
+       }
     }
 
   if (emit_note_gnu_build_id != NULL)
     {
-      bfd *abfd;
-
       /* Find an ELF input.  */
       for (abfd = link_info.input_bfds;
           abfd != (bfd *) NULL; abfd = abfd->link.next)
        if (bfd_get_flavour (abfd) == bfd_target_elf_flavour
-           && bfd_count_sections (abfd) != 0)
+           && bfd_count_sections (abfd) != 0
+           && !((lang_input_statement_type *) abfd->usrdata)->flags.just_syms)
          break;
 
       /* PR 10555: If there are no ELF input files do not try to
@@ -1061,6 +1259,8 @@ gld${EMULATION_NAME}_after_open (void)
        }
     }
 
+  get_elf_backend_data (link_info.output_bfd)->setup_gnu_properties (&link_info);
+
   if (bfd_link_relocatable (&link_info))
     {
       if (link_info.execstack == ! link_info.noexecstack)
@@ -1079,14 +1279,17 @@ gld${EMULATION_NAME}_after_open (void)
 
   if (!link_info.traditional_format)
     {
-      bfd *abfd, *elfbfd = NULL;
+      bfd *elfbfd = NULL;
       bfd_boolean warn_eh_frame = FALSE;
-      asection *s;
       int seen_type = 0;
 
       for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
        {
          int type = 0;
+
+         if (((lang_input_statement_type *) abfd->usrdata)->flags.just_syms)
+           continue;
+
          for (s = abfd->sections; s && type < COMPACT_EH_HDR; s = s->next)
            {
              const char *name = bfd_get_section_name (abfd, s);
@@ -1125,9 +1328,6 @@ gld${EMULATION_NAME}_after_open (void)
 
          if (seen_type == COMPACT_EH_HDR)
            link_info.eh_frame_hdr_type = COMPACT_EH_HDR;
-
-         if (bfd_count_sections (abfd) == 0)
-           continue;
        }
       if (elfbfd)
        {
@@ -1227,9 +1427,9 @@ gld${EMULATION_NAME}_after_open (void)
          size_t len;
          search_dirs_type *search;
 EOF
-if [ "x${NATIVE}" = xyes ] ; then
+if [ "x${NATIVE}" = xyes ] || [ "x${USE_LIBPATH}" = xyes ] ; then
 fragment <<EOF
-         const char *lib_path;
+         const char *path;
 EOF
 fi
 if [ "x${USE_LIBPATH}" = xyes ] ; then
@@ -1246,9 +1446,15 @@ fragment <<EOF
 EOF
 if [ "x${USE_LIBPATH}" = xyes ] ; then
 fragment <<EOF
-         if (gld${EMULATION_NAME}_search_needed (command_line.rpath,
-                                                 &n, force))
-           break;
+         path = command_line.rpath;
+         if (path)
+           {
+             path = gld${EMULATION_NAME}_add_sysroot (path);
+             found = gld${EMULATION_NAME}_search_needed (path, &n, force);
+             free ((char *) path);
+             if (found)
+               break;
+           }
 EOF
 fi
 if [ "x${NATIVE}" = xyes ] ; then
@@ -1256,13 +1462,14 @@ fragment <<EOF
          if (command_line.rpath_link == NULL
              && command_line.rpath == NULL)
            {
-             lib_path = (const char *) getenv ("LD_RUN_PATH");
-             if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
-                                                     force))
+             path = (const char *) getenv ("LD_RUN_PATH");
+             if (path
+                 && gld${EMULATION_NAME}_search_needed (path, &n, force))
                break;
            }
-         lib_path = (const char *) getenv ("LD_LIBRARY_PATH");
-         if (gld${EMULATION_NAME}_search_needed (lib_path, &n, force))
+         path = (const char *) getenv ("LD_LIBRARY_PATH");
+         if (path
+             && gld${EMULATION_NAME}_search_needed (path, &n, force))
            break;
 EOF
 fi
@@ -1272,16 +1479,11 @@ fragment <<EOF
          rp = bfd_elf_get_runpath_list (link_info.output_bfd, &link_info);
          for (; !found && rp != NULL; rp = rp->next)
            {
-             const char *tmpname = rp->name;
-
-             if (IS_ABSOLUTE_PATH (tmpname))
-               tmpname = gld${EMULATION_NAME}_add_sysroot (tmpname);
+             path = gld${EMULATION_NAME}_add_sysroot (rp->name);
              found = (rp->by == l->by
-                      && gld${EMULATION_NAME}_search_needed (tmpname,
-                                                             &n,
+                      && gld${EMULATION_NAME}_search_needed (path, &n,
                                                              force));
-             if (tmpname != rp->name)
-               free ((char *) tmpname);
+             free ((char *) path);
            }
          if (found)
            break;
@@ -1337,7 +1539,7 @@ fragment <<EOF
     }
 
   if (link_info.eh_frame_hdr_type == COMPACT_EH_HDR)
-    if (bfd_elf_parse_eh_frame_entries (NULL, &link_info) == FALSE)
+    if (!bfd_elf_parse_eh_frame_entries (NULL, &link_info))
       einfo (_("%P%F: Failed to parse EH frame entries.\n"));
 }
 
@@ -1358,7 +1560,7 @@ gld${EMULATION_NAME}_find_exp_assignment (etree_type *exp)
     case etree_provide:
     case etree_provided:
       provide = TRUE;
-      /* Fall thru */
+      /* Fallthru */
     case etree_assign:
       /* We call record_link_assignment even if the symbol is defined.
         This is because if it is defined by a dynamic object, we
@@ -1596,7 +1798,6 @@ ${ELF_INTERPRETER_SET_DEFAULT}
        asection *s;
        bfd_size_type sz;
        char *msg;
-       bfd_boolean ret;
 
        if (is->flags.just_syms)
          continue;
@@ -1612,11 +1813,9 @@ ${ELF_INTERPRETER_SET_DEFAULT}
          einfo ("%F%B: Can't read contents of section .gnu.warning: %E\n",
                 is->the_bfd);
        msg[sz] = '\0';
-       ret = link_info.callbacks->warning (&link_info, msg,
-                                           (const char *) NULL,
-                                           is->the_bfd, (asection *) NULL,
-                                           (bfd_vma) 0);
-       ASSERT (ret);
+       (*link_info.callbacks->warning) (&link_info, msg,
+                                        (const char *) NULL, is->the_bfd,
+                                        (asection *) NULL, (bfd_vma) 0);
        free (msg);
 
        /* Clobber the section size, so that we don't waste space
@@ -1809,6 +2008,29 @@ output_rel_find (asection *sec, int isdyn)
   return last;
 }
 
+/* Return whether IN is suitable to be part of OUT.  */
+
+static bfd_boolean
+elf_orphan_compatible (asection *in, asection *out)
+{
+  /* Non-zero sh_info implies a section with SHF_INFO_LINK with
+     unknown semantics for the generic linker, or a SHT_REL/SHT_RELA
+     section where sh_info specifies a symbol table.  (We won't see
+     SHT_GROUP, SHT_SYMTAB or SHT_DYNSYM sections here.)  We clearly
+     can't merge SHT_REL/SHT_RELA using differing symbol tables, and
+     shouldn't merge sections with differing unknown semantics.  */
+  if (elf_section_data (out)->this_hdr.sh_info
+      != elf_section_data (in)->this_hdr.sh_info)
+    return FALSE;
+  /* We can't merge two sections with differing SHF_EXCLUDE when doing
+     a relocatable link.  */
+  if (bfd_link_relocatable (&link_info)
+      && ((elf_section_flags (out) ^ elf_section_flags (in)) & SHF_EXCLUDE) != 0)
+    return FALSE;
+  return _bfd_elf_match_sections_by_type (link_info.output_bfd, out,
+                                         in->owner, in);
+}
+
 /* Place an orphan section.  We use this to put random SHF_ALLOC
    sections in the right segment.  */
 
@@ -1865,8 +2087,9 @@ gld${EMULATION_NAME}_place_orphan (asection *s,
   lang_output_section_statement_type *os;
   lang_output_section_statement_type *match_by_name = NULL;
   int isdyn = 0;
-  int iself = s->owner->xvec->flavour == bfd_target_elf_flavour;
-  unsigned int sh_type = iself ? elf_section_type (s) : SHT_NULL;
+  int elfinput = s->owner->xvec->flavour == bfd_target_elf_flavour;
+  int elfoutput = link_info.output_bfd->xvec->flavour == bfd_target_elf_flavour;
+  unsigned int sh_type = elfinput ? elf_section_type (s) : SHT_NULL;
   flagword flags;
   asection *nexts;
 
@@ -1874,7 +2097,7 @@ gld${EMULATION_NAME}_place_orphan (asection *s,
       && link_info.combreloc
       && (s->flags & SEC_ALLOC))
     {
-      if (iself)
+      if (elfinput)
        switch (sh_type)
          {
          case SHT_RELA:
@@ -1895,7 +2118,53 @@ gld${EMULATION_NAME}_place_orphan (asection *s,
        }
     }
 
-  /* Look through the script to see where to place this section.  */
+  if (!bfd_link_relocatable (&link_info)
+      && elfinput
+      && elfoutput
+      && (s->flags & SEC_ALLOC) != 0
+      && (elf_section_flags (s) & SHF_GNU_MBIND) != 0)
+    {
+      /* Find the output mbind section with the same type, attributes
+        and sh_info field.  */
+      for (os = &lang_output_section_statement.head->output_section_statement;
+          os != NULL;
+          os = os->next)
+       if (os->bfd_section != NULL
+           && !bfd_is_abs_section (os->bfd_section)
+           && (elf_section_flags (os->bfd_section) & SHF_GNU_MBIND) != 0
+           && ((s->flags & (SEC_ALLOC
+                            | SEC_LOAD
+                            | SEC_HAS_CONTENTS
+                            | SEC_READONLY
+                            | SEC_CODE))
+               == (os->bfd_section->flags & (SEC_ALLOC
+                                             | SEC_LOAD
+                                             | SEC_HAS_CONTENTS
+                                             | SEC_READONLY
+                                             | SEC_CODE)))
+           && (elf_section_data (os->bfd_section)->this_hdr.sh_info
+               == elf_section_data (s)->this_hdr.sh_info))
+           {
+             lang_add_section (&os->children, s, NULL, os);
+             return os;
+           }
+
+      /* Create the output mbind section with the ".mbind." prefix
+        in section name.  */
+      if ((s->flags & (SEC_LOAD | SEC_HAS_CONTENTS)) == 0)
+       secname = ".mbind.bss";
+      else if ((s->flags & SEC_READONLY) == 0)
+       secname = ".mbind.data";
+      else if ((s->flags & SEC_CODE) == 0)
+       secname = ".mbind.rodata";
+      else
+       secname = ".mbind.text";
+    }
+
+  /* Look through the script to see where to place this section.  The
+     script includes entries added by previous lang_insert_orphan
+     calls, so this loop puts multiple compatible orphans of the same
+     name into a single output section.  */
   if (constraint == 0)
     for (os = lang_output_section_find (secname);
         os != NULL;
@@ -1905,19 +2174,19 @@ gld${EMULATION_NAME}_place_orphan (asection *s,
           lang_insert_orphan to create a new output section.  */
        constraint = SPECIAL;
 
+       /* Check to see if we already have an output section statement
+          with this name, and its bfd section has compatible flags.
+          If the section already exists but does not have any flags
+          set, then it has been created by the linker, possibly as a
+          result of a --section-start command line switch.  */
        if (os->bfd_section != NULL
            && (os->bfd_section->flags == 0
                || (((s->flags ^ os->bfd_section->flags)
                     & (SEC_LOAD | SEC_ALLOC)) == 0
-                   && _bfd_elf_match_sections_by_type (link_info.output_bfd,
-                                                       os->bfd_section,
-                                                       s->owner, s))))
+                   && (!elfinput
+                       || !elfoutput
+                       || elf_orphan_compatible (s, os->bfd_section)))))
          {
-           /* We already have an output section statement with this
-              name, and its bfd section has compatible flags.
-              If the section already exists but does not have any flags
-              set, then it has been created by the linker, probably as a
-              result of a --section-start command line switch.  */
            lang_add_section (&os->children, s, NULL, os);
            return os;
          }
@@ -1993,8 +2262,8 @@ gld${EMULATION_NAME}_place_orphan (asection *s,
   else if ((flags & SEC_ALLOC) == 0)
     ;
   else if ((flags & SEC_LOAD) != 0
-          && ((iself && sh_type == SHT_NOTE)
-              || (!iself && CONST_STRNEQ (secname, ".note"))))
+          && ((elfinput && sh_type == SHT_NOTE)
+              || (!elfinput && CONST_STRNEQ (secname, ".note"))))
     place = &hold[orphan_interp];
   else if ((flags & (SEC_LOAD | SEC_HAS_CONTENTS | SEC_THREAD_LOCAL)) == 0)
     place = &hold[orphan_bss];
@@ -2004,8 +2273,8 @@ gld${EMULATION_NAME}_place_orphan (asection *s,
     place = &hold[orphan_tdata];
   else if ((flags & SEC_READONLY) == 0)
     place = &hold[orphan_data];
-  else if (((iself && (sh_type == SHT_RELA || sh_type == SHT_REL))
-           || (!iself && CONST_STRNEQ (secname, ".rel")))
+  else if (((elfinput && (sh_type == SHT_RELA || sh_type == SHT_REL))
+           || (!elfinput && CONST_STRNEQ (secname, ".rel")))
           && (flags & SEC_LOAD) != 0)
     place = &hold[orphan_rel];
   else if ((flags & SEC_CODE) == 0)
@@ -2201,15 +2470,19 @@ fi
 
 fragment <<EOF
 
-#define OPTION_DISABLE_NEW_DTAGS       (400)
-#define OPTION_ENABLE_NEW_DTAGS                (OPTION_DISABLE_NEW_DTAGS + 1)
-#define OPTION_GROUP                   (OPTION_ENABLE_NEW_DTAGS + 1)
-#define OPTION_EH_FRAME_HDR            (OPTION_GROUP + 1)
-#define OPTION_EXCLUDE_LIBS            (OPTION_EH_FRAME_HDR + 1)
-#define OPTION_HASH_STYLE              (OPTION_EXCLUDE_LIBS + 1)
-#define OPTION_BUILD_ID                        (OPTION_HASH_STYLE + 1)
-#define OPTION_AUDIT                   (OPTION_BUILD_ID + 1)
-#define OPTION_COMPRESS_DEBUG          (OPTION_AUDIT + 1)
+enum elf_options
+{
+  OPTION_DISABLE_NEW_DTAGS = 400,
+  OPTION_ENABLE_NEW_DTAGS,
+  OPTION_GROUP,
+  OPTION_EH_FRAME_HDR,
+  OPTION_NO_EH_FRAME_HDR,
+  OPTION_EXCLUDE_LIBS,
+  OPTION_HASH_STYLE,
+  OPTION_BUILD_ID,
+  OPTION_AUDIT,
+  OPTION_COMPRESS_DEBUG
+};
 
 static void
 gld${EMULATION_NAME}_add_options
@@ -2245,6 +2518,7 @@ fragment <<EOF
     {"disable-new-dtags", no_argument, NULL, OPTION_DISABLE_NEW_DTAGS},
     {"enable-new-dtags", no_argument, NULL, OPTION_ENABLE_NEW_DTAGS},
     {"eh-frame-hdr", no_argument, NULL, OPTION_EH_FRAME_HDR},
+    {"no-eh-frame-hdr", no_argument, NULL, OPTION_NO_EH_FRAME_HDR},
     {"exclude-libs", required_argument, NULL, OPTION_EXCLUDE_LIBS},
     {"hash-style", required_argument, NULL, OPTION_HASH_STYLE},
 EOF
@@ -2324,6 +2598,10 @@ fragment <<EOF
       link_info.eh_frame_hdr_type = DWARF2_EH_HDR;
       break;
 
+    case OPTION_NO_EH_FRAME_HDR:
+      link_info.eh_frame_hdr_type = 0;
+      break;
+
     case OPTION_GROUP:
       link_info.flags_1 |= (bfd_vma) DF_1_GROUP;
       /* Groups must be self-contained.  */
@@ -2398,6 +2676,10 @@ fragment <<EOF
          link_info.noexecstack = TRUE;
          link_info.execstack = FALSE;
        }
+      else if (strcmp (optarg, "globalaudit") == 0)
+       {
+         link_info.flags_1 |= DF_1_GLOBAUDIT;
+       }
 EOF
 
 if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then