From 1036f9f1bfc4f9b6d39a4633467136819afa0c08 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 9 Apr 2012 16:27:18 +0000 Subject: [PATCH] bfd/ * elf.c (_bfd_elf_map_sections_to_segments): Set INFO->user_phdrs. * elf-nacl.c (nacl_modify_segment_map): Do nothing if INFO->user_phdrs. (nacl_modify_program_headers): Likewise. include/ * bfdlink.h (struct bfd_link_info): Add new member user_phdrs. --- include/ChangeLog | 4 ++++ include/bfdlink.h | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/ChangeLog b/include/ChangeLog index c5b84b579..495c0c891 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2012-04-09 Roland McGrath + + * bfdlink.h (struct bfd_link_info): Add new member user_phdrs. + 2012-03-15 Alan Modra * dis-asm.h (disassemble_init_powerpc): Declare. diff --git a/include/bfdlink.h b/include/bfdlink.h index c79d8f055..d900b4783 100644 --- a/include/bfdlink.h +++ b/include/bfdlink.h @@ -229,7 +229,7 @@ typedef enum {with_flags, without_flags} flag_type; /* A section flag list. */ struct flag_info_list { - flag_type with; + flag_type with; const char *name; bfd_boolean valid; struct flag_info_list *next; @@ -405,6 +405,9 @@ struct bfd_link_info /* TRUE if we should warn alternate ELF machine code. */ unsigned int warn_alternate_em: 1; + /* TRUE if the linker script contained an explicit PHDRS command. */ + unsigned int user_phdrs: 1; + /* Char that may appear as the first char of a symbol, but should be skipped (like symbol_leading_char) when looking up symbols in wrap_hash. Used by PowerPC Linux for 'dot' symbols. */ @@ -674,7 +677,7 @@ struct bfd_link_order } indirect; struct { - /* Size of contents, or zero when contents should be filled by + /* Size of contents, or zero when contents should be filled by the architecture-dependent fill function. A non-zero value allows filling of the output section with an arbitrary repeated pattern. */