Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 2 Dec 2002 21:08:25 -0800
From:      "David O'Brien" <obrien@FreeBSD.org>
To:        Peter Wemm <peter@wemm.org>
Cc:        cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject:   Re: cvs commit: src/gnu/usr.bin/binutils/libbfd/alpha bfd.h src/gnu/usr.bin/binutils/libbfd/i386 bfd.h src/gnu/usr.bin/binutils/libbfd/ia64 bfd.h src/gnu/usr.bin/binutils/libbfd/powerpc bfd.h src/gnu/usr.bin/binutils/libbfd/sparc64 bfd.h
Message-ID:  <20021203050825.GA61322@dragon.nuxi.com>
In-Reply-To: <20021203045646.69ECB2A8A9@canning.wemm.org>
References:  <200212020949.gB29nwCi031412@repoman.freebsd.org> <20021203045646.69ECB2A8A9@canning.wemm.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Dec 02, 2002 at 08:56:46PM -0800, Peter Wemm wrote:
> >   Log:
> >   Update for the Binutils 2.13.2 20021127 snapshot import.
> >   Among other things, we don't need to redefine ELF_DYNAMIC_INTERPRETER here.

Should have added you to this email to Marcel:

Index: Makefile.ia64
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/binutils/libbfd/Makefile.ia64,v
retrieving revision 1.4
diff -u -r1.4 Makefile.ia64
--- Makefile.ia64	2 Dec 2002 09:59:05 -0000	1.4
+++ Makefile.ia64	3 Dec 2002 04:06:42 -0000
@@ -26,8 +26,7 @@
 	sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET}
 
 elf64-ia64.c: elfxx-ia64.c
-	sed -e s/NN/64/g -e 's/^.*#.*define.*ELF_DYNAMIC_INTERPRETER.*$$//g' \
-	    ${.ALLSRC} > ${.TARGET}
+	sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET}
 
 pepigen.c: peXXigen.c
 	sed -e s/XX/pep/g ${.ALLSRC} > ${.TARGET}


This patch will most likely also be needed:


Index: ld/Makefile.ia64
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/binutils/ld/Makefile.ia64,v
retrieving revision 1.4
diff -u -r1.4 Makefile.ia64
--- ld/Makefile.ia64	29 Mar 2002 00:41:01 -0000	1.4
+++ ld/Makefile.ia64	3 Dec 2002 04:24:46 -0000
@@ -3,8 +3,8 @@
 TARGET_TUPLE?=	ia64-unknown-freebsd
 
 .if ${TARGET_ARCH} == "ia64"
-NATIVE_EMULATION=	elf64_ia64
-HOST=	${TARGET_TUPLE}	# do what?? how does this work for a cross-build??
+NATIVE_EMULATION=	elf64_ia64_fbsd
+HOST=	${TARGET_TUPLE}
 CFLAGS+= -DDEFAULT_EMULATION=\"${NATIVE_EMULATION}\"
 CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
 _ia64_path=	\"${TOOLS_PREFIX}/usr/lib\"
@@ -15,11 +15,19 @@
 EMS+=		${NATIVE_EMULATION}
 LDSCRIPTS+=	${NATIVE_EMULATION}.x ${NATIVE_EMULATION}.xbn ${NATIVE_EMULATION}.xn ${NATIVE_EMULATION}.xr \
 		${NATIVE_EMULATION}.xs ${NATIVE_EMULATION}.xu ${NATIVE_EMULATION}.xc ${NATIVE_EMULATION}.xsc
+
 SRCS+=	e${NATIVE_EMULATION}.c
 CLEANFILES+=	e${NATIVE_EMULATION}.c
-
-e${NATIVE_EMULATION}.c: emulparams/${NATIVE_EMULATION}.sh emultempl/elf32.em scripttempl/elf.sc \
-    genscripts.sh stringify.sed
+e${NATIVE_EMULATION}.c: emulparams/${NATIVE_EMULATION}.sh emultempl/elf32.em \
+    scripttempl/elf.sc genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_ia64_path} \
 	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
 	    "${NATIVE_EMULATION}" "" ${NATIVE_EMULATION} "${TARGET_TUPLE}"
+
+SRCS+=	eelf64_ia64.c
+CLEANFILES+=	eelf64_ia64.c
+eelf64_ia64.c: emulparams/elf64_ia64.sh emultempl/elf32.em \
+    scripttempl/elf.sc genscripts.sh stringify.sed
+	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_ia64_path} \
+	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
+	    "elf64_ia64" "" elf64_ia64 ${TARGET_TUPLE}


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021203050825.GA61322>