PERFORCE change 130198 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=130198

Change 130198 by jb at jb_freebsd1 on 2007/12/04 21:12:10

	Rehash build.

Affected files ...

.. //depot/projects/binutils/src/gnu/usr.bin/binutils/libbfd/Makefile#4 edit
.. //depot/projects/binutils/src/gnu/usr.bin/binutils/libbfd/Makefile.amd64#2 edit
.. //depot/projects/binutils/src/gnu/usr.bin/binutils/libbfd/Makefile.i386#2 edit

Differences ...

==== //depot/projects/binutils/src/gnu/usr.bin/binutils/libbfd/Makefile#4 (text+ko) ====

@@ -5,12 +5,46 @@
 .PATH: ${SRCDIR}/bfd ${SRCDIR}/opcodes
 
 LIB=	bfd
-SRCS+=	archive.c archive64.c archures.c bfd.c bfdwin.c binary.c cache.c \
-	coffgen.c corefile.c elf.c elf-attrs.c elf-eh-frame.c elf-strtab.c \
-	elf-vxworks.c format.c \
-	hash.c ihex.c init.c libbfd.c linker.c merge.c opncls.c reloc.c \
-	section.c srec.c stab-syms.c stabs.c syms.c targets.c tekhex.c \
-	targmatch.h dwarf1.c dwarf2.c config.h bfdver.h bfdio.c simple.c
+SRCS+=	archive.c	\
+	archive64.c	\
+	archures.c	\
+	bfd.c		\
+	bfdio.c		\
+	bfdver.h	\
+	bfdwin.c	\
+	binary.c	\
+	cache.c		\
+	coffgen.c	\
+	config.h	\
+	corefile.c	\
+	dwarf1.c	\
+	dwarf2.c	\
+	elf-attrs.c	\
+	elf-eh-frame.c	\
+	elf-strtab.c	\
+	elf-vxworks.c	\
+	elf.c		\
+	format.c	\
+	hash.c		\
+	ihex.c		\
+	init.c		\
+	libbfd.c	\
+	linker.c	\
+	merge.c		\
+	opncls.c	\
+	peigen.c	\
+	pepigen.c	\
+	pex64igen.c	\
+	reloc.c		\
+	section.c	\
+	simple.c	\
+	srec.c		\
+	stab-syms.c	\
+	stabs.c		\
+	syms.c		\
+	targets.c	\
+	targmatch.h	\
+	tekhex.c
 WARNS?=	0
 .if (${TARGET_ARCH} == "alpha" || ${TARGET_ARCH} == "ia64" || \
     ${TARGET_ARCH} == "sparc64")
@@ -18,7 +52,6 @@
 .endif
 CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${SRCDIR}/bfd
-CFLAGS+= -I${.CURDIR}/../libintl
 INTERNALLIB=
 CLEANFILES+=	bfdver.h config.h targmatch.h
 
@@ -56,6 +89,7 @@
 	echo '#define BFD_VERSION	218000000'	> ${.TARGET}
 	echo '#define BFD_VERSION_DATE	20070828'	>> ${.TARGET}
 	echo '#define BFD_VERSION_STRING ${VERSION}'	>> ${.TARGET}
+	echo '#define REPORT_BUGS_TO "<http://www.sourceware.org/bugzilla/>"' >> ${.TARGET}
 
 targmatch.h: targmatch.sed config.bfd
 	sed -f ${.ALLSRC:M*.sed} ${.ALLSRC:M*.bfd} > ${.TARGET}
@@ -67,11 +101,20 @@
 	sed -e 's,!!TRAD_HEADER!!,,g' ${.ALLSRC} > ${.TARGET}
 .endif
 
-CLEANFILES+=	elf32-target.h elf64-target.h
+CLEANFILES+=	elf32-target.h elf64-target.h peigen.c pepigen.c pex64igen.c
 elf32-target.h: elfxx-target.h
 	sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET}
 
 elf64-target.h: elfxx-target.h
 	sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET}
 
+peigen.c: peXXigen.c
+	sed -e s/XX/pe/g < ${.ALLSRC} > ${.TARGET}
+
+pepigen.c: peXXigen.c
+	sed -e s/XX/pep/g < ${.ALLSRC} > ${.TARGET}
+
+pex64igen.c: peXXigen.c
+	sed -e s/XX/pex64/g < ${.ALLSRC} > ${.TARGET}
+
 .include <bsd.lib.mk>

==== //depot/projects/binutils/src/gnu/usr.bin/binutils/libbfd/Makefile.amd64#2 (text+ko) ====

@@ -2,23 +2,17 @@
 
 .include "${.CURDIR}/Makefile.i386"
 
-#	Get the i386 DEFAULT_VECTOR and VECS.
-I386_VECS:=	${DEFAULT_VECTOR} # ${VECS}
+DEFAULT_VECTOR=	bfd_elf64_x86_64_freebsd_vec
 
-DEFAULT_VECTOR=	bfd_elf64_x86_64_vec
-
-SRCS+=	elf64-amd64-fbsd.c \
-	elf64.c \
-	elf64-gen.c \
+SRCS+=	efi-app-x86_64.c	\
+	elf64-x86-64.c		\
+	elf64.c			\
+	elf64-gen.c		\
 	elf64-target.h
 
-VECS=	bfd_elf64_x86_64_vec \
-	${I386_VECS}
-
-CLEANFILES+=	elf64-amd64-fbsd.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}
+VECS=	${I386_VECS}			\
+	bfd_elf64_x86_64_freebsd_vec	\
+	bfd_elf64_x86_64_vec		\
+	bfd_efi_app_x86_64_vec		\
+	bfd_elf64_little_generic_vec	\
+	bfd_elf64_big_generic_vec

==== //depot/projects/binutils/src/gnu/usr.bin/binutils/libbfd/Makefile.i386#2 (text+ko) ====

@@ -2,11 +2,22 @@
 
 DEFAULT_VECTOR=	bfd_elf32_i386_freebsd_vec
 
-SRCS+=	cpu-i386.c \
-	elf32-i386.c \
-	elf32-target.h \
-	elf32.c \
+SRCS+=	coff-i386.c	\
+	cofflink.c	\
+	cpu-i386.c	\
+	efi-app-ia32.c	\
+	elf32-i386.c	\
+	elf32-gen.c	\
+	elf32-target.h	\
+	elf32.c		\
 	elflink.c
 
-VECS=	${DEFAULT_VECTOR} \
-	bfd_elf32_i386_vec
+I386_VECS=				\
+	bfd_elf32_i386_freebsd_vec	\
+	bfd_elf32_i386_vec		\
+	bfd_efi_app_ia32_vec		\
+	bfd_elf32_i386_vec		\
+	bfd_elf32_little_generic_vec	\
+	bfd_elf32_big_generic_vec
+
+VECS=	${I386_VECS}