WebSVN – Kolibri OS – Diff – /contrib/toolchain/binutils/binutils/objcopy.c

 /* objcopy.c -- copy object file from input to output, optionally massaging it.
-   Copyright 1991-2013 Free Software Foundation, Inc.
+   Copyright (C) 1991-2015 Free Software Foundation, Inc.
    This file is part of GNU Binutils.
   char *source;
   char *target;
   struct redefine_node *next;
 };
+struct addsym_node
+{
+  struct addsym_node *next;
+  char *    symdef;
+  long      symval;
+  flagword  flags;
+  char *    section;
+  char *    othersym;
+};
 typedef struct section_rename
+{
   const char *            old_name;
   const char *            new_name;
 };
 /* List of sections to add to the output BFD.  */
+static struct section_add *add_sections;
+/* List of sections to update in the output BFD.  */
+static struct section_add *update_sections;
+/* List of sections to dump from the output BFD.  */
-static struct section_add *add_sections;
+static struct section_add *dump_sections;
 /* If non-NULL the argument to --add-gnu-debuglink.
    This should be the filename to store in the .gnu_debuglink section.  */
 static const char * gnu_debuglink_filename = NULL;
 /* Whether to convert debugging information.  */
 static bfd_boolean convert_debugging = FALSE;
 /* Whether to compress/decompress DWARF debug sections.  */
+static enum
+{
+  nothing = 0,
-static enum
+  compress = 1 << 0,
   compress_zlib = compress | 1 << 1,
-  nothing,
+  compress_gnu_zlib = compress | 1 << 2,
-  compress,
+  compress_gabi_zlib = compress | 1 << 3,
 static htab_t localize_specific_htab = NULL;
 static htab_t globalize_specific_htab = NULL;
 static htab_t keepglobal_specific_htab = NULL;
 static htab_t weaken_specific_htab = NULL;
 static struct redefine_node *redefine_sym_list = NULL;
+static struct addsym_node *add_sym_list = NULL, **add_sym_tail = &add_sym_list;
+static int add_symbols = 0;
 /* If this is TRUE, we weaken global symbols (set BSF_WEAK).  */
 static bfd_boolean weaken = FALSE;
 /* 150 isn't special; it's just an arbitrary non-ASCII char value.  */
 enum command_line_switch
+{
+    OPTION_ADD_SECTION=150,
+  OPTION_ADD_GNU_DEBUGLINK,
+  OPTION_ADD_SYMBOL,
-    OPTION_ADD_SECTION=150,
+  OPTION_ALT_MACH_CODE,
     OPTION_CHANGE_ADDRESSES,
-    OPTION_CHANGE_LEADING_CHAR,
-    OPTION_CHANGE_START,
+    OPTION_CHANGE_LEADING_CHAR,
     OPTION_CHANGE_SECTION_ADDRESS,
     OPTION_CHANGE_SECTION_LMA,
+    OPTION_CHANGE_SECTION_VMA,
-    OPTION_CHANGE_SECTION_VMA,
+  OPTION_CHANGE_START,
     OPTION_CHANGE_WARNINGS,
     OPTION_COMPRESS_DEBUG_SECTIONS,
     OPTION_DEBUGGING,
+    OPTION_DECOMPRESS_DEBUG_SECTIONS,
+  OPTION_DUMP_SECTION,
+  OPTION_EXTRACT_DWO,
+  OPTION_EXTRACT_SYMBOL,
+  OPTION_FILE_ALIGNMENT,
-    OPTION_DECOMPRESS_DEBUG_SECTIONS,
+  OPTION_FORMATS_INFO,
     OPTION_GAP_FILL,
-    OPTION_NO_CHANGE_WARNINGS,
-    OPTION_PAD_TO,
-    OPTION_REMOVE_LEADING_CHAR,
+  OPTION_GLOBALIZE_SYMBOL,
-    OPTION_SET_SECTION_FLAGS,
-    OPTION_SET_START,
-    OPTION_STRIP_UNNEEDED,
+  OPTION_GLOBALIZE_SYMBOLS,
-    OPTION_WEAKEN,
-    OPTION_REDEFINE_SYM,
+  OPTION_HEAP,
-    OPTION_REDEFINE_SYMS,
+  OPTION_IMAGE_BASE,
-    OPTION_SREC_LEN,
+  OPTION_IMPURE,
-    OPTION_SREC_FORCES3,
+  OPTION_INTERLEAVE_WIDTH,
-    OPTION_STRIP_SYMBOLS,
-    OPTION_STRIP_UNNEEDED_SYMBOL,
+  OPTION_KEEPGLOBAL_SYMBOLS,
-    OPTION_STRIP_UNNEEDED_SYMBOLS,
+  OPTION_KEEP_FILE_SYMBOLS,
-    OPTION_KEEP_SYMBOLS,
+  OPTION_KEEP_SYMBOLS,
-    OPTION_LOCALIZE_HIDDEN,
+  OPTION_LOCALIZE_HIDDEN,
-    OPTION_LOCALIZE_SYMBOLS,
+  OPTION_LOCALIZE_SYMBOLS,
-    OPTION_LONG_SECTION_NAMES,
-    OPTION_GLOBALIZE_SYMBOL,
-    OPTION_GLOBALIZE_SYMBOLS,
-    OPTION_KEEPGLOBAL_SYMBOLS,
-    OPTION_WEAKEN_SYMBOLS,
-    OPTION_RENAME_SECTION,
-    OPTION_ALT_MACH_CODE,
-    OPTION_PREFIX_SYMBOLS,
-    OPTION_PREFIX_SECTIONS,
-    OPTION_PREFIX_ALLOC_SECTIONS,
+  OPTION_LONG_SECTION_NAMES,
-    OPTION_FORMATS_INFO,
-    OPTION_ADD_GNU_DEBUGLINK,
+    OPTION_NO_CHANGE_WARNINGS,
+  OPTION_ONLY_KEEP_DEBUG,
-    OPTION_ONLY_KEEP_DEBUG,
+    OPTION_PAD_TO,
-    OPTION_KEEP_FILE_SYMBOLS,
+  OPTION_PREFIX_ALLOC_SECTIONS,
-    OPTION_READONLY_TEXT,
+  OPTION_PREFIX_SECTIONS,
-    OPTION_WRITABLE_TEXT,
+  OPTION_PREFIX_SYMBOLS,
+  OPTION_PURE,
-    OPTION_PURE,
+  OPTION_READONLY_TEXT,
-    OPTION_IMPURE,
+  OPTION_REDEFINE_SYM,
+  OPTION_REDEFINE_SYMS,
+    OPTION_REMOVE_LEADING_CHAR,
-    OPTION_EXTRACT_SYMBOL,
+  OPTION_RENAME_SECTION,
-    OPTION_REVERSE_BYTES,
-    OPTION_FILE_ALIGNMENT,
-    OPTION_HEAP,
-    OPTION_IMAGE_BASE,
+  OPTION_REVERSE_BYTES,
+  OPTION_SECTION_ALIGNMENT,
+    OPTION_SET_SECTION_FLAGS,
+    OPTION_SET_START,
+  OPTION_SREC_FORCES3,
-    OPTION_SECTION_ALIGNMENT,
+    OPTION_SREC_LEN,
+  OPTION_STACK,
-    OPTION_STACK,
+  OPTION_STRIP_DWO,
+    OPTION_STRIP_SYMBOLS,
+  OPTION_STRIP_UNNEEDED,
+    OPTION_STRIP_UNNEEDED_SYMBOL,
-    OPTION_INTERLEAVE_WIDTH,
+    OPTION_STRIP_UNNEEDED_SYMBOLS,
+  OPTION_SUBSYSTEM,
+  OPTION_UPDATE_SECTION,
-    OPTION_SUBSYSTEM,
+  OPTION_WEAKEN,
-    OPTION_EXTRACT_DWO,
+    OPTION_WEAKEN_SYMBOLS,
-    OPTION_STRIP_DWO
+  OPTION_WRITABLE_TEXT
-  };
+};
   {"input-format", required_argument, 0, 'I'}, /* Obsolete */
   {"input-target", required_argument, 0, 'I'},
   {"keep-file-symbols", no_argument, 0, OPTION_KEEP_FILE_SYMBOLS},
   {"keep-symbol", required_argument, 0, 'K'},
   {"only-keep-debug", no_argument, 0, OPTION_ONLY_KEEP_DEBUG},
