svn commit: r214750 - projects/binutils-2.17/gnu/usr.bin/binutils/libbfd

[Dimitry Andric]

Author: dim
Date: Wed Nov  3 16:39:55 2010
New Revision: 214750
URL: http://svn.freebsd.org/changeset/base/214750

Log:
  Simply our custom OSABI branding 'stub'.  It is presently still needed
  for ia64, but I will integrate it into contrib/binutils/bfd/elfxx-ia64.c
  later on, after which it can be removed entirely.

Modified:
  projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/elf-fbsd-brand.c

Modified: projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/elf-fbsd-brand.c
==============================================================================
--- projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/elf-fbsd-brand.c	Wed Nov  3 16:21:47 2010	(r214749)
+++ projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/elf-fbsd-brand.c	Wed Nov  3 16:39:55 2010	(r214750)
@@ -26,28 +26,5 @@
  * $FreeBSD$
  */
 
-#include "bfd.h"
-#include "sysdep.h"
-#include "elf-bfd.h"
-
-/* The kernel recognizes executables as valid only if they carry a
-   "FreeBSD" label in the ELF header.  So we put this label on all
-   executables and (for simplicity) also all other object files.  */
-
-static void elf_fbsd_post_process_headers
-  PARAMS ((bfd *, struct bfd_link_info *));
-
-static void
-elf_fbsd_post_process_headers (abfd, link_info)
-     bfd * abfd;
-     struct bfd_link_info * link_info ATTRIBUTE_UNUSED;
-{
-  Elf_Internal_Ehdr * i_ehdrp;	/* ELF file header, internal form.  */
-
-  i_ehdrp = elf_elfheader (abfd);
-
-  /* Put an ABI label supported by FreeBSD >= 4.1.  */
-  i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_FREEBSD;
-}
-
-#define elf_backend_post_process_headers elf_fbsd_post_process_headers
+#define ELF_OSABI				ELFOSABI_FREEBSD
+#define elf_backend_post_process_headers	_bfd_elf_set_osabi