b10a8ae01c
2007-09-17 H.J. Lu <hongjiu.lu@intel.com> PR binutils/3281 PR binutils/5037 * elf-bfd.h (elf_obj_tdata): Remove relro. * elf.c (get_program_header_size): Check info->relro instead of elf_tdata (abfd)->relro. (_bfd_elf_map_sections_to_segments): Likewise. (assign_file_positions_for_load_sections): Don't set PT_GNU_RELRO segment alignment here. (assign_file_positions_for_non_load_sections): Properly set up PT_GNU_RELRO segment for copying executable/shared library. (rewrite_elf_program_header): Remove PT_GNU_RELRO segment. (copy_elf_program_header): Set p_size and p_size_valid fields for PT_GNU_RELRO segment. include/elf/ 2007-09-17 H.J. Lu <hongjiu.lu@intel.com> PR binutils/3281 PR binutils/5037 * internal.h (elf_segment_map): Add p_size and p_size_valid. (ELF_IS_SECTION_IN_SEGMENT): Allow SHF_TLS sections in PT_GNU_RELRO segments. ld/ 2007-09-17 H.J. Lu <hongjiu.lu@intel.com> PR binutils/3281 PR binutils/5037 * ldexp.h (ldexp_control): Add relro, relro_start_stat and relro_end_stat. * ldexp.c (fold_binary): Set expld.dataseg.relro to exp_dataseg_relro_start or exp_dataseg_relro_end when seeing DATA_SEGMENT_ALIGN or DATA_SEGMENT_RELRO_END, respectively. * ldlang.c (lang_size_sections_1): Properly set expld.dataseg.relro_start_stat and expld.dataseg.relro_end_stat. (find_relro_section_callback): New function. (lang_find_relro_sections_1): Likewise. (lang_find_relro_sections): Likewise. (lang_process): Call lang_find_relro_sections for non-relocatable link. ld/testsuite/ 2007-09-17 H.J. Lu <hongjiu.lu@intel.com> PR binutils/3281 PR binutils/5037 * ld-elf/binutils.exp: Update "-z relro" tests to use relro1.s. Add "-z relro" tests with relro2.s. Add "-z relro" tests with TLS for objcopy. * ld-elf/relro1.s: New file. * ld-elf/relro2.s: Likewise.
196 lines
4.6 KiB
C
196 lines
4.6 KiB
C
/* ldexp.h -
|
|
Copyright 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001, 2002,
|
|
2003, 2004, 2005, 2007 Free Software Foundation, Inc.
|
|
|
|
This file is part of the 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
|
|
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; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
|
|
MA 02110-1301, USA. */
|
|
|
|
#ifndef LDEXP_H
|
|
#define LDEXP_H
|
|
|
|
/* The result of an expression tree */
|
|
typedef struct {
|
|
bfd_vma value;
|
|
char *str;
|
|
asection *section;
|
|
bfd_boolean valid_p;
|
|
} etree_value_type;
|
|
|
|
typedef struct {
|
|
int node_code;
|
|
unsigned int lineno;
|
|
enum {
|
|
etree_binary,
|
|
etree_trinary,
|
|
etree_unary,
|
|
etree_name,
|
|
etree_assign,
|
|
etree_provide,
|
|
etree_provided,
|
|
etree_value,
|
|
etree_assert,
|
|
etree_rel
|
|
} node_class;
|
|
} node_type;
|
|
|
|
typedef union etree_union {
|
|
node_type type;
|
|
struct {
|
|
node_type type;
|
|
union etree_union *lhs;
|
|
union etree_union *rhs;
|
|
} binary;
|
|
struct {
|
|
node_type type;
|
|
union etree_union *cond;
|
|
union etree_union *lhs;
|
|
union etree_union *rhs;
|
|
} trinary;
|
|
struct {
|
|
node_type type;
|
|
const char *dst;
|
|
union etree_union *src;
|
|
bfd_boolean hidden;
|
|
} assign;
|
|
struct {
|
|
node_type type;
|
|
union etree_union *child;
|
|
} unary;
|
|
struct {
|
|
node_type type;
|
|
const char *name;
|
|
} name;
|
|
struct {
|
|
node_type type;
|
|
bfd_vma value;
|
|
char *str;
|
|
} value;
|
|
struct {
|
|
node_type type;
|
|
asection *section;
|
|
bfd_vma value;
|
|
} rel;
|
|
struct {
|
|
node_type type;
|
|
union etree_union *child;
|
|
const char *message;
|
|
} assert_s;
|
|
} etree_type;
|
|
|
|
typedef enum {
|
|
lang_first_phase_enum,
|
|
lang_mark_phase_enum,
|
|
lang_allocating_phase_enum,
|
|
lang_final_phase_enum
|
|
} lang_phase_type;
|
|
|
|
union lang_statement_union;
|
|
|
|
struct ldexp_control {
|
|
/* Modify expression evaluation depending on this. */
|
|
lang_phase_type phase;
|
|
|
|
/* Principally used for diagnostics. */
|
|
bfd_boolean assigning_to_dot;
|
|
|
|
/* Working results. */
|
|
etree_value_type result;
|
|
bfd_vma dot;
|
|
|
|
/* Current dot and section passed to ldexp folder. */
|
|
bfd_vma *dotp;
|
|
asection *section;
|
|
|
|
/* State machine and results for DATASEG. */
|
|
struct {
|
|
enum {
|
|
exp_dataseg_none,
|
|
exp_dataseg_align_seen,
|
|
exp_dataseg_relro_seen,
|
|
exp_dataseg_end_seen,
|
|
exp_dataseg_relro_adjust,
|
|
exp_dataseg_adjust
|
|
} phase;
|
|
|
|
bfd_vma base, min_base, relro_end, end, pagesize, maxpagesize;
|
|
|
|
enum {
|
|
exp_dataseg_relro_none,
|
|
exp_dataseg_relro_start,
|
|
exp_dataseg_relro_end,
|
|
} relro;
|
|
|
|
union lang_statement_union *relro_start_stat;
|
|
union lang_statement_union *relro_end_stat;
|
|
} dataseg;
|
|
};
|
|
|
|
extern struct ldexp_control expld;
|
|
|
|
/* A maps from a segment name to a base address. */
|
|
typedef struct segment_struct {
|
|
/* The next segment in the linked list. */
|
|
struct segment_struct *next;
|
|
/* The name of the sgement. */
|
|
const char *name;
|
|
/* The base address for the segment. */
|
|
bfd_vma value;
|
|
/* True if a SEGMENT_START directive corresponding to this segment
|
|
has been seen. */
|
|
bfd_boolean used;
|
|
} segment_type;
|
|
|
|
/* The segments specified by the user on the command-line. */
|
|
extern segment_type *segments;
|
|
|
|
typedef struct _fill_type fill_type;
|
|
|
|
etree_type *exp_intop
|
|
(bfd_vma);
|
|
etree_type *exp_bigintop
|
|
(bfd_vma, char *);
|
|
etree_type *exp_relop
|
|
(asection *, bfd_vma);
|
|
void exp_fold_tree
|
|
(etree_type *, asection *, bfd_vma *);
|
|
etree_type *exp_binop
|
|
(int, etree_type *, etree_type *);
|
|
etree_type *exp_trinop
|
|
(int,etree_type *, etree_type *, etree_type *);
|
|
etree_type *exp_unop
|
|
(int, etree_type *);
|
|
etree_type *exp_nameop
|
|
(int, const char *);
|
|
etree_type *exp_assop
|
|
(int, const char *, etree_type *);
|
|
etree_type *exp_provide
|
|
(const char *, etree_type *, bfd_boolean);
|
|
etree_type *exp_assert
|
|
(etree_type *, const char *);
|
|
void exp_print_tree
|
|
(etree_type *);
|
|
bfd_vma exp_get_vma
|
|
(etree_type *, bfd_vma, char *);
|
|
int exp_get_value_int
|
|
(etree_type *, int, char *);
|
|
fill_type *exp_get_fill
|
|
(etree_type *, fill_type *, char *);
|
|
bfd_vma exp_get_abs_int
|
|
(etree_type *, int, char *);
|
|
|
|
#endif
|