+  {"output-file", required_argument, 0, 'o'},
   {"output-format", required_argument, 0, 'O'},	/* Obsolete */
   {"output-target", required_argument, 0, 'O'},
-  {"output-file", required_argument, 0, 'o'},
   {"preserve-dates", no_argument, 0, 'p'},
   {"remove-section", required_argument, 0, 'R'},
   {"strip-all", no_argument, 0, 's'},
   {"strip-debug", no_argument, 0, 'S'},
   {"strip-dwo", no_argument, 0, OPTION_STRIP_DWO},
-  {"strip-unneeded", no_argument, 0, OPTION_STRIP_UNNEEDED},
   {"strip-symbol", required_argument, 0, 'N'},
+  {"strip-unneeded", no_argument, 0, OPTION_STRIP_UNNEEDED},
   {"target", required_argument, 0, 'F'},
   {"verbose", no_argument, 0, 'v'},
   {"version", no_argument, 0, 'V'},
   {"wildcard", no_argument, 0, 'w'},
   {0, no_argument, 0, 0}
 static struct option copy_options[] =
+{
   {"add-gnu-debuglink", required_argument, 0, OPTION_ADD_GNU_DEBUGLINK},
+  {"add-section", required_argument, 0, OPTION_ADD_SECTION},
+  {"add-symbol", required_argument, 0, OPTION_ADD_SYMBOL},
-  {"add-section", required_argument, 0, OPTION_ADD_SECTION},
+  {"adjust-section-vma", required_argument, 0, OPTION_CHANGE_SECTION_ADDRESS},
   {"adjust-start", required_argument, 0, OPTION_CHANGE_START},
-  {"adjust-vma", required_argument, 0, OPTION_CHANGE_ADDRESSES},
-  {"adjust-section-vma", required_argument, 0, OPTION_CHANGE_SECTION_ADDRESS},
+  {"adjust-vma", required_argument, 0, OPTION_CHANGE_ADDRESSES},
   {"adjust-warnings", no_argument, 0, OPTION_CHANGE_WARNINGS},
   {"alt-machine-code", required_argument, 0, OPTION_ALT_MACH_CODE},
   {"binary-architecture", required_argument, 0, 'B'},
   {"byte", required_argument, 0, 'b'},
   {"change-section-address", required_argument, 0, OPTION_CHANGE_SECTION_ADDRESS},
   {"change-section-lma", required_argument, 0, OPTION_CHANGE_SECTION_LMA},
   {"change-section-vma", required_argument, 0, OPTION_CHANGE_SECTION_VMA},
   {"change-start", required_argument, 0, OPTION_CHANGE_START},
   {"change-warnings", no_argument, 0, OPTION_CHANGE_WARNINGS},
-  {"compress-debug-sections", no_argument, 0, OPTION_COMPRESS_DEBUG_SECTIONS},
+  {"compress-debug-sections", optional_argument, 0, OPTION_COMPRESS_DEBUG_SECTIONS},
   {"debugging", no_argument, 0, OPTION_DEBUGGING},
   {"decompress-debug-sections", no_argument, 0, OPTION_DECOMPRESS_DEBUG_SECTIONS},
   {"disable-deterministic-archives", no_argument, 0, 'U'},
   {"discard-all", no_argument, 0, 'x'},
   {"discard-locals", no_argument, 0, 'X'},
+  {"dump-section", required_argument, 0, OPTION_DUMP_SECTION},
   {"enable-deterministic-archives", no_argument, 0, 'D'},
   {"extract-dwo", no_argument, 0, OPTION_EXTRACT_DWO},
   {"extract-symbol", no_argument, 0, OPTION_EXTRACT_SYMBOL},
+  {"file-alignment", required_argument, 0, OPTION_FILE_ALIGNMENT},
   {"format", required_argument, 0, 'F'}, /* Obsolete */
   {"gap-fill", required_argument, 0, OPTION_GAP_FILL},
   {"globalize-symbol", required_argument, 0, OPTION_GLOBALIZE_SYMBOL},
   {"globalize-symbols", required_argument, 0, OPTION_GLOBALIZE_SYMBOLS},
+  {"heap", required_argument, 0, OPTION_HEAP},
   {"help", no_argument, 0, 'h'},
+  {"image-base", required_argument, 0 , OPTION_IMAGE_BASE},
   {"impure", no_argument, 0, OPTION_IMPURE},
   {"info", no_argument, 0, OPTION_FORMATS_INFO},
   {"input-format", required_argument, 0, 'I'}, /* Obsolete */
   {"input-target", required_argument, 0, 'I'},
   {"interleave", optional_argument, 0, 'i'},
   {"only-keep-debug", no_argument, 0, OPTION_ONLY_KEEP_DEBUG},
   {"only-section", required_argument, 0, 'j'},
   {"output-format", required_argument, 0, 'O'},	/* Obsolete */
   {"output-target", required_argument, 0, 'O'},
   {"pad-to", required_argument, 0, OPTION_PAD_TO},
-  {"prefix-symbols", required_argument, 0, OPTION_PREFIX_SYMBOLS},
-  {"prefix-sections", required_argument, 0, OPTION_PREFIX_SECTIONS},
   {"prefix-alloc-sections", required_argument, 0, OPTION_PREFIX_ALLOC_SECTIONS},
+  {"prefix-sections", required_argument, 0, OPTION_PREFIX_SECTIONS},
+  {"prefix-symbols", required_argument, 0, OPTION_PREFIX_SYMBOLS},
   {"preserve-dates", no_argument, 0, 'p'},
   {"pure", no_argument, 0, OPTION_PURE},
   {"readonly-text", no_argument, 0, OPTION_READONLY_TEXT},
   {"redefine-sym", required_argument, 0, OPTION_REDEFINE_SYM},
   {"redefine-syms", required_argument, 0, OPTION_REDEFINE_SYMS},
   {"remove-leading-char", no_argument, 0, OPTION_REMOVE_LEADING_CHAR},
   {"remove-section", required_argument, 0, 'R'},
   {"rename-section", required_argument, 0, OPTION_RENAME_SECTION},
   {"reverse-bytes", required_argument, 0, OPTION_REVERSE_BYTES},
+  {"section-alignment", required_argument, 0, OPTION_SECTION_ALIGNMENT},
   {"set-section-flags", required_argument, 0, OPTION_SET_SECTION_FLAGS},
   {"set-start", required_argument, 0, OPTION_SET_START},
-  {"srec-len", required_argument, 0, OPTION_SREC_LEN},
   {"srec-forceS3", no_argument, 0, OPTION_SREC_FORCES3},
+  {"srec-len", required_argument, 0, OPTION_SREC_LEN},
+  {"stack", required_argument, 0, OPTION_STACK},
   {"strip-all", no_argument, 0, 'S'},
   {"strip-debug", no_argument, 0, 'g'},
   {"strip-dwo", no_argument, 0, OPTION_STRIP_DWO},
+  {"strip-symbol", required_argument, 0, 'N'},
+  {"strip-symbols", required_argument, 0, OPTION_STRIP_SYMBOLS},
   {"strip-unneeded", no_argument, 0, OPTION_STRIP_UNNEEDED},
   {"strip-unneeded-symbol", required_argument, 0, OPTION_STRIP_UNNEEDED_SYMBOL},
   {"strip-unneeded-symbols", required_argument, 0, OPTION_STRIP_UNNEEDED_SYMBOLS},
-  {"strip-symbol", required_argument, 0, 'N'},
-  {"strip-symbols", required_argument, 0, OPTION_STRIP_SYMBOLS},
+  {"subsystem", required_argument, 0, OPTION_SUBSYSTEM},
   {"target", required_argument, 0, 'F'},
+  {"update-section", required_argument, 0, OPTION_UPDATE_SECTION},
   {"verbose", no_argument, 0, 'v'},
   {"version", no_argument, 0, 'V'},
   {"weaken", no_argument, 0, OPTION_WEAKEN},
   {"weaken-symbol", required_argument, 0, 'W'},
   {"weaken-symbols", required_argument, 0, OPTION_WEAKEN_SYMBOLS},
   {"wildcard", no_argument, 0, 'w'},
   {"writable-text", no_argument, 0, OPTION_WRITABLE_TEXT},
-  {"file-alignment", required_argument, 0, OPTION_FILE_ALIGNMENT},
-  {"heap", required_argument, 0, OPTION_HEAP},
-  {"image-base", required_argument, 0 , OPTION_IMAGE_BASE},
-  {"section-alignment", required_argument, 0, OPTION_SECTION_ALIGNMENT},
-  {"stack", required_argument, 0, OPTION_STACK},
-  {"subsystem", required_argument, 0, OPTION_SUBSYSTEM},
   {0, no_argument, 0, 0}
 };
 /* IMPORTS */
   -W --weaken-symbol         Force symbol  to be marked as a weak\n\
      --weaken                      Force all global symbols to be marked as weak\n\
   -w --wildcard                    Permit wildcard in symbol comparison\n\
   -x --discard-all                 Remove all non-global symbols\n\
   -X --discard-locals              Remove any compiler-generated symbols\n\
