diff options
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/elf32-i386-fbsd.c | 15 | ||||
| -rw-r--r-- | bfd/elf64-alpha-fbsd.c | 15 |
3 files changed, 20 insertions, 16 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 5d31f00..4c0cbc7 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2002-09-17 David O'Brien <obrien@FreeBSD.org> + + * elf32-i386-fbsd.c: Always label using the EI_OSABI method. + It is benign for FreeBSD < 4.1. Minor reformatting. + * elf64-alpha-fbsd.c: Likewise. + 2002-09-17 Jakub Jelinek <jakub@redhat.com> * elf_i386_relocate_section (R_386_TLS_TPOFF32): Negate addend. diff --git a/bfd/elf32-i386-fbsd.c b/bfd/elf32-i386-fbsd.c index 9420829..500e0eb 100644 --- a/bfd/elf32-i386-fbsd.c +++ b/bfd/elf32-i386-fbsd.c @@ -17,11 +17,11 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define TARGET_LITTLE_SYM bfd_elf32_i386_freebsd_vec -#define TARGET_LITTLE_NAME "elf32-i386-freebsd" -#define ELF_ARCH bfd_arch_i386 -#define ELF_MACHINE_CODE EM_386 -#define ELF_MAXPAGESIZE 0x1000 +#define TARGET_LITTLE_SYM bfd_elf32_i386_freebsd_vec +#define TARGET_LITTLE_NAME "elf32-i386-freebsd" +#define ELF_ARCH bfd_arch_i386 +#define ELF_MACHINE_CODE EM_386 +#define ELF_MAXPAGESIZE 0x1000 #include "bfd.h" #include "sysdep.h" @@ -43,12 +43,11 @@ elf_i386_post_process_headers (abfd, link_info) i_ehdrp = elf_elfheader (abfd); + /* Put an ABI label supported by FreeBSD >= 4.1. */ + i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_FREEBSD; #ifdef OLD_FREEBSD_ABI_LABEL /* The ABI label supported by FreeBSD <= 4.0 is quite nonstandard. */ memcpy (&i_ehdrp->e_ident[EI_ABIVERSION], "FreeBSD", 8); -#else - /* Put an ABI label supported by FreeBSD >= 4.1. */ - i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_FREEBSD; #endif } diff --git a/bfd/elf64-alpha-fbsd.c b/bfd/elf64-alpha-fbsd.c index 00cdf72..061b0b8 100644 --- a/bfd/elf64-alpha-fbsd.c +++ b/bfd/elf64-alpha-fbsd.c @@ -17,11 +17,11 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define TARGET_LITTLE_SYM bfd_elf64_alpha_freebsd_vec -#define TARGET_LITTLE_NAME "elf64-alpha-freebsd" -#define ELF_ARCH bfd_arch_alpha -#define ELF_MACHINE_CODE EM_ALPHA -#define ELF_MAXPAGESIZE 0x10000 +#define TARGET_LITTLE_SYM bfd_elf64_alpha_freebsd_vec +#define TARGET_LITTLE_NAME "elf64-alpha-freebsd" +#define ELF_ARCH bfd_arch_alpha +#define ELF_MACHINE_CODE EM_ALPHA +#define ELF_MAXPAGESIZE 0x10000 #include "bfd.h" #include "sysdep.h" @@ -43,12 +43,11 @@ elf_alpha_post_process_headers (abfd, link_info) i_ehdrp = elf_elfheader (abfd); + /* Put an ABI label supported by FreeBSD >= 4.1. */ + i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_FREEBSD; #ifdef OLD_FREEBSD_ABI_LABEL /* The ABI label supported by FreeBSD <= 4.0 is quite nonstandard. */ memcpy (&i_ehdrp->e_ident[EI_ABIVERSION], "FreeBSD", 8); -#else - /* Put an ABI label supported by FreeBSD >= 4.1. */ - i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_FREEBSD; #endif } |