1999-05-03 15:29:11 +08:00
|
|
|
|
/* objcopy.c -- copy object file from input to output, optionally massaging it.
|
2001-03-13 14:43:59 +08:00
|
|
|
|
Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
|
2011-05-06 22:41:56 +08:00
|
|
|
|
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
|
1999-05-03 15:29:11 +08:00
|
|
|
|
Free Software Foundation, Inc.
|
|
|
|
|
|
|
|
|
|
This file is part of GNU Binutils.
|
|
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU General Public License as published by
|
2007-07-06 00:54:46 +08:00
|
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
1999-05-03 15:29:11 +08:00
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with this program; if not, write to the Free Software
|
2005-05-08 22:17:41 +08:00
|
|
|
|
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
|
|
|
|
|
02110-1301, USA. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2007-04-26 22:47:00 +08:00
|
|
|
|
#include "sysdep.h"
|
1999-05-03 15:29:11 +08:00
|
|
|
|
#include "bfd.h"
|
|
|
|
|
#include "progress.h"
|
|
|
|
|
#include "getopt.h"
|
|
|
|
|
#include "libiberty.h"
|
2007-04-26 22:47:00 +08:00
|
|
|
|
#include "bucomm.h"
|
1999-05-03 15:29:11 +08:00
|
|
|
|
#include "budbg.h"
|
2000-05-26 21:11:57 +08:00
|
|
|
|
#include "filenames.h"
|
2003-11-12 01:50:26 +08:00
|
|
|
|
#include "fnmatch.h"
|
2004-01-13 23:41:00 +08:00
|
|
|
|
#include "elf-bfd.h"
|
1999-05-03 15:29:11 +08:00
|
|
|
|
#include <sys/stat.h>
|
2006-01-18 19:01:09 +08:00
|
|
|
|
#include "libbfd.h"
|
2009-04-14 17:47:44 +08:00
|
|
|
|
#include "coff/internal.h"
|
|
|
|
|
#include "libcoff.h"
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
bfd/
2009-04-17 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/10074
* coffcode.h (bfd_pei_p): New.
* config.bfd: Remove bfd_efi_bsdrv_ia32_vec,
bfd_efi_rtdrv_ia32_vec, bfd_efi_bsdrv_x86_64_vec,
bfd_efi_rtdrv_x86_64_vec, bfd_efi_bsdrv_ia64_vec and
bfd_efi_rtdrv_ia64_vec. Replace bfd_efi_app_ia32_vec,
bfd_efi_app_x86_64_vec and bfd_efi_app_ia64_vec with
i386pei_vec, x86_64pei_vec and bfd_pei_ia64_vec, respectively.
* configure.in: Remove bfd_efi_bsdrv_ia32_vec,
bfd_efi_rtdrv_ia32_vec, bfd_efi_bsdrv_x86_64_vec,
bfd_efi_rtdrv_x86_64_vec,
bfd_efi_bsdrv_ia64_vec and bfd_efi_rtdrv_ia64_vec. Replace
bfd_efi_ia64_vec with bfd_pei_ia64_vec.
* targets.c: Likewise.
* configure: Regenerated.
* libcoff.h: Likewise.
* Makefile.in: Likewise.
* efi-app-ia32.c: Removed.
* efi-app-x86_64.c: Likewise.
* efi-bsdrv-ia32.c: Likewise.
* efi-bsdrv-ia64.c: Likewise.
* efi-bsdrv-x86_64.c: Likewise.
* efi-rtdrv-ia32.c: Likewise.
* efi-rtdrv-ia64.c: Likewise.
* efi-rtdrv-x86_64.c: Likewise.
* efi-rtdrv-ia32.c: Likewise.
* efi-app-ia64.c: Moved to ...
* pei-ia64.c: This.
(TARGET_SYM): Set to bfd_pei_ia64_vec.
(TARGET_NAME): Set to pei-ia64.
* libpei.h (bfd_target_pei_p): Removed.
(bfd_target_pei_arch): Likewise.
(bfd_target_efi_app_p): Likewise.
(bfd_target_efi_app_arch): Likewise.
(bfd_target_efi_bsdrv_p): Likewise.
(bfd_target_efi_bsdrv_arch): Likewise.
(bfd_target_efi_rtdrv_p): Likewise.
(bfd_target_efi_rtdrv_arch): Likewise.
(bfd_pe_executable_p): Likewise.
* Makefile.am (BFD32_BACKENDS): Remove efi-app-ia32.lo,
efi-bsdrv-ia32.lo and efi-rtdrv-ia32.lo.
(BFD32_BACKENDS_CFILES): Remove efi-app-ia32.c, efi-bsdrv-ia32.c
and efi-rtdrv-ia32.c.
(BFD64_BACKENDS): Remove efi-app-ia64.lo, efi-bsdrv-ia64.lo,
efi-rtdrv-ia64.lo, efi-app-x86_64.lo, efi-bsdrv-x86_64.lo and
efi-rtdrv-x86_64.lo. Add pei-ia64.lo.
(BFD64_BACKENDS_CFILES): Remove efi-app-ia64.c, efi-bsdrv-ia64.c,
efi-rtdrv-ia64.c, efi-app-x86_64.c, efi-bsdrv-x86_64.c and
efi-rtdrv-x86_64.c. Add pei-ia64.c.
(efi-app-ia64.lo): Removed.
(efi-bsdrv-ia32.lo): Likewise.
(efi-rtdrv-ia32.lo): Likewise.
(efi-app-ia64.lo): Likewise.
(efi-bsdrv-ia64.lo): Likewise.
(efi-rtdrv-ia64.lo): Likewise.
(efi-app-x86_64.lo): Likewise.
(efi-bsdrv-x86_64.lo): Likewise.
(efi-rtdrv-x86_64.lo): Likewise.
(pei-ia64.lo): New.
* peicode.h (coff_swap_scnhdr_in): Replace bfd_pe_executable_p
with bfd_pei_p.
(arch_type): Removed.
(pe_arch): Likewise.
(pe_bfd_object_p): Just return coff_object_p.
* peXXigen.c (_bfd_XXi_swap_scnhdr_out): Replace
bfd_pe_executable_p with bfd_pei_p.
binutils/
2009-04-17 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/10074
* objcopy.c: Include coff/i386.h and coff/pe.h.
(pe_file_alignment): New.
(pe_heap_commit): Likewise.
(pe_heap_reserve): Likewise.
(pe_image_base): Likewise.
(pe_section_alignment): Likewise.
(pe_stack_commit): Likewise.
(pe_stack_reserve): Likewise.
(pe_subsystem): Likewise.
(pe_major_subsystem_version): Likewise.
(pe_minor_subsystem_version): Likewise.
(set_pe_subsystem): Likewise.
(convert_efi_target): Likewise.
(command_line_switch): Add OPTION_FILE_ALIGNMENT,
OPTION_HEAP, OPTION_IMAGE_BASE, OPTION_SECTION_ALIGNMENT,
OPTION_STACK and OPTION_SUBSYSTEM.
(copy_options): Likewise.
(copy_usage): Add --file-alignment, --heap, --image-base,
--section-alignment, --stack and --subsystem.
(copy_object): Set up PE parameters.
(copy_main): Process Add OPTION_FILE_ALIGNMENT,
OPTION_HEAP, OPTION_IMAGE_BASE, OPTION_SECTION_ALIGNMENT,
OPTION_STACK and OPTION_SUBSYSTEM. Convert EFI target to
PEI target.
* NEWS: Mention --file-alignment, --heap, --image-base,
--section-alignment, --stack and --subsystem command line
options for objcopy.
* doc/binutils.texi: Document --file-alignment, --heap,
--image-base, --section-alignment, --stack and --subsystem
command line options for objcopy.
2009-04-17 21:46:18 +08:00
|
|
|
|
/* FIXME: See bfd/peXXigen.c for why we include an architecture specific
|
|
|
|
|
header in generic PE code. */
|
|
|
|
|
#include "coff/i386.h"
|
|
|
|
|
#include "coff/pe.h"
|
|
|
|
|
|
|
|
|
|
static bfd_vma pe_file_alignment = (bfd_vma) -1;
|
|
|
|
|
static bfd_vma pe_heap_commit = (bfd_vma) -1;
|
|
|
|
|
static bfd_vma pe_heap_reserve = (bfd_vma) -1;
|
|
|
|
|
static bfd_vma pe_image_base = (bfd_vma) -1;
|
|
|
|
|
static bfd_vma pe_section_alignment = (bfd_vma) -1;
|
|
|
|
|
static bfd_vma pe_stack_commit = (bfd_vma) -1;
|
|
|
|
|
static bfd_vma pe_stack_reserve = (bfd_vma) -1;
|
|
|
|
|
static short pe_subsystem = -1;
|
|
|
|
|
static short pe_major_subsystem_version = -1;
|
|
|
|
|
static short pe_minor_subsystem_version = -1;
|
|
|
|
|
|
2008-04-16 16:24:21 +08:00
|
|
|
|
struct is_specified_symbol_predicate_data
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2008-04-16 16:24:21 +08:00
|
|
|
|
const char *name;
|
|
|
|
|
bfd_boolean found;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
};
|
|
|
|
|
|
2000-04-05 11:43:56 +08:00
|
|
|
|
/* A list to support redefine_sym. */
|
|
|
|
|
struct redefine_node
|
|
|
|
|
{
|
|
|
|
|
char *source;
|
|
|
|
|
char *target;
|
|
|
|
|
struct redefine_node *next;
|
|
|
|
|
};
|
|
|
|
|
|
2001-07-31 21:49:39 +08:00
|
|
|
|
typedef struct section_rename
|
|
|
|
|
{
|
|
|
|
|
const char * old_name;
|
|
|
|
|
const char * new_name;
|
|
|
|
|
flagword flags;
|
|
|
|
|
struct section_rename * next;
|
|
|
|
|
}
|
|
|
|
|
section_rename;
|
|
|
|
|
|
|
|
|
|
/* List of sections to be renamed. */
|
2003-07-24 01:34:03 +08:00
|
|
|
|
static section_rename *section_rename_list;
|
2001-07-31 21:49:39 +08:00
|
|
|
|
|
2003-07-24 01:34:03 +08:00
|
|
|
|
static asymbol **isympp = NULL; /* Input symbols. */
|
|
|
|
|
static asymbol **osympp = NULL; /* Output symbols that survive stripping. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2010-09-10 20:11:28 +08:00
|
|
|
|
/* If `copy_byte' >= 0, copy 'copy_width' byte(s) of every `interleave' bytes. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
static int copy_byte = -1;
|
2010-09-10 20:11:28 +08:00
|
|
|
|
static int interleave = 0; /* Initialised to 4 in copy_main(). */
|
|
|
|
|
static int copy_width = 1;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2002-11-30 16:39:46 +08:00
|
|
|
|
static bfd_boolean verbose; /* Print file and target names. */
|
|
|
|
|
static bfd_boolean preserve_dates; /* Preserve input file timestamp. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
static int status = 0; /* Exit status. */
|
|
|
|
|
|
|
|
|
|
enum strip_action
|
|
|
|
|
{
|
|
|
|
|
STRIP_UNDEF,
|
2003-07-24 01:34:03 +08:00
|
|
|
|
STRIP_NONE, /* Don't strip. */
|
|
|
|
|
STRIP_DEBUG, /* Strip all debugger symbols. */
|
|
|
|
|
STRIP_UNNEEDED, /* Strip unnecessary symbols. */
|
2003-06-26 16:14:10 +08:00
|
|
|
|
STRIP_NONDEBUG, /* Strip everything but debug info. */
|
2003-07-24 01:34:03 +08:00
|
|
|
|
STRIP_ALL /* Strip all symbols. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
};
|
|
|
|
|
|
2002-05-22 03:34:58 +08:00
|
|
|
|
/* Which symbols to remove. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
static enum strip_action strip_symbols;
|
|
|
|
|
|
|
|
|
|
enum locals_action
|
|
|
|
|
{
|
|
|
|
|
LOCALS_UNDEF,
|
2003-07-24 01:34:03 +08:00
|
|
|
|
LOCALS_START_L, /* Discard locals starting with L. */
|
|
|
|
|
LOCALS_ALL /* Discard all locals. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Which local symbols to remove. Overrides STRIP_ALL. */
|
|
|
|
|
static enum locals_action discard_locals;
|
|
|
|
|
|
|
|
|
|
/* What kind of change to perform. */
|
|
|
|
|
enum change_action
|
|
|
|
|
{
|
|
|
|
|
CHANGE_IGNORE,
|
|
|
|
|
CHANGE_MODIFY,
|
|
|
|
|
CHANGE_SET
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Structure used to hold lists of sections and actions to take. */
|
|
|
|
|
struct section_list
|
|
|
|
|
{
|
2002-11-30 16:39:46 +08:00
|
|
|
|
struct section_list * next; /* Next section to change. */
|
|
|
|
|
const char * name; /* Section name. */
|
|
|
|
|
bfd_boolean used; /* Whether this entry was used. */
|
|
|
|
|
bfd_boolean remove; /* Whether to remove this section. */
|
|
|
|
|
bfd_boolean copy; /* Whether to copy this section. */
|
|
|
|
|
enum change_action change_vma;/* Whether to change or set VMA. */
|
|
|
|
|
bfd_vma vma_val; /* Amount to change by or set to. */
|
|
|
|
|
enum change_action change_lma;/* Whether to change or set LMA. */
|
|
|
|
|
bfd_vma lma_val; /* Amount to change by or set to. */
|
|
|
|
|
bfd_boolean set_flags; /* Whether to set the section flags. */
|
|
|
|
|
flagword flags; /* What to set the section flags to. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static struct section_list *change_sections;
|
2001-07-31 21:49:39 +08:00
|
|
|
|
|
2002-11-30 16:39:46 +08:00
|
|
|
|
/* TRUE if some sections are to be removed. */
|
|
|
|
|
static bfd_boolean sections_removed;
|
2001-07-31 21:49:39 +08:00
|
|
|
|
|
2002-11-30 16:39:46 +08:00
|
|
|
|
/* TRUE if only some sections are to be copied. */
|
|
|
|
|
static bfd_boolean sections_copied;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
/* Changes to the start address. */
|
|
|
|
|
static bfd_vma change_start = 0;
|
2002-11-30 16:39:46 +08:00
|
|
|
|
static bfd_boolean set_start_set = FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
static bfd_vma set_start;
|
|
|
|
|
|
|
|
|
|
/* Changes to section addresses. */
|
|
|
|
|
static bfd_vma change_section_address = 0;
|
|
|
|
|
|
|
|
|
|
/* Filling gaps between sections. */
|
2002-11-30 16:39:46 +08:00
|
|
|
|
static bfd_boolean gap_fill_set = FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
static bfd_byte gap_fill = 0;
|
|
|
|
|
|
|
|
|
|
/* Pad to a given address. */
|
2002-11-30 16:39:46 +08:00
|
|
|
|
static bfd_boolean pad_to_set = FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
static bfd_vma pad_to;
|
|
|
|
|
|
2006-03-01 00:09:01 +08:00
|
|
|
|
/* Use alternative machine code? */
|
|
|
|
|
static unsigned long use_alt_mach_code = 0;
|
2001-08-24 21:56:11 +08:00
|
|
|
|
|
2003-12-23 21:01:11 +08:00
|
|
|
|
/* Output BFD flags user wants to set or clear */
|
|
|
|
|
static flagword bfd_flags_to_set;
|
|
|
|
|
static flagword bfd_flags_to_clear;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* List of sections to add. */
|
|
|
|
|
struct section_add
|
|
|
|
|
{
|
|
|
|
|
/* Next section to add. */
|
|
|
|
|
struct section_add *next;
|
|
|
|
|
/* Name of section to add. */
|
|
|
|
|
const char *name;
|
|
|
|
|
/* Name of file holding section contents. */
|
|
|
|
|
const char *filename;
|
|
|
|
|
/* Size of file. */
|
|
|
|
|
size_t size;
|
|
|
|
|
/* Contents of file. */
|
|
|
|
|
bfd_byte *contents;
|
|
|
|
|
/* BFD section, after it has been added. */
|
|
|
|
|
asection *section;
|
|
|
|
|
};
|
|
|
|
|
|
2001-07-31 21:49:39 +08:00
|
|
|
|
/* List of sections to add to the output BFD. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
static struct section_add *add_sections;
|
|
|
|
|
|
2003-06-12 15:23:31 +08:00
|
|
|
|
/* 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;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* Whether to convert debugging information. */
|
2002-11-30 16:39:46 +08:00
|
|
|
|
static bfd_boolean convert_debugging = FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2010-10-29 20:10:39 +08:00
|
|
|
|
/* Whether to compress/decompress DWARF debug sections. */
|
|
|
|
|
static enum
|
|
|
|
|
{
|
|
|
|
|
nothing,
|
|
|
|
|
compress,
|
|
|
|
|
decompress
|
|
|
|
|
} do_debug_sections = nothing;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* Whether to change the leading character in symbol names. */
|
2002-11-30 16:39:46 +08:00
|
|
|
|
static bfd_boolean change_leading_char = FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
/* Whether to remove the leading character from global symbol names. */
|
2002-11-30 16:39:46 +08:00
|
|
|
|
static bfd_boolean remove_leading_char = FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2003-12-06 08:06:12 +08:00
|
|
|
|
/* Whether to permit wildcard in symbol comparison. */
|
2003-11-12 01:50:26 +08:00
|
|
|
|
static bfd_boolean wildcard = FALSE;
|
|
|
|
|
|
2006-06-24 00:23:09 +08:00
|
|
|
|
/* True if --localize-hidden is in effect. */
|
|
|
|
|
static bfd_boolean localize_hidden = FALSE;
|
|
|
|
|
|
2001-05-30 18:46:28 +08:00
|
|
|
|
/* List of symbols to strip, keep, localize, keep-global, weaken,
|
|
|
|
|
or redefine. */
|
2008-04-16 16:24:21 +08:00
|
|
|
|
static htab_t strip_specific_htab = NULL;
|
|
|
|
|
static htab_t strip_unneeded_htab = NULL;
|
|
|
|
|
static htab_t keep_specific_htab = NULL;
|
|
|
|
|
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;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
static struct redefine_node *redefine_sym_list = NULL;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2002-11-30 16:39:46 +08:00
|
|
|
|
/* If this is TRUE, we weaken global symbols (set BSF_WEAK). */
|
|
|
|
|
static bfd_boolean weaken = FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2005-11-15 16:33:38 +08:00
|
|
|
|
/* If this is TRUE, we retain BSF_FILE symbols. */
|
|
|
|
|
static bfd_boolean keep_file_symbols = FALSE;
|
|
|
|
|
|
2002-12-13 21:19:44 +08:00
|
|
|
|
/* Prefix symbols/sections. */
|
|
|
|
|
static char *prefix_symbols_string = 0;
|
|
|
|
|
static char *prefix_sections_string = 0;
|
|
|
|
|
static char *prefix_alloc_sections_string = 0;
|
|
|
|
|
|
2007-03-02 00:39:42 +08:00
|
|
|
|
/* True if --extract-symbol was passed on the command line. */
|
|
|
|
|
static bfd_boolean extract_symbol = FALSE;
|
|
|
|
|
|
2007-04-23 18:59:07 +08:00
|
|
|
|
/* If `reverse_bytes' is nonzero, then reverse the order of every chunk
|
|
|
|
|
of <reverse_bytes> bytes within each output section. */
|
|
|
|
|
static int reverse_bytes = 0;
|
|
|
|
|
|
2009-04-14 17:47:44 +08:00
|
|
|
|
/* For Coff objects, we may want to allow or disallow long section names,
|
|
|
|
|
or preserve them where found in the inputs. Debug info relies on them. */
|
|
|
|
|
enum long_section_name_handling
|
|
|
|
|
{
|
|
|
|
|
DISABLE,
|
|
|
|
|
ENABLE,
|
|
|
|
|
KEEP
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* The default long section handling mode is to preserve them.
|
|
|
|
|
This is also the only behaviour for 'strip'. */
|
|
|
|
|
static enum long_section_name_handling long_section_names = KEEP;
|
2007-04-23 18:59:07 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* 150 isn't special; it's just an arbitrary non-ASCII char value. */
|
2003-07-24 01:34:03 +08:00
|
|
|
|
enum command_line_switch
|
|
|
|
|
{
|
|
|
|
|
OPTION_ADD_SECTION=150,
|
|
|
|
|
OPTION_CHANGE_ADDRESSES,
|
|
|
|
|
OPTION_CHANGE_LEADING_CHAR,
|
|
|
|
|
OPTION_CHANGE_START,
|
|
|
|
|
OPTION_CHANGE_SECTION_ADDRESS,
|
|
|
|
|
OPTION_CHANGE_SECTION_LMA,
|
|
|
|
|
OPTION_CHANGE_SECTION_VMA,
|
|
|
|
|
OPTION_CHANGE_WARNINGS,
|
2010-10-29 20:10:39 +08:00
|
|
|
|
OPTION_COMPRESS_DEBUG_SECTIONS,
|
2003-07-24 01:34:03 +08:00
|
|
|
|
OPTION_DEBUGGING,
|
2010-10-29 20:10:39 +08:00
|
|
|
|
OPTION_DECOMPRESS_DEBUG_SECTIONS,
|
2003-07-24 01:34:03 +08:00
|
|
|
|
OPTION_GAP_FILL,
|
|
|
|
|
OPTION_NO_CHANGE_WARNINGS,
|
|
|
|
|
OPTION_PAD_TO,
|
|
|
|
|
OPTION_REMOVE_LEADING_CHAR,
|
|
|
|
|
OPTION_SET_SECTION_FLAGS,
|
|
|
|
|
OPTION_SET_START,
|
|
|
|
|
OPTION_STRIP_UNNEEDED,
|
|
|
|
|
OPTION_WEAKEN,
|
|
|
|
|
OPTION_REDEFINE_SYM,
|
|
|
|
|
OPTION_REDEFINE_SYMS,
|
|
|
|
|
OPTION_SREC_LEN,
|
|
|
|
|
OPTION_SREC_FORCES3,
|
|
|
|
|
OPTION_STRIP_SYMBOLS,
|
2004-12-16 21:16:33 +08:00
|
|
|
|
OPTION_STRIP_UNNEEDED_SYMBOL,
|
|
|
|
|
OPTION_STRIP_UNNEEDED_SYMBOLS,
|
2003-07-24 01:34:03 +08:00
|
|
|
|
OPTION_KEEP_SYMBOLS,
|
2006-06-24 00:23:09 +08:00
|
|
|
|
OPTION_LOCALIZE_HIDDEN,
|
2003-07-24 01:34:03 +08:00
|
|
|
|
OPTION_LOCALIZE_SYMBOLS,
|
2009-04-14 17:47:44 +08:00
|
|
|
|
OPTION_LONG_SECTION_NAMES,
|
2005-03-16 01:45:19 +08:00
|
|
|
|
OPTION_GLOBALIZE_SYMBOL,
|
|
|
|
|
OPTION_GLOBALIZE_SYMBOLS,
|
2003-07-24 01:34:03 +08:00
|
|
|
|
OPTION_KEEPGLOBAL_SYMBOLS,
|
|
|
|
|
OPTION_WEAKEN_SYMBOLS,
|
|
|
|
|
OPTION_RENAME_SECTION,
|
|
|
|
|
OPTION_ALT_MACH_CODE,
|
|
|
|
|
OPTION_PREFIX_SYMBOLS,
|
|
|
|
|
OPTION_PREFIX_SECTIONS,
|
|
|
|
|
OPTION_PREFIX_ALLOC_SECTIONS,
|
|
|
|
|
OPTION_FORMATS_INFO,
|
|
|
|
|
OPTION_ADD_GNU_DEBUGLINK,
|
2003-12-23 21:01:11 +08:00
|
|
|
|
OPTION_ONLY_KEEP_DEBUG,
|
2005-11-15 16:33:38 +08:00
|
|
|
|
OPTION_KEEP_FILE_SYMBOLS,
|
2003-12-23 21:01:11 +08:00
|
|
|
|
OPTION_READONLY_TEXT,
|
|
|
|
|
OPTION_WRITABLE_TEXT,
|
|
|
|
|
OPTION_PURE,
|
2007-03-02 00:39:42 +08:00
|
|
|
|
OPTION_IMPURE,
|
2007-04-23 18:59:07 +08:00
|
|
|
|
OPTION_EXTRACT_SYMBOL,
|
bfd/
2009-04-17 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/10074
* coffcode.h (bfd_pei_p): New.
* config.bfd: Remove bfd_efi_bsdrv_ia32_vec,
bfd_efi_rtdrv_ia32_vec, bfd_efi_bsdrv_x86_64_vec,
bfd_efi_rtdrv_x86_64_vec, bfd_efi_bsdrv_ia64_vec and
bfd_efi_rtdrv_ia64_vec. Replace bfd_efi_app_ia32_vec,
bfd_efi_app_x86_64_vec and bfd_efi_app_ia64_vec with
i386pei_vec, x86_64pei_vec and bfd_pei_ia64_vec, respectively.
* configure.in: Remove bfd_efi_bsdrv_ia32_vec,
bfd_efi_rtdrv_ia32_vec, bfd_efi_bsdrv_x86_64_vec,
bfd_efi_rtdrv_x86_64_vec,
bfd_efi_bsdrv_ia64_vec and bfd_efi_rtdrv_ia64_vec. Replace
bfd_efi_ia64_vec with bfd_pei_ia64_vec.
* targets.c: Likewise.
* configure: Regenerated.
* libcoff.h: Likewise.
* Makefile.in: Likewise.
* efi-app-ia32.c: Removed.
* efi-app-x86_64.c: Likewise.
* efi-bsdrv-ia32.c: Likewise.
* efi-bsdrv-ia64.c: Likewise.
* efi-bsdrv-x86_64.c: Likewise.
* efi-rtdrv-ia32.c: Likewise.
* efi-rtdrv-ia64.c: Likewise.
* efi-rtdrv-x86_64.c: Likewise.
* efi-rtdrv-ia32.c: Likewise.
* efi-app-ia64.c: Moved to ...
* pei-ia64.c: This.
(TARGET_SYM): Set to bfd_pei_ia64_vec.
(TARGET_NAME): Set to pei-ia64.
* libpei.h (bfd_target_pei_p): Removed.
(bfd_target_pei_arch): Likewise.
(bfd_target_efi_app_p): Likewise.
(bfd_target_efi_app_arch): Likewise.
(bfd_target_efi_bsdrv_p): Likewise.
(bfd_target_efi_bsdrv_arch): Likewise.
(bfd_target_efi_rtdrv_p): Likewise.
(bfd_target_efi_rtdrv_arch): Likewise.
(bfd_pe_executable_p): Likewise.
* Makefile.am (BFD32_BACKENDS): Remove efi-app-ia32.lo,
efi-bsdrv-ia32.lo and efi-rtdrv-ia32.lo.
(BFD32_BACKENDS_CFILES): Remove efi-app-ia32.c, efi-bsdrv-ia32.c
and efi-rtdrv-ia32.c.
(BFD64_BACKENDS): Remove efi-app-ia64.lo, efi-bsdrv-ia64.lo,
efi-rtdrv-ia64.lo, efi-app-x86_64.lo, efi-bsdrv-x86_64.lo and
efi-rtdrv-x86_64.lo. Add pei-ia64.lo.
(BFD64_BACKENDS_CFILES): Remove efi-app-ia64.c, efi-bsdrv-ia64.c,
efi-rtdrv-ia64.c, efi-app-x86_64.c, efi-bsdrv-x86_64.c and
efi-rtdrv-x86_64.c. Add pei-ia64.c.
(efi-app-ia64.lo): Removed.
(efi-bsdrv-ia32.lo): Likewise.
(efi-rtdrv-ia32.lo): Likewise.
(efi-app-ia64.lo): Likewise.
(efi-bsdrv-ia64.lo): Likewise.
(efi-rtdrv-ia64.lo): Likewise.
(efi-app-x86_64.lo): Likewise.
(efi-bsdrv-x86_64.lo): Likewise.
(efi-rtdrv-x86_64.lo): Likewise.
(pei-ia64.lo): New.
* peicode.h (coff_swap_scnhdr_in): Replace bfd_pe_executable_p
with bfd_pei_p.
(arch_type): Removed.
(pe_arch): Likewise.
(pe_bfd_object_p): Just return coff_object_p.
* peXXigen.c (_bfd_XXi_swap_scnhdr_out): Replace
bfd_pe_executable_p with bfd_pei_p.
binutils/
2009-04-17 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/10074
* objcopy.c: Include coff/i386.h and coff/pe.h.
(pe_file_alignment): New.
(pe_heap_commit): Likewise.
(pe_heap_reserve): Likewise.
(pe_image_base): Likewise.
(pe_section_alignment): Likewise.
(pe_stack_commit): Likewise.
(pe_stack_reserve): Likewise.
(pe_subsystem): Likewise.
(pe_major_subsystem_version): Likewise.
(pe_minor_subsystem_version): Likewise.
(set_pe_subsystem): Likewise.
(convert_efi_target): Likewise.
(command_line_switch): Add OPTION_FILE_ALIGNMENT,
OPTION_HEAP, OPTION_IMAGE_BASE, OPTION_SECTION_ALIGNMENT,
OPTION_STACK and OPTION_SUBSYSTEM.
(copy_options): Likewise.
(copy_usage): Add --file-alignment, --heap, --image-base,
--section-alignment, --stack and --subsystem.
(copy_object): Set up PE parameters.
(copy_main): Process Add OPTION_FILE_ALIGNMENT,
OPTION_HEAP, OPTION_IMAGE_BASE, OPTION_SECTION_ALIGNMENT,
OPTION_STACK and OPTION_SUBSYSTEM. Convert EFI target to
PEI target.
* NEWS: Mention --file-alignment, --heap, --image-base,
--section-alignment, --stack and --subsystem command line
options for objcopy.
* doc/binutils.texi: Document --file-alignment, --heap,
--image-base, --section-alignment, --stack and --subsystem
command line options for objcopy.
2009-04-17 21:46:18 +08:00
|
|
|
|
OPTION_REVERSE_BYTES,
|
|
|
|
|
OPTION_FILE_ALIGNMENT,
|
|
|
|
|
OPTION_HEAP,
|
|
|
|
|
OPTION_IMAGE_BASE,
|
|
|
|
|
OPTION_SECTION_ALIGNMENT,
|
|
|
|
|
OPTION_STACK,
|
2010-09-10 20:11:28 +08:00
|
|
|
|
OPTION_INTERLEAVE_WIDTH,
|
bfd/
2009-04-17 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/10074
* coffcode.h (bfd_pei_p): New.
* config.bfd: Remove bfd_efi_bsdrv_ia32_vec,
bfd_efi_rtdrv_ia32_vec, bfd_efi_bsdrv_x86_64_vec,
bfd_efi_rtdrv_x86_64_vec, bfd_efi_bsdrv_ia64_vec and
bfd_efi_rtdrv_ia64_vec. Replace bfd_efi_app_ia32_vec,
bfd_efi_app_x86_64_vec and bfd_efi_app_ia64_vec with
i386pei_vec, x86_64pei_vec and bfd_pei_ia64_vec, respectively.
* configure.in: Remove bfd_efi_bsdrv_ia32_vec,
bfd_efi_rtdrv_ia32_vec, bfd_efi_bsdrv_x86_64_vec,
bfd_efi_rtdrv_x86_64_vec,
bfd_efi_bsdrv_ia64_vec and bfd_efi_rtdrv_ia64_vec. Replace
bfd_efi_ia64_vec with bfd_pei_ia64_vec.
* targets.c: Likewise.
* configure: Regenerated.
* libcoff.h: Likewise.
* Makefile.in: Likewise.
* efi-app-ia32.c: Removed.
* efi-app-x86_64.c: Likewise.
* efi-bsdrv-ia32.c: Likewise.
* efi-bsdrv-ia64.c: Likewise.
* efi-bsdrv-x86_64.c: Likewise.
* efi-rtdrv-ia32.c: Likewise.
* efi-rtdrv-ia64.c: Likewise.
* efi-rtdrv-x86_64.c: Likewise.
* efi-rtdrv-ia32.c: Likewise.
* efi-app-ia64.c: Moved to ...
* pei-ia64.c: This.
(TARGET_SYM): Set to bfd_pei_ia64_vec.
(TARGET_NAME): Set to pei-ia64.
* libpei.h (bfd_target_pei_p): Removed.
(bfd_target_pei_arch): Likewise.
(bfd_target_efi_app_p): Likewise.
(bfd_target_efi_app_arch): Likewise.
(bfd_target_efi_bsdrv_p): Likewise.
(bfd_target_efi_bsdrv_arch): Likewise.
(bfd_target_efi_rtdrv_p): Likewise.
(bfd_target_efi_rtdrv_arch): Likewise.
(bfd_pe_executable_p): Likewise.
* Makefile.am (BFD32_BACKENDS): Remove efi-app-ia32.lo,
efi-bsdrv-ia32.lo and efi-rtdrv-ia32.lo.
(BFD32_BACKENDS_CFILES): Remove efi-app-ia32.c, efi-bsdrv-ia32.c
and efi-rtdrv-ia32.c.
(BFD64_BACKENDS): Remove efi-app-ia64.lo, efi-bsdrv-ia64.lo,
efi-rtdrv-ia64.lo, efi-app-x86_64.lo, efi-bsdrv-x86_64.lo and
efi-rtdrv-x86_64.lo. Add pei-ia64.lo.
(BFD64_BACKENDS_CFILES): Remove efi-app-ia64.c, efi-bsdrv-ia64.c,
efi-rtdrv-ia64.c, efi-app-x86_64.c, efi-bsdrv-x86_64.c and
efi-rtdrv-x86_64.c. Add pei-ia64.c.
(efi-app-ia64.lo): Removed.
(efi-bsdrv-ia32.lo): Likewise.
(efi-rtdrv-ia32.lo): Likewise.
(efi-app-ia64.lo): Likewise.
(efi-bsdrv-ia64.lo): Likewise.
(efi-rtdrv-ia64.lo): Likewise.
(efi-app-x86_64.lo): Likewise.
(efi-bsdrv-x86_64.lo): Likewise.
(efi-rtdrv-x86_64.lo): Likewise.
(pei-ia64.lo): New.
* peicode.h (coff_swap_scnhdr_in): Replace bfd_pe_executable_p
with bfd_pei_p.
(arch_type): Removed.
(pe_arch): Likewise.
(pe_bfd_object_p): Just return coff_object_p.
* peXXigen.c (_bfd_XXi_swap_scnhdr_out): Replace
bfd_pe_executable_p with bfd_pei_p.
binutils/
2009-04-17 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/10074
* objcopy.c: Include coff/i386.h and coff/pe.h.
(pe_file_alignment): New.
(pe_heap_commit): Likewise.
(pe_heap_reserve): Likewise.
(pe_image_base): Likewise.
(pe_section_alignment): Likewise.
(pe_stack_commit): Likewise.
(pe_stack_reserve): Likewise.
(pe_subsystem): Likewise.
(pe_major_subsystem_version): Likewise.
(pe_minor_subsystem_version): Likewise.
(set_pe_subsystem): Likewise.
(convert_efi_target): Likewise.
(command_line_switch): Add OPTION_FILE_ALIGNMENT,
OPTION_HEAP, OPTION_IMAGE_BASE, OPTION_SECTION_ALIGNMENT,
OPTION_STACK and OPTION_SUBSYSTEM.
(copy_options): Likewise.
(copy_usage): Add --file-alignment, --heap, --image-base,
--section-alignment, --stack and --subsystem.
(copy_object): Set up PE parameters.
(copy_main): Process Add OPTION_FILE_ALIGNMENT,
OPTION_HEAP, OPTION_IMAGE_BASE, OPTION_SECTION_ALIGNMENT,
OPTION_STACK and OPTION_SUBSYSTEM. Convert EFI target to
PEI target.
* NEWS: Mention --file-alignment, --heap, --image-base,
--section-alignment, --stack and --subsystem command line
options for objcopy.
* doc/binutils.texi: Document --file-alignment, --heap,
--image-base, --section-alignment, --stack and --subsystem
command line options for objcopy.
2009-04-17 21:46:18 +08:00
|
|
|
|
OPTION_SUBSYSTEM
|
2003-07-24 01:34:03 +08:00
|
|
|
|
};
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
/* Options to handle if running as "strip". */
|
|
|
|
|
|
|
|
|
|
static struct option strip_options[] =
|
|
|
|
|
{
|
|
|
|
|
{"discard-all", no_argument, 0, 'x'},
|
|
|
|
|
{"discard-locals", no_argument, 0, 'X'},
|
|
|
|
|
{"format", required_argument, 0, 'F'}, /* Obsolete */
|
|
|
|
|
{"help", no_argument, 0, 'h'},
|
2003-03-25 00:11:46 +08:00
|
|
|
|
{"info", no_argument, 0, OPTION_FORMATS_INFO},
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{"input-format", required_argument, 0, 'I'}, /* Obsolete */
|
|
|
|
|
{"input-target", required_argument, 0, 'I'},
|
2005-11-15 16:33:38 +08:00
|
|
|
|
{"keep-file-symbols", no_argument, 0, OPTION_KEEP_FILE_SYMBOLS},
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{"keep-symbol", required_argument, 0, 'K'},
|
2003-06-26 16:14:10 +08:00
|
|
|
|
{"only-keep-debug", no_argument, 0, OPTION_ONLY_KEEP_DEBUG},
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{"output-format", required_argument, 0, 'O'}, /* Obsolete */
|
|
|
|
|
{"output-target", required_argument, 0, 'O'},
|
2001-06-22 17:02:05 +08:00
|
|
|
|
{"output-file", required_argument, 0, 'o'},
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{"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-unneeded", no_argument, 0, OPTION_STRIP_UNNEEDED},
|
|
|
|
|
{"strip-symbol", required_argument, 0, 'N'},
|
|
|
|
|
{"target", required_argument, 0, 'F'},
|
|
|
|
|
{"verbose", no_argument, 0, 'v'},
|
|
|
|
|
{"version", no_argument, 0, 'V'},
|
2003-11-12 01:50:26 +08:00
|
|
|
|
{"wildcard", no_argument, 0, 'w'},
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{0, no_argument, 0, 0}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Options to handle if running as "objcopy". */
|
|
|
|
|
|
|
|
|
|
static struct option copy_options[] =
|
|
|
|
|
{
|
2003-06-12 15:23:31 +08:00
|
|
|
|
{"add-gnu-debuglink", required_argument, 0, OPTION_ADD_GNU_DEBUGLINK},
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{"add-section", required_argument, 0, OPTION_ADD_SECTION},
|
|
|
|
|
{"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-warnings", no_argument, 0, OPTION_CHANGE_WARNINGS},
|
2002-12-13 21:19:44 +08:00
|
|
|
|
{"alt-machine-code", required_argument, 0, OPTION_ALT_MACH_CODE},
|
2001-03-13 08:08:35 +08:00
|
|
|
|
{"binary-architecture", required_argument, 0, 'B'},
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{"byte", required_argument, 0, 'b'},
|
|
|
|
|
{"change-addresses", required_argument, 0, OPTION_CHANGE_ADDRESSES},
|
|
|
|
|
{"change-leading-char", no_argument, 0, OPTION_CHANGE_LEADING_CHAR},
|
|
|
|
|
{"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},
|
2010-10-29 20:10:39 +08:00
|
|
|
|
{"compress-debug-sections", no_argument, 0, OPTION_COMPRESS_DEBUG_SECTIONS},
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{"debugging", no_argument, 0, OPTION_DEBUGGING},
|
2010-10-29 20:10:39 +08:00
|
|
|
|
{"decompress-debug-sections", no_argument, 0, OPTION_DECOMPRESS_DEBUG_SECTIONS},
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{"discard-all", no_argument, 0, 'x'},
|
|
|
|
|
{"discard-locals", no_argument, 0, 'X'},
|
2007-03-02 00:39:42 +08:00
|
|
|
|
{"extract-symbol", no_argument, 0, OPTION_EXTRACT_SYMBOL},
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{"format", required_argument, 0, 'F'}, /* Obsolete */
|
|
|
|
|
{"gap-fill", required_argument, 0, OPTION_GAP_FILL},
|
2005-03-16 01:45:19 +08:00
|
|
|
|
{"globalize-symbol", required_argument, 0, OPTION_GLOBALIZE_SYMBOL},
|
|
|
|
|
{"globalize-symbols", required_argument, 0, OPTION_GLOBALIZE_SYMBOLS},
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{"help", no_argument, 0, 'h'},
|
2003-12-23 21:01:11 +08:00
|
|
|
|
{"impure", no_argument, 0, OPTION_IMPURE},
|
2003-03-25 00:11:46 +08:00
|
|
|
|
{"info", no_argument, 0, OPTION_FORMATS_INFO},
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{"input-format", required_argument, 0, 'I'}, /* Obsolete */
|
|
|
|
|
{"input-target", required_argument, 0, 'I'},
|
2010-09-10 20:11:28 +08:00
|
|
|
|
{"interleave", optional_argument, 0, 'i'},
|
|
|
|
|
{"interleave-width", required_argument, 0, OPTION_INTERLEAVE_WIDTH},
|
2005-11-15 16:33:38 +08:00
|
|
|
|
{"keep-file-symbols", no_argument, 0, OPTION_KEEP_FILE_SYMBOLS},
|
2002-12-13 21:19:44 +08:00
|
|
|
|
{"keep-global-symbol", required_argument, 0, 'G'},
|
|
|
|
|
{"keep-global-symbols", required_argument, 0, OPTION_KEEPGLOBAL_SYMBOLS},
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{"keep-symbol", required_argument, 0, 'K'},
|
2002-12-13 21:19:44 +08:00
|
|
|
|
{"keep-symbols", required_argument, 0, OPTION_KEEP_SYMBOLS},
|
2006-06-24 00:23:09 +08:00
|
|
|
|
{"localize-hidden", no_argument, 0, OPTION_LOCALIZE_HIDDEN},
|
2002-12-13 21:19:44 +08:00
|
|
|
|
{"localize-symbol", required_argument, 0, 'L'},
|
|
|
|
|
{"localize-symbols", required_argument, 0, OPTION_LOCALIZE_SYMBOLS},
|
2009-04-14 17:47:44 +08:00
|
|
|
|
{"long-section-names", required_argument, 0, OPTION_LONG_SECTION_NAMES},
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{"no-adjust-warnings", no_argument, 0, OPTION_NO_CHANGE_WARNINGS},
|
|
|
|
|
{"no-change-warnings", no_argument, 0, OPTION_NO_CHANGE_WARNINGS},
|
2003-06-26 16:14:10 +08:00
|
|
|
|
{"only-keep-debug", no_argument, 0, OPTION_ONLY_KEEP_DEBUG},
|
2002-12-13 21:19:44 +08:00
|
|
|
|
{"only-section", required_argument, 0, 'j'},
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{"output-format", required_argument, 0, 'O'}, /* Obsolete */
|
|
|
|
|
{"output-target", required_argument, 0, 'O'},
|
|
|
|
|
{"pad-to", required_argument, 0, OPTION_PAD_TO},
|
2002-12-13 21:19:44 +08:00
|
|
|
|
{"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},
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{"preserve-dates", no_argument, 0, 'p'},
|
2003-12-23 21:01:11 +08:00
|
|
|
|
{"pure", no_argument, 0, OPTION_PURE},
|
|
|
|
|
{"readonly-text", no_argument, 0, OPTION_READONLY_TEXT},
|
2002-12-13 21:19:44 +08:00
|
|
|
|
{"redefine-sym", required_argument, 0, OPTION_REDEFINE_SYM},
|
2003-06-02 22:45:13 +08:00
|
|
|
|
{"redefine-syms", required_argument, 0, OPTION_REDEFINE_SYMS},
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{"remove-leading-char", no_argument, 0, OPTION_REMOVE_LEADING_CHAR},
|
|
|
|
|
{"remove-section", required_argument, 0, 'R'},
|
2001-07-31 21:49:39 +08:00
|
|
|
|
{"rename-section", required_argument, 0, OPTION_RENAME_SECTION},
|
2007-04-23 18:59:07 +08:00
|
|
|
|
{"reverse-bytes", required_argument, 0, OPTION_REVERSE_BYTES},
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{"set-section-flags", required_argument, 0, OPTION_SET_SECTION_FLAGS},
|
|
|
|
|
{"set-start", required_argument, 0, OPTION_SET_START},
|
2002-12-13 21:19:44 +08:00
|
|
|
|
{"srec-len", required_argument, 0, OPTION_SREC_LEN},
|
|
|
|
|
{"srec-forceS3", no_argument, 0, OPTION_SREC_FORCES3},
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{"strip-all", no_argument, 0, 'S'},
|
|
|
|
|
{"strip-debug", no_argument, 0, 'g'},
|
|
|
|
|
{"strip-unneeded", no_argument, 0, OPTION_STRIP_UNNEEDED},
|
2004-12-16 21:16:33 +08:00
|
|
|
|
{"strip-unneeded-symbol", required_argument, 0, OPTION_STRIP_UNNEEDED_SYMBOL},
|
|
|
|
|
{"strip-unneeded-symbols", required_argument, 0, OPTION_STRIP_UNNEEDED_SYMBOLS},
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{"strip-symbol", required_argument, 0, 'N'},
|
2002-12-13 21:19:44 +08:00
|
|
|
|
{"strip-symbols", required_argument, 0, OPTION_STRIP_SYMBOLS},
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{"target", required_argument, 0, 'F'},
|
|
|
|
|
{"verbose", no_argument, 0, 'v'},
|
|
|
|
|
{"version", no_argument, 0, 'V'},
|
|
|
|
|
{"weaken", no_argument, 0, OPTION_WEAKEN},
|
|
|
|
|
{"weaken-symbol", required_argument, 0, 'W'},
|
2001-05-30 18:46:28 +08:00
|
|
|
|
{"weaken-symbols", required_argument, 0, OPTION_WEAKEN_SYMBOLS},
|
2003-11-12 01:50:26 +08:00
|
|
|
|
{"wildcard", no_argument, 0, 'w'},
|
2003-12-23 21:01:11 +08:00
|
|
|
|
{"writable-text", no_argument, 0, OPTION_WRITABLE_TEXT},
|
bfd/
2009-04-17 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/10074
* coffcode.h (bfd_pei_p): New.
* config.bfd: Remove bfd_efi_bsdrv_ia32_vec,
bfd_efi_rtdrv_ia32_vec, bfd_efi_bsdrv_x86_64_vec,
bfd_efi_rtdrv_x86_64_vec, bfd_efi_bsdrv_ia64_vec and
bfd_efi_rtdrv_ia64_vec. Replace bfd_efi_app_ia32_vec,
bfd_efi_app_x86_64_vec and bfd_efi_app_ia64_vec with
i386pei_vec, x86_64pei_vec and bfd_pei_ia64_vec, respectively.
* configure.in: Remove bfd_efi_bsdrv_ia32_vec,
bfd_efi_rtdrv_ia32_vec, bfd_efi_bsdrv_x86_64_vec,
bfd_efi_rtdrv_x86_64_vec,
bfd_efi_bsdrv_ia64_vec and bfd_efi_rtdrv_ia64_vec. Replace
bfd_efi_ia64_vec with bfd_pei_ia64_vec.
* targets.c: Likewise.
* configure: Regenerated.
* libcoff.h: Likewise.
* Makefile.in: Likewise.
* efi-app-ia32.c: Removed.
* efi-app-x86_64.c: Likewise.
* efi-bsdrv-ia32.c: Likewise.
* efi-bsdrv-ia64.c: Likewise.
* efi-bsdrv-x86_64.c: Likewise.
* efi-rtdrv-ia32.c: Likewise.
* efi-rtdrv-ia64.c: Likewise.
* efi-rtdrv-x86_64.c: Likewise.
* efi-rtdrv-ia32.c: Likewise.
* efi-app-ia64.c: Moved to ...
* pei-ia64.c: This.
(TARGET_SYM): Set to bfd_pei_ia64_vec.
(TARGET_NAME): Set to pei-ia64.
* libpei.h (bfd_target_pei_p): Removed.
(bfd_target_pei_arch): Likewise.
(bfd_target_efi_app_p): Likewise.
(bfd_target_efi_app_arch): Likewise.
(bfd_target_efi_bsdrv_p): Likewise.
(bfd_target_efi_bsdrv_arch): Likewise.
(bfd_target_efi_rtdrv_p): Likewise.
(bfd_target_efi_rtdrv_arch): Likewise.
(bfd_pe_executable_p): Likewise.
* Makefile.am (BFD32_BACKENDS): Remove efi-app-ia32.lo,
efi-bsdrv-ia32.lo and efi-rtdrv-ia32.lo.
(BFD32_BACKENDS_CFILES): Remove efi-app-ia32.c, efi-bsdrv-ia32.c
and efi-rtdrv-ia32.c.
(BFD64_BACKENDS): Remove efi-app-ia64.lo, efi-bsdrv-ia64.lo,
efi-rtdrv-ia64.lo, efi-app-x86_64.lo, efi-bsdrv-x86_64.lo and
efi-rtdrv-x86_64.lo. Add pei-ia64.lo.
(BFD64_BACKENDS_CFILES): Remove efi-app-ia64.c, efi-bsdrv-ia64.c,
efi-rtdrv-ia64.c, efi-app-x86_64.c, efi-bsdrv-x86_64.c and
efi-rtdrv-x86_64.c. Add pei-ia64.c.
(efi-app-ia64.lo): Removed.
(efi-bsdrv-ia32.lo): Likewise.
(efi-rtdrv-ia32.lo): Likewise.
(efi-app-ia64.lo): Likewise.
(efi-bsdrv-ia64.lo): Likewise.
(efi-rtdrv-ia64.lo): Likewise.
(efi-app-x86_64.lo): Likewise.
(efi-bsdrv-x86_64.lo): Likewise.
(efi-rtdrv-x86_64.lo): Likewise.
(pei-ia64.lo): New.
* peicode.h (coff_swap_scnhdr_in): Replace bfd_pe_executable_p
with bfd_pei_p.
(arch_type): Removed.
(pe_arch): Likewise.
(pe_bfd_object_p): Just return coff_object_p.
* peXXigen.c (_bfd_XXi_swap_scnhdr_out): Replace
bfd_pe_executable_p with bfd_pei_p.
binutils/
2009-04-17 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/10074
* objcopy.c: Include coff/i386.h and coff/pe.h.
(pe_file_alignment): New.
(pe_heap_commit): Likewise.
(pe_heap_reserve): Likewise.
(pe_image_base): Likewise.
(pe_section_alignment): Likewise.
(pe_stack_commit): Likewise.
(pe_stack_reserve): Likewise.
(pe_subsystem): Likewise.
(pe_major_subsystem_version): Likewise.
(pe_minor_subsystem_version): Likewise.
(set_pe_subsystem): Likewise.
(convert_efi_target): Likewise.
(command_line_switch): Add OPTION_FILE_ALIGNMENT,
OPTION_HEAP, OPTION_IMAGE_BASE, OPTION_SECTION_ALIGNMENT,
OPTION_STACK and OPTION_SUBSYSTEM.
(copy_options): Likewise.
(copy_usage): Add --file-alignment, --heap, --image-base,
--section-alignment, --stack and --subsystem.
(copy_object): Set up PE parameters.
(copy_main): Process Add OPTION_FILE_ALIGNMENT,
OPTION_HEAP, OPTION_IMAGE_BASE, OPTION_SECTION_ALIGNMENT,
OPTION_STACK and OPTION_SUBSYSTEM. Convert EFI target to
PEI target.
* NEWS: Mention --file-alignment, --heap, --image-base,
--section-alignment, --stack and --subsystem command line
options for objcopy.
* doc/binutils.texi: Document --file-alignment, --heap,
--image-base, --section-alignment, --stack and --subsystem
command line options for objcopy.
2009-04-17 21:46:18 +08:00
|
|
|
|
{"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},
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{0, no_argument, 0, 0}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* IMPORTS */
|
|
|
|
|
extern char *program_name;
|
|
|
|
|
|
|
|
|
|
/* This flag distinguishes between strip and objcopy:
|
|
|
|
|
1 means this is 'strip'; 0 means this is 'objcopy'.
|
2002-05-22 03:34:58 +08:00
|
|
|
|
-1 means if we should use argv[0] to decide. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
extern int is_strip;
|
|
|
|
|
|
2000-11-03 09:47:13 +08:00
|
|
|
|
/* The maximum length of an S record. This variable is declared in srec.c
|
|
|
|
|
and can be modified by the --srec-len parameter. */
|
|
|
|
|
extern unsigned int Chunk;
|
|
|
|
|
|
|
|
|
|
/* Restrict the generation of Srecords to type S3 only.
|
|
|
|
|
This variable is declare in bfd/srec.c and can be toggled
|
|
|
|
|
on by the --srec-forceS3 command line switch. */
|
2002-11-30 16:39:46 +08:00
|
|
|
|
extern bfd_boolean S3Forced;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2003-08-05 22:40:54 +08:00
|
|
|
|
/* Forward declarations. */
|
|
|
|
|
static void setup_section (bfd *, asection *, void *);
|
2004-05-18 00:40:01 +08:00
|
|
|
|
static void setup_bfd_headers (bfd *, bfd *);
|
2003-08-05 22:40:54 +08:00
|
|
|
|
static void copy_section (bfd *, asection *, void *);
|
|
|
|
|
static void get_sections (bfd *, asection *, void *);
|
|
|
|
|
static int compare_section_lma (const void *, const void *);
|
|
|
|
|
static void mark_symbols_used_in_relocations (bfd *, asection *, void *);
|
|
|
|
|
static bfd_boolean write_debugging_info (bfd *, void *, long *, asymbol ***);
|
|
|
|
|
static const char *lookup_sym_redefinition (const char *);
|
2001-07-31 21:49:39 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
static void
|
2003-07-24 01:34:03 +08:00
|
|
|
|
copy_usage (FILE *stream, int exit_status)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2002-01-24 00:12:56 +08:00
|
|
|
|
fprintf (stream, _("Usage: %s [option(s)] in-file [out-file]\n"), program_name);
|
|
|
|
|
fprintf (stream, _(" Copies a binary file, possibly transforming it in the process\n"));
|
2002-01-16 01:18:53 +08:00
|
|
|
|
fprintf (stream, _(" The options are:\n"));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
fprintf (stream, _("\
|
1999-11-22 17:42:42 +08:00
|
|
|
|
-I --input-target <bfdname> Assume input file is in format <bfdname>\n\
|
|
|
|
|
-O --output-target <bfdname> Create an output file in format <bfdname>\n\
|
2009-09-11 19:16:19 +08:00
|
|
|
|
-B --binary-architecture <arch> Set output arch, when input is arch-less\n\
|
1999-11-22 17:42:42 +08:00
|
|
|
|
-F --target <bfdname> Set both input and output format to <bfdname>\n\
|
|
|
|
|
--debugging Convert debugging information, if possible\n\
|
|
|
|
|
-p --preserve-dates Copy modified/access timestamps to the output\n\
|
|
|
|
|
-j --only-section <name> Only copy section <name> into the output\n\
|
2003-06-12 15:23:31 +08:00
|
|
|
|
--add-gnu-debuglink=<file> Add section .gnu_debuglink linking to <file>\n\
|
1999-11-22 17:42:42 +08:00
|
|
|
|
-R --remove-section <name> Remove section <name> from the output\n\
|
|
|
|
|
-S --strip-all Remove all symbol and relocation information\n\
|
2003-06-12 15:23:31 +08:00
|
|
|
|
-g --strip-debug Remove all debugging symbols & sections\n\
|
1999-11-22 17:42:42 +08:00
|
|
|
|
--strip-unneeded Remove all symbols not needed by relocations\n\
|
|
|
|
|
-N --strip-symbol <name> Do not copy symbol <name>\n\
|
2004-12-16 21:16:33 +08:00
|
|
|
|
--strip-unneeded-symbol <name>\n\
|
|
|
|
|
Do not copy symbol <name> unless needed by\n\
|
|
|
|
|
relocations\n\
|
2003-12-11 21:22:51 +08:00
|
|
|
|
--only-keep-debug Strip everything but the debug information\n\
|
2007-03-02 00:39:42 +08:00
|
|
|
|
--extract-symbol Remove section contents but keep symbols\n\
|
2005-04-25 17:23:24 +08:00
|
|
|
|
-K --keep-symbol <name> Do not strip symbol <name>\n\
|
2005-11-15 16:33:38 +08:00
|
|
|
|
--keep-file-symbols Do not strip file symbol(s)\n\
|
2006-06-24 00:23:09 +08:00
|
|
|
|
--localize-hidden Turn all ELF hidden symbols into locals\n\
|
1999-11-22 17:42:42 +08:00
|
|
|
|
-L --localize-symbol <name> Force symbol <name> to be marked as a local\n\
|
2005-03-16 01:45:19 +08:00
|
|
|
|
--globalize-symbol <name> Force symbol <name> to be marked as a global\n\
|
2001-05-30 18:46:28 +08:00
|
|
|
|
-G --keep-global-symbol <name> Localize all symbols except <name>\n\
|
1999-11-22 17:42:42 +08:00
|
|
|
|
-W --weaken-symbol <name> Force symbol <name> to be marked as a weak\n\
|
|
|
|
|
--weaken Force all global symbols to be marked as weak\n\
|
2004-04-27 14:31:16 +08:00
|
|
|
|
-w --wildcard Permit wildcard in symbol comparison\n\
|
1999-11-22 17:42:42 +08:00
|
|
|
|
-x --discard-all Remove all non-global symbols\n\
|
|
|
|
|
-X --discard-locals Remove any compiler-generated symbols\n\
|
2010-09-10 20:11:28 +08:00
|
|
|
|
-i --interleave [<number>] Only copy N out of every <number> bytes\n\
|
|
|
|
|
--interleave-width <number> Set N for --interleave\n\
|
1999-11-22 17:42:42 +08:00
|
|
|
|
-b --byte <num> Select byte <num> in every interleaved block\n\
|
|
|
|
|
--gap-fill <val> Fill gaps between sections with <val>\n\
|
|
|
|
|
--pad-to <addr> Pad the last section up to address <addr>\n\
|
|
|
|
|
--set-start <addr> Set the start address to <addr>\n\
|
|
|
|
|
{--change-start|--adjust-start} <incr>\n\
|
|
|
|
|
Add <incr> to the start address\n\
|
|
|
|
|
{--change-addresses|--adjust-vma} <incr>\n\
|
|
|
|
|
Add <incr> to LMA, VMA and start addresses\n\
|
|
|
|
|
{--change-section-address|--adjust-section-vma} <name>{=|+|-}<val>\n\
|
|
|
|
|
Change LMA and VMA of section <name> by <val>\n\
|
|
|
|
|
--change-section-lma <name>{=|+|-}<val>\n\
|
|
|
|
|
Change the LMA of section <name> by <val>\n\
|
|
|
|
|
--change-section-vma <name>{=|+|-}<val>\n\
|
|
|
|
|
Change the VMA of section <name> by <val>\n\
|
|
|
|
|
{--[no-]change-warnings|--[no-]adjust-warnings}\n\
|
|
|
|
|
Warn if a named section does not exist\n\
|
|
|
|
|
--set-section-flags <name>=<flags>\n\
|
|
|
|
|
Set section <name>'s properties to <flags>\n\
|
|
|
|
|
--add-section <name>=<file> Add section <name> found in <file> to output\n\
|
2001-07-31 21:49:39 +08:00
|
|
|
|
--rename-section <old>=<new>[,<flags>] Rename section <old> to <new>\n\
|
2009-04-14 17:47:44 +08:00
|
|
|
|
--long-section-names {enable|disable|keep}\n\
|
|
|
|
|
Handle long section names in Coff objects.\n\
|
1999-11-22 17:42:42 +08:00
|
|
|
|
--change-leading-char Force output format's leading character style\n\
|
|
|
|
|
--remove-leading-char Remove leading character from global symbols\n\
|
2007-04-23 18:59:07 +08:00
|
|
|
|
--reverse-bytes=<num> Reverse <num> bytes at a time, in output sections with content\n\
|
2000-04-05 11:43:56 +08:00
|
|
|
|
--redefine-sym <old>=<new> Redefine symbol name <old> to <new>\n\
|
2003-06-02 22:45:13 +08:00
|
|
|
|
--redefine-syms <file> --redefine-sym for all symbol pairs \n\
|
|
|
|
|
listed in <file>\n\
|
2000-11-03 09:47:13 +08:00
|
|
|
|
--srec-len <number> Restrict the length of generated Srecords\n\
|
|
|
|
|
--srec-forceS3 Restrict the type of generated Srecords to S3\n\
|
2001-05-30 18:46:28 +08:00
|
|
|
|
--strip-symbols <file> -N for all symbols listed in <file>\n\
|
2004-12-16 21:16:33 +08:00
|
|
|
|
--strip-unneeded-symbols <file>\n\
|
|
|
|
|
--strip-unneeded-symbol for all symbols listed\n\
|
|
|
|
|
in <file>\n\
|
2001-05-30 18:46:28 +08:00
|
|
|
|
--keep-symbols <file> -K for all symbols listed in <file>\n\
|
|
|
|
|
--localize-symbols <file> -L for all symbols listed in <file>\n\
|
2005-03-16 01:45:19 +08:00
|
|
|
|
--globalize-symbols <file> --globalize-symbol for all in <file>\n\
|
2001-05-30 18:46:28 +08:00
|
|
|
|
--keep-global-symbols <file> -G for all symbols listed in <file>\n\
|
|
|
|
|
--weaken-symbols <file> -W for all symbols listed in <file>\n\
|
2006-03-01 00:09:01 +08:00
|
|
|
|
--alt-machine-code <index> Use the target's <index>'th alternative machine\n\
|
2003-12-23 21:01:11 +08:00
|
|
|
|
--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\
|
2002-12-13 21:19:44 +08:00
|
|
|
|
--prefix-symbols <prefix> Add <prefix> to start of every symbol name\n\
|
|
|
|
|
--prefix-sections <prefix> Add <prefix> to start of every section name\n\
|
|
|
|
|
--prefix-alloc-sections <prefix>\n\
|
|
|
|
|
Add <prefix> to start of every allocatable\n\
|
|
|
|
|
section name\n\
|
bfd/
2009-04-17 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/10074
* coffcode.h (bfd_pei_p): New.
* config.bfd: Remove bfd_efi_bsdrv_ia32_vec,
bfd_efi_rtdrv_ia32_vec, bfd_efi_bsdrv_x86_64_vec,
bfd_efi_rtdrv_x86_64_vec, bfd_efi_bsdrv_ia64_vec and
bfd_efi_rtdrv_ia64_vec. Replace bfd_efi_app_ia32_vec,
bfd_efi_app_x86_64_vec and bfd_efi_app_ia64_vec with
i386pei_vec, x86_64pei_vec and bfd_pei_ia64_vec, respectively.
* configure.in: Remove bfd_efi_bsdrv_ia32_vec,
bfd_efi_rtdrv_ia32_vec, bfd_efi_bsdrv_x86_64_vec,
bfd_efi_rtdrv_x86_64_vec,
bfd_efi_bsdrv_ia64_vec and bfd_efi_rtdrv_ia64_vec. Replace
bfd_efi_ia64_vec with bfd_pei_ia64_vec.
* targets.c: Likewise.
* configure: Regenerated.
* libcoff.h: Likewise.
* Makefile.in: Likewise.
* efi-app-ia32.c: Removed.
* efi-app-x86_64.c: Likewise.
* efi-bsdrv-ia32.c: Likewise.
* efi-bsdrv-ia64.c: Likewise.
* efi-bsdrv-x86_64.c: Likewise.
* efi-rtdrv-ia32.c: Likewise.
* efi-rtdrv-ia64.c: Likewise.
* efi-rtdrv-x86_64.c: Likewise.
* efi-rtdrv-ia32.c: Likewise.
* efi-app-ia64.c: Moved to ...
* pei-ia64.c: This.
(TARGET_SYM): Set to bfd_pei_ia64_vec.
(TARGET_NAME): Set to pei-ia64.
* libpei.h (bfd_target_pei_p): Removed.
(bfd_target_pei_arch): Likewise.
(bfd_target_efi_app_p): Likewise.
(bfd_target_efi_app_arch): Likewise.
(bfd_target_efi_bsdrv_p): Likewise.
(bfd_target_efi_bsdrv_arch): Likewise.
(bfd_target_efi_rtdrv_p): Likewise.
(bfd_target_efi_rtdrv_arch): Likewise.
(bfd_pe_executable_p): Likewise.
* Makefile.am (BFD32_BACKENDS): Remove efi-app-ia32.lo,
efi-bsdrv-ia32.lo and efi-rtdrv-ia32.lo.
(BFD32_BACKENDS_CFILES): Remove efi-app-ia32.c, efi-bsdrv-ia32.c
and efi-rtdrv-ia32.c.
(BFD64_BACKENDS): Remove efi-app-ia64.lo, efi-bsdrv-ia64.lo,
efi-rtdrv-ia64.lo, efi-app-x86_64.lo, efi-bsdrv-x86_64.lo and
efi-rtdrv-x86_64.lo. Add pei-ia64.lo.
(BFD64_BACKENDS_CFILES): Remove efi-app-ia64.c, efi-bsdrv-ia64.c,
efi-rtdrv-ia64.c, efi-app-x86_64.c, efi-bsdrv-x86_64.c and
efi-rtdrv-x86_64.c. Add pei-ia64.c.
(efi-app-ia64.lo): Removed.
(efi-bsdrv-ia32.lo): Likewise.
(efi-rtdrv-ia32.lo): Likewise.
(efi-app-ia64.lo): Likewise.
(efi-bsdrv-ia64.lo): Likewise.
(efi-rtdrv-ia64.lo): Likewise.
(efi-app-x86_64.lo): Likewise.
(efi-bsdrv-x86_64.lo): Likewise.
(efi-rtdrv-x86_64.lo): Likewise.
(pei-ia64.lo): New.
* peicode.h (coff_swap_scnhdr_in): Replace bfd_pe_executable_p
with bfd_pei_p.
(arch_type): Removed.
(pe_arch): Likewise.
(pe_bfd_object_p): Just return coff_object_p.
* peXXigen.c (_bfd_XXi_swap_scnhdr_out): Replace
bfd_pe_executable_p with bfd_pei_p.
binutils/
2009-04-17 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/10074
* objcopy.c: Include coff/i386.h and coff/pe.h.
(pe_file_alignment): New.
(pe_heap_commit): Likewise.
(pe_heap_reserve): Likewise.
(pe_image_base): Likewise.
(pe_section_alignment): Likewise.
(pe_stack_commit): Likewise.
(pe_stack_reserve): Likewise.
(pe_subsystem): Likewise.
(pe_major_subsystem_version): Likewise.
(pe_minor_subsystem_version): Likewise.
(set_pe_subsystem): Likewise.
(convert_efi_target): Likewise.
(command_line_switch): Add OPTION_FILE_ALIGNMENT,
OPTION_HEAP, OPTION_IMAGE_BASE, OPTION_SECTION_ALIGNMENT,
OPTION_STACK and OPTION_SUBSYSTEM.
(copy_options): Likewise.
(copy_usage): Add --file-alignment, --heap, --image-base,
--section-alignment, --stack and --subsystem.
(copy_object): Set up PE parameters.
(copy_main): Process Add OPTION_FILE_ALIGNMENT,
OPTION_HEAP, OPTION_IMAGE_BASE, OPTION_SECTION_ALIGNMENT,
OPTION_STACK and OPTION_SUBSYSTEM. Convert EFI target to
PEI target.
* NEWS: Mention --file-alignment, --heap, --image-base,
--section-alignment, --stack and --subsystem command line
options for objcopy.
* doc/binutils.texi: Document --file-alignment, --heap,
--image-base, --section-alignment, --stack and --subsystem
command line options for objcopy.
2009-04-17 21:46:18 +08:00
|
|
|
|
--file-alignment <num> Set PE file alignment to <num>\n\
|
|
|
|
|
--heap <reserve>[,<commit>] Set PE reserve/commit heap to <reserve>/\n\
|
|
|
|
|
<commit>\n\
|
|
|
|
|
--image-base <address> Set PE image base to <address>\n\
|
|
|
|
|
--section-alignment <num> Set PE section alignment to <num>\n\
|
|
|
|
|
--stack <reserve>[,<commit>] Set PE reserve/commit stack to <reserve>/\n\
|
|
|
|
|
<commit>\n\
|
|
|
|
|
--subsystem <name>[:<version>]\n\
|
2010-07-18 03:33:11 +08:00
|
|
|
|
Set PE subsystem to <name> [& <version>]\n\
|
2010-10-29 20:10:39 +08:00
|
|
|
|
--compress-debug-sections Compress DWARF debug sections using zlib\n\
|
|
|
|
|
--decompress-debug-sections Decompress DWARF debug sections using zlib\n\
|
1999-11-22 17:42:42 +08:00
|
|
|
|
-v --verbose List all object files modified\n\
|
2005-10-04 03:37:44 +08:00
|
|
|
|
@<file> Read options from <file>\n\
|
1999-11-22 17:42:42 +08:00
|
|
|
|
-V --version Display this program's version number\n\
|
|
|
|
|
-h --help Display this output\n\
|
2003-03-25 00:11:46 +08:00
|
|
|
|
--info List object formats & architectures supported\n\
|
1999-11-22 17:42:42 +08:00
|
|
|
|
"));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
list_supported_targets (program_name, stream);
|
2007-02-17 21:33:57 +08:00
|
|
|
|
if (REPORT_BUGS_TO[0] && exit_status == 0)
|
2000-04-04 22:32:35 +08:00
|
|
|
|
fprintf (stream, _("Report bugs to %s\n"), REPORT_BUGS_TO);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
exit (exit_status);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2003-07-24 01:34:03 +08:00
|
|
|
|
strip_usage (FILE *stream, int exit_status)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2002-01-24 00:12:56 +08:00
|
|
|
|
fprintf (stream, _("Usage: %s <option(s)> in-file(s)\n"), program_name);
|
|
|
|
|
fprintf (stream, _(" Removes symbols and sections from files\n"));
|
2002-01-16 01:18:53 +08:00
|
|
|
|
fprintf (stream, _(" The options are:\n"));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
fprintf (stream, _("\
|
2002-01-24 00:12:56 +08:00
|
|
|
|
-I --input-target=<bfdname> Assume input file is in format <bfdname>\n\
|
|
|
|
|
-O --output-target=<bfdname> Create an output file in format <bfdname>\n\
|
|
|
|
|
-F --target=<bfdname> Set both input and output format to <bfdname>\n\
|
1999-11-22 17:42:42 +08:00
|
|
|
|
-p --preserve-dates Copy modified/access timestamps to the output\n\
|
2002-01-24 00:12:56 +08:00
|
|
|
|
-R --remove-section=<name> Remove section <name> from the output\n\
|
1999-11-22 17:42:42 +08:00
|
|
|
|
-s --strip-all Remove all symbol and relocation information\n\
|
2003-06-12 15:23:31 +08:00
|
|
|
|
-g -S -d --strip-debug Remove all debugging symbols & sections\n\
|
1999-11-22 17:42:42 +08:00
|
|
|
|
--strip-unneeded Remove all symbols not needed by relocations\n\
|
2003-12-11 21:22:51 +08:00
|
|
|
|
--only-keep-debug Strip everything but the debug information\n\
|
2002-01-24 00:12:56 +08:00
|
|
|
|
-N --strip-symbol=<name> Do not copy symbol <name>\n\
|
2005-04-25 17:25:57 +08:00
|
|
|
|
-K --keep-symbol=<name> Do not strip symbol <name>\n\
|
2005-11-15 16:33:38 +08:00
|
|
|
|
--keep-file-symbols Do not strip file symbol(s)\n\
|
2004-04-27 14:31:16 +08:00
|
|
|
|
-w --wildcard Permit wildcard in symbol comparison\n\
|
1999-11-22 17:42:42 +08:00
|
|
|
|
-x --discard-all Remove all non-global symbols\n\
|
|
|
|
|
-X --discard-locals Remove any compiler-generated symbols\n\
|
|
|
|
|
-v --verbose List all object files modified\n\
|
|
|
|
|
-V --version Display this program's version number\n\
|
|
|
|
|
-h --help Display this output\n\
|
2003-03-25 00:11:46 +08:00
|
|
|
|
--info List object formats & architectures supported\n\
|
1999-11-22 17:42:42 +08:00
|
|
|
|
-o <file> Place stripped output into <file>\n\
|
|
|
|
|
"));
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
list_supported_targets (program_name, stream);
|
2007-02-17 21:33:57 +08:00
|
|
|
|
if (REPORT_BUGS_TO[0] && exit_status == 0)
|
2000-04-04 22:32:35 +08:00
|
|
|
|
fprintf (stream, _("Report bugs to %s\n"), REPORT_BUGS_TO);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
exit (exit_status);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Parse section flags into a flagword, with a fatal error if the
|
|
|
|
|
string can't be parsed. */
|
|
|
|
|
|
|
|
|
|
static flagword
|
2003-07-24 01:34:03 +08:00
|
|
|
|
parse_flags (const char *s)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
flagword ret;
|
|
|
|
|
const char *snext;
|
|
|
|
|
int len;
|
|
|
|
|
|
|
|
|
|
ret = SEC_NO_FLAGS;
|
|
|
|
|
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
snext = strchr (s, ',');
|
|
|
|
|
if (snext == NULL)
|
|
|
|
|
len = strlen (s);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
len = snext - s;
|
|
|
|
|
++snext;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (0) ;
|
|
|
|
|
#define PARSE_FLAG(fname,fval) \
|
|
|
|
|
else if (strncasecmp (fname, s, len) == 0) ret |= fval
|
|
|
|
|
PARSE_FLAG ("alloc", SEC_ALLOC);
|
|
|
|
|
PARSE_FLAG ("load", SEC_LOAD);
|
1999-09-13 02:33:05 +08:00
|
|
|
|
PARSE_FLAG ("noload", SEC_NEVER_LOAD);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
PARSE_FLAG ("readonly", SEC_READONLY);
|
1999-09-13 02:33:05 +08:00
|
|
|
|
PARSE_FLAG ("debug", SEC_DEBUGGING);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
PARSE_FLAG ("code", SEC_CODE);
|
|
|
|
|
PARSE_FLAG ("data", SEC_DATA);
|
|
|
|
|
PARSE_FLAG ("rom", SEC_ROM);
|
2005-02-22 08:50:07 +08:00
|
|
|
|
PARSE_FLAG ("share", SEC_COFF_SHARED);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
PARSE_FLAG ("contents", SEC_HAS_CONTENTS);
|
|
|
|
|
#undef PARSE_FLAG
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
char *copy;
|
|
|
|
|
|
2009-09-10 21:40:44 +08:00
|
|
|
|
copy = (char *) xmalloc (len + 1);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
strncpy (copy, s, len);
|
|
|
|
|
copy[len] = '\0';
|
|
|
|
|
non_fatal (_("unrecognized section flag `%s'"), copy);
|
2000-04-05 11:43:56 +08:00
|
|
|
|
fatal (_("supported flags: %s"),
|
|
|
|
|
"alloc, load, noload, readonly, debug, code, data, rom, share, contents");
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
s = snext;
|
|
|
|
|
}
|
|
|
|
|
while (s != NULL);
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Find and optionally add an entry in the change_sections list. */
|
|
|
|
|
|
|
|
|
|
static struct section_list *
|
2003-07-24 01:34:03 +08:00
|
|
|
|
find_section_list (const char *name, bfd_boolean add)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2003-07-24 01:34:03 +08:00
|
|
|
|
struct section_list *p;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
for (p = change_sections; p != NULL; p = p->next)
|
|
|
|
|
if (strcmp (p->name, name) == 0)
|
|
|
|
|
return p;
|
|
|
|
|
|
|
|
|
|
if (! add)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
2009-09-10 21:40:44 +08:00
|
|
|
|
p = (struct section_list *) xmalloc (sizeof (struct section_list));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
p->name = name;
|
2002-11-30 16:39:46 +08:00
|
|
|
|
p->used = FALSE;
|
|
|
|
|
p->remove = FALSE;
|
|
|
|
|
p->copy = FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
p->change_vma = CHANGE_IGNORE;
|
|
|
|
|
p->change_lma = CHANGE_IGNORE;
|
|
|
|
|
p->vma_val = 0;
|
|
|
|
|
p->lma_val = 0;
|
2002-11-30 16:39:46 +08:00
|
|
|
|
p->set_flags = FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
p->flags = 0;
|
|
|
|
|
|
|
|
|
|
p->next = change_sections;
|
|
|
|
|
change_sections = p;
|
|
|
|
|
|
|
|
|
|
return p;
|
|
|
|
|
}
|
|
|
|
|
|
2008-04-16 16:24:21 +08:00
|
|
|
|
/* There is htab_hash_string but no htab_eq_string. Makes sense. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
eq_string (const void *s1, const void *s2)
|
|
|
|
|
{
|
2009-09-10 21:40:44 +08:00
|
|
|
|
return strcmp ((const char *) s1, (const char *) s2) == 0;
|
2008-04-16 16:24:21 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static htab_t
|
|
|
|
|
create_symbol_htab (void)
|
|
|
|
|
{
|
|
|
|
|
return htab_create_alloc (16, htab_hash_string, eq_string, NULL, xcalloc, free);
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2000-04-05 11:43:56 +08:00
|
|
|
|
static void
|
2008-04-16 16:24:21 +08:00
|
|
|
|
create_symbol_htabs (void)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2008-04-16 16:24:21 +08:00
|
|
|
|
strip_specific_htab = create_symbol_htab ();
|
|
|
|
|
strip_unneeded_htab = create_symbol_htab ();
|
|
|
|
|
keep_specific_htab = create_symbol_htab ();
|
|
|
|
|
localize_specific_htab = create_symbol_htab ();
|
|
|
|
|
globalize_specific_htab = create_symbol_htab ();
|
|
|
|
|
keepglobal_specific_htab = create_symbol_htab ();
|
|
|
|
|
weaken_specific_htab = create_symbol_htab ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Add a symbol to strip_specific_list. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2008-04-16 16:24:21 +08:00
|
|
|
|
static void
|
|
|
|
|
add_specific_symbol (const char *name, htab_t htab)
|
|
|
|
|
{
|
|
|
|
|
*htab_find_slot (htab, name, INSERT) = (char *) name;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
2002-05-22 03:34:58 +08:00
|
|
|
|
/* Add symbols listed in `filename' to strip_specific_list. */
|
2001-05-30 18:46:28 +08:00
|
|
|
|
|
|
|
|
|
#define IS_WHITESPACE(c) ((c) == ' ' || (c) == '\t')
|
|
|
|
|
#define IS_LINE_TERMINATOR(c) ((c) == '\n' || (c) == '\r' || (c) == '\0')
|
|
|
|
|
|
|
|
|
|
static void
|
2008-04-16 16:24:21 +08:00
|
|
|
|
add_specific_symbols (const char *filename, htab_t htab)
|
2001-05-30 18:46:28 +08:00
|
|
|
|
{
|
2003-11-07 20:19:34 +08:00
|
|
|
|
off_t size;
|
2001-05-30 18:46:28 +08:00
|
|
|
|
FILE * f;
|
|
|
|
|
char * line;
|
|
|
|
|
char * buffer;
|
|
|
|
|
unsigned int line_count;
|
2002-05-22 03:34:58 +08:00
|
|
|
|
|
2003-11-07 20:19:34 +08:00
|
|
|
|
size = get_file_size (filename);
|
|
|
|
|
if (size == 0)
|
2006-08-06 23:49:46 +08:00
|
|
|
|
{
|
|
|
|
|
status = 1;
|
|
|
|
|
return;
|
|
|
|
|
}
|
2001-05-30 18:46:28 +08:00
|
|
|
|
|
2009-09-10 21:40:44 +08:00
|
|
|
|
buffer = (char *) xmalloc (size + 2);
|
2001-05-30 18:46:28 +08:00
|
|
|
|
f = fopen (filename, FOPEN_RT);
|
|
|
|
|
if (f == NULL)
|
2003-11-07 20:19:34 +08:00
|
|
|
|
fatal (_("cannot open '%s': %s"), filename, strerror (errno));
|
2001-05-30 18:46:28 +08:00
|
|
|
|
|
2003-11-07 20:19:34 +08:00
|
|
|
|
if (fread (buffer, 1, size, f) == 0 || ferror (f))
|
2001-05-30 18:46:28 +08:00
|
|
|
|
fatal (_("%s: fread failed"), filename);
|
|
|
|
|
|
|
|
|
|
fclose (f);
|
2003-11-07 20:19:34 +08:00
|
|
|
|
buffer [size] = '\n';
|
|
|
|
|
buffer [size + 1] = '\0';
|
2001-05-30 18:46:28 +08:00
|
|
|
|
|
|
|
|
|
line_count = 1;
|
2002-05-22 03:34:58 +08:00
|
|
|
|
|
2001-05-30 18:46:28 +08:00
|
|
|
|
for (line = buffer; * line != '\0'; line ++)
|
|
|
|
|
{
|
|
|
|
|
char * eol;
|
|
|
|
|
char * name;
|
|
|
|
|
char * name_end;
|
2002-11-30 16:39:46 +08:00
|
|
|
|
int finished = FALSE;
|
2001-05-30 18:46:28 +08:00
|
|
|
|
|
|
|
|
|
for (eol = line;; eol ++)
|
|
|
|
|
{
|
|
|
|
|
switch (* eol)
|
|
|
|
|
{
|
|
|
|
|
case '\n':
|
|
|
|
|
* eol = '\0';
|
|
|
|
|
/* Cope with \n\r. */
|
|
|
|
|
if (eol[1] == '\r')
|
|
|
|
|
++ eol;
|
2002-11-30 16:39:46 +08:00
|
|
|
|
finished = TRUE;
|
2001-05-30 18:46:28 +08:00
|
|
|
|
break;
|
2002-05-22 03:34:58 +08:00
|
|
|
|
|
2001-05-30 18:46:28 +08:00
|
|
|
|
case '\r':
|
|
|
|
|
* eol = '\0';
|
|
|
|
|
/* Cope with \r\n. */
|
|
|
|
|
if (eol[1] == '\n')
|
|
|
|
|
++ eol;
|
2002-11-30 16:39:46 +08:00
|
|
|
|
finished = TRUE;
|
2001-05-30 18:46:28 +08:00
|
|
|
|
break;
|
2002-05-22 03:34:58 +08:00
|
|
|
|
|
2001-05-30 18:46:28 +08:00
|
|
|
|
case 0:
|
2002-11-30 16:39:46 +08:00
|
|
|
|
finished = TRUE;
|
2001-05-30 18:46:28 +08:00
|
|
|
|
break;
|
2002-05-22 03:34:58 +08:00
|
|
|
|
|
2001-05-30 18:46:28 +08:00
|
|
|
|
case '#':
|
|
|
|
|
/* Line comment, Terminate the line here, in case a
|
|
|
|
|
name is present and then allow the rest of the
|
|
|
|
|
loop to find the real end of the line. */
|
|
|
|
|
* eol = '\0';
|
|
|
|
|
break;
|
2002-05-22 03:34:58 +08:00
|
|
|
|
|
2001-05-30 18:46:28 +08:00
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (finished)
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* A name may now exist somewhere between 'line' and 'eol'.
|
|
|
|
|
Strip off leading whitespace and trailing whitespace,
|
|
|
|
|
then add it to the list. */
|
|
|
|
|
for (name = line; IS_WHITESPACE (* name); name ++)
|
|
|
|
|
;
|
|
|
|
|
for (name_end = name;
|
|
|
|
|
(! IS_WHITESPACE (* name_end))
|
|
|
|
|
&& (! IS_LINE_TERMINATOR (* name_end));
|
2002-05-22 03:34:58 +08:00
|
|
|
|
name_end ++)
|
|
|
|
|
;
|
2001-05-30 18:46:28 +08:00
|
|
|
|
|
|
|
|
|
if (! IS_LINE_TERMINATOR (* name_end))
|
|
|
|
|
{
|
|
|
|
|
char * extra;
|
|
|
|
|
|
|
|
|
|
for (extra = name_end + 1; IS_WHITESPACE (* extra); extra ++)
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
if (! IS_LINE_TERMINATOR (* extra))
|
2004-10-18 22:04:40 +08:00
|
|
|
|
non_fatal (_("%s:%d: Ignoring rubbish found on this line"),
|
|
|
|
|
filename, line_count);
|
2001-05-30 18:46:28 +08:00
|
|
|
|
}
|
2002-05-22 03:34:58 +08:00
|
|
|
|
|
2001-05-30 18:46:28 +08:00
|
|
|
|
* name_end = '\0';
|
|
|
|
|
|
|
|
|
|
if (name_end > name)
|
2008-04-16 16:24:21 +08:00
|
|
|
|
add_specific_symbol (name, htab);
|
2001-05-30 18:46:28 +08:00
|
|
|
|
|
|
|
|
|
/* Advance line pointer to end of line. The 'eol ++' in the for
|
|
|
|
|
loop above will then advance us to the start of the next line. */
|
|
|
|
|
line = eol;
|
|
|
|
|
line_count ++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2008-04-16 16:24:21 +08:00
|
|
|
|
/* See whether a symbol should be stripped or kept
|
|
|
|
|
based on strip_specific_list and keep_symbols. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2008-04-16 16:24:21 +08:00
|
|
|
|
static int
|
|
|
|
|
is_specified_symbol_predicate (void **slot, void *data)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2009-09-10 21:40:44 +08:00
|
|
|
|
struct is_specified_symbol_predicate_data *d =
|
|
|
|
|
(struct is_specified_symbol_predicate_data *) data;
|
|
|
|
|
const char *slot_name = (char *) *slot;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2008-04-16 16:24:21 +08:00
|
|
|
|
if (*slot_name != '!')
|
2003-11-12 01:50:26 +08:00
|
|
|
|
{
|
2008-04-16 16:24:21 +08:00
|
|
|
|
if (! fnmatch (slot_name, d->name, 0))
|
|
|
|
|
{
|
|
|
|
|
d->found = TRUE;
|
|
|
|
|
/* Stop traversal. */
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2003-11-12 01:50:26 +08:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2008-04-16 16:24:21 +08:00
|
|
|
|
if (fnmatch (slot_name + 1, d->name, 0))
|
|
|
|
|
{
|
|
|
|
|
d->found = TRUE;
|
|
|
|
|
/* Stop traversal. */
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2003-11-12 01:50:26 +08:00
|
|
|
|
}
|
2001-07-31 21:49:39 +08:00
|
|
|
|
|
2008-04-16 16:24:21 +08:00
|
|
|
|
/* Continue traversal. */
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
|
is_specified_symbol (const char *name, htab_t htab)
|
|
|
|
|
{
|
|
|
|
|
if (wildcard)
|
|
|
|
|
{
|
|
|
|
|
struct is_specified_symbol_predicate_data data;
|
|
|
|
|
|
|
|
|
|
data.name = name;
|
|
|
|
|
data.found = FALSE;
|
|
|
|
|
|
|
|
|
|
htab_traverse (htab, is_specified_symbol_predicate, &data);
|
|
|
|
|
|
|
|
|
|
return data.found;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return htab_find (htab, name) != NULL;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
2006-09-14 20:11:33 +08:00
|
|
|
|
/* Return a pointer to the symbol used as a signature for GROUP. */
|
|
|
|
|
|
|
|
|
|
static asymbol *
|
|
|
|
|
group_signature (asection *group)
|
|
|
|
|
{
|
|
|
|
|
bfd *abfd = group->owner;
|
|
|
|
|
Elf_Internal_Shdr *ghdr;
|
|
|
|
|
|
|
|
|
|
if (bfd_get_flavour (abfd) != bfd_target_elf_flavour)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
ghdr = &elf_section_data (group)->this_hdr;
|
|
|
|
|
if (ghdr->sh_link < elf_numsections (abfd))
|
|
|
|
|
{
|
|
|
|
|
const struct elf_backend_data *bed = get_elf_backend_data (abfd);
|
|
|
|
|
Elf_Internal_Shdr *symhdr = elf_elfsections (abfd) [ghdr->sh_link];
|
|
|
|
|
|
|
|
|
|
if (symhdr->sh_type == SHT_SYMTAB
|
|
|
|
|
&& ghdr->sh_info < symhdr->sh_size / bed->s->sizeof_sym)
|
2006-09-15 07:37:35 +08:00
|
|
|
|
return isympp[ghdr->sh_info - 1];
|
2006-09-14 20:11:33 +08:00
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* See if a section is being removed. */
|
|
|
|
|
|
2002-11-30 16:39:46 +08:00
|
|
|
|
static bfd_boolean
|
2003-07-24 01:34:03 +08:00
|
|
|
|
is_strip_section (bfd *abfd ATTRIBUTE_UNUSED, asection *sec)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2003-06-12 15:23:31 +08:00
|
|
|
|
if (sections_removed || sections_copied)
|
|
|
|
|
{
|
|
|
|
|
struct section_list *p;
|
|
|
|
|
|
|
|
|
|
p = find_section_list (bfd_get_section_name (abfd, sec), FALSE);
|
|
|
|
|
|
|
|
|
|
if (sections_removed && p != NULL && p->remove)
|
|
|
|
|
return TRUE;
|
|
|
|
|
if (sections_copied && (p == NULL || ! p->copy))
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2003-06-12 15:23:31 +08:00
|
|
|
|
if ((bfd_get_section_flags (abfd, sec) & SEC_DEBUGGING) != 0)
|
|
|
|
|
{
|
|
|
|
|
if (strip_symbols == STRIP_DEBUG
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|| strip_symbols == STRIP_UNNEEDED
|
|
|
|
|
|| strip_symbols == STRIP_ALL
|
|
|
|
|
|| discard_locals == LOCALS_ALL
|
2003-06-12 15:23:31 +08:00
|
|
|
|
|| convert_debugging)
|
|
|
|
|
return TRUE;
|
2003-06-26 16:14:10 +08:00
|
|
|
|
|
|
|
|
|
if (strip_symbols == STRIP_NONDEBUG)
|
|
|
|
|
return FALSE;
|
2003-06-12 15:23:31 +08:00
|
|
|
|
}
|
1999-06-12 23:42:04 +08:00
|
|
|
|
|
2006-09-14 20:11:33 +08:00
|
|
|
|
if ((bfd_get_section_flags (abfd, sec) & SEC_GROUP) != 0)
|
|
|
|
|
{
|
|
|
|
|
asymbol *gsym;
|
|
|
|
|
const char *gname;
|
|
|
|
|
|
|
|
|
|
/* PR binutils/3181
|
|
|
|
|
If we are going to strip the group signature symbol, then
|
|
|
|
|
strip the group section too. */
|
|
|
|
|
gsym = group_signature (sec);
|
|
|
|
|
if (gsym != NULL)
|
|
|
|
|
gname = gsym->name;
|
|
|
|
|
else
|
|
|
|
|
gname = sec->name;
|
|
|
|
|
if ((strip_symbols == STRIP_ALL
|
2008-04-16 16:24:21 +08:00
|
|
|
|
&& !is_specified_symbol (gname, keep_specific_htab))
|
|
|
|
|
|| is_specified_symbol (gname, strip_specific_htab))
|
2006-09-14 20:11:33 +08:00
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
2006-09-05 16:22:27 +08:00
|
|
|
|
|
2004-01-13 23:41:00 +08:00
|
|
|
|
return FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
2006-06-24 00:23:09 +08:00
|
|
|
|
/* Return true if SYM is a hidden symbol. */
|
|
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
|
is_hidden_symbol (asymbol *sym)
|
|
|
|
|
{
|
|
|
|
|
elf_symbol_type *elf_sym;
|
|
|
|
|
|
|
|
|
|
elf_sym = elf_symbol_from (sym->the_bfd, sym);
|
|
|
|
|
if (elf_sym != NULL)
|
|
|
|
|
switch (ELF_ST_VISIBILITY (elf_sym->internal_elf_sym.st_other))
|
|
|
|
|
{
|
|
|
|
|
case STV_HIDDEN:
|
|
|
|
|
case STV_INTERNAL:
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* 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. */
|
|
|
|
|
|
|
|
|
|
static unsigned int
|
2003-07-24 01:34:03 +08:00
|
|
|
|
filter_symbols (bfd *abfd, bfd *obfd, asymbol **osyms,
|
|
|
|
|
asymbol **isyms, long symcount)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2003-07-24 01:34:03 +08:00
|
|
|
|
asymbol **from = isyms, **to = osyms;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
long src_count = 0, dst_count = 0;
|
2007-07-02 16:05:06 +08:00
|
|
|
|
int relocatable = (abfd->flags & (EXEC_P | DYNAMIC)) == 0;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
for (; src_count < symcount; src_count++)
|
|
|
|
|
{
|
|
|
|
|
asymbol *sym = from[src_count];
|
|
|
|
|
flagword flags = sym->flags;
|
2002-12-13 21:19:44 +08:00
|
|
|
|
char *name = (char *) bfd_asymbol_name (sym);
|
2007-04-24 18:56:58 +08:00
|
|
|
|
bfd_boolean keep;
|
|
|
|
|
bfd_boolean used_in_reloc = FALSE;
|
2002-11-30 16:39:46 +08:00
|
|
|
|
bfd_boolean undefined;
|
2002-12-13 21:19:44 +08:00
|
|
|
|
bfd_boolean rem_leading_char;
|
|
|
|
|
bfd_boolean add_leading_char;
|
|
|
|
|
|
|
|
|
|
undefined = bfd_is_und_section (bfd_get_section (sym));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2000-04-05 11:43:56 +08:00
|
|
|
|
if (redefine_sym_list)
|
|
|
|
|
{
|
2002-12-13 21:19:44 +08:00
|
|
|
|
char *old_name, *new_name;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
2002-12-13 21:19:44 +08:00
|
|
|
|
old_name = (char *) bfd_asymbol_name (sym);
|
|
|
|
|
new_name = (char *) lookup_sym_redefinition (old_name);
|
2003-02-21 09:12:13 +08:00
|
|
|
|
bfd_asymbol_name (sym) = new_name;
|
|
|
|
|
name = new_name;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
}
|
|
|
|
|
|
2002-12-13 21:19:44 +08:00
|
|
|
|
/* Check if we will remove the current leading character. */
|
|
|
|
|
rem_leading_char =
|
|
|
|
|
(name[0] == bfd_get_symbol_leading_char (abfd))
|
|
|
|
|
&& (change_leading_char
|
|
|
|
|
|| (remove_leading_char
|
|
|
|
|
&& ((flags & (BSF_GLOBAL | BSF_WEAK)) != 0
|
|
|
|
|
|| undefined
|
|
|
|
|
|| bfd_is_com_section (bfd_get_section (sym)))));
|
|
|
|
|
|
|
|
|
|
/* Check if we will add a new leading character. */
|
|
|
|
|
add_leading_char =
|
|
|
|
|
change_leading_char
|
|
|
|
|
&& (bfd_get_symbol_leading_char (obfd) != '\0')
|
|
|
|
|
&& (bfd_get_symbol_leading_char (abfd) == '\0'
|
|
|
|
|
|| (name[0] == bfd_get_symbol_leading_char (abfd)));
|
|
|
|
|
|
|
|
|
|
/* Short circuit for change_leading_char if we can do it in-place. */
|
|
|
|
|
if (rem_leading_char && add_leading_char && !prefix_symbols_string)
|
|
|
|
|
{
|
|
|
|
|
name[0] = bfd_get_symbol_leading_char (obfd);
|
|
|
|
|
bfd_asymbol_name (sym) = name;
|
|
|
|
|
rem_leading_char = FALSE;
|
|
|
|
|
add_leading_char = FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Remove leading char. */
|
|
|
|
|
if (rem_leading_char)
|
2003-02-21 09:12:13 +08:00
|
|
|
|
bfd_asymbol_name (sym) = ++name;
|
2002-12-13 21:19:44 +08:00
|
|
|
|
|
|
|
|
|
/* Add new leading char and/or prefix. */
|
|
|
|
|
if (add_leading_char || prefix_symbols_string)
|
|
|
|
|
{
|
|
|
|
|
char *n, *ptr;
|
|
|
|
|
|
2009-09-10 21:40:44 +08:00
|
|
|
|
ptr = n = (char *) xmalloc (1 + strlen (prefix_symbols_string)
|
|
|
|
|
+ strlen (name) + 1);
|
2002-12-13 21:19:44 +08:00
|
|
|
|
if (add_leading_char)
|
|
|
|
|
*ptr++ = bfd_get_symbol_leading_char (obfd);
|
|
|
|
|
|
|
|
|
|
if (prefix_symbols_string)
|
|
|
|
|
{
|
|
|
|
|
strcpy (ptr, prefix_symbols_string);
|
|
|
|
|
ptr += strlen (prefix_symbols_string);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
strcpy (ptr, name);
|
2003-02-21 09:12:13 +08:00
|
|
|
|
bfd_asymbol_name (sym) = n;
|
|
|
|
|
name = n;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (strip_symbols == STRIP_ALL)
|
2007-04-24 18:56:58 +08:00
|
|
|
|
keep = FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
else if ((flags & BSF_KEEP) != 0 /* Used in relocation. */
|
|
|
|
|
|| ((flags & BSF_SECTION_SYM) != 0
|
|
|
|
|
&& ((*bfd_get_section (sym)->symbol_ptr_ptr)->flags
|
|
|
|
|
& BSF_KEEP) != 0))
|
2007-04-24 18:56:58 +08:00
|
|
|
|
{
|
|
|
|
|
keep = TRUE;
|
|
|
|
|
used_in_reloc = TRUE;
|
|
|
|
|
}
|
2002-05-22 03:34:58 +08:00
|
|
|
|
else if (relocatable /* Relocatable file. */
|
2009-03-10 08:48:10 +08:00
|
|
|
|
&& ((flags & (BSF_GLOBAL | BSF_WEAK)) != 0
|
|
|
|
|
|| bfd_is_com_section (bfd_get_section (sym))))
|
2007-04-24 18:56:58 +08:00
|
|
|
|
keep = TRUE;
|
2001-05-30 18:46:28 +08:00
|
|
|
|
else if (bfd_decode_symclass (sym) == 'I')
|
|
|
|
|
/* Global symbols in $idata sections need to be retained
|
2002-11-30 16:39:46 +08:00
|
|
|
|
even if relocatable is FALSE. External users of the
|
2001-05-30 18:46:28 +08:00
|
|
|
|
library containing the $idata section may reference these
|
|
|
|
|
symbols. */
|
2007-04-24 18:56:58 +08:00
|
|
|
|
keep = TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
else if ((flags & BSF_GLOBAL) != 0 /* Global symbol. */
|
|
|
|
|
|| (flags & BSF_WEAK) != 0
|
2001-07-05 15:27:16 +08:00
|
|
|
|
|| undefined
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|| bfd_is_com_section (bfd_get_section (sym)))
|
|
|
|
|
keep = strip_symbols != STRIP_UNNEEDED;
|
|
|
|
|
else if ((flags & BSF_DEBUGGING) != 0) /* Debugging symbol. */
|
|
|
|
|
keep = (strip_symbols != STRIP_DEBUG
|
|
|
|
|
&& strip_symbols != STRIP_UNNEEDED
|
|
|
|
|
&& ! convert_debugging);
|
2004-07-21 23:42:58 +08:00
|
|
|
|
else if (bfd_coff_get_comdat_section (abfd, bfd_get_section (sym)))
|
2001-06-22 17:02:05 +08:00
|
|
|
|
/* COMDAT sections store special information in local
|
|
|
|
|
symbols, so we cannot risk stripping any of them. */
|
2007-04-24 18:56:58 +08:00
|
|
|
|
keep = TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
else /* Local symbol. */
|
|
|
|
|
keep = (strip_symbols != STRIP_UNNEEDED
|
|
|
|
|
&& (discard_locals != LOCALS_ALL
|
|
|
|
|
&& (discard_locals != LOCALS_START_L
|
|
|
|
|
|| ! bfd_is_local_label (abfd, sym))));
|
|
|
|
|
|
2008-04-16 16:24:21 +08:00
|
|
|
|
if (keep && is_specified_symbol (name, strip_specific_htab))
|
2007-04-24 18:56:58 +08:00
|
|
|
|
{
|
|
|
|
|
/* There are multiple ways to set 'keep' above, but if it
|
|
|
|
|
was the relocatable symbol case, then that's an error. */
|
|
|
|
|
if (used_in_reloc)
|
|
|
|
|
{
|
|
|
|
|
non_fatal (_("not stripping symbol `%s' because it is named in a relocation"), name);
|
|
|
|
|
status = 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
keep = FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
2004-12-16 21:16:33 +08:00
|
|
|
|
if (keep
|
|
|
|
|
&& !(flags & BSF_KEEP)
|
2008-04-16 16:24:21 +08:00
|
|
|
|
&& is_specified_symbol (name, strip_unneeded_htab))
|
2007-04-24 18:56:58 +08:00
|
|
|
|
keep = FALSE;
|
|
|
|
|
|
2005-11-15 16:33:38 +08:00
|
|
|
|
if (!keep
|
|
|
|
|
&& ((keep_file_symbols && (flags & BSF_FILE))
|
2008-04-16 16:24:21 +08:00
|
|
|
|
|| is_specified_symbol (name, keep_specific_htab)))
|
2007-04-24 18:56:58 +08:00
|
|
|
|
keep = TRUE;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (keep && is_strip_section (abfd, bfd_get_section (sym)))
|
2007-04-24 18:56:58 +08:00
|
|
|
|
keep = FALSE;
|
2001-07-05 15:49:05 +08:00
|
|
|
|
|
2005-03-16 01:45:19 +08:00
|
|
|
|
if (keep)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2005-03-16 01:45:19 +08:00
|
|
|
|
if ((flags & BSF_GLOBAL) != 0
|
2008-04-16 16:24:21 +08:00
|
|
|
|
&& (weaken || is_specified_symbol (name, weaken_specific_htab)))
|
2005-03-16 01:45:19 +08:00
|
|
|
|
{
|
|
|
|
|
sym->flags &= ~ BSF_GLOBAL;
|
|
|
|
|
sym->flags |= BSF_WEAK;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2005-03-16 01:45:19 +08:00
|
|
|
|
if (!undefined
|
|
|
|
|
&& (flags & (BSF_GLOBAL | BSF_WEAK))
|
2008-04-16 16:24:21 +08:00
|
|
|
|
&& (is_specified_symbol (name, localize_specific_htab)
|
|
|
|
|
|| (htab_elements (keepglobal_specific_htab) != 0
|
|
|
|
|
&& ! is_specified_symbol (name, keepglobal_specific_htab))
|
2006-06-24 00:23:09 +08:00
|
|
|
|
|| (localize_hidden && is_hidden_symbol (sym))))
|
2005-03-16 01:45:19 +08:00
|
|
|
|
{
|
|
|
|
|
sym->flags &= ~ (BSF_GLOBAL | BSF_WEAK);
|
|
|
|
|
sym->flags |= BSF_LOCAL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!undefined
|
2007-06-29 08:34:14 +08:00
|
|
|
|
&& (flags & BSF_LOCAL)
|
2008-04-16 16:24:21 +08:00
|
|
|
|
&& is_specified_symbol (name, globalize_specific_htab))
|
2005-03-16 01:45:19 +08:00
|
|
|
|
{
|
|
|
|
|
sym->flags &= ~ BSF_LOCAL;
|
|
|
|
|
sym->flags |= BSF_GLOBAL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
to[dst_count++] = sym;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
to[dst_count] = NULL;
|
|
|
|
|
|
|
|
|
|
return dst_count;
|
|
|
|
|
}
|
|
|
|
|
|
2001-07-31 21:49:39 +08:00
|
|
|
|
/* Find the redefined name of symbol SOURCE. */
|
|
|
|
|
|
2000-04-05 11:43:56 +08:00
|
|
|
|
static const char *
|
2003-07-24 01:34:03 +08:00
|
|
|
|
lookup_sym_redefinition (const char *source)
|
2000-04-05 11:43:56 +08:00
|
|
|
|
{
|
|
|
|
|
struct redefine_node *list;
|
|
|
|
|
|
|
|
|
|
for (list = redefine_sym_list; list != NULL; list = list->next)
|
2001-07-31 21:49:39 +08:00
|
|
|
|
if (strcmp (source, list->source) == 0)
|
|
|
|
|
return list->target;
|
|
|
|
|
|
|
|
|
|
return source;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
}
|
|
|
|
|
|
2001-07-31 21:49:39 +08:00
|
|
|
|
/* Add a node to a symbol redefine list. */
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
|
|
|
|
static void
|
2003-07-24 01:34:03 +08:00
|
|
|
|
redefine_list_append (const char *cause, const char *source, const char *target)
|
2000-04-05 11:43:56 +08:00
|
|
|
|
{
|
|
|
|
|
struct redefine_node **p;
|
|
|
|
|
struct redefine_node *list;
|
|
|
|
|
struct redefine_node *new_node;
|
|
|
|
|
|
|
|
|
|
for (p = &redefine_sym_list; (list = *p) != NULL; p = &list->next)
|
|
|
|
|
{
|
|
|
|
|
if (strcmp (source, list->source) == 0)
|
2001-07-31 21:49:39 +08:00
|
|
|
|
fatal (_("%s: Multiple redefinition of symbol \"%s\""),
|
2003-06-02 22:45:13 +08:00
|
|
|
|
cause, source);
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
|
|
|
|
if (strcmp (target, list->target) == 0)
|
2001-07-31 21:49:39 +08:00
|
|
|
|
fatal (_("%s: Symbol \"%s\" is target of more than one redefinition"),
|
2003-06-02 22:45:13 +08:00
|
|
|
|
cause, target);
|
2000-04-05 11:43:56 +08:00
|
|
|
|
}
|
|
|
|
|
|
2009-09-10 21:40:44 +08:00
|
|
|
|
new_node = (struct redefine_node *) xmalloc (sizeof (struct redefine_node));
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
|
|
|
|
new_node->source = strdup (source);
|
|
|
|
|
new_node->target = strdup (target);
|
|
|
|
|
new_node->next = NULL;
|
|
|
|
|
|
|
|
|
|
*p = new_node;
|
|
|
|
|
}
|
|
|
|
|
|
2003-06-02 22:45:13 +08:00
|
|
|
|
/* Handle the --redefine-syms option. Read lines containing "old new"
|
|
|
|
|
from the file, and add them to the symbol redefine list. */
|
|
|
|
|
|
2003-06-12 15:23:31 +08:00
|
|
|
|
static void
|
2003-07-24 01:34:03 +08:00
|
|
|
|
add_redefine_syms_file (const char *filename)
|
2003-06-02 22:45:13 +08:00
|
|
|
|
{
|
|
|
|
|
FILE *file;
|
|
|
|
|
char *buf;
|
2003-07-24 01:34:03 +08:00
|
|
|
|
size_t bufsize;
|
|
|
|
|
size_t len;
|
|
|
|
|
size_t outsym_off;
|
2003-06-02 22:45:13 +08:00
|
|
|
|
int c, lineno;
|
|
|
|
|
|
|
|
|
|
file = fopen (filename, "r");
|
2003-08-05 22:40:54 +08:00
|
|
|
|
if (file == NULL)
|
2003-06-02 22:45:13 +08:00
|
|
|
|
fatal (_("couldn't open symbol redefinition file %s (error: %s)"),
|
|
|
|
|
filename, strerror (errno));
|
|
|
|
|
|
|
|
|
|
bufsize = 100;
|
2009-12-31 22:40:36 +08:00
|
|
|
|
buf = (char *) xmalloc (bufsize + 1 /* For the terminating NUL. */);
|
2003-06-02 22:45:13 +08:00
|
|
|
|
|
|
|
|
|
lineno = 1;
|
|
|
|
|
c = getc (file);
|
|
|
|
|
len = 0;
|
|
|
|
|
outsym_off = 0;
|
|
|
|
|
while (c != EOF)
|
|
|
|
|
{
|
|
|
|
|
/* Collect the input symbol name. */
|
|
|
|
|
while (! IS_WHITESPACE (c) && ! IS_LINE_TERMINATOR (c) && c != EOF)
|
|
|
|
|
{
|
|
|
|
|
if (c == '#')
|
|
|
|
|
goto comment;
|
|
|
|
|
buf[len++] = c;
|
|
|
|
|
if (len >= bufsize)
|
|
|
|
|
{
|
|
|
|
|
bufsize *= 2;
|
2009-12-31 22:40:36 +08:00
|
|
|
|
buf = (char *) xrealloc (buf, bufsize + 1);
|
2003-06-02 22:45:13 +08:00
|
|
|
|
}
|
|
|
|
|
c = getc (file);
|
|
|
|
|
}
|
|
|
|
|
buf[len++] = '\0';
|
|
|
|
|
if (c == EOF)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* Eat white space between the symbol names. */
|
|
|
|
|
while (IS_WHITESPACE (c))
|
|
|
|
|
c = getc (file);
|
|
|
|
|
if (c == '#' || IS_LINE_TERMINATOR (c))
|
|
|
|
|
goto comment;
|
|
|
|
|
if (c == EOF)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* Collect the output symbol name. */
|
|
|
|
|
outsym_off = len;
|
|
|
|
|
while (! IS_WHITESPACE (c) && ! IS_LINE_TERMINATOR (c) && c != EOF)
|
|
|
|
|
{
|
|
|
|
|
if (c == '#')
|
|
|
|
|
goto comment;
|
|
|
|
|
buf[len++] = c;
|
|
|
|
|
if (len >= bufsize)
|
|
|
|
|
{
|
|
|
|
|
bufsize *= 2;
|
2009-12-31 22:40:36 +08:00
|
|
|
|
buf = (char *) xrealloc (buf, bufsize + 1);
|
2003-06-02 22:45:13 +08:00
|
|
|
|
}
|
|
|
|
|
c = getc (file);
|
|
|
|
|
}
|
|
|
|
|
buf[len++] = '\0';
|
|
|
|
|
if (c == EOF)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* Eat white space at end of line. */
|
|
|
|
|
while (! IS_LINE_TERMINATOR(c) && c != EOF && IS_WHITESPACE (c))
|
|
|
|
|
c = getc (file);
|
|
|
|
|
if (c == '#')
|
|
|
|
|
goto comment;
|
|
|
|
|
/* Handle \r\n. */
|
|
|
|
|
if ((c == '\r' && (c = getc (file)) == '\n')
|
|
|
|
|
|| c == '\n' || c == EOF)
|
|
|
|
|
{
|
|
|
|
|
end_of_line:
|
|
|
|
|
/* Append the redefinition to the list. */
|
|
|
|
|
if (buf[0] != '\0')
|
|
|
|
|
redefine_list_append (filename, &buf[0], &buf[outsym_off]);
|
|
|
|
|
|
2007-06-29 08:34:14 +08:00
|
|
|
|
lineno++;
|
2003-06-02 22:45:13 +08:00
|
|
|
|
len = 0;
|
|
|
|
|
outsym_off = 0;
|
|
|
|
|
if (c == EOF)
|
|
|
|
|
break;
|
|
|
|
|
c = getc (file);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
else
|
2004-10-18 22:04:40 +08:00
|
|
|
|
fatal (_("%s:%d: garbage found at end of line"), filename, lineno);
|
2003-06-02 22:45:13 +08:00
|
|
|
|
comment:
|
|
|
|
|
if (len != 0 && (outsym_off == 0 || outsym_off == len))
|
2004-10-18 22:04:40 +08:00
|
|
|
|
fatal (_("%s:%d: missing new symbol name"), filename, lineno);
|
2003-06-02 22:45:13 +08:00
|
|
|
|
buf[len++] = '\0';
|
|
|
|
|
|
|
|
|
|
/* Eat the rest of the line and finish it. */
|
|
|
|
|
while (c != '\n' && c != EOF)
|
|
|
|
|
c = getc (file);
|
|
|
|
|
goto end_of_line;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (len != 0)
|
2004-10-18 22:04:40 +08:00
|
|
|
|
fatal (_("%s:%d: premature end of file"), filename, lineno);
|
2003-06-02 22:45:13 +08:00
|
|
|
|
|
|
|
|
|
free (buf);
|
|
|
|
|
}
|
|
|
|
|
|
2005-06-14 21:26:42 +08:00
|
|
|
|
/* Copy unkown object file IBFD onto OBFD.
|
|
|
|
|
Returns TRUE upon success, FALSE otherwise. */
|
|
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
|
copy_unknown_object (bfd *ibfd, bfd *obfd)
|
|
|
|
|
{
|
|
|
|
|
char *cbuf;
|
|
|
|
|
int tocopy;
|
|
|
|
|
long ncopied;
|
|
|
|
|
long size;
|
|
|
|
|
struct stat buf;
|
|
|
|
|
|
|
|
|
|
if (bfd_stat_arch_elt (ibfd, &buf) != 0)
|
|
|
|
|
{
|
2009-01-29 21:03:21 +08:00
|
|
|
|
bfd_nonfatal_message (NULL, ibfd, NULL, NULL);
|
2005-06-14 21:26:42 +08:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
size = buf.st_size;
|
|
|
|
|
if (size < 0)
|
|
|
|
|
{
|
|
|
|
|
non_fatal (_("stat returns negative size for `%s'"),
|
|
|
|
|
bfd_get_archive_filename (ibfd));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (bfd_seek (ibfd, (file_ptr) 0, SEEK_SET) != 0)
|
|
|
|
|
{
|
|
|
|
|
bfd_nonfatal (bfd_get_archive_filename (ibfd));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (verbose)
|
|
|
|
|
printf (_("copy from `%s' [unknown] to `%s' [unknown]\n"),
|
|
|
|
|
bfd_get_archive_filename (ibfd), bfd_get_filename (obfd));
|
|
|
|
|
|
2009-09-10 21:40:44 +08:00
|
|
|
|
cbuf = (char *) xmalloc (BUFSIZE);
|
2005-06-14 21:26:42 +08:00
|
|
|
|
ncopied = 0;
|
|
|
|
|
while (ncopied < size)
|
|
|
|
|
{
|
|
|
|
|
tocopy = size - ncopied;
|
|
|
|
|
if (tocopy > BUFSIZE)
|
|
|
|
|
tocopy = BUFSIZE;
|
|
|
|
|
|
|
|
|
|
if (bfd_bread (cbuf, (bfd_size_type) tocopy, ibfd)
|
|
|
|
|
!= (bfd_size_type) tocopy)
|
|
|
|
|
{
|
2009-01-29 21:03:21 +08:00
|
|
|
|
bfd_nonfatal_message (NULL, ibfd, NULL, NULL);
|
2005-06-14 21:26:42 +08:00
|
|
|
|
free (cbuf);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (bfd_bwrite (cbuf, (bfd_size_type) tocopy, obfd)
|
|
|
|
|
!= (bfd_size_type) tocopy)
|
|
|
|
|
{
|
2007-08-30 18:19:03 +08:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, NULL, NULL);
|
2005-06-14 21:26:42 +08:00
|
|
|
|
free (cbuf);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ncopied += tocopy;
|
|
|
|
|
}
|
|
|
|
|
|
2011-04-04 09:35:59 +08:00
|
|
|
|
/* We should at least to be able to read it back when copying an
|
|
|
|
|
unknown object in an archive. */
|
|
|
|
|
chmod (bfd_get_filename (obfd), buf.st_mode | S_IRUSR);
|
2005-06-14 21:26:42 +08:00
|
|
|
|
free (cbuf);
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
2004-01-12 21:10:02 +08:00
|
|
|
|
/* Copy object file IBFD onto OBFD.
|
2004-01-12 21:34:30 +08:00
|
|
|
|
Returns TRUE upon success, FALSE otherwise. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2004-01-12 21:10:02 +08:00
|
|
|
|
static bfd_boolean
|
2009-09-11 19:16:19 +08:00
|
|
|
|
copy_object (bfd *ibfd, bfd *obfd, const bfd_arch_info_type *input_arch)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
bfd_vma start;
|
|
|
|
|
long symcount;
|
|
|
|
|
asection **osections = NULL;
|
2003-07-24 01:34:03 +08:00
|
|
|
|
asection *gnu_debuglink_section = NULL;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
bfd_size_type *gaps = NULL;
|
|
|
|
|
bfd_size_type max_gap = 0;
|
|
|
|
|
long symsize;
|
2003-07-24 01:34:03 +08:00
|
|
|
|
void *dhandle;
|
2003-02-21 09:12:13 +08:00
|
|
|
|
enum bfd_architecture iarch;
|
|
|
|
|
unsigned int imach;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2001-01-18 08:17:43 +08:00
|
|
|
|
if (ibfd->xvec->byteorder != obfd->xvec->byteorder
|
|
|
|
|
&& ibfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN
|
|
|
|
|
&& obfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN)
|
2004-01-12 21:10:02 +08:00
|
|
|
|
fatal (_("Unable to change endianness of input file(s)"));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
if (!bfd_set_format (obfd, bfd_get_format (ibfd)))
|
2004-01-12 21:10:02 +08:00
|
|
|
|
{
|
2007-08-30 18:19:03 +08:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, NULL, NULL);
|
2004-01-12 21:10:02 +08:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
if (verbose)
|
2005-06-14 21:26:42 +08:00
|
|
|
|
printf (_("copy from `%s' [%s] to `%s' [%s]\n"),
|
|
|
|
|
bfd_get_archive_filename (ibfd), bfd_get_target (ibfd),
|
1999-05-03 15:29:11 +08:00
|
|
|
|
bfd_get_filename (obfd), bfd_get_target (obfd));
|
|
|
|
|
|
2007-03-02 00:39:42 +08:00
|
|
|
|
if (extract_symbol)
|
|
|
|
|
start = 0;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
else
|
2007-03-02 00:39:42 +08:00
|
|
|
|
{
|
|
|
|
|
if (set_start_set)
|
|
|
|
|
start = set_start;
|
|
|
|
|
else
|
|
|
|
|
start = bfd_get_start_address (ibfd);
|
|
|
|
|
start += change_start;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2002-05-22 03:34:58 +08:00
|
|
|
|
/* Neither the start address nor the flags
|
|
|
|
|
need to be set for a core file. */
|
2001-12-19 13:18:34 +08:00
|
|
|
|
if (bfd_get_format (obfd) != bfd_core)
|
|
|
|
|
{
|
2003-12-23 21:01:11 +08:00
|
|
|
|
flagword flags;
|
|
|
|
|
|
|
|
|
|
flags = bfd_get_file_flags (ibfd);
|
|
|
|
|
flags |= bfd_flags_to_set;
|
|
|
|
|
flags &= ~bfd_flags_to_clear;
|
|
|
|
|
flags &= bfd_applicable_file_flags (obfd);
|
|
|
|
|
|
2009-03-13 21:39:57 +08:00
|
|
|
|
if (strip_symbols == STRIP_ALL)
|
|
|
|
|
flags &= ~HAS_RELOC;
|
|
|
|
|
|
2001-12-19 13:18:34 +08:00
|
|
|
|
if (!bfd_set_start_address (obfd, start)
|
2003-12-23 21:01:11 +08:00
|
|
|
|
|| !bfd_set_file_flags (obfd, flags))
|
2004-01-12 21:10:02 +08:00
|
|
|
|
{
|
2009-01-29 21:03:21 +08:00
|
|
|
|
bfd_nonfatal_message (NULL, ibfd, NULL, NULL);
|
2004-01-12 21:10:02 +08:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
2001-12-19 13:18:34 +08:00
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2001-07-31 21:49:39 +08:00
|
|
|
|
/* Copy architecture of input file to output file. */
|
2003-02-21 09:12:13 +08:00
|
|
|
|
iarch = bfd_get_arch (ibfd);
|
|
|
|
|
imach = bfd_get_mach (ibfd);
|
2009-09-11 19:16:19 +08:00
|
|
|
|
if (input_arch)
|
|
|
|
|
{
|
|
|
|
|
if (bfd_get_arch_info (ibfd) == NULL
|
|
|
|
|
|| bfd_get_arch_info (ibfd)->arch == bfd_arch_unknown)
|
|
|
|
|
{
|
|
|
|
|
iarch = input_arch->arch;
|
|
|
|
|
imach = input_arch->mach;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
non_fatal (_("Input file `%s' ignores binary architecture parameter."),
|
|
|
|
|
bfd_get_archive_filename (ibfd));
|
|
|
|
|
}
|
2003-02-21 09:12:13 +08:00
|
|
|
|
if (!bfd_set_arch_mach (obfd, iarch, imach)
|
2002-08-13 21:39:02 +08:00
|
|
|
|
&& (ibfd->target_defaulted
|
|
|
|
|
|| bfd_get_arch (ibfd) != bfd_get_arch (obfd)))
|
2003-12-05 02:24:07 +08:00
|
|
|
|
{
|
|
|
|
|
if (bfd_get_arch (ibfd) == bfd_arch_unknown)
|
2005-06-14 21:26:42 +08:00
|
|
|
|
non_fatal (_("Unable to recognise the format of the input file `%s'"),
|
|
|
|
|
bfd_get_archive_filename (ibfd));
|
2003-12-05 02:24:07 +08:00
|
|
|
|
else
|
2010-01-05 08:39:47 +08:00
|
|
|
|
non_fatal (_("Output file cannot represent architecture `%s'"),
|
2005-06-14 21:26:42 +08:00
|
|
|
|
bfd_printable_arch_mach (bfd_get_arch (ibfd),
|
|
|
|
|
bfd_get_mach (ibfd)));
|
|
|
|
|
return FALSE;
|
2003-12-05 02:24:07 +08:00
|
|
|
|
}
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (!bfd_set_format (obfd, bfd_get_format (ibfd)))
|
2004-01-12 21:10:02 +08:00
|
|
|
|
{
|
2009-01-29 21:03:21 +08:00
|
|
|
|
bfd_nonfatal_message (NULL, ibfd, NULL, NULL);
|
2004-01-12 21:10:02 +08:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
bfd/
2009-04-17 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/10074
* coffcode.h (bfd_pei_p): New.
* config.bfd: Remove bfd_efi_bsdrv_ia32_vec,
bfd_efi_rtdrv_ia32_vec, bfd_efi_bsdrv_x86_64_vec,
bfd_efi_rtdrv_x86_64_vec, bfd_efi_bsdrv_ia64_vec and
bfd_efi_rtdrv_ia64_vec. Replace bfd_efi_app_ia32_vec,
bfd_efi_app_x86_64_vec and bfd_efi_app_ia64_vec with
i386pei_vec, x86_64pei_vec and bfd_pei_ia64_vec, respectively.
* configure.in: Remove bfd_efi_bsdrv_ia32_vec,
bfd_efi_rtdrv_ia32_vec, bfd_efi_bsdrv_x86_64_vec,
bfd_efi_rtdrv_x86_64_vec,
bfd_efi_bsdrv_ia64_vec and bfd_efi_rtdrv_ia64_vec. Replace
bfd_efi_ia64_vec with bfd_pei_ia64_vec.
* targets.c: Likewise.
* configure: Regenerated.
* libcoff.h: Likewise.
* Makefile.in: Likewise.
* efi-app-ia32.c: Removed.
* efi-app-x86_64.c: Likewise.
* efi-bsdrv-ia32.c: Likewise.
* efi-bsdrv-ia64.c: Likewise.
* efi-bsdrv-x86_64.c: Likewise.
* efi-rtdrv-ia32.c: Likewise.
* efi-rtdrv-ia64.c: Likewise.
* efi-rtdrv-x86_64.c: Likewise.
* efi-rtdrv-ia32.c: Likewise.
* efi-app-ia64.c: Moved to ...
* pei-ia64.c: This.
(TARGET_SYM): Set to bfd_pei_ia64_vec.
(TARGET_NAME): Set to pei-ia64.
* libpei.h (bfd_target_pei_p): Removed.
(bfd_target_pei_arch): Likewise.
(bfd_target_efi_app_p): Likewise.
(bfd_target_efi_app_arch): Likewise.
(bfd_target_efi_bsdrv_p): Likewise.
(bfd_target_efi_bsdrv_arch): Likewise.
(bfd_target_efi_rtdrv_p): Likewise.
(bfd_target_efi_rtdrv_arch): Likewise.
(bfd_pe_executable_p): Likewise.
* Makefile.am (BFD32_BACKENDS): Remove efi-app-ia32.lo,
efi-bsdrv-ia32.lo and efi-rtdrv-ia32.lo.
(BFD32_BACKENDS_CFILES): Remove efi-app-ia32.c, efi-bsdrv-ia32.c
and efi-rtdrv-ia32.c.
(BFD64_BACKENDS): Remove efi-app-ia64.lo, efi-bsdrv-ia64.lo,
efi-rtdrv-ia64.lo, efi-app-x86_64.lo, efi-bsdrv-x86_64.lo and
efi-rtdrv-x86_64.lo. Add pei-ia64.lo.
(BFD64_BACKENDS_CFILES): Remove efi-app-ia64.c, efi-bsdrv-ia64.c,
efi-rtdrv-ia64.c, efi-app-x86_64.c, efi-bsdrv-x86_64.c and
efi-rtdrv-x86_64.c. Add pei-ia64.c.
(efi-app-ia64.lo): Removed.
(efi-bsdrv-ia32.lo): Likewise.
(efi-rtdrv-ia32.lo): Likewise.
(efi-app-ia64.lo): Likewise.
(efi-bsdrv-ia64.lo): Likewise.
(efi-rtdrv-ia64.lo): Likewise.
(efi-app-x86_64.lo): Likewise.
(efi-bsdrv-x86_64.lo): Likewise.
(efi-rtdrv-x86_64.lo): Likewise.
(pei-ia64.lo): New.
* peicode.h (coff_swap_scnhdr_in): Replace bfd_pe_executable_p
with bfd_pei_p.
(arch_type): Removed.
(pe_arch): Likewise.
(pe_bfd_object_p): Just return coff_object_p.
* peXXigen.c (_bfd_XXi_swap_scnhdr_out): Replace
bfd_pe_executable_p with bfd_pei_p.
binutils/
2009-04-17 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/10074
* objcopy.c: Include coff/i386.h and coff/pe.h.
(pe_file_alignment): New.
(pe_heap_commit): Likewise.
(pe_heap_reserve): Likewise.
(pe_image_base): Likewise.
(pe_section_alignment): Likewise.
(pe_stack_commit): Likewise.
(pe_stack_reserve): Likewise.
(pe_subsystem): Likewise.
(pe_major_subsystem_version): Likewise.
(pe_minor_subsystem_version): Likewise.
(set_pe_subsystem): Likewise.
(convert_efi_target): Likewise.
(command_line_switch): Add OPTION_FILE_ALIGNMENT,
OPTION_HEAP, OPTION_IMAGE_BASE, OPTION_SECTION_ALIGNMENT,
OPTION_STACK and OPTION_SUBSYSTEM.
(copy_options): Likewise.
(copy_usage): Add --file-alignment, --heap, --image-base,
--section-alignment, --stack and --subsystem.
(copy_object): Set up PE parameters.
(copy_main): Process Add OPTION_FILE_ALIGNMENT,
OPTION_HEAP, OPTION_IMAGE_BASE, OPTION_SECTION_ALIGNMENT,
OPTION_STACK and OPTION_SUBSYSTEM. Convert EFI target to
PEI target.
* NEWS: Mention --file-alignment, --heap, --image-base,
--section-alignment, --stack and --subsystem command line
options for objcopy.
* doc/binutils.texi: Document --file-alignment, --heap,
--image-base, --section-alignment, --stack and --subsystem
command line options for objcopy.
2009-04-17 21:46:18 +08:00
|
|
|
|
if (bfd_get_flavour (obfd) == bfd_target_coff_flavour
|
|
|
|
|
&& bfd_pei_p (obfd))
|
|
|
|
|
{
|
|
|
|
|
/* Set up PE parameters. */
|
|
|
|
|
pe_data_type *pe = pe_data (obfd);
|
|
|
|
|
|
2009-04-27 21:59:43 +08:00
|
|
|
|
/* Copy PE parameters before changing them. */
|
|
|
|
|
if (ibfd->xvec->flavour == bfd_target_coff_flavour
|
|
|
|
|
&& bfd_pei_p (ibfd))
|
|
|
|
|
pe->pe_opthdr = pe_data (ibfd)->pe_opthdr;
|
|
|
|
|
|
bfd/
2009-04-17 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/10074
* coffcode.h (bfd_pei_p): New.
* config.bfd: Remove bfd_efi_bsdrv_ia32_vec,
bfd_efi_rtdrv_ia32_vec, bfd_efi_bsdrv_x86_64_vec,
bfd_efi_rtdrv_x86_64_vec, bfd_efi_bsdrv_ia64_vec and
bfd_efi_rtdrv_ia64_vec. Replace bfd_efi_app_ia32_vec,
bfd_efi_app_x86_64_vec and bfd_efi_app_ia64_vec with
i386pei_vec, x86_64pei_vec and bfd_pei_ia64_vec, respectively.
* configure.in: Remove bfd_efi_bsdrv_ia32_vec,
bfd_efi_rtdrv_ia32_vec, bfd_efi_bsdrv_x86_64_vec,
bfd_efi_rtdrv_x86_64_vec,
bfd_efi_bsdrv_ia64_vec and bfd_efi_rtdrv_ia64_vec. Replace
bfd_efi_ia64_vec with bfd_pei_ia64_vec.
* targets.c: Likewise.
* configure: Regenerated.
* libcoff.h: Likewise.
* Makefile.in: Likewise.
* efi-app-ia32.c: Removed.
* efi-app-x86_64.c: Likewise.
* efi-bsdrv-ia32.c: Likewise.
* efi-bsdrv-ia64.c: Likewise.
* efi-bsdrv-x86_64.c: Likewise.
* efi-rtdrv-ia32.c: Likewise.
* efi-rtdrv-ia64.c: Likewise.
* efi-rtdrv-x86_64.c: Likewise.
* efi-rtdrv-ia32.c: Likewise.
* efi-app-ia64.c: Moved to ...
* pei-ia64.c: This.
(TARGET_SYM): Set to bfd_pei_ia64_vec.
(TARGET_NAME): Set to pei-ia64.
* libpei.h (bfd_target_pei_p): Removed.
(bfd_target_pei_arch): Likewise.
(bfd_target_efi_app_p): Likewise.
(bfd_target_efi_app_arch): Likewise.
(bfd_target_efi_bsdrv_p): Likewise.
(bfd_target_efi_bsdrv_arch): Likewise.
(bfd_target_efi_rtdrv_p): Likewise.
(bfd_target_efi_rtdrv_arch): Likewise.
(bfd_pe_executable_p): Likewise.
* Makefile.am (BFD32_BACKENDS): Remove efi-app-ia32.lo,
efi-bsdrv-ia32.lo and efi-rtdrv-ia32.lo.
(BFD32_BACKENDS_CFILES): Remove efi-app-ia32.c, efi-bsdrv-ia32.c
and efi-rtdrv-ia32.c.
(BFD64_BACKENDS): Remove efi-app-ia64.lo, efi-bsdrv-ia64.lo,
efi-rtdrv-ia64.lo, efi-app-x86_64.lo, efi-bsdrv-x86_64.lo and
efi-rtdrv-x86_64.lo. Add pei-ia64.lo.
(BFD64_BACKENDS_CFILES): Remove efi-app-ia64.c, efi-bsdrv-ia64.c,
efi-rtdrv-ia64.c, efi-app-x86_64.c, efi-bsdrv-x86_64.c and
efi-rtdrv-x86_64.c. Add pei-ia64.c.
(efi-app-ia64.lo): Removed.
(efi-bsdrv-ia32.lo): Likewise.
(efi-rtdrv-ia32.lo): Likewise.
(efi-app-ia64.lo): Likewise.
(efi-bsdrv-ia64.lo): Likewise.
(efi-rtdrv-ia64.lo): Likewise.
(efi-app-x86_64.lo): Likewise.
(efi-bsdrv-x86_64.lo): Likewise.
(efi-rtdrv-x86_64.lo): Likewise.
(pei-ia64.lo): New.
* peicode.h (coff_swap_scnhdr_in): Replace bfd_pe_executable_p
with bfd_pei_p.
(arch_type): Removed.
(pe_arch): Likewise.
(pe_bfd_object_p): Just return coff_object_p.
* peXXigen.c (_bfd_XXi_swap_scnhdr_out): Replace
bfd_pe_executable_p with bfd_pei_p.
binutils/
2009-04-17 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/10074
* objcopy.c: Include coff/i386.h and coff/pe.h.
(pe_file_alignment): New.
(pe_heap_commit): Likewise.
(pe_heap_reserve): Likewise.
(pe_image_base): Likewise.
(pe_section_alignment): Likewise.
(pe_stack_commit): Likewise.
(pe_stack_reserve): Likewise.
(pe_subsystem): Likewise.
(pe_major_subsystem_version): Likewise.
(pe_minor_subsystem_version): Likewise.
(set_pe_subsystem): Likewise.
(convert_efi_target): Likewise.
(command_line_switch): Add OPTION_FILE_ALIGNMENT,
OPTION_HEAP, OPTION_IMAGE_BASE, OPTION_SECTION_ALIGNMENT,
OPTION_STACK and OPTION_SUBSYSTEM.
(copy_options): Likewise.
(copy_usage): Add --file-alignment, --heap, --image-base,
--section-alignment, --stack and --subsystem.
(copy_object): Set up PE parameters.
(copy_main): Process Add OPTION_FILE_ALIGNMENT,
OPTION_HEAP, OPTION_IMAGE_BASE, OPTION_SECTION_ALIGNMENT,
OPTION_STACK and OPTION_SUBSYSTEM. Convert EFI target to
PEI target.
* NEWS: Mention --file-alignment, --heap, --image-base,
--section-alignment, --stack and --subsystem command line
options for objcopy.
* doc/binutils.texi: Document --file-alignment, --heap,
--image-base, --section-alignment, --stack and --subsystem
command line options for objcopy.
2009-04-17 21:46:18 +08:00
|
|
|
|
if (pe_file_alignment != (bfd_vma) -1)
|
|
|
|
|
pe->pe_opthdr.FileAlignment = pe_file_alignment;
|
|
|
|
|
else
|
|
|
|
|
pe_file_alignment = PE_DEF_FILE_ALIGNMENT;
|
|
|
|
|
|
|
|
|
|
if (pe_heap_commit != (bfd_vma) -1)
|
|
|
|
|
pe->pe_opthdr.SizeOfHeapCommit = pe_heap_commit;
|
|
|
|
|
|
|
|
|
|
if (pe_heap_reserve != (bfd_vma) -1)
|
|
|
|
|
pe->pe_opthdr.SizeOfHeapCommit = pe_heap_reserve;
|
|
|
|
|
|
|
|
|
|
if (pe_image_base != (bfd_vma) -1)
|
|
|
|
|
pe->pe_opthdr.ImageBase = pe_image_base;
|
|
|
|
|
|
|
|
|
|
if (pe_section_alignment != (bfd_vma) -1)
|
|
|
|
|
pe->pe_opthdr.SectionAlignment = pe_section_alignment;
|
|
|
|
|
else
|
|
|
|
|
pe_section_alignment = PE_DEF_SECTION_ALIGNMENT;
|
|
|
|
|
|
|
|
|
|
if (pe_stack_commit != (bfd_vma) -1)
|
|
|
|
|
pe->pe_opthdr.SizeOfStackCommit = pe_stack_commit;
|
|
|
|
|
|
|
|
|
|
if (pe_stack_reserve != (bfd_vma) -1)
|
|
|
|
|
pe->pe_opthdr.SizeOfStackCommit = pe_stack_reserve;
|
|
|
|
|
|
|
|
|
|
if (pe_subsystem != -1)
|
|
|
|
|
pe->pe_opthdr.Subsystem = pe_subsystem;
|
|
|
|
|
|
|
|
|
|
if (pe_major_subsystem_version != -1)
|
|
|
|
|
pe->pe_opthdr.MajorSubsystemVersion = pe_major_subsystem_version;
|
|
|
|
|
|
|
|
|
|
if (pe_minor_subsystem_version != -1)
|
|
|
|
|
pe->pe_opthdr.MinorSubsystemVersion = pe_minor_subsystem_version;
|
|
|
|
|
|
|
|
|
|
if (pe_file_alignment > pe_section_alignment)
|
|
|
|
|
{
|
|
|
|
|
char file_alignment[20], section_alignment[20];
|
|
|
|
|
|
|
|
|
|
sprintf_vma (file_alignment, pe_file_alignment);
|
|
|
|
|
sprintf_vma (section_alignment, pe_section_alignment);
|
|
|
|
|
non_fatal (_("warning: file alignment (0x%s) > section alignment (0x%s)"),
|
|
|
|
|
|
|
|
|
|
file_alignment, section_alignment);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (isympp)
|
2006-01-11 06:34:03 +08:00
|
|
|
|
free (isympp);
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (osympp != isympp)
|
2006-01-11 06:34:03 +08:00
|
|
|
|
free (osympp);
|
|
|
|
|
|
|
|
|
|
isympp = NULL;
|
|
|
|
|
osympp = NULL;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2006-09-13 23:08:38 +08:00
|
|
|
|
symsize = bfd_get_symtab_upper_bound (ibfd);
|
|
|
|
|
if (symsize < 0)
|
|
|
|
|
{
|
2009-01-29 21:03:21 +08:00
|
|
|
|
bfd_nonfatal_message (NULL, ibfd, NULL, NULL);
|
2006-09-13 23:08:38 +08:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
2009-09-10 21:40:44 +08:00
|
|
|
|
osympp = isympp = (asymbol **) xmalloc (symsize);
|
2006-09-13 23:08:38 +08:00
|
|
|
|
symcount = bfd_canonicalize_symtab (ibfd, isympp);
|
|
|
|
|
if (symcount < 0)
|
|
|
|
|
{
|
2007-08-30 18:19:03 +08:00
|
|
|
|
bfd_nonfatal_message (NULL, ibfd, NULL, NULL);
|
2006-09-13 23:08:38 +08:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* BFD mandates that all output sections be created and sizes set before
|
|
|
|
|
any output is done. Thus, we traverse all sections multiple times. */
|
2003-08-05 22:40:54 +08:00
|
|
|
|
bfd_map_over_sections (ibfd, setup_section, obfd);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2008-08-06 08:42:17 +08:00
|
|
|
|
if (!extract_symbol)
|
|
|
|
|
setup_bfd_headers (ibfd, obfd);
|
2004-05-18 00:40:01 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (add_sections != NULL)
|
|
|
|
|
{
|
|
|
|
|
struct section_add *padd;
|
|
|
|
|
struct section_list *pset;
|
|
|
|
|
|
|
|
|
|
for (padd = add_sections; padd != NULL; padd = padd->next)
|
|
|
|
|
{
|
2003-06-12 15:23:31 +08:00
|
|
|
|
flagword flags;
|
|
|
|
|
|
2005-07-04 09:53:44 +08:00
|
|
|
|
pset = find_section_list (padd->name, FALSE);
|
|
|
|
|
if (pset != NULL)
|
|
|
|
|
pset->used = TRUE;
|
|
|
|
|
|
|
|
|
|
flags = SEC_HAS_CONTENTS | SEC_READONLY | SEC_DATA;
|
|
|
|
|
if (pset != NULL && pset->set_flags)
|
|
|
|
|
flags = pset->flags | SEC_HAS_CONTENTS;
|
|
|
|
|
|
2006-01-30 21:06:53 +08:00
|
|
|
|
/* bfd_make_section_with_flags() does not return very helpful
|
|
|
|
|
error codes, so check for the most likely user error first. */
|
|
|
|
|
if (bfd_get_section_by_name (obfd, padd->name))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2007-08-30 18:19:03 +08:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, NULL,
|
|
|
|
|
_("can't add section '%s'"), padd->name);
|
2004-01-12 21:10:02 +08:00
|
|
|
|
return FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
2006-01-30 21:06:53 +08:00
|
|
|
|
else
|
|
|
|
|
{
|
2010-02-01 17:59:46 +08:00
|
|
|
|
/* We use LINKER_CREATED here so that the backend hooks
|
|
|
|
|
will create any special section type information,
|
|
|
|
|
instead of presuming we know what we're doing merely
|
|
|
|
|
because we set the flags. */
|
|
|
|
|
padd->section = bfd_make_section_with_flags
|
|
|
|
|
(obfd, padd->name, flags | SEC_LINKER_CREATED);
|
2006-01-30 21:06:53 +08:00
|
|
|
|
if (padd->section == NULL)
|
|
|
|
|
{
|
2007-08-30 18:19:03 +08:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, NULL,
|
|
|
|
|
_("can't create section `%s'"),
|
|
|
|
|
padd->name);
|
2006-01-30 21:06:53 +08:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2003-06-12 15:23:31 +08:00
|
|
|
|
if (! bfd_set_section_size (obfd, padd->section, padd->size))
|
2004-01-12 21:10:02 +08:00
|
|
|
|
{
|
2007-08-30 18:19:03 +08:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, padd->section, NULL);
|
2004-01-12 21:10:02 +08:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2003-06-12 15:23:31 +08:00
|
|
|
|
if (pset != NULL)
|
|
|
|
|
{
|
|
|
|
|
if (pset->change_vma != CHANGE_IGNORE)
|
2003-07-24 01:34:03 +08:00
|
|
|
|
if (! bfd_set_section_vma (obfd, padd->section,
|
|
|
|
|
pset->vma_val))
|
2004-01-12 21:10:02 +08:00
|
|
|
|
{
|
2007-08-30 18:19:03 +08:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, padd->section, NULL);
|
2004-01-12 21:10:02 +08:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
2003-06-12 15:23:31 +08:00
|
|
|
|
if (pset->change_lma != CHANGE_IGNORE)
|
|
|
|
|
{
|
|
|
|
|
padd->section->lma = pset->lma_val;
|
2004-01-12 21:10:02 +08:00
|
|
|
|
|
2003-06-12 15:23:31 +08:00
|
|
|
|
if (! bfd_set_section_alignment
|
|
|
|
|
(obfd, padd->section,
|
|
|
|
|
bfd_section_alignment (obfd, padd->section)))
|
2004-01-12 21:10:02 +08:00
|
|
|
|
{
|
2007-08-30 18:19:03 +08:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, padd->section, NULL);
|
2004-01-12 21:10:02 +08:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-06-12 15:23:31 +08:00
|
|
|
|
if (gnu_debuglink_filename != NULL)
|
|
|
|
|
{
|
2003-07-24 01:34:03 +08:00
|
|
|
|
gnu_debuglink_section = bfd_create_gnu_debuglink_section
|
|
|
|
|
(obfd, gnu_debuglink_filename);
|
2003-06-27 16:01:28 +08:00
|
|
|
|
|
|
|
|
|
if (gnu_debuglink_section == NULL)
|
2004-01-12 21:10:02 +08:00
|
|
|
|
{
|
2007-08-30 18:19:03 +08:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, NULL,
|
|
|
|
|
_("cannot create debug link section `%s'"),
|
|
|
|
|
gnu_debuglink_filename);
|
2004-01-12 21:10:02 +08:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
2006-01-18 19:01:09 +08:00
|
|
|
|
|
|
|
|
|
/* Special processing for PE format files. We
|
|
|
|
|
have no way to distinguish PE from COFF here. */
|
|
|
|
|
if (bfd_get_flavour (obfd) == bfd_target_coff_flavour)
|
|
|
|
|
{
|
|
|
|
|
bfd_vma debuglink_vma;
|
|
|
|
|
asection * highest_section;
|
|
|
|
|
asection * sec;
|
|
|
|
|
|
|
|
|
|
/* The PE spec requires that all sections be adjacent and sorted
|
|
|
|
|
in ascending order of VMA. It also specifies that debug
|
|
|
|
|
sections should be last. This is despite the fact that debug
|
|
|
|
|
sections are not loaded into memory and so in theory have no
|
|
|
|
|
use for a VMA.
|
|
|
|
|
|
|
|
|
|
This means that the debuglink section must be given a non-zero
|
|
|
|
|
VMA which makes it contiguous with other debug sections. So
|
|
|
|
|
walk the current section list, find the section with the
|
|
|
|
|
highest VMA and start the debuglink section after that one. */
|
|
|
|
|
for (sec = obfd->sections, highest_section = NULL;
|
|
|
|
|
sec != NULL;
|
|
|
|
|
sec = sec->next)
|
|
|
|
|
if (sec->vma > 0
|
|
|
|
|
&& (highest_section == NULL
|
|
|
|
|
|| sec->vma > highest_section->vma))
|
|
|
|
|
highest_section = sec;
|
|
|
|
|
|
|
|
|
|
if (highest_section)
|
|
|
|
|
debuglink_vma = BFD_ALIGN (highest_section->vma
|
|
|
|
|
+ highest_section->size,
|
|
|
|
|
/* FIXME: We ought to be using
|
|
|
|
|
COFF_PAGE_SIZE here or maybe
|
|
|
|
|
bfd_get_section_alignment() (if it
|
|
|
|
|
was set) but since this is for PE
|
|
|
|
|
and we know the required alignment
|
|
|
|
|
it is easier just to hard code it. */
|
|
|
|
|
0x1000);
|
|
|
|
|
else
|
|
|
|
|
/* Umm, not sure what to do in this case. */
|
|
|
|
|
debuglink_vma = 0x1000;
|
|
|
|
|
|
|
|
|
|
bfd_set_section_vma (obfd, gnu_debuglink_section, debuglink_vma);
|
|
|
|
|
}
|
2004-01-12 21:10:02 +08:00
|
|
|
|
}
|
|
|
|
|
|
2007-04-13 03:20:46 +08:00
|
|
|
|
if (bfd_count_sections (obfd) != 0
|
|
|
|
|
&& (gap_fill_set || pad_to_set))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
asection **set;
|
|
|
|
|
unsigned int c, i;
|
|
|
|
|
|
|
|
|
|
/* 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. */
|
|
|
|
|
|
|
|
|
|
c = bfd_count_sections (obfd);
|
2009-09-10 21:40:44 +08:00
|
|
|
|
osections = (asection **) xmalloc (c * sizeof (asection *));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
set = osections;
|
2003-08-05 22:40:54 +08:00
|
|
|
|
bfd_map_over_sections (obfd, get_sections, &set);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
qsort (osections, c, sizeof (asection *), compare_section_lma);
|
|
|
|
|
|
2009-09-10 21:40:44 +08:00
|
|
|
|
gaps = (bfd_size_type *) xmalloc (c * sizeof (bfd_size_type));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
memset (gaps, 0, c * sizeof (bfd_size_type));
|
|
|
|
|
|
|
|
|
|
if (gap_fill_set)
|
|
|
|
|
{
|
|
|
|
|
for (i = 0; i < c - 1; i++)
|
|
|
|
|
{
|
|
|
|
|
flagword flags;
|
|
|
|
|
bfd_size_type size;
|
|
|
|
|
bfd_vma gap_start, gap_stop;
|
|
|
|
|
|
|
|
|
|
flags = bfd_get_section_flags (obfd, osections[i]);
|
|
|
|
|
if ((flags & SEC_HAS_CONTENTS) == 0
|
|
|
|
|
|| (flags & SEC_LOAD) == 0)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
size = bfd_section_size (obfd, osections[i]);
|
|
|
|
|
gap_start = bfd_section_lma (obfd, osections[i]) + size;
|
|
|
|
|
gap_stop = bfd_section_lma (obfd, osections[i + 1]);
|
|
|
|
|
if (gap_start < gap_stop)
|
|
|
|
|
{
|
|
|
|
|
if (! bfd_set_section_size (obfd, osections[i],
|
|
|
|
|
size + (gap_stop - gap_start)))
|
|
|
|
|
{
|
2007-08-30 18:19:03 +08:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, osections[i],
|
|
|
|
|
_("Can't fill gap after section"));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
status = 1;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
gaps[i] = gap_stop - gap_start;
|
|
|
|
|
if (max_gap < gap_stop - gap_start)
|
|
|
|
|
max_gap = gap_stop - gap_start;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (pad_to_set)
|
|
|
|
|
{
|
|
|
|
|
bfd_vma lma;
|
|
|
|
|
bfd_size_type size;
|
|
|
|
|
|
|
|
|
|
lma = bfd_section_lma (obfd, osections[c - 1]);
|
|
|
|
|
size = bfd_section_size (obfd, osections[c - 1]);
|
|
|
|
|
if (lma + size < pad_to)
|
|
|
|
|
{
|
|
|
|
|
if (! bfd_set_section_size (obfd, osections[c - 1],
|
|
|
|
|
pad_to - lma))
|
|
|
|
|
{
|
2007-08-30 18:19:03 +08:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, osections[c - 1],
|
|
|
|
|
_("can't add padding"));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
status = 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
gaps[c - 1] = pad_to - (lma + size);
|
|
|
|
|
if (max_gap < pad_to - (lma + size))
|
|
|
|
|
max_gap = pad_to - (lma + size);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2001-07-31 21:49:39 +08:00
|
|
|
|
/* Symbol filtering must happen after the output sections
|
|
|
|
|
have been created, but before their contents are set. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
dhandle = NULL;
|
|
|
|
|
if (convert_debugging)
|
2008-06-12 19:57:40 +08:00
|
|
|
|
dhandle = read_debugging_info (ibfd, isympp, symcount, FALSE);
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
|
|
|
|
if (strip_symbols == STRIP_DEBUG
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|| strip_symbols == STRIP_ALL
|
|
|
|
|
|| strip_symbols == STRIP_UNNEEDED
|
2003-06-26 16:14:10 +08:00
|
|
|
|
|| strip_symbols == STRIP_NONDEBUG
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|| discard_locals != LOCALS_UNDEF
|
2006-06-24 00:23:09 +08:00
|
|
|
|
|| localize_hidden
|
2008-04-16 16:24:21 +08:00
|
|
|
|
|| htab_elements (strip_specific_htab) != 0
|
|
|
|
|
|| htab_elements (keep_specific_htab) != 0
|
|
|
|
|
|| htab_elements (localize_specific_htab) != 0
|
|
|
|
|
|| htab_elements (globalize_specific_htab) != 0
|
|
|
|
|
|| htab_elements (keepglobal_specific_htab) != 0
|
|
|
|
|
|| htab_elements (weaken_specific_htab) != 0
|
2002-12-13 21:19:44 +08:00
|
|
|
|
|| prefix_symbols_string
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|| sections_removed
|
1999-06-12 23:42:04 +08:00
|
|
|
|
|| sections_copied
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|| convert_debugging
|
|
|
|
|
|| change_leading_char
|
|
|
|
|
|| remove_leading_char
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|| redefine_sym_list
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|| weaken)
|
|
|
|
|
{
|
|
|
|
|
/* Mark symbols used in output relocations so that they
|
|
|
|
|
are kept, even if they are local labels or static symbols.
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
Note we iterate over the input sections examining their
|
|
|
|
|
relocations since the relocations for the output sections
|
|
|
|
|
haven't been set yet. mark_symbols_used_in_relocations will
|
|
|
|
|
ignore input sections which have no corresponding output
|
|
|
|
|
section. */
|
|
|
|
|
if (strip_symbols != STRIP_ALL)
|
|
|
|
|
bfd_map_over_sections (ibfd,
|
|
|
|
|
mark_symbols_used_in_relocations,
|
2003-08-05 22:40:54 +08:00
|
|
|
|
isympp);
|
2009-09-10 21:40:44 +08:00
|
|
|
|
osympp = (asymbol **) xmalloc ((symcount + 1) * sizeof (asymbol *));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
symcount = filter_symbols (ibfd, obfd, osympp, isympp, symcount);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (convert_debugging && dhandle != NULL)
|
|
|
|
|
{
|
|
|
|
|
if (! write_debugging_info (obfd, dhandle, &symcount, &osympp))
|
|
|
|
|
{
|
|
|
|
|
status = 1;
|
2004-01-12 21:10:02 +08:00
|
|
|
|
return FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bfd_set_symtab (obfd, osympp, symcount);
|
|
|
|
|
|
|
|
|
|
/* This has to happen after the symbol table has been set. */
|
2003-08-05 22:40:54 +08:00
|
|
|
|
bfd_map_over_sections (ibfd, copy_section, obfd);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
if (add_sections != NULL)
|
|
|
|
|
{
|
|
|
|
|
struct section_add *padd;
|
|
|
|
|
|
|
|
|
|
for (padd = add_sections; padd != NULL; padd = padd->next)
|
|
|
|
|
{
|
2003-08-05 22:40:54 +08:00
|
|
|
|
if (! bfd_set_section_contents (obfd, padd->section, padd->contents,
|
|
|
|
|
0, padd->size))
|
2004-01-12 21:10:02 +08:00
|
|
|
|
{
|
2007-08-30 18:19:03 +08:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, padd->section, NULL);
|
2004-01-12 21:10:02 +08:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-06-27 16:01:28 +08:00
|
|
|
|
if (gnu_debuglink_filename != NULL)
|
|
|
|
|
{
|
|
|
|
|
if (! bfd_fill_in_gnu_debuglink_section
|
|
|
|
|
(obfd, gnu_debuglink_section, gnu_debuglink_filename))
|
2004-01-12 21:10:02 +08:00
|
|
|
|
{
|
2007-08-30 18:19:03 +08:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, NULL,
|
|
|
|
|
_("cannot fill debug link section `%s'"),
|
|
|
|
|
gnu_debuglink_filename);
|
2004-01-12 21:10:02 +08:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
2003-06-27 16:01:28 +08:00
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (gap_fill_set || pad_to_set)
|
|
|
|
|
{
|
|
|
|
|
bfd_byte *buf;
|
|
|
|
|
int c, i;
|
|
|
|
|
|
|
|
|
|
/* Fill in the gaps. */
|
|
|
|
|
if (max_gap > 8192)
|
|
|
|
|
max_gap = 8192;
|
2009-09-10 21:40:44 +08:00
|
|
|
|
buf = (bfd_byte *) xmalloc (max_gap);
|
2003-08-05 22:40:54 +08:00
|
|
|
|
memset (buf, gap_fill, max_gap);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
c = bfd_count_sections (obfd);
|
|
|
|
|
for (i = 0; i < c; i++)
|
|
|
|
|
{
|
|
|
|
|
if (gaps[i] != 0)
|
|
|
|
|
{
|
|
|
|
|
bfd_size_type left;
|
|
|
|
|
file_ptr off;
|
|
|
|
|
|
|
|
|
|
left = gaps[i];
|
|
|
|
|
off = bfd_section_size (obfd, osections[i]) - left;
|
2001-07-31 21:49:39 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
while (left > 0)
|
|
|
|
|
{
|
|
|
|
|
bfd_size_type now;
|
|
|
|
|
|
|
|
|
|
if (left > 8192)
|
|
|
|
|
now = 8192;
|
|
|
|
|
else
|
|
|
|
|
now = left;
|
|
|
|
|
|
|
|
|
|
if (! bfd_set_section_contents (obfd, osections[i], buf,
|
|
|
|
|
off, now))
|
2004-01-12 21:10:02 +08:00
|
|
|
|
{
|
2007-08-30 18:19:03 +08:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, osections[i], NULL);
|
2004-01-12 21:10:02 +08:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
left -= now;
|
|
|
|
|
off += now;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2007-03-02 00:39:42 +08:00
|
|
|
|
/* 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;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* 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. */
|
2007-05-30 22:29:27 +08:00
|
|
|
|
if (! bfd_copy_private_bfd_data (ibfd, obfd))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2007-08-30 18:19:03 +08:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, NULL,
|
|
|
|
|
_("error copying private BFD data"));
|
2004-01-12 21:10:02 +08:00
|
|
|
|
return FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
2001-08-24 21:56:11 +08:00
|
|
|
|
|
|
|
|
|
/* Switch to the alternate machine code. We have to do this at the
|
|
|
|
|
very end, because we only initialize the header when we create
|
|
|
|
|
the first section. */
|
2006-03-01 00:09:01 +08:00
|
|
|
|
if (use_alt_mach_code != 0)
|
|
|
|
|
{
|
|
|
|
|
if (! bfd_alt_mach_code (obfd, use_alt_mach_code))
|
|
|
|
|
{
|
|
|
|
|
non_fatal (_("this target does not support %lu alternative machine codes"),
|
|
|
|
|
use_alt_mach_code);
|
|
|
|
|
if (bfd_get_flavour (obfd) == bfd_target_elf_flavour)
|
|
|
|
|
{
|
|
|
|
|
non_fatal (_("treating that number as an absolute e_machine value instead"));
|
|
|
|
|
elf_elfheader (obfd)->e_machine = use_alt_mach_code;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
non_fatal (_("ignoring the alternative value"));
|
|
|
|
|
}
|
|
|
|
|
}
|
2004-01-12 21:10:02 +08:00
|
|
|
|
|
|
|
|
|
return TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Read each archive element in turn from IBFD, copy the
|
2006-09-11 22:40:39 +08:00
|
|
|
|
contents to temp file, and keep the temp file handle.
|
|
|
|
|
If 'force_output_target' is TRUE then make sure that
|
|
|
|
|
all elements in the new archive are of the type
|
|
|
|
|
'output_target'. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
static void
|
2006-09-11 22:40:39 +08:00
|
|
|
|
copy_archive (bfd *ibfd, bfd *obfd, const char *output_target,
|
2009-09-11 19:16:19 +08:00
|
|
|
|
bfd_boolean force_output_target,
|
|
|
|
|
const bfd_arch_info_type *input_arch)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
struct name_list
|
|
|
|
|
{
|
|
|
|
|
struct name_list *next;
|
2002-02-11 10:34:14 +08:00
|
|
|
|
const char *name;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
bfd *obfd;
|
|
|
|
|
} *list, *l;
|
|
|
|
|
bfd **ptr = &obfd->archive_head;
|
|
|
|
|
bfd *this_element;
|
2009-01-29 21:03:21 +08:00
|
|
|
|
char *dir;
|
|
|
|
|
const char *filename;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
/* Make a temp directory to hold the contents. */
|
2006-10-13 17:43:29 +08:00
|
|
|
|
dir = make_tempdir (bfd_get_filename (obfd));
|
|
|
|
|
if (dir == NULL)
|
|
|
|
|
fatal (_("cannot create tempdir for archive copying (error: %s)"),
|
|
|
|
|
strerror (errno));
|
2003-07-24 01:34:03 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
obfd->has_armap = ibfd->has_armap;
|
2008-03-28 14:49:44 +08:00
|
|
|
|
obfd->is_thin_archive = ibfd->is_thin_archive;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
list = NULL;
|
|
|
|
|
|
|
|
|
|
this_element = bfd_openr_next_archived_file (ibfd, NULL);
|
2001-07-31 21:49:39 +08:00
|
|
|
|
|
2001-12-18 19:54:10 +08:00
|
|
|
|
if (!bfd_set_format (obfd, bfd_get_format (ibfd)))
|
2009-01-29 21:03:21 +08:00
|
|
|
|
{
|
|
|
|
|
status = 1;
|
|
|
|
|
bfd_nonfatal_message (NULL, obfd, NULL, NULL);
|
|
|
|
|
return;
|
|
|
|
|
}
|
2001-12-18 19:54:10 +08:00
|
|
|
|
|
2003-08-05 22:40:54 +08:00
|
|
|
|
while (!status && this_element != NULL)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2002-02-11 10:34:14 +08:00
|
|
|
|
char *output_name;
|
|
|
|
|
bfd *output_bfd;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
bfd *last_element;
|
1999-05-27 11:16:15 +08:00
|
|
|
|
struct stat buf;
|
|
|
|
|
int stat_status = 0;
|
2009-09-10 21:40:44 +08:00
|
|
|
|
bfd_boolean del = TRUE;
|
2011-05-06 22:41:56 +08:00
|
|
|
|
bfd_boolean ok_object;
|
1999-05-27 11:16:15 +08:00
|
|
|
|
|
2002-02-11 10:34:14 +08:00
|
|
|
|
/* 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)
|
|
|
|
|
{
|
2006-10-13 17:43:29 +08:00
|
|
|
|
output_name = make_tempdir (output_name);
|
|
|
|
|
if (output_name == NULL)
|
2007-01-10 21:36:34 +08:00
|
|
|
|
fatal (_("cannot create tempdir for archive copying (error: %s)"),
|
|
|
|
|
strerror (errno));
|
2003-07-24 01:34:03 +08:00
|
|
|
|
|
2009-09-10 21:40:44 +08:00
|
|
|
|
l = (struct name_list *) xmalloc (sizeof (struct name_list));
|
2002-02-11 10:34:14 +08:00
|
|
|
|
l->name = output_name;
|
|
|
|
|
l->next = list;
|
|
|
|
|
l->obfd = NULL;
|
|
|
|
|
list = l;
|
|
|
|
|
output_name = concat (output_name, "/",
|
|
|
|
|
bfd_get_filename (this_element), (char *) 0);
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-27 11:16:15 +08:00
|
|
|
|
if (preserve_dates)
|
|
|
|
|
{
|
|
|
|
|
stat_status = bfd_stat_arch_elt (this_element, &buf);
|
2001-07-31 21:49:39 +08:00
|
|
|
|
|
1999-05-27 11:16:15 +08:00
|
|
|
|
if (stat_status != 0)
|
|
|
|
|
non_fatal (_("internal stat error on %s"),
|
|
|
|
|
bfd_get_filename (this_element));
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2009-09-10 21:40:44 +08:00
|
|
|
|
l = (struct name_list *) xmalloc (sizeof (struct name_list));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
l->name = output_name;
|
|
|
|
|
l->next = list;
|
2005-04-25 22:27:00 +08:00
|
|
|
|
l->obfd = NULL;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
list = l;
|
|
|
|
|
|
2011-05-06 22:41:56 +08:00
|
|
|
|
ok_object = bfd_check_format (this_element, bfd_object);
|
|
|
|
|
if (!ok_object)
|
|
|
|
|
bfd_nonfatal_message (NULL, this_element, NULL,
|
|
|
|
|
_("Unable to recognise the format of file"));
|
|
|
|
|
|
|
|
|
|
/* PR binutils/3110: Cope with archives
|
|
|
|
|
containing multiple target types. */
|
|
|
|
|
if (force_output_target || !ok_object)
|
|
|
|
|
output_bfd = bfd_openw (output_name, output_target);
|
|
|
|
|
else
|
|
|
|
|
output_bfd = bfd_openw (output_name, bfd_get_target (this_element));
|
|
|
|
|
|
|
|
|
|
if (output_bfd == NULL)
|
2005-06-14 21:26:42 +08:00
|
|
|
|
{
|
2011-05-06 22:41:56 +08:00
|
|
|
|
bfd_nonfatal_message (output_name, NULL, NULL, NULL);
|
|
|
|
|
status = 1;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (ok_object)
|
|
|
|
|
{
|
|
|
|
|
del = !copy_object (this_element, output_bfd, input_arch);
|
2006-09-11 22:40:39 +08:00
|
|
|
|
|
2011-05-06 22:41:56 +08:00
|
|
|
|
if (del && bfd_get_arch (this_element) == bfd_arch_unknown)
|
|
|
|
|
/* Try again as an unknown object file. */
|
|
|
|
|
ok_object = FALSE;
|
|
|
|
|
else if (!bfd_close (output_bfd))
|
2007-08-30 18:19:03 +08:00
|
|
|
|
{
|
|
|
|
|
bfd_nonfatal_message (output_name, NULL, NULL, NULL);
|
2011-05-06 22:41:56 +08:00
|
|
|
|
/* Error in new object file. Don't change archive. */
|
2007-08-30 18:19:03 +08:00
|
|
|
|
status = 1;
|
2005-06-14 21:26:42 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2011-05-06 22:41:56 +08:00
|
|
|
|
if (!ok_object)
|
|
|
|
|
{
|
2009-09-10 21:40:44 +08:00
|
|
|
|
del = !copy_unknown_object (this_element, output_bfd);
|
2005-06-14 21:26:42 +08:00
|
|
|
|
if (!bfd_close_all_done (output_bfd))
|
|
|
|
|
{
|
2009-01-29 21:03:21 +08:00
|
|
|
|
bfd_nonfatal_message (output_name, NULL, NULL, NULL);
|
2005-06-14 21:26:42 +08:00
|
|
|
|
/* Error in new object file. Don't change archive. */
|
|
|
|
|
status = 1;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
2009-09-10 21:40:44 +08:00
|
|
|
|
if (del)
|
2004-01-12 21:10:02 +08:00
|
|
|
|
{
|
|
|
|
|
unlink (output_name);
|
|
|
|
|
status = 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (preserve_dates && stat_status == 0)
|
|
|
|
|
set_times (output_name, &buf);
|
1999-05-27 11:16:15 +08:00
|
|
|
|
|
2004-01-12 21:10:02 +08:00
|
|
|
|
/* Open the newly output file and attach to our list. */
|
|
|
|
|
output_bfd = bfd_openr (output_name, output_target);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2004-01-12 21:10:02 +08:00
|
|
|
|
l->obfd = output_bfd;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2004-01-12 21:10:02 +08:00
|
|
|
|
*ptr = output_bfd;
|
2007-06-27 19:54:10 +08:00
|
|
|
|
ptr = &output_bfd->archive_next;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2004-01-12 21:10:02 +08:00
|
|
|
|
last_element = this_element;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2004-01-12 21:10:02 +08:00
|
|
|
|
this_element = bfd_openr_next_archived_file (ibfd, last_element);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2004-01-12 21:10:02 +08:00
|
|
|
|
bfd_close (last_element);
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
2003-08-05 22:40:54 +08:00
|
|
|
|
*ptr = NULL;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2009-01-29 21:03:21 +08:00
|
|
|
|
filename = bfd_get_filename (obfd);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (!bfd_close (obfd))
|
2009-01-29 21:03:21 +08:00
|
|
|
|
{
|
|
|
|
|
status = 1;
|
|
|
|
|
bfd_nonfatal_message (filename, NULL, NULL, NULL);
|
|
|
|
|
return;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2009-01-29 21:03:21 +08:00
|
|
|
|
filename = bfd_get_filename (ibfd);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (!bfd_close (ibfd))
|
2009-01-29 21:03:21 +08:00
|
|
|
|
{
|
|
|
|
|
status = 1;
|
|
|
|
|
bfd_nonfatal_message (filename, NULL, NULL, NULL);
|
|
|
|
|
return;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
/* Delete all the files that we opened. */
|
|
|
|
|
for (l = list; l != NULL; l = l->next)
|
|
|
|
|
{
|
2002-02-11 10:34:14 +08:00
|
|
|
|
if (l->obfd == NULL)
|
|
|
|
|
rmdir (l->name);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
bfd_close (l->obfd);
|
|
|
|
|
unlink (l->name);
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
rmdir (dir);
|
|
|
|
|
}
|
|
|
|
|
|
2009-04-14 17:47:44 +08:00
|
|
|
|
static void
|
|
|
|
|
set_long_section_mode (bfd *output_bfd, bfd *input_bfd, enum long_section_name_handling style)
|
|
|
|
|
{
|
|
|
|
|
/* This is only relevant to Coff targets. */
|
|
|
|
|
if (bfd_get_flavour (output_bfd) == bfd_target_coff_flavour)
|
|
|
|
|
{
|
2009-05-12 17:07:37 +08:00
|
|
|
|
if (style == KEEP
|
|
|
|
|
&& bfd_get_flavour (input_bfd) == bfd_target_coff_flavour)
|
2009-04-14 17:47:44 +08:00
|
|
|
|
style = bfd_coff_long_section_names (input_bfd) ? ENABLE : DISABLE;
|
|
|
|
|
bfd_coff_set_long_section_names (output_bfd, style != DISABLE);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* The top-level control. */
|
|
|
|
|
|
|
|
|
|
static void
|
2003-07-24 01:34:03 +08:00
|
|
|
|
copy_file (const char *input_filename, const char *output_filename,
|
2009-09-11 19:16:19 +08:00
|
|
|
|
const char *input_target, const char *output_target,
|
|
|
|
|
const bfd_arch_info_type *input_arch)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
bfd *ibfd;
|
2002-10-15 13:10:48 +08:00
|
|
|
|
char **obj_matching;
|
|
|
|
|
char **core_matching;
|
2009-06-28 01:19:02 +08:00
|
|
|
|
off_t size = get_file_size (input_filename);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2009-06-28 01:19:02 +08:00
|
|
|
|
if (size < 1)
|
2003-11-07 20:19:34 +08:00
|
|
|
|
{
|
2009-06-28 01:19:02 +08:00
|
|
|
|
if (size == 0)
|
|
|
|
|
non_fatal (_("error: the input file '%s' is empty"),
|
|
|
|
|
input_filename);
|
2003-11-07 20:19:34 +08:00
|
|
|
|
status = 1;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* To allow us to do "strip *" without dying on the first
|
|
|
|
|
non-object file, failures are nonfatal. */
|
|
|
|
|
ibfd = bfd_openr (input_filename, input_target);
|
|
|
|
|
if (ibfd == NULL)
|
2007-08-30 18:19:03 +08:00
|
|
|
|
{
|
|
|
|
|
bfd_nonfatal_message (input_filename, NULL, NULL, NULL);
|
|
|
|
|
status = 1;
|
|
|
|
|
return;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2010-10-29 20:10:39 +08:00
|
|
|
|
switch (do_debug_sections)
|
|
|
|
|
{
|
|
|
|
|
case compress:
|
|
|
|
|
ibfd->flags |= BFD_COMPRESS;
|
|
|
|
|
break;
|
|
|
|
|
case decompress:
|
|
|
|
|
ibfd->flags |= BFD_DECOMPRESS;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (bfd_check_format (ibfd, bfd_archive))
|
|
|
|
|
{
|
2006-09-11 22:40:39 +08:00
|
|
|
|
bfd_boolean force_output_target;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
bfd *obfd;
|
|
|
|
|
|
|
|
|
|
/* bfd_get_target does not return the correct value until
|
|
|
|
|
bfd_check_format succeeds. */
|
|
|
|
|
if (output_target == NULL)
|
2006-09-11 22:40:39 +08:00
|
|
|
|
{
|
|
|
|
|
output_target = bfd_get_target (ibfd);
|
|
|
|
|
force_output_target = FALSE;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
force_output_target = TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
obfd = bfd_openw (output_filename, output_target);
|
|
|
|
|
if (obfd == NULL)
|
2007-08-30 18:19:03 +08:00
|
|
|
|
{
|
|
|
|
|
bfd_nonfatal_message (output_filename, NULL, NULL, NULL);
|
|
|
|
|
status = 1;
|
|
|
|
|
return;
|
|
|
|
|
}
|
2009-04-14 17:47:44 +08:00
|
|
|
|
/* This is a no-op on non-Coff targets. */
|
|
|
|
|
set_long_section_mode (obfd, ibfd, long_section_names);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2009-09-11 19:16:19 +08:00
|
|
|
|
copy_archive (ibfd, obfd, output_target, force_output_target, input_arch);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
2002-10-15 13:10:48 +08:00
|
|
|
|
else if (bfd_check_format_matches (ibfd, bfd_object, &obj_matching))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
bfd *obfd;
|
2002-10-15 13:10:48 +08:00
|
|
|
|
do_copy:
|
2004-01-12 21:10:02 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* bfd_get_target does not return the correct value until
|
|
|
|
|
bfd_check_format succeeds. */
|
|
|
|
|
if (output_target == NULL)
|
|
|
|
|
output_target = bfd_get_target (ibfd);
|
|
|
|
|
|
|
|
|
|
obfd = bfd_openw (output_filename, output_target);
|
|
|
|
|
if (obfd == NULL)
|
2007-08-30 18:19:03 +08:00
|
|
|
|
{
|
|
|
|
|
bfd_nonfatal_message (output_filename, NULL, NULL, NULL);
|
|
|
|
|
status = 1;
|
|
|
|
|
return;
|
|
|
|
|
}
|
2009-04-14 17:47:44 +08:00
|
|
|
|
/* This is a no-op on non-Coff targets. */
|
|
|
|
|
set_long_section_mode (obfd, ibfd, long_section_names);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2009-09-11 19:16:19 +08:00
|
|
|
|
if (! copy_object (ibfd, obfd, input_arch))
|
2005-05-06 14:32:43 +08:00
|
|
|
|
status = 1;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
if (!bfd_close (obfd))
|
2009-01-29 21:03:21 +08:00
|
|
|
|
{
|
|
|
|
|
status = 1;
|
|
|
|
|
bfd_nonfatal_message (output_filename, NULL, NULL, NULL);
|
|
|
|
|
return;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
if (!bfd_close (ibfd))
|
2009-01-29 21:03:21 +08:00
|
|
|
|
{
|
|
|
|
|
status = 1;
|
|
|
|
|
bfd_nonfatal_message (input_filename, NULL, NULL, NULL);
|
|
|
|
|
return;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2002-10-15 13:10:48 +08:00
|
|
|
|
bfd_error_type obj_error = bfd_get_error ();
|
|
|
|
|
bfd_error_type core_error;
|
2002-11-30 16:39:46 +08:00
|
|
|
|
|
2002-10-15 13:10:48 +08:00
|
|
|
|
if (bfd_check_format_matches (ibfd, bfd_core, &core_matching))
|
|
|
|
|
{
|
|
|
|
|
/* This probably can't happen.. */
|
|
|
|
|
if (obj_error == bfd_error_file_ambiguously_recognized)
|
|
|
|
|
free (obj_matching);
|
|
|
|
|
goto do_copy;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
core_error = bfd_get_error ();
|
|
|
|
|
/* Report the object error in preference to the core error. */
|
|
|
|
|
if (obj_error != core_error)
|
|
|
|
|
bfd_set_error (obj_error);
|
|
|
|
|
|
2007-08-30 18:19:03 +08:00
|
|
|
|
bfd_nonfatal_message (input_filename, NULL, NULL, NULL);
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
2002-10-15 13:10:48 +08:00
|
|
|
|
if (obj_error == bfd_error_file_ambiguously_recognized)
|
|
|
|
|
{
|
|
|
|
|
list_matching_formats (obj_matching);
|
|
|
|
|
free (obj_matching);
|
|
|
|
|
}
|
|
|
|
|
if (core_error == bfd_error_file_ambiguously_recognized)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2002-10-15 13:10:48 +08:00
|
|
|
|
list_matching_formats (core_matching);
|
|
|
|
|
free (core_matching);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
status = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2001-07-31 21:49:39 +08:00
|
|
|
|
/* Add a name to the section renaming list. */
|
|
|
|
|
|
|
|
|
|
static void
|
2003-07-24 01:34:03 +08:00
|
|
|
|
add_section_rename (const char * old_name, const char * new_name,
|
|
|
|
|
flagword flags)
|
2001-07-31 21:49:39 +08:00
|
|
|
|
{
|
2009-12-11 21:42:17 +08:00
|
|
|
|
section_rename * srename;
|
2001-07-31 21:49:39 +08:00
|
|
|
|
|
|
|
|
|
/* Check for conflicts first. */
|
2009-12-11 21:42:17 +08:00
|
|
|
|
for (srename = section_rename_list; srename != NULL; srename = srename->next)
|
|
|
|
|
if (strcmp (srename->old_name, old_name) == 0)
|
2001-07-31 21:49:39 +08:00
|
|
|
|
{
|
|
|
|
|
/* Silently ignore duplicate definitions. */
|
2009-12-11 21:42:17 +08:00
|
|
|
|
if (strcmp (srename->new_name, new_name) == 0
|
|
|
|
|
&& srename->flags == flags)
|
2001-07-31 21:49:39 +08:00
|
|
|
|
return;
|
2002-05-22 03:34:58 +08:00
|
|
|
|
|
2001-07-31 21:49:39 +08:00
|
|
|
|
fatal (_("Multiple renames of section %s"), old_name);
|
|
|
|
|
}
|
|
|
|
|
|
2009-12-11 21:42:17 +08:00
|
|
|
|
srename = (section_rename *) xmalloc (sizeof (* srename));
|
2001-07-31 21:49:39 +08:00
|
|
|
|
|
2009-12-11 21:42:17 +08:00
|
|
|
|
srename->old_name = old_name;
|
|
|
|
|
srename->new_name = new_name;
|
|
|
|
|
srename->flags = flags;
|
|
|
|
|
srename->next = section_rename_list;
|
2002-05-22 03:34:58 +08:00
|
|
|
|
|
2009-12-11 21:42:17 +08:00
|
|
|
|
section_rename_list = srename;
|
2001-07-31 21:49:39 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Check the section rename list for a new name of the input section
|
|
|
|
|
ISECTION. Return the new name if one is found.
|
|
|
|
|
Also set RETURNED_FLAGS to the flags to be used for this section. */
|
|
|
|
|
|
|
|
|
|
static const char *
|
2003-07-24 01:34:03 +08:00
|
|
|
|
find_section_rename (bfd * ibfd ATTRIBUTE_UNUSED, sec_ptr isection,
|
|
|
|
|
flagword * returned_flags)
|
2001-07-31 21:49:39 +08:00
|
|
|
|
{
|
|
|
|
|
const char * old_name = bfd_section_name (ibfd, isection);
|
2009-12-11 21:42:17 +08:00
|
|
|
|
section_rename * srename;
|
2001-07-31 21:49:39 +08:00
|
|
|
|
|
|
|
|
|
/* Default to using the flags of the input section. */
|
|
|
|
|
* returned_flags = bfd_get_section_flags (ibfd, isection);
|
|
|
|
|
|
2009-12-11 21:42:17 +08:00
|
|
|
|
for (srename = section_rename_list; srename != NULL; srename = srename->next)
|
|
|
|
|
if (strcmp (srename->old_name, old_name) == 0)
|
2001-07-31 21:49:39 +08:00
|
|
|
|
{
|
2009-12-11 21:42:17 +08:00
|
|
|
|
if (srename->flags != (flagword) -1)
|
|
|
|
|
* returned_flags = srename->flags;
|
2001-07-31 21:49:39 +08:00
|
|
|
|
|
2009-12-11 21:42:17 +08:00
|
|
|
|
return srename->new_name;
|
2001-07-31 21:49:39 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return old_name;
|
|
|
|
|
}
|
|
|
|
|
|
2004-05-18 00:40:01 +08:00
|
|
|
|
/* Once each of the sections is copied, we may still need to do some
|
|
|
|
|
finalization work for private section headers. Do that here. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
setup_bfd_headers (bfd *ibfd, bfd *obfd)
|
|
|
|
|
{
|
|
|
|
|
/* Allow the BFD backend to copy any private data it understands
|
|
|
|
|
from the input section to the output section. */
|
|
|
|
|
if (! bfd_copy_private_header_data (ibfd, obfd))
|
|
|
|
|
{
|
2007-08-30 18:19:03 +08:00
|
|
|
|
status = 1;
|
|
|
|
|
bfd_nonfatal_message (NULL, ibfd, NULL,
|
2009-01-29 21:03:21 +08:00
|
|
|
|
_("error in private header data"));
|
2007-08-30 18:19:03 +08:00
|
|
|
|
return;
|
2004-05-18 00:40:01 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* All went well. */
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2001-07-31 21:49:39 +08:00
|
|
|
|
/* Create a section in OBFD with the same
|
|
|
|
|
name and attributes as ISECTION in IBFD. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
static void
|
2003-07-24 01:34:03 +08:00
|
|
|
|
setup_section (bfd *ibfd, sec_ptr isection, void *obfdarg)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2009-09-10 21:40:44 +08:00
|
|
|
|
bfd *obfd = (bfd *) obfdarg;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
struct section_list *p;
|
|
|
|
|
sec_ptr osection;
|
|
|
|
|
bfd_size_type size;
|
|
|
|
|
bfd_vma vma;
|
|
|
|
|
bfd_vma lma;
|
|
|
|
|
flagword flags;
|
2000-05-08 12:28:06 +08:00
|
|
|
|
const char *err;
|
2001-07-31 21:49:39 +08:00
|
|
|
|
const char * name;
|
2002-12-13 21:19:44 +08:00
|
|
|
|
char *prefix = NULL;
|
2007-08-04 16:26:38 +08:00
|
|
|
|
bfd_boolean make_nobits;
|
2002-05-22 03:34:58 +08:00
|
|
|
|
|
2003-06-12 15:23:31 +08:00
|
|
|
|
if (is_strip_section (ibfd, isection))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
return;
|
|
|
|
|
|
2002-11-30 16:39:46 +08:00
|
|
|
|
p = find_section_list (bfd_section_name (ibfd, isection), FALSE);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (p != NULL)
|
2002-11-30 16:39:46 +08:00
|
|
|
|
p->used = TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2001-07-31 21:49:39 +08:00
|
|
|
|
/* Get the, possibly new, name of the output section. */
|
|
|
|
|
name = find_section_rename (ibfd, isection, & flags);
|
2002-05-22 03:34:58 +08:00
|
|
|
|
|
2002-12-13 21:19:44 +08:00
|
|
|
|
/* Prefix sections. */
|
2003-07-24 01:34:03 +08:00
|
|
|
|
if ((prefix_alloc_sections_string)
|
|
|
|
|
&& (bfd_get_section_flags (ibfd, isection) & SEC_ALLOC))
|
2002-12-13 21:19:44 +08:00
|
|
|
|
prefix = prefix_alloc_sections_string;
|
|
|
|
|
else if (prefix_sections_string)
|
|
|
|
|
prefix = prefix_sections_string;
|
|
|
|
|
|
|
|
|
|
if (prefix)
|
|
|
|
|
{
|
|
|
|
|
char *n;
|
|
|
|
|
|
2009-09-10 21:40:44 +08:00
|
|
|
|
n = (char *) xmalloc (strlen (prefix) + strlen (name) + 1);
|
2002-12-13 21:19:44 +08:00
|
|
|
|
strcpy (n, prefix);
|
|
|
|
|
strcat (n, name);
|
|
|
|
|
name = n;
|
|
|
|
|
}
|
2003-02-21 09:12:13 +08:00
|
|
|
|
|
2007-08-04 16:26:38 +08:00
|
|
|
|
make_nobits = FALSE;
|
2005-07-04 09:53:44 +08:00
|
|
|
|
if (p != NULL && p->set_flags)
|
|
|
|
|
flags = p->flags | (flags & (SEC_HAS_CONTENTS | SEC_RELOC));
|
2007-05-30 22:29:27 +08:00
|
|
|
|
else if (strip_symbols == STRIP_NONDEBUG
|
2010-06-29 16:47:40 +08:00
|
|
|
|
&& (flags & (SEC_ALLOC | SEC_GROUP)) != 0
|
|
|
|
|
&& !(ibfd->xvec->flavour == bfd_target_elf_flavour
|
|
|
|
|
&& elf_section_type (isection) == SHT_NOTE))
|
2007-08-04 16:26:38 +08:00
|
|
|
|
{
|
2010-06-29 16:47:40 +08:00
|
|
|
|
flags &= ~(SEC_HAS_CONTENTS | SEC_LOAD | SEC_GROUP);
|
2007-08-04 16:26:38 +08:00
|
|
|
|
if (obfd->xvec->flavour == bfd_target_elf_flavour)
|
|
|
|
|
{
|
|
|
|
|
make_nobits = TRUE;
|
|
|
|
|
|
|
|
|
|
/* Twiddle the input section flags so that it seems to
|
|
|
|
|
elf.c:copy_private_bfd_data that section flags have not
|
|
|
|
|
changed between input and output sections. This hack
|
|
|
|
|
prevents wholesale rewriting of the program headers. */
|
2010-06-29 16:47:40 +08:00
|
|
|
|
isection->flags &= ~(SEC_HAS_CONTENTS | SEC_LOAD | SEC_GROUP);
|
2007-08-04 16:26:38 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
2005-07-04 09:53:44 +08:00
|
|
|
|
|
|
|
|
|
osection = bfd_make_section_anyway_with_flags (obfd, name, flags);
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (osection == NULL)
|
|
|
|
|
{
|
2007-08-30 18:19:03 +08:00
|
|
|
|
err = _("failed to create output section");
|
1999-05-03 15:29:11 +08:00
|
|
|
|
goto loser;
|
|
|
|
|
}
|
|
|
|
|
|
2007-08-04 16:26:38 +08:00
|
|
|
|
if (make_nobits)
|
2005-07-04 09:53:44 +08:00
|
|
|
|
elf_section_type (osection) = SHT_NOBITS;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
size = bfd_section_size (ibfd, isection);
|
|
|
|
|
if (copy_byte >= 0)
|
2010-09-10 20:11:28 +08:00
|
|
|
|
size = (size + interleave - 1) / interleave * copy_width;
|
2007-03-02 00:39:42 +08:00
|
|
|
|
else if (extract_symbol)
|
|
|
|
|
size = 0;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (! bfd_set_section_size (obfd, osection, size))
|
|
|
|
|
{
|
2007-08-30 18:19:03 +08:00
|
|
|
|
err = _("failed to set size");
|
1999-05-03 15:29:11 +08:00
|
|
|
|
goto loser;
|
|
|
|
|
}
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
vma = bfd_section_vma (ibfd, isection);
|
|
|
|
|
if (p != NULL && p->change_vma == CHANGE_MODIFY)
|
|
|
|
|
vma += p->vma_val;
|
|
|
|
|
else if (p != NULL && p->change_vma == CHANGE_SET)
|
|
|
|
|
vma = p->vma_val;
|
|
|
|
|
else
|
|
|
|
|
vma += change_section_address;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
2008-08-06 08:42:17 +08:00
|
|
|
|
if (! bfd_set_section_vma (obfd, osection, vma))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2007-08-30 18:19:03 +08:00
|
|
|
|
err = _("failed to set vma");
|
1999-05-03 15:29:11 +08:00
|
|
|
|
goto loser;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
lma = isection->lma;
|
|
|
|
|
if ((p != NULL) && p->change_lma != CHANGE_IGNORE)
|
|
|
|
|
{
|
|
|
|
|
if (p->change_lma == CHANGE_MODIFY)
|
|
|
|
|
lma += p->lma_val;
|
|
|
|
|
else if (p->change_lma == CHANGE_SET)
|
|
|
|
|
lma = p->lma_val;
|
|
|
|
|
else
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
lma += change_section_address;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
2008-08-06 08:42:17 +08:00
|
|
|
|
osection->lma = lma;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
/* FIXME: This is probably not enough. If we change the LMA we
|
|
|
|
|
may have to recompute the header for the file as well. */
|
2002-11-30 16:39:46 +08:00
|
|
|
|
if (!bfd_set_section_alignment (obfd,
|
|
|
|
|
osection,
|
|
|
|
|
bfd_section_alignment (ibfd, isection)))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2007-08-30 18:19:03 +08:00
|
|
|
|
err = _("failed to set alignment");
|
1999-05-03 15:29:11 +08:00
|
|
|
|
goto loser;
|
|
|
|
|
}
|
|
|
|
|
|
2001-12-10 19:03:54 +08:00
|
|
|
|
/* Copy merge entity size. */
|
|
|
|
|
osection->entsize = isection->entsize;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* 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;
|
2008-08-06 08:42:17 +08:00
|
|
|
|
isection->output_offset = 0;
|
2007-03-02 00:39:42 +08:00
|
|
|
|
|
|
|
|
|
/* 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;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2008-09-28 21:29:18 +08:00
|
|
|
|
if ((isection->flags & SEC_GROUP) != 0)
|
|
|
|
|
{
|
|
|
|
|
asymbol *gsym = group_signature (isection);
|
|
|
|
|
|
|
|
|
|
if (gsym != NULL)
|
|
|
|
|
{
|
|
|
|
|
gsym->flags |= BSF_KEEP;
|
|
|
|
|
if (ibfd->xvec->flavour == bfd_target_elf_flavour)
|
|
|
|
|
elf_group_id (isection) = gsym;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* Allow the BFD backend to copy any private data it understands
|
|
|
|
|
from the input section to the output section. */
|
2007-05-30 22:29:27 +08:00
|
|
|
|
if (!bfd_copy_private_section_data (ibfd, isection, obfd, osection))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2007-08-30 18:19:03 +08:00
|
|
|
|
err = _("failed to copy private data");
|
1999-05-03 15:29:11 +08:00
|
|
|
|
goto loser;
|
|
|
|
|
}
|
|
|
|
|
|
2001-07-31 21:49:39 +08:00
|
|
|
|
/* All went well. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
loser:
|
|
|
|
|
status = 1;
|
2007-08-30 18:19:03 +08:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, osection, err);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Copy the data of input section ISECTION of IBFD
|
|
|
|
|
to an output section with the same name in OBFD.
|
|
|
|
|
If stripping then don't copy any relocation info. */
|
|
|
|
|
|
|
|
|
|
static void
|
2003-07-24 01:34:03 +08:00
|
|
|
|
copy_section (bfd *ibfd, sec_ptr isection, void *obfdarg)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2009-09-10 21:40:44 +08:00
|
|
|
|
bfd *obfd = (bfd *) obfdarg;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
struct section_list *p;
|
|
|
|
|
arelent **relpp;
|
|
|
|
|
long relcount;
|
|
|
|
|
sec_ptr osection;
|
|
|
|
|
bfd_size_type size;
|
|
|
|
|
long relsize;
|
2002-06-05 22:06:52 +08:00
|
|
|
|
flagword flags;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2001-07-31 21:49:39 +08:00
|
|
|
|
/* If we have already failed earlier on,
|
|
|
|
|
do not keep on generating complaints now. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (status != 0)
|
|
|
|
|
return;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
2003-06-12 15:23:31 +08:00
|
|
|
|
if (is_strip_section (ibfd, isection))
|
2001-07-05 15:49:05 +08:00
|
|
|
|
return;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2003-06-12 15:23:31 +08:00
|
|
|
|
flags = bfd_get_section_flags (ibfd, isection);
|
2002-06-05 22:06:52 +08:00
|
|
|
|
if ((flags & SEC_GROUP) != 0)
|
|
|
|
|
return;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
osection = isection->output_section;
|
2004-06-15 09:19:13 +08:00
|
|
|
|
size = bfd_get_section_size (isection);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
if (size == 0 || osection == 0)
|
|
|
|
|
return;
|
|
|
|
|
|
2008-08-06 08:42:17 +08:00
|
|
|
|
if (extract_symbol)
|
|
|
|
|
return;
|
|
|
|
|
|
2003-06-12 15:23:31 +08:00
|
|
|
|
p = find_section_list (bfd_get_section_name (ibfd, isection), FALSE);
|
|
|
|
|
|
2002-05-22 03:34:58 +08:00
|
|
|
|
/* Core files do not need to be relocated. */
|
2001-12-19 13:18:34 +08:00
|
|
|
|
if (bfd_get_format (obfd) == bfd_core)
|
|
|
|
|
relsize = 0;
|
|
|
|
|
else
|
2003-10-27 20:45:38 +08:00
|
|
|
|
{
|
|
|
|
|
relsize = bfd_get_reloc_upper_bound (ibfd, isection);
|
2001-12-19 13:18:34 +08:00
|
|
|
|
|
2003-10-27 20:45:38 +08:00
|
|
|
|
if (relsize < 0)
|
|
|
|
|
{
|
|
|
|
|
/* Do not complain if the target does not support relocations. */
|
|
|
|
|
if (relsize == -1 && bfd_get_error () == bfd_error_invalid_operation)
|
|
|
|
|
relsize = 0;
|
|
|
|
|
else
|
2007-08-30 18:19:03 +08:00
|
|
|
|
{
|
|
|
|
|
status = 1;
|
|
|
|
|
bfd_nonfatal_message (NULL, ibfd, isection, NULL);
|
|
|
|
|
return;
|
|
|
|
|
}
|
2003-10-27 20:45:38 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (relsize == 0)
|
2003-08-05 22:40:54 +08:00
|
|
|
|
bfd_set_reloc (obfd, osection, NULL, 0);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
else
|
|
|
|
|
{
|
2009-09-10 21:40:44 +08:00
|
|
|
|
relpp = (arelent **) xmalloc (relsize);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
relcount = bfd_canonicalize_reloc (ibfd, isection, relpp, isympp);
|
|
|
|
|
if (relcount < 0)
|
2007-08-30 18:19:03 +08:00
|
|
|
|
{
|
|
|
|
|
status = 1;
|
|
|
|
|
bfd_nonfatal_message (NULL, ibfd, isection,
|
|
|
|
|
_("relocation count is negative"));
|
|
|
|
|
return;
|
|
|
|
|
}
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (strip_symbols == STRIP_ALL)
|
|
|
|
|
{
|
|
|
|
|
/* Remove relocations which are not in
|
2002-05-22 03:34:58 +08:00
|
|
|
|
keep_strip_specific_list. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
arelent **temp_relpp;
|
|
|
|
|
long temp_relcount = 0;
|
|
|
|
|
long i;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
2009-09-10 21:40:44 +08:00
|
|
|
|
temp_relpp = (arelent **) xmalloc (relsize);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
for (i = 0; i < relcount; i++)
|
2003-08-05 22:40:54 +08:00
|
|
|
|
if (is_specified_symbol (bfd_asymbol_name (*relpp[i]->sym_ptr_ptr),
|
2008-04-16 16:24:21 +08:00
|
|
|
|
keep_specific_htab))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
temp_relpp [temp_relcount++] = relpp [i];
|
|
|
|
|
relcount = temp_relcount;
|
|
|
|
|
free (relpp);
|
|
|
|
|
relpp = temp_relpp;
|
|
|
|
|
}
|
2001-07-05 15:49:05 +08:00
|
|
|
|
|
2003-08-05 22:40:54 +08:00
|
|
|
|
bfd_set_reloc (obfd, osection, relcount == 0 ? NULL : relpp, relcount);
|
2004-01-13 23:41:00 +08:00
|
|
|
|
if (relcount == 0)
|
|
|
|
|
free (relpp);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
2002-05-22 03:34:58 +08:00
|
|
|
|
if (bfd_get_section_flags (ibfd, isection) & SEC_HAS_CONTENTS
|
2001-12-19 13:18:34 +08:00
|
|
|
|
&& bfd_get_section_flags (obfd, osection) & SEC_HAS_CONTENTS)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2010-10-29 20:10:39 +08:00
|
|
|
|
bfd_byte *memhunk = NULL;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2010-10-29 20:10:39 +08:00
|
|
|
|
if (!bfd_get_full_section_contents (ibfd, isection, &memhunk))
|
2007-08-30 18:19:03 +08:00
|
|
|
|
{
|
|
|
|
|
status = 1;
|
|
|
|
|
bfd_nonfatal_message (NULL, ibfd, isection, NULL);
|
|
|
|
|
return;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2007-04-23 18:59:07 +08:00
|
|
|
|
if (reverse_bytes)
|
|
|
|
|
{
|
|
|
|
|
/* We don't handle leftover bytes (too many possible behaviors,
|
|
|
|
|
and we don't know what the user wants). The section length
|
|
|
|
|
must be a multiple of the number of bytes to swap. */
|
|
|
|
|
if ((size % reverse_bytes) == 0)
|
|
|
|
|
{
|
|
|
|
|
unsigned long i, j;
|
|
|
|
|
bfd_byte b;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < size; i += reverse_bytes)
|
|
|
|
|
for (j = 0; j < (unsigned long)(reverse_bytes / 2); j++)
|
|
|
|
|
{
|
|
|
|
|
bfd_byte *m = (bfd_byte *) memhunk;
|
|
|
|
|
|
|
|
|
|
b = m[i + j];
|
|
|
|
|
m[i + j] = m[(i + reverse_bytes) - (j + 1)];
|
|
|
|
|
m[(i + reverse_bytes) - (j + 1)] = b;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
/* User must pad the section up in order to do this. */
|
|
|
|
|
fatal (_("cannot reverse bytes: length of section %s must be evenly divisible by %d"),
|
|
|
|
|
bfd_section_name (ibfd, isection), reverse_bytes);
|
|
|
|
|
}
|
|
|
|
|
|
2000-04-05 11:43:56 +08:00
|
|
|
|
if (copy_byte >= 0)
|
2004-01-03 06:54:47 +08:00
|
|
|
|
{
|
|
|
|
|
/* Keep only every `copy_byte'th byte in MEMHUNK. */
|
2004-02-20 01:15:28 +08:00
|
|
|
|
char *from = (char *) memhunk + copy_byte;
|
2009-09-10 21:40:44 +08:00
|
|
|
|
char *to = (char *) memhunk;
|
2004-02-20 01:15:28 +08:00
|
|
|
|
char *end = (char *) memhunk + size;
|
2010-09-10 20:11:28 +08:00
|
|
|
|
int i;
|
2004-01-03 06:54:47 +08:00
|
|
|
|
|
|
|
|
|
for (; from < end; from += interleave)
|
2010-09-10 20:11:28 +08:00
|
|
|
|
for (i = 0; i < copy_width; i++)
|
|
|
|
|
*to++ = from[i];
|
2004-01-03 06:54:47 +08:00
|
|
|
|
|
2010-09-10 20:11:28 +08:00
|
|
|
|
size = (size + interleave - 1 - copy_byte) / interleave * copy_width;
|
2004-01-03 06:54:47 +08:00
|
|
|
|
osection->lma /= interleave;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2003-08-05 22:40:54 +08:00
|
|
|
|
if (!bfd_set_section_contents (obfd, osection, memhunk, 0, size))
|
2007-08-30 18:19:03 +08:00
|
|
|
|
{
|
|
|
|
|
status = 1;
|
|
|
|
|
bfd_nonfatal_message (NULL, obfd, osection, NULL);
|
|
|
|
|
return;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
free (memhunk);
|
|
|
|
|
}
|
|
|
|
|
else if (p != NULL && p->set_flags && (p->flags & SEC_HAS_CONTENTS) != 0)
|
|
|
|
|
{
|
2003-08-05 22:40:54 +08:00
|
|
|
|
void *memhunk = xmalloc (size);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
/* We don't permit the user to turn off the SEC_HAS_CONTENTS
|
|
|
|
|
flag--they can just remove the section entirely and add it
|
|
|
|
|
back again. However, we do permit them to turn on the
|
|
|
|
|
SEC_HAS_CONTENTS flag, and take it to mean that the section
|
|
|
|
|
contents should be zeroed out. */
|
|
|
|
|
|
|
|
|
|
memset (memhunk, 0, size);
|
2003-08-05 22:40:54 +08:00
|
|
|
|
if (! bfd_set_section_contents (obfd, osection, memhunk, 0, size))
|
2007-08-30 18:19:03 +08:00
|
|
|
|
{
|
|
|
|
|
status = 1;
|
|
|
|
|
bfd_nonfatal_message (NULL, obfd, osection, NULL);
|
|
|
|
|
return;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
free (memhunk);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Get all the sections. This is used when --gap-fill or --pad-to is
|
|
|
|
|
used. */
|
|
|
|
|
|
|
|
|
|
static void
|
2003-07-24 01:34:03 +08:00
|
|
|
|
get_sections (bfd *obfd ATTRIBUTE_UNUSED, asection *osection, void *secppparg)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2009-09-10 21:40:44 +08:00
|
|
|
|
asection ***secppp = (asection ***) secppparg;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
**secppp = osection;
|
|
|
|
|
++(*secppp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Sort sections by VMA. This is called via qsort, and is used when
|
|
|
|
|
--gap-fill or --pad-to is used. We force non loadable or empty
|
|
|
|
|
sections to the front, where they are easier to ignore. */
|
|
|
|
|
|
|
|
|
|
static int
|
2003-07-24 01:34:03 +08:00
|
|
|
|
compare_section_lma (const void *arg1, const void *arg2)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2009-09-10 21:40:44 +08:00
|
|
|
|
const asection *const *sec1 = (const asection * const *) arg1;
|
|
|
|
|
const asection *const *sec2 = (const asection * const *) arg2;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
flagword flags1, flags2;
|
|
|
|
|
|
|
|
|
|
/* Sort non loadable sections to the front. */
|
|
|
|
|
flags1 = (*sec1)->flags;
|
|
|
|
|
flags2 = (*sec2)->flags;
|
|
|
|
|
if ((flags1 & SEC_HAS_CONTENTS) == 0
|
|
|
|
|
|| (flags1 & SEC_LOAD) == 0)
|
|
|
|
|
{
|
|
|
|
|
if ((flags2 & SEC_HAS_CONTENTS) != 0
|
|
|
|
|
&& (flags2 & SEC_LOAD) != 0)
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if ((flags2 & SEC_HAS_CONTENTS) == 0
|
|
|
|
|
|| (flags2 & SEC_LOAD) == 0)
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Sort sections by LMA. */
|
|
|
|
|
if ((*sec1)->lma > (*sec2)->lma)
|
|
|
|
|
return 1;
|
|
|
|
|
else if ((*sec1)->lma < (*sec2)->lma)
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
/* Sort sections with the same LMA by size. */
|
2004-06-15 09:19:13 +08:00
|
|
|
|
if (bfd_get_section_size (*sec1) > bfd_get_section_size (*sec2))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
return 1;
|
2004-06-15 09:19:13 +08:00
|
|
|
|
else if (bfd_get_section_size (*sec1) < bfd_get_section_size (*sec2))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Mark all the symbols which will be used in output relocations with
|
|
|
|
|
the BSF_KEEP flag so that those symbols will not be stripped.
|
|
|
|
|
|
|
|
|
|
Ignore relocations which will not appear in the output file. */
|
|
|
|
|
|
|
|
|
|
static void
|
2003-07-24 01:34:03 +08:00
|
|
|
|
mark_symbols_used_in_relocations (bfd *ibfd, sec_ptr isection, void *symbolsarg)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2009-09-10 21:40:44 +08:00
|
|
|
|
asymbol **symbols = (asymbol **) symbolsarg;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
long relsize;
|
|
|
|
|
arelent **relpp;
|
|
|
|
|
long relcount, i;
|
|
|
|
|
|
|
|
|
|
/* Ignore an input section with no corresponding output section. */
|
|
|
|
|
if (isection->output_section == NULL)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
relsize = bfd_get_reloc_upper_bound (ibfd, isection);
|
|
|
|
|
if (relsize < 0)
|
2003-10-27 20:45:38 +08:00
|
|
|
|
{
|
|
|
|
|
/* Do not complain if the target does not support relocations. */
|
|
|
|
|
if (relsize == -1 && bfd_get_error () == bfd_error_invalid_operation)
|
|
|
|
|
return;
|
|
|
|
|
bfd_fatal (bfd_get_filename (ibfd));
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
if (relsize == 0)
|
|
|
|
|
return;
|
|
|
|
|
|
2009-09-10 21:40:44 +08:00
|
|
|
|
relpp = (arelent **) xmalloc (relsize);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
relcount = bfd_canonicalize_reloc (ibfd, isection, relpp, symbols);
|
|
|
|
|
if (relcount < 0)
|
|
|
|
|
bfd_fatal (bfd_get_filename (ibfd));
|
|
|
|
|
|
2001-07-06 16:01:17 +08:00
|
|
|
|
/* Examine each symbol used in a relocation. If it's not one of the
|
|
|
|
|
special bfd section symbols, then mark it with BSF_KEEP. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
for (i = 0; i < relcount; i++)
|
|
|
|
|
{
|
2001-07-06 16:01:17 +08:00
|
|
|
|
if (*relpp[i]->sym_ptr_ptr != bfd_com_section_ptr->symbol
|
|
|
|
|
&& *relpp[i]->sym_ptr_ptr != bfd_abs_section_ptr->symbol
|
|
|
|
|
&& *relpp[i]->sym_ptr_ptr != bfd_und_section_ptr->symbol)
|
|
|
|
|
(*relpp[i]->sym_ptr_ptr)->flags |= BSF_KEEP;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (relpp != NULL)
|
|
|
|
|
free (relpp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Write out debugging information. */
|
|
|
|
|
|
2002-11-30 16:39:46 +08:00
|
|
|
|
static bfd_boolean
|
2003-07-24 01:34:03 +08:00
|
|
|
|
write_debugging_info (bfd *obfd, void *dhandle,
|
|
|
|
|
long *symcountp ATTRIBUTE_UNUSED,
|
|
|
|
|
asymbol ***symppp ATTRIBUTE_UNUSED)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
if (bfd_get_flavour (obfd) == bfd_target_ieee_flavour)
|
|
|
|
|
return write_ieee_debugging_info (obfd, dhandle);
|
|
|
|
|
|
|
|
|
|
if (bfd_get_flavour (obfd) == bfd_target_coff_flavour
|
|
|
|
|
|| bfd_get_flavour (obfd) == bfd_target_elf_flavour)
|
|
|
|
|
{
|
|
|
|
|
bfd_byte *syms, *strings;
|
|
|
|
|
bfd_size_type symsize, stringsize;
|
|
|
|
|
asection *stabsec, *stabstrsec;
|
2005-07-04 09:53:44 +08:00
|
|
|
|
flagword flags;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
if (! write_stabs_in_sections_debugging_info (obfd, dhandle, &syms,
|
|
|
|
|
&symsize, &strings,
|
|
|
|
|
&stringsize))
|
2002-11-30 16:39:46 +08:00
|
|
|
|
return FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2005-07-04 09:53:44 +08:00
|
|
|
|
flags = SEC_HAS_CONTENTS | SEC_READONLY | SEC_DEBUGGING;
|
|
|
|
|
stabsec = bfd_make_section_with_flags (obfd, ".stab", flags);
|
|
|
|
|
stabstrsec = bfd_make_section_with_flags (obfd, ".stabstr", flags);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (stabsec == NULL
|
|
|
|
|
|| stabstrsec == NULL
|
|
|
|
|
|| ! bfd_set_section_size (obfd, stabsec, symsize)
|
|
|
|
|
|| ! bfd_set_section_size (obfd, stabstrsec, stringsize)
|
|
|
|
|
|| ! bfd_set_section_alignment (obfd, stabsec, 2)
|
2005-07-04 09:53:44 +08:00
|
|
|
|
|| ! bfd_set_section_alignment (obfd, stabstrsec, 0))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2007-08-30 18:19:03 +08:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, NULL,
|
|
|
|
|
_("can't create debugging section"));
|
2002-11-30 16:39:46 +08:00
|
|
|
|
return FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We can get away with setting the section contents now because
|
|
|
|
|
the next thing the caller is going to do is copy over the
|
|
|
|
|
real sections. We may someday have to split the contents
|
|
|
|
|
setting out of this function. */
|
2003-08-05 22:40:54 +08:00
|
|
|
|
if (! bfd_set_section_contents (obfd, stabsec, syms, 0, symsize)
|
|
|
|
|
|| ! bfd_set_section_contents (obfd, stabstrsec, strings, 0,
|
|
|
|
|
stringsize))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2007-08-30 18:19:03 +08:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, NULL,
|
|
|
|
|
_("can't set debugging section contents"));
|
2002-11-30 16:39:46 +08:00
|
|
|
|
return FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
2002-11-30 16:39:46 +08:00
|
|
|
|
return TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
2007-08-30 18:19:03 +08:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, NULL,
|
|
|
|
|
_("don't know how to write debugging information for %s"),
|
|
|
|
|
bfd_get_target (obfd));
|
2002-11-30 16:39:46 +08:00
|
|
|
|
return FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
2003-07-24 01:34:03 +08:00
|
|
|
|
strip_main (int argc, char *argv[])
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2003-03-25 00:11:46 +08:00
|
|
|
|
char *input_target = NULL;
|
|
|
|
|
char *output_target = NULL;
|
2002-11-30 16:39:46 +08:00
|
|
|
|
bfd_boolean show_version = FALSE;
|
2003-03-25 00:11:46 +08:00
|
|
|
|
bfd_boolean formats_info = FALSE;
|
|
|
|
|
int c;
|
|
|
|
|
int i;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
struct section_list *p;
|
|
|
|
|
char *output_file = NULL;
|
|
|
|
|
|
2003-11-12 01:50:26 +08:00
|
|
|
|
while ((c = getopt_long (argc, argv, "I:O:F:K:N:R:o:sSpdgxXHhVvw",
|
1999-05-03 15:29:11 +08:00
|
|
|
|
strip_options, (int *) 0)) != EOF)
|
|
|
|
|
{
|
|
|
|
|
switch (c)
|
|
|
|
|
{
|
|
|
|
|
case 'I':
|
|
|
|
|
input_target = optarg;
|
|
|
|
|
break;
|
|
|
|
|
case 'O':
|
|
|
|
|
output_target = optarg;
|
|
|
|
|
break;
|
|
|
|
|
case 'F':
|
|
|
|
|
input_target = output_target = optarg;
|
|
|
|
|
break;
|
|
|
|
|
case 'R':
|
2002-11-30 16:39:46 +08:00
|
|
|
|
p = find_section_list (optarg, TRUE);
|
|
|
|
|
p->remove = TRUE;
|
|
|
|
|
sections_removed = TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
case 's':
|
|
|
|
|
strip_symbols = STRIP_ALL;
|
|
|
|
|
break;
|
|
|
|
|
case 'S':
|
|
|
|
|
case 'g':
|
2000-08-15 03:47:01 +08:00
|
|
|
|
case 'd': /* Historic BSD alias for -g. Used by early NetBSD. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
strip_symbols = STRIP_DEBUG;
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_STRIP_UNNEEDED:
|
|
|
|
|
strip_symbols = STRIP_UNNEEDED;
|
|
|
|
|
break;
|
|
|
|
|
case 'K':
|
2008-04-16 16:24:21 +08:00
|
|
|
|
add_specific_symbol (optarg, keep_specific_htab);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
case 'N':
|
2008-04-16 16:24:21 +08:00
|
|
|
|
add_specific_symbol (optarg, strip_specific_htab);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
case 'o':
|
|
|
|
|
output_file = optarg;
|
|
|
|
|
break;
|
|
|
|
|
case 'p':
|
2002-11-30 16:39:46 +08:00
|
|
|
|
preserve_dates = TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
case 'x':
|
|
|
|
|
discard_locals = LOCALS_ALL;
|
|
|
|
|
break;
|
|
|
|
|
case 'X':
|
|
|
|
|
discard_locals = LOCALS_START_L;
|
|
|
|
|
break;
|
|
|
|
|
case 'v':
|
2002-11-30 16:39:46 +08:00
|
|
|
|
verbose = TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
case 'V':
|
2002-11-30 16:39:46 +08:00
|
|
|
|
show_version = TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
2003-03-25 00:11:46 +08:00
|
|
|
|
case OPTION_FORMATS_INFO:
|
|
|
|
|
formats_info = TRUE;
|
|
|
|
|
break;
|
2003-06-26 16:14:10 +08:00
|
|
|
|
case OPTION_ONLY_KEEP_DEBUG:
|
|
|
|
|
strip_symbols = STRIP_NONDEBUG;
|
|
|
|
|
break;
|
2005-11-15 16:33:38 +08:00
|
|
|
|
case OPTION_KEEP_FILE_SYMBOLS:
|
|
|
|
|
keep_file_symbols = 1;
|
|
|
|
|
break;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 0:
|
2001-07-31 21:49:39 +08:00
|
|
|
|
/* We've been given a long option. */
|
|
|
|
|
break;
|
2003-11-12 01:50:26 +08:00
|
|
|
|
case 'w':
|
|
|
|
|
wildcard = TRUE;
|
|
|
|
|
break;
|
2002-01-24 00:12:56 +08:00
|
|
|
|
case 'H':
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'h':
|
|
|
|
|
strip_usage (stdout, 0);
|
|
|
|
|
default:
|
|
|
|
|
strip_usage (stderr, 1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-07-24 01:34:03 +08:00
|
|
|
|
if (formats_info)
|
|
|
|
|
{
|
|
|
|
|
display_info ();
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2007-06-29 08:34:14 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (show_version)
|
|
|
|
|
print_version ("strip");
|
|
|
|
|
|
|
|
|
|
/* Default is to strip all symbols. */
|
|
|
|
|
if (strip_symbols == STRIP_UNDEF
|
|
|
|
|
&& discard_locals == LOCALS_UNDEF
|
2008-04-16 16:24:21 +08:00
|
|
|
|
&& htab_elements (strip_specific_htab) == 0)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
strip_symbols = STRIP_ALL;
|
|
|
|
|
|
2003-08-05 22:40:54 +08:00
|
|
|
|
if (output_target == NULL)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
output_target = input_target;
|
|
|
|
|
|
|
|
|
|
i = optind;
|
|
|
|
|
if (i == argc
|
|
|
|
|
|| (output_file != NULL && (i + 1) < argc))
|
|
|
|
|
strip_usage (stderr, 1);
|
|
|
|
|
|
|
|
|
|
for (; i < argc; i++)
|
|
|
|
|
{
|
|
|
|
|
int hold_status = status;
|
|
|
|
|
struct stat statbuf;
|
|
|
|
|
char *tmpname;
|
|
|
|
|
|
2003-11-07 20:19:34 +08:00
|
|
|
|
if (get_file_size (argv[i]) < 1)
|
2006-08-06 23:49:46 +08:00
|
|
|
|
{
|
|
|
|
|
status = 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2003-11-07 20:19:34 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (preserve_dates)
|
2003-11-07 20:19:34 +08:00
|
|
|
|
/* No need to check the return value of stat().
|
|
|
|
|
It has already been checked in get_file_size(). */
|
|
|
|
|
stat (argv[i], &statbuf);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2011-03-01 02:32:52 +08:00
|
|
|
|
if (output_file == NULL
|
|
|
|
|
|| filename_cmp (argv[i], output_file) == 0)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
tmpname = make_tempname (argv[i]);
|
2007-05-18 14:36:14 +08:00
|
|
|
|
else
|
|
|
|
|
tmpname = output_file;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2006-10-13 17:43:29 +08:00
|
|
|
|
if (tmpname == NULL)
|
|
|
|
|
{
|
2007-08-30 18:19:03 +08:00
|
|
|
|
bfd_nonfatal_message (argv[i], NULL, NULL,
|
|
|
|
|
_("could not create temporary file to hold stripped copy"));
|
2006-10-13 17:43:29 +08:00
|
|
|
|
status = 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2006-08-06 23:49:46 +08:00
|
|
|
|
status = 0;
|
2009-09-11 19:16:19 +08:00
|
|
|
|
copy_file (argv[i], tmpname, input_target, output_target, NULL);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (status == 0)
|
|
|
|
|
{
|
|
|
|
|
if (preserve_dates)
|
|
|
|
|
set_times (tmpname, &statbuf);
|
2007-05-18 14:36:14 +08:00
|
|
|
|
if (output_file != tmpname)
|
2009-08-03 21:47:35 +08:00
|
|
|
|
status = (smart_rename (tmpname,
|
|
|
|
|
output_file ? output_file : argv[i],
|
|
|
|
|
preserve_dates) != 0);
|
|
|
|
|
if (status == 0)
|
|
|
|
|
status = hold_status;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
else
|
2005-03-02 17:03:58 +08:00
|
|
|
|
unlink_if_ordinary (tmpname);
|
2007-05-18 14:36:14 +08:00
|
|
|
|
if (output_file != tmpname)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
free (tmpname);
|
|
|
|
|
}
|
|
|
|
|
|
2006-08-06 23:49:46 +08:00
|
|
|
|
return status;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
bfd/
2009-04-17 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/10074
* coffcode.h (bfd_pei_p): New.
* config.bfd: Remove bfd_efi_bsdrv_ia32_vec,
bfd_efi_rtdrv_ia32_vec, bfd_efi_bsdrv_x86_64_vec,
bfd_efi_rtdrv_x86_64_vec, bfd_efi_bsdrv_ia64_vec and
bfd_efi_rtdrv_ia64_vec. Replace bfd_efi_app_ia32_vec,
bfd_efi_app_x86_64_vec and bfd_efi_app_ia64_vec with
i386pei_vec, x86_64pei_vec and bfd_pei_ia64_vec, respectively.
* configure.in: Remove bfd_efi_bsdrv_ia32_vec,
bfd_efi_rtdrv_ia32_vec, bfd_efi_bsdrv_x86_64_vec,
bfd_efi_rtdrv_x86_64_vec,
bfd_efi_bsdrv_ia64_vec and bfd_efi_rtdrv_ia64_vec. Replace
bfd_efi_ia64_vec with bfd_pei_ia64_vec.
* targets.c: Likewise.
* configure: Regenerated.
* libcoff.h: Likewise.
* Makefile.in: Likewise.
* efi-app-ia32.c: Removed.
* efi-app-x86_64.c: Likewise.
* efi-bsdrv-ia32.c: Likewise.
* efi-bsdrv-ia64.c: Likewise.
* efi-bsdrv-x86_64.c: Likewise.
* efi-rtdrv-ia32.c: Likewise.
* efi-rtdrv-ia64.c: Likewise.
* efi-rtdrv-x86_64.c: Likewise.
* efi-rtdrv-ia32.c: Likewise.
* efi-app-ia64.c: Moved to ...
* pei-ia64.c: This.
(TARGET_SYM): Set to bfd_pei_ia64_vec.
(TARGET_NAME): Set to pei-ia64.
* libpei.h (bfd_target_pei_p): Removed.
(bfd_target_pei_arch): Likewise.
(bfd_target_efi_app_p): Likewise.
(bfd_target_efi_app_arch): Likewise.
(bfd_target_efi_bsdrv_p): Likewise.
(bfd_target_efi_bsdrv_arch): Likewise.
(bfd_target_efi_rtdrv_p): Likewise.
(bfd_target_efi_rtdrv_arch): Likewise.
(bfd_pe_executable_p): Likewise.
* Makefile.am (BFD32_BACKENDS): Remove efi-app-ia32.lo,
efi-bsdrv-ia32.lo and efi-rtdrv-ia32.lo.
(BFD32_BACKENDS_CFILES): Remove efi-app-ia32.c, efi-bsdrv-ia32.c
and efi-rtdrv-ia32.c.
(BFD64_BACKENDS): Remove efi-app-ia64.lo, efi-bsdrv-ia64.lo,
efi-rtdrv-ia64.lo, efi-app-x86_64.lo, efi-bsdrv-x86_64.lo and
efi-rtdrv-x86_64.lo. Add pei-ia64.lo.
(BFD64_BACKENDS_CFILES): Remove efi-app-ia64.c, efi-bsdrv-ia64.c,
efi-rtdrv-ia64.c, efi-app-x86_64.c, efi-bsdrv-x86_64.c and
efi-rtdrv-x86_64.c. Add pei-ia64.c.
(efi-app-ia64.lo): Removed.
(efi-bsdrv-ia32.lo): Likewise.
(efi-rtdrv-ia32.lo): Likewise.
(efi-app-ia64.lo): Likewise.
(efi-bsdrv-ia64.lo): Likewise.
(efi-rtdrv-ia64.lo): Likewise.
(efi-app-x86_64.lo): Likewise.
(efi-bsdrv-x86_64.lo): Likewise.
(efi-rtdrv-x86_64.lo): Likewise.
(pei-ia64.lo): New.
* peicode.h (coff_swap_scnhdr_in): Replace bfd_pe_executable_p
with bfd_pei_p.
(arch_type): Removed.
(pe_arch): Likewise.
(pe_bfd_object_p): Just return coff_object_p.
* peXXigen.c (_bfd_XXi_swap_scnhdr_out): Replace
bfd_pe_executable_p with bfd_pei_p.
binutils/
2009-04-17 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/10074
* objcopy.c: Include coff/i386.h and coff/pe.h.
(pe_file_alignment): New.
(pe_heap_commit): Likewise.
(pe_heap_reserve): Likewise.
(pe_image_base): Likewise.
(pe_section_alignment): Likewise.
(pe_stack_commit): Likewise.
(pe_stack_reserve): Likewise.
(pe_subsystem): Likewise.
(pe_major_subsystem_version): Likewise.
(pe_minor_subsystem_version): Likewise.
(set_pe_subsystem): Likewise.
(convert_efi_target): Likewise.
(command_line_switch): Add OPTION_FILE_ALIGNMENT,
OPTION_HEAP, OPTION_IMAGE_BASE, OPTION_SECTION_ALIGNMENT,
OPTION_STACK and OPTION_SUBSYSTEM.
(copy_options): Likewise.
(copy_usage): Add --file-alignment, --heap, --image-base,
--section-alignment, --stack and --subsystem.
(copy_object): Set up PE parameters.
(copy_main): Process Add OPTION_FILE_ALIGNMENT,
OPTION_HEAP, OPTION_IMAGE_BASE, OPTION_SECTION_ALIGNMENT,
OPTION_STACK and OPTION_SUBSYSTEM. Convert EFI target to
PEI target.
* NEWS: Mention --file-alignment, --heap, --image-base,
--section-alignment, --stack and --subsystem command line
options for objcopy.
* doc/binutils.texi: Document --file-alignment, --heap,
--image-base, --section-alignment, --stack and --subsystem
command line options for objcopy.
2009-04-17 21:46:18 +08:00
|
|
|
|
/* Set up PE subsystem. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
set_pe_subsystem (const char *s)
|
|
|
|
|
{
|
|
|
|
|
const char *version, *subsystem;
|
|
|
|
|
size_t i;
|
|
|
|
|
static const struct
|
|
|
|
|
{
|
|
|
|
|
const char *name;
|
|
|
|
|
const char set_def;
|
|
|
|
|
const short value;
|
|
|
|
|
}
|
|
|
|
|
v[] =
|
|
|
|
|
{
|
|
|
|
|
{ "native", 0, IMAGE_SUBSYSTEM_NATIVE },
|
|
|
|
|
{ "windows", 0, IMAGE_SUBSYSTEM_WINDOWS_GUI },
|
|
|
|
|
{ "console", 0, IMAGE_SUBSYSTEM_WINDOWS_CUI },
|
|
|
|
|
{ "posix", 0, IMAGE_SUBSYSTEM_POSIX_CUI },
|
|
|
|
|
{ "wince", 0, IMAGE_SUBSYSTEM_WINDOWS_CE_GUI },
|
|
|
|
|
{ "efi-app", 1, IMAGE_SUBSYSTEM_EFI_APPLICATION },
|
|
|
|
|
{ "efi-bsd", 1, IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER },
|
|
|
|
|
{ "efi-rtd", 1, IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER },
|
2009-04-17 23:03:48 +08:00
|
|
|
|
{ "sal-rtd", 1, IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER },
|
bfd/
2009-04-17 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/10074
* coffcode.h (bfd_pei_p): New.
* config.bfd: Remove bfd_efi_bsdrv_ia32_vec,
bfd_efi_rtdrv_ia32_vec, bfd_efi_bsdrv_x86_64_vec,
bfd_efi_rtdrv_x86_64_vec, bfd_efi_bsdrv_ia64_vec and
bfd_efi_rtdrv_ia64_vec. Replace bfd_efi_app_ia32_vec,
bfd_efi_app_x86_64_vec and bfd_efi_app_ia64_vec with
i386pei_vec, x86_64pei_vec and bfd_pei_ia64_vec, respectively.
* configure.in: Remove bfd_efi_bsdrv_ia32_vec,
bfd_efi_rtdrv_ia32_vec, bfd_efi_bsdrv_x86_64_vec,
bfd_efi_rtdrv_x86_64_vec,
bfd_efi_bsdrv_ia64_vec and bfd_efi_rtdrv_ia64_vec. Replace
bfd_efi_ia64_vec with bfd_pei_ia64_vec.
* targets.c: Likewise.
* configure: Regenerated.
* libcoff.h: Likewise.
* Makefile.in: Likewise.
* efi-app-ia32.c: Removed.
* efi-app-x86_64.c: Likewise.
* efi-bsdrv-ia32.c: Likewise.
* efi-bsdrv-ia64.c: Likewise.
* efi-bsdrv-x86_64.c: Likewise.
* efi-rtdrv-ia32.c: Likewise.
* efi-rtdrv-ia64.c: Likewise.
* efi-rtdrv-x86_64.c: Likewise.
* efi-rtdrv-ia32.c: Likewise.
* efi-app-ia64.c: Moved to ...
* pei-ia64.c: This.
(TARGET_SYM): Set to bfd_pei_ia64_vec.
(TARGET_NAME): Set to pei-ia64.
* libpei.h (bfd_target_pei_p): Removed.
(bfd_target_pei_arch): Likewise.
(bfd_target_efi_app_p): Likewise.
(bfd_target_efi_app_arch): Likewise.
(bfd_target_efi_bsdrv_p): Likewise.
(bfd_target_efi_bsdrv_arch): Likewise.
(bfd_target_efi_rtdrv_p): Likewise.
(bfd_target_efi_rtdrv_arch): Likewise.
(bfd_pe_executable_p): Likewise.
* Makefile.am (BFD32_BACKENDS): Remove efi-app-ia32.lo,
efi-bsdrv-ia32.lo and efi-rtdrv-ia32.lo.
(BFD32_BACKENDS_CFILES): Remove efi-app-ia32.c, efi-bsdrv-ia32.c
and efi-rtdrv-ia32.c.
(BFD64_BACKENDS): Remove efi-app-ia64.lo, efi-bsdrv-ia64.lo,
efi-rtdrv-ia64.lo, efi-app-x86_64.lo, efi-bsdrv-x86_64.lo and
efi-rtdrv-x86_64.lo. Add pei-ia64.lo.
(BFD64_BACKENDS_CFILES): Remove efi-app-ia64.c, efi-bsdrv-ia64.c,
efi-rtdrv-ia64.c, efi-app-x86_64.c, efi-bsdrv-x86_64.c and
efi-rtdrv-x86_64.c. Add pei-ia64.c.
(efi-app-ia64.lo): Removed.
(efi-bsdrv-ia32.lo): Likewise.
(efi-rtdrv-ia32.lo): Likewise.
(efi-app-ia64.lo): Likewise.
(efi-bsdrv-ia64.lo): Likewise.
(efi-rtdrv-ia64.lo): Likewise.
(efi-app-x86_64.lo): Likewise.
(efi-bsdrv-x86_64.lo): Likewise.
(efi-rtdrv-x86_64.lo): Likewise.
(pei-ia64.lo): New.
* peicode.h (coff_swap_scnhdr_in): Replace bfd_pe_executable_p
with bfd_pei_p.
(arch_type): Removed.
(pe_arch): Likewise.
(pe_bfd_object_p): Just return coff_object_p.
* peXXigen.c (_bfd_XXi_swap_scnhdr_out): Replace
bfd_pe_executable_p with bfd_pei_p.
binutils/
2009-04-17 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/10074
* objcopy.c: Include coff/i386.h and coff/pe.h.
(pe_file_alignment): New.
(pe_heap_commit): Likewise.
(pe_heap_reserve): Likewise.
(pe_image_base): Likewise.
(pe_section_alignment): Likewise.
(pe_stack_commit): Likewise.
(pe_stack_reserve): Likewise.
(pe_subsystem): Likewise.
(pe_major_subsystem_version): Likewise.
(pe_minor_subsystem_version): Likewise.
(set_pe_subsystem): Likewise.
(convert_efi_target): Likewise.
(command_line_switch): Add OPTION_FILE_ALIGNMENT,
OPTION_HEAP, OPTION_IMAGE_BASE, OPTION_SECTION_ALIGNMENT,
OPTION_STACK and OPTION_SUBSYSTEM.
(copy_options): Likewise.
(copy_usage): Add --file-alignment, --heap, --image-base,
--section-alignment, --stack and --subsystem.
(copy_object): Set up PE parameters.
(copy_main): Process Add OPTION_FILE_ALIGNMENT,
OPTION_HEAP, OPTION_IMAGE_BASE, OPTION_SECTION_ALIGNMENT,
OPTION_STACK and OPTION_SUBSYSTEM. Convert EFI target to
PEI target.
* NEWS: Mention --file-alignment, --heap, --image-base,
--section-alignment, --stack and --subsystem command line
options for objcopy.
* doc/binutils.texi: Document --file-alignment, --heap,
--image-base, --section-alignment, --stack and --subsystem
command line options for objcopy.
2009-04-17 21:46:18 +08:00
|
|
|
|
{ "xbox", 0, IMAGE_SUBSYSTEM_XBOX }
|
|
|
|
|
};
|
|
|
|
|
short value;
|
|
|
|
|
char *copy;
|
|
|
|
|
int set_def = -1;
|
|
|
|
|
|
|
|
|
|
/* Check for the presence of a version number. */
|
|
|
|
|
version = strchr (s, ':');
|
|
|
|
|
if (version == NULL)
|
|
|
|
|
subsystem = s;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
int len = version - s;
|
|
|
|
|
copy = xstrdup (s);
|
|
|
|
|
subsystem = copy;
|
|
|
|
|
copy[len] = '\0';
|
|
|
|
|
version = copy + 1 + len;
|
|
|
|
|
pe_major_subsystem_version = strtoul (version, ©, 0);
|
|
|
|
|
if (*copy == '.')
|
|
|
|
|
pe_minor_subsystem_version = strtoul (copy + 1, ©, 0);
|
|
|
|
|
if (*copy != '\0')
|
|
|
|
|
non_fatal (_("%s: bad version in PE subsystem"), s);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Check for numeric subsystem. */
|
|
|
|
|
value = (short) strtol (subsystem, ©, 0);
|
|
|
|
|
if (*copy == '\0')
|
|
|
|
|
{
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE (v); i++)
|
|
|
|
|
if (v[i].value == value)
|
|
|
|
|
{
|
|
|
|
|
pe_subsystem = value;
|
|
|
|
|
set_def = v[i].set_def;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Search for subsystem by name. */
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE (v); i++)
|
|
|
|
|
if (strcmp (subsystem, v[i].name) == 0)
|
|
|
|
|
{
|
|
|
|
|
pe_subsystem = v[i].value;
|
|
|
|
|
set_def = v[i].set_def;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
switch (set_def)
|
|
|
|
|
{
|
|
|
|
|
case -1:
|
|
|
|
|
fatal (_("unknown PE subsystem: %s"), s);
|
|
|
|
|
break;
|
|
|
|
|
case 0:
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
if (pe_file_alignment == (bfd_vma) -1)
|
|
|
|
|
pe_file_alignment = PE_DEF_FILE_ALIGNMENT;
|
|
|
|
|
if (pe_section_alignment == (bfd_vma) -1)
|
|
|
|
|
pe_section_alignment = PE_DEF_SECTION_ALIGNMENT;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2011-03-15 04:51:59 +08:00
|
|
|
|
if (s != subsystem)
|
|
|
|
|
free ((char *) subsystem);
|
bfd/
2009-04-17 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/10074
* coffcode.h (bfd_pei_p): New.
* config.bfd: Remove bfd_efi_bsdrv_ia32_vec,
bfd_efi_rtdrv_ia32_vec, bfd_efi_bsdrv_x86_64_vec,
bfd_efi_rtdrv_x86_64_vec, bfd_efi_bsdrv_ia64_vec and
bfd_efi_rtdrv_ia64_vec. Replace bfd_efi_app_ia32_vec,
bfd_efi_app_x86_64_vec and bfd_efi_app_ia64_vec with
i386pei_vec, x86_64pei_vec and bfd_pei_ia64_vec, respectively.
* configure.in: Remove bfd_efi_bsdrv_ia32_vec,
bfd_efi_rtdrv_ia32_vec, bfd_efi_bsdrv_x86_64_vec,
bfd_efi_rtdrv_x86_64_vec,
bfd_efi_bsdrv_ia64_vec and bfd_efi_rtdrv_ia64_vec. Replace
bfd_efi_ia64_vec with bfd_pei_ia64_vec.
* targets.c: Likewise.
* configure: Regenerated.
* libcoff.h: Likewise.
* Makefile.in: Likewise.
* efi-app-ia32.c: Removed.
* efi-app-x86_64.c: Likewise.
* efi-bsdrv-ia32.c: Likewise.
* efi-bsdrv-ia64.c: Likewise.
* efi-bsdrv-x86_64.c: Likewise.
* efi-rtdrv-ia32.c: Likewise.
* efi-rtdrv-ia64.c: Likewise.
* efi-rtdrv-x86_64.c: Likewise.
* efi-rtdrv-ia32.c: Likewise.
* efi-app-ia64.c: Moved to ...
* pei-ia64.c: This.
(TARGET_SYM): Set to bfd_pei_ia64_vec.
(TARGET_NAME): Set to pei-ia64.
* libpei.h (bfd_target_pei_p): Removed.
(bfd_target_pei_arch): Likewise.
(bfd_target_efi_app_p): Likewise.
(bfd_target_efi_app_arch): Likewise.
(bfd_target_efi_bsdrv_p): Likewise.
(bfd_target_efi_bsdrv_arch): Likewise.
(bfd_target_efi_rtdrv_p): Likewise.
(bfd_target_efi_rtdrv_arch): Likewise.
(bfd_pe_executable_p): Likewise.
* Makefile.am (BFD32_BACKENDS): Remove efi-app-ia32.lo,
efi-bsdrv-ia32.lo and efi-rtdrv-ia32.lo.
(BFD32_BACKENDS_CFILES): Remove efi-app-ia32.c, efi-bsdrv-ia32.c
and efi-rtdrv-ia32.c.
(BFD64_BACKENDS): Remove efi-app-ia64.lo, efi-bsdrv-ia64.lo,
efi-rtdrv-ia64.lo, efi-app-x86_64.lo, efi-bsdrv-x86_64.lo and
efi-rtdrv-x86_64.lo. Add pei-ia64.lo.
(BFD64_BACKENDS_CFILES): Remove efi-app-ia64.c, efi-bsdrv-ia64.c,
efi-rtdrv-ia64.c, efi-app-x86_64.c, efi-bsdrv-x86_64.c and
efi-rtdrv-x86_64.c. Add pei-ia64.c.
(efi-app-ia64.lo): Removed.
(efi-bsdrv-ia32.lo): Likewise.
(efi-rtdrv-ia32.lo): Likewise.
(efi-app-ia64.lo): Likewise.
(efi-bsdrv-ia64.lo): Likewise.
(efi-rtdrv-ia64.lo): Likewise.
(efi-app-x86_64.lo): Likewise.
(efi-bsdrv-x86_64.lo): Likewise.
(efi-rtdrv-x86_64.lo): Likewise.
(pei-ia64.lo): New.
* peicode.h (coff_swap_scnhdr_in): Replace bfd_pe_executable_p
with bfd_pei_p.
(arch_type): Removed.
(pe_arch): Likewise.
(pe_bfd_object_p): Just return coff_object_p.
* peXXigen.c (_bfd_XXi_swap_scnhdr_out): Replace
bfd_pe_executable_p with bfd_pei_p.
binutils/
2009-04-17 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/10074
* objcopy.c: Include coff/i386.h and coff/pe.h.
(pe_file_alignment): New.
(pe_heap_commit): Likewise.
(pe_heap_reserve): Likewise.
(pe_image_base): Likewise.
(pe_section_alignment): Likewise.
(pe_stack_commit): Likewise.
(pe_stack_reserve): Likewise.
(pe_subsystem): Likewise.
(pe_major_subsystem_version): Likewise.
(pe_minor_subsystem_version): Likewise.
(set_pe_subsystem): Likewise.
(convert_efi_target): Likewise.
(command_line_switch): Add OPTION_FILE_ALIGNMENT,
OPTION_HEAP, OPTION_IMAGE_BASE, OPTION_SECTION_ALIGNMENT,
OPTION_STACK and OPTION_SUBSYSTEM.
(copy_options): Likewise.
(copy_usage): Add --file-alignment, --heap, --image-base,
--section-alignment, --stack and --subsystem.
(copy_object): Set up PE parameters.
(copy_main): Process Add OPTION_FILE_ALIGNMENT,
OPTION_HEAP, OPTION_IMAGE_BASE, OPTION_SECTION_ALIGNMENT,
OPTION_STACK and OPTION_SUBSYSTEM. Convert EFI target to
PEI target.
* NEWS: Mention --file-alignment, --heap, --image-base,
--section-alignment, --stack and --subsystem command line
options for objcopy.
* doc/binutils.texi: Document --file-alignment, --heap,
--image-base, --section-alignment, --stack and --subsystem
command line options for objcopy.
2009-04-17 21:46:18 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Convert EFI target to PEI target. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
convert_efi_target (char *efi)
|
|
|
|
|
{
|
|
|
|
|
efi[0] = 'p';
|
|
|
|
|
efi[1] = 'e';
|
|
|
|
|
efi[2] = 'i';
|
|
|
|
|
|
|
|
|
|
if (strcmp (efi + 4, "ia32") == 0)
|
|
|
|
|
{
|
|
|
|
|
/* Change ia32 to i386. */
|
|
|
|
|
efi[5]= '3';
|
|
|
|
|
efi[6]= '8';
|
|
|
|
|
efi[7]= '6';
|
|
|
|
|
}
|
|
|
|
|
else if (strcmp (efi + 4, "x86_64") == 0)
|
|
|
|
|
{
|
|
|
|
|
/* Change x86_64 to x86-64. */
|
|
|
|
|
efi[7] = '-';
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
static int
|
2003-07-24 01:34:03 +08:00
|
|
|
|
copy_main (int argc, char *argv[])
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2003-03-25 00:11:46 +08:00
|
|
|
|
char *input_filename = NULL;
|
|
|
|
|
char *output_filename = NULL;
|
2007-06-29 08:34:14 +08:00
|
|
|
|
char *tmpname;
|
2003-03-25 00:11:46 +08:00
|
|
|
|
char *input_target = NULL;
|
|
|
|
|
char *output_target = NULL;
|
2002-11-30 16:39:46 +08:00
|
|
|
|
bfd_boolean show_version = FALSE;
|
|
|
|
|
bfd_boolean change_warn = TRUE;
|
2003-03-25 00:11:46 +08:00
|
|
|
|
bfd_boolean formats_info = FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
int c;
|
|
|
|
|
struct section_list *p;
|
|
|
|
|
struct stat statbuf;
|
2009-09-11 19:16:19 +08:00
|
|
|
|
const bfd_arch_info_type *input_arch = NULL;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2003-11-12 01:50:26 +08:00
|
|
|
|
while ((c = getopt_long (argc, argv, "b:B:i:I:j:K:N:s:O:d:F:L:G:R:SpgxXHhVvW:w",
|
1999-05-03 15:29:11 +08:00
|
|
|
|
copy_options, (int *) 0)) != EOF)
|
|
|
|
|
{
|
|
|
|
|
switch (c)
|
|
|
|
|
{
|
|
|
|
|
case 'b':
|
|
|
|
|
copy_byte = atoi (optarg);
|
|
|
|
|
if (copy_byte < 0)
|
|
|
|
|
fatal (_("byte number must be non-negative"));
|
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
2002-05-22 03:34:58 +08:00
|
|
|
|
case 'B':
|
2009-09-11 19:16:19 +08:00
|
|
|
|
input_arch = bfd_scan_arch (optarg);
|
|
|
|
|
if (input_arch == NULL)
|
|
|
|
|
fatal (_("architecture %s unknown"), optarg);
|
2002-05-22 03:34:58 +08:00
|
|
|
|
break;
|
2001-03-13 08:08:35 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'i':
|
2010-09-10 20:11:28 +08:00
|
|
|
|
if (optarg)
|
|
|
|
|
{
|
|
|
|
|
interleave = atoi (optarg);
|
|
|
|
|
if (interleave < 1)
|
|
|
|
|
fatal (_("interleave must be positive"));
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
interleave = 4;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OPTION_INTERLEAVE_WIDTH:
|
|
|
|
|
copy_width = atoi (optarg);
|
|
|
|
|
if (copy_width < 1)
|
|
|
|
|
fatal(_("interleave width must be positive"));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'I':
|
|
|
|
|
case 's': /* "source" - 'I' is preferred */
|
|
|
|
|
input_target = optarg;
|
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'O':
|
|
|
|
|
case 'd': /* "destination" - 'O' is preferred */
|
|
|
|
|
output_target = optarg;
|
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'F':
|
|
|
|
|
input_target = output_target = optarg;
|
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-06-12 23:42:04 +08:00
|
|
|
|
case 'j':
|
2002-11-30 16:39:46 +08:00
|
|
|
|
p = find_section_list (optarg, TRUE);
|
1999-06-12 23:42:04 +08:00
|
|
|
|
if (p->remove)
|
|
|
|
|
fatal (_("%s both copied and removed"), optarg);
|
2002-11-30 16:39:46 +08:00
|
|
|
|
p->copy = TRUE;
|
|
|
|
|
sections_copied = TRUE;
|
1999-06-12 23:42:04 +08:00
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'R':
|
2002-11-30 16:39:46 +08:00
|
|
|
|
p = find_section_list (optarg, TRUE);
|
1999-06-12 23:42:04 +08:00
|
|
|
|
if (p->copy)
|
|
|
|
|
fatal (_("%s both copied and removed"), optarg);
|
2002-11-30 16:39:46 +08:00
|
|
|
|
p->remove = TRUE;
|
|
|
|
|
sections_removed = TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'S':
|
|
|
|
|
strip_symbols = STRIP_ALL;
|
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'g':
|
|
|
|
|
strip_symbols = STRIP_DEBUG;
|
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case OPTION_STRIP_UNNEEDED:
|
|
|
|
|
strip_symbols = STRIP_UNNEEDED;
|
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
2003-06-26 16:14:10 +08:00
|
|
|
|
case OPTION_ONLY_KEEP_DEBUG:
|
|
|
|
|
strip_symbols = STRIP_NONDEBUG;
|
|
|
|
|
break;
|
|
|
|
|
|
2005-11-15 16:33:38 +08:00
|
|
|
|
case OPTION_KEEP_FILE_SYMBOLS:
|
|
|
|
|
keep_file_symbols = 1;
|
|
|
|
|
break;
|
|
|
|
|
|
2003-06-12 15:23:31 +08:00
|
|
|
|
case OPTION_ADD_GNU_DEBUGLINK:
|
|
|
|
|
gnu_debuglink_filename = optarg;
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'K':
|
2008-04-16 16:24:21 +08:00
|
|
|
|
add_specific_symbol (optarg, keep_specific_htab);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'N':
|
2008-04-16 16:24:21 +08:00
|
|
|
|
add_specific_symbol (optarg, strip_specific_htab);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
2004-12-16 21:16:33 +08:00
|
|
|
|
case OPTION_STRIP_UNNEEDED_SYMBOL:
|
2008-04-16 16:24:21 +08:00
|
|
|
|
add_specific_symbol (optarg, strip_unneeded_htab);
|
2004-12-16 21:16:33 +08:00
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'L':
|
2008-04-16 16:24:21 +08:00
|
|
|
|
add_specific_symbol (optarg, localize_specific_htab);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
2005-03-16 01:45:19 +08:00
|
|
|
|
case OPTION_GLOBALIZE_SYMBOL:
|
2008-04-16 16:24:21 +08:00
|
|
|
|
add_specific_symbol (optarg, globalize_specific_htab);
|
2005-03-16 01:45:19 +08:00
|
|
|
|
break;
|
|
|
|
|
|
2001-05-30 18:46:28 +08:00
|
|
|
|
case 'G':
|
2008-04-16 16:24:21 +08:00
|
|
|
|
add_specific_symbol (optarg, keepglobal_specific_htab);
|
2001-05-30 18:46:28 +08:00
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'W':
|
2008-04-16 16:24:21 +08:00
|
|
|
|
add_specific_symbol (optarg, weaken_specific_htab);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'p':
|
2002-11-30 16:39:46 +08:00
|
|
|
|
preserve_dates = TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
2003-11-12 01:50:26 +08:00
|
|
|
|
case 'w':
|
|
|
|
|
wildcard = TRUE;
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'x':
|
|
|
|
|
discard_locals = LOCALS_ALL;
|
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'X':
|
|
|
|
|
discard_locals = LOCALS_START_L;
|
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'v':
|
2002-11-30 16:39:46 +08:00
|
|
|
|
verbose = TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'V':
|
2002-11-30 16:39:46 +08:00
|
|
|
|
show_version = TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
2003-03-25 00:11:46 +08:00
|
|
|
|
case OPTION_FORMATS_INFO:
|
|
|
|
|
formats_info = TRUE;
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case OPTION_WEAKEN:
|
2002-11-30 16:39:46 +08:00
|
|
|
|
weaken = TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case OPTION_ADD_SECTION:
|
|
|
|
|
{
|
|
|
|
|
const char *s;
|
2010-01-20 08:09:13 +08:00
|
|
|
|
size_t off, alloc;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
struct section_add *pa;
|
|
|
|
|
FILE *f;
|
|
|
|
|
|
|
|
|
|
s = strchr (optarg, '=');
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (s == NULL)
|
2000-04-05 11:43:56 +08:00
|
|
|
|
fatal (_("bad format for %s"), "--add-section");
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2009-09-10 21:40:44 +08:00
|
|
|
|
pa = (struct section_add *) xmalloc (sizeof (struct section_add));
|
2010-01-20 08:09:13 +08:00
|
|
|
|
pa->name = xstrndup (optarg, s - optarg);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
pa->filename = s + 1;
|
|
|
|
|
|
2010-01-20 08:09:13 +08:00
|
|
|
|
/* 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. */
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
2010-01-20 08:09:13 +08:00
|
|
|
|
f = fopen (pa->filename, FOPEN_RB);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (f == NULL)
|
2003-07-24 01:34:03 +08:00
|
|
|
|
fatal (_("cannot open: %s: %s"),
|
|
|
|
|
pa->filename, strerror (errno));
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
2010-01-20 08:09:13 +08:00
|
|
|
|
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;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
fclose (f);
|
|
|
|
|
|
|
|
|
|
pa->next = add_sections;
|
|
|
|
|
add_sections = pa;
|
|
|
|
|
}
|
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case OPTION_CHANGE_START:
|
|
|
|
|
change_start = parse_vma (optarg, "--change-start");
|
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case OPTION_CHANGE_SECTION_ADDRESS:
|
|
|
|
|
case OPTION_CHANGE_SECTION_LMA:
|
|
|
|
|
case OPTION_CHANGE_SECTION_VMA:
|
|
|
|
|
{
|
|
|
|
|
const char *s;
|
|
|
|
|
int len;
|
|
|
|
|
char *name;
|
1999-07-12 04:02:30 +08:00
|
|
|
|
char *option = NULL;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
bfd_vma val;
|
1999-07-12 04:02:30 +08:00
|
|
|
|
enum change_action what = CHANGE_IGNORE;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
switch (c)
|
|
|
|
|
{
|
1999-07-12 04:02:30 +08:00
|
|
|
|
case OPTION_CHANGE_SECTION_ADDRESS:
|
|
|
|
|
option = "--change-section-address";
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_CHANGE_SECTION_LMA:
|
|
|
|
|
option = "--change-section-lma";
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_CHANGE_SECTION_VMA:
|
|
|
|
|
option = "--change-section-vma";
|
|
|
|
|
break;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
s = strchr (optarg, '=');
|
|
|
|
|
if (s == NULL)
|
|
|
|
|
{
|
|
|
|
|
s = strchr (optarg, '+');
|
|
|
|
|
if (s == NULL)
|
|
|
|
|
{
|
|
|
|
|
s = strchr (optarg, '-');
|
|
|
|
|
if (s == NULL)
|
|
|
|
|
fatal (_("bad format for %s"), option);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
len = s - optarg;
|
2009-09-10 21:40:44 +08:00
|
|
|
|
name = (char *) xmalloc (len + 1);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
strncpy (name, optarg, len);
|
|
|
|
|
name[len] = '\0';
|
|
|
|
|
|
2002-11-30 16:39:46 +08:00
|
|
|
|
p = find_section_list (name, TRUE);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
val = parse_vma (s + 1, option);
|
|
|
|
|
|
|
|
|
|
switch (*s)
|
|
|
|
|
{
|
|
|
|
|
case '=': what = CHANGE_SET; break;
|
|
|
|
|
case '-': val = - val; /* Drop through. */
|
|
|
|
|
case '+': what = CHANGE_MODIFY; break;
|
|
|
|
|
}
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
switch (c)
|
|
|
|
|
{
|
|
|
|
|
case OPTION_CHANGE_SECTION_ADDRESS:
|
|
|
|
|
p->change_vma = what;
|
|
|
|
|
p->vma_val = val;
|
|
|
|
|
/* Drop through. */
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case OPTION_CHANGE_SECTION_LMA:
|
|
|
|
|
p->change_lma = what;
|
|
|
|
|
p->lma_val = val;
|
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case OPTION_CHANGE_SECTION_VMA:
|
|
|
|
|
p->change_vma = what;
|
|
|
|
|
p->vma_val = val;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case OPTION_CHANGE_ADDRESSES:
|
|
|
|
|
change_section_address = parse_vma (optarg, "--change-addresses");
|
|
|
|
|
change_start = change_section_address;
|
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case OPTION_CHANGE_WARNINGS:
|
2002-11-30 16:39:46 +08:00
|
|
|
|
change_warn = TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case OPTION_CHANGE_LEADING_CHAR:
|
2002-11-30 16:39:46 +08:00
|
|
|
|
change_leading_char = TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
2010-10-29 20:10:39 +08:00
|
|
|
|
case OPTION_COMPRESS_DEBUG_SECTIONS:
|
|
|
|
|
do_debug_sections = compress;
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case OPTION_DEBUGGING:
|
2002-11-30 16:39:46 +08:00
|
|
|
|
convert_debugging = TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
2010-10-29 20:10:39 +08:00
|
|
|
|
case OPTION_DECOMPRESS_DEBUG_SECTIONS:
|
|
|
|
|
do_debug_sections = decompress;
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case OPTION_GAP_FILL:
|
|
|
|
|
{
|
|
|
|
|
bfd_vma gap_fill_vma;
|
|
|
|
|
|
|
|
|
|
gap_fill_vma = parse_vma (optarg, "--gap-fill");
|
|
|
|
|
gap_fill = (bfd_byte) gap_fill_vma;
|
|
|
|
|
if ((bfd_vma) gap_fill != gap_fill_vma)
|
|
|
|
|
{
|
|
|
|
|
char buff[20];
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
sprintf_vma (buff, gap_fill_vma);
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
non_fatal (_("Warning: truncating gap-fill from 0x%s to 0x%x"),
|
|
|
|
|
buff, gap_fill);
|
|
|
|
|
}
|
2002-11-30 16:39:46 +08:00
|
|
|
|
gap_fill_set = TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case OPTION_NO_CHANGE_WARNINGS:
|
2002-11-30 16:39:46 +08:00
|
|
|
|
change_warn = FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case OPTION_PAD_TO:
|
|
|
|
|
pad_to = parse_vma (optarg, "--pad-to");
|
2002-11-30 16:39:46 +08:00
|
|
|
|
pad_to_set = TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case OPTION_REMOVE_LEADING_CHAR:
|
2002-11-30 16:39:46 +08:00
|
|
|
|
remove_leading_char = TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
|
|
|
|
case OPTION_REDEFINE_SYM:
|
|
|
|
|
{
|
|
|
|
|
/* Push this redefinition onto redefine_symbol_list. */
|
|
|
|
|
|
|
|
|
|
int len;
|
|
|
|
|
const char *s;
|
|
|
|
|
const char *nextarg;
|
|
|
|
|
char *source, *target;
|
|
|
|
|
|
|
|
|
|
s = strchr (optarg, '=');
|
|
|
|
|
if (s == NULL)
|
2001-07-31 21:49:39 +08:00
|
|
|
|
fatal (_("bad format for %s"), "--redefine-sym");
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
|
|
|
|
len = s - optarg;
|
2009-09-10 21:40:44 +08:00
|
|
|
|
source = (char *) xmalloc (len + 1);
|
2000-04-05 11:43:56 +08:00
|
|
|
|
strncpy (source, optarg, len);
|
|
|
|
|
source[len] = '\0';
|
|
|
|
|
|
|
|
|
|
nextarg = s + 1;
|
|
|
|
|
len = strlen (nextarg);
|
2009-09-10 21:40:44 +08:00
|
|
|
|
target = (char *) xmalloc (len + 1);
|
2000-04-05 11:43:56 +08:00
|
|
|
|
strcpy (target, nextarg);
|
|
|
|
|
|
2003-06-02 22:45:13 +08:00
|
|
|
|
redefine_list_append ("--redefine-sym", source, target);
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
|
|
|
|
free (source);
|
|
|
|
|
free (target);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
2003-06-02 22:45:13 +08:00
|
|
|
|
case OPTION_REDEFINE_SYMS:
|
|
|
|
|
add_redefine_syms_file (optarg);
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case OPTION_SET_SECTION_FLAGS:
|
|
|
|
|
{
|
|
|
|
|
const char *s;
|
|
|
|
|
int len;
|
|
|
|
|
char *name;
|
|
|
|
|
|
|
|
|
|
s = strchr (optarg, '=');
|
|
|
|
|
if (s == NULL)
|
2000-04-05 11:43:56 +08:00
|
|
|
|
fatal (_("bad format for %s"), "--set-section-flags");
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
len = s - optarg;
|
2009-09-10 21:40:44 +08:00
|
|
|
|
name = (char *) xmalloc (len + 1);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
strncpy (name, optarg, len);
|
|
|
|
|
name[len] = '\0';
|
|
|
|
|
|
2002-11-30 16:39:46 +08:00
|
|
|
|
p = find_section_list (name, TRUE);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2002-11-30 16:39:46 +08:00
|
|
|
|
p->set_flags = TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
p->flags = parse_flags (s + 1);
|
|
|
|
|
}
|
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
2001-07-31 21:49:39 +08:00
|
|
|
|
case OPTION_RENAME_SECTION:
|
|
|
|
|
{
|
|
|
|
|
flagword flags;
|
2001-09-19 14:58:06 +08:00
|
|
|
|
const char *eq, *fl;
|
|
|
|
|
char *old_name;
|
|
|
|
|
char *new_name;
|
2001-07-31 21:49:39 +08:00
|
|
|
|
unsigned int len;
|
|
|
|
|
|
2001-09-19 14:58:06 +08:00
|
|
|
|
eq = strchr (optarg, '=');
|
|
|
|
|
if (eq == NULL)
|
2001-07-31 21:49:39 +08:00
|
|
|
|
fatal (_("bad format for %s"), "--rename-section");
|
|
|
|
|
|
2001-09-19 14:58:06 +08:00
|
|
|
|
len = eq - optarg;
|
2001-07-31 21:49:39 +08:00
|
|
|
|
if (len == 0)
|
2001-09-19 14:58:06 +08:00
|
|
|
|
fatal (_("bad format for %s"), "--rename-section");
|
2001-07-31 21:49:39 +08:00
|
|
|
|
|
2009-09-10 21:40:44 +08:00
|
|
|
|
old_name = (char *) xmalloc (len + 1);
|
2001-07-31 21:49:39 +08:00
|
|
|
|
strncpy (old_name, optarg, len);
|
|
|
|
|
old_name[len] = 0;
|
|
|
|
|
|
2001-09-19 14:58:06 +08:00
|
|
|
|
eq++;
|
|
|
|
|
fl = strchr (eq, ',');
|
|
|
|
|
if (fl)
|
2001-07-31 21:49:39 +08:00
|
|
|
|
{
|
2001-09-19 14:58:06 +08:00
|
|
|
|
flags = parse_flags (fl + 1);
|
|
|
|
|
len = fl - eq;
|
2001-07-31 21:49:39 +08:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
flags = -1;
|
2001-09-19 14:58:06 +08:00
|
|
|
|
len = strlen (eq);
|
2001-07-31 21:49:39 +08:00
|
|
|
|
}
|
|
|
|
|
|
2001-09-19 14:58:06 +08:00
|
|
|
|
if (len == 0)
|
|
|
|
|
fatal (_("bad format for %s"), "--rename-section");
|
|
|
|
|
|
2009-09-10 21:40:44 +08:00
|
|
|
|
new_name = (char *) xmalloc (len + 1);
|
2001-09-19 14:58:06 +08:00
|
|
|
|
strncpy (new_name, eq, len);
|
|
|
|
|
new_name[len] = 0;
|
|
|
|
|
|
2001-07-31 21:49:39 +08:00
|
|
|
|
add_section_rename (old_name, new_name, flags);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case OPTION_SET_START:
|
|
|
|
|
set_start = parse_vma (optarg, "--set-start");
|
2002-11-30 16:39:46 +08:00
|
|
|
|
set_start_set = TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
2002-05-22 03:34:58 +08:00
|
|
|
|
case OPTION_SREC_LEN:
|
|
|
|
|
Chunk = parse_vma (optarg, "--srec-len");
|
|
|
|
|
break;
|
2000-11-03 09:47:13 +08:00
|
|
|
|
|
2002-05-22 03:34:58 +08:00
|
|
|
|
case OPTION_SREC_FORCES3:
|
2002-11-30 16:39:46 +08:00
|
|
|
|
S3Forced = TRUE;
|
2002-05-22 03:34:58 +08:00
|
|
|
|
break;
|
2000-11-03 09:47:13 +08:00
|
|
|
|
|
2001-05-30 18:46:28 +08:00
|
|
|
|
case OPTION_STRIP_SYMBOLS:
|
2008-04-16 16:24:21 +08:00
|
|
|
|
add_specific_symbols (optarg, strip_specific_htab);
|
2001-05-30 18:46:28 +08:00
|
|
|
|
break;
|
|
|
|
|
|
2004-12-16 21:16:33 +08:00
|
|
|
|
case OPTION_STRIP_UNNEEDED_SYMBOLS:
|
2008-04-16 16:24:21 +08:00
|
|
|
|
add_specific_symbols (optarg, strip_unneeded_htab);
|
2004-12-16 21:16:33 +08:00
|
|
|
|
break;
|
|
|
|
|
|
2001-05-30 18:46:28 +08:00
|
|
|
|
case OPTION_KEEP_SYMBOLS:
|
2008-04-16 16:24:21 +08:00
|
|
|
|
add_specific_symbols (optarg, keep_specific_htab);
|
2001-05-30 18:46:28 +08:00
|
|
|
|
break;
|
|
|
|
|
|
2006-06-24 00:23:09 +08:00
|
|
|
|
case OPTION_LOCALIZE_HIDDEN:
|
|
|
|
|
localize_hidden = TRUE;
|
|
|
|
|
break;
|
|
|
|
|
|
2001-05-30 18:46:28 +08:00
|
|
|
|
case OPTION_LOCALIZE_SYMBOLS:
|
2008-04-16 16:24:21 +08:00
|
|
|
|
add_specific_symbols (optarg, localize_specific_htab);
|
2001-05-30 18:46:28 +08:00
|
|
|
|
break;
|
|
|
|
|
|
2009-04-14 17:47:44 +08:00
|
|
|
|
case OPTION_LONG_SECTION_NAMES:
|
|
|
|
|
if (!strcmp ("enable", optarg))
|
|
|
|
|
long_section_names = ENABLE;
|
|
|
|
|
else if (!strcmp ("disable", optarg))
|
|
|
|
|
long_section_names = DISABLE;
|
|
|
|
|
else if (!strcmp ("keep", optarg))
|
|
|
|
|
long_section_names = KEEP;
|
|
|
|
|
else
|
|
|
|
|
fatal (_("unknown long section names option '%s'"), optarg);
|
|
|
|
|
break;
|
|
|
|
|
|
2005-03-16 01:45:19 +08:00
|
|
|
|
case OPTION_GLOBALIZE_SYMBOLS:
|
2008-04-16 16:24:21 +08:00
|
|
|
|
add_specific_symbols (optarg, globalize_specific_htab);
|
2005-03-16 01:45:19 +08:00
|
|
|
|
break;
|
|
|
|
|
|
2001-05-30 18:46:28 +08:00
|
|
|
|
case OPTION_KEEPGLOBAL_SYMBOLS:
|
2008-04-16 16:24:21 +08:00
|
|
|
|
add_specific_symbols (optarg, keepglobal_specific_htab);
|
2001-05-30 18:46:28 +08:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OPTION_WEAKEN_SYMBOLS:
|
2008-04-16 16:24:21 +08:00
|
|
|
|
add_specific_symbols (optarg, weaken_specific_htab);
|
2001-05-30 18:46:28 +08:00
|
|
|
|
break;
|
|
|
|
|
|
2001-08-24 21:56:11 +08:00
|
|
|
|
case OPTION_ALT_MACH_CODE:
|
2006-03-01 00:09:01 +08:00
|
|
|
|
use_alt_mach_code = strtoul (optarg, NULL, 0);
|
|
|
|
|
if (use_alt_mach_code == 0)
|
|
|
|
|
fatal (_("unable to parse alternative machine code"));
|
2001-08-24 21:56:11 +08:00
|
|
|
|
break;
|
|
|
|
|
|
2002-12-13 21:19:44 +08:00
|
|
|
|
case OPTION_PREFIX_SYMBOLS:
|
|
|
|
|
prefix_symbols_string = optarg;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OPTION_PREFIX_SECTIONS:
|
|
|
|
|
prefix_sections_string = optarg;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OPTION_PREFIX_ALLOC_SECTIONS:
|
|
|
|
|
prefix_alloc_sections_string = optarg;
|
|
|
|
|
break;
|
|
|
|
|
|
2003-12-23 21:01:11 +08:00
|
|
|
|
case OPTION_READONLY_TEXT:
|
|
|
|
|
bfd_flags_to_set |= WP_TEXT;
|
|
|
|
|
bfd_flags_to_clear &= ~WP_TEXT;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OPTION_WRITABLE_TEXT:
|
|
|
|
|
bfd_flags_to_clear |= WP_TEXT;
|
|
|
|
|
bfd_flags_to_set &= ~WP_TEXT;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OPTION_PURE:
|
|
|
|
|
bfd_flags_to_set |= D_PAGED;
|
|
|
|
|
bfd_flags_to_clear &= ~D_PAGED;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OPTION_IMPURE:
|
|
|
|
|
bfd_flags_to_clear |= D_PAGED;
|
|
|
|
|
bfd_flags_to_set &= ~D_PAGED;
|
|
|
|
|
break;
|
|
|
|
|
|
2007-03-02 00:39:42 +08:00
|
|
|
|
case OPTION_EXTRACT_SYMBOL:
|
|
|
|
|
extract_symbol = TRUE;
|
|
|
|
|
break;
|
|
|
|
|
|
2007-04-23 18:59:07 +08:00
|
|
|
|
case OPTION_REVERSE_BYTES:
|
|
|
|
|
{
|
|
|
|
|
int prev = reverse_bytes;
|
|
|
|
|
|
|
|
|
|
reverse_bytes = atoi (optarg);
|
|
|
|
|
if ((reverse_bytes <= 0) || ((reverse_bytes % 2) != 0))
|
|
|
|
|
fatal (_("number of bytes to reverse must be positive and even"));
|
|
|
|
|
|
|
|
|
|
if (prev && prev != reverse_bytes)
|
|
|
|
|
non_fatal (_("Warning: ignoring previous --reverse-bytes value of %d"),
|
|
|
|
|
prev);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
bfd/
2009-04-17 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/10074
* coffcode.h (bfd_pei_p): New.
* config.bfd: Remove bfd_efi_bsdrv_ia32_vec,
bfd_efi_rtdrv_ia32_vec, bfd_efi_bsdrv_x86_64_vec,
bfd_efi_rtdrv_x86_64_vec, bfd_efi_bsdrv_ia64_vec and
bfd_efi_rtdrv_ia64_vec. Replace bfd_efi_app_ia32_vec,
bfd_efi_app_x86_64_vec and bfd_efi_app_ia64_vec with
i386pei_vec, x86_64pei_vec and bfd_pei_ia64_vec, respectively.
* configure.in: Remove bfd_efi_bsdrv_ia32_vec,
bfd_efi_rtdrv_ia32_vec, bfd_efi_bsdrv_x86_64_vec,
bfd_efi_rtdrv_x86_64_vec,
bfd_efi_bsdrv_ia64_vec and bfd_efi_rtdrv_ia64_vec. Replace
bfd_efi_ia64_vec with bfd_pei_ia64_vec.
* targets.c: Likewise.
* configure: Regenerated.
* libcoff.h: Likewise.
* Makefile.in: Likewise.
* efi-app-ia32.c: Removed.
* efi-app-x86_64.c: Likewise.
* efi-bsdrv-ia32.c: Likewise.
* efi-bsdrv-ia64.c: Likewise.
* efi-bsdrv-x86_64.c: Likewise.
* efi-rtdrv-ia32.c: Likewise.
* efi-rtdrv-ia64.c: Likewise.
* efi-rtdrv-x86_64.c: Likewise.
* efi-rtdrv-ia32.c: Likewise.
* efi-app-ia64.c: Moved to ...
* pei-ia64.c: This.
(TARGET_SYM): Set to bfd_pei_ia64_vec.
(TARGET_NAME): Set to pei-ia64.
* libpei.h (bfd_target_pei_p): Removed.
(bfd_target_pei_arch): Likewise.
(bfd_target_efi_app_p): Likewise.
(bfd_target_efi_app_arch): Likewise.
(bfd_target_efi_bsdrv_p): Likewise.
(bfd_target_efi_bsdrv_arch): Likewise.
(bfd_target_efi_rtdrv_p): Likewise.
(bfd_target_efi_rtdrv_arch): Likewise.
(bfd_pe_executable_p): Likewise.
* Makefile.am (BFD32_BACKENDS): Remove efi-app-ia32.lo,
efi-bsdrv-ia32.lo and efi-rtdrv-ia32.lo.
(BFD32_BACKENDS_CFILES): Remove efi-app-ia32.c, efi-bsdrv-ia32.c
and efi-rtdrv-ia32.c.
(BFD64_BACKENDS): Remove efi-app-ia64.lo, efi-bsdrv-ia64.lo,
efi-rtdrv-ia64.lo, efi-app-x86_64.lo, efi-bsdrv-x86_64.lo and
efi-rtdrv-x86_64.lo. Add pei-ia64.lo.
(BFD64_BACKENDS_CFILES): Remove efi-app-ia64.c, efi-bsdrv-ia64.c,
efi-rtdrv-ia64.c, efi-app-x86_64.c, efi-bsdrv-x86_64.c and
efi-rtdrv-x86_64.c. Add pei-ia64.c.
(efi-app-ia64.lo): Removed.
(efi-bsdrv-ia32.lo): Likewise.
(efi-rtdrv-ia32.lo): Likewise.
(efi-app-ia64.lo): Likewise.
(efi-bsdrv-ia64.lo): Likewise.
(efi-rtdrv-ia64.lo): Likewise.
(efi-app-x86_64.lo): Likewise.
(efi-bsdrv-x86_64.lo): Likewise.
(efi-rtdrv-x86_64.lo): Likewise.
(pei-ia64.lo): New.
* peicode.h (coff_swap_scnhdr_in): Replace bfd_pe_executable_p
with bfd_pei_p.
(arch_type): Removed.
(pe_arch): Likewise.
(pe_bfd_object_p): Just return coff_object_p.
* peXXigen.c (_bfd_XXi_swap_scnhdr_out): Replace
bfd_pe_executable_p with bfd_pei_p.
binutils/
2009-04-17 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/10074
* objcopy.c: Include coff/i386.h and coff/pe.h.
(pe_file_alignment): New.
(pe_heap_commit): Likewise.
(pe_heap_reserve): Likewise.
(pe_image_base): Likewise.
(pe_section_alignment): Likewise.
(pe_stack_commit): Likewise.
(pe_stack_reserve): Likewise.
(pe_subsystem): Likewise.
(pe_major_subsystem_version): Likewise.
(pe_minor_subsystem_version): Likewise.
(set_pe_subsystem): Likewise.
(convert_efi_target): Likewise.
(command_line_switch): Add OPTION_FILE_ALIGNMENT,
OPTION_HEAP, OPTION_IMAGE_BASE, OPTION_SECTION_ALIGNMENT,
OPTION_STACK and OPTION_SUBSYSTEM.
(copy_options): Likewise.
(copy_usage): Add --file-alignment, --heap, --image-base,
--section-alignment, --stack and --subsystem.
(copy_object): Set up PE parameters.
(copy_main): Process Add OPTION_FILE_ALIGNMENT,
OPTION_HEAP, OPTION_IMAGE_BASE, OPTION_SECTION_ALIGNMENT,
OPTION_STACK and OPTION_SUBSYSTEM. Convert EFI target to
PEI target.
* NEWS: Mention --file-alignment, --heap, --image-base,
--section-alignment, --stack and --subsystem command line
options for objcopy.
* doc/binutils.texi: Document --file-alignment, --heap,
--image-base, --section-alignment, --stack and --subsystem
command line options for objcopy.
2009-04-17 21:46:18 +08:00
|
|
|
|
case OPTION_FILE_ALIGNMENT:
|
|
|
|
|
pe_file_alignment = parse_vma (optarg, "--file-alignment");
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OPTION_HEAP:
|
|
|
|
|
{
|
|
|
|
|
char *end;
|
|
|
|
|
pe_heap_reserve = strtoul (optarg, &end, 0);
|
|
|
|
|
if (end == optarg
|
|
|
|
|
|| (*end != '.' && *end != '\0'))
|
|
|
|
|
non_fatal (_("%s: invalid reserve value for --heap"),
|
|
|
|
|
optarg);
|
|
|
|
|
else if (*end != '\0')
|
|
|
|
|
{
|
|
|
|
|
pe_heap_commit = strtoul (end + 1, &end, 0);
|
|
|
|
|
if (*end != '\0')
|
|
|
|
|
non_fatal (_("%s: invalid commit value for --heap"),
|
|
|
|
|
optarg);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OPTION_IMAGE_BASE:
|
|
|
|
|
pe_image_base = parse_vma (optarg, "--image-base");
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OPTION_SECTION_ALIGNMENT:
|
|
|
|
|
pe_section_alignment = parse_vma (optarg,
|
|
|
|
|
"--section-alignment");
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OPTION_SUBSYSTEM:
|
|
|
|
|
set_pe_subsystem (optarg);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OPTION_STACK:
|
|
|
|
|
{
|
|
|
|
|
char *end;
|
|
|
|
|
pe_stack_reserve = strtoul (optarg, &end, 0);
|
|
|
|
|
if (end == optarg
|
|
|
|
|
|| (*end != '.' && *end != '\0'))
|
|
|
|
|
non_fatal (_("%s: invalid reserve value for --stack"),
|
|
|
|
|
optarg);
|
|
|
|
|
else if (*end != '\0')
|
|
|
|
|
{
|
|
|
|
|
pe_stack_commit = strtoul (end + 1, &end, 0);
|
|
|
|
|
if (*end != '\0')
|
|
|
|
|
non_fatal (_("%s: invalid commit value for --stack"),
|
|
|
|
|
optarg);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 0:
|
2003-06-12 15:23:31 +08:00
|
|
|
|
/* We've been given a long option. */
|
|
|
|
|
break;
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
2002-01-24 00:12:56 +08:00
|
|
|
|
case 'H':
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'h':
|
|
|
|
|
copy_usage (stdout, 0);
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
default:
|
|
|
|
|
copy_usage (stderr, 1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-03-25 00:11:46 +08:00
|
|
|
|
if (formats_info)
|
|
|
|
|
{
|
|
|
|
|
display_info ();
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2007-06-29 08:34:14 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (show_version)
|
|
|
|
|
print_version ("objcopy");
|
|
|
|
|
|
2010-09-10 20:11:28 +08:00
|
|
|
|
if (interleave && copy_byte == -1)
|
|
|
|
|
fatal (_("interleave start byte must be set with --byte"));
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (copy_byte >= interleave)
|
|
|
|
|
fatal (_("byte number must be less than interleave"));
|
|
|
|
|
|
2010-09-10 20:11:28 +08:00
|
|
|
|
if (copy_width > interleave - copy_byte)
|
|
|
|
|
fatal (_("interleave width must be less than or equal to interleave - byte`"));
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (optind == argc || optind + 2 < argc)
|
|
|
|
|
copy_usage (stderr, 1);
|
|
|
|
|
|
|
|
|
|
input_filename = argv[optind];
|
|
|
|
|
if (optind + 1 < argc)
|
|
|
|
|
output_filename = argv[optind + 1];
|
|
|
|
|
|
|
|
|
|
/* Default is to strip no symbols. */
|
|
|
|
|
if (strip_symbols == STRIP_UNDEF && discard_locals == LOCALS_UNDEF)
|
|
|
|
|
strip_symbols = STRIP_NONE;
|
|
|
|
|
|
2003-08-05 22:40:54 +08:00
|
|
|
|
if (output_target == NULL)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
output_target = input_target;
|
|
|
|
|
|
bfd/
2009-04-17 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/10074
* coffcode.h (bfd_pei_p): New.
* config.bfd: Remove bfd_efi_bsdrv_ia32_vec,
bfd_efi_rtdrv_ia32_vec, bfd_efi_bsdrv_x86_64_vec,
bfd_efi_rtdrv_x86_64_vec, bfd_efi_bsdrv_ia64_vec and
bfd_efi_rtdrv_ia64_vec. Replace bfd_efi_app_ia32_vec,
bfd_efi_app_x86_64_vec and bfd_efi_app_ia64_vec with
i386pei_vec, x86_64pei_vec and bfd_pei_ia64_vec, respectively.
* configure.in: Remove bfd_efi_bsdrv_ia32_vec,
bfd_efi_rtdrv_ia32_vec, bfd_efi_bsdrv_x86_64_vec,
bfd_efi_rtdrv_x86_64_vec,
bfd_efi_bsdrv_ia64_vec and bfd_efi_rtdrv_ia64_vec. Replace
bfd_efi_ia64_vec with bfd_pei_ia64_vec.
* targets.c: Likewise.
* configure: Regenerated.
* libcoff.h: Likewise.
* Makefile.in: Likewise.
* efi-app-ia32.c: Removed.
* efi-app-x86_64.c: Likewise.
* efi-bsdrv-ia32.c: Likewise.
* efi-bsdrv-ia64.c: Likewise.
* efi-bsdrv-x86_64.c: Likewise.
* efi-rtdrv-ia32.c: Likewise.
* efi-rtdrv-ia64.c: Likewise.
* efi-rtdrv-x86_64.c: Likewise.
* efi-rtdrv-ia32.c: Likewise.
* efi-app-ia64.c: Moved to ...
* pei-ia64.c: This.
(TARGET_SYM): Set to bfd_pei_ia64_vec.
(TARGET_NAME): Set to pei-ia64.
* libpei.h (bfd_target_pei_p): Removed.
(bfd_target_pei_arch): Likewise.
(bfd_target_efi_app_p): Likewise.
(bfd_target_efi_app_arch): Likewise.
(bfd_target_efi_bsdrv_p): Likewise.
(bfd_target_efi_bsdrv_arch): Likewise.
(bfd_target_efi_rtdrv_p): Likewise.
(bfd_target_efi_rtdrv_arch): Likewise.
(bfd_pe_executable_p): Likewise.
* Makefile.am (BFD32_BACKENDS): Remove efi-app-ia32.lo,
efi-bsdrv-ia32.lo and efi-rtdrv-ia32.lo.
(BFD32_BACKENDS_CFILES): Remove efi-app-ia32.c, efi-bsdrv-ia32.c
and efi-rtdrv-ia32.c.
(BFD64_BACKENDS): Remove efi-app-ia64.lo, efi-bsdrv-ia64.lo,
efi-rtdrv-ia64.lo, efi-app-x86_64.lo, efi-bsdrv-x86_64.lo and
efi-rtdrv-x86_64.lo. Add pei-ia64.lo.
(BFD64_BACKENDS_CFILES): Remove efi-app-ia64.c, efi-bsdrv-ia64.c,
efi-rtdrv-ia64.c, efi-app-x86_64.c, efi-bsdrv-x86_64.c and
efi-rtdrv-x86_64.c. Add pei-ia64.c.
(efi-app-ia64.lo): Removed.
(efi-bsdrv-ia32.lo): Likewise.
(efi-rtdrv-ia32.lo): Likewise.
(efi-app-ia64.lo): Likewise.
(efi-bsdrv-ia64.lo): Likewise.
(efi-rtdrv-ia64.lo): Likewise.
(efi-app-x86_64.lo): Likewise.
(efi-bsdrv-x86_64.lo): Likewise.
(efi-rtdrv-x86_64.lo): Likewise.
(pei-ia64.lo): New.
* peicode.h (coff_swap_scnhdr_in): Replace bfd_pe_executable_p
with bfd_pei_p.
(arch_type): Removed.
(pe_arch): Likewise.
(pe_bfd_object_p): Just return coff_object_p.
* peXXigen.c (_bfd_XXi_swap_scnhdr_out): Replace
bfd_pe_executable_p with bfd_pei_p.
binutils/
2009-04-17 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/10074
* objcopy.c: Include coff/i386.h and coff/pe.h.
(pe_file_alignment): New.
(pe_heap_commit): Likewise.
(pe_heap_reserve): Likewise.
(pe_image_base): Likewise.
(pe_section_alignment): Likewise.
(pe_stack_commit): Likewise.
(pe_stack_reserve): Likewise.
(pe_subsystem): Likewise.
(pe_major_subsystem_version): Likewise.
(pe_minor_subsystem_version): Likewise.
(set_pe_subsystem): Likewise.
(convert_efi_target): Likewise.
(command_line_switch): Add OPTION_FILE_ALIGNMENT,
OPTION_HEAP, OPTION_IMAGE_BASE, OPTION_SECTION_ALIGNMENT,
OPTION_STACK and OPTION_SUBSYSTEM.
(copy_options): Likewise.
(copy_usage): Add --file-alignment, --heap, --image-base,
--section-alignment, --stack and --subsystem.
(copy_object): Set up PE parameters.
(copy_main): Process Add OPTION_FILE_ALIGNMENT,
OPTION_HEAP, OPTION_IMAGE_BASE, OPTION_SECTION_ALIGNMENT,
OPTION_STACK and OPTION_SUBSYSTEM. Convert EFI target to
PEI target.
* NEWS: Mention --file-alignment, --heap, --image-base,
--section-alignment, --stack and --subsystem command line
options for objcopy.
* doc/binutils.texi: Document --file-alignment, --heap,
--image-base, --section-alignment, --stack and --subsystem
command line options for objcopy.
2009-04-17 21:46:18 +08:00
|
|
|
|
/* Convert input EFI target to PEI target. */
|
|
|
|
|
if (input_target != NULL
|
|
|
|
|
&& strncmp (input_target, "efi-", 4) == 0)
|
|
|
|
|
{
|
|
|
|
|
char *efi;
|
|
|
|
|
|
|
|
|
|
efi = xstrdup (output_target + 4);
|
|
|
|
|
if (strncmp (efi, "bsdrv-", 6) == 0
|
|
|
|
|
|| strncmp (efi, "rtdrv-", 6) == 0)
|
|
|
|
|
efi += 2;
|
|
|
|
|
else if (strncmp (efi, "app-", 4) != 0)
|
|
|
|
|
fatal (_("unknown input EFI target: %s"), input_target);
|
|
|
|
|
|
|
|
|
|
input_target = efi;
|
|
|
|
|
convert_efi_target (efi);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Convert output EFI target to PEI target. */
|
|
|
|
|
if (output_target != NULL
|
|
|
|
|
&& strncmp (output_target, "efi-", 4) == 0)
|
|
|
|
|
{
|
|
|
|
|
char *efi;
|
|
|
|
|
|
|
|
|
|
efi = xstrdup (output_target + 4);
|
|
|
|
|
if (strncmp (efi, "app-", 4) == 0)
|
|
|
|
|
{
|
|
|
|
|
if (pe_subsystem == -1)
|
|
|
|
|
pe_subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION;
|
|
|
|
|
}
|
|
|
|
|
else if (strncmp (efi, "bsdrv-", 6) == 0)
|
|
|
|
|
{
|
|
|
|
|
if (pe_subsystem == -1)
|
|
|
|
|
pe_subsystem = IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER;
|
|
|
|
|
efi += 2;
|
|
|
|
|
}
|
|
|
|
|
else if (strncmp (efi, "rtdrv-", 6) == 0)
|
|
|
|
|
{
|
|
|
|
|
if (pe_subsystem == -1)
|
|
|
|
|
pe_subsystem = IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER;
|
|
|
|
|
efi += 2;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
fatal (_("unknown output EFI target: %s"), output_target);
|
|
|
|
|
|
|
|
|
|
if (pe_file_alignment == (bfd_vma) -1)
|
|
|
|
|
pe_file_alignment = PE_DEF_FILE_ALIGNMENT;
|
|
|
|
|
if (pe_section_alignment == (bfd_vma) -1)
|
|
|
|
|
pe_section_alignment = PE_DEF_SECTION_ALIGNMENT;
|
|
|
|
|
|
|
|
|
|
output_target = efi;
|
|
|
|
|
convert_efi_target (efi);
|
|
|
|
|
}
|
|
|
|
|
|
2001-03-13 08:08:35 +08:00
|
|
|
|
if (preserve_dates)
|
|
|
|
|
if (stat (input_filename, & statbuf) < 0)
|
2003-11-07 20:19:34 +08:00
|
|
|
|
fatal (_("warning: could not locate '%s'. System error message: %s"),
|
|
|
|
|
input_filename, strerror (errno));
|
2001-03-13 08:08:35 +08:00
|
|
|
|
|
2003-05-13 19:15:59 +08:00
|
|
|
|
/* If there is no destination file, or the source and destination files
|
2003-08-05 22:40:54 +08:00
|
|
|
|
are the same, then create a temp and rename the result into the input. */
|
2011-03-01 02:32:52 +08:00
|
|
|
|
if (output_filename == NULL
|
|
|
|
|
|| filename_cmp (input_filename, output_filename) == 0)
|
2007-05-18 14:36:14 +08:00
|
|
|
|
tmpname = make_tempname (input_filename);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
else
|
2007-05-18 14:36:14 +08:00
|
|
|
|
tmpname = output_filename;
|
2007-06-29 08:34:14 +08:00
|
|
|
|
|
2007-05-18 14:36:14 +08:00
|
|
|
|
if (tmpname == NULL)
|
|
|
|
|
fatal (_("warning: could not create temporary file whilst copying '%s', (error: %s)"),
|
|
|
|
|
input_filename, strerror (errno));
|
2001-07-31 21:49:39 +08:00
|
|
|
|
|
2009-09-11 19:16:19 +08:00
|
|
|
|
copy_file (input_filename, tmpname, input_target, output_target, input_arch);
|
2007-05-18 14:36:14 +08:00
|
|
|
|
if (status == 0)
|
|
|
|
|
{
|
|
|
|
|
if (preserve_dates)
|
|
|
|
|
set_times (tmpname, &statbuf);
|
|
|
|
|
if (tmpname != output_filename)
|
2009-08-03 21:47:35 +08:00
|
|
|
|
status = (smart_rename (tmpname, input_filename,
|
|
|
|
|
preserve_dates) != 0);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
2007-05-18 14:36:14 +08:00
|
|
|
|
else
|
|
|
|
|
unlink_if_ordinary (tmpname);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
if (change_warn)
|
|
|
|
|
{
|
|
|
|
|
for (p = change_sections; p != NULL; p = p->next)
|
|
|
|
|
{
|
|
|
|
|
if (! p->used)
|
|
|
|
|
{
|
|
|
|
|
if (p->change_vma != CHANGE_IGNORE)
|
|
|
|
|
{
|
|
|
|
|
char buff [20];
|
|
|
|
|
|
|
|
|
|
sprintf_vma (buff, p->vma_val);
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* xgettext:c-format */
|
2000-04-05 11:43:56 +08:00
|
|
|
|
non_fatal (_("%s %s%c0x%s never used"),
|
|
|
|
|
"--change-section-vma",
|
1999-05-03 15:29:11 +08:00
|
|
|
|
p->name,
|
|
|
|
|
p->change_vma == CHANGE_SET ? '=' : '+',
|
|
|
|
|
buff);
|
|
|
|
|
}
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (p->change_lma != CHANGE_IGNORE)
|
|
|
|
|
{
|
|
|
|
|
char buff [20];
|
|
|
|
|
|
|
|
|
|
sprintf_vma (buff, p->lma_val);
|
2000-04-05 11:43:56 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* xgettext:c-format */
|
2000-04-05 11:43:56 +08:00
|
|
|
|
non_fatal (_("%s %s%c0x%s never used"),
|
|
|
|
|
"--change-section-lma",
|
1999-05-03 15:29:11 +08:00
|
|
|
|
p->name,
|
|
|
|
|
p->change_lma == CHANGE_SET ? '=' : '+',
|
|
|
|
|
buff);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
2003-07-24 01:34:03 +08:00
|
|
|
|
main (int argc, char *argv[])
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
|
|
|
|
|
setlocale (LC_MESSAGES, "");
|
2001-09-19 13:33:36 +08:00
|
|
|
|
#endif
|
|
|
|
|
#if defined (HAVE_SETLOCALE)
|
|
|
|
|
setlocale (LC_CTYPE, "");
|
1999-05-03 15:29:11 +08:00
|
|
|
|
#endif
|
|
|
|
|
bindtextdomain (PACKAGE, LOCALEDIR);
|
|
|
|
|
textdomain (PACKAGE);
|
|
|
|
|
|
|
|
|
|
program_name = argv[0];
|
|
|
|
|
xmalloc_set_program_name (program_name);
|
|
|
|
|
|
|
|
|
|
START_PROGRESS (program_name, 0);
|
|
|
|
|
|
2005-10-01 00:37:32 +08:00
|
|
|
|
expandargv (&argc, &argv);
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
strip_symbols = STRIP_UNDEF;
|
|
|
|
|
discard_locals = LOCALS_UNDEF;
|
|
|
|
|
|
|
|
|
|
bfd_init ();
|
|
|
|
|
set_default_bfd_target ();
|
|
|
|
|
|
|
|
|
|
if (is_strip < 0)
|
|
|
|
|
{
|
|
|
|
|
int i = strlen (program_name);
|
2000-05-26 21:11:57 +08:00
|
|
|
|
#ifdef HAVE_DOS_BASED_FILE_SYSTEM
|
|
|
|
|
/* Drop the .exe suffix, if any. */
|
|
|
|
|
if (i > 4 && FILENAME_CMP (program_name + i - 4, ".exe") == 0)
|
|
|
|
|
{
|
|
|
|
|
i -= 4;
|
|
|
|
|
program_name[i] = '\0';
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
is_strip = (i >= 5 && FILENAME_CMP (program_name + i - 5, "strip") == 0);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
2008-04-16 16:24:21 +08:00
|
|
|
|
create_symbol_htabs ();
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (is_strip)
|
|
|
|
|
strip_main (argc, argv);
|
|
|
|
|
else
|
|
|
|
|
copy_main (argc, argv);
|
|
|
|
|
|
|
|
|
|
END_PROGRESS (program_name);
|
|
|
|
|
|
|
|
|
|
return status;
|
|
|
|
|
}
|