-  -i --interleave []       Only copy N out of every  bytes\n\
+  -i --interleave[=]       Only copy N out of every  bytes\n\
      --interleave-width    Set N for --interleave\n\
   -b --byte                   Select byte  in every interleaved block\n\
      --gap-fill               Fill gaps between sections with \n\
      --pad-to                Pad the last section up to address \n\
      --set-start             Set the start address to \n\
     {--[no-]change-warnings|--[no-]adjust-warnings}\n\
                                    Warn if a named section does not exist\n\
      --set-section-flags =\n\
                                    Set section 's properties to \n\
      --add-section =   Add section  found in  to output\n\
+     --update-section =\n\
+                                   Update contents of section  with\n\
+                                   contents found in \n\
+     --dump-section =  Dump the contents of section  into \n\
      --rename-section =[,] Rename section  to \n\
      --long-section-names {enable|disable|keep}\n\
                                    Handle long section names in Coff objects.\n\
      --change-leading-char         Force output format's leading character style\n\
      --remove-leading-char         Remove leading character from global symbols\n\
      --keep-symbols          -K for all symbols listed in \n\
      --localize-symbols      -L for all symbols listed in \n\
      --globalize-symbols     --globalize-symbol for all in \n\
      --keep-global-symbols   -G for all symbols listed in \n\
      --weaken-symbols        -W for all symbols listed in \n\
+     --add-symbol =[:][,]  Add a symbol\n\
      --alt-machine-code     Use the target's 'th alternative machine\n\
      --writable-text               Mark the output text as writable\n\
      --readonly-text               Make the output text write protected\n\
      --pure                        Mark the output file as demand paged\n\
      --impure                      Mark the output file as impure\n\
      --section-alignment      Set PE section alignment to \n\
      --stack [,]  Set PE reserve/commit stack to /\n\
                                    \n\
      --subsystem [:]\n\
                                    Set PE subsystem to  [& ]\n\
