Merge our ELF branding into Binutils 2.12_20020622 snapshot.

(note that this will be the last Binutils update to offer our original
method of ELF branding (WANT_OLD_BRANDELF_METHOD))
This commit is contained in:
David E. O'Brien 2002-07-05 20:30:48 +00:00
parent 95cd50e6d7
commit c563f5ced3
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=99464

View File

@ -3885,7 +3885,6 @@ prep_headers (abfd)
Elf_Internal_Ehdr *i_ehdrp; /* Elf file header, internal form */
Elf_Internal_Phdr *i_phdrp = 0; /* Program header table, internal form */
Elf_Internal_Shdr **i_shdrp; /* Section header table, internal form */
int count;
struct elf_strtab_hash *shstrtab;
struct elf_backend_data *bed = get_elf_backend_data (abfd);
@ -3909,12 +3908,6 @@ prep_headers (abfd)
i_ehdrp->e_ident[EI_VERSION] = bed->s->ev_current;
i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_FREEBSD;
i_ehdrp->e_ident[EI_ABIVERSION] = 0;
for (count = EI_PAD; count < EI_NIDENT; count++)
i_ehdrp->e_ident[count] = 0;
#ifdef WANT_OLD_BRANDELF_METHOD
#define _OLD_EI_BRAND_OFFSET 8
#define _OLD_BRANDING "FreeBSD"
@ -3922,7 +3915,6 @@ prep_headers (abfd)
EI_NIDENT-_OLD_EI_BRAND_OFFSET);
#endif
if ((abfd->flags & DYNAMIC) != 0)
i_ehdrp->e_type = ET_DYN;
else if ((abfd->flags & EXEC_P) != 0)