aarch64 bfd.h tidy
bfd/ * bfd-in.h: Move aarch64 declarations and defines.. * cpu-aarch64.h: ..to here, new file.. * elfxx-aarch64.h: ..and here. * cpu-aarch64.c: Include cpu-aarch64.h. * elfnn-aarch64.c: Likewise. * bfd-in2.h: Regenerate. ld/ * emultempl/aarch64elf.em: Include elfxx-aarch64.h.
This commit is contained in:
Alan Modra
parent
c348479ddd
commit
a8bfaadbb4
|
|
@ -1,3 +1,12 @@
|
|||
2019-09-23 Alan Modra <amodra@gmail.com>
|
||||
|
||||
* bfd-in.h: Move aarch64 declarations and defines..
|
||||
* cpu-aarch64.h: ..to here, new file..
|
||||
* elfxx-aarch64.h: ..and here.
|
||||
* cpu-aarch64.c: Include cpu-aarch64.h.
|
||||
* elfnn-aarch64.c: Likewise.
|
||||
* bfd-in2.h: Regenerate.
|
||||
|
||||
2019-09-23 Alan Modra <amodra@gmail.com>
|
||||
|
||||
* bfd-in.h: Delete ticoff function declarations.
|
||||
|
|
|
|||
86
bfd/bfd-in.h
86
bfd/bfd-in.h
|
|
@ -907,89 +907,3 @@ extern bfd_boolean elf32_arm_fix_exidx_coverage
|
|||
/* C6x unwind section editing support. */
|
||||
extern bfd_boolean elf32_tic6x_fix_exidx_coverage
|
||||
(struct bfd_section **, unsigned int, struct bfd_link_info *, bfd_boolean);
|
||||
|
||||
extern void bfd_elf64_aarch64_init_maps
|
||||
(bfd *);
|
||||
|
||||
extern void bfd_elf32_aarch64_init_maps
|
||||
(bfd *);
|
||||
|
||||
/* Types of PLTs based on the level of security. This would be a
|
||||
bit-mask to denote which of the combinations of security features
|
||||
are enabled:
|
||||
- No security feature PLTs
|
||||
- PLTs with BTI instruction
|
||||
- PLTs with PAC instruction
|
||||
*/
|
||||
typedef enum
|
||||
{
|
||||
PLT_NORMAL = 0x0, /* Normal plts. */
|
||||
PLT_BTI = 0x1, /* plts with bti. */
|
||||
PLT_PAC = 0x2, /* plts with pointer authentication. */
|
||||
PLT_BTI_PAC = PLT_BTI | PLT_PAC
|
||||
} aarch64_plt_type;
|
||||
|
||||
/* To indicate if BTI is enabled with/without warning. */
|
||||
typedef enum
|
||||
{
|
||||
BTI_NONE = 0, /* BTI is not enabled. */
|
||||
BTI_WARN = 1, /* BTI is enabled with -z force-bti. */
|
||||
} aarch64_enable_bti_type;
|
||||
|
||||
/* A structure to encompass all information coming from BTI or PAC
|
||||
related command line options. This involves the "PLT_TYPE" to determine
|
||||
which version of PLTs to pick and "BTI_TYPE" to determine if
|
||||
BTI should be turned on with any warnings. */
|
||||
typedef struct
|
||||
{
|
||||
aarch64_plt_type plt_type;
|
||||
aarch64_enable_bti_type bti_type;
|
||||
} aarch64_bti_pac_info;
|
||||
|
||||
/* An enum to define what kind of erratum fixes we should apply. This gives the
|
||||
user a bit more control over the sequences we generate. */
|
||||
typedef enum
|
||||
{
|
||||
ERRAT_NONE = (1 << 0), /* No erratum workarounds allowed. */
|
||||
ERRAT_ADR = (1 << 1), /* Erratum workarounds using ADR allowed. */
|
||||
ERRAT_ADRP = (1 << 2), /* Erratum workarounds using ADRP are allowed. */
|
||||
} erratum_84319_opts;
|
||||
|
||||
extern void bfd_elf64_aarch64_set_options
|
||||
(bfd *, struct bfd_link_info *, int, int, int, int, erratum_84319_opts, int,
|
||||
aarch64_bti_pac_info);
|
||||
|
||||
extern void bfd_elf32_aarch64_set_options
|
||||
(bfd *, struct bfd_link_info *, int, int, int, int, erratum_84319_opts, int,
|
||||
aarch64_bti_pac_info);
|
||||
|
||||
/* ELF AArch64 mapping symbol support. */
|
||||
#define BFD_AARCH64_SPECIAL_SYM_TYPE_MAP (1 << 0)
|
||||
#define BFD_AARCH64_SPECIAL_SYM_TYPE_TAG (1 << 1)
|
||||
#define BFD_AARCH64_SPECIAL_SYM_TYPE_OTHER (1 << 2)
|
||||
#define BFD_AARCH64_SPECIAL_SYM_TYPE_ANY (~0)
|
||||
extern bfd_boolean bfd_is_aarch64_special_symbol_name
|
||||
(const char * name, int type);
|
||||
|
||||
/* AArch64 stub generation support for ELF64. Called from the linker. */
|
||||
extern int elf64_aarch64_setup_section_lists
|
||||
(bfd *, struct bfd_link_info *);
|
||||
extern void elf64_aarch64_next_input_section
|
||||
(struct bfd_link_info *, struct bfd_section *);
|
||||
extern bfd_boolean elf64_aarch64_size_stubs
|
||||
(bfd *, bfd *, struct bfd_link_info *, bfd_signed_vma,
|
||||
struct bfd_section * (*) (const char *, struct bfd_section *),
|
||||
void (*) (void));
|
||||
extern bfd_boolean elf64_aarch64_build_stubs
|
||||
(struct bfd_link_info *);
|
||||
/* AArch64 stub generation support for ELF32. Called from the linker. */
|
||||
extern int elf32_aarch64_setup_section_lists
|
||||
(bfd *, struct bfd_link_info *);
|
||||
extern void elf32_aarch64_next_input_section
|
||||
(struct bfd_link_info *, struct bfd_section *);
|
||||
extern bfd_boolean elf32_aarch64_size_stubs
|
||||
(bfd *, bfd *, struct bfd_link_info *, bfd_signed_vma,
|
||||
struct bfd_section * (*) (const char *, struct bfd_section *),
|
||||
void (*) (void));
|
||||
extern bfd_boolean elf32_aarch64_build_stubs
|
||||
(struct bfd_link_info *);
|
||||
|
|
|
|||
|
|
@ -914,92 +914,6 @@ extern bfd_boolean elf32_arm_fix_exidx_coverage
|
|||
/* C6x unwind section editing support. */
|
||||
extern bfd_boolean elf32_tic6x_fix_exidx_coverage
|
||||
(struct bfd_section **, unsigned int, struct bfd_link_info *, bfd_boolean);
|
||||
|
||||
extern void bfd_elf64_aarch64_init_maps
|
||||
(bfd *);
|
||||
|
||||
extern void bfd_elf32_aarch64_init_maps
|
||||
(bfd *);
|
||||
|
||||
/* Types of PLTs based on the level of security. This would be a
|
||||
bit-mask to denote which of the combinations of security features
|
||||
are enabled:
|
||||
- No security feature PLTs
|
||||
- PLTs with BTI instruction
|
||||
- PLTs with PAC instruction
|
||||
*/
|
||||
typedef enum
|
||||
{
|
||||
PLT_NORMAL = 0x0, /* Normal plts. */
|
||||
PLT_BTI = 0x1, /* plts with bti. */
|
||||
PLT_PAC = 0x2, /* plts with pointer authentication. */
|
||||
PLT_BTI_PAC = PLT_BTI | PLT_PAC
|
||||
} aarch64_plt_type;
|
||||
|
||||
/* To indicate if BTI is enabled with/without warning. */
|
||||
typedef enum
|
||||
{
|
||||
BTI_NONE = 0, /* BTI is not enabled. */
|
||||
BTI_WARN = 1, /* BTI is enabled with -z force-bti. */
|
||||
} aarch64_enable_bti_type;
|
||||
|
||||
/* A structure to encompass all information coming from BTI or PAC
|
||||
related command line options. This involves the "PLT_TYPE" to determine
|
||||
which version of PLTs to pick and "BTI_TYPE" to determine if
|
||||
BTI should be turned on with any warnings. */
|
||||
typedef struct
|
||||
{
|
||||
aarch64_plt_type plt_type;
|
||||
aarch64_enable_bti_type bti_type;
|
||||
} aarch64_bti_pac_info;
|
||||
|
||||
/* An enum to define what kind of erratum fixes we should apply. This gives the
|
||||
user a bit more control over the sequences we generate. */
|
||||
typedef enum
|
||||
{
|
||||
ERRAT_NONE = (1 << 0), /* No erratum workarounds allowed. */
|
||||
ERRAT_ADR = (1 << 1), /* Erratum workarounds using ADR allowed. */
|
||||
ERRAT_ADRP = (1 << 2), /* Erratum workarounds using ADRP are allowed. */
|
||||
} erratum_84319_opts;
|
||||
|
||||
extern void bfd_elf64_aarch64_set_options
|
||||
(bfd *, struct bfd_link_info *, int, int, int, int, erratum_84319_opts, int,
|
||||
aarch64_bti_pac_info);
|
||||
|
||||
extern void bfd_elf32_aarch64_set_options
|
||||
(bfd *, struct bfd_link_info *, int, int, int, int, erratum_84319_opts, int,
|
||||
aarch64_bti_pac_info);
|
||||
|
||||
/* ELF AArch64 mapping symbol support. */
|
||||
#define BFD_AARCH64_SPECIAL_SYM_TYPE_MAP (1 << 0)
|
||||
#define BFD_AARCH64_SPECIAL_SYM_TYPE_TAG (1 << 1)
|
||||
#define BFD_AARCH64_SPECIAL_SYM_TYPE_OTHER (1 << 2)
|
||||
#define BFD_AARCH64_SPECIAL_SYM_TYPE_ANY (~0)
|
||||
extern bfd_boolean bfd_is_aarch64_special_symbol_name
|
||||
(const char * name, int type);
|
||||
|
||||
/* AArch64 stub generation support for ELF64. Called from the linker. */
|
||||
extern int elf64_aarch64_setup_section_lists
|
||||
(bfd *, struct bfd_link_info *);
|
||||
extern void elf64_aarch64_next_input_section
|
||||
(struct bfd_link_info *, struct bfd_section *);
|
||||
extern bfd_boolean elf64_aarch64_size_stubs
|
||||
(bfd *, bfd *, struct bfd_link_info *, bfd_signed_vma,
|
||||
struct bfd_section * (*) (const char *, struct bfd_section *),
|
||||
void (*) (void));
|
||||
extern bfd_boolean elf64_aarch64_build_stubs
|
||||
(struct bfd_link_info *);
|
||||
/* AArch64 stub generation support for ELF32. Called from the linker. */
|
||||
extern int elf32_aarch64_setup_section_lists
|
||||
(bfd *, struct bfd_link_info *);
|
||||
extern void elf32_aarch64_next_input_section
|
||||
(struct bfd_link_info *, struct bfd_section *);
|
||||
extern bfd_boolean elf32_aarch64_size_stubs
|
||||
(bfd *, bfd *, struct bfd_link_info *, bfd_signed_vma,
|
||||
struct bfd_section * (*) (const char *, struct bfd_section *),
|
||||
void (*) (void));
|
||||
extern bfd_boolean elf32_aarch64_build_stubs
|
||||
(struct bfd_link_info *);
|
||||
/* Extracted from init.c. */
|
||||
unsigned int bfd_init (void);
|
||||
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
#include "bfd.h"
|
||||
#include "libbfd.h"
|
||||
#include "libiberty.h"
|
||||
#include "cpu-aarch64.h"
|
||||
|
||||
/* This routine is provided two arch_infos and works out which Aarch64
|
||||
machine which would be compatible with both and returns a pointer
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
/* ELF AArch64 mapping symbol support
|
||||
Copyright (C) 2019 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of BFD, the Binary File Descriptor library.
|
||||
|
||||
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
|
||||
the Free Software Foundation; either version 3 of the License, or
|
||||
(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; see the file COPYING3. If not,
|
||||
see <http://www.gnu.org/licenses/>. */
|
||||
|
||||
#define BFD_AARCH64_SPECIAL_SYM_TYPE_MAP (1 << 0)
|
||||
#define BFD_AARCH64_SPECIAL_SYM_TYPE_TAG (1 << 1)
|
||||
#define BFD_AARCH64_SPECIAL_SYM_TYPE_OTHER (1 << 2)
|
||||
#define BFD_AARCH64_SPECIAL_SYM_TYPE_ANY (~0)
|
||||
extern bfd_boolean bfd_is_aarch64_special_symbol_name
|
||||
(const char * name, int type);
|
||||
|
|
@ -144,6 +144,7 @@
|
|||
#include "objalloc.h"
|
||||
#include "elf/aarch64.h"
|
||||
#include "elfxx-aarch64.h"
|
||||
#include "cpu-aarch64.h"
|
||||
|
||||
#define ARCH_SIZE NN
|
||||
|
||||
|
|
|
|||
|
|
@ -18,6 +18,84 @@
|
|||
along with this program; see the file COPYING3. If not,
|
||||
see <http://www.gnu.org/licenses/>. */
|
||||
|
||||
extern void bfd_elf64_aarch64_init_maps
|
||||
(bfd *);
|
||||
|
||||
extern void bfd_elf32_aarch64_init_maps
|
||||
(bfd *);
|
||||
|
||||
/* Types of PLTs based on the level of security. This would be a
|
||||
bit-mask to denote which of the combinations of security features
|
||||
are enabled:
|
||||
- No security feature PLTs
|
||||
- PLTs with BTI instruction
|
||||
- PLTs with PAC instruction
|
||||
*/
|
||||
typedef enum
|
||||
{
|
||||
PLT_NORMAL = 0x0, /* Normal plts. */
|
||||
PLT_BTI = 0x1, /* plts with bti. */
|
||||
PLT_PAC = 0x2, /* plts with pointer authentication. */
|
||||
PLT_BTI_PAC = PLT_BTI | PLT_PAC
|
||||
} aarch64_plt_type;
|
||||
|
||||
/* To indicate if BTI is enabled with/without warning. */
|
||||
typedef enum
|
||||
{
|
||||
BTI_NONE = 0, /* BTI is not enabled. */
|
||||
BTI_WARN = 1, /* BTI is enabled with -z force-bti. */
|
||||
} aarch64_enable_bti_type;
|
||||
|
||||
/* A structure to encompass all information coming from BTI or PAC
|
||||
related command line options. This involves the "PLT_TYPE" to determine
|
||||
which version of PLTs to pick and "BTI_TYPE" to determine if
|
||||
BTI should be turned on with any warnings. */
|
||||
typedef struct
|
||||
{
|
||||
aarch64_plt_type plt_type;
|
||||
aarch64_enable_bti_type bti_type;
|
||||
} aarch64_bti_pac_info;
|
||||
|
||||
/* An enum to define what kind of erratum fixes we should apply. This gives the
|
||||
user a bit more control over the sequences we generate. */
|
||||
typedef enum
|
||||
{
|
||||
ERRAT_NONE = (1 << 0), /* No erratum workarounds allowed. */
|
||||
ERRAT_ADR = (1 << 1), /* Erratum workarounds using ADR allowed. */
|
||||
ERRAT_ADRP = (1 << 2), /* Erratum workarounds using ADRP are allowed. */
|
||||
} erratum_84319_opts;
|
||||
|
||||
extern void bfd_elf64_aarch64_set_options
|
||||
(bfd *, struct bfd_link_info *, int, int, int, int, erratum_84319_opts, int,
|
||||
aarch64_bti_pac_info);
|
||||
|
||||
extern void bfd_elf32_aarch64_set_options
|
||||
(bfd *, struct bfd_link_info *, int, int, int, int, erratum_84319_opts, int,
|
||||
aarch64_bti_pac_info);
|
||||
|
||||
/* AArch64 stub generation support for ELF64. Called from the linker. */
|
||||
extern int elf64_aarch64_setup_section_lists
|
||||
(bfd *, struct bfd_link_info *);
|
||||
extern void elf64_aarch64_next_input_section
|
||||
(struct bfd_link_info *, struct bfd_section *);
|
||||
extern bfd_boolean elf64_aarch64_size_stubs
|
||||
(bfd *, bfd *, struct bfd_link_info *, bfd_signed_vma,
|
||||
struct bfd_section * (*) (const char *, struct bfd_section *),
|
||||
void (*) (void));
|
||||
extern bfd_boolean elf64_aarch64_build_stubs
|
||||
(struct bfd_link_info *);
|
||||
/* AArch64 stub generation support for ELF32. Called from the linker. */
|
||||
extern int elf32_aarch64_setup_section_lists
|
||||
(bfd *, struct bfd_link_info *);
|
||||
extern void elf32_aarch64_next_input_section
|
||||
(struct bfd_link_info *, struct bfd_section *);
|
||||
extern bfd_boolean elf32_aarch64_size_stubs
|
||||
(bfd *, bfd *, struct bfd_link_info *, bfd_signed_vma,
|
||||
struct bfd_section * (*) (const char *, struct bfd_section *),
|
||||
void (*) (void));
|
||||
extern bfd_boolean elf32_aarch64_build_stubs
|
||||
(struct bfd_link_info *);
|
||||
|
||||
/* Take the PAGE component of an address or offset. */
|
||||
#define PG(x) ((x) & ~ (bfd_vma) 0xfff)
|
||||
#define PG_OFFSET(x) ((x) & (bfd_vma) 0xfff)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
2019-09-23 Alan Modra <amodra@gmail.com>
|
||||
|
||||
* emultempl/aarch64elf.em: Include elfxx-aarch64.h.
|
||||
|
||||
2019-09-23 Alan Modra <amodra@gmail.com>
|
||||
|
||||
* emultempl/ia64elf.em: Include elfxx-ia64.h.
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ fragment <<EOF
|
|||
|
||||
#include "ldctor.h"
|
||||
#include "elf/aarch64.h"
|
||||
#include "elfxx-aarch64.h"
|
||||
|
||||
static int no_enum_size_warning = 0;
|
||||
static int no_wchar_size_warning = 0;
|
||||
|
|
|
|||
Loading…
Reference in New Issue