+     --compress-debug-sections[={none|zlib|zlib-gnu|zlib-gabi}]\n\
-     --compress-debug-sections     Compress DWARF debug sections using zlib\n\
+                                   Compress DWARF debug sections using zlib\n\
      --decompress-debug-sections   Decompress DWARF debug sections using zlib\n\
   -v --verbose                     List all object files modified\n\
   @                          Read options from \n\
   -V --version                     Display this program's version number\n\
   -h --help                        Display this output\n\
   -D --enable-deterministic-archives\n\
                                    Produce deterministic output when stripping archives\n\
   -U --disable-deterministic-archives\n\
                                    Disable -D behavior (default)\n"));
   fprintf (stream, _("\
-  -R --remove-section=       Remove section  from the output\n\
+  -R --remove-section=       Also remove section  from the output\n\
   -s --strip-all                   Remove all symbol and relocation information\n\
   -g -S -d --strip-debug           Remove all debugging symbols & sections\n\
      --strip-dwo                   Remove all DWO sections\n\
      --strip-unneeded              Remove all symbols not needed by relocations\n\
      --only-keep-debug             Strip everything but the debug information\n\
   while (s != NULL);
   return ret;
+}
+/* Parse symbol flags into a flagword, with a fatal error if the
+   string can't be parsed.  */
+static flagword
+parse_symflags (const char *s, char **other)
+{
+  flagword ret;
+  const char *snext;
+  int len;
+  ret = BSF_NO_FLAGS;
+  do
+    {
+      snext = strchr (s, ',');
+      if (snext == NULL)
+	  len = strlen (s);
+      else
+	{
+	  len = snext - s;
+	  ++snext;
+	}
+#define PARSE_FLAG(fname,fval)							  \
+      else if (len == (int) sizeof fname - 1 && strncasecmp (fname, s, len) == 0) \
+	ret |= fval
+#define PARSE_OTHER(fname,fval)								   \
+      else if (len >= (int) sizeof fname && strncasecmp (fname, s, sizeof fname - 1) == 0) \
+	fval = xstrndup (s + sizeof fname - 1, len - sizeof fname + 1)
+      if (0) ;
+      PARSE_FLAG ("local", BSF_LOCAL);
+      PARSE_FLAG ("global", BSF_GLOBAL);
+      PARSE_FLAG ("export", BSF_EXPORT);
+      PARSE_FLAG ("debug", BSF_DEBUGGING);
+      PARSE_FLAG ("function", BSF_FUNCTION);
+      PARSE_FLAG ("weak", BSF_WEAK);
+      PARSE_FLAG ("section", BSF_SECTION_SYM);
+      PARSE_FLAG ("constructor", BSF_CONSTRUCTOR);
+      PARSE_FLAG ("warning", BSF_WARNING);
+      PARSE_FLAG ("indirect", BSF_INDIRECT);
+      PARSE_FLAG ("file", BSF_FILE);
+      PARSE_FLAG ("object", BSF_OBJECT);
+      PARSE_FLAG ("synthetic", BSF_SYNTHETIC);
+      PARSE_FLAG ("indirect-function", BSF_GNU_INDIRECT_FUNCTION | BSF_FUNCTION);
+      PARSE_FLAG ("unique-object", BSF_GNU_UNIQUE | BSF_OBJECT);
+      PARSE_OTHER ("before=", *other);
+#undef PARSE_FLAG
+#undef PARSE_OTHER
+      else
+	{
+	  char *copy;
+	  copy = (char *) xmalloc (len + 1);
+	  strncpy (copy, s, len);
+	  copy[len] = '\0';
+	  non_fatal (_("unrecognized symbol flag `%s'"), copy);
+	  fatal (_("supported flags: %s"),
+		  "local, global, export, debug, function, weak, section, "
+		  "constructor, warning, indirect, file, object, synthetic, "
+		  "indirect-function, unique-object, before=");
+	}
+      s = snext;
+    }
+  while (s != NULL);
+  return ret;
+}
 /* Find and optionally add an entry in the change_sections list.
   if (*slot_name != '!')
+    {
       if (! fnmatch (slot_name, d->name, 0))
+	{
 	  d->found = TRUE;
-	  /* Stop traversal.  */
+	  /* Continue traversal, there might be a non-match rule.  */
-	  return 0;
+	  return 1;
+	}
+    }
   else
+    {
-      if (fnmatch (slot_name + 1, d->name, 0))
+      if (! fnmatch (slot_name + 1, d->name, 0))
+	{
-	  d->found = TRUE;
+	  d->found = FALSE;
 	  /* Stop traversal.  */
 	  return 0;
+	}
+    }
   int len = strlen (name);
   return strncmp (name + len - 4, ".dwo", 4) == 0;
+}
+/* Return TRUE if section SEC is in the update list.  */
+static bfd_boolean
+is_update_section (bfd *abfd ATTRIBUTE_UNUSED, asection *sec)
+{
+  if (update_sections != NULL)
+    {
+      struct section_add *pupdate;
+      for (pupdate = update_sections;
+           pupdate != NULL;
+           pupdate = pupdate->next)
+	{
+          if (strcmp (sec->name, pupdate->name) == 0)
+            return TRUE;
+        }
+    }
+  return FALSE;
+}
 /* See if a non-group section is being removed.  */
 			     SECTION_CONTEXT_COPY);
       if (p && q)
 	fatal (_("error: section %s matches both remove and copy options"),
+	       bfd_get_section_name (abfd, sec));
+      if (p && is_update_section (abfd, sec))
+        fatal (_("error: section %s matches both update and remove options"),
-	       bfd_get_section_name (abfd, sec));
+               bfd_get_section_name (abfd, sec));
       if (p != NULL)
 	return TRUE;
+    }
   return FALSE;
+}
+static bfd_boolean
+is_nondebug_keep_contents_section (bfd *ibfd, asection *isection)
+{
+  /* Always keep ELF note sections.  */
+  if (ibfd->xvec->flavour == bfd_target_elf_flavour)
+    return (elf_section_type (isection) == SHT_NOTE);
+  /* Always keep the .buildid section for PE/COFF.
+     Strictly, this should be written "always keep the section storing the debug
+     directory", but that may be the .text section for objects produced by some
+     tools, which it is not sensible to keep.  */
+  if (ibfd->xvec->flavour == bfd_target_coff_flavour)
+    return (strcmp (bfd_get_section_name (ibfd, isection), ".buildid") == 0);
+  return FALSE;
+}
 /* Return true if SYM is a hidden symbol.  */
 	return TRUE;
