projects / packages / binutils.git / blame
| Commit | Line | Data |
|---|---|---|
| b31a0c51 JR |
1 | From cf7363b42b2fdc9fd108bed8d53b35adf4d52ad5 Mon Sep 17 00:00:00 2001 |
| 2 | From: H.J. Lu <hjl.tools@gmail.com> | |
| 3 | Date: Mon, 29 Sep 2014 08:35:49 -0700 | |
| 4 | Subject: [PATCH] Fix build for OLD_FREEBSD_ABI_LABEL | |
| 5 | ||
| 6 | PR ld/17440 | |
| 7 | * elf32-i386.c (elf_i386_fbsd_post_process_headers): Fix build | |
| 8 | for OLD_FREEBSD_ABI_LABEL. | |
| 9 | --- | |
| 10 | bfd/ChangeLog | 6 ++++++ | |
| 11 | bfd/elf32-i386.c | 7 +++++-- | |
| 12 | 2 files changed, 11 insertions(+), 2 deletions(-) | |
| 13 | ||
| 14 | diff --git a/bfd/ChangeLog b/bfd/ChangeLog | |
| 15 | index f70cad6..e4445dc 100644 | |
| 16 | --- a/bfd/ChangeLog | |
| 17 | +++ b/bfd/ChangeLog | |
| 18 | @@ -1,3 +1,9 @@ | |
| 19 | +2014-09-29 H.J. Lu <hongjiu.lu@intel.com> | |
| 20 | + | |
| 21 | + PR ld/17440 | |
| 22 | + * elf32-i386.c (elf_i386_fbsd_post_process_headers): Fix build | |
| 23 | + for OLD_FREEBSD_ABI_LABEL. | |
| 24 | + | |
| 25 | 2014-09-24 Markus Trippelsdorf <markus@trippelsdorf.de> | |
| 26 | ||
| 27 | PR 17422 | |
| 28 | diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c | |
| 29 | index a00d47c..afa21b5 100644 | |
| 30 | --- a/bfd/elf32-i386.c | |
| 31 | +++ b/bfd/elf32-i386.c | |
| 32 | @@ -5120,8 +5120,11 @@ elf_i386_fbsd_post_process_headers (bfd *abfd, struct bfd_link_info *info) | |
| 33 | _bfd_elf_post_process_headers (abfd, info); | |
| 34 | ||
| 35 | #ifdef OLD_FREEBSD_ABI_LABEL | |
| 36 | - /* The ABI label supported by FreeBSD <= 4.0 is quite nonstandard. */ | |
| 37 | - memcpy (&i_ehdrp->e_ident[EI_ABIVERSION], "FreeBSD", 8); | |
| 38 | + { | |
| 39 | + /* The ABI label supported by FreeBSD <= 4.0 is quite nonstandard. */ | |
| 40 | + Elf_Internal_Ehdr *i_ehdrp = elf_elfheader (abfd); | |
| 41 | + memcpy (&i_ehdrp->e_ident[EI_ABIVERSION], "FreeBSD", 8); | |
| 42 | + } | |
| 43 | #endif | |
| 44 | } | |
| 45 | ||
| 46 | -- | |
| 47 | 1.7.1 | |
| 48 |