1999-05-03 09:29:11 +02:00
|
|
|
|
/* objcopy.c -- copy object file from input to output, optionally massaging it.
|
2019-01-01 11:31:27 +01:00
|
|
|
|
Copyright (C) 1991-2019 Free Software Foundation, Inc.
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
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-05 18:54:46 +02:00
|
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
1999-05-03 09:29:11 +02: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 16:17:41 +02:00
|
|
|
|
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
|
|
|
|
|
02110-1301, USA. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2007-04-26 16:47:00 +02:00
|
|
|
|
#include "sysdep.h"
|
1999-05-03 09:29:11 +02:00
|
|
|
|
#include "bfd.h"
|
|
|
|
|
#include "progress.h"
|
|
|
|
|
#include "getopt.h"
|
|
|
|
|
#include "libiberty.h"
|
2007-04-26 16:47:00 +02:00
|
|
|
|
#include "bucomm.h"
|
1999-05-03 09:29:11 +02:00
|
|
|
|
#include "budbg.h"
|
2000-05-26 15:11:57 +02:00
|
|
|
|
#include "filenames.h"
|
2003-11-11 18:50:26 +01:00
|
|
|
|
#include "fnmatch.h"
|
2004-01-13 16:41:00 +01:00
|
|
|
|
#include "elf-bfd.h"
|
2009-04-14 11:47:44 +02:00
|
|
|
|
#include "coff/internal.h"
|
|
|
|
|
#include "libcoff.h"
|
2017-03-01 12:09:46 +01:00
|
|
|
|
#include "safe-ctype.h"
|
1999-05-03 09:29:11 +02: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 15:46:18 +02: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 10:24:21 +02:00
|
|
|
|
struct is_specified_symbol_predicate_data
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
2015-10-21 16:16:35 +02:00
|
|
|
|
const char * name;
|
2008-04-16 10:24:21 +02:00
|
|
|
|
bfd_boolean found;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
};
|
|
|
|
|
|
2017-04-05 18:22:47 +02:00
|
|
|
|
/* A node includes symbol name mapping to support redefine_sym. */
|
2000-04-05 05:43:56 +02:00
|
|
|
|
struct redefine_node
|
|
|
|
|
{
|
|
|
|
|
char *source;
|
|
|
|
|
char *target;
|
|
|
|
|
};
|
|
|
|
|
|
2015-10-21 16:16:35 +02:00
|
|
|
|
struct addsym_node
|
|
|
|
|
{
|
|
|
|
|
struct addsym_node *next;
|
|
|
|
|
char * symdef;
|
|
|
|
|
long symval;
|
|
|
|
|
flagword flags;
|
|
|
|
|
char * section;
|
|
|
|
|
char * othersym;
|
|
|
|
|
};
|
|
|
|
|
|
2001-07-31 15:49:39 +02: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-23 19:34:03 +02:00
|
|
|
|
static section_rename *section_rename_list;
|
2001-07-31 15:49:39 +02:00
|
|
|
|
|
2003-07-23 19:34:03 +02:00
|
|
|
|
static asymbol **isympp = NULL; /* Input symbols. */
|
|
|
|
|
static asymbol **osympp = NULL; /* Output symbols that survive stripping. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2010-09-10 14:11:28 +02:00
|
|
|
|
/* If `copy_byte' >= 0, copy 'copy_width' byte(s) of every `interleave' bytes. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
static int copy_byte = -1;
|
2010-09-10 14:11:28 +02:00
|
|
|
|
static int interleave = 0; /* Initialised to 4 in copy_main(). */
|
|
|
|
|
static int copy_width = 1;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2002-11-30 09:39:46 +01:00
|
|
|
|
static bfd_boolean verbose; /* Print file and target names. */
|
|
|
|
|
static bfd_boolean preserve_dates; /* Preserve input file timestamp. */
|
2013-01-07 18:40:59 +01:00
|
|
|
|
static int deterministic = -1; /* Enable deterministic archives. */
|
2017-03-01 12:09:46 +01:00
|
|
|
|
static int status = 0; /* Exit status. */
|
|
|
|
|
|
|
|
|
|
static bfd_boolean merge_notes = FALSE; /* Merge note sections. */
|
|
|
|
|
static bfd_byte * merged_notes = NULL; /* Contents on note section undergoing a merge. */
|
|
|
|
|
static bfd_size_type merged_size = 0; /* New, smaller size of the merged note section. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
enum strip_action
|
2015-10-21 16:16:35 +02:00
|
|
|
|
{
|
|
|
|
|
STRIP_UNDEF,
|
|
|
|
|
STRIP_NONE, /* Don't strip. */
|
|
|
|
|
STRIP_DEBUG, /* Strip all debugger symbols. */
|
|
|
|
|
STRIP_UNNEEDED, /* Strip unnecessary symbols. */
|
|
|
|
|
STRIP_NONDEBUG, /* Strip everything but debug info. */
|
|
|
|
|
STRIP_DWO, /* Strip all DWO info. */
|
|
|
|
|
STRIP_NONDWO, /* Strip everything but DWO info. */
|
|
|
|
|
STRIP_ALL /* Strip all symbols. */
|
|
|
|
|
};
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2002-05-21 21:34:58 +02:00
|
|
|
|
/* Which symbols to remove. */
|
2012-10-18 19:29:54 +02:00
|
|
|
|
static enum strip_action strip_symbols = STRIP_UNDEF;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
enum locals_action
|
2015-10-21 16:16:35 +02:00
|
|
|
|
{
|
|
|
|
|
LOCALS_UNDEF,
|
|
|
|
|
LOCALS_START_L, /* Discard locals starting with L. */
|
|
|
|
|
LOCALS_ALL /* Discard all locals. */
|
|
|
|
|
};
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
/* Which local symbols to remove. Overrides STRIP_ALL. */
|
|
|
|
|
static enum locals_action discard_locals;
|
|
|
|
|
|
|
|
|
|
/* Structure used to hold lists of sections and actions to take. */
|
|
|
|
|
struct section_list
|
|
|
|
|
{
|
2002-11-30 09:39:46 +01:00
|
|
|
|
struct section_list * next; /* Next section to change. */
|
2013-02-15 10:32:31 +01:00
|
|
|
|
const char * pattern; /* Section name pattern. */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
bfd_boolean used; /* Whether this entry was used. */
|
2013-02-15 10:32:31 +01:00
|
|
|
|
|
|
|
|
|
unsigned int context; /* What to do with matching sections. */
|
|
|
|
|
/* Flag bits used in the context field.
|
|
|
|
|
COPY and REMOVE are mutually exlusive. SET and ALTER are mutually exclusive. */
|
|
|
|
|
#define SECTION_CONTEXT_REMOVE (1 << 0) /* Remove this section. */
|
|
|
|
|
#define SECTION_CONTEXT_COPY (1 << 1) /* Copy this section, delete all non-copied section. */
|
|
|
|
|
#define SECTION_CONTEXT_SET_VMA (1 << 2) /* Set the sections' VMA address. */
|
|
|
|
|
#define SECTION_CONTEXT_ALTER_VMA (1 << 3) /* Increment or decrement the section's VMA address. */
|
|
|
|
|
#define SECTION_CONTEXT_SET_LMA (1 << 4) /* Set the sections' LMA address. */
|
|
|
|
|
#define SECTION_CONTEXT_ALTER_LMA (1 << 5) /* Increment or decrement the section's LMA address. */
|
|
|
|
|
#define SECTION_CONTEXT_SET_FLAGS (1 << 6) /* Set the section's flags. */
|
objcopy/strip: Add option --remove-relocations=SECTIONPATTERN
The objcopy and strip tools make use of the bfd library to manipulate
the state of the input file (to produce an output file). Within the
input file (for ELF at least), relocations are held within a section,
and so, if the user wanted to remove the relocations, but keep the
section to which the relocations would have been applied, it is tempting
to think that specifying the name of a relocation section to objcopy's
--remove-section option might do what you want, for example:
objcopy --remove-section=.rela.text input.elf output.elf
However, this does not work. The reason is that when the input file is
loaded, relocations are not managed as sections, but are, instead,
loaded as data associated with the section to which the relocations
would be applied. In our example above the relocations in '.rela.text'
are held as data on the section '.text' once 'input.elf' is loaded.
One task that objcopy and strip do is copy the relocations from the
input file to the output file if the section is also being copied from
the input file to the output file.
This commit adds a new command line option for objcopy and strip,
--remove-relocations, which can be used to remove the relocations, while
keeping the section that the relocations would have been applied to, for
example:
objcopy --remove-relocations=.text input.elf output.elf
in this case the section '.text' will appear in both 'input.elf' and
'output.elf', but any relocations in 'input.elf' that apply to '.text'
will not be present in 'output.elf'.
I have also added a special case to the handling of --remove-section
that spots if a user tries to remove a relocation section (currently
this is done by spotting the '.rela.' or '.rel.' prefix) and forwards
the request to --remove-relocations.
As with --remove-section and --only-section the --remove-relocations
option supports the '!' prefix on the section-patterns it takes to allow
for sections to be specifically not matched.
There are tests for all the new functionality.
binutils/ChangeLog:
* doc/binutils.texi (objcopy): Document 'remove-relocations'.
(strip): Likewise.
* objcopy.c (SECTION_CONTEXT_REMOVE_RELOCS): Define.
(enum command_line_switch): Add 'OPTION_REMOVE_RELOCS'.
(struct option strip_options): Add 'remove-relocations'.
(struct option copy_options): Likewise.
(copy_usage): Likewise.
(strip_usage): Likewise.
(handle_remove_relocations_option): New function.
(discard_relocations): New function.
(handle_remove_section_option): New function.
(copy_relocations_in_section): Use discard_relocations.
(strip_main): Use handle_remove_section_option for
'remove-section', and handle 'remove-relocations' option.
(copy_main): Likewise.
* testsuite/binutils-all/objcopy.exp: Run new tests.
* testsuite/binutils-all/remove-relocs-01.d: New file.
* testsuite/binutils-all/remove-relocs-01.s: New file.
* testsuite/binutils-all/remove-relocs-02.d: New file.
* testsuite/binutils-all/remove-relocs-03.d: New file.
* testsuite/binutils-all/remove-relocs-04.d: New file.
* testsuite/binutils-all/remove-relocs-05.d: New file.
* testsuite/binutils-all/remove-relocs-06.d: New file.
2015-08-21 21:08:26 +02:00
|
|
|
|
#define SECTION_CONTEXT_REMOVE_RELOCS (1 << 7) /* Remove relocations for this section. */
|
2013-02-15 10:32:31 +01:00
|
|
|
|
|
2002-11-30 09:39:46 +01:00
|
|
|
|
bfd_vma vma_val; /* Amount to change by or set to. */
|
|
|
|
|
bfd_vma lma_val; /* Amount to change by or set to. */
|
|
|
|
|
flagword flags; /* What to set the section flags to. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static struct section_list *change_sections;
|
2001-07-31 15:49:39 +02:00
|
|
|
|
|
2002-11-30 09:39:46 +01:00
|
|
|
|
/* TRUE if some sections are to be removed. */
|
|
|
|
|
static bfd_boolean sections_removed;
|
2001-07-31 15:49:39 +02:00
|
|
|
|
|
2002-11-30 09:39:46 +01:00
|
|
|
|
/* TRUE if only some sections are to be copied. */
|
|
|
|
|
static bfd_boolean sections_copied;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
/* Changes to the start address. */
|
|
|
|
|
static bfd_vma change_start = 0;
|
2002-11-30 09:39:46 +01:00
|
|
|
|
static bfd_boolean set_start_set = FALSE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
static bfd_vma set_start;
|
|
|
|
|
|
|
|
|
|
/* Changes to section addresses. */
|
|
|
|
|
static bfd_vma change_section_address = 0;
|
|
|
|
|
|
|
|
|
|
/* Filling gaps between sections. */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
static bfd_boolean gap_fill_set = FALSE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
static bfd_byte gap_fill = 0;
|
|
|
|
|
|
|
|
|
|
/* Pad to a given address. */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
static bfd_boolean pad_to_set = FALSE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
static bfd_vma pad_to;
|
|
|
|
|
|
2006-02-28 17:09:01 +01:00
|
|
|
|
/* Use alternative machine code? */
|
|
|
|
|
static unsigned long use_alt_mach_code = 0;
|
2001-08-24 15:56:11 +02:00
|
|
|
|
|
2003-12-23 14:01:11 +01: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 09:29:11 +02: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 15:49:39 +02:00
|
|
|
|
/* List of sections to add to the output BFD. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
static struct section_add *add_sections;
|
|
|
|
|
|
2015-02-13 18:04:42 +01:00
|
|
|
|
/* List of sections to update in the output BFD. */
|
|
|
|
|
static struct section_add *update_sections;
|
|
|
|
|
|
2013-12-31 10:52:24 +01:00
|
|
|
|
/* List of sections to dump from the output BFD. */
|
|
|
|
|
static struct section_add *dump_sections;
|
|
|
|
|
|
2003-06-12 09:23:31 +02: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 09:29:11 +02:00
|
|
|
|
/* Whether to convert debugging information. */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
static bfd_boolean convert_debugging = FALSE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2010-10-29 14:10:39 +02:00
|
|
|
|
/* Whether to compress/decompress DWARF debug sections. */
|
|
|
|
|
static enum
|
|
|
|
|
{
|
2015-04-09 19:56:28 +02:00
|
|
|
|
nothing = 0,
|
|
|
|
|
compress = 1 << 0,
|
|
|
|
|
compress_zlib = compress | 1 << 1,
|
|
|
|
|
compress_gnu_zlib = compress | 1 << 2,
|
|
|
|
|
compress_gabi_zlib = compress | 1 << 3,
|
|
|
|
|
decompress = 1 << 4
|
2010-10-29 14:10:39 +02:00
|
|
|
|
} do_debug_sections = nothing;
|
|
|
|
|
|
Properly implement STT_COMMON
The BFD configure option, --enable-elf-stt-common, can't be to used to
verify STT_COMMON implementation with the normal binutils build. Instead,
this patch removes it from BFD. It adds --elf-stt-common=[no|yes] to ELF
assembler/objcopy and adds -z common/-z nocommon to ld.
A configure option, --enable-elf-stt-common, is added to gas to specify
whether ELF assembler should generate common symbols with the STT_COMMON
type by default.
Since BSF_KEEP_G is never used, it is renamed to BSF_ELF_COMMON for ELF
common symbols.
bfd/
PR ld/19645
* bfd.c (bfd): Change flags to 20 bits.
(BFD_CONVERT_ELF_COMMON): New.
(BFD_USE_ELF_STT_COMMON): Likewise.
(BFD_FLAGS_SAVED): Add BFD_CONVERT_ELF_COMMON and
BFD_USE_ELF_STT_COMMON.
(BFD_FLAGS_FOR_BFD_USE_MASK): Likewise.
* configure.ac: Remove --enable-elf-stt-common.
* elf.c (swap_out_syms): Choose STT_COMMON or STT_OBJECT for
common symbol depending on BFD_CONVERT_ELF_COMMON and
BFD_USE_ELF_STT_COMMON.
* elfcode.h (elf_slurp_symbol_table): Set BSF_ELF_COMMON for
STT_COMMON.
* elflink.c (bfd_elf_link_mark_dynamic_symbol): Also check
STT_COMMON.
(elf_link_convert_common_type): New function.
(elf_link_output_extsym): Choose STT_COMMON or STT_OBJECT for
common symbol depending on BFD_CONVERT_ELF_COMMON and
BFD_USE_ELF_STT_COMMON. Set sym.st_info after sym.st_shndx.
* elfxx-target.h (TARGET_BIG_SYM): Add BFD_CONVERT_ELF_COMMON
and BFD_USE_ELF_STT_COMMON to object_flags.
(TARGET_LITTLE_SYM): Likewise.
* syms.c (BSF_KEEP_G): Renamed to ...
(BSF_ELF_COMMON): This.
* bfd-in2.h: Regenerated.
* config.in: Likewise.
* configure: Likewise.
binutils/
PR ld/19645
* NEWS: Mention --elf-stt-common= for objcopy.
* doc/binutils.texi: Document --elf-stt-common= for objcopy.
* objcopy.c (do_elf_stt_common): New.
(command_line_switch): Add OPTION_ELF_STT_COMMON.
(copy_options): Add --elf-stt-common=.
(copy_usage): Add --elf-stt-common=.
(copy_object): Also check do_elf_stt_common for ELF targets.
(copy_file): Handle do_elf_stt_common.
(copy_main): Handle OPTION_ELF_STT_COMMON.
* readelf.c (apply_relocations): Support STT_COMMON.
* testsuite/binutils-all/common-1.s: New file.
* testsuite/binutils-all/common-1a.d: Likewise.
* testsuite/binutils-all/common-1b.d: Likewise.
* testsuite/binutils-all/common-1c.d: Likewise.
* testsuite/binutils-all/common-1d.d: Likewise.
* testsuite/binutils-all/common-1e.d: Likewise.
* testsuite/binutils-all/common-1f.d: Likewise.
* testsuite/binutils-all/common-2.s: Likewise.
* testsuite/binutils-all/common-2a.d: Likewise.
* testsuite/binutils-all/common-2b.d: Likewise.
* testsuite/binutils-all/common-2c.d: Likewise.
* testsuite/binutils-all/common-2d.d: Likewise.
* testsuite/binutils-all/common-2e.d: Likewise.
* testsuite/binutils-all/common-2f.d: Likewise.
* testsuite/binutils-all/objcopy.exp
(objcopy_test_elf_common_symbols): New proc.
Run objcopy_test_elf_common_symbols for ELF targets
gas/
PR ld/19645
* NEWS: Mention --enable-elf-stt-common and --elf-stt-common=
for ELF assemblers.
* as.c (flag_use_elf_stt_common): New.
(show_usage): Add --elf-stt-common=.
(option_values): Add OPTION_ELF_STT_COMMON.
(std_longopts): Add --elf-stt-common=.
(parse_args): Handle --elf-stt-common=.
* as.h (flag_use_elf_stt_common): New.
* config.in: Regenerated.
* configure: Likewise.
* configure.ac: Add --enable-elf-stt-common and define
DEFAULT_GENERATE_ELF_STT_COMMON.
* gas/write.c (write_object_file): Set BFD_CONVERT_ELF_COMMON
and BFD_USE_ELF_STT_COMMON if flag_use_elf_stt_common is set.
* doc/as.texinfo: Document --elf-stt-common=.
* testsuite/gas/elf/common3.s: New file.
* testsuite/gas/elf/common3a.d: Likewise.
* testsuite/gas/elf/common3b.d: Likewise.
* testsuite/gas/elf/common4.s: Likewise.
* testsuite/gas/elf/common4a.d: Likewise.
* testsuite/gas/elf/common4b.d: Likewise.
* testsuite/gas/i386/dw2-compress-3b.d: Likewise.
* testsuite/gas/i386/dw2-compressed-3b.d: Likewise.
* testsuite/gas/elf/elf.exp: Run common3a, common3b, common4a
and common4b.
* testsuite/gas/i386/dw2-compress-3.d: Renamed to ...
* testsuite/gas/i386/dw2-compress-3a.d: This. Pass
--elf-stt-common=no to as.
* testsuite/gas/i386/dw2-compressed-3.d: Renamed to ...
* testsuite/gas/i386/dw2-compressed-3a.d: This. Pass
--elf-stt-common=no to as.
* testsuite/gas/i386/i386.exp: Run dw2-compress-3a,
dw2-compress-3b, dw2-compressed-3a and dw2-compressed-3b instead
of dw2-compress-3 and dw2-compressed-3.
include/
PR ld/19645
* bfdlink.h (bfd_link_elf_stt_common): New enum.
(bfd_link_info): Add elf_stt_common.
ld/
PR ld/19645
* NEWS: Mention -z common/-z nocommon for ELF targets.
* emultempl/elf32.em (gld${EMULATION_NAME}_handle_option): Handle
-z common and -z nocommon.
* ld.texinfo: Document -z common/-z nocommon.
* lexsup.c (elf_shlib_list_options): Add -z common/-z nocommon.
* testsuite/ld-elf/tls_common.exp: Test --elf-stt-common=no and
--elf-stt-common=yes with assembler.
* testsuite/ld-elfcomm/common-1.s: New file.
* testsuite/ld-elfcomm/common-1a.d: Likewise.
* testsuite/ld-elfcomm/common-1b.d: Likewise.
* testsuite/ld-elfcomm/common-1c.d: Likewise.
* testsuite/ld-elfcomm/common-1d.d: Likewise.
* testsuite/ld-elfcomm/common-1e.d: Likewise.
* testsuite/ld-elfcomm/common-1f.d: Likewise.
* testsuite/ld-elfcomm/common-2.s: Likewise.
* testsuite/ld-elfcomm/common-2a.d: Likewise.
* testsuite/ld-elfcomm/common-2b.d: Likewise.
* testsuite/ld-elfcomm/common-2c.d: Likewise.
* testsuite/ld-elfcomm/common-2d.d: Likewise.
* testsuite/ld-elfcomm/common-2e.d: Likewise.
* testsuite/ld-elfcomm/common-2f.d: Likewise.
* testsuite/ld-elfcomm/common-3a.rd: Likewise.
* testsuite/ld-elfcomm/common-3b.rd: Likewise.
* testsuite/ld-i386/pr19645.d: Likewise.
* testsuite/ld-i386/pr19645.s: Likewise.
* testsuite/ld-x86-64/largecomm-1.s: Likewise.
* testsuite/ld-x86-64/largecomm-1a.d: Likewise.
* testsuite/ld-x86-64/largecomm-1b.d: Likewise.
* testsuite/ld-x86-64/largecomm-1c.d: Likewise.
* testsuite/ld-x86-64/largecomm-1d.d: Likewise.
* testsuite/ld-x86-64/largecomm-1e.d: Likewise.
* testsuite/ld-x86-64/largecomm-1f.d: Likewise.
* testsuite/ld-x86-64/pr19645.d: Likewise.
* testsuite/ld-x86-64/pr19645.s: Likewise.
* testsuite/ld-elfcomm/elfcomm.exp: Test --elf-stt-common=yes
with assembler.
(assembler_generates_commons): Removed.
Run -z common/-z nocommon tests. Run *.d tests.
* testsuite/ld-i386/i386.exp: Run pr19645.
* testsuite/ld-x86-64/x86-64.exp: Likewise.
* testsuite/ld-x86-64/dwarfreloc.exp: Test --elf-stt-common with
assembler. Test STT_COMMON with readelf.
2016-02-22 18:18:52 +01:00
|
|
|
|
/* Whether to generate ELF common symbols with the STT_COMMON type. */
|
2016-06-11 15:09:06 +02:00
|
|
|
|
static enum bfd_link_elf_stt_common do_elf_stt_common = unchanged;
|
Properly implement STT_COMMON
The BFD configure option, --enable-elf-stt-common, can't be to used to
verify STT_COMMON implementation with the normal binutils build. Instead,
this patch removes it from BFD. It adds --elf-stt-common=[no|yes] to ELF
assembler/objcopy and adds -z common/-z nocommon to ld.
A configure option, --enable-elf-stt-common, is added to gas to specify
whether ELF assembler should generate common symbols with the STT_COMMON
type by default.
Since BSF_KEEP_G is never used, it is renamed to BSF_ELF_COMMON for ELF
common symbols.
bfd/
PR ld/19645
* bfd.c (bfd): Change flags to 20 bits.
(BFD_CONVERT_ELF_COMMON): New.
(BFD_USE_ELF_STT_COMMON): Likewise.
(BFD_FLAGS_SAVED): Add BFD_CONVERT_ELF_COMMON and
BFD_USE_ELF_STT_COMMON.
(BFD_FLAGS_FOR_BFD_USE_MASK): Likewise.
* configure.ac: Remove --enable-elf-stt-common.
* elf.c (swap_out_syms): Choose STT_COMMON or STT_OBJECT for
common symbol depending on BFD_CONVERT_ELF_COMMON and
BFD_USE_ELF_STT_COMMON.
* elfcode.h (elf_slurp_symbol_table): Set BSF_ELF_COMMON for
STT_COMMON.
* elflink.c (bfd_elf_link_mark_dynamic_symbol): Also check
STT_COMMON.
(elf_link_convert_common_type): New function.
(elf_link_output_extsym): Choose STT_COMMON or STT_OBJECT for
common symbol depending on BFD_CONVERT_ELF_COMMON and
BFD_USE_ELF_STT_COMMON. Set sym.st_info after sym.st_shndx.
* elfxx-target.h (TARGET_BIG_SYM): Add BFD_CONVERT_ELF_COMMON
and BFD_USE_ELF_STT_COMMON to object_flags.
(TARGET_LITTLE_SYM): Likewise.
* syms.c (BSF_KEEP_G): Renamed to ...
(BSF_ELF_COMMON): This.
* bfd-in2.h: Regenerated.
* config.in: Likewise.
* configure: Likewise.
binutils/
PR ld/19645
* NEWS: Mention --elf-stt-common= for objcopy.
* doc/binutils.texi: Document --elf-stt-common= for objcopy.
* objcopy.c (do_elf_stt_common): New.
(command_line_switch): Add OPTION_ELF_STT_COMMON.
(copy_options): Add --elf-stt-common=.
(copy_usage): Add --elf-stt-common=.
(copy_object): Also check do_elf_stt_common for ELF targets.
(copy_file): Handle do_elf_stt_common.
(copy_main): Handle OPTION_ELF_STT_COMMON.
* readelf.c (apply_relocations): Support STT_COMMON.
* testsuite/binutils-all/common-1.s: New file.
* testsuite/binutils-all/common-1a.d: Likewise.
* testsuite/binutils-all/common-1b.d: Likewise.
* testsuite/binutils-all/common-1c.d: Likewise.
* testsuite/binutils-all/common-1d.d: Likewise.
* testsuite/binutils-all/common-1e.d: Likewise.
* testsuite/binutils-all/common-1f.d: Likewise.
* testsuite/binutils-all/common-2.s: Likewise.
* testsuite/binutils-all/common-2a.d: Likewise.
* testsuite/binutils-all/common-2b.d: Likewise.
* testsuite/binutils-all/common-2c.d: Likewise.
* testsuite/binutils-all/common-2d.d: Likewise.
* testsuite/binutils-all/common-2e.d: Likewise.
* testsuite/binutils-all/common-2f.d: Likewise.
* testsuite/binutils-all/objcopy.exp
(objcopy_test_elf_common_symbols): New proc.
Run objcopy_test_elf_common_symbols for ELF targets
gas/
PR ld/19645
* NEWS: Mention --enable-elf-stt-common and --elf-stt-common=
for ELF assemblers.
* as.c (flag_use_elf_stt_common): New.
(show_usage): Add --elf-stt-common=.
(option_values): Add OPTION_ELF_STT_COMMON.
(std_longopts): Add --elf-stt-common=.
(parse_args): Handle --elf-stt-common=.
* as.h (flag_use_elf_stt_common): New.
* config.in: Regenerated.
* configure: Likewise.
* configure.ac: Add --enable-elf-stt-common and define
DEFAULT_GENERATE_ELF_STT_COMMON.
* gas/write.c (write_object_file): Set BFD_CONVERT_ELF_COMMON
and BFD_USE_ELF_STT_COMMON if flag_use_elf_stt_common is set.
* doc/as.texinfo: Document --elf-stt-common=.
* testsuite/gas/elf/common3.s: New file.
* testsuite/gas/elf/common3a.d: Likewise.
* testsuite/gas/elf/common3b.d: Likewise.
* testsuite/gas/elf/common4.s: Likewise.
* testsuite/gas/elf/common4a.d: Likewise.
* testsuite/gas/elf/common4b.d: Likewise.
* testsuite/gas/i386/dw2-compress-3b.d: Likewise.
* testsuite/gas/i386/dw2-compressed-3b.d: Likewise.
* testsuite/gas/elf/elf.exp: Run common3a, common3b, common4a
and common4b.
* testsuite/gas/i386/dw2-compress-3.d: Renamed to ...
* testsuite/gas/i386/dw2-compress-3a.d: This. Pass
--elf-stt-common=no to as.
* testsuite/gas/i386/dw2-compressed-3.d: Renamed to ...
* testsuite/gas/i386/dw2-compressed-3a.d: This. Pass
--elf-stt-common=no to as.
* testsuite/gas/i386/i386.exp: Run dw2-compress-3a,
dw2-compress-3b, dw2-compressed-3a and dw2-compressed-3b instead
of dw2-compress-3 and dw2-compressed-3.
include/
PR ld/19645
* bfdlink.h (bfd_link_elf_stt_common): New enum.
(bfd_link_info): Add elf_stt_common.
ld/
PR ld/19645
* NEWS: Mention -z common/-z nocommon for ELF targets.
* emultempl/elf32.em (gld${EMULATION_NAME}_handle_option): Handle
-z common and -z nocommon.
* ld.texinfo: Document -z common/-z nocommon.
* lexsup.c (elf_shlib_list_options): Add -z common/-z nocommon.
* testsuite/ld-elf/tls_common.exp: Test --elf-stt-common=no and
--elf-stt-common=yes with assembler.
* testsuite/ld-elfcomm/common-1.s: New file.
* testsuite/ld-elfcomm/common-1a.d: Likewise.
* testsuite/ld-elfcomm/common-1b.d: Likewise.
* testsuite/ld-elfcomm/common-1c.d: Likewise.
* testsuite/ld-elfcomm/common-1d.d: Likewise.
* testsuite/ld-elfcomm/common-1e.d: Likewise.
* testsuite/ld-elfcomm/common-1f.d: Likewise.
* testsuite/ld-elfcomm/common-2.s: Likewise.
* testsuite/ld-elfcomm/common-2a.d: Likewise.
* testsuite/ld-elfcomm/common-2b.d: Likewise.
* testsuite/ld-elfcomm/common-2c.d: Likewise.
* testsuite/ld-elfcomm/common-2d.d: Likewise.
* testsuite/ld-elfcomm/common-2e.d: Likewise.
* testsuite/ld-elfcomm/common-2f.d: Likewise.
* testsuite/ld-elfcomm/common-3a.rd: Likewise.
* testsuite/ld-elfcomm/common-3b.rd: Likewise.
* testsuite/ld-i386/pr19645.d: Likewise.
* testsuite/ld-i386/pr19645.s: Likewise.
* testsuite/ld-x86-64/largecomm-1.s: Likewise.
* testsuite/ld-x86-64/largecomm-1a.d: Likewise.
* testsuite/ld-x86-64/largecomm-1b.d: Likewise.
* testsuite/ld-x86-64/largecomm-1c.d: Likewise.
* testsuite/ld-x86-64/largecomm-1d.d: Likewise.
* testsuite/ld-x86-64/largecomm-1e.d: Likewise.
* testsuite/ld-x86-64/largecomm-1f.d: Likewise.
* testsuite/ld-x86-64/pr19645.d: Likewise.
* testsuite/ld-x86-64/pr19645.s: Likewise.
* testsuite/ld-elfcomm/elfcomm.exp: Test --elf-stt-common=yes
with assembler.
(assembler_generates_commons): Removed.
Run -z common/-z nocommon tests. Run *.d tests.
* testsuite/ld-i386/i386.exp: Run pr19645.
* testsuite/ld-x86-64/x86-64.exp: Likewise.
* testsuite/ld-x86-64/dwarfreloc.exp: Test --elf-stt-common with
assembler. Test STT_COMMON with readelf.
2016-02-22 18:18:52 +01:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
/* Whether to change the leading character in symbol names. */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
static bfd_boolean change_leading_char = FALSE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
/* Whether to remove the leading character from global symbol names. */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
static bfd_boolean remove_leading_char = FALSE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2003-12-06 01:06:12 +01:00
|
|
|
|
/* Whether to permit wildcard in symbol comparison. */
|
2003-11-11 18:50:26 +01:00
|
|
|
|
static bfd_boolean wildcard = FALSE;
|
|
|
|
|
|
2006-06-23 18:23:09 +02:00
|
|
|
|
/* True if --localize-hidden is in effect. */
|
|
|
|
|
static bfd_boolean localize_hidden = FALSE;
|
|
|
|
|
|
2001-05-30 12:46:28 +02:00
|
|
|
|
/* List of symbols to strip, keep, localize, keep-global, weaken,
|
|
|
|
|
or redefine. */
|
2008-04-16 10:24:21 +02: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;
|
2017-04-05 18:22:47 +02:00
|
|
|
|
static htab_t redefine_specific_htab = NULL;
|
|
|
|
|
static htab_t redefine_specific_reverse_htab = NULL;
|
2015-10-21 16:16:35 +02:00
|
|
|
|
static struct addsym_node *add_sym_list = NULL, **add_sym_tail = &add_sym_list;
|
|
|
|
|
static int add_symbols = 0;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2018-09-17 17:50:42 +02:00
|
|
|
|
static char *strip_specific_buffer = NULL;
|
|
|
|
|
static char *strip_unneeded_buffer = NULL;
|
|
|
|
|
static char *keep_specific_buffer = NULL;
|
|
|
|
|
static char *localize_specific_buffer = NULL;
|
|
|
|
|
static char *globalize_specific_buffer = NULL;
|
|
|
|
|
static char *keepglobal_specific_buffer = NULL;
|
|
|
|
|
static char *weaken_specific_buffer = NULL;
|
|
|
|
|
|
2002-11-30 09:39:46 +01:00
|
|
|
|
/* If this is TRUE, we weaken global symbols (set BSF_WEAK). */
|
|
|
|
|
static bfd_boolean weaken = FALSE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2005-11-15 09:33:38 +01:00
|
|
|
|
/* If this is TRUE, we retain BSF_FILE symbols. */
|
|
|
|
|
static bfd_boolean keep_file_symbols = FALSE;
|
|
|
|
|
|
2002-12-13 14:19:44 +01: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-01 17:39:42 +01:00
|
|
|
|
/* True if --extract-symbol was passed on the command line. */
|
|
|
|
|
static bfd_boolean extract_symbol = FALSE;
|
|
|
|
|
|
2007-04-23 12:59:07 +02: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 11:47:44 +02: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
|
2015-10-21 16:16:35 +02:00
|
|
|
|
{
|
|
|
|
|
DISABLE,
|
|
|
|
|
ENABLE,
|
|
|
|
|
KEEP
|
|
|
|
|
};
|
2009-04-14 11:47:44 +02:00
|
|
|
|
|
|
|
|
|
/* 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 12:59:07 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
/* 150 isn't special; it's just an arbitrary non-ASCII char value. */
|
2003-07-23 19:34:03 +02:00
|
|
|
|
enum command_line_switch
|
2015-10-21 16:16:35 +02:00
|
|
|
|
{
|
|
|
|
|
OPTION_ADD_SECTION=150,
|
|
|
|
|
OPTION_ADD_GNU_DEBUGLINK,
|
|
|
|
|
OPTION_ADD_SYMBOL,
|
|
|
|
|
OPTION_ALT_MACH_CODE,
|
|
|
|
|
OPTION_CHANGE_ADDRESSES,
|
|
|
|
|
OPTION_CHANGE_LEADING_CHAR,
|
|
|
|
|
OPTION_CHANGE_SECTION_ADDRESS,
|
|
|
|
|
OPTION_CHANGE_SECTION_LMA,
|
|
|
|
|
OPTION_CHANGE_SECTION_VMA,
|
|
|
|
|
OPTION_CHANGE_START,
|
|
|
|
|
OPTION_CHANGE_WARNINGS,
|
|
|
|
|
OPTION_COMPRESS_DEBUG_SECTIONS,
|
|
|
|
|
OPTION_DEBUGGING,
|
|
|
|
|
OPTION_DECOMPRESS_DEBUG_SECTIONS,
|
|
|
|
|
OPTION_DUMP_SECTION,
|
Properly implement STT_COMMON
The BFD configure option, --enable-elf-stt-common, can't be to used to
verify STT_COMMON implementation with the normal binutils build. Instead,
this patch removes it from BFD. It adds --elf-stt-common=[no|yes] to ELF
assembler/objcopy and adds -z common/-z nocommon to ld.
A configure option, --enable-elf-stt-common, is added to gas to specify
whether ELF assembler should generate common symbols with the STT_COMMON
type by default.
Since BSF_KEEP_G is never used, it is renamed to BSF_ELF_COMMON for ELF
common symbols.
bfd/
PR ld/19645
* bfd.c (bfd): Change flags to 20 bits.
(BFD_CONVERT_ELF_COMMON): New.
(BFD_USE_ELF_STT_COMMON): Likewise.
(BFD_FLAGS_SAVED): Add BFD_CONVERT_ELF_COMMON and
BFD_USE_ELF_STT_COMMON.
(BFD_FLAGS_FOR_BFD_USE_MASK): Likewise.
* configure.ac: Remove --enable-elf-stt-common.
* elf.c (swap_out_syms): Choose STT_COMMON or STT_OBJECT for
common symbol depending on BFD_CONVERT_ELF_COMMON and
BFD_USE_ELF_STT_COMMON.
* elfcode.h (elf_slurp_symbol_table): Set BSF_ELF_COMMON for
STT_COMMON.
* elflink.c (bfd_elf_link_mark_dynamic_symbol): Also check
STT_COMMON.
(elf_link_convert_common_type): New function.
(elf_link_output_extsym): Choose STT_COMMON or STT_OBJECT for
common symbol depending on BFD_CONVERT_ELF_COMMON and
BFD_USE_ELF_STT_COMMON. Set sym.st_info after sym.st_shndx.
* elfxx-target.h (TARGET_BIG_SYM): Add BFD_CONVERT_ELF_COMMON
and BFD_USE_ELF_STT_COMMON to object_flags.
(TARGET_LITTLE_SYM): Likewise.
* syms.c (BSF_KEEP_G): Renamed to ...
(BSF_ELF_COMMON): This.
* bfd-in2.h: Regenerated.
* config.in: Likewise.
* configure: Likewise.
binutils/
PR ld/19645
* NEWS: Mention --elf-stt-common= for objcopy.
* doc/binutils.texi: Document --elf-stt-common= for objcopy.
* objcopy.c (do_elf_stt_common): New.
(command_line_switch): Add OPTION_ELF_STT_COMMON.
(copy_options): Add --elf-stt-common=.
(copy_usage): Add --elf-stt-common=.
(copy_object): Also check do_elf_stt_common for ELF targets.
(copy_file): Handle do_elf_stt_common.
(copy_main): Handle OPTION_ELF_STT_COMMON.
* readelf.c (apply_relocations): Support STT_COMMON.
* testsuite/binutils-all/common-1.s: New file.
* testsuite/binutils-all/common-1a.d: Likewise.
* testsuite/binutils-all/common-1b.d: Likewise.
* testsuite/binutils-all/common-1c.d: Likewise.
* testsuite/binutils-all/common-1d.d: Likewise.
* testsuite/binutils-all/common-1e.d: Likewise.
* testsuite/binutils-all/common-1f.d: Likewise.
* testsuite/binutils-all/common-2.s: Likewise.
* testsuite/binutils-all/common-2a.d: Likewise.
* testsuite/binutils-all/common-2b.d: Likewise.
* testsuite/binutils-all/common-2c.d: Likewise.
* testsuite/binutils-all/common-2d.d: Likewise.
* testsuite/binutils-all/common-2e.d: Likewise.
* testsuite/binutils-all/common-2f.d: Likewise.
* testsuite/binutils-all/objcopy.exp
(objcopy_test_elf_common_symbols): New proc.
Run objcopy_test_elf_common_symbols for ELF targets
gas/
PR ld/19645
* NEWS: Mention --enable-elf-stt-common and --elf-stt-common=
for ELF assemblers.
* as.c (flag_use_elf_stt_common): New.
(show_usage): Add --elf-stt-common=.
(option_values): Add OPTION_ELF_STT_COMMON.
(std_longopts): Add --elf-stt-common=.
(parse_args): Handle --elf-stt-common=.
* as.h (flag_use_elf_stt_common): New.
* config.in: Regenerated.
* configure: Likewise.
* configure.ac: Add --enable-elf-stt-common and define
DEFAULT_GENERATE_ELF_STT_COMMON.
* gas/write.c (write_object_file): Set BFD_CONVERT_ELF_COMMON
and BFD_USE_ELF_STT_COMMON if flag_use_elf_stt_common is set.
* doc/as.texinfo: Document --elf-stt-common=.
* testsuite/gas/elf/common3.s: New file.
* testsuite/gas/elf/common3a.d: Likewise.
* testsuite/gas/elf/common3b.d: Likewise.
* testsuite/gas/elf/common4.s: Likewise.
* testsuite/gas/elf/common4a.d: Likewise.
* testsuite/gas/elf/common4b.d: Likewise.
* testsuite/gas/i386/dw2-compress-3b.d: Likewise.
* testsuite/gas/i386/dw2-compressed-3b.d: Likewise.
* testsuite/gas/elf/elf.exp: Run common3a, common3b, common4a
and common4b.
* testsuite/gas/i386/dw2-compress-3.d: Renamed to ...
* testsuite/gas/i386/dw2-compress-3a.d: This. Pass
--elf-stt-common=no to as.
* testsuite/gas/i386/dw2-compressed-3.d: Renamed to ...
* testsuite/gas/i386/dw2-compressed-3a.d: This. Pass
--elf-stt-common=no to as.
* testsuite/gas/i386/i386.exp: Run dw2-compress-3a,
dw2-compress-3b, dw2-compressed-3a and dw2-compressed-3b instead
of dw2-compress-3 and dw2-compressed-3.
include/
PR ld/19645
* bfdlink.h (bfd_link_elf_stt_common): New enum.
(bfd_link_info): Add elf_stt_common.
ld/
PR ld/19645
* NEWS: Mention -z common/-z nocommon for ELF targets.
* emultempl/elf32.em (gld${EMULATION_NAME}_handle_option): Handle
-z common and -z nocommon.
* ld.texinfo: Document -z common/-z nocommon.
* lexsup.c (elf_shlib_list_options): Add -z common/-z nocommon.
* testsuite/ld-elf/tls_common.exp: Test --elf-stt-common=no and
--elf-stt-common=yes with assembler.
* testsuite/ld-elfcomm/common-1.s: New file.
* testsuite/ld-elfcomm/common-1a.d: Likewise.
* testsuite/ld-elfcomm/common-1b.d: Likewise.
* testsuite/ld-elfcomm/common-1c.d: Likewise.
* testsuite/ld-elfcomm/common-1d.d: Likewise.
* testsuite/ld-elfcomm/common-1e.d: Likewise.
* testsuite/ld-elfcomm/common-1f.d: Likewise.
* testsuite/ld-elfcomm/common-2.s: Likewise.
* testsuite/ld-elfcomm/common-2a.d: Likewise.
* testsuite/ld-elfcomm/common-2b.d: Likewise.
* testsuite/ld-elfcomm/common-2c.d: Likewise.
* testsuite/ld-elfcomm/common-2d.d: Likewise.
* testsuite/ld-elfcomm/common-2e.d: Likewise.
* testsuite/ld-elfcomm/common-2f.d: Likewise.
* testsuite/ld-elfcomm/common-3a.rd: Likewise.
* testsuite/ld-elfcomm/common-3b.rd: Likewise.
* testsuite/ld-i386/pr19645.d: Likewise.
* testsuite/ld-i386/pr19645.s: Likewise.
* testsuite/ld-x86-64/largecomm-1.s: Likewise.
* testsuite/ld-x86-64/largecomm-1a.d: Likewise.
* testsuite/ld-x86-64/largecomm-1b.d: Likewise.
* testsuite/ld-x86-64/largecomm-1c.d: Likewise.
* testsuite/ld-x86-64/largecomm-1d.d: Likewise.
* testsuite/ld-x86-64/largecomm-1e.d: Likewise.
* testsuite/ld-x86-64/largecomm-1f.d: Likewise.
* testsuite/ld-x86-64/pr19645.d: Likewise.
* testsuite/ld-x86-64/pr19645.s: Likewise.
* testsuite/ld-elfcomm/elfcomm.exp: Test --elf-stt-common=yes
with assembler.
(assembler_generates_commons): Removed.
Run -z common/-z nocommon tests. Run *.d tests.
* testsuite/ld-i386/i386.exp: Run pr19645.
* testsuite/ld-x86-64/x86-64.exp: Likewise.
* testsuite/ld-x86-64/dwarfreloc.exp: Test --elf-stt-common with
assembler. Test STT_COMMON with readelf.
2016-02-22 18:18:52 +01:00
|
|
|
|
OPTION_ELF_STT_COMMON,
|
2015-10-21 16:16:35 +02:00
|
|
|
|
OPTION_EXTRACT_DWO,
|
|
|
|
|
OPTION_EXTRACT_SYMBOL,
|
|
|
|
|
OPTION_FILE_ALIGNMENT,
|
|
|
|
|
OPTION_FORMATS_INFO,
|
|
|
|
|
OPTION_GAP_FILL,
|
|
|
|
|
OPTION_GLOBALIZE_SYMBOL,
|
|
|
|
|
OPTION_GLOBALIZE_SYMBOLS,
|
|
|
|
|
OPTION_HEAP,
|
|
|
|
|
OPTION_IMAGE_BASE,
|
|
|
|
|
OPTION_IMPURE,
|
|
|
|
|
OPTION_INTERLEAVE_WIDTH,
|
|
|
|
|
OPTION_KEEPGLOBAL_SYMBOLS,
|
|
|
|
|
OPTION_KEEP_FILE_SYMBOLS,
|
|
|
|
|
OPTION_KEEP_SYMBOLS,
|
|
|
|
|
OPTION_LOCALIZE_HIDDEN,
|
|
|
|
|
OPTION_LOCALIZE_SYMBOLS,
|
|
|
|
|
OPTION_LONG_SECTION_NAMES,
|
2017-03-01 12:09:46 +01:00
|
|
|
|
OPTION_MERGE_NOTES,
|
2017-04-13 15:50:56 +02:00
|
|
|
|
OPTION_NO_MERGE_NOTES,
|
2015-10-21 16:16:35 +02:00
|
|
|
|
OPTION_NO_CHANGE_WARNINGS,
|
|
|
|
|
OPTION_ONLY_KEEP_DEBUG,
|
|
|
|
|
OPTION_PAD_TO,
|
|
|
|
|
OPTION_PREFIX_ALLOC_SECTIONS,
|
|
|
|
|
OPTION_PREFIX_SECTIONS,
|
|
|
|
|
OPTION_PREFIX_SYMBOLS,
|
|
|
|
|
OPTION_PURE,
|
|
|
|
|
OPTION_READONLY_TEXT,
|
|
|
|
|
OPTION_REDEFINE_SYM,
|
|
|
|
|
OPTION_REDEFINE_SYMS,
|
|
|
|
|
OPTION_REMOVE_LEADING_CHAR,
|
objcopy/strip: Add option --remove-relocations=SECTIONPATTERN
The objcopy and strip tools make use of the bfd library to manipulate
the state of the input file (to produce an output file). Within the
input file (for ELF at least), relocations are held within a section,
and so, if the user wanted to remove the relocations, but keep the
section to which the relocations would have been applied, it is tempting
to think that specifying the name of a relocation section to objcopy's
--remove-section option might do what you want, for example:
objcopy --remove-section=.rela.text input.elf output.elf
However, this does not work. The reason is that when the input file is
loaded, relocations are not managed as sections, but are, instead,
loaded as data associated with the section to which the relocations
would be applied. In our example above the relocations in '.rela.text'
are held as data on the section '.text' once 'input.elf' is loaded.
One task that objcopy and strip do is copy the relocations from the
input file to the output file if the section is also being copied from
the input file to the output file.
This commit adds a new command line option for objcopy and strip,
--remove-relocations, which can be used to remove the relocations, while
keeping the section that the relocations would have been applied to, for
example:
objcopy --remove-relocations=.text input.elf output.elf
in this case the section '.text' will appear in both 'input.elf' and
'output.elf', but any relocations in 'input.elf' that apply to '.text'
will not be present in 'output.elf'.
I have also added a special case to the handling of --remove-section
that spots if a user tries to remove a relocation section (currently
this is done by spotting the '.rela.' or '.rel.' prefix) and forwards
the request to --remove-relocations.
As with --remove-section and --only-section the --remove-relocations
option supports the '!' prefix on the section-patterns it takes to allow
for sections to be specifically not matched.
There are tests for all the new functionality.
binutils/ChangeLog:
* doc/binutils.texi (objcopy): Document 'remove-relocations'.
(strip): Likewise.
* objcopy.c (SECTION_CONTEXT_REMOVE_RELOCS): Define.
(enum command_line_switch): Add 'OPTION_REMOVE_RELOCS'.
(struct option strip_options): Add 'remove-relocations'.
(struct option copy_options): Likewise.
(copy_usage): Likewise.
(strip_usage): Likewise.
(handle_remove_relocations_option): New function.
(discard_relocations): New function.
(handle_remove_section_option): New function.
(copy_relocations_in_section): Use discard_relocations.
(strip_main): Use handle_remove_section_option for
'remove-section', and handle 'remove-relocations' option.
(copy_main): Likewise.
* testsuite/binutils-all/objcopy.exp: Run new tests.
* testsuite/binutils-all/remove-relocs-01.d: New file.
* testsuite/binutils-all/remove-relocs-01.s: New file.
* testsuite/binutils-all/remove-relocs-02.d: New file.
* testsuite/binutils-all/remove-relocs-03.d: New file.
* testsuite/binutils-all/remove-relocs-04.d: New file.
* testsuite/binutils-all/remove-relocs-05.d: New file.
* testsuite/binutils-all/remove-relocs-06.d: New file.
2015-08-21 21:08:26 +02:00
|
|
|
|
OPTION_REMOVE_RELOCS,
|
2015-10-21 16:16:35 +02:00
|
|
|
|
OPTION_RENAME_SECTION,
|
|
|
|
|
OPTION_REVERSE_BYTES,
|
|
|
|
|
OPTION_SECTION_ALIGNMENT,
|
|
|
|
|
OPTION_SET_SECTION_FLAGS,
|
|
|
|
|
OPTION_SET_START,
|
|
|
|
|
OPTION_SREC_FORCES3,
|
|
|
|
|
OPTION_SREC_LEN,
|
|
|
|
|
OPTION_STACK,
|
|
|
|
|
OPTION_STRIP_DWO,
|
|
|
|
|
OPTION_STRIP_SYMBOLS,
|
|
|
|
|
OPTION_STRIP_UNNEEDED,
|
|
|
|
|
OPTION_STRIP_UNNEEDED_SYMBOL,
|
|
|
|
|
OPTION_STRIP_UNNEEDED_SYMBOLS,
|
|
|
|
|
OPTION_SUBSYSTEM,
|
|
|
|
|
OPTION_UPDATE_SECTION,
|
|
|
|
|
OPTION_WEAKEN,
|
|
|
|
|
OPTION_WEAKEN_SYMBOLS,
|
|
|
|
|
OPTION_WRITABLE_TEXT
|
|
|
|
|
};
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
/* Options to handle if running as "strip". */
|
|
|
|
|
|
|
|
|
|
static struct option strip_options[] =
|
|
|
|
|
{
|
2013-01-07 18:40:59 +01:00
|
|
|
|
{"disable-deterministic-archives", no_argument, 0, 'U'},
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{"discard-all", no_argument, 0, 'x'},
|
|
|
|
|
{"discard-locals", no_argument, 0, 'X'},
|
2012-04-25 19:50:14 +02:00
|
|
|
|
{"enable-deterministic-archives", no_argument, 0, 'D'},
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{"format", required_argument, 0, 'F'}, /* Obsolete */
|
|
|
|
|
{"help", no_argument, 0, 'h'},
|
2003-03-24 17:11:46 +01:00
|
|
|
|
{"info", no_argument, 0, OPTION_FORMATS_INFO},
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{"input-format", required_argument, 0, 'I'}, /* Obsolete */
|
|
|
|
|
{"input-target", required_argument, 0, 'I'},
|
2005-11-15 09:33:38 +01:00
|
|
|
|
{"keep-file-symbols", no_argument, 0, OPTION_KEEP_FILE_SYMBOLS},
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{"keep-symbol", required_argument, 0, 'K'},
|
2017-04-13 15:50:56 +02:00
|
|
|
|
{"merge-notes", no_argument, 0, 'M'},
|
|
|
|
|
{"no-merge-notes", no_argument, 0, OPTION_NO_MERGE_NOTES},
|
2003-06-26 10:14:10 +02:00
|
|
|
|
{"only-keep-debug", no_argument, 0, OPTION_ONLY_KEEP_DEBUG},
|
2015-10-21 16:16:35 +02:00
|
|
|
|
{"output-file", required_argument, 0, 'o'},
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{"output-format", required_argument, 0, 'O'}, /* Obsolete */
|
|
|
|
|
{"output-target", required_argument, 0, 'O'},
|
|
|
|
|
{"preserve-dates", no_argument, 0, 'p'},
|
|
|
|
|
{"remove-section", required_argument, 0, 'R'},
|
objcopy/strip: Add option --remove-relocations=SECTIONPATTERN
The objcopy and strip tools make use of the bfd library to manipulate
the state of the input file (to produce an output file). Within the
input file (for ELF at least), relocations are held within a section,
and so, if the user wanted to remove the relocations, but keep the
section to which the relocations would have been applied, it is tempting
to think that specifying the name of a relocation section to objcopy's
--remove-section option might do what you want, for example:
objcopy --remove-section=.rela.text input.elf output.elf
However, this does not work. The reason is that when the input file is
loaded, relocations are not managed as sections, but are, instead,
loaded as data associated with the section to which the relocations
would be applied. In our example above the relocations in '.rela.text'
are held as data on the section '.text' once 'input.elf' is loaded.
One task that objcopy and strip do is copy the relocations from the
input file to the output file if the section is also being copied from
the input file to the output file.
This commit adds a new command line option for objcopy and strip,
--remove-relocations, which can be used to remove the relocations, while
keeping the section that the relocations would have been applied to, for
example:
objcopy --remove-relocations=.text input.elf output.elf
in this case the section '.text' will appear in both 'input.elf' and
'output.elf', but any relocations in 'input.elf' that apply to '.text'
will not be present in 'output.elf'.
I have also added a special case to the handling of --remove-section
that spots if a user tries to remove a relocation section (currently
this is done by spotting the '.rela.' or '.rel.' prefix) and forwards
the request to --remove-relocations.
As with --remove-section and --only-section the --remove-relocations
option supports the '!' prefix on the section-patterns it takes to allow
for sections to be specifically not matched.
There are tests for all the new functionality.
binutils/ChangeLog:
* doc/binutils.texi (objcopy): Document 'remove-relocations'.
(strip): Likewise.
* objcopy.c (SECTION_CONTEXT_REMOVE_RELOCS): Define.
(enum command_line_switch): Add 'OPTION_REMOVE_RELOCS'.
(struct option strip_options): Add 'remove-relocations'.
(struct option copy_options): Likewise.
(copy_usage): Likewise.
(strip_usage): Likewise.
(handle_remove_relocations_option): New function.
(discard_relocations): New function.
(handle_remove_section_option): New function.
(copy_relocations_in_section): Use discard_relocations.
(strip_main): Use handle_remove_section_option for
'remove-section', and handle 'remove-relocations' option.
(copy_main): Likewise.
* testsuite/binutils-all/objcopy.exp: Run new tests.
* testsuite/binutils-all/remove-relocs-01.d: New file.
* testsuite/binutils-all/remove-relocs-01.s: New file.
* testsuite/binutils-all/remove-relocs-02.d: New file.
* testsuite/binutils-all/remove-relocs-03.d: New file.
* testsuite/binutils-all/remove-relocs-04.d: New file.
* testsuite/binutils-all/remove-relocs-05.d: New file.
* testsuite/binutils-all/remove-relocs-06.d: New file.
2015-08-21 21:08:26 +02:00
|
|
|
|
{"remove-relocations", required_argument, 0, OPTION_REMOVE_RELOCS},
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{"strip-all", no_argument, 0, 's'},
|
|
|
|
|
{"strip-debug", no_argument, 0, 'S'},
|
2012-05-08 19:49:36 +02:00
|
|
|
|
{"strip-dwo", no_argument, 0, OPTION_STRIP_DWO},
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{"strip-symbol", required_argument, 0, 'N'},
|
2015-10-21 16:16:35 +02:00
|
|
|
|
{"strip-unneeded", no_argument, 0, OPTION_STRIP_UNNEEDED},
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{"target", required_argument, 0, 'F'},
|
|
|
|
|
{"verbose", no_argument, 0, 'v'},
|
|
|
|
|
{"version", no_argument, 0, 'V'},
|
2003-11-11 18:50:26 +01:00
|
|
|
|
{"wildcard", no_argument, 0, 'w'},
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{0, no_argument, 0, 0}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Options to handle if running as "objcopy". */
|
|
|
|
|
|
|
|
|
|
static struct option copy_options[] =
|
|
|
|
|
{
|
2003-06-12 09:23:31 +02:00
|
|
|
|
{"add-gnu-debuglink", required_argument, 0, OPTION_ADD_GNU_DEBUGLINK},
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{"add-section", required_argument, 0, OPTION_ADD_SECTION},
|
2015-10-21 16:16:35 +02:00
|
|
|
|
{"add-symbol", required_argument, 0, OPTION_ADD_SYMBOL},
|
|
|
|
|
{"adjust-section-vma", required_argument, 0, OPTION_CHANGE_SECTION_ADDRESS},
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{"adjust-start", required_argument, 0, OPTION_CHANGE_START},
|
|
|
|
|
{"adjust-vma", required_argument, 0, OPTION_CHANGE_ADDRESSES},
|
|
|
|
|
{"adjust-warnings", no_argument, 0, OPTION_CHANGE_WARNINGS},
|
2002-12-13 14:19:44 +01:00
|
|
|
|
{"alt-machine-code", required_argument, 0, OPTION_ALT_MACH_CODE},
|
2001-03-13 01:08:35 +01:00
|
|
|
|
{"binary-architecture", required_argument, 0, 'B'},
|
1999-05-03 09:29:11 +02: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},
|
2015-04-08 16:53:54 +02:00
|
|
|
|
{"compress-debug-sections", optional_argument, 0, OPTION_COMPRESS_DEBUG_SECTIONS},
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{"debugging", no_argument, 0, OPTION_DEBUGGING},
|
2010-10-29 14:10:39 +02:00
|
|
|
|
{"decompress-debug-sections", no_argument, 0, OPTION_DECOMPRESS_DEBUG_SECTIONS},
|
2013-01-07 18:40:59 +01:00
|
|
|
|
{"disable-deterministic-archives", no_argument, 0, 'U'},
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{"discard-all", no_argument, 0, 'x'},
|
|
|
|
|
{"discard-locals", no_argument, 0, 'X'},
|
2013-12-31 10:52:24 +01:00
|
|
|
|
{"dump-section", required_argument, 0, OPTION_DUMP_SECTION},
|
Properly implement STT_COMMON
The BFD configure option, --enable-elf-stt-common, can't be to used to
verify STT_COMMON implementation with the normal binutils build. Instead,
this patch removes it from BFD. It adds --elf-stt-common=[no|yes] to ELF
assembler/objcopy and adds -z common/-z nocommon to ld.
A configure option, --enable-elf-stt-common, is added to gas to specify
whether ELF assembler should generate common symbols with the STT_COMMON
type by default.
Since BSF_KEEP_G is never used, it is renamed to BSF_ELF_COMMON for ELF
common symbols.
bfd/
PR ld/19645
* bfd.c (bfd): Change flags to 20 bits.
(BFD_CONVERT_ELF_COMMON): New.
(BFD_USE_ELF_STT_COMMON): Likewise.
(BFD_FLAGS_SAVED): Add BFD_CONVERT_ELF_COMMON and
BFD_USE_ELF_STT_COMMON.
(BFD_FLAGS_FOR_BFD_USE_MASK): Likewise.
* configure.ac: Remove --enable-elf-stt-common.
* elf.c (swap_out_syms): Choose STT_COMMON or STT_OBJECT for
common symbol depending on BFD_CONVERT_ELF_COMMON and
BFD_USE_ELF_STT_COMMON.
* elfcode.h (elf_slurp_symbol_table): Set BSF_ELF_COMMON for
STT_COMMON.
* elflink.c (bfd_elf_link_mark_dynamic_symbol): Also check
STT_COMMON.
(elf_link_convert_common_type): New function.
(elf_link_output_extsym): Choose STT_COMMON or STT_OBJECT for
common symbol depending on BFD_CONVERT_ELF_COMMON and
BFD_USE_ELF_STT_COMMON. Set sym.st_info after sym.st_shndx.
* elfxx-target.h (TARGET_BIG_SYM): Add BFD_CONVERT_ELF_COMMON
and BFD_USE_ELF_STT_COMMON to object_flags.
(TARGET_LITTLE_SYM): Likewise.
* syms.c (BSF_KEEP_G): Renamed to ...
(BSF_ELF_COMMON): This.
* bfd-in2.h: Regenerated.
* config.in: Likewise.
* configure: Likewise.
binutils/
PR ld/19645
* NEWS: Mention --elf-stt-common= for objcopy.
* doc/binutils.texi: Document --elf-stt-common= for objcopy.
* objcopy.c (do_elf_stt_common): New.
(command_line_switch): Add OPTION_ELF_STT_COMMON.
(copy_options): Add --elf-stt-common=.
(copy_usage): Add --elf-stt-common=.
(copy_object): Also check do_elf_stt_common for ELF targets.
(copy_file): Handle do_elf_stt_common.
(copy_main): Handle OPTION_ELF_STT_COMMON.
* readelf.c (apply_relocations): Support STT_COMMON.
* testsuite/binutils-all/common-1.s: New file.
* testsuite/binutils-all/common-1a.d: Likewise.
* testsuite/binutils-all/common-1b.d: Likewise.
* testsuite/binutils-all/common-1c.d: Likewise.
* testsuite/binutils-all/common-1d.d: Likewise.
* testsuite/binutils-all/common-1e.d: Likewise.
* testsuite/binutils-all/common-1f.d: Likewise.
* testsuite/binutils-all/common-2.s: Likewise.
* testsuite/binutils-all/common-2a.d: Likewise.
* testsuite/binutils-all/common-2b.d: Likewise.
* testsuite/binutils-all/common-2c.d: Likewise.
* testsuite/binutils-all/common-2d.d: Likewise.
* testsuite/binutils-all/common-2e.d: Likewise.
* testsuite/binutils-all/common-2f.d: Likewise.
* testsuite/binutils-all/objcopy.exp
(objcopy_test_elf_common_symbols): New proc.
Run objcopy_test_elf_common_symbols for ELF targets
gas/
PR ld/19645
* NEWS: Mention --enable-elf-stt-common and --elf-stt-common=
for ELF assemblers.
* as.c (flag_use_elf_stt_common): New.
(show_usage): Add --elf-stt-common=.
(option_values): Add OPTION_ELF_STT_COMMON.
(std_longopts): Add --elf-stt-common=.
(parse_args): Handle --elf-stt-common=.
* as.h (flag_use_elf_stt_common): New.
* config.in: Regenerated.
* configure: Likewise.
* configure.ac: Add --enable-elf-stt-common and define
DEFAULT_GENERATE_ELF_STT_COMMON.
* gas/write.c (write_object_file): Set BFD_CONVERT_ELF_COMMON
and BFD_USE_ELF_STT_COMMON if flag_use_elf_stt_common is set.
* doc/as.texinfo: Document --elf-stt-common=.
* testsuite/gas/elf/common3.s: New file.
* testsuite/gas/elf/common3a.d: Likewise.
* testsuite/gas/elf/common3b.d: Likewise.
* testsuite/gas/elf/common4.s: Likewise.
* testsuite/gas/elf/common4a.d: Likewise.
* testsuite/gas/elf/common4b.d: Likewise.
* testsuite/gas/i386/dw2-compress-3b.d: Likewise.
* testsuite/gas/i386/dw2-compressed-3b.d: Likewise.
* testsuite/gas/elf/elf.exp: Run common3a, common3b, common4a
and common4b.
* testsuite/gas/i386/dw2-compress-3.d: Renamed to ...
* testsuite/gas/i386/dw2-compress-3a.d: This. Pass
--elf-stt-common=no to as.
* testsuite/gas/i386/dw2-compressed-3.d: Renamed to ...
* testsuite/gas/i386/dw2-compressed-3a.d: This. Pass
--elf-stt-common=no to as.
* testsuite/gas/i386/i386.exp: Run dw2-compress-3a,
dw2-compress-3b, dw2-compressed-3a and dw2-compressed-3b instead
of dw2-compress-3 and dw2-compressed-3.
include/
PR ld/19645
* bfdlink.h (bfd_link_elf_stt_common): New enum.
(bfd_link_info): Add elf_stt_common.
ld/
PR ld/19645
* NEWS: Mention -z common/-z nocommon for ELF targets.
* emultempl/elf32.em (gld${EMULATION_NAME}_handle_option): Handle
-z common and -z nocommon.
* ld.texinfo: Document -z common/-z nocommon.
* lexsup.c (elf_shlib_list_options): Add -z common/-z nocommon.
* testsuite/ld-elf/tls_common.exp: Test --elf-stt-common=no and
--elf-stt-common=yes with assembler.
* testsuite/ld-elfcomm/common-1.s: New file.
* testsuite/ld-elfcomm/common-1a.d: Likewise.
* testsuite/ld-elfcomm/common-1b.d: Likewise.
* testsuite/ld-elfcomm/common-1c.d: Likewise.
* testsuite/ld-elfcomm/common-1d.d: Likewise.
* testsuite/ld-elfcomm/common-1e.d: Likewise.
* testsuite/ld-elfcomm/common-1f.d: Likewise.
* testsuite/ld-elfcomm/common-2.s: Likewise.
* testsuite/ld-elfcomm/common-2a.d: Likewise.
* testsuite/ld-elfcomm/common-2b.d: Likewise.
* testsuite/ld-elfcomm/common-2c.d: Likewise.
* testsuite/ld-elfcomm/common-2d.d: Likewise.
* testsuite/ld-elfcomm/common-2e.d: Likewise.
* testsuite/ld-elfcomm/common-2f.d: Likewise.
* testsuite/ld-elfcomm/common-3a.rd: Likewise.
* testsuite/ld-elfcomm/common-3b.rd: Likewise.
* testsuite/ld-i386/pr19645.d: Likewise.
* testsuite/ld-i386/pr19645.s: Likewise.
* testsuite/ld-x86-64/largecomm-1.s: Likewise.
* testsuite/ld-x86-64/largecomm-1a.d: Likewise.
* testsuite/ld-x86-64/largecomm-1b.d: Likewise.
* testsuite/ld-x86-64/largecomm-1c.d: Likewise.
* testsuite/ld-x86-64/largecomm-1d.d: Likewise.
* testsuite/ld-x86-64/largecomm-1e.d: Likewise.
* testsuite/ld-x86-64/largecomm-1f.d: Likewise.
* testsuite/ld-x86-64/pr19645.d: Likewise.
* testsuite/ld-x86-64/pr19645.s: Likewise.
* testsuite/ld-elfcomm/elfcomm.exp: Test --elf-stt-common=yes
with assembler.
(assembler_generates_commons): Removed.
Run -z common/-z nocommon tests. Run *.d tests.
* testsuite/ld-i386/i386.exp: Run pr19645.
* testsuite/ld-x86-64/x86-64.exp: Likewise.
* testsuite/ld-x86-64/dwarfreloc.exp: Test --elf-stt-common with
assembler. Test STT_COMMON with readelf.
2016-02-22 18:18:52 +01:00
|
|
|
|
{"elf-stt-common", required_argument, 0, OPTION_ELF_STT_COMMON},
|
2012-04-25 19:50:14 +02:00
|
|
|
|
{"enable-deterministic-archives", no_argument, 0, 'D'},
|
2012-05-08 19:49:36 +02:00
|
|
|
|
{"extract-dwo", no_argument, 0, OPTION_EXTRACT_DWO},
|
2007-03-01 17:39:42 +01:00
|
|
|
|
{"extract-symbol", no_argument, 0, OPTION_EXTRACT_SYMBOL},
|
2015-10-21 16:16:35 +02:00
|
|
|
|
{"file-alignment", required_argument, 0, OPTION_FILE_ALIGNMENT},
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{"format", required_argument, 0, 'F'}, /* Obsolete */
|
|
|
|
|
{"gap-fill", required_argument, 0, OPTION_GAP_FILL},
|
2005-03-15 18:45:19 +01:00
|
|
|
|
{"globalize-symbol", required_argument, 0, OPTION_GLOBALIZE_SYMBOL},
|
|
|
|
|
{"globalize-symbols", required_argument, 0, OPTION_GLOBALIZE_SYMBOLS},
|
2015-10-21 16:16:35 +02:00
|
|
|
|
{"heap", required_argument, 0, OPTION_HEAP},
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{"help", no_argument, 0, 'h'},
|
2015-10-21 16:16:35 +02:00
|
|
|
|
{"image-base", required_argument, 0 , OPTION_IMAGE_BASE},
|
2003-12-23 14:01:11 +01:00
|
|
|
|
{"impure", no_argument, 0, OPTION_IMPURE},
|
2003-03-24 17:11:46 +01:00
|
|
|
|
{"info", no_argument, 0, OPTION_FORMATS_INFO},
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{"input-format", required_argument, 0, 'I'}, /* Obsolete */
|
|
|
|
|
{"input-target", required_argument, 0, 'I'},
|
2010-09-10 14:11:28 +02:00
|
|
|
|
{"interleave", optional_argument, 0, 'i'},
|
|
|
|
|
{"interleave-width", required_argument, 0, OPTION_INTERLEAVE_WIDTH},
|
2005-11-15 09:33:38 +01:00
|
|
|
|
{"keep-file-symbols", no_argument, 0, OPTION_KEEP_FILE_SYMBOLS},
|
2002-12-13 14:19:44 +01:00
|
|
|
|
{"keep-global-symbol", required_argument, 0, 'G'},
|
|
|
|
|
{"keep-global-symbols", required_argument, 0, OPTION_KEEPGLOBAL_SYMBOLS},
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{"keep-symbol", required_argument, 0, 'K'},
|
2002-12-13 14:19:44 +01:00
|
|
|
|
{"keep-symbols", required_argument, 0, OPTION_KEEP_SYMBOLS},
|
2006-06-23 18:23:09 +02:00
|
|
|
|
{"localize-hidden", no_argument, 0, OPTION_LOCALIZE_HIDDEN},
|
2002-12-13 14:19:44 +01:00
|
|
|
|
{"localize-symbol", required_argument, 0, 'L'},
|
|
|
|
|
{"localize-symbols", required_argument, 0, OPTION_LOCALIZE_SYMBOLS},
|
2009-04-14 11:47:44 +02:00
|
|
|
|
{"long-section-names", required_argument, 0, OPTION_LONG_SECTION_NAMES},
|
2017-03-01 12:09:46 +01:00
|
|
|
|
{"merge-notes", no_argument, 0, 'M'},
|
2017-04-13 15:50:56 +02:00
|
|
|
|
{"no-merge-notes", no_argument, 0, OPTION_NO_MERGE_NOTES},
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{"no-adjust-warnings", no_argument, 0, OPTION_NO_CHANGE_WARNINGS},
|
|
|
|
|
{"no-change-warnings", no_argument, 0, OPTION_NO_CHANGE_WARNINGS},
|
2003-06-26 10:14:10 +02:00
|
|
|
|
{"only-keep-debug", no_argument, 0, OPTION_ONLY_KEEP_DEBUG},
|
2002-12-13 14:19:44 +01:00
|
|
|
|
{"only-section", required_argument, 0, 'j'},
|
1999-05-03 09:29:11 +02: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 14:19:44 +01:00
|
|
|
|
{"prefix-alloc-sections", required_argument, 0, OPTION_PREFIX_ALLOC_SECTIONS},
|
2015-10-21 16:16:35 +02:00
|
|
|
|
{"prefix-sections", required_argument, 0, OPTION_PREFIX_SECTIONS},
|
|
|
|
|
{"prefix-symbols", required_argument, 0, OPTION_PREFIX_SYMBOLS},
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{"preserve-dates", no_argument, 0, 'p'},
|
2003-12-23 14:01:11 +01:00
|
|
|
|
{"pure", no_argument, 0, OPTION_PURE},
|
|
|
|
|
{"readonly-text", no_argument, 0, OPTION_READONLY_TEXT},
|
2002-12-13 14:19:44 +01:00
|
|
|
|
{"redefine-sym", required_argument, 0, OPTION_REDEFINE_SYM},
|
2003-06-02 16:45:13 +02:00
|
|
|
|
{"redefine-syms", required_argument, 0, OPTION_REDEFINE_SYMS},
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{"remove-leading-char", no_argument, 0, OPTION_REMOVE_LEADING_CHAR},
|
|
|
|
|
{"remove-section", required_argument, 0, 'R'},
|
objcopy/strip: Add option --remove-relocations=SECTIONPATTERN
The objcopy and strip tools make use of the bfd library to manipulate
the state of the input file (to produce an output file). Within the
input file (for ELF at least), relocations are held within a section,
and so, if the user wanted to remove the relocations, but keep the
section to which the relocations would have been applied, it is tempting
to think that specifying the name of a relocation section to objcopy's
--remove-section option might do what you want, for example:
objcopy --remove-section=.rela.text input.elf output.elf
However, this does not work. The reason is that when the input file is
loaded, relocations are not managed as sections, but are, instead,
loaded as data associated with the section to which the relocations
would be applied. In our example above the relocations in '.rela.text'
are held as data on the section '.text' once 'input.elf' is loaded.
One task that objcopy and strip do is copy the relocations from the
input file to the output file if the section is also being copied from
the input file to the output file.
This commit adds a new command line option for objcopy and strip,
--remove-relocations, which can be used to remove the relocations, while
keeping the section that the relocations would have been applied to, for
example:
objcopy --remove-relocations=.text input.elf output.elf
in this case the section '.text' will appear in both 'input.elf' and
'output.elf', but any relocations in 'input.elf' that apply to '.text'
will not be present in 'output.elf'.
I have also added a special case to the handling of --remove-section
that spots if a user tries to remove a relocation section (currently
this is done by spotting the '.rela.' or '.rel.' prefix) and forwards
the request to --remove-relocations.
As with --remove-section and --only-section the --remove-relocations
option supports the '!' prefix on the section-patterns it takes to allow
for sections to be specifically not matched.
There are tests for all the new functionality.
binutils/ChangeLog:
* doc/binutils.texi (objcopy): Document 'remove-relocations'.
(strip): Likewise.
* objcopy.c (SECTION_CONTEXT_REMOVE_RELOCS): Define.
(enum command_line_switch): Add 'OPTION_REMOVE_RELOCS'.
(struct option strip_options): Add 'remove-relocations'.
(struct option copy_options): Likewise.
(copy_usage): Likewise.
(strip_usage): Likewise.
(handle_remove_relocations_option): New function.
(discard_relocations): New function.
(handle_remove_section_option): New function.
(copy_relocations_in_section): Use discard_relocations.
(strip_main): Use handle_remove_section_option for
'remove-section', and handle 'remove-relocations' option.
(copy_main): Likewise.
* testsuite/binutils-all/objcopy.exp: Run new tests.
* testsuite/binutils-all/remove-relocs-01.d: New file.
* testsuite/binutils-all/remove-relocs-01.s: New file.
* testsuite/binutils-all/remove-relocs-02.d: New file.
* testsuite/binutils-all/remove-relocs-03.d: New file.
* testsuite/binutils-all/remove-relocs-04.d: New file.
* testsuite/binutils-all/remove-relocs-05.d: New file.
* testsuite/binutils-all/remove-relocs-06.d: New file.
2015-08-21 21:08:26 +02:00
|
|
|
|
{"remove-relocations", required_argument, 0, OPTION_REMOVE_RELOCS},
|
2001-07-31 15:49:39 +02:00
|
|
|
|
{"rename-section", required_argument, 0, OPTION_RENAME_SECTION},
|
2007-04-23 12:59:07 +02:00
|
|
|
|
{"reverse-bytes", required_argument, 0, OPTION_REVERSE_BYTES},
|
2015-10-21 16:16:35 +02:00
|
|
|
|
{"section-alignment", required_argument, 0, OPTION_SECTION_ALIGNMENT},
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{"set-section-flags", required_argument, 0, OPTION_SET_SECTION_FLAGS},
|
|
|
|
|
{"set-start", required_argument, 0, OPTION_SET_START},
|
2002-12-13 14:19:44 +01:00
|
|
|
|
{"srec-forceS3", no_argument, 0, OPTION_SREC_FORCES3},
|
2015-10-21 16:16:35 +02:00
|
|
|
|
{"srec-len", required_argument, 0, OPTION_SREC_LEN},
|
|
|
|
|
{"stack", required_argument, 0, OPTION_STACK},
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{"strip-all", no_argument, 0, 'S'},
|
|
|
|
|
{"strip-debug", no_argument, 0, 'g'},
|
2012-05-08 19:49:36 +02:00
|
|
|
|
{"strip-dwo", no_argument, 0, OPTION_STRIP_DWO},
|
2015-10-21 16:16:35 +02:00
|
|
|
|
{"strip-symbol", required_argument, 0, 'N'},
|
|
|
|
|
{"strip-symbols", required_argument, 0, OPTION_STRIP_SYMBOLS},
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{"strip-unneeded", no_argument, 0, OPTION_STRIP_UNNEEDED},
|
2004-12-16 14:16:33 +01:00
|
|
|
|
{"strip-unneeded-symbol", required_argument, 0, OPTION_STRIP_UNNEEDED_SYMBOL},
|
|
|
|
|
{"strip-unneeded-symbols", required_argument, 0, OPTION_STRIP_UNNEEDED_SYMBOLS},
|
2015-10-21 16:16:35 +02:00
|
|
|
|
{"subsystem", required_argument, 0, OPTION_SUBSYSTEM},
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{"target", required_argument, 0, 'F'},
|
2015-10-21 16:16:35 +02:00
|
|
|
|
{"update-section", required_argument, 0, OPTION_UPDATE_SECTION},
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{"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 12:46:28 +02:00
|
|
|
|
{"weaken-symbols", required_argument, 0, OPTION_WEAKEN_SYMBOLS},
|
2003-11-11 18:50:26 +01:00
|
|
|
|
{"wildcard", no_argument, 0, 'w'},
|
2003-12-23 14:01:11 +01:00
|
|
|
|
{"writable-text", no_argument, 0, OPTION_WRITABLE_TEXT},
|
1999-05-03 09:29:11 +02: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-21 21:34:58 +02:00
|
|
|
|
-1 means if we should use argv[0] to decide. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
extern int is_strip;
|
|
|
|
|
|
2017-02-17 02:26:12 +01:00
|
|
|
|
/* The maximum length of an S record. This variable is defined in srec.c
|
2000-11-03 02:47:13 +01:00
|
|
|
|
and can be modified by the --srec-len parameter. */
|
2017-02-17 02:26:12 +01:00
|
|
|
|
extern unsigned int _bfd_srec_len;
|
2000-11-03 02:47:13 +01:00
|
|
|
|
|
|
|
|
|
/* Restrict the generation of Srecords to type S3 only.
|
2017-02-17 02:26:12 +01:00
|
|
|
|
This variable is defined in bfd/srec.c and can be toggled
|
2000-11-03 02:47:13 +01:00
|
|
|
|
on by the --srec-forceS3 command line switch. */
|
2017-02-17 02:26:12 +01:00
|
|
|
|
extern bfd_boolean _bfd_srec_forceS3;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2003-08-05 16:40:54 +02:00
|
|
|
|
/* Forward declarations. */
|
|
|
|
|
static void setup_section (bfd *, asection *, void *);
|
2004-05-17 18:40:01 +02:00
|
|
|
|
static void setup_bfd_headers (bfd *, bfd *);
|
2012-04-13 04:52:34 +02:00
|
|
|
|
static void copy_relocations_in_section (bfd *, asection *, void *);
|
2003-08-05 16:40:54 +02: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 *);
|
2016-06-23 14:41:57 +02:00
|
|
|
|
static const char *find_section_rename (const char *, flagword *);
|
2001-07-31 15:49:39 +02:00
|
|
|
|
|
2016-10-05 08:14:07 +02:00
|
|
|
|
ATTRIBUTE_NORETURN static void
|
2003-07-23 19:34:03 +02:00
|
|
|
|
copy_usage (FILE *stream, int exit_status)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
2002-01-23 17:12:56 +01: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-15 18:18:53 +01:00
|
|
|
|
fprintf (stream, _(" The options are:\n"));
|
1999-05-03 09:29:11 +02:00
|
|
|
|
fprintf (stream, _("\
|
1999-11-22 10:42:42 +01: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 13:16:19 +02:00
|
|
|
|
-B --binary-architecture <arch> Set output arch, when input is arch-less\n\
|
1999-11-22 10:42:42 +01:00
|
|
|
|
-F --target <bfdname> Set both input and output format to <bfdname>\n\
|
|
|
|
|
--debugging Convert debugging information, if possible\n\
|
2013-01-07 18:40:59 +01:00
|
|
|
|
-p --preserve-dates Copy modified/access timestamps to the output\n"));
|
|
|
|
|
if (DEFAULT_AR_DETERMINISTIC)
|
|
|
|
|
fprintf (stream, _("\
|
|
|
|
|
-D --enable-deterministic-archives\n\
|
|
|
|
|
Produce deterministic output when stripping archives (default)\n\
|
|
|
|
|
-U --disable-deterministic-archives\n\
|
|
|
|
|
Disable -D behavior\n"));
|
|
|
|
|
else
|
|
|
|
|
fprintf (stream, _("\
|
2012-04-25 19:50:14 +02:00
|
|
|
|
-D --enable-deterministic-archives\n\
|
|
|
|
|
Produce deterministic output when stripping archives\n\
|
2013-01-07 18:40:59 +01:00
|
|
|
|
-U --disable-deterministic-archives\n\
|
|
|
|
|
Disable -D behavior (default)\n"));
|
|
|
|
|
fprintf (stream, _("\
|
1999-11-22 10:42:42 +01:00
|
|
|
|
-j --only-section <name> Only copy section <name> into the output\n\
|
2003-06-12 09:23:31 +02:00
|
|
|
|
--add-gnu-debuglink=<file> Add section .gnu_debuglink linking to <file>\n\
|
1999-11-22 10:42:42 +01:00
|
|
|
|
-R --remove-section <name> Remove section <name> from the output\n\
|
objcopy/strip: Add option --remove-relocations=SECTIONPATTERN
The objcopy and strip tools make use of the bfd library to manipulate
the state of the input file (to produce an output file). Within the
input file (for ELF at least), relocations are held within a section,
and so, if the user wanted to remove the relocations, but keep the
section to which the relocations would have been applied, it is tempting
to think that specifying the name of a relocation section to objcopy's
--remove-section option might do what you want, for example:
objcopy --remove-section=.rela.text input.elf output.elf
However, this does not work. The reason is that when the input file is
loaded, relocations are not managed as sections, but are, instead,
loaded as data associated with the section to which the relocations
would be applied. In our example above the relocations in '.rela.text'
are held as data on the section '.text' once 'input.elf' is loaded.
One task that objcopy and strip do is copy the relocations from the
input file to the output file if the section is also being copied from
the input file to the output file.
This commit adds a new command line option for objcopy and strip,
--remove-relocations, which can be used to remove the relocations, while
keeping the section that the relocations would have been applied to, for
example:
objcopy --remove-relocations=.text input.elf output.elf
in this case the section '.text' will appear in both 'input.elf' and
'output.elf', but any relocations in 'input.elf' that apply to '.text'
will not be present in 'output.elf'.
I have also added a special case to the handling of --remove-section
that spots if a user tries to remove a relocation section (currently
this is done by spotting the '.rela.' or '.rel.' prefix) and forwards
the request to --remove-relocations.
As with --remove-section and --only-section the --remove-relocations
option supports the '!' prefix on the section-patterns it takes to allow
for sections to be specifically not matched.
There are tests for all the new functionality.
binutils/ChangeLog:
* doc/binutils.texi (objcopy): Document 'remove-relocations'.
(strip): Likewise.
* objcopy.c (SECTION_CONTEXT_REMOVE_RELOCS): Define.
(enum command_line_switch): Add 'OPTION_REMOVE_RELOCS'.
(struct option strip_options): Add 'remove-relocations'.
(struct option copy_options): Likewise.
(copy_usage): Likewise.
(strip_usage): Likewise.
(handle_remove_relocations_option): New function.
(discard_relocations): New function.
(handle_remove_section_option): New function.
(copy_relocations_in_section): Use discard_relocations.
(strip_main): Use handle_remove_section_option for
'remove-section', and handle 'remove-relocations' option.
(copy_main): Likewise.
* testsuite/binutils-all/objcopy.exp: Run new tests.
* testsuite/binutils-all/remove-relocs-01.d: New file.
* testsuite/binutils-all/remove-relocs-01.s: New file.
* testsuite/binutils-all/remove-relocs-02.d: New file.
* testsuite/binutils-all/remove-relocs-03.d: New file.
* testsuite/binutils-all/remove-relocs-04.d: New file.
* testsuite/binutils-all/remove-relocs-05.d: New file.
* testsuite/binutils-all/remove-relocs-06.d: New file.
2015-08-21 21:08:26 +02:00
|
|
|
|
--remove-relocations <name> Remove relocations from section <name>\n\
|
1999-11-22 10:42:42 +01:00
|
|
|
|
-S --strip-all Remove all symbol and relocation information\n\
|
2003-06-12 09:23:31 +02:00
|
|
|
|
-g --strip-debug Remove all debugging symbols & sections\n\
|
2012-05-08 19:49:36 +02:00
|
|
|
|
--strip-dwo Remove all DWO sections\n\
|
1999-11-22 10:42:42 +01:00
|
|
|
|
--strip-unneeded Remove all symbols not needed by relocations\n\
|
|
|
|
|
-N --strip-symbol <name> Do not copy symbol <name>\n\
|
2004-12-16 14:16:33 +01:00
|
|
|
|
--strip-unneeded-symbol <name>\n\
|
|
|
|
|
Do not copy symbol <name> unless needed by\n\
|
|
|
|
|
relocations\n\
|
2003-12-11 14:22:51 +01:00
|
|
|
|
--only-keep-debug Strip everything but the debug information\n\
|
2012-05-08 19:49:36 +02:00
|
|
|
|
--extract-dwo Copy only DWO sections\n\
|
2007-03-01 17:39:42 +01:00
|
|
|
|
--extract-symbol Remove section contents but keep symbols\n\
|
2005-04-25 11:23:24 +02:00
|
|
|
|
-K --keep-symbol <name> Do not strip symbol <name>\n\
|
2005-11-15 09:33:38 +01:00
|
|
|
|
--keep-file-symbols Do not strip file symbol(s)\n\
|
2006-06-23 18:23:09 +02:00
|
|
|
|
--localize-hidden Turn all ELF hidden symbols into locals\n\
|
1999-11-22 10:42:42 +01:00
|
|
|
|
-L --localize-symbol <name> Force symbol <name> to be marked as a local\n\
|
2005-03-15 18:45:19 +01:00
|
|
|
|
--globalize-symbol <name> Force symbol <name> to be marked as a global\n\
|
2001-05-30 12:46:28 +02:00
|
|
|
|
-G --keep-global-symbol <name> Localize all symbols except <name>\n\
|
1999-11-22 10:42:42 +01: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 08:31:16 +02:00
|
|
|
|
-w --wildcard Permit wildcard in symbol comparison\n\
|
1999-11-22 10:42:42 +01:00
|
|
|
|
-x --discard-all Remove all non-global symbols\n\
|
|
|
|
|
-X --discard-locals Remove any compiler-generated symbols\n\
|
2015-04-08 14:04:13 +02:00
|
|
|
|
-i --interleave[=<number>] Only copy N out of every <number> bytes\n\
|
2010-09-10 14:11:28 +02:00
|
|
|
|
--interleave-width <number> Set N for --interleave\n\
|
1999-11-22 10:42:42 +01: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\
|
2015-02-13 18:04:42 +01:00
|
|
|
|
--update-section <name>=<file>\n\
|
|
|
|
|
Update contents of section <name> with\n\
|
|
|
|
|
contents found in <file>\n\
|
2013-12-31 10:52:24 +01:00
|
|
|
|
--dump-section <name>=<file> Dump the contents of section <name> into <file>\n\
|
2001-07-31 15:49:39 +02:00
|
|
|
|
--rename-section <old>=<new>[,<flags>] Rename section <old> to <new>\n\
|
2009-04-14 11:47:44 +02:00
|
|
|
|
--long-section-names {enable|disable|keep}\n\
|
|
|
|
|
Handle long section names in Coff objects.\n\
|
1999-11-22 10:42:42 +01: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 12:59:07 +02:00
|
|
|
|
--reverse-bytes=<num> Reverse <num> bytes at a time, in output sections with content\n\
|
2000-04-05 05:43:56 +02:00
|
|
|
|
--redefine-sym <old>=<new> Redefine symbol name <old> to <new>\n\
|
2003-06-02 16:45:13 +02:00
|
|
|
|
--redefine-syms <file> --redefine-sym for all symbol pairs \n\
|
|
|
|
|
listed in <file>\n\
|
2000-11-03 02:47:13 +01: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 12:46:28 +02:00
|
|
|
|
--strip-symbols <file> -N for all symbols listed in <file>\n\
|
2004-12-16 14:16:33 +01:00
|
|
|
|
--strip-unneeded-symbols <file>\n\
|
|
|
|
|
--strip-unneeded-symbol for all symbols listed\n\
|
|
|
|
|
in <file>\n\
|
2001-05-30 12:46:28 +02: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-15 18:45:19 +01:00
|
|
|
|
--globalize-symbols <file> --globalize-symbol for all in <file>\n\
|
2001-05-30 12:46:28 +02:00
|
|
|
|
--keep-global-symbols <file> -G for all symbols listed in <file>\n\
|
|
|
|
|
--weaken-symbols <file> -W for all symbols listed in <file>\n\
|
2015-10-21 16:16:35 +02:00
|
|
|
|
--add-symbol <name>=[<section>:]<value>[,<flags>] Add a symbol\n\
|
2006-02-28 17:09:01 +01:00
|
|
|
|
--alt-machine-code <index> Use the target's <index>'th alternative machine\n\
|
2003-12-23 14:01:11 +01: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 14:19:44 +01: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 15:46:18 +02: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-17 21:33:11 +02:00
|
|
|
|
Set PE subsystem to <name> [& <version>]\n\
|
2015-04-08 16:53:54 +02:00
|
|
|
|
--compress-debug-sections[={none|zlib|zlib-gnu|zlib-gabi}]\n\
|
|
|
|
|
Compress DWARF debug sections using zlib\n\
|
2010-10-29 14:10:39 +02:00
|
|
|
|
--decompress-debug-sections Decompress DWARF debug sections using zlib\n\
|
Properly implement STT_COMMON
The BFD configure option, --enable-elf-stt-common, can't be to used to
verify STT_COMMON implementation with the normal binutils build. Instead,
this patch removes it from BFD. It adds --elf-stt-common=[no|yes] to ELF
assembler/objcopy and adds -z common/-z nocommon to ld.
A configure option, --enable-elf-stt-common, is added to gas to specify
whether ELF assembler should generate common symbols with the STT_COMMON
type by default.
Since BSF_KEEP_G is never used, it is renamed to BSF_ELF_COMMON for ELF
common symbols.
bfd/
PR ld/19645
* bfd.c (bfd): Change flags to 20 bits.
(BFD_CONVERT_ELF_COMMON): New.
(BFD_USE_ELF_STT_COMMON): Likewise.
(BFD_FLAGS_SAVED): Add BFD_CONVERT_ELF_COMMON and
BFD_USE_ELF_STT_COMMON.
(BFD_FLAGS_FOR_BFD_USE_MASK): Likewise.
* configure.ac: Remove --enable-elf-stt-common.
* elf.c (swap_out_syms): Choose STT_COMMON or STT_OBJECT for
common symbol depending on BFD_CONVERT_ELF_COMMON and
BFD_USE_ELF_STT_COMMON.
* elfcode.h (elf_slurp_symbol_table): Set BSF_ELF_COMMON for
STT_COMMON.
* elflink.c (bfd_elf_link_mark_dynamic_symbol): Also check
STT_COMMON.
(elf_link_convert_common_type): New function.
(elf_link_output_extsym): Choose STT_COMMON or STT_OBJECT for
common symbol depending on BFD_CONVERT_ELF_COMMON and
BFD_USE_ELF_STT_COMMON. Set sym.st_info after sym.st_shndx.
* elfxx-target.h (TARGET_BIG_SYM): Add BFD_CONVERT_ELF_COMMON
and BFD_USE_ELF_STT_COMMON to object_flags.
(TARGET_LITTLE_SYM): Likewise.
* syms.c (BSF_KEEP_G): Renamed to ...
(BSF_ELF_COMMON): This.
* bfd-in2.h: Regenerated.
* config.in: Likewise.
* configure: Likewise.
binutils/
PR ld/19645
* NEWS: Mention --elf-stt-common= for objcopy.
* doc/binutils.texi: Document --elf-stt-common= for objcopy.
* objcopy.c (do_elf_stt_common): New.
(command_line_switch): Add OPTION_ELF_STT_COMMON.
(copy_options): Add --elf-stt-common=.
(copy_usage): Add --elf-stt-common=.
(copy_object): Also check do_elf_stt_common for ELF targets.
(copy_file): Handle do_elf_stt_common.
(copy_main): Handle OPTION_ELF_STT_COMMON.
* readelf.c (apply_relocations): Support STT_COMMON.
* testsuite/binutils-all/common-1.s: New file.
* testsuite/binutils-all/common-1a.d: Likewise.
* testsuite/binutils-all/common-1b.d: Likewise.
* testsuite/binutils-all/common-1c.d: Likewise.
* testsuite/binutils-all/common-1d.d: Likewise.
* testsuite/binutils-all/common-1e.d: Likewise.
* testsuite/binutils-all/common-1f.d: Likewise.
* testsuite/binutils-all/common-2.s: Likewise.
* testsuite/binutils-all/common-2a.d: Likewise.
* testsuite/binutils-all/common-2b.d: Likewise.
* testsuite/binutils-all/common-2c.d: Likewise.
* testsuite/binutils-all/common-2d.d: Likewise.
* testsuite/binutils-all/common-2e.d: Likewise.
* testsuite/binutils-all/common-2f.d: Likewise.
* testsuite/binutils-all/objcopy.exp
(objcopy_test_elf_common_symbols): New proc.
Run objcopy_test_elf_common_symbols for ELF targets
gas/
PR ld/19645
* NEWS: Mention --enable-elf-stt-common and --elf-stt-common=
for ELF assemblers.
* as.c (flag_use_elf_stt_common): New.
(show_usage): Add --elf-stt-common=.
(option_values): Add OPTION_ELF_STT_COMMON.
(std_longopts): Add --elf-stt-common=.
(parse_args): Handle --elf-stt-common=.
* as.h (flag_use_elf_stt_common): New.
* config.in: Regenerated.
* configure: Likewise.
* configure.ac: Add --enable-elf-stt-common and define
DEFAULT_GENERATE_ELF_STT_COMMON.
* gas/write.c (write_object_file): Set BFD_CONVERT_ELF_COMMON
and BFD_USE_ELF_STT_COMMON if flag_use_elf_stt_common is set.
* doc/as.texinfo: Document --elf-stt-common=.
* testsuite/gas/elf/common3.s: New file.
* testsuite/gas/elf/common3a.d: Likewise.
* testsuite/gas/elf/common3b.d: Likewise.
* testsuite/gas/elf/common4.s: Likewise.
* testsuite/gas/elf/common4a.d: Likewise.
* testsuite/gas/elf/common4b.d: Likewise.
* testsuite/gas/i386/dw2-compress-3b.d: Likewise.
* testsuite/gas/i386/dw2-compressed-3b.d: Likewise.
* testsuite/gas/elf/elf.exp: Run common3a, common3b, common4a
and common4b.
* testsuite/gas/i386/dw2-compress-3.d: Renamed to ...
* testsuite/gas/i386/dw2-compress-3a.d: This. Pass
--elf-stt-common=no to as.
* testsuite/gas/i386/dw2-compressed-3.d: Renamed to ...
* testsuite/gas/i386/dw2-compressed-3a.d: This. Pass
--elf-stt-common=no to as.
* testsuite/gas/i386/i386.exp: Run dw2-compress-3a,
dw2-compress-3b, dw2-compressed-3a and dw2-compressed-3b instead
of dw2-compress-3 and dw2-compressed-3.
include/
PR ld/19645
* bfdlink.h (bfd_link_elf_stt_common): New enum.
(bfd_link_info): Add elf_stt_common.
ld/
PR ld/19645
* NEWS: Mention -z common/-z nocommon for ELF targets.
* emultempl/elf32.em (gld${EMULATION_NAME}_handle_option): Handle
-z common and -z nocommon.
* ld.texinfo: Document -z common/-z nocommon.
* lexsup.c (elf_shlib_list_options): Add -z common/-z nocommon.
* testsuite/ld-elf/tls_common.exp: Test --elf-stt-common=no and
--elf-stt-common=yes with assembler.
* testsuite/ld-elfcomm/common-1.s: New file.
* testsuite/ld-elfcomm/common-1a.d: Likewise.
* testsuite/ld-elfcomm/common-1b.d: Likewise.
* testsuite/ld-elfcomm/common-1c.d: Likewise.
* testsuite/ld-elfcomm/common-1d.d: Likewise.
* testsuite/ld-elfcomm/common-1e.d: Likewise.
* testsuite/ld-elfcomm/common-1f.d: Likewise.
* testsuite/ld-elfcomm/common-2.s: Likewise.
* testsuite/ld-elfcomm/common-2a.d: Likewise.
* testsuite/ld-elfcomm/common-2b.d: Likewise.
* testsuite/ld-elfcomm/common-2c.d: Likewise.
* testsuite/ld-elfcomm/common-2d.d: Likewise.
* testsuite/ld-elfcomm/common-2e.d: Likewise.
* testsuite/ld-elfcomm/common-2f.d: Likewise.
* testsuite/ld-elfcomm/common-3a.rd: Likewise.
* testsuite/ld-elfcomm/common-3b.rd: Likewise.
* testsuite/ld-i386/pr19645.d: Likewise.
* testsuite/ld-i386/pr19645.s: Likewise.
* testsuite/ld-x86-64/largecomm-1.s: Likewise.
* testsuite/ld-x86-64/largecomm-1a.d: Likewise.
* testsuite/ld-x86-64/largecomm-1b.d: Likewise.
* testsuite/ld-x86-64/largecomm-1c.d: Likewise.
* testsuite/ld-x86-64/largecomm-1d.d: Likewise.
* testsuite/ld-x86-64/largecomm-1e.d: Likewise.
* testsuite/ld-x86-64/largecomm-1f.d: Likewise.
* testsuite/ld-x86-64/pr19645.d: Likewise.
* testsuite/ld-x86-64/pr19645.s: Likewise.
* testsuite/ld-elfcomm/elfcomm.exp: Test --elf-stt-common=yes
with assembler.
(assembler_generates_commons): Removed.
Run -z common/-z nocommon tests. Run *.d tests.
* testsuite/ld-i386/i386.exp: Run pr19645.
* testsuite/ld-x86-64/x86-64.exp: Likewise.
* testsuite/ld-x86-64/dwarfreloc.exp: Test --elf-stt-common with
assembler. Test STT_COMMON with readelf.
2016-02-22 18:18:52 +01:00
|
|
|
|
--elf-stt-common=[yes|no] Generate ELF common symbols with STT_COMMON\n\
|
|
|
|
|
type\n\
|
2017-03-01 12:09:46 +01:00
|
|
|
|
-M --merge-notes Remove redundant entries in note sections\n\
|
2017-04-13 15:50:56 +02:00
|
|
|
|
--no-merge-notes Do not attempt to remove redundant notes (default)\n\
|
1999-11-22 10:42:42 +01:00
|
|
|
|
-v --verbose List all object files modified\n\
|
2005-10-03 21:37:44 +02:00
|
|
|
|
@<file> Read options from <file>\n\
|
1999-11-22 10:42:42 +01:00
|
|
|
|
-V --version Display this program's version number\n\
|
|
|
|
|
-h --help Display this output\n\
|
2003-03-24 17:11:46 +01:00
|
|
|
|
--info List object formats & architectures supported\n\
|
1999-11-22 10:42:42 +01:00
|
|
|
|
"));
|
1999-05-03 09:29:11 +02:00
|
|
|
|
list_supported_targets (program_name, stream);
|
2007-02-17 14:33:57 +01:00
|
|
|
|
if (REPORT_BUGS_TO[0] && exit_status == 0)
|
2000-04-04 16:32:35 +02:00
|
|
|
|
fprintf (stream, _("Report bugs to %s\n"), REPORT_BUGS_TO);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
exit (exit_status);
|
|
|
|
|
}
|
|
|
|
|
|
2016-10-05 08:14:07 +02:00
|
|
|
|
ATTRIBUTE_NORETURN static void
|
2003-07-23 19:34:03 +02:00
|
|
|
|
strip_usage (FILE *stream, int exit_status)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
2002-01-23 17:12:56 +01:00
|
|
|
|
fprintf (stream, _("Usage: %s <option(s)> in-file(s)\n"), program_name);
|
|
|
|
|
fprintf (stream, _(" Removes symbols and sections from files\n"));
|
2002-01-15 18:18:53 +01:00
|
|
|
|
fprintf (stream, _(" The options are:\n"));
|
1999-05-03 09:29:11 +02:00
|
|
|
|
fprintf (stream, _("\
|
2002-01-23 17:12:56 +01: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 10:42:42 +01:00
|
|
|
|
-p --preserve-dates Copy modified/access timestamps to the output\n\
|
2013-01-07 18:40:59 +01:00
|
|
|
|
"));
|
|
|
|
|
if (DEFAULT_AR_DETERMINISTIC)
|
|
|
|
|
fprintf (stream, _("\
|
|
|
|
|
-D --enable-deterministic-archives\n\
|
|
|
|
|
Produce deterministic output when stripping archives (default)\n\
|
|
|
|
|
-U --disable-deterministic-archives\n\
|
|
|
|
|
Disable -D behavior\n"));
|
|
|
|
|
else
|
|
|
|
|
fprintf (stream, _("\
|
2012-04-25 19:50:14 +02:00
|
|
|
|
-D --enable-deterministic-archives\n\
|
|
|
|
|
Produce deterministic output when stripping archives\n\
|
2013-01-07 18:40:59 +01:00
|
|
|
|
-U --disable-deterministic-archives\n\
|
|
|
|
|
Disable -D behavior (default)\n"));
|
|
|
|
|
fprintf (stream, _("\
|
2014-12-23 21:28:16 +01:00
|
|
|
|
-R --remove-section=<name> Also remove section <name> from the output\n\
|
objcopy/strip: Add option --remove-relocations=SECTIONPATTERN
The objcopy and strip tools make use of the bfd library to manipulate
the state of the input file (to produce an output file). Within the
input file (for ELF at least), relocations are held within a section,
and so, if the user wanted to remove the relocations, but keep the
section to which the relocations would have been applied, it is tempting
to think that specifying the name of a relocation section to objcopy's
--remove-section option might do what you want, for example:
objcopy --remove-section=.rela.text input.elf output.elf
However, this does not work. The reason is that when the input file is
loaded, relocations are not managed as sections, but are, instead,
loaded as data associated with the section to which the relocations
would be applied. In our example above the relocations in '.rela.text'
are held as data on the section '.text' once 'input.elf' is loaded.
One task that objcopy and strip do is copy the relocations from the
input file to the output file if the section is also being copied from
the input file to the output file.
This commit adds a new command line option for objcopy and strip,
--remove-relocations, which can be used to remove the relocations, while
keeping the section that the relocations would have been applied to, for
example:
objcopy --remove-relocations=.text input.elf output.elf
in this case the section '.text' will appear in both 'input.elf' and
'output.elf', but any relocations in 'input.elf' that apply to '.text'
will not be present in 'output.elf'.
I have also added a special case to the handling of --remove-section
that spots if a user tries to remove a relocation section (currently
this is done by spotting the '.rela.' or '.rel.' prefix) and forwards
the request to --remove-relocations.
As with --remove-section and --only-section the --remove-relocations
option supports the '!' prefix on the section-patterns it takes to allow
for sections to be specifically not matched.
There are tests for all the new functionality.
binutils/ChangeLog:
* doc/binutils.texi (objcopy): Document 'remove-relocations'.
(strip): Likewise.
* objcopy.c (SECTION_CONTEXT_REMOVE_RELOCS): Define.
(enum command_line_switch): Add 'OPTION_REMOVE_RELOCS'.
(struct option strip_options): Add 'remove-relocations'.
(struct option copy_options): Likewise.
(copy_usage): Likewise.
(strip_usage): Likewise.
(handle_remove_relocations_option): New function.
(discard_relocations): New function.
(handle_remove_section_option): New function.
(copy_relocations_in_section): Use discard_relocations.
(strip_main): Use handle_remove_section_option for
'remove-section', and handle 'remove-relocations' option.
(copy_main): Likewise.
* testsuite/binutils-all/objcopy.exp: Run new tests.
* testsuite/binutils-all/remove-relocs-01.d: New file.
* testsuite/binutils-all/remove-relocs-01.s: New file.
* testsuite/binutils-all/remove-relocs-02.d: New file.
* testsuite/binutils-all/remove-relocs-03.d: New file.
* testsuite/binutils-all/remove-relocs-04.d: New file.
* testsuite/binutils-all/remove-relocs-05.d: New file.
* testsuite/binutils-all/remove-relocs-06.d: New file.
2015-08-21 21:08:26 +02:00
|
|
|
|
--remove-relocations <name> Remove relocations from section <name>\n\
|
1999-11-22 10:42:42 +01:00
|
|
|
|
-s --strip-all Remove all symbol and relocation information\n\
|
2003-06-12 09:23:31 +02:00
|
|
|
|
-g -S -d --strip-debug Remove all debugging symbols & sections\n\
|
2012-05-08 19:49:36 +02:00
|
|
|
|
--strip-dwo Remove all DWO sections\n\
|
1999-11-22 10:42:42 +01:00
|
|
|
|
--strip-unneeded Remove all symbols not needed by relocations\n\
|
2003-12-11 14:22:51 +01:00
|
|
|
|
--only-keep-debug Strip everything but the debug information\n\
|
2017-04-13 15:50:56 +02:00
|
|
|
|
-M --merge-notes Remove redundant entries in note sections (default)\n\
|
|
|
|
|
--no-merge-notes Do not attempt to remove redundant notes\n\
|
2002-01-23 17:12:56 +01:00
|
|
|
|
-N --strip-symbol=<name> Do not copy symbol <name>\n\
|
2005-04-25 11:25:57 +02:00
|
|
|
|
-K --keep-symbol=<name> Do not strip symbol <name>\n\
|
2005-11-15 09:33:38 +01:00
|
|
|
|
--keep-file-symbols Do not strip file symbol(s)\n\
|
2004-04-27 08:31:16 +02:00
|
|
|
|
-w --wildcard Permit wildcard in symbol comparison\n\
|
1999-11-22 10:42:42 +01: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-24 17:11:46 +01:00
|
|
|
|
--info List object formats & architectures supported\n\
|
1999-11-22 10:42:42 +01:00
|
|
|
|
-o <file> Place stripped output into <file>\n\
|
|
|
|
|
"));
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
list_supported_targets (program_name, stream);
|
2007-02-17 14:33:57 +01:00
|
|
|
|
if (REPORT_BUGS_TO[0] && exit_status == 0)
|
2000-04-04 16:32:35 +02:00
|
|
|
|
fprintf (stream, _("Report bugs to %s\n"), REPORT_BUGS_TO);
|
1999-05-03 09:29:11 +02: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-23 19:34:03 +02:00
|
|
|
|
parse_flags (const char *s)
|
1999-05-03 09:29:11 +02: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) ;
|
2016-05-31 12:51:09 +02:00
|
|
|
|
#define PARSE_FLAG(fname,fval) \
|
|
|
|
|
else if (strncasecmp (fname, s, len) == 0) ret |= fval
|
1999-05-03 09:29:11 +02:00
|
|
|
|
PARSE_FLAG ("alloc", SEC_ALLOC);
|
|
|
|
|
PARSE_FLAG ("load", SEC_LOAD);
|
1999-09-12 20:33:05 +02:00
|
|
|
|
PARSE_FLAG ("noload", SEC_NEVER_LOAD);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
PARSE_FLAG ("readonly", SEC_READONLY);
|
1999-09-12 20:33:05 +02:00
|
|
|
|
PARSE_FLAG ("debug", SEC_DEBUGGING);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
PARSE_FLAG ("code", SEC_CODE);
|
|
|
|
|
PARSE_FLAG ("data", SEC_DATA);
|
|
|
|
|
PARSE_FLAG ("rom", SEC_ROM);
|
2005-02-22 01:50:07 +01:00
|
|
|
|
PARSE_FLAG ("share", SEC_COFF_SHARED);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
PARSE_FLAG ("contents", SEC_HAS_CONTENTS);
|
2013-01-28 10:31:01 +01:00
|
|
|
|
PARSE_FLAG ("merge", SEC_MERGE);
|
|
|
|
|
PARSE_FLAG ("strings", SEC_STRINGS);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
#undef PARSE_FLAG
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
char *copy;
|
|
|
|
|
|
2009-09-10 15:40:44 +02:00
|
|
|
|
copy = (char *) xmalloc (len + 1);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
strncpy (copy, s, len);
|
|
|
|
|
copy[len] = '\0';
|
|
|
|
|
non_fatal (_("unrecognized section flag `%s'"), copy);
|
2000-04-05 05:43:56 +02:00
|
|
|
|
fatal (_("supported flags: %s"),
|
2013-01-28 10:31:01 +01:00
|
|
|
|
"alloc, load, noload, readonly, debug, code, data, rom, share, contents, merge, strings");
|
1999-05-03 09:29:11 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
s = snext;
|
|
|
|
|
}
|
|
|
|
|
while (s != NULL);
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2015-10-21 16:16:35 +02:00
|
|
|
|
/* Parse symbol flags into a flagword, with a fatal error if the
|
|
|
|
|
string can't be parsed. */
|
|
|
|
|
|
|
|
|
|
static flagword
|
|
|
|
|
parse_symflags (const char *s, char **other)
|
|
|
|
|
{
|
|
|
|
|
flagword ret;
|
|
|
|
|
const char *snext;
|
2016-05-31 12:51:09 +02:00
|
|
|
|
size_t len;
|
2015-10-21 16:16:35 +02:00
|
|
|
|
|
|
|
|
|
ret = BSF_NO_FLAGS;
|
|
|
|
|
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
snext = strchr (s, ',');
|
|
|
|
|
if (snext == NULL)
|
2016-05-31 12:51:09 +02:00
|
|
|
|
len = strlen (s);
|
2015-10-21 16:16:35 +02:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
len = snext - s;
|
|
|
|
|
++snext;
|
|
|
|
|
}
|
|
|
|
|
|
2016-05-31 12:51:09 +02:00
|
|
|
|
#define PARSE_FLAG(fname, fval) \
|
|
|
|
|
else if (len == sizeof fname - 1 \
|
|
|
|
|
&& strncasecmp (fname, s, len) == 0) \
|
2015-10-21 16:16:35 +02:00
|
|
|
|
ret |= fval
|
|
|
|
|
|
2016-05-31 12:51:09 +02:00
|
|
|
|
#define PARSE_OTHER(fname, fval) \
|
|
|
|
|
else if (len >= sizeof fname \
|
|
|
|
|
&& strncasecmp (fname, s, sizeof fname - 1) == 0) \
|
2015-11-20 15:08:29 +01:00
|
|
|
|
fval = xstrndup (s + sizeof fname - 1, len - sizeof fname + 1)
|
2016-05-31 12:51:09 +02:00
|
|
|
|
|
2015-10-21 16:16:35 +02:00
|
|
|
|
if (0) ;
|
|
|
|
|
PARSE_FLAG ("local", BSF_LOCAL);
|
|
|
|
|
PARSE_FLAG ("global", BSF_GLOBAL);
|
|
|
|
|
PARSE_FLAG ("export", BSF_EXPORT);
|
|
|
|
|
PARSE_FLAG ("debug", BSF_DEBUGGING);
|
|
|
|
|
PARSE_FLAG ("function", BSF_FUNCTION);
|
|
|
|
|
PARSE_FLAG ("weak", BSF_WEAK);
|
|
|
|
|
PARSE_FLAG ("section", BSF_SECTION_SYM);
|
|
|
|
|
PARSE_FLAG ("constructor", BSF_CONSTRUCTOR);
|
|
|
|
|
PARSE_FLAG ("warning", BSF_WARNING);
|
|
|
|
|
PARSE_FLAG ("indirect", BSF_INDIRECT);
|
|
|
|
|
PARSE_FLAG ("file", BSF_FILE);
|
|
|
|
|
PARSE_FLAG ("object", BSF_OBJECT);
|
|
|
|
|
PARSE_FLAG ("synthetic", BSF_SYNTHETIC);
|
|
|
|
|
PARSE_FLAG ("indirect-function", BSF_GNU_INDIRECT_FUNCTION | BSF_FUNCTION);
|
|
|
|
|
PARSE_FLAG ("unique-object", BSF_GNU_UNIQUE | BSF_OBJECT);
|
|
|
|
|
PARSE_OTHER ("before=", *other);
|
|
|
|
|
|
|
|
|
|
#undef PARSE_FLAG
|
|
|
|
|
#undef PARSE_OTHER
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
char *copy;
|
|
|
|
|
|
|
|
|
|
copy = (char *) xmalloc (len + 1);
|
|
|
|
|
strncpy (copy, s, len);
|
|
|
|
|
copy[len] = '\0';
|
|
|
|
|
non_fatal (_("unrecognized symbol flag `%s'"), copy);
|
|
|
|
|
fatal (_("supported flags: %s"),
|
2016-05-31 12:51:09 +02:00
|
|
|
|
"local, global, export, debug, function, weak, section, "
|
|
|
|
|
"constructor, warning, indirect, file, object, synthetic, "
|
|
|
|
|
"indirect-function, unique-object, before=<othersym>");
|
2015-10-21 16:16:35 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
s = snext;
|
|
|
|
|
}
|
|
|
|
|
while (s != NULL);
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2013-02-15 10:32:31 +01:00
|
|
|
|
/* Find and optionally add an entry in the change_sections list.
|
|
|
|
|
|
|
|
|
|
We need to be careful in how we match section names because of the support
|
|
|
|
|
for wildcard characters. For example suppose that the user has invoked
|
|
|
|
|
objcopy like this:
|
2015-08-12 13:42:37 +02:00
|
|
|
|
|
2013-02-15 10:32:31 +01:00
|
|
|
|
--set-section-flags .debug_*=debug
|
|
|
|
|
--set-section-flags .debug_str=readonly,debug
|
|
|
|
|
--change-section-address .debug_*ranges=0x1000
|
|
|
|
|
|
|
|
|
|
With the idea that all debug sections will receive the DEBUG flag, the
|
|
|
|
|
.debug_str section will also receive the READONLY flag and the
|
|
|
|
|
.debug_ranges and .debug_aranges sections will have their address set to
|
|
|
|
|
0x1000. (This may not make much sense, but it is just an example).
|
|
|
|
|
|
|
|
|
|
When adding the section name patterns to the section list we need to make
|
|
|
|
|
sure that previous entries do not match with the new entry, unless the
|
|
|
|
|
match is exact. (In which case we assume that the user is overriding
|
|
|
|
|
the previous entry with the new context).
|
|
|
|
|
|
|
|
|
|
When matching real section names to the section list we make use of the
|
|
|
|
|
wildcard characters, but we must do so in context. Eg if we are setting
|
|
|
|
|
section addresses then we match for .debug_ranges but not for .debug_info.
|
|
|
|
|
|
|
|
|
|
Finally, if ADD is false and we do find a match, we mark the section list
|
|
|
|
|
entry as used. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
static struct section_list *
|
2013-02-15 10:32:31 +01:00
|
|
|
|
find_section_list (const char *name, bfd_boolean add, unsigned int context)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
2015-08-24 14:02:39 +02:00
|
|
|
|
struct section_list *p, *match = NULL;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2013-02-15 10:32:31 +01:00
|
|
|
|
/* assert ((context & ((1 << 7) - 1)) != 0); */
|
2015-08-12 13:42:37 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
for (p = change_sections; p != NULL; p = p->next)
|
2013-02-15 10:32:31 +01:00
|
|
|
|
{
|
|
|
|
|
if (add)
|
|
|
|
|
{
|
|
|
|
|
if (strcmp (p->pattern, name) == 0)
|
|
|
|
|
{
|
|
|
|
|
/* Check for context conflicts. */
|
|
|
|
|
if (((p->context & SECTION_CONTEXT_REMOVE)
|
|
|
|
|
&& (context & SECTION_CONTEXT_COPY))
|
|
|
|
|
|| ((context & SECTION_CONTEXT_REMOVE)
|
|
|
|
|
&& (p->context & SECTION_CONTEXT_COPY)))
|
|
|
|
|
fatal (_("error: %s both copied and removed"), name);
|
|
|
|
|
|
|
|
|
|
if (((p->context & SECTION_CONTEXT_SET_VMA)
|
|
|
|
|
&& (context & SECTION_CONTEXT_ALTER_VMA))
|
|
|
|
|
|| ((context & SECTION_CONTEXT_SET_VMA)
|
|
|
|
|
&& (context & SECTION_CONTEXT_ALTER_VMA)))
|
|
|
|
|
fatal (_("error: %s both sets and alters VMA"), name);
|
|
|
|
|
|
|
|
|
|
if (((p->context & SECTION_CONTEXT_SET_LMA)
|
|
|
|
|
&& (context & SECTION_CONTEXT_ALTER_LMA))
|
|
|
|
|
|| ((context & SECTION_CONTEXT_SET_LMA)
|
|
|
|
|
&& (context & SECTION_CONTEXT_ALTER_LMA)))
|
|
|
|
|
fatal (_("error: %s both sets and alters LMA"), name);
|
|
|
|
|
|
|
|
|
|
/* Extend the context. */
|
|
|
|
|
p->context |= context;
|
|
|
|
|
return p;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
/* If we are not adding a new name/pattern then
|
|
|
|
|
only check for a match if the context applies. */
|
2015-08-24 14:02:39 +02:00
|
|
|
|
else if (p->context & context)
|
|
|
|
|
{
|
|
|
|
|
/* We could check for the presence of wildchar characters
|
|
|
|
|
first and choose between calling strcmp and fnmatch,
|
|
|
|
|
but is that really worth it ? */
|
|
|
|
|
if (p->pattern [0] == '!')
|
|
|
|
|
{
|
|
|
|
|
if (fnmatch (p->pattern + 1, name, 0) == 0)
|
|
|
|
|
{
|
|
|
|
|
p->used = TRUE;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (fnmatch (p->pattern, name, 0) == 0)
|
|
|
|
|
{
|
|
|
|
|
if (match == NULL)
|
|
|
|
|
match = p;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2013-02-15 10:32:31 +01:00
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
if (! add)
|
2015-08-24 14:02:39 +02:00
|
|
|
|
{
|
|
|
|
|
if (match != NULL)
|
|
|
|
|
match->used = TRUE;
|
|
|
|
|
return match;
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2009-09-10 15:40:44 +02:00
|
|
|
|
p = (struct section_list *) xmalloc (sizeof (struct section_list));
|
2013-02-15 10:32:31 +01:00
|
|
|
|
p->pattern = name;
|
2002-11-30 09:39:46 +01:00
|
|
|
|
p->used = FALSE;
|
2013-02-15 10:32:31 +01:00
|
|
|
|
p->context = context;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
p->vma_val = 0;
|
|
|
|
|
p->lma_val = 0;
|
|
|
|
|
p->flags = 0;
|
|
|
|
|
p->next = change_sections;
|
|
|
|
|
change_sections = p;
|
|
|
|
|
|
|
|
|
|
return p;
|
|
|
|
|
}
|
|
|
|
|
|
2017-04-05 18:22:47 +02:00
|
|
|
|
/* S1 is the entry node already in the table, S2 is the key node. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
eq_string_redefnode (const void *s1, const void *s2)
|
|
|
|
|
{
|
|
|
|
|
struct redefine_node *node1 = (struct redefine_node *) s1;
|
|
|
|
|
struct redefine_node *node2 = (struct redefine_node *) s2;
|
|
|
|
|
return !strcmp ((const char *) node1->source, (const char *) node2->source);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* P is redefine node. Hash value is generated from its "source" filed. */
|
|
|
|
|
|
|
|
|
|
static hashval_t
|
|
|
|
|
htab_hash_redefnode (const void *p)
|
|
|
|
|
{
|
|
|
|
|
struct redefine_node *redefnode = (struct redefine_node *) p;
|
|
|
|
|
return htab_hash_string (redefnode->source);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Create hashtab used for redefine node. */
|
|
|
|
|
|
|
|
|
|
static htab_t
|
|
|
|
|
create_symbol2redef_htab (void)
|
|
|
|
|
{
|
|
|
|
|
return htab_create_alloc (16, htab_hash_redefnode, eq_string_redefnode, NULL,
|
|
|
|
|
xcalloc, free);
|
|
|
|
|
}
|
|
|
|
|
|
2008-04-16 10:24:21 +02: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 15:40:44 +02:00
|
|
|
|
return strcmp ((const char *) s1, (const char *) s2) == 0;
|
2008-04-16 10:24:21 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static htab_t
|
|
|
|
|
create_symbol_htab (void)
|
|
|
|
|
{
|
|
|
|
|
return htab_create_alloc (16, htab_hash_string, eq_string, NULL, xcalloc, free);
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2000-04-05 05:43:56 +02:00
|
|
|
|
static void
|
2008-04-16 10:24:21 +02:00
|
|
|
|
create_symbol_htabs (void)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
2008-04-16 10:24:21 +02: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 ();
|
2017-04-05 18:22:47 +02:00
|
|
|
|
redefine_specific_htab = create_symbol2redef_htab ();
|
|
|
|
|
/* As there is no bidirectional hash table in libiberty, need a reverse table
|
|
|
|
|
to check duplicated target string. */
|
|
|
|
|
redefine_specific_reverse_htab = create_symbol_htab ();
|
2008-04-16 10:24:21 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Add a symbol to strip_specific_list. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2008-04-16 10:24:21 +02:00
|
|
|
|
static void
|
|
|
|
|
add_specific_symbol (const char *name, htab_t htab)
|
|
|
|
|
{
|
|
|
|
|
*htab_find_slot (htab, name, INSERT) = (char *) name;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
}
|
|
|
|
|
|
2017-04-05 18:22:47 +02:00
|
|
|
|
/* Like add_specific_symbol, but the element type is void *. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
add_specific_symbol_node (const void *node, htab_t htab)
|
|
|
|
|
{
|
|
|
|
|
*htab_find_slot (htab, node, INSERT) = (void *) node;
|
|
|
|
|
}
|
|
|
|
|
|
2002-05-21 21:34:58 +02:00
|
|
|
|
/* Add symbols listed in `filename' to strip_specific_list. */
|
2001-05-30 12:46:28 +02:00
|
|
|
|
|
|
|
|
|
#define IS_WHITESPACE(c) ((c) == ' ' || (c) == '\t')
|
|
|
|
|
#define IS_LINE_TERMINATOR(c) ((c) == '\n' || (c) == '\r' || (c) == '\0')
|
|
|
|
|
|
|
|
|
|
static void
|
2018-09-17 17:50:42 +02:00
|
|
|
|
add_specific_symbols (const char *filename, htab_t htab, char **buffer_p)
|
2001-05-30 12:46:28 +02:00
|
|
|
|
{
|
2003-11-07 13:19:34 +01:00
|
|
|
|
off_t size;
|
2001-05-30 12:46:28 +02:00
|
|
|
|
FILE * f;
|
|
|
|
|
char * line;
|
|
|
|
|
char * buffer;
|
|
|
|
|
unsigned int line_count;
|
2002-05-21 21:34:58 +02:00
|
|
|
|
|
2003-11-07 13:19:34 +01:00
|
|
|
|
size = get_file_size (filename);
|
|
|
|
|
if (size == 0)
|
2006-08-06 17:49:46 +02:00
|
|
|
|
{
|
|
|
|
|
status = 1;
|
|
|
|
|
return;
|
|
|
|
|
}
|
2001-05-30 12:46:28 +02:00
|
|
|
|
|
2009-09-10 15:40:44 +02:00
|
|
|
|
buffer = (char *) xmalloc (size + 2);
|
2001-05-30 12:46:28 +02:00
|
|
|
|
f = fopen (filename, FOPEN_RT);
|
|
|
|
|
if (f == NULL)
|
2003-11-07 13:19:34 +01:00
|
|
|
|
fatal (_("cannot open '%s': %s"), filename, strerror (errno));
|
2001-05-30 12:46:28 +02:00
|
|
|
|
|
2003-11-07 13:19:34 +01:00
|
|
|
|
if (fread (buffer, 1, size, f) == 0 || ferror (f))
|
2001-05-30 12:46:28 +02:00
|
|
|
|
fatal (_("%s: fread failed"), filename);
|
|
|
|
|
|
|
|
|
|
fclose (f);
|
2003-11-07 13:19:34 +01:00
|
|
|
|
buffer [size] = '\n';
|
|
|
|
|
buffer [size + 1] = '\0';
|
2001-05-30 12:46:28 +02:00
|
|
|
|
|
|
|
|
|
line_count = 1;
|
2002-05-21 21:34:58 +02:00
|
|
|
|
|
2001-05-30 12:46:28 +02:00
|
|
|
|
for (line = buffer; * line != '\0'; line ++)
|
|
|
|
|
{
|
|
|
|
|
char * eol;
|
|
|
|
|
char * name;
|
|
|
|
|
char * name_end;
|
2002-11-30 09:39:46 +01:00
|
|
|
|
int finished = FALSE;
|
2001-05-30 12:46:28 +02:00
|
|
|
|
|
|
|
|
|
for (eol = line;; eol ++)
|
|
|
|
|
{
|
|
|
|
|
switch (* eol)
|
|
|
|
|
{
|
|
|
|
|
case '\n':
|
|
|
|
|
* eol = '\0';
|
|
|
|
|
/* Cope with \n\r. */
|
|
|
|
|
if (eol[1] == '\r')
|
|
|
|
|
++ eol;
|
2002-11-30 09:39:46 +01:00
|
|
|
|
finished = TRUE;
|
2001-05-30 12:46:28 +02:00
|
|
|
|
break;
|
2002-05-21 21:34:58 +02:00
|
|
|
|
|
2001-05-30 12:46:28 +02:00
|
|
|
|
case '\r':
|
|
|
|
|
* eol = '\0';
|
|
|
|
|
/* Cope with \r\n. */
|
|
|
|
|
if (eol[1] == '\n')
|
|
|
|
|
++ eol;
|
2002-11-30 09:39:46 +01:00
|
|
|
|
finished = TRUE;
|
2001-05-30 12:46:28 +02:00
|
|
|
|
break;
|
2002-05-21 21:34:58 +02:00
|
|
|
|
|
2001-05-30 12:46:28 +02:00
|
|
|
|
case 0:
|
2002-11-30 09:39:46 +01:00
|
|
|
|
finished = TRUE;
|
2001-05-30 12:46:28 +02:00
|
|
|
|
break;
|
2002-05-21 21:34:58 +02:00
|
|
|
|
|
2001-05-30 12:46:28 +02: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-21 21:34:58 +02:00
|
|
|
|
|
2001-05-30 12:46:28 +02: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-21 21:34:58 +02:00
|
|
|
|
name_end ++)
|
|
|
|
|
;
|
2001-05-30 12:46:28 +02: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 16:04:40 +02:00
|
|
|
|
non_fatal (_("%s:%d: Ignoring rubbish found on this line"),
|
|
|
|
|
filename, line_count);
|
2001-05-30 12:46:28 +02:00
|
|
|
|
}
|
2002-05-21 21:34:58 +02:00
|
|
|
|
|
2001-05-30 12:46:28 +02:00
|
|
|
|
* name_end = '\0';
|
|
|
|
|
|
|
|
|
|
if (name_end > name)
|
2008-04-16 10:24:21 +02:00
|
|
|
|
add_specific_symbol (name, htab);
|
2001-05-30 12:46:28 +02: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 ++;
|
|
|
|
|
}
|
2018-07-20 16:05:34 +02:00
|
|
|
|
|
2018-09-13 17:14:36 +02:00
|
|
|
|
/* Do not free the buffer. Parts of it will have been referenced
|
|
|
|
|
in the calls to add_specific_symbol. */
|
2018-09-17 17:50:42 +02:00
|
|
|
|
*buffer_p = buffer;
|
2001-05-30 12:46:28 +02:00
|
|
|
|
}
|
|
|
|
|
|
2008-04-16 10:24:21 +02:00
|
|
|
|
/* See whether a symbol should be stripped or kept
|
|
|
|
|
based on strip_specific_list and keep_symbols. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2008-04-16 10:24:21 +02:00
|
|
|
|
static int
|
|
|
|
|
is_specified_symbol_predicate (void **slot, void *data)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
2009-09-10 15:40:44 +02:00
|
|
|
|
struct is_specified_symbol_predicate_data *d =
|
|
|
|
|
(struct is_specified_symbol_predicate_data *) data;
|
|
|
|
|
const char *slot_name = (char *) *slot;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2008-04-16 10:24:21 +02:00
|
|
|
|
if (*slot_name != '!')
|
2003-11-11 18:50:26 +01:00
|
|
|
|
{
|
2008-04-16 10:24:21 +02:00
|
|
|
|
if (! fnmatch (slot_name, d->name, 0))
|
|
|
|
|
{
|
|
|
|
|
d->found = TRUE;
|
objcopy: Improve wildcard matching for symbols with '!' prefix.
When using options such as --localize-symbol, --globalize-symbol, etc,
along with the --wildcard option, prefixing a symbol name with '!'
should provide non-matching behaviour, as example the following example
is given in the manual:
--wildcard --weaken-symbol !foo --weaken-symbol fo*
which should weaken all symbols matching the pattern 'fo*', but not the
symbol 'foo'.
However, this currently does not work, the current logic will waken all
symbols matching the pattern 'fo*' AND all symbols that are not 'foo'.
The symbol 'foo' is covered by the first condition, and so is weakened,
while, other symbols, for example 'bar' will match the second condition,
and so be weakened.
This patch adjusts the logic so that a pattern prefixed with '!'
specifically DOES NOT apply the relevant change to any matching symbols,
instead of applying the change to all non-matching symbols. So this:
--weaken-symbol !foo
will ensure that the symbol 'foo' is not weakened, but says nothing
about symbols that are not 'foo'. As a result, a pattern prefixed with
'!' now only makes sense when used alongside a more wide ranging
wildcard pattern.
This change should make the wildcard matching feature more useful, with
no overall loss of functionality. The example given in the manual,
weaken all symbols matching 'fo*' except 'foo' can now be achieved, but
so too can more complex examples, such as weaken all symbols matching
'fo*' except 'foo', 'foa', and 'fob', like this:
--wildcard --weaken-symbol !foo \
--weaken-symbol !foa \
--weaken-symbol !fob \
--weaken-symbol fo*
Under the previous scheme, something as symbols as, weaken all symbols
except 'foo' could have been achieved with this:
--weaken-symbol !foo
however, this will no longer work. To achieve the same result under the
new scheme this is now required:
--weaken-symbol !foo --weaken-symbol *
binutils/ChangeLog:
* objcopy.c (is_specified_symbol_predicate): Don't stop at first
match. Non-match rules set found to FALSE.
binutils/testsuite/ChangeLog:
* binutils-all/objcopy.exp: Run new symbol tests.
(objcopy_test_symbol_manipulation): New function.
* binutils-all/symbols-1.d: New file.
* binutils-all/symbols-2.d: New file.
* binutils-all/symbols-3.d: New file.
* binutils-all/symbols-4.d: New file.
* binutils-all/symbols.s: New file.
2015-07-31 14:48:22 +02:00
|
|
|
|
/* Continue traversal, there might be a non-match rule. */
|
|
|
|
|
return 1;
|
2008-04-16 10:24:21 +02:00
|
|
|
|
}
|
2003-11-11 18:50:26 +01:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
objcopy: Improve wildcard matching for symbols with '!' prefix.
When using options such as --localize-symbol, --globalize-symbol, etc,
along with the --wildcard option, prefixing a symbol name with '!'
should provide non-matching behaviour, as example the following example
is given in the manual:
--wildcard --weaken-symbol !foo --weaken-symbol fo*
which should weaken all symbols matching the pattern 'fo*', but not the
symbol 'foo'.
However, this currently does not work, the current logic will waken all
symbols matching the pattern 'fo*' AND all symbols that are not 'foo'.
The symbol 'foo' is covered by the first condition, and so is weakened,
while, other symbols, for example 'bar' will match the second condition,
and so be weakened.
This patch adjusts the logic so that a pattern prefixed with '!'
specifically DOES NOT apply the relevant change to any matching symbols,
instead of applying the change to all non-matching symbols. So this:
--weaken-symbol !foo
will ensure that the symbol 'foo' is not weakened, but says nothing
about symbols that are not 'foo'. As a result, a pattern prefixed with
'!' now only makes sense when used alongside a more wide ranging
wildcard pattern.
This change should make the wildcard matching feature more useful, with
no overall loss of functionality. The example given in the manual,
weaken all symbols matching 'fo*' except 'foo' can now be achieved, but
so too can more complex examples, such as weaken all symbols matching
'fo*' except 'foo', 'foa', and 'fob', like this:
--wildcard --weaken-symbol !foo \
--weaken-symbol !foa \
--weaken-symbol !fob \
--weaken-symbol fo*
Under the previous scheme, something as symbols as, weaken all symbols
except 'foo' could have been achieved with this:
--weaken-symbol !foo
however, this will no longer work. To achieve the same result under the
new scheme this is now required:
--weaken-symbol !foo --weaken-symbol *
binutils/ChangeLog:
* objcopy.c (is_specified_symbol_predicate): Don't stop at first
match. Non-match rules set found to FALSE.
binutils/testsuite/ChangeLog:
* binutils-all/objcopy.exp: Run new symbol tests.
(objcopy_test_symbol_manipulation): New function.
* binutils-all/symbols-1.d: New file.
* binutils-all/symbols-2.d: New file.
* binutils-all/symbols-3.d: New file.
* binutils-all/symbols-4.d: New file.
* binutils-all/symbols.s: New file.
2015-07-31 14:48:22 +02:00
|
|
|
|
if (! fnmatch (slot_name + 1, d->name, 0))
|
2008-04-16 10:24:21 +02:00
|
|
|
|
{
|
objcopy: Improve wildcard matching for symbols with '!' prefix.
When using options such as --localize-symbol, --globalize-symbol, etc,
along with the --wildcard option, prefixing a symbol name with '!'
should provide non-matching behaviour, as example the following example
is given in the manual:
--wildcard --weaken-symbol !foo --weaken-symbol fo*
which should weaken all symbols matching the pattern 'fo*', but not the
symbol 'foo'.
However, this currently does not work, the current logic will waken all
symbols matching the pattern 'fo*' AND all symbols that are not 'foo'.
The symbol 'foo' is covered by the first condition, and so is weakened,
while, other symbols, for example 'bar' will match the second condition,
and so be weakened.
This patch adjusts the logic so that a pattern prefixed with '!'
specifically DOES NOT apply the relevant change to any matching symbols,
instead of applying the change to all non-matching symbols. So this:
--weaken-symbol !foo
will ensure that the symbol 'foo' is not weakened, but says nothing
about symbols that are not 'foo'. As a result, a pattern prefixed with
'!' now only makes sense when used alongside a more wide ranging
wildcard pattern.
This change should make the wildcard matching feature more useful, with
no overall loss of functionality. The example given in the manual,
weaken all symbols matching 'fo*' except 'foo' can now be achieved, but
so too can more complex examples, such as weaken all symbols matching
'fo*' except 'foo', 'foa', and 'fob', like this:
--wildcard --weaken-symbol !foo \
--weaken-symbol !foa \
--weaken-symbol !fob \
--weaken-symbol fo*
Under the previous scheme, something as symbols as, weaken all symbols
except 'foo' could have been achieved with this:
--weaken-symbol !foo
however, this will no longer work. To achieve the same result under the
new scheme this is now required:
--weaken-symbol !foo --weaken-symbol *
binutils/ChangeLog:
* objcopy.c (is_specified_symbol_predicate): Don't stop at first
match. Non-match rules set found to FALSE.
binutils/testsuite/ChangeLog:
* binutils-all/objcopy.exp: Run new symbol tests.
(objcopy_test_symbol_manipulation): New function.
* binutils-all/symbols-1.d: New file.
* binutils-all/symbols-2.d: New file.
* binutils-all/symbols-3.d: New file.
* binutils-all/symbols-4.d: New file.
* binutils-all/symbols.s: New file.
2015-07-31 14:48:22 +02:00
|
|
|
|
d->found = FALSE;
|
2008-04-16 10:24:21 +02:00
|
|
|
|
/* Stop traversal. */
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2003-11-11 18:50:26 +01:00
|
|
|
|
}
|
2001-07-31 15:49:39 +02:00
|
|
|
|
|
2008-04-16 10:24:21 +02: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 09:29:11 +02:00
|
|
|
|
}
|
|
|
|
|
|
2006-09-14 14:11:33 +02: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;
|
|
|
|
|
|
2016-06-02 17:20:27 +02:00
|
|
|
|
/* PR 20089: An earlier error may have prevented us from loading the symbol table. */
|
|
|
|
|
if (isympp == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
2006-09-14 14:11:33 +02:00
|
|
|
|
if (bfd_get_flavour (abfd) != bfd_target_elf_flavour)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
ghdr = &elf_section_data (group)->this_hdr;
|
2018-05-07 15:11:47 +02:00
|
|
|
|
if (ghdr->sh_link == elf_onesymtab (abfd))
|
2006-09-14 14:11:33 +02:00
|
|
|
|
{
|
|
|
|
|
const struct elf_backend_data *bed = get_elf_backend_data (abfd);
|
2018-05-07 15:11:47 +02:00
|
|
|
|
Elf_Internal_Shdr *symhdr = &elf_symtab_hdr (abfd);
|
2006-09-14 14:11:33 +02:00
|
|
|
|
|
2018-05-07 15:11:47 +02:00
|
|
|
|
if (ghdr->sh_info > 0
|
|
|
|
|
&& ghdr->sh_info < symhdr->sh_size / bed->s->sizeof_sym)
|
2006-09-15 01:37:35 +02:00
|
|
|
|
return isympp[ghdr->sh_info - 1];
|
2006-09-14 14:11:33 +02:00
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2012-05-08 19:49:36 +02:00
|
|
|
|
/* Return TRUE if the section is a DWO section. */
|
|
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
|
is_dwo_section (bfd *abfd ATTRIBUTE_UNUSED, asection *sec)
|
|
|
|
|
{
|
|
|
|
|
const char *name = bfd_get_section_name (abfd, sec);
|
|
|
|
|
int len = strlen (name);
|
|
|
|
|
|
|
|
|
|
return strncmp (name + len - 4, ".dwo", 4) == 0;
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-13 18:04:42 +01:00
|
|
|
|
/* Return TRUE if section SEC is in the update list. */
|
|
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
|
is_update_section (bfd *abfd ATTRIBUTE_UNUSED, asection *sec)
|
|
|
|
|
{
|
|
|
|
|
if (update_sections != NULL)
|
|
|
|
|
{
|
|
|
|
|
struct section_add *pupdate;
|
|
|
|
|
|
|
|
|
|
for (pupdate = update_sections;
|
2016-05-31 12:51:09 +02:00
|
|
|
|
pupdate != NULL;
|
|
|
|
|
pupdate = pupdate->next)
|
2015-02-13 18:04:42 +01:00
|
|
|
|
{
|
2016-05-31 12:51:09 +02:00
|
|
|
|
if (strcmp (sec->name, pupdate->name) == 0)
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
2015-02-13 18:04:42 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-01 12:09:46 +01:00
|
|
|
|
static bfd_boolean
|
|
|
|
|
is_merged_note_section (bfd * abfd, asection * sec)
|
|
|
|
|
{
|
|
|
|
|
if (merge_notes
|
|
|
|
|
&& bfd_get_flavour (abfd) == bfd_target_elf_flavour
|
|
|
|
|
&& elf_section_data (sec)->this_hdr.sh_type == SHT_NOTE
|
|
|
|
|
/* FIXME: We currently only support merging GNU_BUILD_NOTEs.
|
|
|
|
|
We should add support for more note types. */
|
2017-03-02 18:10:20 +01:00
|
|
|
|
&& ((elf_section_data (sec)->this_hdr.sh_flags & SHF_GNU_BUILD_NOTE) != 0
|
|
|
|
|
/* Old versions of GAS (prior to 2.27) could not set the section
|
|
|
|
|
flags to OS-specific values, so we also accept sections with the
|
|
|
|
|
expected name. */
|
|
|
|
|
|| (strcmp (sec->name, GNU_BUILD_ATTRS_SECTION_NAME) == 0)))
|
2017-03-01 12:09:46 +01:00
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
2011-09-16 06:23:19 +02:00
|
|
|
|
/* See if a non-group section is being removed. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2002-11-30 09:39:46 +01:00
|
|
|
|
static bfd_boolean
|
2011-09-16 06:23:19 +02:00
|
|
|
|
is_strip_section_1 (bfd *abfd ATTRIBUTE_UNUSED, asection *sec)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
2003-06-12 09:23:31 +02:00
|
|
|
|
if (sections_removed || sections_copied)
|
|
|
|
|
{
|
|
|
|
|
struct section_list *p;
|
2013-02-15 10:32:31 +01:00
|
|
|
|
struct section_list *q;
|
2003-06-12 09:23:31 +02:00
|
|
|
|
|
2013-02-15 10:32:31 +01:00
|
|
|
|
p = find_section_list (bfd_get_section_name (abfd, sec), FALSE,
|
|
|
|
|
SECTION_CONTEXT_REMOVE);
|
|
|
|
|
q = find_section_list (bfd_get_section_name (abfd, sec), FALSE,
|
|
|
|
|
SECTION_CONTEXT_COPY);
|
2003-06-12 09:23:31 +02:00
|
|
|
|
|
2013-02-15 10:32:31 +01:00
|
|
|
|
if (p && q)
|
|
|
|
|
fatal (_("error: section %s matches both remove and copy options"),
|
|
|
|
|
bfd_get_section_name (abfd, sec));
|
2015-02-13 18:04:42 +01:00
|
|
|
|
if (p && is_update_section (abfd, sec))
|
2016-05-31 12:51:09 +02:00
|
|
|
|
fatal (_("error: section %s matches both update and remove options"),
|
|
|
|
|
bfd_get_section_name (abfd, sec));
|
2013-02-15 10:32:31 +01:00
|
|
|
|
|
|
|
|
|
if (p != NULL)
|
2003-06-12 09:23:31 +02:00
|
|
|
|
return TRUE;
|
2013-02-15 10:32:31 +01:00
|
|
|
|
if (sections_copied && q == NULL)
|
2003-06-12 09:23:31 +02:00
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2003-06-12 09:23:31 +02:00
|
|
|
|
if ((bfd_get_section_flags (abfd, sec) & SEC_DEBUGGING) != 0)
|
|
|
|
|
{
|
|
|
|
|
if (strip_symbols == STRIP_DEBUG
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|| strip_symbols == STRIP_UNNEEDED
|
|
|
|
|
|| strip_symbols == STRIP_ALL
|
|
|
|
|
|| discard_locals == LOCALS_ALL
|
2003-06-12 09:23:31 +02:00
|
|
|
|
|| convert_debugging)
|
2012-10-18 19:29:54 +02:00
|
|
|
|
{
|
|
|
|
|
/* By default we don't want to strip .reloc section.
|
|
|
|
|
This section has for pe-coff special meaning. See
|
|
|
|
|
pe-dll.c file in ld, and peXXigen.c in bfd for details. */
|
|
|
|
|
if (strcmp (bfd_get_section_name (abfd, sec), ".reloc") != 0)
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
2003-06-26 10:14:10 +02:00
|
|
|
|
|
2012-05-08 19:49:36 +02:00
|
|
|
|
if (strip_symbols == STRIP_DWO)
|
|
|
|
|
return is_dwo_section (abfd, sec);
|
|
|
|
|
|
2003-06-26 10:14:10 +02:00
|
|
|
|
if (strip_symbols == STRIP_NONDEBUG)
|
|
|
|
|
return FALSE;
|
2003-06-12 09:23:31 +02:00
|
|
|
|
}
|
1999-06-12 17:42:04 +02:00
|
|
|
|
|
2012-05-08 19:49:36 +02:00
|
|
|
|
if (strip_symbols == STRIP_NONDWO)
|
|
|
|
|
return !is_dwo_section (abfd, sec);
|
|
|
|
|
|
2011-09-16 06:23:19 +02:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* See if a section is being removed. */
|
|
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
|
is_strip_section (bfd *abfd ATTRIBUTE_UNUSED, asection *sec)
|
|
|
|
|
{
|
|
|
|
|
if (is_strip_section_1 (abfd, sec))
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
2006-09-14 14:11:33 +02:00
|
|
|
|
if ((bfd_get_section_flags (abfd, sec) & SEC_GROUP) != 0)
|
|
|
|
|
{
|
|
|
|
|
asymbol *gsym;
|
|
|
|
|
const char *gname;
|
2011-09-16 06:23:19 +02:00
|
|
|
|
asection *elt, *first;
|
2006-09-14 14:11:33 +02:00
|
|
|
|
|
2018-05-08 07:02:04 +02:00
|
|
|
|
gsym = group_signature (sec);
|
|
|
|
|
/* Strip groups without a valid signature. */
|
|
|
|
|
if (gsym == NULL)
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
2006-09-14 14:11:33 +02:00
|
|
|
|
/* PR binutils/3181
|
|
|
|
|
If we are going to strip the group signature symbol, then
|
|
|
|
|
strip the group section too. */
|
2018-05-08 07:02:04 +02:00
|
|
|
|
gname = gsym->name;
|
2006-09-14 14:11:33 +02:00
|
|
|
|
if ((strip_symbols == STRIP_ALL
|
2008-04-16 10:24:21 +02:00
|
|
|
|
&& !is_specified_symbol (gname, keep_specific_htab))
|
|
|
|
|
|| is_specified_symbol (gname, strip_specific_htab))
|
2006-09-14 14:11:33 +02:00
|
|
|
|
return TRUE;
|
2011-09-16 06:23:19 +02:00
|
|
|
|
|
|
|
|
|
/* Remove the group section if all members are removed. */
|
|
|
|
|
first = elt = elf_next_in_group (sec);
|
|
|
|
|
while (elt != NULL)
|
|
|
|
|
{
|
|
|
|
|
if (!is_strip_section_1 (abfd, elt))
|
|
|
|
|
return FALSE;
|
|
|
|
|
elt = elf_next_in_group (elt);
|
|
|
|
|
if (elt == first)
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
2006-09-14 14:11:33 +02:00
|
|
|
|
}
|
2006-09-05 10:22:27 +02:00
|
|
|
|
|
2004-01-13 16:41:00 +01:00
|
|
|
|
return FALSE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
}
|
|
|
|
|
|
2014-05-16 16:34:13 +02:00
|
|
|
|
static bfd_boolean
|
|
|
|
|
is_nondebug_keep_contents_section (bfd *ibfd, asection *isection)
|
|
|
|
|
{
|
|
|
|
|
/* Always keep ELF note sections. */
|
|
|
|
|
if (ibfd->xvec->flavour == bfd_target_elf_flavour)
|
|
|
|
|
return (elf_section_type (isection) == SHT_NOTE);
|
|
|
|
|
|
Change pe/coff build-id section name to '.buildid'
The section name used to store the build-id on pe/coff is arbitrary, as it's
contents should be located using the pe/coff header's DataDirectory debug data
entry, not by using the section name.
But '.build-id' is not a good choice for that section name, as it is 9
characters long, and hence truncated to 8 characters when
--disable-long-section-names is used (which is the default, when producing an
executable with no dwarf debug sections, e.g. using ld --strip-all --build-id)
This truncation then breaks 'objcopy --only-keep-debug', which does use the
section name, due to concerns that keeping an arbitrary section which contains
the debug directory is not sensible.
binutils/ChangeLog
2014-09-01 Jon TURNEY <jon.turney@dronecode.org.uk>
* objcopy.c (is_nondebug_keep_contents_section): Change pe/coff
build-id section name from '.build-id' to '.buildid'.
ld/ChangeLog
2014-09-01 Jon TURNEY <jon.turney@dronecode.org.uk>
* emultempl/pe.em (write_build_id, setup_build_id): Change pe/coff
build-id section name from '.build-id' to '.buildid'.
* emultempl/pep.em (write_build_id, setup_build_id): Ditto.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2014-08-30 16:02:49 +02:00
|
|
|
|
/* Always keep the .buildid section for PE/COFF.
|
2014-05-16 16:34:13 +02:00
|
|
|
|
|
|
|
|
|
Strictly, this should be written "always keep the section storing the debug
|
|
|
|
|
directory", but that may be the .text section for objects produced by some
|
|
|
|
|
tools, which it is not sensible to keep. */
|
|
|
|
|
if (ibfd->xvec->flavour == bfd_target_coff_flavour)
|
Change pe/coff build-id section name to '.buildid'
The section name used to store the build-id on pe/coff is arbitrary, as it's
contents should be located using the pe/coff header's DataDirectory debug data
entry, not by using the section name.
But '.build-id' is not a good choice for that section name, as it is 9
characters long, and hence truncated to 8 characters when
--disable-long-section-names is used (which is the default, when producing an
executable with no dwarf debug sections, e.g. using ld --strip-all --build-id)
This truncation then breaks 'objcopy --only-keep-debug', which does use the
section name, due to concerns that keeping an arbitrary section which contains
the debug directory is not sensible.
binutils/ChangeLog
2014-09-01 Jon TURNEY <jon.turney@dronecode.org.uk>
* objcopy.c (is_nondebug_keep_contents_section): Change pe/coff
build-id section name from '.build-id' to '.buildid'.
ld/ChangeLog
2014-09-01 Jon TURNEY <jon.turney@dronecode.org.uk>
* emultempl/pe.em (write_build_id, setup_build_id): Change pe/coff
build-id section name from '.build-id' to '.buildid'.
* emultempl/pep.em (write_build_id, setup_build_id): Ditto.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2014-08-30 16:02:49 +02:00
|
|
|
|
return (strcmp (bfd_get_section_name (ibfd, isection), ".buildid") == 0);
|
2014-05-16 16:34:13 +02:00
|
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
2006-06-23 18:23:09 +02: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;
|
|
|
|
|
}
|
|
|
|
|
|
2015-10-21 16:16:35 +02:00
|
|
|
|
static bfd_boolean
|
|
|
|
|
need_sym_before (struct addsym_node **node, const char *sym)
|
|
|
|
|
{
|
|
|
|
|
int count;
|
|
|
|
|
struct addsym_node *ptr = add_sym_list;
|
|
|
|
|
|
|
|
|
|
/* 'othersym' symbols are at the front of the list. */
|
|
|
|
|
for (count = 0; count < add_symbols; count++)
|
|
|
|
|
{
|
|
|
|
|
if (!ptr->othersym)
|
|
|
|
|
break;
|
|
|
|
|
else if (strcmp (ptr->othersym, sym) == 0)
|
|
|
|
|
{
|
|
|
|
|
free (ptr->othersym);
|
|
|
|
|
ptr->othersym = ""; /* Empty name is hopefully never a valid symbol name. */
|
|
|
|
|
*node = ptr;
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
ptr = ptr->next;
|
|
|
|
|
}
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static asymbol *
|
|
|
|
|
create_new_symbol (struct addsym_node *ptr, bfd *obfd)
|
|
|
|
|
{
|
2016-05-31 12:51:09 +02:00
|
|
|
|
asymbol *sym = bfd_make_empty_symbol (obfd);
|
2015-10-21 16:16:35 +02:00
|
|
|
|
|
2016-05-31 12:51:09 +02:00
|
|
|
|
bfd_asymbol_name (sym) = ptr->symdef;
|
2015-10-21 16:16:35 +02:00
|
|
|
|
sym->value = ptr->symval;
|
|
|
|
|
sym->flags = ptr->flags;
|
|
|
|
|
if (ptr->section)
|
|
|
|
|
{
|
|
|
|
|
asection *sec = bfd_get_section_by_name (obfd, ptr->section);
|
|
|
|
|
if (!sec)
|
|
|
|
|
fatal (_("Section %s not found"), ptr->section);
|
|
|
|
|
sym->section = sec;
|
|
|
|
|
}
|
2016-05-31 12:51:09 +02:00
|
|
|
|
else
|
|
|
|
|
sym->section = bfd_abs_section_ptr;
|
2015-10-21 16:16:35 +02:00
|
|
|
|
return sym;
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 09:29:11 +02: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-23 19:34:03 +02:00
|
|
|
|
filter_symbols (bfd *abfd, bfd *obfd, asymbol **osyms,
|
|
|
|
|
asymbol **isyms, long symcount)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
2003-07-23 19:34:03 +02:00
|
|
|
|
asymbol **from = isyms, **to = osyms;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
long src_count = 0, dst_count = 0;
|
2007-07-02 10:05:06 +02:00
|
|
|
|
int relocatable = (abfd->flags & (EXEC_P | DYNAMIC)) == 0;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
for (; src_count < symcount; src_count++)
|
|
|
|
|
{
|
|
|
|
|
asymbol *sym = from[src_count];
|
|
|
|
|
flagword flags = sym->flags;
|
2002-12-13 14:19:44 +01:00
|
|
|
|
char *name = (char *) bfd_asymbol_name (sym);
|
2007-04-24 12:56:58 +02:00
|
|
|
|
bfd_boolean keep;
|
|
|
|
|
bfd_boolean used_in_reloc = FALSE;
|
2002-11-30 09:39:46 +01:00
|
|
|
|
bfd_boolean undefined;
|
2002-12-13 14:19:44 +01:00
|
|
|
|
bfd_boolean rem_leading_char;
|
|
|
|
|
bfd_boolean add_leading_char;
|
|
|
|
|
|
|
|
|
|
undefined = bfd_is_und_section (bfd_get_section (sym));
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2015-10-21 16:16:35 +02:00
|
|
|
|
if (add_sym_list)
|
|
|
|
|
{
|
|
|
|
|
struct addsym_node *ptr;
|
|
|
|
|
|
|
|
|
|
if (need_sym_before (&ptr, name))
|
|
|
|
|
to[dst_count++] = create_new_symbol (ptr, obfd);
|
|
|
|
|
}
|
|
|
|
|
|
2017-04-05 18:22:47 +02:00
|
|
|
|
if (htab_elements (redefine_specific_htab) || section_rename_list)
|
2000-04-05 05:43:56 +02:00
|
|
|
|
{
|
2016-06-23 14:41:57 +02:00
|
|
|
|
char *new_name;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
2016-06-23 14:41:57 +02:00
|
|
|
|
new_name = (char *) lookup_sym_redefinition (name);
|
|
|
|
|
if (new_name == name
|
|
|
|
|
&& (flags & BSF_SECTION_SYM) != 0)
|
|
|
|
|
new_name = (char *) find_section_rename (name, NULL);
|
2003-02-21 02:12:13 +01:00
|
|
|
|
bfd_asymbol_name (sym) = new_name;
|
|
|
|
|
name = new_name;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
}
|
|
|
|
|
|
2002-12-13 14:19:44 +01: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)
|
2016-05-31 12:51:09 +02:00
|
|
|
|
{
|
2002-12-13 14:19:44 +01:00
|
|
|
|
name[0] = bfd_get_symbol_leading_char (obfd);
|
|
|
|
|
bfd_asymbol_name (sym) = name;
|
|
|
|
|
rem_leading_char = FALSE;
|
|
|
|
|
add_leading_char = FALSE;
|
2016-05-31 12:51:09 +02:00
|
|
|
|
}
|
2002-12-13 14:19:44 +01:00
|
|
|
|
|
|
|
|
|
/* Remove leading char. */
|
|
|
|
|
if (rem_leading_char)
|
2003-02-21 02:12:13 +01:00
|
|
|
|
bfd_asymbol_name (sym) = ++name;
|
2002-12-13 14:19:44 +01:00
|
|
|
|
|
|
|
|
|
/* Add new leading char and/or prefix. */
|
|
|
|
|
if (add_leading_char || prefix_symbols_string)
|
2016-05-31 12:51:09 +02:00
|
|
|
|
{
|
|
|
|
|
char *n, *ptr;
|
2002-12-13 14:19:44 +01:00
|
|
|
|
|
2016-05-31 12:51:09 +02:00
|
|
|
|
ptr = n = (char *) xmalloc (1 + strlen (prefix_symbols_string)
|
|
|
|
|
+ strlen (name) + 1);
|
|
|
|
|
if (add_leading_char)
|
2002-12-13 14:19:44 +01:00
|
|
|
|
*ptr++ = bfd_get_symbol_leading_char (obfd);
|
|
|
|
|
|
2016-05-31 12:51:09 +02:00
|
|
|
|
if (prefix_symbols_string)
|
|
|
|
|
{
|
|
|
|
|
strcpy (ptr, prefix_symbols_string);
|
|
|
|
|
ptr += strlen (prefix_symbols_string);
|
|
|
|
|
}
|
2002-12-13 14:19:44 +01:00
|
|
|
|
|
2016-05-31 12:51:09 +02:00
|
|
|
|
strcpy (ptr, name);
|
|
|
|
|
bfd_asymbol_name (sym) = n;
|
|
|
|
|
name = n;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (strip_symbols == STRIP_ALL)
|
2007-04-24 12:56:58 +02:00
|
|
|
|
keep = FALSE;
|
1999-05-03 09:29:11 +02: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 12:56:58 +02:00
|
|
|
|
{
|
|
|
|
|
keep = TRUE;
|
|
|
|
|
used_in_reloc = TRUE;
|
|
|
|
|
}
|
2002-05-21 21:34:58 +02:00
|
|
|
|
else if (relocatable /* Relocatable file. */
|
2009-03-10 01:48:10 +01:00
|
|
|
|
&& ((flags & (BSF_GLOBAL | BSF_WEAK)) != 0
|
|
|
|
|
|| bfd_is_com_section (bfd_get_section (sym))))
|
2007-04-24 12:56:58 +02:00
|
|
|
|
keep = TRUE;
|
2001-05-30 12:46:28 +02:00
|
|
|
|
else if (bfd_decode_symclass (sym) == 'I')
|
|
|
|
|
/* Global symbols in $idata sections need to be retained
|
2002-11-30 09:39:46 +01:00
|
|
|
|
even if relocatable is FALSE. External users of the
|
2001-05-30 12:46:28 +02:00
|
|
|
|
library containing the $idata section may reference these
|
|
|
|
|
symbols. */
|
2007-04-24 12:56:58 +02:00
|
|
|
|
keep = TRUE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
else if ((flags & BSF_GLOBAL) != 0 /* Global symbol. */
|
|
|
|
|
|| (flags & BSF_WEAK) != 0
|
2001-07-05 09:27:16 +02:00
|
|
|
|
|| undefined
|
1999-05-03 09:29:11 +02: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 17:42:58 +02:00
|
|
|
|
else if (bfd_coff_get_comdat_section (abfd, bfd_get_section (sym)))
|
2001-06-22 11:02:05 +02:00
|
|
|
|
/* COMDAT sections store special information in local
|
|
|
|
|
symbols, so we cannot risk stripping any of them. */
|
2007-04-24 12:56:58 +02:00
|
|
|
|
keep = TRUE;
|
1999-05-03 09:29:11 +02: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 10:24:21 +02:00
|
|
|
|
if (keep && is_specified_symbol (name, strip_specific_htab))
|
2007-04-24 12:56:58 +02: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 14:16:33 +01:00
|
|
|
|
if (keep
|
|
|
|
|
&& !(flags & BSF_KEEP)
|
2008-04-16 10:24:21 +02:00
|
|
|
|
&& is_specified_symbol (name, strip_unneeded_htab))
|
2007-04-24 12:56:58 +02:00
|
|
|
|
keep = FALSE;
|
|
|
|
|
|
2005-11-15 09:33:38 +01:00
|
|
|
|
if (!keep
|
|
|
|
|
&& ((keep_file_symbols && (flags & BSF_FILE))
|
2008-04-16 10:24:21 +02:00
|
|
|
|
|| is_specified_symbol (name, keep_specific_htab)))
|
2007-04-24 12:56:58 +02:00
|
|
|
|
keep = TRUE;
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
if (keep && is_strip_section (abfd, bfd_get_section (sym)))
|
2007-04-24 12:56:58 +02:00
|
|
|
|
keep = FALSE;
|
2001-07-05 09:49:05 +02:00
|
|
|
|
|
2005-03-15 18:45:19 +01:00
|
|
|
|
if (keep)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
2005-03-15 18:45:19 +01:00
|
|
|
|
if ((flags & BSF_GLOBAL) != 0
|
2008-04-16 10:24:21 +02:00
|
|
|
|
&& (weaken || is_specified_symbol (name, weaken_specific_htab)))
|
2005-03-15 18:45:19 +01:00
|
|
|
|
{
|
|
|
|
|
sym->flags &= ~ BSF_GLOBAL;
|
|
|
|
|
sym->flags |= BSF_WEAK;
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2005-03-15 18:45:19 +01:00
|
|
|
|
if (!undefined
|
|
|
|
|
&& (flags & (BSF_GLOBAL | BSF_WEAK))
|
2008-04-16 10:24:21 +02:00
|
|
|
|
&& (is_specified_symbol (name, localize_specific_htab)
|
|
|
|
|
|| (htab_elements (keepglobal_specific_htab) != 0
|
|
|
|
|
&& ! is_specified_symbol (name, keepglobal_specific_htab))
|
2006-06-23 18:23:09 +02:00
|
|
|
|
|| (localize_hidden && is_hidden_symbol (sym))))
|
2005-03-15 18:45:19 +01:00
|
|
|
|
{
|
|
|
|
|
sym->flags &= ~ (BSF_GLOBAL | BSF_WEAK);
|
|
|
|
|
sym->flags |= BSF_LOCAL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!undefined
|
2007-06-29 02:34:14 +02:00
|
|
|
|
&& (flags & BSF_LOCAL)
|
2008-04-16 10:24:21 +02:00
|
|
|
|
&& is_specified_symbol (name, globalize_specific_htab))
|
2005-03-15 18:45:19 +01:00
|
|
|
|
{
|
|
|
|
|
sym->flags &= ~ BSF_LOCAL;
|
|
|
|
|
sym->flags |= BSF_GLOBAL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
to[dst_count++] = sym;
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
}
|
2015-10-21 16:16:35 +02:00
|
|
|
|
if (add_sym_list)
|
|
|
|
|
{
|
|
|
|
|
struct addsym_node *ptr = add_sym_list;
|
|
|
|
|
|
|
|
|
|
for (src_count = 0; src_count < add_symbols; src_count++)
|
|
|
|
|
{
|
|
|
|
|
if (ptr->othersym)
|
|
|
|
|
{
|
|
|
|
|
if (strcmp (ptr->othersym, ""))
|
|
|
|
|
fatal (_("'before=%s' not found"), ptr->othersym);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
to[dst_count++] = create_new_symbol (ptr, obfd);
|
|
|
|
|
|
|
|
|
|
ptr = ptr->next;
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
to[dst_count] = NULL;
|
|
|
|
|
|
|
|
|
|
return dst_count;
|
|
|
|
|
}
|
|
|
|
|
|
2001-07-31 15:49:39 +02:00
|
|
|
|
/* Find the redefined name of symbol SOURCE. */
|
|
|
|
|
|
2000-04-05 05:43:56 +02:00
|
|
|
|
static const char *
|
2003-07-23 19:34:03 +02:00
|
|
|
|
lookup_sym_redefinition (const char *source)
|
2000-04-05 05:43:56 +02:00
|
|
|
|
{
|
2017-04-05 18:22:47 +02:00
|
|
|
|
struct redefine_node key_node = {(char *) source, NULL};
|
|
|
|
|
struct redefine_node *redef_node
|
|
|
|
|
= (struct redefine_node *) htab_find (redefine_specific_htab, &key_node);
|
2001-07-31 15:49:39 +02:00
|
|
|
|
|
2017-04-05 18:22:47 +02:00
|
|
|
|
return redef_node == NULL ? source : redef_node->target;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
}
|
|
|
|
|
|
2017-04-05 18:22:47 +02:00
|
|
|
|
/* Insert a node into symbol redefine hash tabel. */
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
|
|
|
|
static void
|
2017-04-05 18:22:47 +02:00
|
|
|
|
add_redefine_and_check (const char *cause, const char *source,
|
|
|
|
|
const char *target)
|
2000-04-05 05:43:56 +02:00
|
|
|
|
{
|
2017-04-05 18:22:47 +02:00
|
|
|
|
struct redefine_node *new_node
|
|
|
|
|
= (struct redefine_node *) xmalloc (sizeof (struct redefine_node));
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
2017-04-05 18:22:47 +02:00
|
|
|
|
new_node->source = strdup (source);
|
|
|
|
|
new_node->target = strdup (target);
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
2017-04-05 18:22:47 +02:00
|
|
|
|
if (htab_find (redefine_specific_htab, new_node) != HTAB_EMPTY_ENTRY)
|
|
|
|
|
fatal (_("%s: Multiple redefinition of symbol \"%s\""),
|
|
|
|
|
cause, source);
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
2017-04-05 18:22:47 +02:00
|
|
|
|
if (htab_find (redefine_specific_reverse_htab, target) != HTAB_EMPTY_ENTRY)
|
|
|
|
|
fatal (_("%s: Symbol \"%s\" is target of more than one redefinition"),
|
|
|
|
|
cause, target);
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
2017-04-05 18:22:47 +02:00
|
|
|
|
/* Insert the NEW_NODE into hash table for quick search. */
|
|
|
|
|
add_specific_symbol_node (new_node, redefine_specific_htab);
|
|
|
|
|
|
|
|
|
|
/* Insert the target string into the reverse hash table, this is needed for
|
|
|
|
|
duplicated target string check. */
|
|
|
|
|
add_specific_symbol (new_node->target, redefine_specific_reverse_htab);
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
2003-06-02 16:45:13 +02: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 09:23:31 +02:00
|
|
|
|
static void
|
2003-07-23 19:34:03 +02:00
|
|
|
|
add_redefine_syms_file (const char *filename)
|
2003-06-02 16:45:13 +02:00
|
|
|
|
{
|
|
|
|
|
FILE *file;
|
|
|
|
|
char *buf;
|
2003-07-23 19:34:03 +02:00
|
|
|
|
size_t bufsize;
|
|
|
|
|
size_t len;
|
|
|
|
|
size_t outsym_off;
|
2003-06-02 16:45:13 +02:00
|
|
|
|
int c, lineno;
|
|
|
|
|
|
|
|
|
|
file = fopen (filename, "r");
|
2003-08-05 16:40:54 +02:00
|
|
|
|
if (file == NULL)
|
2003-06-02 16:45:13 +02:00
|
|
|
|
fatal (_("couldn't open symbol redefinition file %s (error: %s)"),
|
|
|
|
|
filename, strerror (errno));
|
|
|
|
|
|
|
|
|
|
bufsize = 100;
|
2009-12-31 15:40:36 +01:00
|
|
|
|
buf = (char *) xmalloc (bufsize + 1 /* For the terminating NUL. */);
|
2003-06-02 16:45:13 +02: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 15:40:36 +01:00
|
|
|
|
buf = (char *) xrealloc (buf, bufsize + 1);
|
2003-06-02 16:45:13 +02: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 15:40:36 +01:00
|
|
|
|
buf = (char *) xrealloc (buf, bufsize + 1);
|
2003-06-02 16:45:13 +02: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)
|
|
|
|
|
{
|
2016-05-31 12:51:09 +02:00
|
|
|
|
end_of_line:
|
2003-06-02 16:45:13 +02:00
|
|
|
|
/* Append the redefinition to the list. */
|
|
|
|
|
if (buf[0] != '\0')
|
2017-04-05 18:22:47 +02:00
|
|
|
|
add_redefine_and_check (filename, &buf[0], &buf[outsym_off]);
|
2003-06-02 16:45:13 +02:00
|
|
|
|
|
2007-06-29 02:34:14 +02:00
|
|
|
|
lineno++;
|
2003-06-02 16:45:13 +02:00
|
|
|
|
len = 0;
|
|
|
|
|
outsym_off = 0;
|
|
|
|
|
if (c == EOF)
|
|
|
|
|
break;
|
|
|
|
|
c = getc (file);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
else
|
2004-10-18 16:04:40 +02:00
|
|
|
|
fatal (_("%s:%d: garbage found at end of line"), filename, lineno);
|
2016-05-31 12:51:09 +02:00
|
|
|
|
comment:
|
2003-06-02 16:45:13 +02:00
|
|
|
|
if (len != 0 && (outsym_off == 0 || outsym_off == len))
|
2004-10-18 16:04:40 +02:00
|
|
|
|
fatal (_("%s:%d: missing new symbol name"), filename, lineno);
|
2003-06-02 16:45:13 +02: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 16:04:40 +02:00
|
|
|
|
fatal (_("%s:%d: premature end of file"), filename, lineno);
|
2003-06-02 16:45:13 +02:00
|
|
|
|
|
|
|
|
|
free (buf);
|
2018-07-20 16:05:34 +02:00
|
|
|
|
fclose (file);
|
2003-06-02 16:45:13 +02:00
|
|
|
|
}
|
|
|
|
|
|
2016-11-25 21:01:40 +01:00
|
|
|
|
/* Copy unknown object file IBFD onto OBFD.
|
2005-06-14 15:26:42 +02:00
|
|
|
|
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 14:03:21 +01:00
|
|
|
|
bfd_nonfatal_message (NULL, ibfd, NULL, NULL);
|
2005-06-14 15:26:42 +02: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 15:40:44 +02:00
|
|
|
|
cbuf = (char *) xmalloc (BUFSIZE);
|
2005-06-14 15:26:42 +02: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 14:03:21 +01:00
|
|
|
|
bfd_nonfatal_message (NULL, ibfd, NULL, NULL);
|
2005-06-14 15:26:42 +02:00
|
|
|
|
free (cbuf);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (bfd_bwrite (cbuf, (bfd_size_type) tocopy, obfd)
|
|
|
|
|
!= (bfd_size_type) tocopy)
|
|
|
|
|
{
|
2007-08-30 12:19:03 +02:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, NULL, NULL);
|
2005-06-14 15:26:42 +02:00
|
|
|
|
free (cbuf);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ncopied += tocopy;
|
|
|
|
|
}
|
|
|
|
|
|
2011-04-04 03:35:59 +02: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 15:26:42 +02:00
|
|
|
|
free (cbuf);
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
2017-04-13 15:50:56 +02:00
|
|
|
|
/* Returns the number of bytes needed to store VAL. */
|
|
|
|
|
|
|
|
|
|
static inline unsigned int
|
|
|
|
|
num_bytes (unsigned long val)
|
|
|
|
|
{
|
|
|
|
|
unsigned int count = 0;
|
|
|
|
|
|
|
|
|
|
/* FIXME: There must be a faster way to do this. */
|
|
|
|
|
while (val)
|
|
|
|
|
{
|
|
|
|
|
count ++;
|
|
|
|
|
val >>= 8;
|
|
|
|
|
}
|
|
|
|
|
return count;
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-03 11:28:33 +01:00
|
|
|
|
typedef struct objcopy_internal_note
|
|
|
|
|
{
|
|
|
|
|
Elf_Internal_Note note;
|
|
|
|
|
bfd_vma start;
|
|
|
|
|
bfd_vma end;
|
|
|
|
|
bfd_boolean modified;
|
|
|
|
|
} objcopy_internal_note;
|
|
|
|
|
|
|
|
|
|
/* Returns TRUE if a gap does, or could, exist between the address range
|
|
|
|
|
covered by PNOTE1 and PNOTE2. */
|
|
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
|
gap_exists (objcopy_internal_note * pnote1,
|
|
|
|
|
objcopy_internal_note * pnote2)
|
|
|
|
|
{
|
|
|
|
|
/* Without range end notes, we assume that a gap might exist. */
|
|
|
|
|
if (pnote1->end == 0 || pnote2->end == 0)
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
/* FIXME: Alignment of 16 bytes taken from x86_64 binaries.
|
|
|
|
|
Really we should extract the alignment of the section covered by the notes. */
|
|
|
|
|
return BFD_ALIGN (pnote1->end, 16) < pnote2->start;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
|
is_open_note (objcopy_internal_note * pnote)
|
|
|
|
|
{
|
|
|
|
|
return (pnote->note.type == NT_GNU_BUILD_ATTRIBUTE_OPEN);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
|
is_func_note (objcopy_internal_note * pnote)
|
|
|
|
|
{
|
|
|
|
|
return (pnote->note.type == NT_GNU_BUILD_ATTRIBUTE_FUNC);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
|
is_64bit (bfd * abfd)
|
|
|
|
|
{
|
|
|
|
|
/* Should never happen, but let's be paranoid. */
|
|
|
|
|
if (bfd_get_flavour (abfd) != bfd_target_elf_flavour)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
return elf_elfheader (abfd)->e_ident[EI_CLASS] == ELFCLASS64;
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-01 12:09:46 +01:00
|
|
|
|
/* Merge the notes on SEC, removing redundant entries.
|
|
|
|
|
Returns the new, smaller size of the section upon success. */
|
|
|
|
|
|
|
|
|
|
static bfd_size_type
|
|
|
|
|
merge_gnu_build_notes (bfd * abfd, asection * sec, bfd_size_type size, bfd_byte * contents)
|
|
|
|
|
{
|
2018-01-03 11:28:33 +01:00
|
|
|
|
objcopy_internal_note * pnotes_end;
|
|
|
|
|
objcopy_internal_note * pnotes = NULL;
|
|
|
|
|
objcopy_internal_note * pnote;
|
2017-03-01 12:09:46 +01:00
|
|
|
|
bfd_size_type remain = size;
|
2017-06-28 15:52:12 +02:00
|
|
|
|
unsigned version_1_seen = 0;
|
|
|
|
|
unsigned version_2_seen = 0;
|
2018-01-03 11:28:33 +01:00
|
|
|
|
unsigned version_3_seen = 0;
|
2017-03-01 12:09:46 +01:00
|
|
|
|
bfd_boolean duplicate_found = FALSE;
|
|
|
|
|
const char * err = NULL;
|
|
|
|
|
bfd_byte * in = contents;
|
2017-06-28 15:52:12 +02:00
|
|
|
|
int attribute_type_byte;
|
|
|
|
|
int val_start;
|
2018-01-03 11:28:33 +01:00
|
|
|
|
unsigned long previous_func_start = 0;
|
|
|
|
|
unsigned long previous_open_start = 0;
|
|
|
|
|
unsigned long previous_func_end = 0;
|
|
|
|
|
unsigned long previous_open_end = 0;
|
|
|
|
|
long relsize;
|
|
|
|
|
|
2017-03-01 12:09:46 +01:00
|
|
|
|
|
2018-01-03 11:28:33 +01:00
|
|
|
|
relsize = bfd_get_reloc_upper_bound (abfd, sec);
|
|
|
|
|
if (relsize > 0)
|
|
|
|
|
{
|
|
|
|
|
arelent ** relpp;
|
|
|
|
|
long relcount;
|
|
|
|
|
|
|
|
|
|
/* If there are relocs associated with this section then we
|
|
|
|
|
cannot safely merge it. */
|
|
|
|
|
relpp = (arelent **) xmalloc (relsize);
|
|
|
|
|
relcount = bfd_canonicalize_reloc (abfd, sec, relpp, isympp);
|
|
|
|
|
free (relpp);
|
|
|
|
|
if (relcount != 0)
|
|
|
|
|
goto done;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Make a copy of the notes and convert to our internal format.
|
2017-03-01 12:09:46 +01:00
|
|
|
|
Minimum size of a note is 12 bytes. */
|
2018-01-03 11:28:33 +01:00
|
|
|
|
pnote = pnotes = (objcopy_internal_note *) xcalloc ((size / 12), sizeof (* pnote));
|
2017-03-01 12:09:46 +01:00
|
|
|
|
while (remain >= 12)
|
|
|
|
|
{
|
2018-01-03 11:28:33 +01:00
|
|
|
|
bfd_vma start, end;
|
|
|
|
|
|
|
|
|
|
pnote->note.namesz = (bfd_get_32 (abfd, in ) + 3) & ~3;
|
|
|
|
|
pnote->note.descsz = (bfd_get_32 (abfd, in + 4) + 3) & ~3;
|
|
|
|
|
pnote->note.type = bfd_get_32 (abfd, in + 8);
|
2017-03-01 12:09:46 +01:00
|
|
|
|
|
2018-01-03 11:28:33 +01:00
|
|
|
|
if (pnote->note.type != NT_GNU_BUILD_ATTRIBUTE_OPEN
|
|
|
|
|
&& pnote->note.type != NT_GNU_BUILD_ATTRIBUTE_FUNC)
|
2017-03-01 12:09:46 +01:00
|
|
|
|
{
|
|
|
|
|
err = _("corrupt GNU build attribute note: wrong note type");
|
|
|
|
|
goto done;
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-03 11:28:33 +01:00
|
|
|
|
if (pnote->note.namesz + pnote->note.descsz + 12 > remain)
|
2017-03-01 12:09:46 +01:00
|
|
|
|
{
|
|
|
|
|
err = _("corrupt GNU build attribute note: note too big");
|
|
|
|
|
goto done;
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-03 11:28:33 +01:00
|
|
|
|
if (pnote->note.namesz < 2)
|
2017-03-01 12:09:46 +01:00
|
|
|
|
{
|
|
|
|
|
err = _("corrupt GNU build attribute note: name too small");
|
|
|
|
|
goto done;
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-03 11:28:33 +01:00
|
|
|
|
pnote->note.namedata = (char *)(in + 12);
|
|
|
|
|
pnote->note.descdata = (char *)(in + 12 + pnote->note.namesz);
|
|
|
|
|
|
|
|
|
|
remain -= 12 + pnote->note.namesz + pnote->note.descsz;
|
|
|
|
|
in += 12 + pnote->note.namesz + pnote->note.descsz;
|
|
|
|
|
|
|
|
|
|
if (pnote->note.namesz > 2
|
|
|
|
|
&& pnote->note.namedata[0] == '$'
|
|
|
|
|
&& pnote->note.namedata[1] == GNU_BUILD_ATTRIBUTE_VERSION
|
|
|
|
|
&& pnote->note.namedata[2] == '1')
|
|
|
|
|
++ version_1_seen;
|
|
|
|
|
else if (pnote->note.namesz > 4
|
|
|
|
|
&& pnote->note.namedata[0] == 'G'
|
|
|
|
|
&& pnote->note.namedata[1] == 'A'
|
|
|
|
|
&& pnote->note.namedata[2] == '$'
|
|
|
|
|
&& pnote->note.namedata[3] == GNU_BUILD_ATTRIBUTE_VERSION)
|
|
|
|
|
{
|
|
|
|
|
if (pnote->note.namedata[4] == '2')
|
|
|
|
|
++ version_2_seen;
|
|
|
|
|
else if (pnote->note.namedata[4] == '3')
|
|
|
|
|
++ version_3_seen;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
err = _("corrupt GNU build attribute note: unsupported version");
|
|
|
|
|
goto done;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
switch (pnote->note.descsz)
|
2017-03-01 12:09:46 +01:00
|
|
|
|
{
|
2018-01-03 11:28:33 +01:00
|
|
|
|
case 0:
|
|
|
|
|
start = end = 0;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 4:
|
|
|
|
|
start = bfd_get_32 (abfd, pnote->note.descdata);
|
|
|
|
|
/* FIXME: For version 1 and 2 notes we should try to
|
|
|
|
|
calculate the end address by finding a symbol whose
|
|
|
|
|
value is START, and then adding in its size.
|
|
|
|
|
|
|
|
|
|
For now though, since v1 and v2 was not intended to
|
|
|
|
|
handle gaps, we chose an artificially large end
|
|
|
|
|
address. */
|
2018-01-29 06:18:03 +01:00
|
|
|
|
end = (bfd_vma) -1;
|
2018-01-03 11:28:33 +01:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 8:
|
|
|
|
|
if (! is_64bit (abfd))
|
|
|
|
|
{
|
|
|
|
|
start = bfd_get_32 (abfd, pnote->note.descdata);
|
|
|
|
|
end = bfd_get_32 (abfd, pnote->note.descdata + 4);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
start = bfd_get_64 (abfd, pnote->note.descdata);
|
|
|
|
|
/* FIXME: For version 1 and 2 notes we should try to
|
|
|
|
|
calculate the end address by finding a symbol whose
|
|
|
|
|
value is START, and then adding in its size.
|
|
|
|
|
|
|
|
|
|
For now though, since v1 and v2 was not intended to
|
|
|
|
|
handle gaps, we chose an artificially large end
|
|
|
|
|
address. */
|
2018-01-29 06:18:03 +01:00
|
|
|
|
end = (bfd_vma) -1;
|
2018-01-03 11:28:33 +01:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 16:
|
|
|
|
|
start = bfd_get_64 (abfd, pnote->note.descdata);
|
|
|
|
|
end = bfd_get_64 (abfd, pnote->note.descdata + 8);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
2017-03-01 12:09:46 +01:00
|
|
|
|
err = _("corrupt GNU build attribute note: bad description size");
|
|
|
|
|
goto done;
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-03 11:28:33 +01:00
|
|
|
|
if (is_open_note (pnote))
|
|
|
|
|
{
|
|
|
|
|
if (start)
|
|
|
|
|
previous_open_start = start;
|
|
|
|
|
|
|
|
|
|
pnote->start = previous_open_start;
|
|
|
|
|
|
|
|
|
|
if (end)
|
|
|
|
|
previous_open_end = end;
|
|
|
|
|
|
|
|
|
|
pnote->end = previous_open_end;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (start)
|
|
|
|
|
previous_func_start = start;
|
|
|
|
|
|
|
|
|
|
pnote->start = previous_func_start;
|
2017-03-01 12:09:46 +01:00
|
|
|
|
|
2018-01-03 11:28:33 +01:00
|
|
|
|
if (end)
|
|
|
|
|
previous_func_end = end;
|
2017-03-01 12:09:46 +01:00
|
|
|
|
|
2018-01-03 11:28:33 +01:00
|
|
|
|
pnote->end = previous_func_end;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (pnote->note.namedata[pnote->note.namesz - 1] != 0)
|
2017-04-13 15:50:56 +02:00
|
|
|
|
{
|
|
|
|
|
err = _("corrupt GNU build attribute note: name not NUL terminated");
|
|
|
|
|
goto done;
|
|
|
|
|
}
|
2018-01-03 11:28:33 +01:00
|
|
|
|
|
2017-03-01 12:09:46 +01:00
|
|
|
|
pnote ++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pnotes_end = pnote;
|
|
|
|
|
|
|
|
|
|
/* Check that the notes are valid. */
|
|
|
|
|
if (remain != 0)
|
|
|
|
|
{
|
2017-06-28 15:52:12 +02:00
|
|
|
|
err = _("corrupt GNU build attribute notes: excess data at end");
|
2017-03-01 12:09:46 +01:00
|
|
|
|
goto done;
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-03 11:28:33 +01:00
|
|
|
|
if (version_1_seen == 0 && version_2_seen == 0 && version_3_seen == 0)
|
2017-03-01 12:09:46 +01:00
|
|
|
|
{
|
2017-06-28 15:52:12 +02:00
|
|
|
|
err = _("bad GNU build attribute notes: no known versions detected");
|
|
|
|
|
goto done;
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-03 11:28:33 +01:00
|
|
|
|
if ((version_1_seen > 0 && version_2_seen > 0)
|
|
|
|
|
|| (version_1_seen > 0 && version_3_seen > 0)
|
|
|
|
|
|| (version_2_seen > 0 && version_3_seen > 0))
|
2017-06-28 15:52:12 +02:00
|
|
|
|
{
|
|
|
|
|
err = _("bad GNU build attribute notes: multiple different versions");
|
2017-03-01 12:09:46 +01:00
|
|
|
|
goto done;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Merging is only needed if there is more than one version note... */
|
2018-01-03 11:28:33 +01:00
|
|
|
|
if (version_1_seen == 1 || version_2_seen == 1 || version_3_seen == 1)
|
2017-03-01 12:09:46 +01:00
|
|
|
|
goto done;
|
|
|
|
|
|
2017-06-28 15:52:12 +02:00
|
|
|
|
attribute_type_byte = version_1_seen ? 1 : 3;
|
|
|
|
|
val_start = attribute_type_byte + 1;
|
|
|
|
|
|
2017-03-01 12:09:46 +01:00
|
|
|
|
/* The first note should be the first version note. */
|
2018-01-03 11:28:33 +01:00
|
|
|
|
if (pnotes[0].note.namedata[attribute_type_byte] != GNU_BUILD_ATTRIBUTE_VERSION)
|
2017-03-01 12:09:46 +01:00
|
|
|
|
{
|
|
|
|
|
err = _("bad GNU build attribute notes: first note not version note");
|
|
|
|
|
goto done;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Now merge the notes. The rules are:
|
|
|
|
|
1. Preserve the ordering of the notes.
|
|
|
|
|
2. Preserve any NT_GNU_BUILD_ATTRIBUTE_FUNC notes.
|
|
|
|
|
3. Eliminate any NT_GNU_BUILD_ATTRIBUTE_OPEN notes that have the same
|
|
|
|
|
full name field as the immediately preceeding note with the same type
|
2018-01-03 11:28:33 +01:00
|
|
|
|
of name and whose address ranges coincide.
|
2018-08-03 18:08:11 +02:00
|
|
|
|
IE - if there are gaps in the coverage of the notes, then these gaps
|
2018-01-03 11:28:33 +01:00
|
|
|
|
must be preserved.
|
2017-04-13 15:50:56 +02:00
|
|
|
|
4. Combine the numeric value of any NT_GNU_BUILD_ATTRIBUTE_OPEN notes
|
|
|
|
|
of type GNU_BUILD_ATTRIBUTE_STACK_SIZE.
|
|
|
|
|
5. If an NT_GNU_BUILD_ATTRIBUTE_OPEN note is going to be preserved and
|
2017-03-01 12:09:46 +01:00
|
|
|
|
its description field is empty then the nearest preceeding OPEN note
|
|
|
|
|
with a non-empty description field must also be preserved *OR* the
|
|
|
|
|
description field of the note must be changed to contain the starting
|
2018-08-03 18:08:11 +02:00
|
|
|
|
address to which it refers.
|
|
|
|
|
6. Notes with the same start and end address can be deleted. */
|
2017-03-01 12:09:46 +01:00
|
|
|
|
for (pnote = pnotes + 1; pnote < pnotes_end; pnote ++)
|
|
|
|
|
{
|
2018-01-03 11:28:33 +01:00
|
|
|
|
int note_type;
|
|
|
|
|
objcopy_internal_note * back;
|
|
|
|
|
objcopy_internal_note * prev_open_with_range = NULL;
|
2017-03-01 12:09:46 +01:00
|
|
|
|
|
2018-08-03 18:08:11 +02:00
|
|
|
|
/* Rule 6 - delete 0-range notes. */
|
|
|
|
|
if (pnote->start == pnote->end)
|
|
|
|
|
{
|
|
|
|
|
duplicate_found = TRUE;
|
|
|
|
|
pnote->note.type = 0;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-03 11:28:33 +01:00
|
|
|
|
/* Rule 2 - preserve function notes. */
|
|
|
|
|
if (! is_open_note (pnote))
|
2018-08-03 18:08:11 +02:00
|
|
|
|
{
|
|
|
|
|
int iter;
|
|
|
|
|
|
|
|
|
|
/* Check to see if there is an identical previous function note.
|
|
|
|
|
This can happen with overlays for example. */
|
|
|
|
|
for (iter = 0, back = pnote -1; back >= pnotes; back --)
|
|
|
|
|
{
|
|
|
|
|
if (back->start == pnote->start
|
|
|
|
|
&& back->end == pnote->end
|
|
|
|
|
&& back->note.namesz == pnote->note.namesz
|
|
|
|
|
&& memcmp (back->note.namedata, pnote->note.namedata, pnote->note.namesz) == 0)
|
|
|
|
|
{
|
|
|
|
|
fprintf (stderr, "DUP FUNXC\n");
|
|
|
|
|
duplicate_found = TRUE;
|
|
|
|
|
pnote->note.type = 0;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Don't scan too far back however. */
|
|
|
|
|
if (iter ++ > 16)
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2017-03-01 12:09:46 +01:00
|
|
|
|
|
2018-01-03 11:28:33 +01:00
|
|
|
|
note_type = pnote->note.namedata[attribute_type_byte];
|
|
|
|
|
|
|
|
|
|
/* Scan backwards from pnote, looking for duplicates.
|
|
|
|
|
Clear the type field of any found - but do not delete them just yet. */
|
2017-03-01 12:09:46 +01:00
|
|
|
|
for (back = pnote - 1; back >= pnotes; back --)
|
|
|
|
|
{
|
2018-01-03 11:28:33 +01:00
|
|
|
|
int back_type = back->note.namedata[attribute_type_byte];
|
2017-03-01 12:09:46 +01:00
|
|
|
|
|
2018-01-03 11:28:33 +01:00
|
|
|
|
/* If this is the first open note with an address
|
|
|
|
|
range that we have encountered then record it. */
|
|
|
|
|
if (prev_open_with_range == NULL
|
|
|
|
|
&& back->note.descsz > 0
|
|
|
|
|
&& ! is_func_note (back))
|
|
|
|
|
prev_open_with_range = back;
|
2017-06-28 15:52:12 +02:00
|
|
|
|
|
2018-01-03 11:28:33 +01:00
|
|
|
|
if (! is_open_note (back))
|
|
|
|
|
continue;
|
2017-06-28 15:52:12 +02:00
|
|
|
|
|
2018-01-03 11:28:33 +01:00
|
|
|
|
/* If the two notes are different then keep on searching. */
|
|
|
|
|
if (back_type != note_type)
|
|
|
|
|
continue;
|
2017-06-28 15:52:12 +02:00
|
|
|
|
|
2018-01-03 11:28:33 +01:00
|
|
|
|
/* Rule 4 - combine stack size notes. */
|
|
|
|
|
if (back_type == GNU_BUILD_ATTRIBUTE_STACK_SIZE)
|
|
|
|
|
{
|
|
|
|
|
unsigned char * name;
|
|
|
|
|
unsigned long note_val;
|
|
|
|
|
unsigned long back_val;
|
|
|
|
|
unsigned int shift;
|
|
|
|
|
unsigned int bytes;
|
|
|
|
|
unsigned long byte;
|
|
|
|
|
|
|
|
|
|
for (shift = 0, note_val = 0,
|
|
|
|
|
bytes = pnote->note.namesz - val_start,
|
|
|
|
|
name = (unsigned char *) pnote->note.namedata + val_start;
|
|
|
|
|
bytes--;)
|
|
|
|
|
{
|
|
|
|
|
byte = (* name ++) & 0xff;
|
|
|
|
|
note_val |= byte << shift;
|
|
|
|
|
shift += 8;
|
|
|
|
|
}
|
2017-04-13 15:50:56 +02:00
|
|
|
|
|
2018-01-03 11:28:33 +01:00
|
|
|
|
for (shift = 0, back_val = 0,
|
|
|
|
|
bytes = back->note.namesz - val_start,
|
|
|
|
|
name = (unsigned char *) back->note.namedata + val_start;
|
|
|
|
|
bytes--;)
|
|
|
|
|
{
|
|
|
|
|
byte = (* name ++) & 0xff;
|
|
|
|
|
back_val |= byte << shift;
|
|
|
|
|
shift += 8;
|
2017-04-13 15:50:56 +02:00
|
|
|
|
}
|
2018-01-03 11:28:33 +01:00
|
|
|
|
|
|
|
|
|
back_val += note_val;
|
|
|
|
|
if (num_bytes (back_val) >= back->note.namesz - val_start)
|
2017-03-01 12:09:46 +01:00
|
|
|
|
{
|
2018-01-03 11:28:33 +01:00
|
|
|
|
/* We have a problem - the new value requires more bytes of
|
|
|
|
|
storage in the name field than are available. Currently
|
|
|
|
|
we have no way of fixing this, so we just preserve both
|
|
|
|
|
notes. */
|
|
|
|
|
continue;
|
2017-03-01 12:09:46 +01:00
|
|
|
|
}
|
|
|
|
|
|
2018-01-03 11:28:33 +01:00
|
|
|
|
/* Write the new val into back. */
|
|
|
|
|
name = (unsigned char *) back->note.namedata + val_start;
|
|
|
|
|
while (name < (unsigned char *) back->note.namedata
|
|
|
|
|
+ back->note.namesz)
|
2017-03-01 12:09:46 +01:00
|
|
|
|
{
|
2018-01-03 11:28:33 +01:00
|
|
|
|
byte = back_val & 0xff;
|
|
|
|
|
* name ++ = byte;
|
|
|
|
|
if (back_val == 0)
|
|
|
|
|
break;
|
|
|
|
|
back_val >>= 8;
|
2017-03-01 12:09:46 +01:00
|
|
|
|
}
|
2018-01-03 11:28:33 +01:00
|
|
|
|
|
|
|
|
|
duplicate_found = TRUE;
|
|
|
|
|
pnote->note.type = 0;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Rule 3 - combine identical open notes. */
|
|
|
|
|
if (back->note.namesz == pnote->note.namesz
|
|
|
|
|
&& memcmp (back->note.namedata,
|
|
|
|
|
pnote->note.namedata, back->note.namesz) == 0
|
|
|
|
|
&& ! gap_exists (back, pnote))
|
|
|
|
|
{
|
|
|
|
|
duplicate_found = TRUE;
|
|
|
|
|
pnote->note.type = 0;
|
|
|
|
|
|
|
|
|
|
if (pnote->end > back->end)
|
|
|
|
|
back->end = pnote->end;
|
|
|
|
|
|
|
|
|
|
if (version_3_seen)
|
|
|
|
|
back->modified = TRUE;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Rule 5 - Since we are keeping this note we must check to see
|
|
|
|
|
if its description refers back to an earlier OPEN version
|
|
|
|
|
note that has been scheduled for deletion. If so then we
|
|
|
|
|
must make sure that version note is also preserved. */
|
|
|
|
|
if (version_3_seen)
|
|
|
|
|
{
|
|
|
|
|
/* As of version 3 we can just
|
|
|
|
|
move the range into the note. */
|
|
|
|
|
pnote->modified = TRUE;
|
|
|
|
|
pnote->note.type = NT_GNU_BUILD_ATTRIBUTE_FUNC;
|
|
|
|
|
back->modified = TRUE;
|
|
|
|
|
back->note.type = NT_GNU_BUILD_ATTRIBUTE_FUNC;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (pnote->note.descsz == 0
|
|
|
|
|
&& prev_open_with_range != NULL
|
|
|
|
|
&& prev_open_with_range->note.type == 0)
|
|
|
|
|
prev_open_with_range->note.type = NT_GNU_BUILD_ATTRIBUTE_OPEN;
|
2017-03-01 12:09:46 +01:00
|
|
|
|
}
|
2018-01-03 11:28:33 +01:00
|
|
|
|
|
|
|
|
|
/* We have found a similar attribute but the details do not match.
|
|
|
|
|
Stop searching backwards. */
|
|
|
|
|
break;
|
2017-03-01 12:09:46 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (duplicate_found)
|
|
|
|
|
{
|
|
|
|
|
bfd_byte * new_contents;
|
|
|
|
|
bfd_byte * old;
|
|
|
|
|
bfd_byte * new;
|
|
|
|
|
bfd_size_type new_size;
|
2018-01-03 11:28:33 +01:00
|
|
|
|
bfd_vma prev_start = 0;
|
|
|
|
|
bfd_vma prev_end = 0;
|
2017-03-01 12:09:46 +01:00
|
|
|
|
|
|
|
|
|
/* Eliminate the duplicates. */
|
|
|
|
|
new = new_contents = xmalloc (size);
|
|
|
|
|
for (pnote = pnotes, old = contents;
|
|
|
|
|
pnote < pnotes_end;
|
|
|
|
|
pnote ++)
|
|
|
|
|
{
|
2018-01-03 11:28:33 +01:00
|
|
|
|
bfd_size_type note_size = 12 + pnote->note.namesz + pnote->note.descsz;
|
2017-03-01 12:09:46 +01:00
|
|
|
|
|
2018-01-03 11:28:33 +01:00
|
|
|
|
if (pnote->note.type != 0)
|
2017-03-01 12:09:46 +01:00
|
|
|
|
{
|
2018-01-03 11:28:33 +01:00
|
|
|
|
if (pnote->modified)
|
2017-03-01 12:09:46 +01:00
|
|
|
|
{
|
2018-01-03 11:28:33 +01:00
|
|
|
|
/* If the note has been modified then we must copy it by
|
|
|
|
|
hand, potentially adding in a new description field. */
|
|
|
|
|
if (pnote->start == prev_start && pnote->end == prev_end)
|
|
|
|
|
{
|
|
|
|
|
bfd_put_32 (abfd, pnote->note.namesz, new);
|
|
|
|
|
bfd_put_32 (abfd, 0, new + 4);
|
|
|
|
|
bfd_put_32 (abfd, pnote->note.type, new + 8);
|
|
|
|
|
new += 12;
|
|
|
|
|
memcpy (new, pnote->note.namedata, pnote->note.namesz);
|
|
|
|
|
new += pnote->note.namesz;
|
|
|
|
|
}
|
|
|
|
|
else
|
2017-03-01 12:09:46 +01:00
|
|
|
|
{
|
2018-01-03 11:28:33 +01:00
|
|
|
|
bfd_put_32 (abfd, pnote->note.namesz, new);
|
|
|
|
|
bfd_put_32 (abfd, is_64bit (abfd) ? 16 : 8, new + 4);
|
|
|
|
|
bfd_put_32 (abfd, pnote->note.type, new + 8);
|
|
|
|
|
new += 12;
|
|
|
|
|
memcpy (new, pnote->note.namedata, pnote->note.namesz);
|
|
|
|
|
new += pnote->note.namesz;
|
|
|
|
|
if (is_64bit (abfd))
|
|
|
|
|
{
|
|
|
|
|
bfd_put_64 (abfd, pnote->start, new);
|
|
|
|
|
bfd_put_64 (abfd, pnote->end, new + 8);
|
|
|
|
|
new += 16;
|
|
|
|
|
}
|
2017-03-01 12:09:46 +01:00
|
|
|
|
else
|
2018-01-03 11:28:33 +01:00
|
|
|
|
{
|
|
|
|
|
bfd_put_32 (abfd, pnote->start, new);
|
|
|
|
|
bfd_put_32 (abfd, pnote->end, new + 4);
|
|
|
|
|
new += 8;
|
|
|
|
|
}
|
2017-03-01 12:09:46 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
2018-01-03 11:28:33 +01:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
memcpy (new, old, note_size);
|
|
|
|
|
new += note_size;
|
|
|
|
|
}
|
|
|
|
|
prev_start = pnote->start;
|
|
|
|
|
prev_end = pnote->end;
|
2017-03-01 12:09:46 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
old += note_size;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
new_size = new - new_contents;
|
|
|
|
|
memcpy (contents, new_contents, new_size);
|
|
|
|
|
size = new_size;
|
|
|
|
|
free (new_contents);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
done:
|
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
|
bfd_nonfatal_message (NULL, abfd, sec, err);
|
|
|
|
|
status = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
free (pnotes);
|
|
|
|
|
return size;
|
|
|
|
|
}
|
|
|
|
|
|
2004-01-12 14:10:02 +01:00
|
|
|
|
/* Copy object file IBFD onto OBFD.
|
2004-01-12 14:34:30 +01:00
|
|
|
|
Returns TRUE upon success, FALSE otherwise. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2004-01-12 14:10:02 +01:00
|
|
|
|
static bfd_boolean
|
2009-09-11 13:16:19 +02:00
|
|
|
|
copy_object (bfd *ibfd, bfd *obfd, const bfd_arch_info_type *input_arch)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
|
|
|
|
bfd_vma start;
|
|
|
|
|
long symcount;
|
|
|
|
|
asection **osections = NULL;
|
2017-03-01 12:09:46 +01:00
|
|
|
|
asection *osec;
|
2003-07-23 19:34:03 +02:00
|
|
|
|
asection *gnu_debuglink_section = NULL;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
bfd_size_type *gaps = NULL;
|
|
|
|
|
bfd_size_type max_gap = 0;
|
|
|
|
|
long symsize;
|
2003-07-23 19:34:03 +02:00
|
|
|
|
void *dhandle;
|
2003-02-21 02:12:13 +01:00
|
|
|
|
enum bfd_architecture iarch;
|
|
|
|
|
unsigned int imach;
|
2015-09-29 15:33:03 +02:00
|
|
|
|
unsigned int c, i;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2001-01-18 01:17:43 +01:00
|
|
|
|
if (ibfd->xvec->byteorder != obfd->xvec->byteorder
|
|
|
|
|
&& ibfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN
|
|
|
|
|
&& obfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN)
|
2015-03-10 14:38:24 +01:00
|
|
|
|
{
|
|
|
|
|
/* PR 17636: Call non-fatal so that we return to our parent who
|
|
|
|
|
may need to tidy temporary files. */
|
|
|
|
|
non_fatal (_("Unable to change endianness of input file(s)"));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
if (!bfd_set_format (obfd, bfd_get_format (ibfd)))
|
2004-01-12 14:10:02 +01:00
|
|
|
|
{
|
2007-08-30 12:19:03 +02:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, NULL, NULL);
|
2004-01-12 14:10:02 +01:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2014-04-07 06:14:50 +02:00
|
|
|
|
if (ibfd->sections == NULL)
|
|
|
|
|
{
|
|
|
|
|
non_fatal (_("error: the input file '%s' has no sections"),
|
|
|
|
|
bfd_get_archive_filename (ibfd));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
Properly implement STT_COMMON
The BFD configure option, --enable-elf-stt-common, can't be to used to
verify STT_COMMON implementation with the normal binutils build. Instead,
this patch removes it from BFD. It adds --elf-stt-common=[no|yes] to ELF
assembler/objcopy and adds -z common/-z nocommon to ld.
A configure option, --enable-elf-stt-common, is added to gas to specify
whether ELF assembler should generate common symbols with the STT_COMMON
type by default.
Since BSF_KEEP_G is never used, it is renamed to BSF_ELF_COMMON for ELF
common symbols.
bfd/
PR ld/19645
* bfd.c (bfd): Change flags to 20 bits.
(BFD_CONVERT_ELF_COMMON): New.
(BFD_USE_ELF_STT_COMMON): Likewise.
(BFD_FLAGS_SAVED): Add BFD_CONVERT_ELF_COMMON and
BFD_USE_ELF_STT_COMMON.
(BFD_FLAGS_FOR_BFD_USE_MASK): Likewise.
* configure.ac: Remove --enable-elf-stt-common.
* elf.c (swap_out_syms): Choose STT_COMMON or STT_OBJECT for
common symbol depending on BFD_CONVERT_ELF_COMMON and
BFD_USE_ELF_STT_COMMON.
* elfcode.h (elf_slurp_symbol_table): Set BSF_ELF_COMMON for
STT_COMMON.
* elflink.c (bfd_elf_link_mark_dynamic_symbol): Also check
STT_COMMON.
(elf_link_convert_common_type): New function.
(elf_link_output_extsym): Choose STT_COMMON or STT_OBJECT for
common symbol depending on BFD_CONVERT_ELF_COMMON and
BFD_USE_ELF_STT_COMMON. Set sym.st_info after sym.st_shndx.
* elfxx-target.h (TARGET_BIG_SYM): Add BFD_CONVERT_ELF_COMMON
and BFD_USE_ELF_STT_COMMON to object_flags.
(TARGET_LITTLE_SYM): Likewise.
* syms.c (BSF_KEEP_G): Renamed to ...
(BSF_ELF_COMMON): This.
* bfd-in2.h: Regenerated.
* config.in: Likewise.
* configure: Likewise.
binutils/
PR ld/19645
* NEWS: Mention --elf-stt-common= for objcopy.
* doc/binutils.texi: Document --elf-stt-common= for objcopy.
* objcopy.c (do_elf_stt_common): New.
(command_line_switch): Add OPTION_ELF_STT_COMMON.
(copy_options): Add --elf-stt-common=.
(copy_usage): Add --elf-stt-common=.
(copy_object): Also check do_elf_stt_common for ELF targets.
(copy_file): Handle do_elf_stt_common.
(copy_main): Handle OPTION_ELF_STT_COMMON.
* readelf.c (apply_relocations): Support STT_COMMON.
* testsuite/binutils-all/common-1.s: New file.
* testsuite/binutils-all/common-1a.d: Likewise.
* testsuite/binutils-all/common-1b.d: Likewise.
* testsuite/binutils-all/common-1c.d: Likewise.
* testsuite/binutils-all/common-1d.d: Likewise.
* testsuite/binutils-all/common-1e.d: Likewise.
* testsuite/binutils-all/common-1f.d: Likewise.
* testsuite/binutils-all/common-2.s: Likewise.
* testsuite/binutils-all/common-2a.d: Likewise.
* testsuite/binutils-all/common-2b.d: Likewise.
* testsuite/binutils-all/common-2c.d: Likewise.
* testsuite/binutils-all/common-2d.d: Likewise.
* testsuite/binutils-all/common-2e.d: Likewise.
* testsuite/binutils-all/common-2f.d: Likewise.
* testsuite/binutils-all/objcopy.exp
(objcopy_test_elf_common_symbols): New proc.
Run objcopy_test_elf_common_symbols for ELF targets
gas/
PR ld/19645
* NEWS: Mention --enable-elf-stt-common and --elf-stt-common=
for ELF assemblers.
* as.c (flag_use_elf_stt_common): New.
(show_usage): Add --elf-stt-common=.
(option_values): Add OPTION_ELF_STT_COMMON.
(std_longopts): Add --elf-stt-common=.
(parse_args): Handle --elf-stt-common=.
* as.h (flag_use_elf_stt_common): New.
* config.in: Regenerated.
* configure: Likewise.
* configure.ac: Add --enable-elf-stt-common and define
DEFAULT_GENERATE_ELF_STT_COMMON.
* gas/write.c (write_object_file): Set BFD_CONVERT_ELF_COMMON
and BFD_USE_ELF_STT_COMMON if flag_use_elf_stt_common is set.
* doc/as.texinfo: Document --elf-stt-common=.
* testsuite/gas/elf/common3.s: New file.
* testsuite/gas/elf/common3a.d: Likewise.
* testsuite/gas/elf/common3b.d: Likewise.
* testsuite/gas/elf/common4.s: Likewise.
* testsuite/gas/elf/common4a.d: Likewise.
* testsuite/gas/elf/common4b.d: Likewise.
* testsuite/gas/i386/dw2-compress-3b.d: Likewise.
* testsuite/gas/i386/dw2-compressed-3b.d: Likewise.
* testsuite/gas/elf/elf.exp: Run common3a, common3b, common4a
and common4b.
* testsuite/gas/i386/dw2-compress-3.d: Renamed to ...
* testsuite/gas/i386/dw2-compress-3a.d: This. Pass
--elf-stt-common=no to as.
* testsuite/gas/i386/dw2-compressed-3.d: Renamed to ...
* testsuite/gas/i386/dw2-compressed-3a.d: This. Pass
--elf-stt-common=no to as.
* testsuite/gas/i386/i386.exp: Run dw2-compress-3a,
dw2-compress-3b, dw2-compressed-3a and dw2-compressed-3b instead
of dw2-compress-3 and dw2-compressed-3.
include/
PR ld/19645
* bfdlink.h (bfd_link_elf_stt_common): New enum.
(bfd_link_info): Add elf_stt_common.
ld/
PR ld/19645
* NEWS: Mention -z common/-z nocommon for ELF targets.
* emultempl/elf32.em (gld${EMULATION_NAME}_handle_option): Handle
-z common and -z nocommon.
* ld.texinfo: Document -z common/-z nocommon.
* lexsup.c (elf_shlib_list_options): Add -z common/-z nocommon.
* testsuite/ld-elf/tls_common.exp: Test --elf-stt-common=no and
--elf-stt-common=yes with assembler.
* testsuite/ld-elfcomm/common-1.s: New file.
* testsuite/ld-elfcomm/common-1a.d: Likewise.
* testsuite/ld-elfcomm/common-1b.d: Likewise.
* testsuite/ld-elfcomm/common-1c.d: Likewise.
* testsuite/ld-elfcomm/common-1d.d: Likewise.
* testsuite/ld-elfcomm/common-1e.d: Likewise.
* testsuite/ld-elfcomm/common-1f.d: Likewise.
* testsuite/ld-elfcomm/common-2.s: Likewise.
* testsuite/ld-elfcomm/common-2a.d: Likewise.
* testsuite/ld-elfcomm/common-2b.d: Likewise.
* testsuite/ld-elfcomm/common-2c.d: Likewise.
* testsuite/ld-elfcomm/common-2d.d: Likewise.
* testsuite/ld-elfcomm/common-2e.d: Likewise.
* testsuite/ld-elfcomm/common-2f.d: Likewise.
* testsuite/ld-elfcomm/common-3a.rd: Likewise.
* testsuite/ld-elfcomm/common-3b.rd: Likewise.
* testsuite/ld-i386/pr19645.d: Likewise.
* testsuite/ld-i386/pr19645.s: Likewise.
* testsuite/ld-x86-64/largecomm-1.s: Likewise.
* testsuite/ld-x86-64/largecomm-1a.d: Likewise.
* testsuite/ld-x86-64/largecomm-1b.d: Likewise.
* testsuite/ld-x86-64/largecomm-1c.d: Likewise.
* testsuite/ld-x86-64/largecomm-1d.d: Likewise.
* testsuite/ld-x86-64/largecomm-1e.d: Likewise.
* testsuite/ld-x86-64/largecomm-1f.d: Likewise.
* testsuite/ld-x86-64/pr19645.d: Likewise.
* testsuite/ld-x86-64/pr19645.s: Likewise.
* testsuite/ld-elfcomm/elfcomm.exp: Test --elf-stt-common=yes
with assembler.
(assembler_generates_commons): Removed.
Run -z common/-z nocommon tests. Run *.d tests.
* testsuite/ld-i386/i386.exp: Run pr19645.
* testsuite/ld-x86-64/x86-64.exp: Likewise.
* testsuite/ld-x86-64/dwarfreloc.exp: Test --elf-stt-common with
assembler. Test STT_COMMON with readelf.
2016-02-22 18:18:52 +01:00
|
|
|
|
if (ibfd->xvec->flavour != bfd_target_elf_flavour)
|
2015-04-09 19:56:28 +02:00
|
|
|
|
{
|
Properly implement STT_COMMON
The BFD configure option, --enable-elf-stt-common, can't be to used to
verify STT_COMMON implementation with the normal binutils build. Instead,
this patch removes it from BFD. It adds --elf-stt-common=[no|yes] to ELF
assembler/objcopy and adds -z common/-z nocommon to ld.
A configure option, --enable-elf-stt-common, is added to gas to specify
whether ELF assembler should generate common symbols with the STT_COMMON
type by default.
Since BSF_KEEP_G is never used, it is renamed to BSF_ELF_COMMON for ELF
common symbols.
bfd/
PR ld/19645
* bfd.c (bfd): Change flags to 20 bits.
(BFD_CONVERT_ELF_COMMON): New.
(BFD_USE_ELF_STT_COMMON): Likewise.
(BFD_FLAGS_SAVED): Add BFD_CONVERT_ELF_COMMON and
BFD_USE_ELF_STT_COMMON.
(BFD_FLAGS_FOR_BFD_USE_MASK): Likewise.
* configure.ac: Remove --enable-elf-stt-common.
* elf.c (swap_out_syms): Choose STT_COMMON or STT_OBJECT for
common symbol depending on BFD_CONVERT_ELF_COMMON and
BFD_USE_ELF_STT_COMMON.
* elfcode.h (elf_slurp_symbol_table): Set BSF_ELF_COMMON for
STT_COMMON.
* elflink.c (bfd_elf_link_mark_dynamic_symbol): Also check
STT_COMMON.
(elf_link_convert_common_type): New function.
(elf_link_output_extsym): Choose STT_COMMON or STT_OBJECT for
common symbol depending on BFD_CONVERT_ELF_COMMON and
BFD_USE_ELF_STT_COMMON. Set sym.st_info after sym.st_shndx.
* elfxx-target.h (TARGET_BIG_SYM): Add BFD_CONVERT_ELF_COMMON
and BFD_USE_ELF_STT_COMMON to object_flags.
(TARGET_LITTLE_SYM): Likewise.
* syms.c (BSF_KEEP_G): Renamed to ...
(BSF_ELF_COMMON): This.
* bfd-in2.h: Regenerated.
* config.in: Likewise.
* configure: Likewise.
binutils/
PR ld/19645
* NEWS: Mention --elf-stt-common= for objcopy.
* doc/binutils.texi: Document --elf-stt-common= for objcopy.
* objcopy.c (do_elf_stt_common): New.
(command_line_switch): Add OPTION_ELF_STT_COMMON.
(copy_options): Add --elf-stt-common=.
(copy_usage): Add --elf-stt-common=.
(copy_object): Also check do_elf_stt_common for ELF targets.
(copy_file): Handle do_elf_stt_common.
(copy_main): Handle OPTION_ELF_STT_COMMON.
* readelf.c (apply_relocations): Support STT_COMMON.
* testsuite/binutils-all/common-1.s: New file.
* testsuite/binutils-all/common-1a.d: Likewise.
* testsuite/binutils-all/common-1b.d: Likewise.
* testsuite/binutils-all/common-1c.d: Likewise.
* testsuite/binutils-all/common-1d.d: Likewise.
* testsuite/binutils-all/common-1e.d: Likewise.
* testsuite/binutils-all/common-1f.d: Likewise.
* testsuite/binutils-all/common-2.s: Likewise.
* testsuite/binutils-all/common-2a.d: Likewise.
* testsuite/binutils-all/common-2b.d: Likewise.
* testsuite/binutils-all/common-2c.d: Likewise.
* testsuite/binutils-all/common-2d.d: Likewise.
* testsuite/binutils-all/common-2e.d: Likewise.
* testsuite/binutils-all/common-2f.d: Likewise.
* testsuite/binutils-all/objcopy.exp
(objcopy_test_elf_common_symbols): New proc.
Run objcopy_test_elf_common_symbols for ELF targets
gas/
PR ld/19645
* NEWS: Mention --enable-elf-stt-common and --elf-stt-common=
for ELF assemblers.
* as.c (flag_use_elf_stt_common): New.
(show_usage): Add --elf-stt-common=.
(option_values): Add OPTION_ELF_STT_COMMON.
(std_longopts): Add --elf-stt-common=.
(parse_args): Handle --elf-stt-common=.
* as.h (flag_use_elf_stt_common): New.
* config.in: Regenerated.
* configure: Likewise.
* configure.ac: Add --enable-elf-stt-common and define
DEFAULT_GENERATE_ELF_STT_COMMON.
* gas/write.c (write_object_file): Set BFD_CONVERT_ELF_COMMON
and BFD_USE_ELF_STT_COMMON if flag_use_elf_stt_common is set.
* doc/as.texinfo: Document --elf-stt-common=.
* testsuite/gas/elf/common3.s: New file.
* testsuite/gas/elf/common3a.d: Likewise.
* testsuite/gas/elf/common3b.d: Likewise.
* testsuite/gas/elf/common4.s: Likewise.
* testsuite/gas/elf/common4a.d: Likewise.
* testsuite/gas/elf/common4b.d: Likewise.
* testsuite/gas/i386/dw2-compress-3b.d: Likewise.
* testsuite/gas/i386/dw2-compressed-3b.d: Likewise.
* testsuite/gas/elf/elf.exp: Run common3a, common3b, common4a
and common4b.
* testsuite/gas/i386/dw2-compress-3.d: Renamed to ...
* testsuite/gas/i386/dw2-compress-3a.d: This. Pass
--elf-stt-common=no to as.
* testsuite/gas/i386/dw2-compressed-3.d: Renamed to ...
* testsuite/gas/i386/dw2-compressed-3a.d: This. Pass
--elf-stt-common=no to as.
* testsuite/gas/i386/i386.exp: Run dw2-compress-3a,
dw2-compress-3b, dw2-compressed-3a and dw2-compressed-3b instead
of dw2-compress-3 and dw2-compressed-3.
include/
PR ld/19645
* bfdlink.h (bfd_link_elf_stt_common): New enum.
(bfd_link_info): Add elf_stt_common.
ld/
PR ld/19645
* NEWS: Mention -z common/-z nocommon for ELF targets.
* emultempl/elf32.em (gld${EMULATION_NAME}_handle_option): Handle
-z common and -z nocommon.
* ld.texinfo: Document -z common/-z nocommon.
* lexsup.c (elf_shlib_list_options): Add -z common/-z nocommon.
* testsuite/ld-elf/tls_common.exp: Test --elf-stt-common=no and
--elf-stt-common=yes with assembler.
* testsuite/ld-elfcomm/common-1.s: New file.
* testsuite/ld-elfcomm/common-1a.d: Likewise.
* testsuite/ld-elfcomm/common-1b.d: Likewise.
* testsuite/ld-elfcomm/common-1c.d: Likewise.
* testsuite/ld-elfcomm/common-1d.d: Likewise.
* testsuite/ld-elfcomm/common-1e.d: Likewise.
* testsuite/ld-elfcomm/common-1f.d: Likewise.
* testsuite/ld-elfcomm/common-2.s: Likewise.
* testsuite/ld-elfcomm/common-2a.d: Likewise.
* testsuite/ld-elfcomm/common-2b.d: Likewise.
* testsuite/ld-elfcomm/common-2c.d: Likewise.
* testsuite/ld-elfcomm/common-2d.d: Likewise.
* testsuite/ld-elfcomm/common-2e.d: Likewise.
* testsuite/ld-elfcomm/common-2f.d: Likewise.
* testsuite/ld-elfcomm/common-3a.rd: Likewise.
* testsuite/ld-elfcomm/common-3b.rd: Likewise.
* testsuite/ld-i386/pr19645.d: Likewise.
* testsuite/ld-i386/pr19645.s: Likewise.
* testsuite/ld-x86-64/largecomm-1.s: Likewise.
* testsuite/ld-x86-64/largecomm-1a.d: Likewise.
* testsuite/ld-x86-64/largecomm-1b.d: Likewise.
* testsuite/ld-x86-64/largecomm-1c.d: Likewise.
* testsuite/ld-x86-64/largecomm-1d.d: Likewise.
* testsuite/ld-x86-64/largecomm-1e.d: Likewise.
* testsuite/ld-x86-64/largecomm-1f.d: Likewise.
* testsuite/ld-x86-64/pr19645.d: Likewise.
* testsuite/ld-x86-64/pr19645.s: Likewise.
* testsuite/ld-elfcomm/elfcomm.exp: Test --elf-stt-common=yes
with assembler.
(assembler_generates_commons): Removed.
Run -z common/-z nocommon tests. Run *.d tests.
* testsuite/ld-i386/i386.exp: Run pr19645.
* testsuite/ld-x86-64/x86-64.exp: Likewise.
* testsuite/ld-x86-64/dwarfreloc.exp: Test --elf-stt-common with
assembler. Test STT_COMMON with readelf.
2016-02-22 18:18:52 +01:00
|
|
|
|
if ((do_debug_sections & compress) != 0
|
|
|
|
|
&& do_debug_sections != compress)
|
|
|
|
|
{
|
|
|
|
|
non_fatal (_("--compress-debug-sections=[zlib|zlib-gnu|zlib-gabi] is unsupported on `%s'"),
|
|
|
|
|
bfd_get_archive_filename (ibfd));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (do_elf_stt_common)
|
|
|
|
|
{
|
|
|
|
|
non_fatal (_("--elf-stt-common=[yes|no] is unsupported on `%s'"),
|
|
|
|
|
bfd_get_archive_filename (ibfd));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
2015-04-09 19:56:28 +02:00
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
if (verbose)
|
2005-06-14 15:26:42 +02:00
|
|
|
|
printf (_("copy from `%s' [%s] to `%s' [%s]\n"),
|
|
|
|
|
bfd_get_archive_filename (ibfd), bfd_get_target (ibfd),
|
1999-05-03 09:29:11 +02:00
|
|
|
|
bfd_get_filename (obfd), bfd_get_target (obfd));
|
|
|
|
|
|
2007-03-01 17:39:42 +01:00
|
|
|
|
if (extract_symbol)
|
|
|
|
|
start = 0;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
else
|
2007-03-01 17:39:42 +01:00
|
|
|
|
{
|
|
|
|
|
if (set_start_set)
|
|
|
|
|
start = set_start;
|
|
|
|
|
else
|
|
|
|
|
start = bfd_get_start_address (ibfd);
|
|
|
|
|
start += change_start;
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2002-05-21 21:34:58 +02:00
|
|
|
|
/* Neither the start address nor the flags
|
|
|
|
|
need to be set for a core file. */
|
2001-12-19 06:18:34 +01:00
|
|
|
|
if (bfd_get_format (obfd) != bfd_core)
|
|
|
|
|
{
|
2003-12-23 14:01:11 +01: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 14:39:57 +01:00
|
|
|
|
if (strip_symbols == STRIP_ALL)
|
|
|
|
|
flags &= ~HAS_RELOC;
|
|
|
|
|
|
2001-12-19 06:18:34 +01:00
|
|
|
|
if (!bfd_set_start_address (obfd, start)
|
2003-12-23 14:01:11 +01:00
|
|
|
|
|| !bfd_set_file_flags (obfd, flags))
|
2004-01-12 14:10:02 +01:00
|
|
|
|
{
|
2009-01-29 14:03:21 +01:00
|
|
|
|
bfd_nonfatal_message (NULL, ibfd, NULL, NULL);
|
2004-01-12 14:10:02 +01:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
2001-12-19 06:18:34 +01:00
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2001-07-31 15:49:39 +02:00
|
|
|
|
/* Copy architecture of input file to output file. */
|
2003-02-21 02:12:13 +01:00
|
|
|
|
iarch = bfd_get_arch (ibfd);
|
|
|
|
|
imach = bfd_get_mach (ibfd);
|
2009-09-11 13:16:19 +02: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 02:12:13 +01:00
|
|
|
|
if (!bfd_set_arch_mach (obfd, iarch, imach)
|
2002-08-13 15:39:02 +02:00
|
|
|
|
&& (ibfd->target_defaulted
|
|
|
|
|
|| bfd_get_arch (ibfd) != bfd_get_arch (obfd)))
|
2003-12-04 19:24:07 +01:00
|
|
|
|
{
|
|
|
|
|
if (bfd_get_arch (ibfd) == bfd_arch_unknown)
|
2005-06-14 15:26:42 +02:00
|
|
|
|
non_fatal (_("Unable to recognise the format of the input file `%s'"),
|
|
|
|
|
bfd_get_archive_filename (ibfd));
|
2003-12-04 19:24:07 +01:00
|
|
|
|
else
|
2010-01-05 01:39:47 +01:00
|
|
|
|
non_fatal (_("Output file cannot represent architecture `%s'"),
|
2005-06-14 15:26:42 +02:00
|
|
|
|
bfd_printable_arch_mach (bfd_get_arch (ibfd),
|
|
|
|
|
bfd_get_mach (ibfd)));
|
|
|
|
|
return FALSE;
|
2003-12-04 19:24:07 +01:00
|
|
|
|
}
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
if (!bfd_set_format (obfd, bfd_get_format (ibfd)))
|
2004-01-12 14:10:02 +01:00
|
|
|
|
{
|
2009-01-29 14:03:21 +01:00
|
|
|
|
bfd_nonfatal_message (NULL, ibfd, NULL, NULL);
|
2004-01-12 14:10:02 +01:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02: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 15:46:18 +02: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 15:59:43 +02: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 15:46:18 +02: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 09:29:11 +02:00
|
|
|
|
if (isympp)
|
2006-01-10 23:34:03 +01:00
|
|
|
|
free (isympp);
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
if (osympp != isympp)
|
2006-01-10 23:34:03 +01:00
|
|
|
|
free (osympp);
|
|
|
|
|
|
|
|
|
|
isympp = NULL;
|
|
|
|
|
osympp = NULL;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2006-09-13 17:08:38 +02:00
|
|
|
|
symsize = bfd_get_symtab_upper_bound (ibfd);
|
|
|
|
|
if (symsize < 0)
|
|
|
|
|
{
|
2009-01-29 14:03:21 +01:00
|
|
|
|
bfd_nonfatal_message (NULL, ibfd, NULL, NULL);
|
2006-09-13 17:08:38 +02:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
2009-09-10 15:40:44 +02:00
|
|
|
|
osympp = isympp = (asymbol **) xmalloc (symsize);
|
2006-09-13 17:08:38 +02:00
|
|
|
|
symcount = bfd_canonicalize_symtab (ibfd, isympp);
|
|
|
|
|
if (symcount < 0)
|
|
|
|
|
{
|
2007-08-30 12:19:03 +02:00
|
|
|
|
bfd_nonfatal_message (NULL, ibfd, NULL, NULL);
|
2006-09-13 17:08:38 +02:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
2015-01-08 16:39:49 +01:00
|
|
|
|
/* PR 17512: file: d6323821
|
|
|
|
|
If the symbol table could not be loaded do not pretend that we have
|
|
|
|
|
any symbols. This trips us up later on when we load the relocs. */
|
|
|
|
|
if (symcount == 0)
|
|
|
|
|
{
|
|
|
|
|
free (isympp);
|
|
|
|
|
osympp = isympp = NULL;
|
|
|
|
|
}
|
2006-09-13 17:08:38 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02: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 16:40:54 +02:00
|
|
|
|
bfd_map_over_sections (ibfd, setup_section, obfd);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2008-08-06 02:42:17 +02:00
|
|
|
|
if (!extract_symbol)
|
|
|
|
|
setup_bfd_headers (ibfd, obfd);
|
2004-05-17 18:40:01 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02: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 09:23:31 +02:00
|
|
|
|
flagword flags;
|
|
|
|
|
|
2013-02-15 10:32:31 +01:00
|
|
|
|
pset = find_section_list (padd->name, FALSE,
|
|
|
|
|
SECTION_CONTEXT_SET_FLAGS);
|
2005-07-04 03:53:44 +02:00
|
|
|
|
if (pset != NULL)
|
|
|
|
|
flags = pset->flags | SEC_HAS_CONTENTS;
|
2013-02-15 10:32:31 +01:00
|
|
|
|
else
|
|
|
|
|
flags = SEC_HAS_CONTENTS | SEC_READONLY | SEC_DATA;
|
2005-07-04 03:53:44 +02:00
|
|
|
|
|
2006-01-30 14:06:53 +01: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 09:29:11 +02:00
|
|
|
|
{
|
2007-08-30 12:19:03 +02:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, NULL,
|
2016-05-31 12:51:09 +02:00
|
|
|
|
_("can't add section '%s'"), padd->name);
|
2004-01-12 14:10:02 +01:00
|
|
|
|
return FALSE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
}
|
2006-01-30 14:06:53 +01:00
|
|
|
|
else
|
|
|
|
|
{
|
2010-02-01 10:59:46 +01:00
|
|
|
|
/* We use LINKER_CREATED here so that the backend hooks
|
2016-05-31 12:51:09 +02:00
|
|
|
|
will create any special section type information,
|
|
|
|
|
instead of presuming we know what we're doing merely
|
|
|
|
|
because we set the flags. */
|
2010-02-01 10:59:46 +01:00
|
|
|
|
padd->section = bfd_make_section_with_flags
|
|
|
|
|
(obfd, padd->name, flags | SEC_LINKER_CREATED);
|
2006-01-30 14:06:53 +01:00
|
|
|
|
if (padd->section == NULL)
|
|
|
|
|
{
|
2007-08-30 12:19:03 +02:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, NULL,
|
|
|
|
|
_("can't create section `%s'"),
|
|
|
|
|
padd->name);
|
2006-01-30 14:06:53 +01:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2003-06-12 09:23:31 +02:00
|
|
|
|
if (! bfd_set_section_size (obfd, padd->section, padd->size))
|
2004-01-12 14:10:02 +01:00
|
|
|
|
{
|
2007-08-30 12:19:03 +02:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, padd->section, NULL);
|
2004-01-12 14:10:02 +01:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2013-02-15 10:32:31 +01:00
|
|
|
|
pset = find_section_list (padd->name, FALSE,
|
|
|
|
|
SECTION_CONTEXT_SET_VMA | SECTION_CONTEXT_ALTER_VMA);
|
|
|
|
|
if (pset != NULL
|
|
|
|
|
&& ! bfd_set_section_vma (obfd, padd->section, pset->vma_val))
|
|
|
|
|
{
|
|
|
|
|
bfd_nonfatal_message (NULL, obfd, padd->section, NULL);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pset = find_section_list (padd->name, FALSE,
|
|
|
|
|
SECTION_CONTEXT_SET_LMA | SECTION_CONTEXT_ALTER_LMA);
|
2003-06-12 09:23:31 +02:00
|
|
|
|
if (pset != NULL)
|
|
|
|
|
{
|
2013-02-15 10:32:31 +01:00
|
|
|
|
padd->section->lma = pset->lma_val;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
2013-02-15 10:32:31 +01:00
|
|
|
|
if (! bfd_set_section_alignment
|
|
|
|
|
(obfd, padd->section,
|
|
|
|
|
bfd_section_alignment (obfd, padd->section)))
|
2003-06-12 09:23:31 +02:00
|
|
|
|
{
|
2013-02-15 10:32:31 +01:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, padd->section, NULL);
|
|
|
|
|
return FALSE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-13 18:04:42 +01:00
|
|
|
|
if (update_sections != NULL)
|
|
|
|
|
{
|
|
|
|
|
struct section_add *pupdate;
|
|
|
|
|
|
|
|
|
|
for (pupdate = update_sections;
|
|
|
|
|
pupdate != NULL;
|
|
|
|
|
pupdate = pupdate->next)
|
|
|
|
|
{
|
|
|
|
|
pupdate->section = bfd_get_section_by_name (ibfd, pupdate->name);
|
|
|
|
|
if (pupdate->section == NULL)
|
2015-03-10 14:38:24 +01:00
|
|
|
|
{
|
|
|
|
|
non_fatal (_("error: %s not found, can't be updated"), pupdate->name);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
2015-02-13 18:04:42 +01:00
|
|
|
|
|
|
|
|
|
osec = pupdate->section->output_section;
|
|
|
|
|
if (! bfd_set_section_size (obfd, osec, pupdate->size))
|
|
|
|
|
{
|
|
|
|
|
bfd_nonfatal_message (NULL, obfd, osec, NULL);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-01 12:09:46 +01:00
|
|
|
|
if (merge_notes)
|
|
|
|
|
{
|
|
|
|
|
/* This palaver is necessary because we must set the output
|
|
|
|
|
section size first, before its contents are ready. */
|
|
|
|
|
osec = bfd_get_section_by_name (ibfd, GNU_BUILD_ATTRS_SECTION_NAME);
|
|
|
|
|
if (osec && is_merged_note_section (ibfd, osec))
|
|
|
|
|
{
|
|
|
|
|
bfd_size_type size;
|
|
|
|
|
|
|
|
|
|
size = bfd_get_section_size (osec);
|
|
|
|
|
if (size == 0)
|
|
|
|
|
{
|
|
|
|
|
bfd_nonfatal_message (NULL, ibfd, osec, _("warning: note section is empty"));
|
|
|
|
|
merge_notes = FALSE;
|
|
|
|
|
}
|
|
|
|
|
else if (! bfd_get_full_section_contents (ibfd, osec, & merged_notes))
|
|
|
|
|
{
|
|
|
|
|
bfd_nonfatal_message (NULL, ibfd, osec, _("warning: could not load note section"));
|
|
|
|
|
free (merged_notes);
|
|
|
|
|
merged_notes = NULL;
|
|
|
|
|
merge_notes = FALSE;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
merged_size = merge_gnu_build_notes (ibfd, osec, size, merged_notes);
|
|
|
|
|
if (merged_size == size)
|
|
|
|
|
{
|
|
|
|
|
/* Merging achieves nothing. */
|
|
|
|
|
free (merged_notes);
|
|
|
|
|
merged_notes = NULL;
|
|
|
|
|
merge_notes = FALSE;
|
|
|
|
|
merged_size = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (osec->output_section == NULL
|
|
|
|
|
|| ! bfd_set_section_size (obfd, osec->output_section, merged_size))
|
|
|
|
|
{
|
|
|
|
|
bfd_nonfatal_message (NULL, obfd, osec, _("warning: failed to set merged notes size"));
|
|
|
|
|
free (merged_notes);
|
|
|
|
|
merged_notes = NULL;
|
|
|
|
|
merge_notes = FALSE;
|
|
|
|
|
merged_size = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-12-31 10:52:24 +01:00
|
|
|
|
if (dump_sections != NULL)
|
|
|
|
|
{
|
|
|
|
|
struct section_add * pdump;
|
|
|
|
|
|
|
|
|
|
for (pdump = dump_sections; pdump != NULL; pdump = pdump->next)
|
|
|
|
|
{
|
2017-03-01 12:09:46 +01:00
|
|
|
|
osec = bfd_get_section_by_name (ibfd, pdump->name);
|
|
|
|
|
if (osec == NULL)
|
2013-12-31 10:52:24 +01:00
|
|
|
|
{
|
|
|
|
|
bfd_nonfatal_message (NULL, ibfd, NULL,
|
|
|
|
|
_("can't dump section '%s' - it does not exist"),
|
|
|
|
|
pdump->name);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-01 12:09:46 +01:00
|
|
|
|
if ((bfd_get_section_flags (ibfd, osec) & SEC_HAS_CONTENTS) == 0)
|
2013-12-31 10:52:24 +01:00
|
|
|
|
{
|
2017-03-01 12:09:46 +01:00
|
|
|
|
bfd_nonfatal_message (NULL, ibfd, osec,
|
2013-12-31 10:52:24 +01:00
|
|
|
|
_("can't dump section - it has no contents"));
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2015-08-12 13:42:37 +02:00
|
|
|
|
|
2017-03-01 12:09:46 +01:00
|
|
|
|
bfd_size_type size = bfd_get_section_size (osec);
|
2013-12-31 10:52:24 +01:00
|
|
|
|
if (size == 0)
|
|
|
|
|
{
|
2017-03-01 12:09:46 +01:00
|
|
|
|
bfd_nonfatal_message (NULL, ibfd, osec,
|
2013-12-31 10:52:24 +01:00
|
|
|
|
_("can't dump section - it is empty"));
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
FILE * f;
|
|
|
|
|
f = fopen (pdump->filename, FOPEN_WB);
|
|
|
|
|
if (f == NULL)
|
|
|
|
|
{
|
|
|
|
|
bfd_nonfatal_message (pdump->filename, NULL, NULL,
|
|
|
|
|
_("could not open section dump file"));
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2017-07-01 14:28:10 +02:00
|
|
|
|
bfd_byte *contents;
|
|
|
|
|
if (bfd_malloc_and_get_section (ibfd, osec, &contents))
|
2014-03-14 17:56:12 +01:00
|
|
|
|
{
|
|
|
|
|
if (fwrite (contents, 1, size, f) != size)
|
2015-03-10 14:38:24 +01:00
|
|
|
|
{
|
|
|
|
|
non_fatal (_("error writing section contents to %s (error: %s)"),
|
|
|
|
|
pdump->filename,
|
|
|
|
|
strerror (errno));
|
2017-07-01 14:28:10 +02:00
|
|
|
|
free (contents);
|
2018-07-20 16:05:34 +02:00
|
|
|
|
fclose (f);
|
2015-03-10 14:38:24 +01:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
2014-03-14 17:56:12 +01:00
|
|
|
|
}
|
2013-12-31 10:52:24 +01:00
|
|
|
|
else
|
2017-03-01 12:09:46 +01:00
|
|
|
|
bfd_nonfatal_message (NULL, ibfd, osec,
|
2013-12-31 10:52:24 +01:00
|
|
|
|
_("could not retrieve section contents"));
|
|
|
|
|
|
|
|
|
|
fclose (f);
|
|
|
|
|
free (contents);
|
|
|
|
|
}
|
|
|
|
|
}
|
2015-08-12 13:42:37 +02:00
|
|
|
|
|
2003-06-12 09:23:31 +02:00
|
|
|
|
if (gnu_debuglink_filename != NULL)
|
|
|
|
|
{
|
2013-02-14 12:52:25 +01:00
|
|
|
|
/* PR 15125: Give a helpful warning message if
|
|
|
|
|
the debuglink section already exists, and
|
|
|
|
|
allow the rest of the copy to complete. */
|
|
|
|
|
if (bfd_get_section_by_name (obfd, ".gnu_debuglink"))
|
2004-01-12 14:10:02 +01:00
|
|
|
|
{
|
2013-02-14 12:52:25 +01:00
|
|
|
|
non_fatal (_("%s: debuglink section already exists"),
|
|
|
|
|
bfd_get_filename (obfd));
|
|
|
|
|
gnu_debuglink_filename = NULL;
|
2004-01-12 14:10:02 +01:00
|
|
|
|
}
|
2013-02-14 12:52:25 +01:00
|
|
|
|
else
|
2006-01-18 12:01:09 +01:00
|
|
|
|
{
|
2013-02-14 12:52:25 +01:00
|
|
|
|
gnu_debuglink_section = bfd_create_gnu_debuglink_section
|
|
|
|
|
(obfd, gnu_debuglink_filename);
|
|
|
|
|
|
|
|
|
|
if (gnu_debuglink_section == NULL)
|
|
|
|
|
{
|
|
|
|
|
bfd_nonfatal_message (NULL, obfd, NULL,
|
|
|
|
|
_("cannot create debug link section `%s'"),
|
|
|
|
|
gnu_debuglink_filename);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
2006-01-18 12:01:09 +01:00
|
|
|
|
|
2013-02-14 12:52:25 +01: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;
|
|
|
|
|
|
|
|
|
|
/* 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. */
|
2017-03-01 12:09:46 +01:00
|
|
|
|
for (osec = obfd->sections, highest_section = NULL;
|
|
|
|
|
osec != NULL;
|
|
|
|
|
osec = osec->next)
|
|
|
|
|
if (osec->vma > 0
|
2013-02-14 12:52:25 +01:00
|
|
|
|
&& (highest_section == NULL
|
2017-03-01 12:09:46 +01:00
|
|
|
|
|| osec->vma > highest_section->vma))
|
|
|
|
|
highest_section = osec;
|
2013-02-14 12:52:25 +01:00
|
|
|
|
|
|
|
|
|
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);
|
|
|
|
|
}
|
2006-01-18 12:01:09 +01:00
|
|
|
|
}
|
2004-01-12 14:10:02 +01:00
|
|
|
|
}
|
|
|
|
|
|
2015-09-29 15:33:03 +02:00
|
|
|
|
c = bfd_count_sections (obfd);
|
|
|
|
|
if (c != 0
|
2007-04-12 21:20:46 +02:00
|
|
|
|
&& (gap_fill_set || pad_to_set))
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
|
|
|
|
asection **set;
|
|
|
|
|
|
|
|
|
|
/* We must fill in gaps between the sections and/or we must pad
|
|
|
|
|
the last section to a specified address. We do this by
|
|
|
|
|
grabbing a list of the sections, sorting them by VMA, and
|
|
|
|
|
increasing the section sizes as required to fill the gaps.
|
|
|
|
|
We write out the gap contents below. */
|
|
|
|
|
|
2009-09-10 15:40:44 +02:00
|
|
|
|
osections = (asection **) xmalloc (c * sizeof (asection *));
|
1999-05-03 09:29:11 +02:00
|
|
|
|
set = osections;
|
2003-08-05 16:40:54 +02:00
|
|
|
|
bfd_map_over_sections (obfd, get_sections, &set);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
qsort (osections, c, sizeof (asection *), compare_section_lma);
|
|
|
|
|
|
2009-09-10 15:40:44 +02:00
|
|
|
|
gaps = (bfd_size_type *) xmalloc (c * sizeof (bfd_size_type));
|
1999-05-03 09:29:11 +02: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 12:19:03 +02:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, osections[i],
|
|
|
|
|
_("Can't fill gap after section"));
|
1999-05-03 09:29:11 +02: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 12:19:03 +02:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, osections[c - 1],
|
|
|
|
|
_("can't add padding"));
|
1999-05-03 09:29:11 +02: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 15:49:39 +02:00
|
|
|
|
/* Symbol filtering must happen after the output sections
|
|
|
|
|
have been created, but before their contents are set. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
dhandle = NULL;
|
|
|
|
|
if (convert_debugging)
|
2008-06-12 13:57:40 +02:00
|
|
|
|
dhandle = read_debugging_info (ibfd, isympp, symcount, FALSE);
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
|
|
|
|
if (strip_symbols == STRIP_DEBUG
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|| strip_symbols == STRIP_ALL
|
|
|
|
|
|| strip_symbols == STRIP_UNNEEDED
|
2003-06-26 10:14:10 +02:00
|
|
|
|
|| strip_symbols == STRIP_NONDEBUG
|
2012-05-08 19:49:36 +02:00
|
|
|
|
|| strip_symbols == STRIP_DWO
|
|
|
|
|
|| strip_symbols == STRIP_NONDWO
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|| discard_locals != LOCALS_UNDEF
|
2006-06-23 18:23:09 +02:00
|
|
|
|
|| localize_hidden
|
2008-04-16 10:24:21 +02: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
|
2017-04-05 18:22:47 +02:00
|
|
|
|
|| htab_elements (redefine_specific_htab) != 0
|
2002-12-13 14:19:44 +01:00
|
|
|
|
|| prefix_symbols_string
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|| sections_removed
|
1999-06-12 17:42:04 +02:00
|
|
|
|
|| sections_copied
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|| convert_debugging
|
|
|
|
|
|| change_leading_char
|
|
|
|
|
|| remove_leading_char
|
2016-06-23 14:41:57 +02:00
|
|
|
|
|| section_rename_list
|
2015-10-21 16:16:35 +02:00
|
|
|
|
|| weaken
|
|
|
|
|
|| add_symbols)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
|
|
|
|
/* Mark symbols used in output relocations so that they
|
|
|
|
|
are kept, even if they are local labels or static symbols.
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02: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)
|
Have info_to_howto functions return a success/fail status. Check this result. Stop strip from completeing if one of these functions fails.
bfd PR 22875
* elf-bfd.h (struct elf_backend_data): Change the return type of
the elf_info_to_howto and elf_info_to_howto_rel function pointers
to bfd_boolean.
* elfcode.h (elf_slurp_reloc_table_from_section): Check the return value from the info_to_howto function and fail if that function failed.
* elf32-h8300.c (elf32_h8_relocate_section): Check return value from the info_to_howto function.
(elf32_h8_relax_section): Likewise.
* elf32-lm32.c (lm32_elf_relocate_section): Likewise.
* elf32-m68hc1x.c (elf32_m68hc11_relocate_section): Likewise.
* elf32-score.c (s3_bfd_score_elf_relocate_section): Likewise.
* elf32-score7.c (s7_bfd_score_elf_relocate_section): Likewise.
* elf32-tic6x.c (elf32_tic6x_relocate_section): Likewise.
* elf64-ia64-vms.c (elf64_ia64_relocate_section): Likewise.
* elf64-sparc.c (elf64_sparc_slurp_one_reloc_table): Likewise.
* elf64-x86-64.c (elf_x86_64_tls_transition): Likewise.
* elfnn-ia64.c (elfNN_ia64_relocate_section): Likewise.
* elfnn-riscv.c (riscv_elf_check_relocs): Likewise.
(riscv_elf_relocate_section): Likewise.
* elf-hppa.h (elf_hppa_info_to_howto): Change return type to
bfd_boolean. Issue an error message, set an error value and
return FALSE if the reloc is not recognized.
(elf_hppa_info_to_howto_rel): Likewise.
* elf-m10200.c (mn10200_info_to_howto): Likewise.
* elf-m10300.c (mn10300_info_to_howto): Likewise.
* elf.c (_bfd_elf_no_info_to_howto): Likewise.
* elf32-arc.c (arc_info_to_howto_rel): Likewise.
* elf32-arm.c (elf32_arm_info_to_howto): Likewise.
* elf32-avr.c (avr_info_to_howto_rela): Likewise.
* elf32-bfin.c (bfin_info_to_howto): Likewise.
* elf32-cr16.c (elf_cr16_info_to_howto): Likewise.
* elf32-cr16c.c (elf_cr16c_info_to_howto): Likewise.
* elf32-cris.c (elf_cr16c_info_to_howto_rel, cris_info_to_howto_rela): Likewise.
* elf32-crx.c (elf_crx_info_to_howto): Likewise.
* elf32-d10v.c (d10v_info_to_howto_rel): Likewise.
* elf32-d30v.c (d30v_info_to_howto_rel, d30v_info_to_howto_rela): Likewise.
* elf32-dlx.c (dlx_rtype_to_howto, elf32_dlx_info_to_howto, elf32_dlx_info_to_howto_rel): Likewise.
* elf32-epiphany.c (epiphany_info_to_howto_rela): Likewise.
* elf32-fr30.c (fr30_info_to_howto_rela): Likewise.
* elf32-frv.c (frv_info_to_howto_rela, frvfdpic_info_to_howto_rel): Likewise.
* elf32-ft32.c (ft32_info_to_howto_rela): Likewise.
* elf32-gen.c (elf_generic_info_to_howto, elf_generic_info_to_howto_rel): Likewise.
* elf32-h8300.c (elf32_h8_info_to_howto, elf32_h8_info_to_howto_rel): Likewise.
* elf32-i370.c (i370_elf_info_to_howto): Likewise.
* elf32-i386.c (elf_i386_reloc_type_lookup, elf_i386_rtype_to_howto, elf_i386_info_to_howto_rel): Likewise.
* elf32-i860.c (lookup_howto, elf32_i860_info_to_howto_rela): Likewise.
* elf32-i960.c (elf32_i960_info_to_howto_rel): Likewise.
* elf32-ip2k.c (ip2k_info_to_howto_rela): Likewise.
* elf32-iq2000.c (iq2000_info_to_howto_rela): Likewise.
* elf32-lm32.c (lm32_info_to_howto_rela): Likewise.
* elf32-m32c.c (m32c_info_to_howto_rela): Likewise.
* elf32-m32r.c (m32r_info_to_howto_rel, m32r_info_to_howto): Likewise.
* elf32-m68hc11.c (m68hc11_info_to_howto_rel): Likewise.
* elf32-m68hc12.c (m68hc11_info_to_howto_rel): Likewise.
* elf32-m68k.c (rtype_to_howto): Likewise.
* elf32-mcore.c (mcore_elf_info_to_howto): Likewise.
* elf32-mep.c (mep_info_to_howto_rela): Likewise.
* elf32-metag.c (metag_info_to_howto_rela): Likewise.
* elf32-microblaze.c (microblaze_elf_info_to_howto): Likewise.
* elf32-mips.c (mips_info_to_howto_rel, mips_info_to_howto_rela): Likewise.
* elf32-moxie.c (moxie_info_to_howto_rela): Likewise.
* elf32-msp430.c (msp430_info_to_howto_rela): Likewise.
* elf32-mt.c (mt_info_to_howto_rela): Likewise.
* elf32-nds32.c (nds32_info_to_howto_rel, nds32_info_to_howto): Likewise.
* elf32-nios2.c (nios2_elf32_info_to_howto): Likewise.
* elf32-or1k.c (or1k_info_to_howto_rela): Likewise.
* elf32-pj.c (pj_elf_info_to_howto): Likewise.
* elf32-ppc.c (ppc_elf_info_to_howto): Likewise.
* elf32-pru.c (pru_elf32_info_to_howto): Likewise.
* elf32-rl78.c (rl78_info_to_howto_rela): Likewise.
* elf32-rx.c (rx_info_to_howto_rela): Likewise.
* elf32-s390.c (elf_s390_info_to_howto): Likewise.
* elf32-score.c (s3_bfd_score_info_to_howto, _bfd_score_info_to_howto): Likewise.
* elf32-score7.c (s7_bfd_score_info_to_howto): Likewise.
* elf32-sh.c (sh_elf_info_to_howto): Likewise.
* elf32-spu.c (spu_elf_info_to_howto): Likewise.
* elf32-tic6x.c (elf32_tic6x_info_to_howto, elf32_tic6x_info_to_howto_rel): Likewise.
* elf32-tilepro.c (tilepro_info_to_howto_rela): Likewise.
* elf32-v850.c (v850_elf_info_to_howto_rel, v850_elf_info_to_howto_rela, v800_elf_info_to_howto): Likewise.
* elf32-vax.c (rtype_to_howto): Likewise.
* elf32-visium.c (visium_info_to_howto_rela): Likewise.
* elf32-wasm32.c (elf32_wasm32_rtype_to_howto, elf32_wasm32_info_to_howto_rela): Likewise.
* elf32-xc16x.c (elf32_xc16x_info_to_howto): Likewise.
* elf32-xgate.c (xgate_info_to_howto_rel): Likewise.
* elf32-xstormy16.c (xstormy16_info_to_howto_rela): Likewise.
* elf32-xtensa.c (elf_xtensa_info_to_howto_rela): Likewise.
* elf64-alpha.c (elf64_alpha_info_to_howto): Likewise.
* elf64-gen.c (elf_generic_info_to_howto, elf_generic_info_to_howto_rel): Likewise.
* elf64-ia64-vms.c (elf64_ia64_info_to_howto): Likewise.
* elf64-mips.c (mips_elf64_info_to_howto_rela): Likewise.
* elf64-mmix.c (mmix_info_to_howto_rela): Likewise.
* elf64-ppc.c (ppc64_elf_info_to_howto): Likewise.
* elf64-s390.c (elf_s390_reloc_type_lookup): Likewise.
* elf64-sh64.c (elf_s390_info_to_howto, sh_elf64_info_to_howto): Likewise.
* elf64-x86-64.c (elf_x86_64_info_to_howto): Likewise.
* elfn32-mips.c (mips_info_to_howto_rel, mips_info_to_howto_rela): Likewise.
* elfnn-aarch64.c (elfNN_aarch64_info_to_howto): Likewise.
* elfnn-ia64.c (elfNN_ia64_info_to_howto): Likewise.
* elfnn-riscv.c (riscv_info_to_howto_rela): Likewise.
* elfxx-ia64.c (ia64_elf_reloc_type_lookup): Likewise.
* elfxx-sparc.c (_bfd_sparc_elf_info_to_howto): Likewise.
* elfxx-tilegx.c (tilegx_info_to_howto_rela): Likewise.
* elf32-score.h (s7_bfd_score_info_to_howto): Update prototype.
* elfxx-sparc.h (_bfd_sparc_elf_info_to_howto): Update prototype.
* elfxx-tilegx.h (tilegx_info_to_howto_rela): Update prototype.
* elfxx-target.h (elf_info_to_howto, elf_info_to_howto_rel): Default to NULL.
binutils PR 22875
* objcopy.c (copy_object): Check the error status after marking symbols used in relocations.
* testsuite/binutils-all/strip-13.s: New test source file.
* testsuite/binutils-all/strip-13.s: New test driver file.
* testsuite/binutils-all/objcopy.exp: Run the new test.
2018-02-27 11:15:13 +01:00
|
|
|
|
{
|
|
|
|
|
bfd_set_error (bfd_error_no_error);
|
|
|
|
|
bfd_map_over_sections (ibfd,
|
|
|
|
|
mark_symbols_used_in_relocations,
|
|
|
|
|
isympp);
|
|
|
|
|
if (bfd_get_error () != bfd_error_no_error)
|
|
|
|
|
{
|
|
|
|
|
status = 1;
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-10-21 16:16:35 +02:00
|
|
|
|
osympp = (asymbol **) xmalloc ((symcount + add_symbols + 1) * sizeof (asymbol *));
|
1999-05-03 09:29:11 +02:00
|
|
|
|
symcount = filter_symbols (ibfd, obfd, osympp, isympp, symcount);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (convert_debugging && dhandle != NULL)
|
|
|
|
|
{
|
2019-01-04 13:11:51 +01:00
|
|
|
|
bfd_boolean res;
|
|
|
|
|
|
|
|
|
|
res = write_debugging_info (obfd, dhandle, &symcount, &osympp);
|
|
|
|
|
|
|
|
|
|
free (dhandle);
|
|
|
|
|
dhandle = NULL; /* Paranoia... */
|
|
|
|
|
|
|
|
|
|
if (! res)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
|
|
|
|
status = 1;
|
2004-01-12 14:10:02 +01:00
|
|
|
|
return FALSE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bfd_set_symtab (obfd, osympp, symcount);
|
|
|
|
|
|
2012-04-13 04:52:34 +02:00
|
|
|
|
/* This has to happen before section positions are set. */
|
|
|
|
|
bfd_map_over_sections (ibfd, copy_relocations_in_section, obfd);
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
/* This has to happen after the symbol table has been set. */
|
2003-08-05 16:40:54 +02:00
|
|
|
|
bfd_map_over_sections (ibfd, copy_section, obfd);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
if (add_sections != NULL)
|
|
|
|
|
{
|
|
|
|
|
struct section_add *padd;
|
|
|
|
|
|
|
|
|
|
for (padd = add_sections; padd != NULL; padd = padd->next)
|
|
|
|
|
{
|
2003-08-05 16:40:54 +02:00
|
|
|
|
if (! bfd_set_section_contents (obfd, padd->section, padd->contents,
|
|
|
|
|
0, padd->size))
|
2004-01-12 14:10:02 +01:00
|
|
|
|
{
|
2007-08-30 12:19:03 +02:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, padd->section, NULL);
|
2004-01-12 14:10:02 +01:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-13 18:04:42 +01:00
|
|
|
|
if (update_sections != NULL)
|
|
|
|
|
{
|
|
|
|
|
struct section_add *pupdate;
|
|
|
|
|
|
|
|
|
|
for (pupdate = update_sections;
|
2016-05-31 12:51:09 +02:00
|
|
|
|
pupdate != NULL;
|
|
|
|
|
pupdate = pupdate->next)
|
2015-02-13 18:04:42 +01:00
|
|
|
|
{
|
|
|
|
|
osec = pupdate->section->output_section;
|
|
|
|
|
if (! bfd_set_section_contents (obfd, osec, pupdate->contents,
|
2016-05-31 12:51:09 +02:00
|
|
|
|
0, pupdate->size))
|
2015-02-13 18:04:42 +01:00
|
|
|
|
{
|
|
|
|
|
bfd_nonfatal_message (NULL, obfd, osec, NULL);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-01 12:09:46 +01:00
|
|
|
|
if (merge_notes)
|
|
|
|
|
{
|
|
|
|
|
osec = bfd_get_section_by_name (obfd, GNU_BUILD_ATTRS_SECTION_NAME);
|
|
|
|
|
if (osec && is_merged_note_section (obfd, osec))
|
|
|
|
|
{
|
|
|
|
|
if (! bfd_set_section_contents (obfd, osec, merged_notes, 0, merged_size))
|
|
|
|
|
{
|
|
|
|
|
bfd_nonfatal_message (NULL, obfd, osec, _("error: failed to copy merged notes into output"));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
}
|
2017-04-13 15:50:56 +02:00
|
|
|
|
else if (! is_strip)
|
|
|
|
|
bfd_nonfatal_message (NULL, obfd, osec, _("could not find any mergeable note sections"));
|
2017-03-01 12:09:46 +01:00
|
|
|
|
free (merged_notes);
|
|
|
|
|
merged_notes = NULL;
|
|
|
|
|
merge_notes = FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
2003-06-27 10:01:28 +02:00
|
|
|
|
if (gnu_debuglink_filename != NULL)
|
|
|
|
|
{
|
|
|
|
|
if (! bfd_fill_in_gnu_debuglink_section
|
|
|
|
|
(obfd, gnu_debuglink_section, gnu_debuglink_filename))
|
2004-01-12 14:10:02 +01:00
|
|
|
|
{
|
2007-08-30 12:19:03 +02:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, NULL,
|
|
|
|
|
_("cannot fill debug link section `%s'"),
|
|
|
|
|
gnu_debuglink_filename);
|
2004-01-12 14:10:02 +01:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
2003-06-27 10:01:28 +02:00
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
if (gap_fill_set || pad_to_set)
|
|
|
|
|
{
|
|
|
|
|
bfd_byte *buf;
|
|
|
|
|
|
|
|
|
|
/* Fill in the gaps. */
|
|
|
|
|
if (max_gap > 8192)
|
|
|
|
|
max_gap = 8192;
|
2009-09-10 15:40:44 +02:00
|
|
|
|
buf = (bfd_byte *) xmalloc (max_gap);
|
2003-08-05 16:40:54 +02:00
|
|
|
|
memset (buf, gap_fill, max_gap);
|
1999-05-03 09:29:11 +02: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 15:49:39 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02: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 14:10:02 +01:00
|
|
|
|
{
|
2007-08-30 12:19:03 +02:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, osections[i], NULL);
|
2018-07-20 16:05:34 +02:00
|
|
|
|
free (buf);
|
2004-01-12 14:10:02 +01:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
left -= now;
|
|
|
|
|
off += now;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2018-07-20 16:05:34 +02:00
|
|
|
|
|
|
|
|
|
free (buf);
|
|
|
|
|
free (gaps);
|
|
|
|
|
gaps = NULL;
|
1999-05-03 09:29:11 +02: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 16:29:27 +02:00
|
|
|
|
if (! bfd_copy_private_bfd_data (ibfd, obfd))
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
2007-08-30 12:19:03 +02:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, NULL,
|
|
|
|
|
_("error copying private BFD data"));
|
2004-01-12 14:10:02 +01:00
|
|
|
|
return FALSE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
}
|
2001-08-24 15:56:11 +02: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-02-28 17:09:01 +01: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 14:10:02 +01:00
|
|
|
|
|
|
|
|
|
return TRUE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Read each archive element in turn from IBFD, copy the
|
2006-09-11 16:40:39 +02: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 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
static void
|
2006-09-11 16:40:39 +02:00
|
|
|
|
copy_archive (bfd *ibfd, bfd *obfd, const char *output_target,
|
2009-09-11 13:16:19 +02:00
|
|
|
|
bfd_boolean force_output_target,
|
|
|
|
|
const bfd_arch_info_type *input_arch)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
|
|
|
|
struct name_list
|
|
|
|
|
{
|
|
|
|
|
struct name_list *next;
|
2002-02-11 03:34:14 +01:00
|
|
|
|
const char *name;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
bfd *obfd;
|
|
|
|
|
} *list, *l;
|
|
|
|
|
bfd **ptr = &obfd->archive_head;
|
|
|
|
|
bfd *this_element;
|
2009-01-29 14:03:21 +01:00
|
|
|
|
char *dir;
|
|
|
|
|
const char *filename;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
/* Make a temp directory to hold the contents. */
|
2006-10-13 11:43:29 +02:00
|
|
|
|
dir = make_tempdir (bfd_get_filename (obfd));
|
|
|
|
|
if (dir == NULL)
|
2016-05-31 12:51:09 +02:00
|
|
|
|
fatal (_("cannot create tempdir for archive copying (error: %s)"),
|
2006-10-13 11:43:29 +02:00
|
|
|
|
strerror (errno));
|
2003-07-23 19:34:03 +02:00
|
|
|
|
|
2012-04-25 19:50:14 +02:00
|
|
|
|
if (strip_symbols == STRIP_ALL)
|
|
|
|
|
obfd->has_armap = FALSE;
|
|
|
|
|
else
|
|
|
|
|
obfd->has_armap = ibfd->has_armap;
|
2008-03-28 07:49:44 +01:00
|
|
|
|
obfd->is_thin_archive = ibfd->is_thin_archive;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2012-04-25 19:50:14 +02:00
|
|
|
|
if (deterministic)
|
|
|
|
|
obfd->flags |= BFD_DETERMINISTIC_OUTPUT;
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
list = NULL;
|
|
|
|
|
|
|
|
|
|
this_element = bfd_openr_next_archived_file (ibfd, NULL);
|
2001-07-31 15:49:39 +02:00
|
|
|
|
|
2001-12-18 12:54:10 +01:00
|
|
|
|
if (!bfd_set_format (obfd, bfd_get_format (ibfd)))
|
2009-01-29 14:03:21 +01:00
|
|
|
|
{
|
|
|
|
|
status = 1;
|
|
|
|
|
bfd_nonfatal_message (NULL, obfd, NULL, NULL);
|
2015-03-10 14:38:24 +01:00
|
|
|
|
goto cleanup_and_exit;
|
2009-01-29 14:03:21 +01:00
|
|
|
|
}
|
2001-12-18 12:54:10 +01:00
|
|
|
|
|
2003-08-05 16:40:54 +02:00
|
|
|
|
while (!status && this_element != NULL)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
2002-02-11 03:34:14 +01:00
|
|
|
|
char *output_name;
|
|
|
|
|
bfd *output_bfd;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
bfd *last_element;
|
1999-05-27 05:16:15 +02:00
|
|
|
|
struct stat buf;
|
|
|
|
|
int stat_status = 0;
|
2009-09-10 15:40:44 +02:00
|
|
|
|
bfd_boolean del = TRUE;
|
2011-05-06 16:41:56 +02:00
|
|
|
|
bfd_boolean ok_object;
|
1999-05-27 05:16:15 +02:00
|
|
|
|
|
2014-11-06 15:49:10 +01:00
|
|
|
|
/* PR binutils/17533: Do not allow directory traversal
|
|
|
|
|
outside of the current directory tree by archive members. */
|
|
|
|
|
if (! is_valid_archive_path (bfd_get_filename (this_element)))
|
2014-11-10 15:28:43 +01:00
|
|
|
|
{
|
|
|
|
|
non_fatal (_("illegal pathname found in archive member: %s"),
|
|
|
|
|
bfd_get_filename (this_element));
|
|
|
|
|
status = 1;
|
|
|
|
|
goto cleanup_and_exit;
|
|
|
|
|
}
|
2014-11-06 15:49:10 +01:00
|
|
|
|
|
2002-02-11 03:34:14 +01: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)
|
|
|
|
|
{
|
2018-07-24 15:07:54 +02:00
|
|
|
|
char * tmpdir = make_tempdir (output_name);
|
|
|
|
|
|
|
|
|
|
free (output_name);
|
|
|
|
|
if (tmpdir == NULL)
|
2014-11-10 15:28:43 +01:00
|
|
|
|
{
|
|
|
|
|
non_fatal (_("cannot create tempdir for archive copying (error: %s)"),
|
|
|
|
|
strerror (errno));
|
|
|
|
|
status = 1;
|
|
|
|
|
goto cleanup_and_exit;
|
|
|
|
|
}
|
2003-07-23 19:34:03 +02:00
|
|
|
|
|
2009-09-10 15:40:44 +02:00
|
|
|
|
l = (struct name_list *) xmalloc (sizeof (struct name_list));
|
2018-07-24 15:07:54 +02:00
|
|
|
|
l->name = tmpdir;
|
2002-02-11 03:34:14 +01:00
|
|
|
|
l->next = list;
|
|
|
|
|
l->obfd = NULL;
|
|
|
|
|
list = l;
|
2018-07-24 15:07:54 +02:00
|
|
|
|
output_name = concat (tmpdir, "/",
|
2002-02-11 03:34:14 +01:00
|
|
|
|
bfd_get_filename (this_element), (char *) 0);
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-27 05:16:15 +02:00
|
|
|
|
if (preserve_dates)
|
|
|
|
|
{
|
|
|
|
|
stat_status = bfd_stat_arch_elt (this_element, &buf);
|
2001-07-31 15:49:39 +02:00
|
|
|
|
|
1999-05-27 05:16:15 +02:00
|
|
|
|
if (stat_status != 0)
|
|
|
|
|
non_fatal (_("internal stat error on %s"),
|
|
|
|
|
bfd_get_filename (this_element));
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2009-09-10 15:40:44 +02:00
|
|
|
|
l = (struct name_list *) xmalloc (sizeof (struct name_list));
|
1999-05-03 09:29:11 +02:00
|
|
|
|
l->name = output_name;
|
|
|
|
|
l->next = list;
|
2005-04-25 16:27:00 +02:00
|
|
|
|
l->obfd = NULL;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
list = l;
|
|
|
|
|
|
2011-05-06 16:41:56 +02: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 15:26:42 +02:00
|
|
|
|
{
|
2011-05-06 16:41:56 +02:00
|
|
|
|
bfd_nonfatal_message (output_name, NULL, NULL, NULL);
|
|
|
|
|
status = 1;
|
2014-11-10 15:28:43 +01:00
|
|
|
|
goto cleanup_and_exit;
|
2011-05-06 16:41:56 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (ok_object)
|
|
|
|
|
{
|
|
|
|
|
del = !copy_object (this_element, output_bfd, input_arch);
|
2006-09-11 16:40:39 +02:00
|
|
|
|
|
2011-05-06 16:41:56 +02: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 12:19:03 +02:00
|
|
|
|
{
|
|
|
|
|
bfd_nonfatal_message (output_name, NULL, NULL, NULL);
|
2011-05-06 16:41:56 +02:00
|
|
|
|
/* Error in new object file. Don't change archive. */
|
2007-08-30 12:19:03 +02:00
|
|
|
|
status = 1;
|
2005-06-14 15:26:42 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2011-05-06 16:41:56 +02:00
|
|
|
|
if (!ok_object)
|
|
|
|
|
{
|
2009-09-10 15:40:44 +02:00
|
|
|
|
del = !copy_unknown_object (this_element, output_bfd);
|
2005-06-14 15:26:42 +02:00
|
|
|
|
if (!bfd_close_all_done (output_bfd))
|
|
|
|
|
{
|
2009-01-29 14:03:21 +01:00
|
|
|
|
bfd_nonfatal_message (output_name, NULL, NULL, NULL);
|
2005-06-14 15:26:42 +02:00
|
|
|
|
/* Error in new object file. Don't change archive. */
|
|
|
|
|
status = 1;
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
}
|
|
|
|
|
|
2009-09-10 15:40:44 +02:00
|
|
|
|
if (del)
|
2004-01-12 14:10:02 +01:00
|
|
|
|
{
|
|
|
|
|
unlink (output_name);
|
|
|
|
|
status = 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (preserve_dates && stat_status == 0)
|
|
|
|
|
set_times (output_name, &buf);
|
1999-05-27 05:16:15 +02:00
|
|
|
|
|
2004-01-12 14:10:02 +01:00
|
|
|
|
/* Open the newly output file and attach to our list. */
|
|
|
|
|
output_bfd = bfd_openr (output_name, output_target);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2004-01-12 14:10:02 +01:00
|
|
|
|
l->obfd = output_bfd;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2004-01-12 14:10:02 +01:00
|
|
|
|
*ptr = output_bfd;
|
2007-06-27 13:54:10 +02:00
|
|
|
|
ptr = &output_bfd->archive_next;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2004-01-12 14:10:02 +01:00
|
|
|
|
last_element = this_element;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2004-01-12 14:10:02 +01:00
|
|
|
|
this_element = bfd_openr_next_archived_file (ibfd, last_element);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2004-01-12 14:10:02 +01:00
|
|
|
|
bfd_close (last_element);
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
}
|
2003-08-05 16:40:54 +02:00
|
|
|
|
*ptr = NULL;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2009-01-29 14:03:21 +01:00
|
|
|
|
filename = bfd_get_filename (obfd);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
if (!bfd_close (obfd))
|
2009-01-29 14:03:21 +01:00
|
|
|
|
{
|
|
|
|
|
status = 1;
|
|
|
|
|
bfd_nonfatal_message (filename, NULL, NULL, NULL);
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2009-01-29 14:03:21 +01:00
|
|
|
|
filename = bfd_get_filename (ibfd);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
if (!bfd_close (ibfd))
|
2009-01-29 14:03:21 +01:00
|
|
|
|
{
|
|
|
|
|
status = 1;
|
|
|
|
|
bfd_nonfatal_message (filename, NULL, NULL, NULL);
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2014-11-10 15:28:43 +01:00
|
|
|
|
cleanup_and_exit:
|
1999-05-03 09:29:11 +02:00
|
|
|
|
/* Delete all the files that we opened. */
|
2018-07-24 15:07:54 +02:00
|
|
|
|
{
|
|
|
|
|
struct name_list * next;
|
|
|
|
|
|
|
|
|
|
for (l = list; l != NULL; l = next)
|
|
|
|
|
{
|
|
|
|
|
if (l->obfd == NULL)
|
|
|
|
|
rmdir (l->name);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
bfd_close (l->obfd);
|
|
|
|
|
unlink (l->name);
|
|
|
|
|
}
|
|
|
|
|
next = l->next;
|
|
|
|
|
free (l);
|
|
|
|
|
}
|
|
|
|
|
}
|
2015-03-10 14:38:24 +01:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
rmdir (dir);
|
|
|
|
|
}
|
|
|
|
|
|
2009-04-14 11:47:44 +02: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 11:07:37 +02:00
|
|
|
|
if (style == KEEP
|
|
|
|
|
&& bfd_get_flavour (input_bfd) == bfd_target_coff_flavour)
|
2009-04-14 11:47:44 +02:00
|
|
|
|
style = bfd_coff_long_section_names (input_bfd) ? ENABLE : DISABLE;
|
|
|
|
|
bfd_coff_set_long_section_names (output_bfd, style != DISABLE);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
/* The top-level control. */
|
|
|
|
|
|
|
|
|
|
static void
|
2003-07-23 19:34:03 +02:00
|
|
|
|
copy_file (const char *input_filename, const char *output_filename,
|
2009-09-11 13:16:19 +02:00
|
|
|
|
const char *input_target, const char *output_target,
|
|
|
|
|
const bfd_arch_info_type *input_arch)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
|
|
|
|
bfd *ibfd;
|
2002-10-15 07:10:48 +02:00
|
|
|
|
char **obj_matching;
|
|
|
|
|
char **core_matching;
|
2009-06-27 19:19:02 +02:00
|
|
|
|
off_t size = get_file_size (input_filename);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2009-06-27 19:19:02 +02:00
|
|
|
|
if (size < 1)
|
2003-11-07 13:19:34 +01:00
|
|
|
|
{
|
2009-06-27 19:19:02 +02:00
|
|
|
|
if (size == 0)
|
|
|
|
|
non_fatal (_("error: the input file '%s' is empty"),
|
|
|
|
|
input_filename);
|
2003-11-07 13:19:34 +01:00
|
|
|
|
status = 1;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 09:29:11 +02: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 12:19:03 +02:00
|
|
|
|
{
|
|
|
|
|
bfd_nonfatal_message (input_filename, NULL, NULL, NULL);
|
|
|
|
|
status = 1;
|
|
|
|
|
return;
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2010-10-29 14:10:39 +02:00
|
|
|
|
switch (do_debug_sections)
|
|
|
|
|
{
|
|
|
|
|
case compress:
|
2015-04-08 16:53:54 +02:00
|
|
|
|
case compress_zlib:
|
|
|
|
|
case compress_gnu_zlib:
|
|
|
|
|
case compress_gabi_zlib:
|
2010-10-29 14:10:39 +02:00
|
|
|
|
ibfd->flags |= BFD_COMPRESS;
|
2015-04-09 19:56:28 +02:00
|
|
|
|
/* Don't check if input is ELF here since this information is
|
|
|
|
|
only available after bfd_check_format_matches is called. */
|
2015-07-14 19:25:52 +02:00
|
|
|
|
if (do_debug_sections != compress_gnu_zlib)
|
2015-04-09 19:56:28 +02:00
|
|
|
|
ibfd->flags |= BFD_COMPRESS_GABI;
|
2010-10-29 14:10:39 +02:00
|
|
|
|
break;
|
|
|
|
|
case decompress:
|
|
|
|
|
ibfd->flags |= BFD_DECOMPRESS;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
Properly implement STT_COMMON
The BFD configure option, --enable-elf-stt-common, can't be to used to
verify STT_COMMON implementation with the normal binutils build. Instead,
this patch removes it from BFD. It adds --elf-stt-common=[no|yes] to ELF
assembler/objcopy and adds -z common/-z nocommon to ld.
A configure option, --enable-elf-stt-common, is added to gas to specify
whether ELF assembler should generate common symbols with the STT_COMMON
type by default.
Since BSF_KEEP_G is never used, it is renamed to BSF_ELF_COMMON for ELF
common symbols.
bfd/
PR ld/19645
* bfd.c (bfd): Change flags to 20 bits.
(BFD_CONVERT_ELF_COMMON): New.
(BFD_USE_ELF_STT_COMMON): Likewise.
(BFD_FLAGS_SAVED): Add BFD_CONVERT_ELF_COMMON and
BFD_USE_ELF_STT_COMMON.
(BFD_FLAGS_FOR_BFD_USE_MASK): Likewise.
* configure.ac: Remove --enable-elf-stt-common.
* elf.c (swap_out_syms): Choose STT_COMMON or STT_OBJECT for
common symbol depending on BFD_CONVERT_ELF_COMMON and
BFD_USE_ELF_STT_COMMON.
* elfcode.h (elf_slurp_symbol_table): Set BSF_ELF_COMMON for
STT_COMMON.
* elflink.c (bfd_elf_link_mark_dynamic_symbol): Also check
STT_COMMON.
(elf_link_convert_common_type): New function.
(elf_link_output_extsym): Choose STT_COMMON or STT_OBJECT for
common symbol depending on BFD_CONVERT_ELF_COMMON and
BFD_USE_ELF_STT_COMMON. Set sym.st_info after sym.st_shndx.
* elfxx-target.h (TARGET_BIG_SYM): Add BFD_CONVERT_ELF_COMMON
and BFD_USE_ELF_STT_COMMON to object_flags.
(TARGET_LITTLE_SYM): Likewise.
* syms.c (BSF_KEEP_G): Renamed to ...
(BSF_ELF_COMMON): This.
* bfd-in2.h: Regenerated.
* config.in: Likewise.
* configure: Likewise.
binutils/
PR ld/19645
* NEWS: Mention --elf-stt-common= for objcopy.
* doc/binutils.texi: Document --elf-stt-common= for objcopy.
* objcopy.c (do_elf_stt_common): New.
(command_line_switch): Add OPTION_ELF_STT_COMMON.
(copy_options): Add --elf-stt-common=.
(copy_usage): Add --elf-stt-common=.
(copy_object): Also check do_elf_stt_common for ELF targets.
(copy_file): Handle do_elf_stt_common.
(copy_main): Handle OPTION_ELF_STT_COMMON.
* readelf.c (apply_relocations): Support STT_COMMON.
* testsuite/binutils-all/common-1.s: New file.
* testsuite/binutils-all/common-1a.d: Likewise.
* testsuite/binutils-all/common-1b.d: Likewise.
* testsuite/binutils-all/common-1c.d: Likewise.
* testsuite/binutils-all/common-1d.d: Likewise.
* testsuite/binutils-all/common-1e.d: Likewise.
* testsuite/binutils-all/common-1f.d: Likewise.
* testsuite/binutils-all/common-2.s: Likewise.
* testsuite/binutils-all/common-2a.d: Likewise.
* testsuite/binutils-all/common-2b.d: Likewise.
* testsuite/binutils-all/common-2c.d: Likewise.
* testsuite/binutils-all/common-2d.d: Likewise.
* testsuite/binutils-all/common-2e.d: Likewise.
* testsuite/binutils-all/common-2f.d: Likewise.
* testsuite/binutils-all/objcopy.exp
(objcopy_test_elf_common_symbols): New proc.
Run objcopy_test_elf_common_symbols for ELF targets
gas/
PR ld/19645
* NEWS: Mention --enable-elf-stt-common and --elf-stt-common=
for ELF assemblers.
* as.c (flag_use_elf_stt_common): New.
(show_usage): Add --elf-stt-common=.
(option_values): Add OPTION_ELF_STT_COMMON.
(std_longopts): Add --elf-stt-common=.
(parse_args): Handle --elf-stt-common=.
* as.h (flag_use_elf_stt_common): New.
* config.in: Regenerated.
* configure: Likewise.
* configure.ac: Add --enable-elf-stt-common and define
DEFAULT_GENERATE_ELF_STT_COMMON.
* gas/write.c (write_object_file): Set BFD_CONVERT_ELF_COMMON
and BFD_USE_ELF_STT_COMMON if flag_use_elf_stt_common is set.
* doc/as.texinfo: Document --elf-stt-common=.
* testsuite/gas/elf/common3.s: New file.
* testsuite/gas/elf/common3a.d: Likewise.
* testsuite/gas/elf/common3b.d: Likewise.
* testsuite/gas/elf/common4.s: Likewise.
* testsuite/gas/elf/common4a.d: Likewise.
* testsuite/gas/elf/common4b.d: Likewise.
* testsuite/gas/i386/dw2-compress-3b.d: Likewise.
* testsuite/gas/i386/dw2-compressed-3b.d: Likewise.
* testsuite/gas/elf/elf.exp: Run common3a, common3b, common4a
and common4b.
* testsuite/gas/i386/dw2-compress-3.d: Renamed to ...
* testsuite/gas/i386/dw2-compress-3a.d: This. Pass
--elf-stt-common=no to as.
* testsuite/gas/i386/dw2-compressed-3.d: Renamed to ...
* testsuite/gas/i386/dw2-compressed-3a.d: This. Pass
--elf-stt-common=no to as.
* testsuite/gas/i386/i386.exp: Run dw2-compress-3a,
dw2-compress-3b, dw2-compressed-3a and dw2-compressed-3b instead
of dw2-compress-3 and dw2-compressed-3.
include/
PR ld/19645
* bfdlink.h (bfd_link_elf_stt_common): New enum.
(bfd_link_info): Add elf_stt_common.
ld/
PR ld/19645
* NEWS: Mention -z common/-z nocommon for ELF targets.
* emultempl/elf32.em (gld${EMULATION_NAME}_handle_option): Handle
-z common and -z nocommon.
* ld.texinfo: Document -z common/-z nocommon.
* lexsup.c (elf_shlib_list_options): Add -z common/-z nocommon.
* testsuite/ld-elf/tls_common.exp: Test --elf-stt-common=no and
--elf-stt-common=yes with assembler.
* testsuite/ld-elfcomm/common-1.s: New file.
* testsuite/ld-elfcomm/common-1a.d: Likewise.
* testsuite/ld-elfcomm/common-1b.d: Likewise.
* testsuite/ld-elfcomm/common-1c.d: Likewise.
* testsuite/ld-elfcomm/common-1d.d: Likewise.
* testsuite/ld-elfcomm/common-1e.d: Likewise.
* testsuite/ld-elfcomm/common-1f.d: Likewise.
* testsuite/ld-elfcomm/common-2.s: Likewise.
* testsuite/ld-elfcomm/common-2a.d: Likewise.
* testsuite/ld-elfcomm/common-2b.d: Likewise.
* testsuite/ld-elfcomm/common-2c.d: Likewise.
* testsuite/ld-elfcomm/common-2d.d: Likewise.
* testsuite/ld-elfcomm/common-2e.d: Likewise.
* testsuite/ld-elfcomm/common-2f.d: Likewise.
* testsuite/ld-elfcomm/common-3a.rd: Likewise.
* testsuite/ld-elfcomm/common-3b.rd: Likewise.
* testsuite/ld-i386/pr19645.d: Likewise.
* testsuite/ld-i386/pr19645.s: Likewise.
* testsuite/ld-x86-64/largecomm-1.s: Likewise.
* testsuite/ld-x86-64/largecomm-1a.d: Likewise.
* testsuite/ld-x86-64/largecomm-1b.d: Likewise.
* testsuite/ld-x86-64/largecomm-1c.d: Likewise.
* testsuite/ld-x86-64/largecomm-1d.d: Likewise.
* testsuite/ld-x86-64/largecomm-1e.d: Likewise.
* testsuite/ld-x86-64/largecomm-1f.d: Likewise.
* testsuite/ld-x86-64/pr19645.d: Likewise.
* testsuite/ld-x86-64/pr19645.s: Likewise.
* testsuite/ld-elfcomm/elfcomm.exp: Test --elf-stt-common=yes
with assembler.
(assembler_generates_commons): Removed.
Run -z common/-z nocommon tests. Run *.d tests.
* testsuite/ld-i386/i386.exp: Run pr19645.
* testsuite/ld-x86-64/x86-64.exp: Likewise.
* testsuite/ld-x86-64/dwarfreloc.exp: Test --elf-stt-common with
assembler. Test STT_COMMON with readelf.
2016-02-22 18:18:52 +01:00
|
|
|
|
switch (do_elf_stt_common)
|
|
|
|
|
{
|
|
|
|
|
case elf_stt_common:
|
|
|
|
|
ibfd->flags |= BFD_CONVERT_ELF_COMMON | BFD_USE_ELF_STT_COMMON;
|
|
|
|
|
break;
|
|
|
|
|
break;
|
|
|
|
|
case no_elf_stt_common:
|
|
|
|
|
ibfd->flags |= BFD_CONVERT_ELF_COMMON;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
if (bfd_check_format (ibfd, bfd_archive))
|
|
|
|
|
{
|
2006-09-11 16:40:39 +02:00
|
|
|
|
bfd_boolean force_output_target;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
bfd *obfd;
|
|
|
|
|
|
|
|
|
|
/* bfd_get_target does not return the correct value until
|
2016-05-31 12:51:09 +02:00
|
|
|
|
bfd_check_format succeeds. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
if (output_target == NULL)
|
2006-09-11 16:40:39 +02:00
|
|
|
|
{
|
|
|
|
|
output_target = bfd_get_target (ibfd);
|
|
|
|
|
force_output_target = FALSE;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
force_output_target = TRUE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
obfd = bfd_openw (output_filename, output_target);
|
|
|
|
|
if (obfd == NULL)
|
2007-08-30 12:19:03 +02:00
|
|
|
|
{
|
|
|
|
|
bfd_nonfatal_message (output_filename, NULL, NULL, NULL);
|
|
|
|
|
status = 1;
|
|
|
|
|
return;
|
|
|
|
|
}
|
2009-04-14 11:47:44 +02:00
|
|
|
|
/* This is a no-op on non-Coff targets. */
|
|
|
|
|
set_long_section_mode (obfd, ibfd, long_section_names);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2009-09-11 13:16:19 +02:00
|
|
|
|
copy_archive (ibfd, obfd, output_target, force_output_target, input_arch);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
}
|
2002-10-15 07:10:48 +02:00
|
|
|
|
else if (bfd_check_format_matches (ibfd, bfd_object, &obj_matching))
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
|
|
|
|
bfd *obfd;
|
2002-10-15 07:10:48 +02:00
|
|
|
|
do_copy:
|
2004-01-12 14:10:02 +01:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
/* bfd_get_target does not return the correct value until
|
2016-05-31 12:51:09 +02:00
|
|
|
|
bfd_check_format succeeds. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
if (output_target == NULL)
|
|
|
|
|
output_target = bfd_get_target (ibfd);
|
|
|
|
|
|
|
|
|
|
obfd = bfd_openw (output_filename, output_target);
|
|
|
|
|
if (obfd == NULL)
|
2007-08-30 12:19:03 +02:00
|
|
|
|
{
|
|
|
|
|
bfd_nonfatal_message (output_filename, NULL, NULL, NULL);
|
|
|
|
|
status = 1;
|
|
|
|
|
return;
|
|
|
|
|
}
|
2009-04-14 11:47:44 +02:00
|
|
|
|
/* This is a no-op on non-Coff targets. */
|
|
|
|
|
set_long_section_mode (obfd, ibfd, long_section_names);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2009-09-11 13:16:19 +02:00
|
|
|
|
if (! copy_object (ibfd, obfd, input_arch))
|
2005-05-06 08:32:43 +02:00
|
|
|
|
status = 1;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2015-01-08 16:39:49 +01:00
|
|
|
|
/* PR 17512: file: 0f15796a.
|
|
|
|
|
If the file could not be copied it may not be in a writeable
|
|
|
|
|
state. So use bfd_close_all_done to avoid the possibility of
|
|
|
|
|
writing uninitialised data into the file. */
|
|
|
|
|
if (! (status ? bfd_close_all_done (obfd) : bfd_close (obfd)))
|
2009-01-29 14:03:21 +01:00
|
|
|
|
{
|
|
|
|
|
status = 1;
|
|
|
|
|
bfd_nonfatal_message (output_filename, NULL, NULL, NULL);
|
|
|
|
|
return;
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
if (!bfd_close (ibfd))
|
2009-01-29 14:03:21 +01:00
|
|
|
|
{
|
|
|
|
|
status = 1;
|
|
|
|
|
bfd_nonfatal_message (input_filename, NULL, NULL, NULL);
|
|
|
|
|
return;
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2002-10-15 07:10:48 +02:00
|
|
|
|
bfd_error_type obj_error = bfd_get_error ();
|
|
|
|
|
bfd_error_type core_error;
|
2002-11-30 09:39:46 +01:00
|
|
|
|
|
2002-10-15 07:10:48 +02: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 12:19:03 +02:00
|
|
|
|
bfd_nonfatal_message (input_filename, NULL, NULL, NULL);
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
2002-10-15 07:10:48 +02: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 09:29:11 +02:00
|
|
|
|
{
|
2002-10-15 07:10:48 +02:00
|
|
|
|
list_matching_formats (core_matching);
|
|
|
|
|
free (core_matching);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
}
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
status = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2001-07-31 15:49:39 +02:00
|
|
|
|
/* Add a name to the section renaming list. */
|
|
|
|
|
|
|
|
|
|
static void
|
2003-07-23 19:34:03 +02:00
|
|
|
|
add_section_rename (const char * old_name, const char * new_name,
|
|
|
|
|
flagword flags)
|
2001-07-31 15:49:39 +02:00
|
|
|
|
{
|
2009-12-11 14:42:17 +01:00
|
|
|
|
section_rename * srename;
|
2001-07-31 15:49:39 +02:00
|
|
|
|
|
|
|
|
|
/* Check for conflicts first. */
|
2009-12-11 14:42:17 +01:00
|
|
|
|
for (srename = section_rename_list; srename != NULL; srename = srename->next)
|
|
|
|
|
if (strcmp (srename->old_name, old_name) == 0)
|
2001-07-31 15:49:39 +02:00
|
|
|
|
{
|
|
|
|
|
/* Silently ignore duplicate definitions. */
|
2009-12-11 14:42:17 +01:00
|
|
|
|
if (strcmp (srename->new_name, new_name) == 0
|
|
|
|
|
&& srename->flags == flags)
|
2001-07-31 15:49:39 +02:00
|
|
|
|
return;
|
2002-05-21 21:34:58 +02:00
|
|
|
|
|
2001-07-31 15:49:39 +02:00
|
|
|
|
fatal (_("Multiple renames of section %s"), old_name);
|
|
|
|
|
}
|
|
|
|
|
|
2009-12-11 14:42:17 +01:00
|
|
|
|
srename = (section_rename *) xmalloc (sizeof (* srename));
|
2001-07-31 15:49:39 +02:00
|
|
|
|
|
2009-12-11 14:42:17 +01:00
|
|
|
|
srename->old_name = old_name;
|
|
|
|
|
srename->new_name = new_name;
|
|
|
|
|
srename->flags = flags;
|
|
|
|
|
srename->next = section_rename_list;
|
2002-05-21 21:34:58 +02:00
|
|
|
|
|
2009-12-11 14:42:17 +01:00
|
|
|
|
section_rename_list = srename;
|
2001-07-31 15:49:39 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Check the section rename list for a new name of the input section
|
2016-06-23 14:41:57 +02:00
|
|
|
|
called OLD_NAME. Returns the new name if one is found and sets
|
|
|
|
|
RETURNED_FLAGS if non-NULL to the flags to be used for this section. */
|
2001-07-31 15:49:39 +02:00
|
|
|
|
|
|
|
|
|
static const char *
|
2016-06-23 14:41:57 +02:00
|
|
|
|
find_section_rename (const char *old_name, flagword *returned_flags)
|
2001-07-31 15:49:39 +02:00
|
|
|
|
{
|
2016-06-23 14:41:57 +02:00
|
|
|
|
const section_rename *srename;
|
2001-07-31 15:49:39 +02:00
|
|
|
|
|
2009-12-11 14:42:17 +01:00
|
|
|
|
for (srename = section_rename_list; srename != NULL; srename = srename->next)
|
|
|
|
|
if (strcmp (srename->old_name, old_name) == 0)
|
2001-07-31 15:49:39 +02:00
|
|
|
|
{
|
2016-06-23 14:41:57 +02:00
|
|
|
|
if (returned_flags != NULL && srename->flags != (flagword) -1)
|
|
|
|
|
*returned_flags = srename->flags;
|
2001-07-31 15:49:39 +02:00
|
|
|
|
|
2009-12-11 14:42:17 +01:00
|
|
|
|
return srename->new_name;
|
2001-07-31 15:49:39 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return old_name;
|
|
|
|
|
}
|
|
|
|
|
|
2004-05-17 18:40:01 +02: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 12:19:03 +02:00
|
|
|
|
status = 1;
|
|
|
|
|
bfd_nonfatal_message (NULL, ibfd, NULL,
|
2009-01-29 14:03:21 +01:00
|
|
|
|
_("error in private header data"));
|
2007-08-30 12:19:03 +02:00
|
|
|
|
return;
|
2004-05-17 18:40:01 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* All went well. */
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2001-07-31 15:49:39 +02:00
|
|
|
|
/* Create a section in OBFD with the same
|
|
|
|
|
name and attributes as ISECTION in IBFD. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
static void
|
2003-07-23 19:34:03 +02:00
|
|
|
|
setup_section (bfd *ibfd, sec_ptr isection, void *obfdarg)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
2009-09-10 15:40:44 +02:00
|
|
|
|
bfd *obfd = (bfd *) obfdarg;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
struct section_list *p;
|
|
|
|
|
sec_ptr osection;
|
|
|
|
|
bfd_size_type size;
|
|
|
|
|
bfd_vma vma;
|
|
|
|
|
bfd_vma lma;
|
|
|
|
|
flagword flags;
|
2000-05-08 06:28:06 +02:00
|
|
|
|
const char *err;
|
2001-07-31 15:49:39 +02:00
|
|
|
|
const char * name;
|
2002-12-13 14:19:44 +01:00
|
|
|
|
char *prefix = NULL;
|
2007-08-04 10:26:38 +02:00
|
|
|
|
bfd_boolean make_nobits;
|
2002-05-21 21:34:58 +02:00
|
|
|
|
|
2003-06-12 09:23:31 +02:00
|
|
|
|
if (is_strip_section (ibfd, isection))
|
1999-05-03 09:29:11 +02:00
|
|
|
|
return;
|
|
|
|
|
|
2001-07-31 15:49:39 +02:00
|
|
|
|
/* Get the, possibly new, name of the output section. */
|
2016-06-23 14:41:57 +02:00
|
|
|
|
name = bfd_section_name (ibfd, isection);
|
|
|
|
|
flags = bfd_get_section_flags (ibfd, isection);
|
|
|
|
|
name = find_section_rename (name, &flags);
|
2002-05-21 21:34:58 +02:00
|
|
|
|
|
2002-12-13 14:19:44 +01:00
|
|
|
|
/* Prefix sections. */
|
2003-07-23 19:34:03 +02:00
|
|
|
|
if ((prefix_alloc_sections_string)
|
|
|
|
|
&& (bfd_get_section_flags (ibfd, isection) & SEC_ALLOC))
|
2002-12-13 14:19:44 +01:00
|
|
|
|
prefix = prefix_alloc_sections_string;
|
|
|
|
|
else if (prefix_sections_string)
|
|
|
|
|
prefix = prefix_sections_string;
|
|
|
|
|
|
|
|
|
|
if (prefix)
|
|
|
|
|
{
|
|
|
|
|
char *n;
|
|
|
|
|
|
2009-09-10 15:40:44 +02:00
|
|
|
|
n = (char *) xmalloc (strlen (prefix) + strlen (name) + 1);
|
2002-12-13 14:19:44 +01:00
|
|
|
|
strcpy (n, prefix);
|
|
|
|
|
strcat (n, name);
|
|
|
|
|
name = n;
|
|
|
|
|
}
|
2003-02-21 02:12:13 +01:00
|
|
|
|
|
2007-08-04 10:26:38 +02:00
|
|
|
|
make_nobits = FALSE;
|
2013-02-15 10:32:31 +01:00
|
|
|
|
|
|
|
|
|
p = find_section_list (bfd_section_name (ibfd, isection), FALSE,
|
|
|
|
|
SECTION_CONTEXT_SET_FLAGS);
|
|
|
|
|
if (p != NULL)
|
2005-07-04 03:53:44 +02:00
|
|
|
|
flags = p->flags | (flags & (SEC_HAS_CONTENTS | SEC_RELOC));
|
2007-05-30 16:29:27 +02:00
|
|
|
|
else if (strip_symbols == STRIP_NONDEBUG
|
2010-06-29 10:47:40 +02:00
|
|
|
|
&& (flags & (SEC_ALLOC | SEC_GROUP)) != 0
|
2016-05-31 12:51:09 +02:00
|
|
|
|
&& !is_nondebug_keep_contents_section (ibfd, isection))
|
2007-08-04 10:26:38 +02:00
|
|
|
|
{
|
2010-06-29 10:47:40 +02:00
|
|
|
|
flags &= ~(SEC_HAS_CONTENTS | SEC_LOAD | SEC_GROUP);
|
2007-08-04 10:26:38 +02: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 10:47:40 +02:00
|
|
|
|
isection->flags &= ~(SEC_HAS_CONTENTS | SEC_LOAD | SEC_GROUP);
|
2007-08-04 10:26:38 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
2005-07-04 03:53:44 +02:00
|
|
|
|
|
|
|
|
|
osection = bfd_make_section_anyway_with_flags (obfd, name, flags);
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
if (osection == NULL)
|
|
|
|
|
{
|
2007-08-30 12:19:03 +02:00
|
|
|
|
err = _("failed to create output section");
|
1999-05-03 09:29:11 +02:00
|
|
|
|
goto loser;
|
|
|
|
|
}
|
|
|
|
|
|
2007-08-04 10:26:38 +02:00
|
|
|
|
if (make_nobits)
|
2005-07-04 03:53:44 +02:00
|
|
|
|
elf_section_type (osection) = SHT_NOBITS;
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
size = bfd_section_size (ibfd, isection);
|
2015-07-10 23:20:20 +02:00
|
|
|
|
size = bfd_convert_section_size (ibfd, isection, obfd, size);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
if (copy_byte >= 0)
|
2010-09-10 14:11:28 +02:00
|
|
|
|
size = (size + interleave - 1) / interleave * copy_width;
|
2007-03-01 17:39:42 +01:00
|
|
|
|
else if (extract_symbol)
|
|
|
|
|
size = 0;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
if (! bfd_set_section_size (obfd, osection, size))
|
|
|
|
|
{
|
2007-08-30 12:19:03 +02:00
|
|
|
|
err = _("failed to set size");
|
1999-05-03 09:29:11 +02:00
|
|
|
|
goto loser;
|
|
|
|
|
}
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
vma = bfd_section_vma (ibfd, isection);
|
2013-02-15 10:32:31 +01:00
|
|
|
|
p = find_section_list (bfd_section_name (ibfd, isection), FALSE,
|
|
|
|
|
SECTION_CONTEXT_ALTER_VMA | SECTION_CONTEXT_SET_VMA);
|
|
|
|
|
if (p != NULL)
|
|
|
|
|
{
|
|
|
|
|
if (p->context & SECTION_CONTEXT_SET_VMA)
|
|
|
|
|
vma = p->vma_val;
|
|
|
|
|
else
|
|
|
|
|
vma += p->vma_val;
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
else
|
|
|
|
|
vma += change_section_address;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
2008-08-06 02:42:17 +02:00
|
|
|
|
if (! bfd_set_section_vma (obfd, osection, vma))
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
2007-08-30 12:19:03 +02:00
|
|
|
|
err = _("failed to set vma");
|
1999-05-03 09:29:11 +02:00
|
|
|
|
goto loser;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
lma = isection->lma;
|
2013-02-15 10:32:31 +01:00
|
|
|
|
p = find_section_list (bfd_section_name (ibfd, isection), FALSE,
|
|
|
|
|
SECTION_CONTEXT_ALTER_LMA | SECTION_CONTEXT_SET_LMA);
|
|
|
|
|
if (p != NULL)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
2013-02-15 10:32:31 +01:00
|
|
|
|
if (p->context & SECTION_CONTEXT_ALTER_LMA)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
lma += p->lma_val;
|
|
|
|
|
else
|
2013-02-15 10:32:31 +01:00
|
|
|
|
lma = p->lma_val;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
lma += change_section_address;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
2008-08-06 02:42:17 +02:00
|
|
|
|
osection->lma = lma;
|
1999-05-03 09:29:11 +02: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 09:39:46 +01:00
|
|
|
|
if (!bfd_set_section_alignment (obfd,
|
|
|
|
|
osection,
|
|
|
|
|
bfd_section_alignment (ibfd, isection)))
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
2007-08-30 12:19:03 +02:00
|
|
|
|
err = _("failed to set alignment");
|
1999-05-03 09:29:11 +02:00
|
|
|
|
goto loser;
|
|
|
|
|
}
|
|
|
|
|
|
2001-12-10 12:03:54 +01:00
|
|
|
|
/* Copy merge entity size. */
|
|
|
|
|
osection->entsize = isection->entsize;
|
|
|
|
|
|
2015-04-23 16:58:05 +02:00
|
|
|
|
/* Copy compress status. */
|
|
|
|
|
osection->compress_status = isection->compress_status;
|
|
|
|
|
|
1999-05-03 09:29:11 +02: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 02:42:17 +02:00
|
|
|
|
isection->output_offset = 0;
|
2007-03-01 17:39:42 +01:00
|
|
|
|
|
2008-09-28 15:29:18 +02: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 09:29:11 +02:00
|
|
|
|
/* Allow the BFD backend to copy any private data it understands
|
|
|
|
|
from the input section to the output section. */
|
2007-05-30 16:29:27 +02:00
|
|
|
|
if (!bfd_copy_private_section_data (ibfd, isection, obfd, osection))
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
2007-08-30 12:19:03 +02:00
|
|
|
|
err = _("failed to copy private data");
|
1999-05-03 09:29:11 +02:00
|
|
|
|
goto loser;
|
|
|
|
|
}
|
|
|
|
|
|
2001-07-31 15:49:39 +02:00
|
|
|
|
/* All went well. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
return;
|
|
|
|
|
|
2016-05-31 12:51:09 +02:00
|
|
|
|
loser:
|
1999-05-03 09:29:11 +02:00
|
|
|
|
status = 1;
|
2007-08-30 12:19:03 +02:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, osection, err);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
}
|
|
|
|
|
|
2012-04-13 04:52:34 +02:00
|
|
|
|
/* Return TRUE if input section ISECTION should be skipped. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2012-04-13 04:52:34 +02:00
|
|
|
|
static bfd_boolean
|
2017-03-01 12:09:46 +01:00
|
|
|
|
skip_section (bfd *ibfd, sec_ptr isection, bfd_boolean skip_copy)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
|
|
|
|
sec_ptr osection;
|
|
|
|
|
bfd_size_type size;
|
2002-06-05 16:06:52 +02:00
|
|
|
|
flagword flags;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2001-07-31 15:49:39 +02:00
|
|
|
|
/* If we have already failed earlier on,
|
|
|
|
|
do not keep on generating complaints now. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
if (status != 0)
|
2012-04-13 04:52:34 +02:00
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
if (extract_symbol)
|
|
|
|
|
return TRUE;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
2003-06-12 09:23:31 +02:00
|
|
|
|
if (is_strip_section (ibfd, isection))
|
2012-04-13 04:52:34 +02:00
|
|
|
|
return TRUE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2015-02-13 18:04:42 +01:00
|
|
|
|
if (is_update_section (ibfd, isection))
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
2017-03-01 12:09:46 +01:00
|
|
|
|
/* When merging a note section we skip the copying of the contents,
|
|
|
|
|
but not the copying of the relocs associated with the contents. */
|
|
|
|
|
if (skip_copy && is_merged_note_section (ibfd, isection))
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
2003-06-12 09:23:31 +02:00
|
|
|
|
flags = bfd_get_section_flags (ibfd, isection);
|
2002-06-05 16:06:52 +02:00
|
|
|
|
if ((flags & SEC_GROUP) != 0)
|
2012-04-13 04:52:34 +02:00
|
|
|
|
return TRUE;
|
2002-06-05 16:06:52 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
osection = isection->output_section;
|
2004-06-15 03:19:13 +02:00
|
|
|
|
size = bfd_get_section_size (isection);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
if (size == 0 || osection == 0)
|
2012-04-13 04:52:34 +02:00
|
|
|
|
return TRUE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2012-04-13 04:52:34 +02:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
objcopy/strip: Add option --remove-relocations=SECTIONPATTERN
The objcopy and strip tools make use of the bfd library to manipulate
the state of the input file (to produce an output file). Within the
input file (for ELF at least), relocations are held within a section,
and so, if the user wanted to remove the relocations, but keep the
section to which the relocations would have been applied, it is tempting
to think that specifying the name of a relocation section to objcopy's
--remove-section option might do what you want, for example:
objcopy --remove-section=.rela.text input.elf output.elf
However, this does not work. The reason is that when the input file is
loaded, relocations are not managed as sections, but are, instead,
loaded as data associated with the section to which the relocations
would be applied. In our example above the relocations in '.rela.text'
are held as data on the section '.text' once 'input.elf' is loaded.
One task that objcopy and strip do is copy the relocations from the
input file to the output file if the section is also being copied from
the input file to the output file.
This commit adds a new command line option for objcopy and strip,
--remove-relocations, which can be used to remove the relocations, while
keeping the section that the relocations would have been applied to, for
example:
objcopy --remove-relocations=.text input.elf output.elf
in this case the section '.text' will appear in both 'input.elf' and
'output.elf', but any relocations in 'input.elf' that apply to '.text'
will not be present in 'output.elf'.
I have also added a special case to the handling of --remove-section
that spots if a user tries to remove a relocation section (currently
this is done by spotting the '.rela.' or '.rel.' prefix) and forwards
the request to --remove-relocations.
As with --remove-section and --only-section the --remove-relocations
option supports the '!' prefix on the section-patterns it takes to allow
for sections to be specifically not matched.
There are tests for all the new functionality.
binutils/ChangeLog:
* doc/binutils.texi (objcopy): Document 'remove-relocations'.
(strip): Likewise.
* objcopy.c (SECTION_CONTEXT_REMOVE_RELOCS): Define.
(enum command_line_switch): Add 'OPTION_REMOVE_RELOCS'.
(struct option strip_options): Add 'remove-relocations'.
(struct option copy_options): Likewise.
(copy_usage): Likewise.
(strip_usage): Likewise.
(handle_remove_relocations_option): New function.
(discard_relocations): New function.
(handle_remove_section_option): New function.
(copy_relocations_in_section): Use discard_relocations.
(strip_main): Use handle_remove_section_option for
'remove-section', and handle 'remove-relocations' option.
(copy_main): Likewise.
* testsuite/binutils-all/objcopy.exp: Run new tests.
* testsuite/binutils-all/remove-relocs-01.d: New file.
* testsuite/binutils-all/remove-relocs-01.s: New file.
* testsuite/binutils-all/remove-relocs-02.d: New file.
* testsuite/binutils-all/remove-relocs-03.d: New file.
* testsuite/binutils-all/remove-relocs-04.d: New file.
* testsuite/binutils-all/remove-relocs-05.d: New file.
* testsuite/binutils-all/remove-relocs-06.d: New file.
2015-08-21 21:08:26 +02:00
|
|
|
|
/* Add section SECTION_PATTERN to the list of sections that will have their
|
|
|
|
|
relocations removed. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
handle_remove_relocations_option (const char *section_pattern)
|
|
|
|
|
{
|
|
|
|
|
find_section_list (section_pattern, TRUE, SECTION_CONTEXT_REMOVE_RELOCS);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return TRUE if ISECTION from IBFD should have its relocations removed,
|
|
|
|
|
otherwise return FALSE. If the user has requested that relocations be
|
|
|
|
|
removed from a section that does not have relocations then this
|
|
|
|
|
function will still return TRUE. */
|
|
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
|
discard_relocations (bfd *ibfd ATTRIBUTE_UNUSED, asection *isection)
|
|
|
|
|
{
|
|
|
|
|
return (find_section_list (bfd_section_name (ibfd, isection), FALSE,
|
|
|
|
|
SECTION_CONTEXT_REMOVE_RELOCS) != NULL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Wrapper for dealing with --remove-section (-R) command line arguments.
|
|
|
|
|
A special case is detected here, if the user asks to remove a relocation
|
2018-09-12 07:27:48 +02:00
|
|
|
|
section (one starting with ".rela" or ".rel") then this removal must
|
2018-09-10 04:27:08 +02:00
|
|
|
|
be done using a different technique in a relocatable object. */
|
objcopy/strip: Add option --remove-relocations=SECTIONPATTERN
The objcopy and strip tools make use of the bfd library to manipulate
the state of the input file (to produce an output file). Within the
input file (for ELF at least), relocations are held within a section,
and so, if the user wanted to remove the relocations, but keep the
section to which the relocations would have been applied, it is tempting
to think that specifying the name of a relocation section to objcopy's
--remove-section option might do what you want, for example:
objcopy --remove-section=.rela.text input.elf output.elf
However, this does not work. The reason is that when the input file is
loaded, relocations are not managed as sections, but are, instead,
loaded as data associated with the section to which the relocations
would be applied. In our example above the relocations in '.rela.text'
are held as data on the section '.text' once 'input.elf' is loaded.
One task that objcopy and strip do is copy the relocations from the
input file to the output file if the section is also being copied from
the input file to the output file.
This commit adds a new command line option for objcopy and strip,
--remove-relocations, which can be used to remove the relocations, while
keeping the section that the relocations would have been applied to, for
example:
objcopy --remove-relocations=.text input.elf output.elf
in this case the section '.text' will appear in both 'input.elf' and
'output.elf', but any relocations in 'input.elf' that apply to '.text'
will not be present in 'output.elf'.
I have also added a special case to the handling of --remove-section
that spots if a user tries to remove a relocation section (currently
this is done by spotting the '.rela.' or '.rel.' prefix) and forwards
the request to --remove-relocations.
As with --remove-section and --only-section the --remove-relocations
option supports the '!' prefix on the section-patterns it takes to allow
for sections to be specifically not matched.
There are tests for all the new functionality.
binutils/ChangeLog:
* doc/binutils.texi (objcopy): Document 'remove-relocations'.
(strip): Likewise.
* objcopy.c (SECTION_CONTEXT_REMOVE_RELOCS): Define.
(enum command_line_switch): Add 'OPTION_REMOVE_RELOCS'.
(struct option strip_options): Add 'remove-relocations'.
(struct option copy_options): Likewise.
(copy_usage): Likewise.
(strip_usage): Likewise.
(handle_remove_relocations_option): New function.
(discard_relocations): New function.
(handle_remove_section_option): New function.
(copy_relocations_in_section): Use discard_relocations.
(strip_main): Use handle_remove_section_option for
'remove-section', and handle 'remove-relocations' option.
(copy_main): Likewise.
* testsuite/binutils-all/objcopy.exp: Run new tests.
* testsuite/binutils-all/remove-relocs-01.d: New file.
* testsuite/binutils-all/remove-relocs-01.s: New file.
* testsuite/binutils-all/remove-relocs-02.d: New file.
* testsuite/binutils-all/remove-relocs-03.d: New file.
* testsuite/binutils-all/remove-relocs-04.d: New file.
* testsuite/binutils-all/remove-relocs-05.d: New file.
* testsuite/binutils-all/remove-relocs-06.d: New file.
2015-08-21 21:08:26 +02:00
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
handle_remove_section_option (const char *section_pattern)
|
|
|
|
|
{
|
2018-09-10 04:27:08 +02:00
|
|
|
|
find_section_list (section_pattern, TRUE, SECTION_CONTEXT_REMOVE);
|
2018-09-12 07:27:48 +02:00
|
|
|
|
if (strncmp (section_pattern, ".rel", 4) == 0)
|
|
|
|
|
{
|
|
|
|
|
section_pattern += 4;
|
|
|
|
|
if (*section_pattern == 'a')
|
|
|
|
|
section_pattern++;
|
|
|
|
|
if (*section_pattern)
|
|
|
|
|
handle_remove_relocations_option (section_pattern);
|
|
|
|
|
}
|
2018-09-10 04:27:08 +02:00
|
|
|
|
sections_removed = TRUE;
|
objcopy/strip: Add option --remove-relocations=SECTIONPATTERN
The objcopy and strip tools make use of the bfd library to manipulate
the state of the input file (to produce an output file). Within the
input file (for ELF at least), relocations are held within a section,
and so, if the user wanted to remove the relocations, but keep the
section to which the relocations would have been applied, it is tempting
to think that specifying the name of a relocation section to objcopy's
--remove-section option might do what you want, for example:
objcopy --remove-section=.rela.text input.elf output.elf
However, this does not work. The reason is that when the input file is
loaded, relocations are not managed as sections, but are, instead,
loaded as data associated with the section to which the relocations
would be applied. In our example above the relocations in '.rela.text'
are held as data on the section '.text' once 'input.elf' is loaded.
One task that objcopy and strip do is copy the relocations from the
input file to the output file if the section is also being copied from
the input file to the output file.
This commit adds a new command line option for objcopy and strip,
--remove-relocations, which can be used to remove the relocations, while
keeping the section that the relocations would have been applied to, for
example:
objcopy --remove-relocations=.text input.elf output.elf
in this case the section '.text' will appear in both 'input.elf' and
'output.elf', but any relocations in 'input.elf' that apply to '.text'
will not be present in 'output.elf'.
I have also added a special case to the handling of --remove-section
that spots if a user tries to remove a relocation section (currently
this is done by spotting the '.rela.' or '.rel.' prefix) and forwards
the request to --remove-relocations.
As with --remove-section and --only-section the --remove-relocations
option supports the '!' prefix on the section-patterns it takes to allow
for sections to be specifically not matched.
There are tests for all the new functionality.
binutils/ChangeLog:
* doc/binutils.texi (objcopy): Document 'remove-relocations'.
(strip): Likewise.
* objcopy.c (SECTION_CONTEXT_REMOVE_RELOCS): Define.
(enum command_line_switch): Add 'OPTION_REMOVE_RELOCS'.
(struct option strip_options): Add 'remove-relocations'.
(struct option copy_options): Likewise.
(copy_usage): Likewise.
(strip_usage): Likewise.
(handle_remove_relocations_option): New function.
(discard_relocations): New function.
(handle_remove_section_option): New function.
(copy_relocations_in_section): Use discard_relocations.
(strip_main): Use handle_remove_section_option for
'remove-section', and handle 'remove-relocations' option.
(copy_main): Likewise.
* testsuite/binutils-all/objcopy.exp: Run new tests.
* testsuite/binutils-all/remove-relocs-01.d: New file.
* testsuite/binutils-all/remove-relocs-01.s: New file.
* testsuite/binutils-all/remove-relocs-02.d: New file.
* testsuite/binutils-all/remove-relocs-03.d: New file.
* testsuite/binutils-all/remove-relocs-04.d: New file.
* testsuite/binutils-all/remove-relocs-05.d: New file.
* testsuite/binutils-all/remove-relocs-06.d: New file.
2015-08-21 21:08:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
2012-04-13 04:52:34 +02:00
|
|
|
|
/* Copy relocations in input section ISECTION of IBFD to an output
|
|
|
|
|
section with the same name in OBFDARG. If stripping then don't
|
|
|
|
|
copy any relocation info. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
copy_relocations_in_section (bfd *ibfd, sec_ptr isection, void *obfdarg)
|
|
|
|
|
{
|
|
|
|
|
bfd *obfd = (bfd *) obfdarg;
|
|
|
|
|
long relsize;
|
|
|
|
|
arelent **relpp;
|
|
|
|
|
long relcount;
|
|
|
|
|
sec_ptr osection;
|
|
|
|
|
|
2017-03-01 12:09:46 +01:00
|
|
|
|
if (skip_section (ibfd, isection, FALSE))
|
2008-08-06 02:42:17 +02:00
|
|
|
|
return;
|
|
|
|
|
|
2012-04-13 04:52:34 +02:00
|
|
|
|
osection = isection->output_section;
|
2003-06-12 09:23:31 +02:00
|
|
|
|
|
2012-05-08 19:49:36 +02:00
|
|
|
|
/* Core files and DWO files do not need to be relocated. */
|
objcopy/strip: Add option --remove-relocations=SECTIONPATTERN
The objcopy and strip tools make use of the bfd library to manipulate
the state of the input file (to produce an output file). Within the
input file (for ELF at least), relocations are held within a section,
and so, if the user wanted to remove the relocations, but keep the
section to which the relocations would have been applied, it is tempting
to think that specifying the name of a relocation section to objcopy's
--remove-section option might do what you want, for example:
objcopy --remove-section=.rela.text input.elf output.elf
However, this does not work. The reason is that when the input file is
loaded, relocations are not managed as sections, but are, instead,
loaded as data associated with the section to which the relocations
would be applied. In our example above the relocations in '.rela.text'
are held as data on the section '.text' once 'input.elf' is loaded.
One task that objcopy and strip do is copy the relocations from the
input file to the output file if the section is also being copied from
the input file to the output file.
This commit adds a new command line option for objcopy and strip,
--remove-relocations, which can be used to remove the relocations, while
keeping the section that the relocations would have been applied to, for
example:
objcopy --remove-relocations=.text input.elf output.elf
in this case the section '.text' will appear in both 'input.elf' and
'output.elf', but any relocations in 'input.elf' that apply to '.text'
will not be present in 'output.elf'.
I have also added a special case to the handling of --remove-section
that spots if a user tries to remove a relocation section (currently
this is done by spotting the '.rela.' or '.rel.' prefix) and forwards
the request to --remove-relocations.
As with --remove-section and --only-section the --remove-relocations
option supports the '!' prefix on the section-patterns it takes to allow
for sections to be specifically not matched.
There are tests for all the new functionality.
binutils/ChangeLog:
* doc/binutils.texi (objcopy): Document 'remove-relocations'.
(strip): Likewise.
* objcopy.c (SECTION_CONTEXT_REMOVE_RELOCS): Define.
(enum command_line_switch): Add 'OPTION_REMOVE_RELOCS'.
(struct option strip_options): Add 'remove-relocations'.
(struct option copy_options): Likewise.
(copy_usage): Likewise.
(strip_usage): Likewise.
(handle_remove_relocations_option): New function.
(discard_relocations): New function.
(handle_remove_section_option): New function.
(copy_relocations_in_section): Use discard_relocations.
(strip_main): Use handle_remove_section_option for
'remove-section', and handle 'remove-relocations' option.
(copy_main): Likewise.
* testsuite/binutils-all/objcopy.exp: Run new tests.
* testsuite/binutils-all/remove-relocs-01.d: New file.
* testsuite/binutils-all/remove-relocs-01.s: New file.
* testsuite/binutils-all/remove-relocs-02.d: New file.
* testsuite/binutils-all/remove-relocs-03.d: New file.
* testsuite/binutils-all/remove-relocs-04.d: New file.
* testsuite/binutils-all/remove-relocs-05.d: New file.
* testsuite/binutils-all/remove-relocs-06.d: New file.
2015-08-21 21:08:26 +02:00
|
|
|
|
if (bfd_get_format (obfd) == bfd_core
|
|
|
|
|
|| strip_symbols == STRIP_NONDWO
|
|
|
|
|
|| discard_relocations (ibfd, isection))
|
2001-12-19 06:18:34 +01:00
|
|
|
|
relsize = 0;
|
|
|
|
|
else
|
2003-10-27 13:45:38 +01:00
|
|
|
|
{
|
|
|
|
|
relsize = bfd_get_reloc_upper_bound (ibfd, isection);
|
2001-12-19 06:18:34 +01:00
|
|
|
|
|
2003-10-27 13:45:38 +01: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 12:19:03 +02:00
|
|
|
|
{
|
|
|
|
|
status = 1;
|
|
|
|
|
bfd_nonfatal_message (NULL, ibfd, isection, NULL);
|
|
|
|
|
return;
|
|
|
|
|
}
|
2003-10-27 13:45:38 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
if (relsize == 0)
|
2012-05-08 19:49:36 +02:00
|
|
|
|
{
|
|
|
|
|
bfd_set_reloc (obfd, osection, NULL, 0);
|
|
|
|
|
osection->flags &= ~SEC_RELOC;
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
else
|
|
|
|
|
{
|
2017-12-08 11:07:14 +01:00
|
|
|
|
if (isection->orelocation != NULL)
|
2007-08-30 12:19:03 +02:00
|
|
|
|
{
|
2017-12-08 11:07:14 +01:00
|
|
|
|
/* Some other function has already set up the output relocs
|
|
|
|
|
for us, so scan those instead of the default relocs. */
|
|
|
|
|
relcount = isection->reloc_count;
|
|
|
|
|
relpp = isection->orelocation;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
relpp = (arelent **) xmalloc (relsize);
|
|
|
|
|
relcount = bfd_canonicalize_reloc (ibfd, isection, relpp, isympp);
|
|
|
|
|
if (relcount < 0)
|
|
|
|
|
{
|
|
|
|
|
status = 1;
|
|
|
|
|
bfd_nonfatal_message (NULL, ibfd, isection,
|
|
|
|
|
_("relocation count is negative"));
|
|
|
|
|
return;
|
|
|
|
|
}
|
2007-08-30 12:19:03 +02:00
|
|
|
|
}
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
if (strip_symbols == STRIP_ALL)
|
|
|
|
|
{
|
|
|
|
|
/* Remove relocations which are not in
|
2002-05-21 21:34:58 +02:00
|
|
|
|
keep_strip_specific_list. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
arelent **temp_relpp;
|
|
|
|
|
long temp_relcount = 0;
|
|
|
|
|
long i;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
2009-09-10 15:40:44 +02:00
|
|
|
|
temp_relpp = (arelent **) xmalloc (relsize);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
for (i = 0; i < relcount; i++)
|
2015-01-21 18:37:23 +01:00
|
|
|
|
{
|
|
|
|
|
/* PR 17512: file: 9e907e0c. */
|
2016-05-18 16:21:16 +02:00
|
|
|
|
if (relpp[i]->sym_ptr_ptr
|
|
|
|
|
/* PR 20096 */
|
|
|
|
|
&& * relpp[i]->sym_ptr_ptr)
|
2015-01-21 18:37:23 +01:00
|
|
|
|
if (is_specified_symbol (bfd_asymbol_name (*relpp[i]->sym_ptr_ptr),
|
|
|
|
|
keep_specific_htab))
|
|
|
|
|
temp_relpp [temp_relcount++] = relpp [i];
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
relcount = temp_relcount;
|
2017-12-08 11:07:14 +01:00
|
|
|
|
if (isection->orelocation == NULL)
|
|
|
|
|
free (relpp);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
relpp = temp_relpp;
|
|
|
|
|
}
|
2001-07-05 09:49:05 +02:00
|
|
|
|
|
2003-08-05 16:40:54 +02:00
|
|
|
|
bfd_set_reloc (obfd, osection, relcount == 0 ? NULL : relpp, relcount);
|
2004-01-13 16:41:00 +01:00
|
|
|
|
if (relcount == 0)
|
2012-04-13 04:52:34 +02:00
|
|
|
|
{
|
|
|
|
|
osection->flags &= ~SEC_RELOC;
|
|
|
|
|
free (relpp);
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
}
|
2012-04-13 04:52:34 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Copy the data of input section ISECTION of IBFD
|
|
|
|
|
to an output section with the same name in OBFD. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
copy_section (bfd *ibfd, sec_ptr isection, void *obfdarg)
|
|
|
|
|
{
|
|
|
|
|
bfd *obfd = (bfd *) obfdarg;
|
|
|
|
|
struct section_list *p;
|
|
|
|
|
sec_ptr osection;
|
|
|
|
|
bfd_size_type size;
|
|
|
|
|
|
2017-03-01 12:09:46 +01:00
|
|
|
|
if (skip_section (ibfd, isection, TRUE))
|
2012-04-13 04:52:34 +02:00
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
osection = isection->output_section;
|
2015-07-10 23:20:20 +02:00
|
|
|
|
/* The output SHF_COMPRESSED section size is different from input if
|
2015-09-29 18:35:47 +02:00
|
|
|
|
ELF classes of input and output aren't the same. We can't use
|
|
|
|
|
the output section size since --interleave will shrink the output
|
|
|
|
|
section. Size will be updated if the section is converted. */
|
|
|
|
|
size = bfd_get_section_size (isection);
|
2012-04-13 04:52:34 +02:00
|
|
|
|
|
2002-05-21 21:34:58 +02:00
|
|
|
|
if (bfd_get_section_flags (ibfd, isection) & SEC_HAS_CONTENTS
|
2001-12-19 06:18:34 +01:00
|
|
|
|
&& bfd_get_section_flags (obfd, osection) & SEC_HAS_CONTENTS)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
2010-10-29 14:10:39 +02:00
|
|
|
|
bfd_byte *memhunk = NULL;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2015-07-10 23:20:20 +02:00
|
|
|
|
if (!bfd_get_full_section_contents (ibfd, isection, &memhunk)
|
|
|
|
|
|| !bfd_convert_section_contents (ibfd, isection, obfd,
|
2015-09-29 18:35:47 +02:00
|
|
|
|
&memhunk, &size))
|
2007-08-30 12:19:03 +02:00
|
|
|
|
{
|
|
|
|
|
status = 1;
|
|
|
|
|
bfd_nonfatal_message (NULL, ibfd, isection, NULL);
|
2016-08-11 17:04:59 +02:00
|
|
|
|
free (memhunk);
|
2007-08-30 12:19:03 +02:00
|
|
|
|
return;
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2007-04-23 12:59:07 +02: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 05:43:56 +02:00
|
|
|
|
if (copy_byte >= 0)
|
2004-01-02 23:54:47 +01:00
|
|
|
|
{
|
|
|
|
|
/* Keep only every `copy_byte'th byte in MEMHUNK. */
|
2004-02-19 18:15:28 +01:00
|
|
|
|
char *from = (char *) memhunk + copy_byte;
|
2009-09-10 15:40:44 +02:00
|
|
|
|
char *to = (char *) memhunk;
|
2004-02-19 18:15:28 +01:00
|
|
|
|
char *end = (char *) memhunk + size;
|
2010-09-10 14:11:28 +02:00
|
|
|
|
int i;
|
2004-01-02 23:54:47 +01:00
|
|
|
|
|
2017-12-06 19:34:36 +01:00
|
|
|
|
/* If the section address is not exactly divisible by the interleave,
|
|
|
|
|
then we must bias the from address. If the copy_byte is less than
|
|
|
|
|
the bias, then we must skip forward one interleave, and increment
|
|
|
|
|
the final lma. */
|
|
|
|
|
int extra = isection->lma % interleave;
|
|
|
|
|
from -= extra;
|
|
|
|
|
if (copy_byte < extra)
|
|
|
|
|
from += interleave;
|
|
|
|
|
|
2004-01-02 23:54:47 +01:00
|
|
|
|
for (; from < end; from += interleave)
|
2010-09-10 14:11:28 +02:00
|
|
|
|
for (i = 0; i < copy_width; i++)
|
2012-11-07 07:16:26 +01:00
|
|
|
|
{
|
|
|
|
|
if (&from[i] >= end)
|
|
|
|
|
break;
|
|
|
|
|
*to++ = from[i];
|
|
|
|
|
}
|
2004-01-02 23:54:47 +01:00
|
|
|
|
|
2010-09-10 14:11:28 +02:00
|
|
|
|
size = (size + interleave - 1 - copy_byte) / interleave * copy_width;
|
2004-01-02 23:54:47 +01:00
|
|
|
|
osection->lma /= interleave;
|
2017-12-06 19:34:36 +01:00
|
|
|
|
if (copy_byte < extra)
|
|
|
|
|
osection->lma++;
|
2004-01-02 23:54:47 +01:00
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2003-08-05 16:40:54 +02:00
|
|
|
|
if (!bfd_set_section_contents (obfd, osection, memhunk, 0, size))
|
2007-08-30 12:19:03 +02:00
|
|
|
|
{
|
|
|
|
|
status = 1;
|
|
|
|
|
bfd_nonfatal_message (NULL, obfd, osection, NULL);
|
2016-08-11 17:04:59 +02:00
|
|
|
|
free (memhunk);
|
2007-08-30 12:19:03 +02:00
|
|
|
|
return;
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
free (memhunk);
|
|
|
|
|
}
|
2013-02-15 10:32:31 +01:00
|
|
|
|
else if ((p = find_section_list (bfd_get_section_name (ibfd, isection),
|
|
|
|
|
FALSE, SECTION_CONTEXT_SET_FLAGS)) != NULL
|
|
|
|
|
&& (p->flags & SEC_HAS_CONTENTS) != 0)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
2003-08-05 16:40:54 +02:00
|
|
|
|
void *memhunk = xmalloc (size);
|
1999-05-03 09:29:11 +02: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 16:40:54 +02:00
|
|
|
|
if (! bfd_set_section_contents (obfd, osection, memhunk, 0, size))
|
2007-08-30 12:19:03 +02:00
|
|
|
|
{
|
|
|
|
|
status = 1;
|
|
|
|
|
bfd_nonfatal_message (NULL, obfd, osection, NULL);
|
2016-08-11 17:04:59 +02:00
|
|
|
|
free (memhunk);
|
2007-08-30 12:19:03 +02:00
|
|
|
|
return;
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
free (memhunk);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Get all the sections. This is used when --gap-fill or --pad-to is
|
|
|
|
|
used. */
|
|
|
|
|
|
|
|
|
|
static void
|
2003-07-23 19:34:03 +02:00
|
|
|
|
get_sections (bfd *obfd ATTRIBUTE_UNUSED, asection *osection, void *secppparg)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
2009-09-10 15:40:44 +02:00
|
|
|
|
asection ***secppp = (asection ***) secppparg;
|
1999-05-03 09:29:11 +02: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-23 19:34:03 +02:00
|
|
|
|
compare_section_lma (const void *arg1, const void *arg2)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
2009-09-10 15:40:44 +02:00
|
|
|
|
const asection *const *sec1 = (const asection * const *) arg1;
|
|
|
|
|
const asection *const *sec2 = (const asection * const *) arg2;
|
1999-05-03 09:29:11 +02: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 03:19:13 +02:00
|
|
|
|
if (bfd_get_section_size (*sec1) > bfd_get_section_size (*sec2))
|
1999-05-03 09:29:11 +02:00
|
|
|
|
return 1;
|
2004-06-15 03:19:13 +02:00
|
|
|
|
else if (bfd_get_section_size (*sec1) < bfd_get_section_size (*sec2))
|
1999-05-03 09:29:11 +02: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-23 19:34:03 +02:00
|
|
|
|
mark_symbols_used_in_relocations (bfd *ibfd, sec_ptr isection, void *symbolsarg)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
2009-09-10 15:40:44 +02:00
|
|
|
|
asymbol **symbols = (asymbol **) symbolsarg;
|
1999-05-03 09:29:11 +02: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 13:45:38 +01: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 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
if (relsize == 0)
|
|
|
|
|
return;
|
|
|
|
|
|
2009-09-10 15:40:44 +02:00
|
|
|
|
relpp = (arelent **) xmalloc (relsize);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
relcount = bfd_canonicalize_reloc (ibfd, isection, relpp, symbols);
|
|
|
|
|
if (relcount < 0)
|
|
|
|
|
bfd_fatal (bfd_get_filename (ibfd));
|
|
|
|
|
|
2001-07-06 10:01:17 +02: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 09:29:11 +02:00
|
|
|
|
for (i = 0; i < relcount; i++)
|
|
|
|
|
{
|
2016-12-06 17:26:42 +01:00
|
|
|
|
/* See PRs 20923 and 20930 for reproducers for the NULL tests. */
|
2016-12-05 14:11:01 +01:00
|
|
|
|
if (relpp[i]->sym_ptr_ptr != NULL
|
2016-12-06 17:26:42 +01:00
|
|
|
|
&& * relpp[i]->sym_ptr_ptr != NULL
|
2016-12-05 14:11:01 +01:00
|
|
|
|
&& *relpp[i]->sym_ptr_ptr != bfd_com_section_ptr->symbol
|
2001-07-06 10:01:17 +02:00
|
|
|
|
&& *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 09:29:11 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (relpp != NULL)
|
|
|
|
|
free (relpp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Write out debugging information. */
|
|
|
|
|
|
2002-11-30 09:39:46 +01:00
|
|
|
|
static bfd_boolean
|
2003-07-23 19:34:03 +02:00
|
|
|
|
write_debugging_info (bfd *obfd, void *dhandle,
|
|
|
|
|
long *symcountp ATTRIBUTE_UNUSED,
|
|
|
|
|
asymbol ***symppp ATTRIBUTE_UNUSED)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
|
|
|
|
if (bfd_get_flavour (obfd) == bfd_target_coff_flavour
|
|
|
|
|
|| bfd_get_flavour (obfd) == bfd_target_elf_flavour)
|
|
|
|
|
{
|
2018-07-24 15:07:54 +02:00
|
|
|
|
bfd_byte *syms, *strings = NULL;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
bfd_size_type symsize, stringsize;
|
|
|
|
|
asection *stabsec, *stabstrsec;
|
2005-07-04 03:53:44 +02:00
|
|
|
|
flagword flags;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
if (! write_stabs_in_sections_debugging_info (obfd, dhandle, &syms,
|
|
|
|
|
&symsize, &strings,
|
|
|
|
|
&stringsize))
|
2002-11-30 09:39:46 +01:00
|
|
|
|
return FALSE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2005-07-04 03:53:44 +02: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 09:29:11 +02: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 03:53:44 +02:00
|
|
|
|
|| ! bfd_set_section_alignment (obfd, stabstrsec, 0))
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
2007-08-30 12:19:03 +02:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, NULL,
|
|
|
|
|
_("can't create debugging section"));
|
2018-07-24 15:07:54 +02:00
|
|
|
|
free (strings);
|
2002-11-30 09:39:46 +01:00
|
|
|
|
return FALSE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We can get away with setting the section contents now because
|
2016-05-31 12:51:09 +02:00
|
|
|
|
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 16:40:54 +02:00
|
|
|
|
if (! bfd_set_section_contents (obfd, stabsec, syms, 0, symsize)
|
|
|
|
|
|| ! bfd_set_section_contents (obfd, stabstrsec, strings, 0,
|
|
|
|
|
stringsize))
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
2007-08-30 12:19:03 +02:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, NULL,
|
|
|
|
|
_("can't set debugging section contents"));
|
2018-07-24 15:07:54 +02:00
|
|
|
|
free (strings);
|
2002-11-30 09:39:46 +01:00
|
|
|
|
return FALSE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
}
|
|
|
|
|
|
2002-11-30 09:39:46 +01:00
|
|
|
|
return TRUE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
}
|
|
|
|
|
|
2007-08-30 12:19:03 +02:00
|
|
|
|
bfd_nonfatal_message (NULL, obfd, NULL,
|
|
|
|
|
_("don't know how to write debugging information for %s"),
|
2016-05-31 12:51:09 +02:00
|
|
|
|
bfd_get_target (obfd));
|
2002-11-30 09:39:46 +01:00
|
|
|
|
return FALSE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
}
|
|
|
|
|
|
2013-01-07 18:40:59 +01:00
|
|
|
|
/* If neither -D nor -U was specified explicitly,
|
|
|
|
|
then use the configured default. */
|
|
|
|
|
static void
|
|
|
|
|
default_deterministic (void)
|
|
|
|
|
{
|
|
|
|
|
if (deterministic < 0)
|
|
|
|
|
deterministic = DEFAULT_AR_DETERMINISTIC;
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
static int
|
2003-07-23 19:34:03 +02:00
|
|
|
|
strip_main (int argc, char *argv[])
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
2003-03-24 17:11:46 +01:00
|
|
|
|
char *input_target = NULL;
|
|
|
|
|
char *output_target = NULL;
|
2002-11-30 09:39:46 +01:00
|
|
|
|
bfd_boolean show_version = FALSE;
|
2003-03-24 17:11:46 +01:00
|
|
|
|
bfd_boolean formats_info = FALSE;
|
|
|
|
|
int c;
|
|
|
|
|
int i;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
char *output_file = NULL;
|
|
|
|
|
|
2017-04-13 15:50:56 +02:00
|
|
|
|
merge_notes = TRUE;
|
|
|
|
|
|
2017-10-05 14:48:32 +02:00
|
|
|
|
while ((c = getopt_long (argc, argv, "I:O:F:K:MN:R:o:sSpdgxXHhVvwDU",
|
1999-05-03 09:29:11 +02: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':
|
objcopy/strip: Add option --remove-relocations=SECTIONPATTERN
The objcopy and strip tools make use of the bfd library to manipulate
the state of the input file (to produce an output file). Within the
input file (for ELF at least), relocations are held within a section,
and so, if the user wanted to remove the relocations, but keep the
section to which the relocations would have been applied, it is tempting
to think that specifying the name of a relocation section to objcopy's
--remove-section option might do what you want, for example:
objcopy --remove-section=.rela.text input.elf output.elf
However, this does not work. The reason is that when the input file is
loaded, relocations are not managed as sections, but are, instead,
loaded as data associated with the section to which the relocations
would be applied. In our example above the relocations in '.rela.text'
are held as data on the section '.text' once 'input.elf' is loaded.
One task that objcopy and strip do is copy the relocations from the
input file to the output file if the section is also being copied from
the input file to the output file.
This commit adds a new command line option for objcopy and strip,
--remove-relocations, which can be used to remove the relocations, while
keeping the section that the relocations would have been applied to, for
example:
objcopy --remove-relocations=.text input.elf output.elf
in this case the section '.text' will appear in both 'input.elf' and
'output.elf', but any relocations in 'input.elf' that apply to '.text'
will not be present in 'output.elf'.
I have also added a special case to the handling of --remove-section
that spots if a user tries to remove a relocation section (currently
this is done by spotting the '.rela.' or '.rel.' prefix) and forwards
the request to --remove-relocations.
As with --remove-section and --only-section the --remove-relocations
option supports the '!' prefix on the section-patterns it takes to allow
for sections to be specifically not matched.
There are tests for all the new functionality.
binutils/ChangeLog:
* doc/binutils.texi (objcopy): Document 'remove-relocations'.
(strip): Likewise.
* objcopy.c (SECTION_CONTEXT_REMOVE_RELOCS): Define.
(enum command_line_switch): Add 'OPTION_REMOVE_RELOCS'.
(struct option strip_options): Add 'remove-relocations'.
(struct option copy_options): Likewise.
(copy_usage): Likewise.
(strip_usage): Likewise.
(handle_remove_relocations_option): New function.
(discard_relocations): New function.
(handle_remove_section_option): New function.
(copy_relocations_in_section): Use discard_relocations.
(strip_main): Use handle_remove_section_option for
'remove-section', and handle 'remove-relocations' option.
(copy_main): Likewise.
* testsuite/binutils-all/objcopy.exp: Run new tests.
* testsuite/binutils-all/remove-relocs-01.d: New file.
* testsuite/binutils-all/remove-relocs-01.s: New file.
* testsuite/binutils-all/remove-relocs-02.d: New file.
* testsuite/binutils-all/remove-relocs-03.d: New file.
* testsuite/binutils-all/remove-relocs-04.d: New file.
* testsuite/binutils-all/remove-relocs-05.d: New file.
* testsuite/binutils-all/remove-relocs-06.d: New file.
2015-08-21 21:08:26 +02:00
|
|
|
|
handle_remove_section_option (optarg);
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_REMOVE_RELOCS:
|
|
|
|
|
handle_remove_relocations_option (optarg);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
break;
|
|
|
|
|
case 's':
|
|
|
|
|
strip_symbols = STRIP_ALL;
|
|
|
|
|
break;
|
|
|
|
|
case 'S':
|
|
|
|
|
case 'g':
|
2000-08-14 21:47:01 +02:00
|
|
|
|
case 'd': /* Historic BSD alias for -g. Used by early NetBSD. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
strip_symbols = STRIP_DEBUG;
|
|
|
|
|
break;
|
2012-05-08 19:49:36 +02:00
|
|
|
|
case OPTION_STRIP_DWO:
|
|
|
|
|
strip_symbols = STRIP_DWO;
|
|
|
|
|
break;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case OPTION_STRIP_UNNEEDED:
|
|
|
|
|
strip_symbols = STRIP_UNNEEDED;
|
|
|
|
|
break;
|
|
|
|
|
case 'K':
|
2008-04-16 10:24:21 +02:00
|
|
|
|
add_specific_symbol (optarg, keep_specific_htab);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
break;
|
2017-04-13 15:50:56 +02:00
|
|
|
|
case 'M':
|
|
|
|
|
merge_notes = TRUE;
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_NO_MERGE_NOTES:
|
|
|
|
|
merge_notes = FALSE;
|
|
|
|
|
break;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case 'N':
|
2008-04-16 10:24:21 +02:00
|
|
|
|
add_specific_symbol (optarg, strip_specific_htab);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
break;
|
|
|
|
|
case 'o':
|
|
|
|
|
output_file = optarg;
|
|
|
|
|
break;
|
|
|
|
|
case 'p':
|
2002-11-30 09:39:46 +01:00
|
|
|
|
preserve_dates = TRUE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
break;
|
2012-04-25 19:50:14 +02:00
|
|
|
|
case 'D':
|
|
|
|
|
deterministic = TRUE;
|
|
|
|
|
break;
|
2013-01-07 18:40:59 +01:00
|
|
|
|
case 'U':
|
|
|
|
|
deterministic = FALSE;
|
|
|
|
|
break;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case 'x':
|
|
|
|
|
discard_locals = LOCALS_ALL;
|
|
|
|
|
break;
|
|
|
|
|
case 'X':
|
|
|
|
|
discard_locals = LOCALS_START_L;
|
|
|
|
|
break;
|
|
|
|
|
case 'v':
|
2002-11-30 09:39:46 +01:00
|
|
|
|
verbose = TRUE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
break;
|
|
|
|
|
case 'V':
|
2002-11-30 09:39:46 +01:00
|
|
|
|
show_version = TRUE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
break;
|
2003-03-24 17:11:46 +01:00
|
|
|
|
case OPTION_FORMATS_INFO:
|
|
|
|
|
formats_info = TRUE;
|
|
|
|
|
break;
|
2003-06-26 10:14:10 +02:00
|
|
|
|
case OPTION_ONLY_KEEP_DEBUG:
|
|
|
|
|
strip_symbols = STRIP_NONDEBUG;
|
|
|
|
|
break;
|
2005-11-15 09:33:38 +01:00
|
|
|
|
case OPTION_KEEP_FILE_SYMBOLS:
|
|
|
|
|
keep_file_symbols = 1;
|
|
|
|
|
break;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case 0:
|
2001-07-31 15:49:39 +02:00
|
|
|
|
/* We've been given a long option. */
|
|
|
|
|
break;
|
2003-11-11 18:50:26 +01:00
|
|
|
|
case 'w':
|
|
|
|
|
wildcard = TRUE;
|
|
|
|
|
break;
|
2002-01-23 17:12:56 +01:00
|
|
|
|
case 'H':
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case 'h':
|
|
|
|
|
strip_usage (stdout, 0);
|
|
|
|
|
default:
|
|
|
|
|
strip_usage (stderr, 1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-07-23 19:34:03 +02:00
|
|
|
|
if (formats_info)
|
|
|
|
|
{
|
|
|
|
|
display_info ();
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2007-06-29 02:34:14 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
if (show_version)
|
|
|
|
|
print_version ("strip");
|
|
|
|
|
|
2013-01-07 18:40:59 +01:00
|
|
|
|
default_deterministic ();
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
/* Default is to strip all symbols. */
|
|
|
|
|
if (strip_symbols == STRIP_UNDEF
|
|
|
|
|
&& discard_locals == LOCALS_UNDEF
|
2008-04-16 10:24:21 +02:00
|
|
|
|
&& htab_elements (strip_specific_htab) == 0)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
strip_symbols = STRIP_ALL;
|
|
|
|
|
|
2003-08-05 16:40:54 +02:00
|
|
|
|
if (output_target == NULL)
|
1999-05-03 09:29:11 +02: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 13:19:34 +01:00
|
|
|
|
if (get_file_size (argv[i]) < 1)
|
2006-08-06 17:49:46 +02:00
|
|
|
|
{
|
|
|
|
|
status = 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2003-11-07 13:19:34 +01:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
if (preserve_dates)
|
2003-11-07 13:19:34 +01: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 09:29:11 +02:00
|
|
|
|
|
2011-02-28 19:32:52 +01:00
|
|
|
|
if (output_file == NULL
|
|
|
|
|
|| filename_cmp (argv[i], output_file) == 0)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
tmpname = make_tempname (argv[i]);
|
2007-05-18 08:36:14 +02:00
|
|
|
|
else
|
|
|
|
|
tmpname = output_file;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2006-10-13 11:43:29 +02:00
|
|
|
|
if (tmpname == NULL)
|
|
|
|
|
{
|
2007-08-30 12:19:03 +02:00
|
|
|
|
bfd_nonfatal_message (argv[i], NULL, NULL,
|
|
|
|
|
_("could not create temporary file to hold stripped copy"));
|
2006-10-13 11:43:29 +02:00
|
|
|
|
status = 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2006-08-06 17:49:46 +02:00
|
|
|
|
status = 0;
|
2009-09-11 13:16:19 +02:00
|
|
|
|
copy_file (argv[i], tmpname, input_target, output_target, NULL);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
if (status == 0)
|
|
|
|
|
{
|
|
|
|
|
if (preserve_dates)
|
|
|
|
|
set_times (tmpname, &statbuf);
|
2007-05-18 08:36:14 +02:00
|
|
|
|
if (output_file != tmpname)
|
2009-08-03 15:47:35 +02:00
|
|
|
|
status = (smart_rename (tmpname,
|
|
|
|
|
output_file ? output_file : argv[i],
|
|
|
|
|
preserve_dates) != 0);
|
|
|
|
|
if (status == 0)
|
|
|
|
|
status = hold_status;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
2005-03-02 10:03:58 +01:00
|
|
|
|
unlink_if_ordinary (tmpname);
|
2007-05-18 08:36:14 +02:00
|
|
|
|
if (output_file != tmpname)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
free (tmpname);
|
|
|
|
|
}
|
|
|
|
|
|
2006-08-06 17:49:46 +02:00
|
|
|
|
return status;
|
1999-05-03 09:29:11 +02: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 15:46:18 +02: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[] =
|
|
|
|
|
{
|
2013-01-07 18:40:59 +01:00
|
|
|
|
{ "native", 0, IMAGE_SUBSYSTEM_NATIVE },
|
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 15:46:18 +02:00
|
|
|
|
{ "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 17:03:48 +02: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 15:46:18 +02: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-14 21:51:59 +01: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 15:46:18 +02: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] = '-';
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-20 21:12:56 +01:00
|
|
|
|
/* Allocate and return a pointer to a struct section_add, initializing the
|
2015-02-26 18:17:46 +01:00
|
|
|
|
structure using ARG, a string in the format "sectionname=filename".
|
2015-02-20 21:12:56 +01:00
|
|
|
|
The returned structure will have its next pointer set to NEXT. The
|
|
|
|
|
OPTION field is the name of the command line option currently being
|
|
|
|
|
parsed, and is only used if an error needs to be reported. */
|
|
|
|
|
|
|
|
|
|
static struct section_add *
|
2015-02-26 18:17:46 +01:00
|
|
|
|
init_section_add (const char *arg,
|
2016-05-31 12:51:09 +02:00
|
|
|
|
struct section_add *next,
|
|
|
|
|
const char *option)
|
2015-02-20 21:12:56 +01:00
|
|
|
|
{
|
|
|
|
|
struct section_add *pa;
|
|
|
|
|
const char *s;
|
|
|
|
|
|
2015-02-26 18:17:46 +01:00
|
|
|
|
s = strchr (arg, '=');
|
2015-02-20 21:12:56 +01:00
|
|
|
|
if (s == NULL)
|
|
|
|
|
fatal (_("bad format for %s"), option);
|
|
|
|
|
|
|
|
|
|
pa = (struct section_add *) xmalloc (sizeof (struct section_add));
|
2015-02-26 18:17:46 +01:00
|
|
|
|
pa->name = xstrndup (arg, s - arg);
|
2015-02-20 21:12:56 +01:00
|
|
|
|
pa->filename = s + 1;
|
|
|
|
|
pa->next = next;
|
|
|
|
|
pa->contents = NULL;
|
|
|
|
|
pa->size = 0;
|
|
|
|
|
|
|
|
|
|
return pa;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Load the file specified in PA, allocating memory to hold the file
|
|
|
|
|
contents, and store a pointer to the allocated memory in the contents
|
|
|
|
|
field of PA. The size field of PA is also updated. All errors call
|
|
|
|
|
FATAL. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
section_add_load_file (struct section_add *pa)
|
|
|
|
|
{
|
|
|
|
|
size_t off, alloc;
|
|
|
|
|
FILE *f;
|
|
|
|
|
|
|
|
|
|
/* We don't use get_file_size so that we can do
|
|
|
|
|
--add-section .note.GNU_stack=/dev/null
|
|
|
|
|
get_file_size doesn't work on /dev/null. */
|
|
|
|
|
|
|
|
|
|
f = fopen (pa->filename, FOPEN_RB);
|
|
|
|
|
if (f == NULL)
|
|
|
|
|
fatal (_("cannot open: %s: %s"),
|
2016-05-31 12:51:09 +02:00
|
|
|
|
pa->filename, strerror (errno));
|
2015-02-20 21:12:56 +01:00
|
|
|
|
|
|
|
|
|
off = 0;
|
|
|
|
|
alloc = 4096;
|
|
|
|
|
pa->contents = (bfd_byte *) xmalloc (alloc);
|
|
|
|
|
while (!feof (f))
|
|
|
|
|
{
|
|
|
|
|
off_t got;
|
|
|
|
|
|
|
|
|
|
if (off == alloc)
|
2016-05-31 12:51:09 +02:00
|
|
|
|
{
|
|
|
|
|
alloc <<= 1;
|
|
|
|
|
pa->contents = (bfd_byte *) xrealloc (pa->contents, alloc);
|
|
|
|
|
}
|
2015-02-20 21:12:56 +01:00
|
|
|
|
|
|
|
|
|
got = fread (pa->contents + off, 1, alloc - off, f);
|
|
|
|
|
if (ferror (f))
|
2016-05-31 12:51:09 +02:00
|
|
|
|
fatal (_("%s: fread failed"), pa->filename);
|
2015-02-20 21:12:56 +01:00
|
|
|
|
|
|
|
|
|
off += got;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pa->size = off;
|
|
|
|
|
|
|
|
|
|
fclose (f);
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
static int
|
2003-07-23 19:34:03 +02:00
|
|
|
|
copy_main (int argc, char *argv[])
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
2003-03-24 17:11:46 +01:00
|
|
|
|
char *input_filename = NULL;
|
|
|
|
|
char *output_filename = NULL;
|
2007-06-29 02:34:14 +02:00
|
|
|
|
char *tmpname;
|
2003-03-24 17:11:46 +01:00
|
|
|
|
char *input_target = NULL;
|
|
|
|
|
char *output_target = NULL;
|
2002-11-30 09:39:46 +01:00
|
|
|
|
bfd_boolean show_version = FALSE;
|
|
|
|
|
bfd_boolean change_warn = TRUE;
|
2003-03-24 17:11:46 +01:00
|
|
|
|
bfd_boolean formats_info = FALSE;
|
2018-10-11 12:38:10 +02:00
|
|
|
|
bfd_boolean use_globalize = FALSE;
|
|
|
|
|
bfd_boolean use_keep_global = FALSE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
int c;
|
|
|
|
|
struct stat statbuf;
|
2009-09-11 13:16:19 +02:00
|
|
|
|
const bfd_arch_info_type *input_arch = NULL;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2017-03-01 12:09:46 +01:00
|
|
|
|
while ((c = getopt_long (argc, argv, "b:B:i:I:j:K:MN:s:O:d:F:L:G:R:SpgxXHhVvW:wDU",
|
1999-05-03 09:29:11 +02: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 05:43:56 +02:00
|
|
|
|
|
2002-05-21 21:34:58 +02:00
|
|
|
|
case 'B':
|
2009-09-11 13:16:19 +02:00
|
|
|
|
input_arch = bfd_scan_arch (optarg);
|
|
|
|
|
if (input_arch == NULL)
|
|
|
|
|
fatal (_("architecture %s unknown"), optarg);
|
2002-05-21 21:34:58 +02:00
|
|
|
|
break;
|
2001-03-13 01:08:35 +01:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case 'i':
|
2010-09-10 14:11:28 +02: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 09:29:11 +02:00
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case 'I':
|
|
|
|
|
case 's': /* "source" - 'I' is preferred */
|
|
|
|
|
input_target = optarg;
|
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case 'O':
|
|
|
|
|
case 'd': /* "destination" - 'O' is preferred */
|
|
|
|
|
output_target = optarg;
|
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case 'F':
|
|
|
|
|
input_target = output_target = optarg;
|
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-06-12 17:42:04 +02:00
|
|
|
|
case 'j':
|
2013-02-15 10:32:31 +01:00
|
|
|
|
find_section_list (optarg, TRUE, SECTION_CONTEXT_COPY);
|
2002-11-30 09:39:46 +01:00
|
|
|
|
sections_copied = TRUE;
|
1999-06-12 17:42:04 +02:00
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case 'R':
|
objcopy/strip: Add option --remove-relocations=SECTIONPATTERN
The objcopy and strip tools make use of the bfd library to manipulate
the state of the input file (to produce an output file). Within the
input file (for ELF at least), relocations are held within a section,
and so, if the user wanted to remove the relocations, but keep the
section to which the relocations would have been applied, it is tempting
to think that specifying the name of a relocation section to objcopy's
--remove-section option might do what you want, for example:
objcopy --remove-section=.rela.text input.elf output.elf
However, this does not work. The reason is that when the input file is
loaded, relocations are not managed as sections, but are, instead,
loaded as data associated with the section to which the relocations
would be applied. In our example above the relocations in '.rela.text'
are held as data on the section '.text' once 'input.elf' is loaded.
One task that objcopy and strip do is copy the relocations from the
input file to the output file if the section is also being copied from
the input file to the output file.
This commit adds a new command line option for objcopy and strip,
--remove-relocations, which can be used to remove the relocations, while
keeping the section that the relocations would have been applied to, for
example:
objcopy --remove-relocations=.text input.elf output.elf
in this case the section '.text' will appear in both 'input.elf' and
'output.elf', but any relocations in 'input.elf' that apply to '.text'
will not be present in 'output.elf'.
I have also added a special case to the handling of --remove-section
that spots if a user tries to remove a relocation section (currently
this is done by spotting the '.rela.' or '.rel.' prefix) and forwards
the request to --remove-relocations.
As with --remove-section and --only-section the --remove-relocations
option supports the '!' prefix on the section-patterns it takes to allow
for sections to be specifically not matched.
There are tests for all the new functionality.
binutils/ChangeLog:
* doc/binutils.texi (objcopy): Document 'remove-relocations'.
(strip): Likewise.
* objcopy.c (SECTION_CONTEXT_REMOVE_RELOCS): Define.
(enum command_line_switch): Add 'OPTION_REMOVE_RELOCS'.
(struct option strip_options): Add 'remove-relocations'.
(struct option copy_options): Likewise.
(copy_usage): Likewise.
(strip_usage): Likewise.
(handle_remove_relocations_option): New function.
(discard_relocations): New function.
(handle_remove_section_option): New function.
(copy_relocations_in_section): Use discard_relocations.
(strip_main): Use handle_remove_section_option for
'remove-section', and handle 'remove-relocations' option.
(copy_main): Likewise.
* testsuite/binutils-all/objcopy.exp: Run new tests.
* testsuite/binutils-all/remove-relocs-01.d: New file.
* testsuite/binutils-all/remove-relocs-01.s: New file.
* testsuite/binutils-all/remove-relocs-02.d: New file.
* testsuite/binutils-all/remove-relocs-03.d: New file.
* testsuite/binutils-all/remove-relocs-04.d: New file.
* testsuite/binutils-all/remove-relocs-05.d: New file.
* testsuite/binutils-all/remove-relocs-06.d: New file.
2015-08-21 21:08:26 +02:00
|
|
|
|
handle_remove_section_option (optarg);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OPTION_REMOVE_RELOCS:
|
|
|
|
|
handle_remove_relocations_option (optarg);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case 'S':
|
|
|
|
|
strip_symbols = STRIP_ALL;
|
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case 'g':
|
|
|
|
|
strip_symbols = STRIP_DEBUG;
|
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
2012-05-08 19:49:36 +02:00
|
|
|
|
case OPTION_STRIP_DWO:
|
|
|
|
|
strip_symbols = STRIP_DWO;
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case OPTION_STRIP_UNNEEDED:
|
|
|
|
|
strip_symbols = STRIP_UNNEEDED;
|
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
2003-06-26 10:14:10 +02:00
|
|
|
|
case OPTION_ONLY_KEEP_DEBUG:
|
|
|
|
|
strip_symbols = STRIP_NONDEBUG;
|
|
|
|
|
break;
|
|
|
|
|
|
2005-11-15 09:33:38 +01:00
|
|
|
|
case OPTION_KEEP_FILE_SYMBOLS:
|
|
|
|
|
keep_file_symbols = 1;
|
|
|
|
|
break;
|
|
|
|
|
|
2003-06-12 09:23:31 +02:00
|
|
|
|
case OPTION_ADD_GNU_DEBUGLINK:
|
2013-01-25 12:32:44 +01:00
|
|
|
|
long_section_names = ENABLE ;
|
2003-06-12 09:23:31 +02:00
|
|
|
|
gnu_debuglink_filename = optarg;
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case 'K':
|
2008-04-16 10:24:21 +02:00
|
|
|
|
add_specific_symbol (optarg, keep_specific_htab);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
2017-03-01 12:09:46 +01:00
|
|
|
|
case 'M':
|
|
|
|
|
merge_notes = TRUE;
|
|
|
|
|
break;
|
2017-04-13 15:50:56 +02:00
|
|
|
|
case OPTION_NO_MERGE_NOTES:
|
|
|
|
|
merge_notes = FALSE;
|
|
|
|
|
break;
|
2017-03-01 12:09:46 +01:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case 'N':
|
2008-04-16 10:24:21 +02:00
|
|
|
|
add_specific_symbol (optarg, strip_specific_htab);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
2004-12-16 14:16:33 +01:00
|
|
|
|
case OPTION_STRIP_UNNEEDED_SYMBOL:
|
2008-04-16 10:24:21 +02:00
|
|
|
|
add_specific_symbol (optarg, strip_unneeded_htab);
|
2004-12-16 14:16:33 +01:00
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case 'L':
|
2008-04-16 10:24:21 +02:00
|
|
|
|
add_specific_symbol (optarg, localize_specific_htab);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
2005-03-15 18:45:19 +01:00
|
|
|
|
case OPTION_GLOBALIZE_SYMBOL:
|
2018-10-11 12:38:10 +02:00
|
|
|
|
use_globalize = TRUE;
|
2008-04-16 10:24:21 +02:00
|
|
|
|
add_specific_symbol (optarg, globalize_specific_htab);
|
2005-03-15 18:45:19 +01:00
|
|
|
|
break;
|
|
|
|
|
|
2001-05-30 12:46:28 +02:00
|
|
|
|
case 'G':
|
2018-10-11 12:38:10 +02:00
|
|
|
|
use_keep_global = TRUE;
|
2008-04-16 10:24:21 +02:00
|
|
|
|
add_specific_symbol (optarg, keepglobal_specific_htab);
|
2001-05-30 12:46:28 +02:00
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case 'W':
|
2008-04-16 10:24:21 +02:00
|
|
|
|
add_specific_symbol (optarg, weaken_specific_htab);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case 'p':
|
2002-11-30 09:39:46 +01:00
|
|
|
|
preserve_dates = TRUE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
2012-04-25 19:50:14 +02:00
|
|
|
|
case 'D':
|
|
|
|
|
deterministic = TRUE;
|
|
|
|
|
break;
|
|
|
|
|
|
2013-01-07 18:40:59 +01:00
|
|
|
|
case 'U':
|
|
|
|
|
deterministic = FALSE;
|
|
|
|
|
break;
|
|
|
|
|
|
2003-11-11 18:50:26 +01:00
|
|
|
|
case 'w':
|
|
|
|
|
wildcard = TRUE;
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case 'x':
|
|
|
|
|
discard_locals = LOCALS_ALL;
|
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case 'X':
|
|
|
|
|
discard_locals = LOCALS_START_L;
|
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case 'v':
|
2002-11-30 09:39:46 +01:00
|
|
|
|
verbose = TRUE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case 'V':
|
2002-11-30 09:39:46 +01:00
|
|
|
|
show_version = TRUE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
2003-03-24 17:11:46 +01:00
|
|
|
|
case OPTION_FORMATS_INFO:
|
|
|
|
|
formats_info = TRUE;
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case OPTION_WEAKEN:
|
2002-11-30 09:39:46 +01:00
|
|
|
|
weaken = TRUE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case OPTION_ADD_SECTION:
|
2016-05-31 12:51:09 +02:00
|
|
|
|
add_sections = init_section_add (optarg, add_sections,
|
|
|
|
|
"--add-section");
|
|
|
|
|
section_add_load_file (add_sections);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
2015-02-13 18:04:42 +01:00
|
|
|
|
case OPTION_UPDATE_SECTION:
|
|
|
|
|
update_sections = init_section_add (optarg, update_sections,
|
2016-05-31 12:51:09 +02:00
|
|
|
|
"--update-section");
|
2015-02-13 18:04:42 +01:00
|
|
|
|
section_add_load_file (update_sections);
|
|
|
|
|
break;
|
|
|
|
|
|
2013-12-31 10:52:24 +01:00
|
|
|
|
case OPTION_DUMP_SECTION:
|
2016-05-31 12:51:09 +02:00
|
|
|
|
dump_sections = init_section_add (optarg, dump_sections,
|
|
|
|
|
"--dump-section");
|
2013-12-31 10:52:24 +01:00
|
|
|
|
break;
|
2015-08-12 13:42:37 +02:00
|
|
|
|
|
2015-10-21 16:16:35 +02:00
|
|
|
|
case OPTION_ADD_SYMBOL:
|
|
|
|
|
{
|
|
|
|
|
char *s, *t;
|
|
|
|
|
struct addsym_node *newsym = xmalloc (sizeof *newsym);
|
|
|
|
|
|
|
|
|
|
newsym->next = NULL;
|
|
|
|
|
s = strchr (optarg, '=');
|
|
|
|
|
if (s == NULL)
|
|
|
|
|
fatal (_("bad format for %s"), "--add-symbol");
|
|
|
|
|
t = strchr (s + 1, ':');
|
|
|
|
|
|
2015-11-20 15:08:29 +01:00
|
|
|
|
newsym->symdef = xstrndup (optarg, s - optarg);
|
2015-10-21 16:16:35 +02:00
|
|
|
|
if (t)
|
|
|
|
|
{
|
2015-11-20 15:08:29 +01:00
|
|
|
|
newsym->section = xstrndup (s + 1, t - (s + 1));
|
2015-10-21 16:16:35 +02:00
|
|
|
|
newsym->symval = strtol (t + 1, NULL, 0);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
newsym->section = NULL;
|
|
|
|
|
newsym->symval = strtol (s + 1, NULL, 0);
|
|
|
|
|
t = s;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
t = strchr (t + 1, ',');
|
2016-05-31 12:51:09 +02:00
|
|
|
|
newsym->othersym = NULL;
|
2015-10-21 16:16:35 +02:00
|
|
|
|
if (t)
|
|
|
|
|
newsym->flags = parse_symflags (t+1, &newsym->othersym);
|
|
|
|
|
else
|
|
|
|
|
newsym->flags = BSF_GLOBAL;
|
|
|
|
|
|
|
|
|
|
/* Keep 'othersym' symbols at the front of the list. */
|
|
|
|
|
if (newsym->othersym)
|
|
|
|
|
{
|
|
|
|
|
newsym->next = add_sym_list;
|
|
|
|
|
if (!add_sym_list)
|
|
|
|
|
add_sym_tail = &newsym->next;
|
|
|
|
|
add_sym_list = newsym;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
*add_sym_tail = newsym;
|
|
|
|
|
add_sym_tail = &newsym->next;
|
|
|
|
|
}
|
|
|
|
|
add_symbols++;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case OPTION_CHANGE_START:
|
|
|
|
|
change_start = parse_vma (optarg, "--change-start");
|
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case OPTION_CHANGE_SECTION_ADDRESS:
|
|
|
|
|
case OPTION_CHANGE_SECTION_LMA:
|
|
|
|
|
case OPTION_CHANGE_SECTION_VMA:
|
|
|
|
|
{
|
2013-02-15 10:32:31 +01:00
|
|
|
|
struct section_list * p;
|
2013-02-15 15:25:34 +01:00
|
|
|
|
unsigned int context = 0;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
const char *s;
|
|
|
|
|
int len;
|
|
|
|
|
char *name;
|
1999-07-11 22:02:30 +02:00
|
|
|
|
char *option = NULL;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
bfd_vma val;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
switch (c)
|
|
|
|
|
{
|
1999-07-11 22:02:30 +02:00
|
|
|
|
case OPTION_CHANGE_SECTION_ADDRESS:
|
|
|
|
|
option = "--change-section-address";
|
2013-02-15 10:32:31 +01:00
|
|
|
|
context = SECTION_CONTEXT_ALTER_LMA | SECTION_CONTEXT_ALTER_VMA;
|
1999-07-11 22:02:30 +02:00
|
|
|
|
break;
|
|
|
|
|
case OPTION_CHANGE_SECTION_LMA:
|
|
|
|
|
option = "--change-section-lma";
|
2013-02-15 10:32:31 +01:00
|
|
|
|
context = SECTION_CONTEXT_ALTER_LMA;
|
1999-07-11 22:02:30 +02:00
|
|
|
|
break;
|
|
|
|
|
case OPTION_CHANGE_SECTION_VMA:
|
|
|
|
|
option = "--change-section-vma";
|
2013-02-15 10:32:31 +01:00
|
|
|
|
context = SECTION_CONTEXT_ALTER_VMA;
|
1999-07-11 22:02:30 +02:00
|
|
|
|
break;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
}
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02: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);
|
|
|
|
|
}
|
|
|
|
|
}
|
2013-02-15 10:32:31 +01:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Correct the context. */
|
|
|
|
|
switch (c)
|
|
|
|
|
{
|
|
|
|
|
case OPTION_CHANGE_SECTION_ADDRESS:
|
|
|
|
|
context = SECTION_CONTEXT_SET_LMA | SECTION_CONTEXT_SET_VMA;
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_CHANGE_SECTION_LMA:
|
|
|
|
|
context = SECTION_CONTEXT_SET_LMA;
|
|
|
|
|
break;
|
|
|
|
|
case OPTION_CHANGE_SECTION_VMA:
|
|
|
|
|
context = SECTION_CONTEXT_SET_VMA;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
len = s - optarg;
|
2009-09-10 15:40:44 +02:00
|
|
|
|
name = (char *) xmalloc (len + 1);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
strncpy (name, optarg, len);
|
|
|
|
|
name[len] = '\0';
|
|
|
|
|
|
2013-02-15 10:32:31 +01:00
|
|
|
|
p = find_section_list (name, TRUE, context);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
val = parse_vma (s + 1, option);
|
2013-02-15 10:32:31 +01:00
|
|
|
|
if (*s == '-')
|
|
|
|
|
val = - val;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
switch (c)
|
|
|
|
|
{
|
|
|
|
|
case OPTION_CHANGE_SECTION_ADDRESS:
|
2013-02-15 10:32:31 +01:00
|
|
|
|
p->vma_val = val;
|
2016-10-05 09:47:02 +02:00
|
|
|
|
/* Fall through. */
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case OPTION_CHANGE_SECTION_LMA:
|
2013-02-15 10:32:31 +01:00
|
|
|
|
p->lma_val = val;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case OPTION_CHANGE_SECTION_VMA:
|
2013-02-15 10:32:31 +01:00
|
|
|
|
p->vma_val = val;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case OPTION_CHANGE_ADDRESSES:
|
|
|
|
|
change_section_address = parse_vma (optarg, "--change-addresses");
|
|
|
|
|
change_start = change_section_address;
|
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case OPTION_CHANGE_WARNINGS:
|
2002-11-30 09:39:46 +01:00
|
|
|
|
change_warn = TRUE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case OPTION_CHANGE_LEADING_CHAR:
|
2002-11-30 09:39:46 +01:00
|
|
|
|
change_leading_char = TRUE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
2010-10-29 14:10:39 +02:00
|
|
|
|
case OPTION_COMPRESS_DEBUG_SECTIONS:
|
2015-04-08 16:53:54 +02:00
|
|
|
|
if (optarg)
|
|
|
|
|
{
|
|
|
|
|
if (strcasecmp (optarg, "none") == 0)
|
|
|
|
|
do_debug_sections = decompress;
|
|
|
|
|
else if (strcasecmp (optarg, "zlib") == 0)
|
|
|
|
|
do_debug_sections = compress_zlib;
|
|
|
|
|
else if (strcasecmp (optarg, "zlib-gnu") == 0)
|
|
|
|
|
do_debug_sections = compress_gnu_zlib;
|
|
|
|
|
else if (strcasecmp (optarg, "zlib-gabi") == 0)
|
|
|
|
|
do_debug_sections = compress_gabi_zlib;
|
|
|
|
|
else
|
|
|
|
|
fatal (_("unrecognized --compress-debug-sections type `%s'"),
|
|
|
|
|
optarg);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
do_debug_sections = compress;
|
2010-10-29 14:10:39 +02:00
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case OPTION_DEBUGGING:
|
2002-11-30 09:39:46 +01:00
|
|
|
|
convert_debugging = TRUE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
2010-10-29 14:10:39 +02:00
|
|
|
|
case OPTION_DECOMPRESS_DEBUG_SECTIONS:
|
|
|
|
|
do_debug_sections = decompress;
|
|
|
|
|
break;
|
|
|
|
|
|
Properly implement STT_COMMON
The BFD configure option, --enable-elf-stt-common, can't be to used to
verify STT_COMMON implementation with the normal binutils build. Instead,
this patch removes it from BFD. It adds --elf-stt-common=[no|yes] to ELF
assembler/objcopy and adds -z common/-z nocommon to ld.
A configure option, --enable-elf-stt-common, is added to gas to specify
whether ELF assembler should generate common symbols with the STT_COMMON
type by default.
Since BSF_KEEP_G is never used, it is renamed to BSF_ELF_COMMON for ELF
common symbols.
bfd/
PR ld/19645
* bfd.c (bfd): Change flags to 20 bits.
(BFD_CONVERT_ELF_COMMON): New.
(BFD_USE_ELF_STT_COMMON): Likewise.
(BFD_FLAGS_SAVED): Add BFD_CONVERT_ELF_COMMON and
BFD_USE_ELF_STT_COMMON.
(BFD_FLAGS_FOR_BFD_USE_MASK): Likewise.
* configure.ac: Remove --enable-elf-stt-common.
* elf.c (swap_out_syms): Choose STT_COMMON or STT_OBJECT for
common symbol depending on BFD_CONVERT_ELF_COMMON and
BFD_USE_ELF_STT_COMMON.
* elfcode.h (elf_slurp_symbol_table): Set BSF_ELF_COMMON for
STT_COMMON.
* elflink.c (bfd_elf_link_mark_dynamic_symbol): Also check
STT_COMMON.
(elf_link_convert_common_type): New function.
(elf_link_output_extsym): Choose STT_COMMON or STT_OBJECT for
common symbol depending on BFD_CONVERT_ELF_COMMON and
BFD_USE_ELF_STT_COMMON. Set sym.st_info after sym.st_shndx.
* elfxx-target.h (TARGET_BIG_SYM): Add BFD_CONVERT_ELF_COMMON
and BFD_USE_ELF_STT_COMMON to object_flags.
(TARGET_LITTLE_SYM): Likewise.
* syms.c (BSF_KEEP_G): Renamed to ...
(BSF_ELF_COMMON): This.
* bfd-in2.h: Regenerated.
* config.in: Likewise.
* configure: Likewise.
binutils/
PR ld/19645
* NEWS: Mention --elf-stt-common= for objcopy.
* doc/binutils.texi: Document --elf-stt-common= for objcopy.
* objcopy.c (do_elf_stt_common): New.
(command_line_switch): Add OPTION_ELF_STT_COMMON.
(copy_options): Add --elf-stt-common=.
(copy_usage): Add --elf-stt-common=.
(copy_object): Also check do_elf_stt_common for ELF targets.
(copy_file): Handle do_elf_stt_common.
(copy_main): Handle OPTION_ELF_STT_COMMON.
* readelf.c (apply_relocations): Support STT_COMMON.
* testsuite/binutils-all/common-1.s: New file.
* testsuite/binutils-all/common-1a.d: Likewise.
* testsuite/binutils-all/common-1b.d: Likewise.
* testsuite/binutils-all/common-1c.d: Likewise.
* testsuite/binutils-all/common-1d.d: Likewise.
* testsuite/binutils-all/common-1e.d: Likewise.
* testsuite/binutils-all/common-1f.d: Likewise.
* testsuite/binutils-all/common-2.s: Likewise.
* testsuite/binutils-all/common-2a.d: Likewise.
* testsuite/binutils-all/common-2b.d: Likewise.
* testsuite/binutils-all/common-2c.d: Likewise.
* testsuite/binutils-all/common-2d.d: Likewise.
* testsuite/binutils-all/common-2e.d: Likewise.
* testsuite/binutils-all/common-2f.d: Likewise.
* testsuite/binutils-all/objcopy.exp
(objcopy_test_elf_common_symbols): New proc.
Run objcopy_test_elf_common_symbols for ELF targets
gas/
PR ld/19645
* NEWS: Mention --enable-elf-stt-common and --elf-stt-common=
for ELF assemblers.
* as.c (flag_use_elf_stt_common): New.
(show_usage): Add --elf-stt-common=.
(option_values): Add OPTION_ELF_STT_COMMON.
(std_longopts): Add --elf-stt-common=.
(parse_args): Handle --elf-stt-common=.
* as.h (flag_use_elf_stt_common): New.
* config.in: Regenerated.
* configure: Likewise.
* configure.ac: Add --enable-elf-stt-common and define
DEFAULT_GENERATE_ELF_STT_COMMON.
* gas/write.c (write_object_file): Set BFD_CONVERT_ELF_COMMON
and BFD_USE_ELF_STT_COMMON if flag_use_elf_stt_common is set.
* doc/as.texinfo: Document --elf-stt-common=.
* testsuite/gas/elf/common3.s: New file.
* testsuite/gas/elf/common3a.d: Likewise.
* testsuite/gas/elf/common3b.d: Likewise.
* testsuite/gas/elf/common4.s: Likewise.
* testsuite/gas/elf/common4a.d: Likewise.
* testsuite/gas/elf/common4b.d: Likewise.
* testsuite/gas/i386/dw2-compress-3b.d: Likewise.
* testsuite/gas/i386/dw2-compressed-3b.d: Likewise.
* testsuite/gas/elf/elf.exp: Run common3a, common3b, common4a
and common4b.
* testsuite/gas/i386/dw2-compress-3.d: Renamed to ...
* testsuite/gas/i386/dw2-compress-3a.d: This. Pass
--elf-stt-common=no to as.
* testsuite/gas/i386/dw2-compressed-3.d: Renamed to ...
* testsuite/gas/i386/dw2-compressed-3a.d: This. Pass
--elf-stt-common=no to as.
* testsuite/gas/i386/i386.exp: Run dw2-compress-3a,
dw2-compress-3b, dw2-compressed-3a and dw2-compressed-3b instead
of dw2-compress-3 and dw2-compressed-3.
include/
PR ld/19645
* bfdlink.h (bfd_link_elf_stt_common): New enum.
(bfd_link_info): Add elf_stt_common.
ld/
PR ld/19645
* NEWS: Mention -z common/-z nocommon for ELF targets.
* emultempl/elf32.em (gld${EMULATION_NAME}_handle_option): Handle
-z common and -z nocommon.
* ld.texinfo: Document -z common/-z nocommon.
* lexsup.c (elf_shlib_list_options): Add -z common/-z nocommon.
* testsuite/ld-elf/tls_common.exp: Test --elf-stt-common=no and
--elf-stt-common=yes with assembler.
* testsuite/ld-elfcomm/common-1.s: New file.
* testsuite/ld-elfcomm/common-1a.d: Likewise.
* testsuite/ld-elfcomm/common-1b.d: Likewise.
* testsuite/ld-elfcomm/common-1c.d: Likewise.
* testsuite/ld-elfcomm/common-1d.d: Likewise.
* testsuite/ld-elfcomm/common-1e.d: Likewise.
* testsuite/ld-elfcomm/common-1f.d: Likewise.
* testsuite/ld-elfcomm/common-2.s: Likewise.
* testsuite/ld-elfcomm/common-2a.d: Likewise.
* testsuite/ld-elfcomm/common-2b.d: Likewise.
* testsuite/ld-elfcomm/common-2c.d: Likewise.
* testsuite/ld-elfcomm/common-2d.d: Likewise.
* testsuite/ld-elfcomm/common-2e.d: Likewise.
* testsuite/ld-elfcomm/common-2f.d: Likewise.
* testsuite/ld-elfcomm/common-3a.rd: Likewise.
* testsuite/ld-elfcomm/common-3b.rd: Likewise.
* testsuite/ld-i386/pr19645.d: Likewise.
* testsuite/ld-i386/pr19645.s: Likewise.
* testsuite/ld-x86-64/largecomm-1.s: Likewise.
* testsuite/ld-x86-64/largecomm-1a.d: Likewise.
* testsuite/ld-x86-64/largecomm-1b.d: Likewise.
* testsuite/ld-x86-64/largecomm-1c.d: Likewise.
* testsuite/ld-x86-64/largecomm-1d.d: Likewise.
* testsuite/ld-x86-64/largecomm-1e.d: Likewise.
* testsuite/ld-x86-64/largecomm-1f.d: Likewise.
* testsuite/ld-x86-64/pr19645.d: Likewise.
* testsuite/ld-x86-64/pr19645.s: Likewise.
* testsuite/ld-elfcomm/elfcomm.exp: Test --elf-stt-common=yes
with assembler.
(assembler_generates_commons): Removed.
Run -z common/-z nocommon tests. Run *.d tests.
* testsuite/ld-i386/i386.exp: Run pr19645.
* testsuite/ld-x86-64/x86-64.exp: Likewise.
* testsuite/ld-x86-64/dwarfreloc.exp: Test --elf-stt-common with
assembler. Test STT_COMMON with readelf.
2016-02-22 18:18:52 +01:00
|
|
|
|
case OPTION_ELF_STT_COMMON:
|
|
|
|
|
if (strcasecmp (optarg, "yes") == 0)
|
|
|
|
|
do_elf_stt_common = elf_stt_common;
|
|
|
|
|
else if (strcasecmp (optarg, "no") == 0)
|
|
|
|
|
do_elf_stt_common = no_elf_stt_common;
|
|
|
|
|
else
|
|
|
|
|
fatal (_("unrecognized --elf-stt-common= option `%s'"),
|
|
|
|
|
optarg);
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 09:29:11 +02: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 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
sprintf_vma (buff, gap_fill_vma);
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
non_fatal (_("Warning: truncating gap-fill from 0x%s to 0x%x"),
|
|
|
|
|
buff, gap_fill);
|
|
|
|
|
}
|
2002-11-30 09:39:46 +01:00
|
|
|
|
gap_fill_set = TRUE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
}
|
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case OPTION_NO_CHANGE_WARNINGS:
|
2002-11-30 09:39:46 +01:00
|
|
|
|
change_warn = FALSE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case OPTION_PAD_TO:
|
|
|
|
|
pad_to = parse_vma (optarg, "--pad-to");
|
2002-11-30 09:39:46 +01:00
|
|
|
|
pad_to_set = TRUE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case OPTION_REMOVE_LEADING_CHAR:
|
2002-11-30 09:39:46 +01:00
|
|
|
|
remove_leading_char = TRUE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
|
|
|
|
case OPTION_REDEFINE_SYM:
|
|
|
|
|
{
|
2017-04-05 18:22:47 +02:00
|
|
|
|
/* Insert this redefinition onto redefine_specific_htab. */
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
|
|
|
|
int len;
|
|
|
|
|
const char *s;
|
|
|
|
|
const char *nextarg;
|
|
|
|
|
char *source, *target;
|
|
|
|
|
|
|
|
|
|
s = strchr (optarg, '=');
|
|
|
|
|
if (s == NULL)
|
2001-07-31 15:49:39 +02:00
|
|
|
|
fatal (_("bad format for %s"), "--redefine-sym");
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
|
|
|
|
len = s - optarg;
|
2009-09-10 15:40:44 +02:00
|
|
|
|
source = (char *) xmalloc (len + 1);
|
2000-04-05 05:43:56 +02:00
|
|
|
|
strncpy (source, optarg, len);
|
|
|
|
|
source[len] = '\0';
|
|
|
|
|
|
|
|
|
|
nextarg = s + 1;
|
|
|
|
|
len = strlen (nextarg);
|
2009-09-10 15:40:44 +02:00
|
|
|
|
target = (char *) xmalloc (len + 1);
|
2000-04-05 05:43:56 +02:00
|
|
|
|
strcpy (target, nextarg);
|
|
|
|
|
|
2017-04-05 18:22:47 +02:00
|
|
|
|
add_redefine_and_check ("--redefine-sym", source, target);
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
|
|
|
|
free (source);
|
|
|
|
|
free (target);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
2003-06-02 16:45:13 +02:00
|
|
|
|
case OPTION_REDEFINE_SYMS:
|
|
|
|
|
add_redefine_syms_file (optarg);
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case OPTION_SET_SECTION_FLAGS:
|
|
|
|
|
{
|
2013-02-15 10:32:31 +01:00
|
|
|
|
struct section_list *p;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
const char *s;
|
|
|
|
|
int len;
|
|
|
|
|
char *name;
|
|
|
|
|
|
|
|
|
|
s = strchr (optarg, '=');
|
|
|
|
|
if (s == NULL)
|
2000-04-05 05:43:56 +02:00
|
|
|
|
fatal (_("bad format for %s"), "--set-section-flags");
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
len = s - optarg;
|
2009-09-10 15:40:44 +02:00
|
|
|
|
name = (char *) xmalloc (len + 1);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
strncpy (name, optarg, len);
|
|
|
|
|
name[len] = '\0';
|
|
|
|
|
|
2013-02-15 10:32:31 +01:00
|
|
|
|
p = find_section_list (name, TRUE, SECTION_CONTEXT_SET_FLAGS);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
p->flags = parse_flags (s + 1);
|
|
|
|
|
}
|
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
2001-07-31 15:49:39 +02:00
|
|
|
|
case OPTION_RENAME_SECTION:
|
|
|
|
|
{
|
|
|
|
|
flagword flags;
|
2001-09-19 08:58:06 +02:00
|
|
|
|
const char *eq, *fl;
|
|
|
|
|
char *old_name;
|
|
|
|
|
char *new_name;
|
2001-07-31 15:49:39 +02:00
|
|
|
|
unsigned int len;
|
|
|
|
|
|
2001-09-19 08:58:06 +02:00
|
|
|
|
eq = strchr (optarg, '=');
|
|
|
|
|
if (eq == NULL)
|
2001-07-31 15:49:39 +02:00
|
|
|
|
fatal (_("bad format for %s"), "--rename-section");
|
|
|
|
|
|
2001-09-19 08:58:06 +02:00
|
|
|
|
len = eq - optarg;
|
2001-07-31 15:49:39 +02:00
|
|
|
|
if (len == 0)
|
2001-09-19 08:58:06 +02:00
|
|
|
|
fatal (_("bad format for %s"), "--rename-section");
|
2001-07-31 15:49:39 +02:00
|
|
|
|
|
2009-09-10 15:40:44 +02:00
|
|
|
|
old_name = (char *) xmalloc (len + 1);
|
2001-07-31 15:49:39 +02:00
|
|
|
|
strncpy (old_name, optarg, len);
|
|
|
|
|
old_name[len] = 0;
|
|
|
|
|
|
2001-09-19 08:58:06 +02:00
|
|
|
|
eq++;
|
|
|
|
|
fl = strchr (eq, ',');
|
|
|
|
|
if (fl)
|
2001-07-31 15:49:39 +02:00
|
|
|
|
{
|
2001-09-19 08:58:06 +02:00
|
|
|
|
flags = parse_flags (fl + 1);
|
|
|
|
|
len = fl - eq;
|
2001-07-31 15:49:39 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
flags = -1;
|
2001-09-19 08:58:06 +02:00
|
|
|
|
len = strlen (eq);
|
2001-07-31 15:49:39 +02:00
|
|
|
|
}
|
|
|
|
|
|
2001-09-19 08:58:06 +02:00
|
|
|
|
if (len == 0)
|
|
|
|
|
fatal (_("bad format for %s"), "--rename-section");
|
|
|
|
|
|
2009-09-10 15:40:44 +02:00
|
|
|
|
new_name = (char *) xmalloc (len + 1);
|
2001-09-19 08:58:06 +02:00
|
|
|
|
strncpy (new_name, eq, len);
|
|
|
|
|
new_name[len] = 0;
|
|
|
|
|
|
2001-07-31 15:49:39 +02:00
|
|
|
|
add_section_rename (old_name, new_name, flags);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case OPTION_SET_START:
|
|
|
|
|
set_start = parse_vma (optarg, "--set-start");
|
2002-11-30 09:39:46 +01:00
|
|
|
|
set_start_set = TRUE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
2002-05-21 21:34:58 +02:00
|
|
|
|
case OPTION_SREC_LEN:
|
2017-02-17 02:26:12 +01:00
|
|
|
|
_bfd_srec_len = parse_vma (optarg, "--srec-len");
|
2002-05-21 21:34:58 +02:00
|
|
|
|
break;
|
2000-11-03 02:47:13 +01:00
|
|
|
|
|
2002-05-21 21:34:58 +02:00
|
|
|
|
case OPTION_SREC_FORCES3:
|
2017-02-17 02:26:12 +01:00
|
|
|
|
_bfd_srec_forceS3 = TRUE;
|
2002-05-21 21:34:58 +02:00
|
|
|
|
break;
|
2000-11-03 02:47:13 +01:00
|
|
|
|
|
2001-05-30 12:46:28 +02:00
|
|
|
|
case OPTION_STRIP_SYMBOLS:
|
2018-09-17 17:50:42 +02:00
|
|
|
|
add_specific_symbols (optarg, strip_specific_htab,
|
|
|
|
|
&strip_specific_buffer);
|
2001-05-30 12:46:28 +02:00
|
|
|
|
break;
|
|
|
|
|
|
2004-12-16 14:16:33 +01:00
|
|
|
|
case OPTION_STRIP_UNNEEDED_SYMBOLS:
|
2018-09-17 17:50:42 +02:00
|
|
|
|
add_specific_symbols (optarg, strip_unneeded_htab,
|
|
|
|
|
&strip_unneeded_buffer);
|
2004-12-16 14:16:33 +01:00
|
|
|
|
break;
|
|
|
|
|
|
2001-05-30 12:46:28 +02:00
|
|
|
|
case OPTION_KEEP_SYMBOLS:
|
2018-09-17 17:50:42 +02:00
|
|
|
|
add_specific_symbols (optarg, keep_specific_htab,
|
|
|
|
|
&keep_specific_buffer);
|
2001-05-30 12:46:28 +02:00
|
|
|
|
break;
|
|
|
|
|
|
2006-06-23 18:23:09 +02:00
|
|
|
|
case OPTION_LOCALIZE_HIDDEN:
|
|
|
|
|
localize_hidden = TRUE;
|
|
|
|
|
break;
|
|
|
|
|
|
2001-05-30 12:46:28 +02:00
|
|
|
|
case OPTION_LOCALIZE_SYMBOLS:
|
2018-09-17 17:50:42 +02:00
|
|
|
|
add_specific_symbols (optarg, localize_specific_htab,
|
|
|
|
|
&localize_specific_buffer);
|
2001-05-30 12:46:28 +02:00
|
|
|
|
break;
|
|
|
|
|
|
2009-04-14 11:47:44 +02: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-15 18:45:19 +01:00
|
|
|
|
case OPTION_GLOBALIZE_SYMBOLS:
|
2018-10-11 12:38:10 +02:00
|
|
|
|
use_globalize = TRUE;
|
2018-09-17 17:50:42 +02:00
|
|
|
|
add_specific_symbols (optarg, globalize_specific_htab,
|
|
|
|
|
&globalize_specific_buffer);
|
2005-03-15 18:45:19 +01:00
|
|
|
|
break;
|
|
|
|
|
|
2001-05-30 12:46:28 +02:00
|
|
|
|
case OPTION_KEEPGLOBAL_SYMBOLS:
|
2018-10-11 12:38:10 +02:00
|
|
|
|
use_keep_global = TRUE;
|
2018-09-17 17:50:42 +02:00
|
|
|
|
add_specific_symbols (optarg, keepglobal_specific_htab,
|
|
|
|
|
&keepglobal_specific_buffer);
|
2001-05-30 12:46:28 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OPTION_WEAKEN_SYMBOLS:
|
2018-09-17 17:50:42 +02:00
|
|
|
|
add_specific_symbols (optarg, weaken_specific_htab,
|
|
|
|
|
&weaken_specific_buffer);
|
2001-05-30 12:46:28 +02:00
|
|
|
|
break;
|
|
|
|
|
|
2001-08-24 15:56:11 +02:00
|
|
|
|
case OPTION_ALT_MACH_CODE:
|
2006-02-28 17:09:01 +01: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 15:56:11 +02:00
|
|
|
|
break;
|
|
|
|
|
|
2002-12-13 14:19:44 +01: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 14:01:11 +01: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;
|
|
|
|
|
|
2012-05-08 19:49:36 +02:00
|
|
|
|
case OPTION_EXTRACT_DWO:
|
|
|
|
|
strip_symbols = STRIP_NONDWO;
|
|
|
|
|
break;
|
|
|
|
|
|
2007-03-01 17:39:42 +01:00
|
|
|
|
case OPTION_EXTRACT_SYMBOL:
|
|
|
|
|
extract_symbol = TRUE;
|
|
|
|
|
break;
|
|
|
|
|
|
2007-04-23 12:59:07 +02:00
|
|
|
|
case OPTION_REVERSE_BYTES:
|
2016-05-31 12:51:09 +02:00
|
|
|
|
{
|
|
|
|
|
int prev = reverse_bytes;
|
2007-04-23 12:59:07 +02:00
|
|
|
|
|
2016-05-31 12:51:09 +02:00
|
|
|
|
reverse_bytes = atoi (optarg);
|
|
|
|
|
if ((reverse_bytes <= 0) || ((reverse_bytes % 2) != 0))
|
|
|
|
|
fatal (_("number of bytes to reverse must be positive and even"));
|
2007-04-23 12:59:07 +02:00
|
|
|
|
|
2016-05-31 12:51:09 +02:00
|
|
|
|
if (prev && prev != reverse_bytes)
|
|
|
|
|
non_fatal (_("Warning: ignoring previous --reverse-bytes value of %d"),
|
|
|
|
|
prev);
|
|
|
|
|
break;
|
|
|
|
|
}
|
2007-04-23 12:59:07 +02: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 15:46:18 +02:00
|
|
|
|
case OPTION_FILE_ALIGNMENT:
|
|
|
|
|
pe_file_alignment = parse_vma (optarg, "--file-alignment");
|
|
|
|
|
break;
|
2013-01-07 18:40:59 +01: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 15:46:18 +02:00
|
|
|
|
case OPTION_HEAP:
|
2016-05-31 12:51:09 +02:00
|
|
|
|
{
|
|
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
}
|
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 15:46:18 +02:00
|
|
|
|
break;
|
2013-01-07 18:40:59 +01: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 15:46:18 +02:00
|
|
|
|
case OPTION_IMAGE_BASE:
|
|
|
|
|
pe_image_base = parse_vma (optarg, "--image-base");
|
|
|
|
|
break;
|
2013-01-07 18:40:59 +01: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 15:46:18 +02:00
|
|
|
|
case OPTION_SECTION_ALIGNMENT:
|
|
|
|
|
pe_section_alignment = parse_vma (optarg,
|
|
|
|
|
"--section-alignment");
|
|
|
|
|
break;
|
2013-01-07 18:40:59 +01: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 15:46:18 +02:00
|
|
|
|
case OPTION_SUBSYSTEM:
|
|
|
|
|
set_pe_subsystem (optarg);
|
|
|
|
|
break;
|
2013-01-07 18:40:59 +01: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 15:46:18 +02:00
|
|
|
|
case OPTION_STACK:
|
2016-05-31 12:51:09 +02:00
|
|
|
|
{
|
|
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
}
|
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 15:46:18 +02:00
|
|
|
|
break;
|
2013-01-07 18:40:59 +01:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case 0:
|
2003-06-12 09:23:31 +02:00
|
|
|
|
/* We've been given a long option. */
|
|
|
|
|
break;
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
2002-01-23 17:12:56 +01:00
|
|
|
|
case 'H':
|
1999-05-03 09:29:11 +02:00
|
|
|
|
case 'h':
|
|
|
|
|
copy_usage (stdout, 0);
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
default:
|
|
|
|
|
copy_usage (stderr, 1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-10-11 12:38:10 +02:00
|
|
|
|
if (use_globalize && use_keep_global)
|
|
|
|
|
fatal(_("--globalize-symbol(s) is incompatible with -G/--keep-global-symbol(s)"));
|
|
|
|
|
|
2003-03-24 17:11:46 +01:00
|
|
|
|
if (formats_info)
|
|
|
|
|
{
|
|
|
|
|
display_info ();
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2007-06-29 02:34:14 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
if (show_version)
|
|
|
|
|
print_version ("objcopy");
|
|
|
|
|
|
2010-09-10 14:11:28 +02:00
|
|
|
|
if (interleave && copy_byte == -1)
|
|
|
|
|
fatal (_("interleave start byte must be set with --byte"));
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
if (copy_byte >= interleave)
|
|
|
|
|
fatal (_("byte number must be less than interleave"));
|
|
|
|
|
|
2010-09-10 14:11:28 +02:00
|
|
|
|
if (copy_width > interleave - copy_byte)
|
|
|
|
|
fatal (_("interleave width must be less than or equal to interleave - byte`"));
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
if (optind == argc || optind + 2 < argc)
|
|
|
|
|
copy_usage (stderr, 1);
|
|
|
|
|
|
|
|
|
|
input_filename = argv[optind];
|
|
|
|
|
if (optind + 1 < argc)
|
|
|
|
|
output_filename = argv[optind + 1];
|
|
|
|
|
|
2013-01-07 18:40:59 +01:00
|
|
|
|
default_deterministic ();
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
/* Default is to strip no symbols. */
|
|
|
|
|
if (strip_symbols == STRIP_UNDEF && discard_locals == LOCALS_UNDEF)
|
|
|
|
|
strip_symbols = STRIP_NONE;
|
|
|
|
|
|
2003-08-05 16:40:54 +02:00
|
|
|
|
if (output_target == NULL)
|
1999-05-03 09:29:11 +02: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 15:46:18 +02: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 01:08:35 +01:00
|
|
|
|
if (preserve_dates)
|
|
|
|
|
if (stat (input_filename, & statbuf) < 0)
|
2003-11-07 13:19:34 +01:00
|
|
|
|
fatal (_("warning: could not locate '%s'. System error message: %s"),
|
|
|
|
|
input_filename, strerror (errno));
|
2001-03-13 01:08:35 +01:00
|
|
|
|
|
2003-05-13 13:15:59 +02:00
|
|
|
|
/* If there is no destination file, or the source and destination files
|
2003-08-05 16:40:54 +02:00
|
|
|
|
are the same, then create a temp and rename the result into the input. */
|
2011-02-28 19:32:52 +01:00
|
|
|
|
if (output_filename == NULL
|
|
|
|
|
|| filename_cmp (input_filename, output_filename) == 0)
|
2007-05-18 08:36:14 +02:00
|
|
|
|
tmpname = make_tempname (input_filename);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
else
|
2007-05-18 08:36:14 +02:00
|
|
|
|
tmpname = output_filename;
|
2007-06-29 02:34:14 +02:00
|
|
|
|
|
2007-05-18 08:36:14 +02:00
|
|
|
|
if (tmpname == NULL)
|
|
|
|
|
fatal (_("warning: could not create temporary file whilst copying '%s', (error: %s)"),
|
|
|
|
|
input_filename, strerror (errno));
|
2001-07-31 15:49:39 +02:00
|
|
|
|
|
2009-09-11 13:16:19 +02:00
|
|
|
|
copy_file (input_filename, tmpname, input_target, output_target, input_arch);
|
2007-05-18 08:36:14 +02:00
|
|
|
|
if (status == 0)
|
|
|
|
|
{
|
|
|
|
|
if (preserve_dates)
|
|
|
|
|
set_times (tmpname, &statbuf);
|
|
|
|
|
if (tmpname != output_filename)
|
2009-08-03 15:47:35 +02:00
|
|
|
|
status = (smart_rename (tmpname, input_filename,
|
|
|
|
|
preserve_dates) != 0);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
}
|
2007-05-18 08:36:14 +02:00
|
|
|
|
else
|
|
|
|
|
unlink_if_ordinary (tmpname);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
2017-11-15 12:53:22 +01:00
|
|
|
|
if (tmpname != output_filename)
|
|
|
|
|
free (tmpname);
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
if (change_warn)
|
|
|
|
|
{
|
2013-02-15 10:32:31 +01:00
|
|
|
|
struct section_list *p;
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
for (p = change_sections; p != NULL; p = p->next)
|
|
|
|
|
{
|
|
|
|
|
if (! p->used)
|
|
|
|
|
{
|
2013-02-15 10:32:31 +01:00
|
|
|
|
if (p->context & (SECTION_CONTEXT_SET_VMA | SECTION_CONTEXT_ALTER_VMA))
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
|
|
|
|
char buff [20];
|
|
|
|
|
|
|
|
|
|
sprintf_vma (buff, p->vma_val);
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
/* xgettext:c-format */
|
2000-04-05 05:43:56 +02:00
|
|
|
|
non_fatal (_("%s %s%c0x%s never used"),
|
|
|
|
|
"--change-section-vma",
|
2013-02-15 10:32:31 +01:00
|
|
|
|
p->pattern,
|
|
|
|
|
p->context & SECTION_CONTEXT_SET_VMA ? '=' : '+',
|
1999-05-03 09:29:11 +02:00
|
|
|
|
buff);
|
|
|
|
|
}
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
2013-02-15 10:32:31 +01:00
|
|
|
|
if (p->context & (SECTION_CONTEXT_SET_LMA | SECTION_CONTEXT_ALTER_LMA))
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
|
|
|
|
char buff [20];
|
|
|
|
|
|
|
|
|
|
sprintf_vma (buff, p->lma_val);
|
2000-04-05 05:43:56 +02:00
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
/* xgettext:c-format */
|
2000-04-05 05:43:56 +02:00
|
|
|
|
non_fatal (_("%s %s%c0x%s never used"),
|
|
|
|
|
"--change-section-lma",
|
2013-02-15 10:32:31 +01:00
|
|
|
|
p->pattern,
|
|
|
|
|
p->context & SECTION_CONTEXT_SET_LMA ? '=' : '+',
|
1999-05-03 09:29:11 +02:00
|
|
|
|
buff);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-17 17:50:42 +02:00
|
|
|
|
if (strip_specific_buffer)
|
|
|
|
|
free (strip_specific_buffer);
|
|
|
|
|
|
|
|
|
|
if (strip_unneeded_buffer)
|
|
|
|
|
free (strip_unneeded_buffer);
|
|
|
|
|
|
|
|
|
|
if (keep_specific_buffer)
|
|
|
|
|
free (keep_specific_buffer);
|
|
|
|
|
|
|
|
|
|
if (localize_specific_buffer)
|
|
|
|
|
free (globalize_specific_buffer);
|
|
|
|
|
|
|
|
|
|
if (globalize_specific_buffer)
|
|
|
|
|
free (globalize_specific_buffer);
|
|
|
|
|
|
|
|
|
|
if (keepglobal_specific_buffer)
|
|
|
|
|
free (keepglobal_specific_buffer);
|
|
|
|
|
|
|
|
|
|
if (weaken_specific_buffer)
|
|
|
|
|
free (weaken_specific_buffer);
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
2003-07-23 19:34:03 +02:00
|
|
|
|
main (int argc, char *argv[])
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
|
|
|
|
#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
|
|
|
|
|
setlocale (LC_MESSAGES, "");
|
2001-09-19 07:33:36 +02:00
|
|
|
|
#endif
|
|
|
|
|
#if defined (HAVE_SETLOCALE)
|
|
|
|
|
setlocale (LC_CTYPE, "");
|
1999-05-03 09:29:11 +02:00
|
|
|
|
#endif
|
|
|
|
|
bindtextdomain (PACKAGE, LOCALEDIR);
|
|
|
|
|
textdomain (PACKAGE);
|
|
|
|
|
|
|
|
|
|
program_name = argv[0];
|
|
|
|
|
xmalloc_set_program_name (program_name);
|
|
|
|
|
|
|
|
|
|
START_PROGRESS (program_name, 0);
|
|
|
|
|
|
2005-09-30 18:37:32 +02:00
|
|
|
|
expandargv (&argc, &argv);
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
strip_symbols = STRIP_UNDEF;
|
|
|
|
|
discard_locals = LOCALS_UNDEF;
|
|
|
|
|
|
2018-10-15 07:40:27 +02:00
|
|
|
|
if (bfd_init () != BFD_INIT_MAGIC)
|
|
|
|
|
fatal (_("fatal error: libbfd ABI mismatch"));
|
1999-05-03 09:29:11 +02:00
|
|
|
|
set_default_bfd_target ();
|
|
|
|
|
|
|
|
|
|
if (is_strip < 0)
|
|
|
|
|
{
|
|
|
|
|
int i = strlen (program_name);
|
2000-05-26 15:11:57 +02: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 09:29:11 +02:00
|
|
|
|
}
|
|
|
|
|
|
2008-04-16 10:24:21 +02:00
|
|
|
|
create_symbol_htabs ();
|
|
|
|
|
|
2015-01-21 18:37:23 +01:00
|
|
|
|
if (argv != NULL)
|
|
|
|
|
bfd_set_error_program_name (argv[0]);
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
if (is_strip)
|
|
|
|
|
strip_main (argc, argv);
|
|
|
|
|
else
|
|
|
|
|
copy_main (argc, argv);
|
|
|
|
|
|
|
|
|
|
END_PROGRESS (program_name);
|
|
|
|
|
|
|
|
|
|
return status;
|
|
|
|
|
}
|