+      }
   return FALSE;
+}
+static bfd_boolean
+need_sym_before (struct addsym_node **node, const char *sym)
+{
+  int count;
+  struct addsym_node *ptr = add_sym_list;
+  /* 'othersym' symbols are at the front of the list.  */
+  for (count = 0; count < add_symbols; count++)
+    {
+      if (!ptr->othersym)
+	break;
+      else if (strcmp (ptr->othersym, sym) == 0)
+	{
+	  free (ptr->othersym);
+	  ptr->othersym = ""; /* Empty name is hopefully never a valid symbol name.  */
+	  *node = ptr;
+	  return TRUE;
+	}
+      ptr = ptr->next;
+    }
+  return FALSE;
+}
+static asymbol *
+create_new_symbol (struct addsym_node *ptr, bfd *obfd)
+{
+  asymbol *sym = bfd_make_empty_symbol(obfd);
+  bfd_asymbol_name(sym) = ptr->symdef;
+  sym->value = ptr->symval;
+  sym->flags = ptr->flags;
+  if (ptr->section)
+    {
+      asection *sec = bfd_get_section_by_name (obfd, ptr->section);
+      if (!sec)
+	fatal (_("Section %s not found"), ptr->section);
+      sym->section = sec;
+    }
+  else
+      sym->section = bfd_abs_section_ptr;
+  return sym;
+}
 /* Choose which symbol entries to copy; put the result in OSYMS.
    We don't copy in place, because that confuses the relocs.
    Return the number of symbols to print.  */
       bfd_boolean rem_leading_char;
       bfd_boolean add_leading_char;
+      undefined = bfd_is_und_section (bfd_get_section (sym));
+      if (add_sym_list)
+	{
+	  struct addsym_node *ptr;
+	  if (need_sym_before (&ptr, name))
+	    to[dst_count++] = create_new_symbol (ptr, obfd);
       undefined = bfd_is_und_section (bfd_get_section (sym));
       if (redefine_sym_list)
+	{
+	    }
 	  to[dst_count++] = sym;
+	}
+    }
+  if (add_sym_list)
+    {
+      struct addsym_node *ptr = add_sym_list;
+      for (src_count = 0; src_count < add_symbols; src_count++)
+	{
+	  if (ptr->othersym)
+	    {
+	      if (strcmp (ptr->othersym, ""))
+		fatal (_("'before=%s' not found"), ptr->othersym);
+	    }
+	  else
+	    to[dst_count++] = create_new_symbol (ptr, obfd);
+	  ptr = ptr->next;
+	}
+    }
   to[dst_count] = NULL;
   bfd_size_type max_gap = 0;
   long symsize;
   void *dhandle;
   enum bfd_architecture iarch;
   unsigned int imach;
+  unsigned int c, i;
   if (ibfd->xvec->byteorder != obfd->xvec->byteorder
       && ibfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN
+      && obfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN)
+    {
+      /* PR 17636: Call non-fatal so that we return to our parent who
-      && obfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN)
+	 may need to tidy temporary files.  */
+      non_fatal (_("Unable to change endianness of input file(s)"));
+      return FALSE;
     fatal (_("Unable to change endianness of input file(s)"));
   if (!bfd_set_format (obfd, bfd_get_format (ibfd)))
+    {
       bfd_nonfatal_message (NULL, obfd, NULL, NULL);
+      return FALSE;
+    }
+  if (ibfd->sections == NULL)
+    {
+      non_fatal (_("error: the input file '%s' has no sections"),
+		 bfd_get_archive_filename (ibfd));
+      return FALSE;
+    }
+  if ((do_debug_sections & compress) != 0
+      && do_debug_sections != compress
+      && ibfd->xvec->flavour != bfd_target_elf_flavour)
+    {
+      non_fatal (_("--compress-debug-sections=[zlib|zlib-gnu|zlib-gabi] is unsupported on `%s'"),
+		 bfd_get_archive_filename (ibfd));
       return FALSE;
+    }
   if (verbose)
   if (symcount < 0)
+    {
       bfd_nonfatal_message (NULL, ibfd, NULL, NULL);
       return FALSE;
+    }
+  /* PR 17512: file:  d6323821
+     If the symbol table could not be loaded do not pretend that we have
+     any symbols.  This trips us up later on when we load the relocs.  */
+  if (symcount == 0)
+    {
+      free (isympp);
+      osympp = isympp = NULL;
+    }
   /* BFD mandates that all output sections be created and sizes set before
      any output is done.  Thus, we traverse all sections multiple times.  */
+		}
+	    }
+	}
+    }
+  if (update_sections != NULL)
+    {
+      struct section_add *pupdate;
+      for (pupdate = update_sections;
+	   pupdate != NULL;
+	   pupdate = pupdate->next)
+	{
+	  asection *osec;
+	  pupdate->section = bfd_get_section_by_name (ibfd, pupdate->name);
+	  if (pupdate->section == NULL)
+	    {
+	      non_fatal (_("error: %s not found, can't be updated"), pupdate->name);
+	      return FALSE;
+	    }
+	  osec = pupdate->section->output_section;
+	  if (! bfd_set_section_size (obfd, osec, pupdate->size))
+	    {
+	      bfd_nonfatal_message (NULL, obfd, osec, NULL);
+	      return FALSE;
+	    }
+	}
+    }
+  if (dump_sections != NULL)
+    {
+      struct section_add * pdump;
+      for (pdump = dump_sections; pdump != NULL; pdump = pdump->next)
+	{
+	  asection * sec;
+	  sec = bfd_get_section_by_name (ibfd, pdump->name);
+	  if (sec == NULL)
+	    {
+	      bfd_nonfatal_message (NULL, ibfd, NULL,
+				    _("can't dump section '%s' - it does not exist"),
+				    pdump->name);
+	      continue;
+	    }
+	  if ((bfd_get_section_flags (ibfd, sec) & SEC_HAS_CONTENTS) == 0)
+	    {
+	      bfd_nonfatal_message (NULL, ibfd, sec,
+				    _("can't dump section - it has no contents"));
+	      continue;
+	    }
+	  bfd_size_type size = bfd_get_section_size (sec);
+	  if (size == 0)
+	    {
+	      bfd_nonfatal_message (NULL, ibfd, sec,
+				    _("can't dump section - it is empty"));
+	      continue;
+	    }
+	  FILE * f;
+	  f = fopen (pdump->filename, FOPEN_WB);
+	  if (f == NULL)
+	    {
+	      bfd_nonfatal_message (pdump->filename, NULL, NULL,
+				    _("could not open section dump file"));
+	      continue;
+	    }
+	  bfd_byte * contents = xmalloc (size);
+	  if (bfd_get_section_contents (ibfd, sec, contents, 0, size))
+	    {
+	      if (fwrite (contents, 1, size, f) != size)
+		{
+		  non_fatal (_("error writing section contents to %s (error: %s)"),
+			     pdump->filename,
+			     strerror (errno));
+		  return FALSE;
+		}
+	    }
+	  else
+	    bfd_nonfatal_message (NULL, ibfd, sec,
+				  _("could not retrieve section contents"));
+	  fclose (f);
+	  free (contents);
+	}
+    }
   if (gnu_debuglink_filename != NULL)
