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

[Dimitry Andric]

Author: dim
Date: Tue Oct 26 17:49:17 2010
New Revision: 214385
URL: http://svn.freebsd.org/changeset/base/214385

Log:
  Make sure elf_fbsd_post_process_headers() is actually called for ia64.
  This is done by prepending the file to elfxx-ia64, not appending it.
  
  Additionally, reduce diffs between Makefile.amd64 and Makefile.ia64;
  instead of echo'ing defines in Makefiles, just add the needed define to
  elf-fbsd-brand.c directly, as it is only used for amd64 and ia64.

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

Modified: projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/Makefile.amd64
==============================================================================
--- projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/Makefile.amd64	Tue Oct 26 17:38:45 2010	(r214384)
+++ projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/Makefile.amd64	Tue Oct 26 17:49:17 2010	(r214385)
@@ -20,14 +20,13 @@ VECS=	${DEFAULT_VECTOR} \
 	bfd_efi_app_ia32_vec \
 	${I386_VECS}
 
-CLEANFILES+=	elf64-amd64-fbsd.c pepigen.c peigen.c
+CLEANFILES+=	elf64-amd64-fbsd.c pepigen.c # peigen.c
 
-elf64-amd64-fbsd.c: ${.CURDIR}/elf-fbsd-brand.c ${SRCDIR}/bfd/elf64-x86-64.c
-	cat ${.ALLSRC:M*elf-fbsd-brand.c} > ${.TARGET}
-	echo "#define elf_backend_post_process_headers elf_fbsd_post_process_headers" \
-	    >> ${.TARGET}
-	cat ${.ALLSRC:M*elf64-x86-64.c} >> ${.TARGET}
+elf64-amd64-fbsd.c: elf-fbsd-brand.c elf64-x86-64.c
+	cat ${.ALLSRC} > ${.TARGET}
 
 pepigen.c: peXXigen.c
 	sed -e s/XX/pep/g ${.ALLSRC} > ${.TARGET}
 
+peigen.c: peXXigen.c
+	sed -e s/XX/pe/g ${.ALLSRC} > ${.TARGET}

Modified: projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/Makefile.ia64
==============================================================================
--- projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/Makefile.ia64	Tue Oct 26 17:38:45 2010	(r214384)
+++ projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/Makefile.ia64	Tue Oct 26 17:49:17 2010	(r214385)
@@ -23,8 +23,8 @@ VECS+=	${DEFAULT_VECTOR} \
 
 CLEANFILES+=	elf64-ia64.c pepigen.c # peigen.c
 
-elf64-ia64.c: elfxx-ia64.c elf-fbsd-brand.c
-	cat ${.ALLSRC} | sed -e s/NN/64/g > ${.TARGET}
+elf64-ia64.c: elf-fbsd-brand.c elfxx-ia64.c
+	sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET}
 
 pepigen.c: peXXigen.c
 	sed -e s/XX/pep/g ${.ALLSRC} > ${.TARGET}

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	Tue Oct 26 17:38:45 2010	(r214384)
+++ projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/elf-fbsd-brand.c	Tue Oct 26 17:49:17 2010	(r214385)
@@ -49,3 +49,5 @@ elf_fbsd_post_process_headers (abfd, lin
   /* 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