From owner-p4-projects@FreeBSD.ORG Tue Jul 1 15:00:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 29E8537B404; Tue, 1 Jul 2003 15:00:48 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D100737B401 for ; Tue, 1 Jul 2003 15:00:47 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 59B9443F75 for ; Tue, 1 Jul 2003 15:00:47 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h61M0l0U057604 for ; Tue, 1 Jul 2003 15:00:47 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h61M0k7X057590 for perforce@freebsd.org; Tue, 1 Jul 2003 15:00:46 -0700 (PDT) Date: Tue, 1 Jul 2003 15:00:46 -0700 (PDT) Message-Id: <200307012200.h61M0k7X057590@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 33949 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jul 2003 22:00:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=33949 Change 33949 by peter@peter_daintree on 2003/07/01 14:59:48 revert to vendor prior to integration Affected files ... .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile.amd64#3 edit .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.amd64#4 edit Differences ... ==== //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile.amd64#3 (text+ko) ==== @@ -18,17 +18,3 @@ sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_x86_64_path} \ ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \ "${NATIVE_EMULATION}" "" ${NATIVE_EMULATION} "${TARGET_TUPLE}" - -X86_EMULATION= elf_i386_fbsd -_i386_path= \"${TOOLS_PREFIX}/usr/lib/i386\" -EMS+= ${X86_EMULATION} -LDSCRIPTS+= ${X86_EMULATION}.x ${X86_EMULATION}.xbn ${X86_EMULATION}.xn ${X86_EMULATION}.xr \ - ${X86_EMULATION}.xs ${X86_EMULATION}.xu ${X86_EMULATION}.xc ${X86_EMULATION}.xsc -SRCS+= e${X86_EMULATION}.c -CLEANFILES+= e${X86_EMULATION}.c - -e${X86_EMULATION}.c: emulparams/${X86_EMULATION}.sh emultempl/elf32.em scripttempl/elf.sc \ - genscripts.sh stringify.sed - sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_i386_path} \ - ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \ - "${X86_EMULATION}" "" ${X86_EMULATION} "${TARGET_TUPLE}" ==== //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.amd64#4 (text+ko) ==== @@ -1,22 +1,21 @@ # $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.amd64,v 1.1 2003/04/26 03:28:21 obrien Exp $ +.include "${.CURDIR}/Makefile.i386" + +# Get the i386 DEFAULT_VECTOR and VECS. +I386_VECS:= ${DEFAULT_VECTOR} ${VECS} + DEFAULT_VECTOR= bfd_elf64_x86_64_vec -VECS= bfd_elf64_x86_64_vec bfd_elf32_i386_freebsd_vec +VECS= bfd_elf64_x86_64_vec ${I386_VECS} SRCS+= elf64-amd64-fbsd.c elf64-target.h elf64-gen.c elf64.c -SRCS+= cpu-i386.c elf32-i386-fbsd.c elf32-target.h elf32.c elflink.c CLEANFILES+= elf64-target.h elf64-target.h: elfxx-target.h sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET} -CLEANFILES+= elf32-target.h - -elf32-target.h: elfxx-target.h - sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET} - CLEANFILES+= elf64-amd64-fbsd.c elf64-amd64-fbsd.c: ${.CURDIR}/elf-fbsd-brand.c ${SRCDIR}/bfd/elf64-x86-64.c