+    {
       /* PR 15125: Give a helpful warning message if
 	 the debuglink section already exists, and
 	      bfd_set_section_vma (obfd, gnu_debuglink_section, debuglink_vma);
+	    }
+	}
+    }
+  c = bfd_count_sections (obfd);
-  if (bfd_count_sections (obfd) != 0
+  if (c != 0
       && (gap_fill_set || pad_to_set))
+    {
-      asection **set;
-      unsigned int c, i;
+      asection **set;
       /* We must fill in gaps between the sections and/or we must pad
 	 the last section to a specified address.  We do this by
 	 grabbing a list of the sections, sorting them by VMA, and
-	 increasing the section sizes as required to fill the gaps.
-	 We write out the gap contents below.  */
+	 increasing the section sizes as required to fill the gaps.
 	 We write out the gap contents below.  */
       c = bfd_count_sections (obfd);
       osections = (asection **) xmalloc (c * sizeof (asection *));
       || sections_copied
       || convert_debugging
       || change_leading_char
       || remove_leading_char
       || redefine_sym_list
-      || weaken)
+      || weaken
+      || add_symbols)
+    {
       /* Mark symbols used in output relocations so that they
 	 are kept, even if they are local labels or static symbols.
 	 section.  */
       if (strip_symbols != STRIP_ALL)
 	bfd_map_over_sections (ibfd,
 			       mark_symbols_used_in_relocations,
 			       isympp);
-      osympp = (asymbol **) xmalloc ((symcount + 1) * sizeof (asymbol *));
+      osympp = (asymbol **) xmalloc ((symcount + add_symbols + 1) * sizeof (asymbol *));
       symcount = filter_symbols (ibfd, obfd, osympp, isympp, symcount);
+    }
   if (convert_debugging && dhandle != NULL)
 	      return FALSE;
+	    }
+	}
+    }
+  if (update_sections != NULL)
+    {
+      struct section_add *pupdate;
+      for (pupdate = update_sections;
+           pupdate != NULL;
+           pupdate = pupdate->next)
+	{
+	  asection *osec;
+	  osec = pupdate->section->output_section;
+	  if (! bfd_set_section_contents (obfd, osec, pupdate->contents,
+, pupdate->size))
+	    {
+	      bfd_nonfatal_message (NULL, obfd, osec, NULL);
+	      return FALSE;
+	    }
+	}
+    }
   if (gnu_debuglink_filename != NULL)
+    {
       if (! bfd_fill_in_gnu_debuglink_section
 	  (obfd, gnu_debuglink_section, gnu_debuglink_filename))
+    }
   if (gap_fill_set || pad_to_set)
+    {
-      bfd_byte *buf;
-      int c, i;
+      bfd_byte *buf;
       /* Fill in the gaps.  */
       if (max_gap > 8192)
+		}
+	    }
+	}
+    }
-  /* Do not copy backend data if --extract-symbol is passed; anything
-     that needs to look at the section contents will fail.  */
-  if (extract_symbol)
-    return TRUE;
   /* Allow the BFD backend to copy any private data it understands
      from the input BFD to the output BFD.  This is done last to
      permit the routine to look at the filtered symbol table, which is
      important for the ECOFF code at least.  */
   if (!bfd_set_format (obfd, bfd_get_format (ibfd)))
+    {
       status = 1;
       bfd_nonfatal_message (NULL, obfd, NULL, NULL);
-      return;
+      goto cleanup_and_exit;
+    }
   while (!status && this_element != NULL)
       struct stat buf;
       int stat_status = 0;
       bfd_boolean del = TRUE;
       bfd_boolean ok_object;
+      /* PR binutils/17533: Do not allow directory traversal
+	 outside of the current directory tree by archive members.  */
+      if (! is_valid_archive_path (bfd_get_filename (this_element)))
+	{
+	  non_fatal (_("illegal pathname found in archive member: %s"),
+		     bfd_get_filename (this_element));
+	  status = 1;
+	  goto cleanup_and_exit;
+	}
       /* Create an output file for this member.  */
       output_name = concat (dir, "/",
 			    bfd_get_filename (this_element), (char *) 0);
       /* If the file already exists, make another temp dir.  */
       if (stat (output_name, &buf) >= 0)
+	{
+	  output_name = make_tempdir (output_name);
-	  output_name = make_tempdir (output_name);
+	  if (output_name == NULL)
 	  if (output_name == NULL)
+	      non_fatal (_("cannot create tempdir for archive copying (error: %s)"),
+		   strerror (errno));
+	      status = 1;
-	    fatal (_("cannot create tempdir for archive copying (error: %s)"),
+	      goto cleanup_and_exit;
 		   strerror (errno));
 	  l = (struct name_list *) xmalloc (sizeof (struct name_list));
       if (output_bfd == NULL)
+	{
 	  bfd_nonfatal_message (output_name, NULL, NULL, NULL);
 	  status = 1;
-	  return;
+	  goto cleanup_and_exit;
+	}
       if (ok_object)
   filename = bfd_get_filename (obfd);
   if (!bfd_close (obfd))
+    {
       status = 1;
       bfd_nonfatal_message (filename, NULL, NULL, NULL);
-      return;
+    }
   filename = bfd_get_filename (ibfd);
   if (!bfd_close (ibfd))
+    {
       status = 1;
-      bfd_nonfatal_message (filename, NULL, NULL, NULL);
-      return;
+      bfd_nonfatal_message (filename, NULL, NULL, NULL);
+    }
  cleanup_and_exit: ;
   /* Delete all the files that we opened.  */
 #if 0
   for (l = list; l != NULL; l = l->next)
+	{
 	  bfd_close (l->obfd);
 	  unlink (l->name);
+	}
+    }
   rmdir (dir);
 #endif
+    }
   switch (do_debug_sections)
