Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-29 02:20:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

ld: Update phase_enum/relro_enum and add seg_align_type

Browse Source 
Update GNU_RELRO date type so that they can also be used for text-only
LOAD segment.

	* ldexp.h (phase_enum): Rename exp_dataseg_none,
	exp_dataseg_align_seen, exp_dataseg_relro_seen,
	exp_dataseg_end_seen, exp_dataseg_relro_adjust,
	exp_dataseg_adjust and exp_dataseg_done to exp_seg_none,
	exp_seg_align_seen, exp_seg_relro_seen, exp_seg_end_seen,
	exp_seg_relro_adjust, exp_seg_adjust and exp_seg_done.
	(relro_enum): Rename exp_dataseg_relro_none,
	exp_dataseg_relro_start and exp_dataseg_relro_end to
	exp_seg_relro_none, exp_seg_relro_start and exp_seg_relro_end.
	(seg_align_type): New struct type.
	(ldexp_control): Use seg_align_type.
	* ldexp.c (fold_unary): Updated.
	(fold_binary): Likewise.
	* ldlang.c (strip_excluded_output_sections): Likewise.
	(lang_size_sections_1): Likewise.
	(lang_size_sections): Likewise.
This commit is contained in:
H.J. Lu
2017-11-12 17:17:47 -08:00
parent f882209d9a
commit 0f99513f2a
4 changed files with 76 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
ld/ldexp.h
View File

@@ -115,23 +115,34 @@ union lang_statement_union;
enum phase_enum {
/* We step through the first four states here as we see the
associated linker script tokens. */
exp_dataseg_none,
exp_dataseg_align_seen,
exp_dataseg_relro_seen,
exp_dataseg_end_seen,
exp_seg_none,
exp_seg_align_seen,
exp_seg_relro_seen,
exp_seg_end_seen,
/* The last three states are final, and affect the value returned
by DATA_SEGMENT_ALIGN. */
exp_dataseg_relro_adjust,
exp_dataseg_adjust,
exp_dataseg_done
by XXX_SEGMENT_ALIGN. */
exp_seg_relro_adjust,
exp_seg_adjust,
exp_seg_done
};
enum relro_enum {
exp_dataseg_relro_none,
exp_dataseg_relro_start,
exp_dataseg_relro_end,
exp_seg_relro_none,
exp_seg_relro_start,
exp_seg_relro_end,
};
typedef struct {
enum phase_enum phase;
bfd_vma base, relro_offset, relro_end, end, pagesize, maxpagesize;
enum relro_enum relro;
union lang_statement_union *relro_start_stat;
union lang_statement_union *relro_end_stat;
} seg_align_type;
struct ldexp_control {
/* Modify expression evaluation depending on this. */
lang_phase_type phase;
@@ -161,16 +172,7 @@ struct ldexp_control {
asection *section;
/* State machine and results for DATASEG. */
struct {
enum phase_enum phase;
bfd_vma base, relro_offset, relro_end, end, pagesize, maxpagesize;
enum relro_enum relro;
union lang_statement_union *relro_start_stat;
union lang_statement_union *relro_end_stat;
} dataseg;
seg_align_type dataseg;
};
extern struct ldexp_control expld;