summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2002-07-05 20:30:48 +0000
committerobrien <obrien@FreeBSD.org>2002-07-05 20:30:48 +0000
commit07fd3c7d7969279a96c5b56ea47311b8bac5d0ad (patch)
tree44e35571b7ca4c186202ccbe04bbbbe2bfa4ddc0 /contrib
parent5bbed9e6b0ec2fe158136f658b45d0dbaa4fcfad (diff)
downloadFreeBSD-src-07fd3c7d7969279a96c5b56ea47311b8bac5d0ad.zip
FreeBSD-src-07fd3c7d7969279a96c5b56ea47311b8bac5d0ad.tar.gz
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))
Diffstat (limited to 'contrib')
-rw-r--r--contrib/binutils/bfd/elf.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/contrib/binutils/bfd/elf.c b/contrib/binutils/bfd/elf.c
index 88d3256..e4db494 100644
--- a/contrib/binutils/bfd/elf.c
+++ b/contrib/binutils/bfd/elf.c
@@ -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)
OpenPOWER on IntegriCloud