From owner-svn-src-projects@FreeBSD.ORG Tue Oct 26 17:49:18 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 88081106564A; Tue, 26 Oct 2010 17:49:17 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5CB4B8FC14; Tue, 26 Oct 2010 17:49:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9QHnHvf058671; Tue, 26 Oct 2010 17:49:17 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9QHnHOo058667; Tue, 26 Oct 2010 17:49:17 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201010261749.o9QHnHOo058667@svn.freebsd.org> From: Dimitry Andric Date: Tue, 26 Oct 2010 17:49:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r214385 - projects/binutils-2.17/gnu/usr.bin/binutils/libbfd X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Oct 2010 17:49:18 -0000 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