+    {
+    case compress:
+    case compress_zlib:
+    case compress_gnu_zlib:
-    case compress:
+    case compress_gabi_zlib:
+      ibfd->flags |= BFD_COMPRESS;
+      /* Don't check if input is ELF here since this information is
+	 only available after bfd_check_format_matches is called.  */
+      if (do_debug_sections != compress_gnu_zlib)
-      ibfd->flags |= BFD_COMPRESS;
+	ibfd->flags |= BFD_COMPRESS_GABI;
       break;
     case decompress:
       ibfd->flags |= BFD_DECOMPRESS;
       break;
       set_long_section_mode (obfd, ibfd, long_section_names);
       if (! copy_object (ibfd, obfd, input_arch))
 	status = 1;
+      /* PR 17512: file: 0f15796a.
+	 If the file could not be copied it may not be in a writeable
+	 state.  So use bfd_close_all_done to avoid the possibility of
 	 writing uninitialised data into the file.  */
-      if (!bfd_close (obfd))
+      if (! (status ? bfd_close_all_done (obfd) : bfd_close (obfd)))
+	{
 	  status = 1;
 	  bfd_nonfatal_message (output_filename, NULL, NULL, NULL);
 			 SECTION_CONTEXT_SET_FLAGS);
   if (p != NULL)
     flags = p->flags | (flags & (SEC_HAS_CONTENTS | SEC_RELOC));
   else if (strip_symbols == STRIP_NONDEBUG
 	   && (flags & (SEC_ALLOC | SEC_GROUP)) != 0
-	   && !(ibfd->xvec->flavour == bfd_target_elf_flavour
-		&& elf_section_type (isection) == SHT_NOTE))
+           && !is_nondebug_keep_contents_section (ibfd, isection))
+    {
       flags &= ~(SEC_HAS_CONTENTS | SEC_LOAD | SEC_GROUP);
       if (obfd->xvec->flavour == bfd_target_elf_flavour)
+	{
 	  make_nobits = TRUE;
   if (make_nobits)
     elf_section_type (osection) = SHT_NOBITS;
   size = bfd_section_size (ibfd, isection);
-  size = bfd_section_size (ibfd, isection);
+  size = bfd_convert_section_size (ibfd, isection, obfd, size);
   if (copy_byte >= 0)
     size = (size + interleave - 1) / interleave * copy_width;
   else if (extract_symbol)
+    }
   /* Copy merge entity size.  */
+  osection->entsize = isection->entsize;
+  /* Copy compress status.  */
-  osection->entsize = isection->entsize;
+  osection->compress_status = isection->compress_status;
   /* This used to be mangle_section; we do here to avoid using
      bfd_get_section_by_name since some formats allow multiple
      sections with the same name.  */
-  isection->output_section = osection;
-  isection->output_offset = 0;
-  /* Do not copy backend data if --extract-symbol is passed; anything
-     that needs to look at the section contents will fail.  */
-  if (extract_symbol)
+  isection->output_section = osection;
-    return;
+  isection->output_offset = 0;
   if ((isection->flags & SEC_GROUP) != 0)
     return TRUE;
   if (is_strip_section (ibfd, isection))
+    return TRUE;
+  if (is_update_section (ibfd, isection))
     return TRUE;
   flags = bfd_get_section_flags (ibfd, isection);
   if ((flags & SEC_GROUP) != 0)
 	  long temp_relcount = 0;
 	  long i;
 	  temp_relpp = (arelent **) xmalloc (relsize);
+	  for (i = 0; i < relcount; i++)
+	    {
+	      /* PR 17512: file: 9e907e0c.  */
-	  for (i = 0; i < relcount; i++)
+	      if (relpp[i]->sym_ptr_ptr)
 	    if (is_specified_symbol (bfd_asymbol_name (*relpp[i]->sym_ptr_ptr),
 				     keep_specific_htab))
+	      temp_relpp [temp_relcount++] = relpp [i];
 	      temp_relpp [temp_relcount++] = relpp [i];
 	  relcount = temp_relcount;
 	  free (relpp);
 	  relpp = temp_relpp;
   if (skip_section (ibfd, isection))
     return;
+  osection = isection->output_section;
+  /* The output SHF_COMPRESSED section size is different from input if
+     ELF classes of input and output aren't the same.  We can't use
      the output section size since --interleave will shrink the output
-  osection = isection->output_section;
+     section.   Size will be updated if the section is converted.   */
   size = bfd_get_section_size (isection);
   if (bfd_get_section_flags (ibfd, isection) & SEC_HAS_CONTENTS
       && bfd_get_section_flags (obfd, osection) & SEC_HAS_CONTENTS)
+    {
+      bfd_byte *memhunk = NULL;
-      bfd_byte *memhunk = NULL;
+      if (!bfd_get_full_section_contents (ibfd, isection, &memhunk)
 	  || !bfd_convert_section_contents (ibfd, isection, obfd,
-      if (!bfd_get_full_section_contents (ibfd, isection, &memhunk))
+					    &memhunk, &size))
+	{
   bfd_boolean formats_info = FALSE;
   int c;
   int i;
   char *output_file = NULL;
-  while ((c = getopt_long (argc, argv, "I:O:F:K:N:R:o:sSpdgxXHhVvw",
+  while ((c = getopt_long (argc, argv, "I:O:F:K:N:R:o:sSpdgxXHhVvwDU",
 			   strip_options, (int *) 0)) != EOF)
+    {
       switch (c)
+	{
       /* Change x86_64 to x86-64.  */
       efi[7] = '-';
+    }
+}
+/* Allocate and return a pointer to a struct section_add, initializing the
+   structure using ARG, a string in the format "sectionname=filename".
+   The returned structure will have its next pointer set to NEXT.  The
+   OPTION field is the name of the command line option currently being
+   parsed, and is only used if an error needs to be reported.  */
+static struct section_add *
+init_section_add (const char *arg,
+                  struct section_add *next,
+                  const char *option)
+{
+  struct section_add *pa;
+  const char *s;
+  s = strchr (arg, '=');
+  if (s == NULL)
+    fatal (_("bad format for %s"), option);
+  pa = (struct section_add *) xmalloc (sizeof (struct section_add));
+  pa->name = xstrndup (arg, s - arg);
+  pa->filename = s + 1;
+  pa->next = next;
+  pa->contents = NULL;
+  pa->size = 0;
+  return pa;
+}
+/* Load the file specified in PA, allocating memory to hold the file
+   contents, and store a pointer to the allocated memory in the contents
+   field of PA.  The size field of PA is also updated.  All errors call
+   FATAL.  */
+static void
+section_add_load_file (struct section_add *pa)
+{
+  size_t off, alloc;
+  FILE *f;
+  /* We don't use get_file_size so that we can do
+     --add-section .note.GNU_stack=/dev/null
+     get_file_size doesn't work on /dev/null.  */
+  f = fopen (pa->filename, FOPEN_RB);
+  if (f == NULL)
+    fatal (_("cannot open: %s: %s"),
+           pa->filename, strerror (errno));
+  off = 0;
+  alloc = 4096;
+  pa->contents = (bfd_byte *) xmalloc (alloc);
+  while (!feof (f))
+    {
+      off_t got;
+      if (off == alloc)
+        {
+          alloc <<= 1;
+          pa->contents = (bfd_byte *) xrealloc (pa->contents, alloc);
+        }
+      got = fread (pa->contents + off, 1, alloc - off, f);
+      if (ferror (f))
+        fatal (_("%s: fread failed"), pa->filename);
+      off += got;
+    }
+  pa->size = off;
+  fclose (f);
+}
 static int
 copy_main (int argc, char *argv[])
+{
   char *input_filename = NULL;
   bfd_boolean formats_info = FALSE;
   int c;
   struct stat statbuf;
   const bfd_arch_info_type *input_arch = NULL;
-  while ((c = getopt_long (argc, argv, "b:B:i:I:j:K:N:s:O:d:F:L:G:R:SpgxXHhVvW:w",
+  while ((c = getopt_long (argc, argv, "b:B:i:I:j:K:N:s:O:d:F:L:G:R:SpgxXHhVvW:wDU",
 			   copy_options, (int *) 0)) != EOF)
+    {
       switch (c)
+	{
 	case OPTION_WEAKEN:
 	  weaken = TRUE;
 	  break;
-	case OPTION_ADD_SECTION:
-	  {
+	case OPTION_ADD_SECTION:
-	    const char *s;
+          add_sections = init_section_add (optarg, add_sections,
-	    size_t off, alloc;
+                                           "--add-section");
-	    struct section_add *pa;
+          section_add_load_file (add_sections);
-	    FILE *f;
-	    s = strchr (optarg, '=');
+	  break;
+	case OPTION_UPDATE_SECTION:
+	  update_sections = init_section_add (optarg, update_sections,
+                                              "--update-section");
+	  section_add_load_file (update_sections);
-	    if (s == NULL)
+	  break;
-	      fatal (_("bad format for %s"), "--add-section");
+	case OPTION_DUMP_SECTION:
-	    pa = (struct section_add *) xmalloc (sizeof (struct section_add));
+          dump_sections = init_section_add (optarg, dump_sections,
+                                            "--dump-section");
-	    pa->name = xstrndup (optarg, s - optarg);
+	  break;
-	    pa->filename = s + 1;
+	case OPTION_ADD_SYMBOL:
+	  {
-	    /* We don't use get_file_size so that we can do
+	    char *s, *t;
-	         --add-section .note.GNU_stack=/dev/null
+	    struct addsym_node *newsym = xmalloc (sizeof *newsym);
-	       get_file_size doesn't work on /dev/null.  */
-	    f = fopen (pa->filename, FOPEN_RB);
-	    if (f == NULL)
+	    newsym->next = NULL;
-	      fatal (_("cannot open: %s: %s"),
+	    s = strchr (optarg, '=');
-		     pa->filename, strerror (errno));
+	    if (s == NULL)
+	      fatal (_("bad format for %s"), "--add-symbol");
+	    t = strchr (s + 1, ':');
-	    off = 0;
-	    alloc = 4096;
+	    newsym->symdef = xstrndup (optarg, s - optarg);
-	    pa->contents = (bfd_byte *) xmalloc (alloc);
+	    if (t)
-	    while (!feof (f))
+	      {
-	      {
+		newsym->section = xstrndup (s + 1, t - (s + 1));
+		newsym->symval = strtol (t + 1, NULL, 0);
 		off_t got;
+	    else
-		if (off == alloc)
+		  {
-		  {
+		newsym->section = NULL;
+		newsym->symval = strtol (s + 1, NULL, 0);
+		t = s;
+		  }
-		    alloc <<= 1;
+	    t = strchr (t + 1, ',');
+	    if (t)
+	      newsym->flags = parse_symflags (t+1, &newsym->othersym);
+	    else
+	      newsym->flags = BSF_GLOBAL;
 		    pa->contents = (bfd_byte *) xrealloc (pa->contents, alloc);
-		  }
+	    /* Keep 'othersym' symbols at the front of the list.  */
-		got = fread (pa->contents + off, 1, alloc - off, f);
+	    if (newsym->othersym)
-		if (ferror (f))
+	      {
-		  fatal (_("%s: fread failed"), pa->filename);
+		newsym->next = add_sym_list;
+		if (!add_sym_list)
-		off += got;
+		  add_sym_tail = &newsym->next;
 		add_sym_list = newsym;
+	      }
-	    pa->size = off;
+	    else
+	      {
 	case OPTION_CHANGE_LEADING_CHAR:
 	  change_leading_char = TRUE;
 	  break;
+	case OPTION_COMPRESS_DEBUG_SECTIONS:
+	  if (optarg)
+	    {
+	      if (strcasecmp (optarg, "none") == 0)
+		do_debug_sections = decompress;
+	      else if (strcasecmp (optarg, "zlib") == 0)
+		do_debug_sections = compress_zlib;
+	      else if (strcasecmp (optarg, "zlib-gnu") == 0)
+		do_debug_sections = compress_gnu_zlib;
+	      else if (strcasecmp (optarg, "zlib-gabi") == 0)
+		do_debug_sections = compress_gabi_zlib;
+	      else
+		fatal (_("unrecognized --compress-debug-sections type `%s'"),
+		       optarg);
+	    }
-	case OPTION_COMPRESS_DEBUG_SECTIONS:
+	  else
 	  do_debug_sections = compress;
 	  break;
       is_strip = (i >= 5 && FILENAME_CMP (program_name + i - 5, "strip") == 0);
+    }
+  create_symbol_htabs ();
+  if (argv != NULL)
-  create_symbol_htabs ();
+    bfd_set_error_program_name (argv[0]);
   if (is_strip)
     strip_main (argc, argv);

Subversion Repositories Kolibri OS

(root)/contrib/toolchain/binutils/binutils/objcopy.c – Rev 5217 → 6324