From owner-cvs-all Fri Nov 15 23: 0:19 2002 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AB77837B401; Fri, 15 Nov 2002 23:00:10 -0800 (PST) Received: from whale.sunbay.crimea.ua (whale.sunbay.crimea.ua [212.110.138.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9A1C343E42; Fri, 15 Nov 2002 23:00:06 -0800 (PST) (envelope-from ru@whale.sunbay.crimea.ua) Received: from whale.sunbay.crimea.ua (ru@localhost [127.0.0.1]) by whale.sunbay.crimea.ua (8.12.6/8.12.6/Sunbay) with ESMTP id gAG7015V054595 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO); Sat, 16 Nov 2002 09:00:01 +0200 (EET) (envelope-from ru@whale.sunbay.crimea.ua) Received: (from ru@localhost) by whale.sunbay.crimea.ua (8.12.6/8.12.6/Submit) id gAG6xwgR054571; Sat, 16 Nov 2002 08:59:58 +0200 (EET) Date: Sat, 16 Nov 2002 08:59:58 +0200 From: Ruslan Ermilov To: Peter Wemm Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/boot/i386/btx/lib Makefile Message-ID: <20021116065958.GA53717@sunbay.com> References: <200211151946.gAFJkfDE025786@repoman.freebsd.org> <20021115210723.E38B32A88D@canning.wemm.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="GvXjxJ+pjyke8COw" Content-Disposition: inline In-Reply-To: <20021115210723.E38B32A88D@canning.wemm.org> User-Agent: Mutt/1.5.1i Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --GvXjxJ+pjyke8COw Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Nov 15, 2002 at 01:07:23PM -0800, Peter Wemm wrote: > Ruslan Ermilov wrote: > > ru 2002/11/15 11:46:41 PST > >=20 > > Modified files: (Branch: RELENG_4) > > sys/boot/i386/btx/lib Makefile=20 > > Log: > > MFC: 1.10. > > =20 > > The getobjformat(3) API was broken in 5.0-CURRENT -- it no longer > > deletes object format options from the argument vector. Should > > this be fixed before 5.0 is out? > > =20 > > (This is to restore the ability to downgrade to RELENG_4.) >=20 > Actually, getobjformat(3) was supposed to go away the moment the gcc folk= s. > Why does the world build care what the host environment is here? Wouldn't > this just be making it harder to upgrade from older OS's? >=20 This is now necessary to build a RELENG_4 kernel on 5.0-CURRENT: %%% Index: Makefile.alpha =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/sys/conf/Makefile.alpha,v retrieving revision 1.47.2.14 diff -u -r1.47.2.14 Makefile.alpha --- Makefile.alpha 7 Aug 2002 16:31:53 -0000 1.47.2.14 +++ Makefile.alpha 16 Nov 2002 06:58:26 -0000 @@ -57,12 +57,6 @@ # XXX LOCORE means "don't declare C stuff" not "for locore.s". ASM_CFLAGS=3D -x assembler-with-cpp -DLOCORE ${CFLAGS} =20 -# Select the correct set of tools. Can't set OBJFORMAT here because it -# doesn't get exported into the environment, and if it were exported -# then it might break building of utilities. -FMT=3D -elf -CFLAGS+=3D ${FMT} - DEFINED_PROF=3D ${PROF} .if defined(PROF) CFLAGS+=3D -malign-functions=3D4 @@ -91,12 +85,12 @@ SYSTEM_DEP=3D Makefile ${SYSTEM_OBJS} SYSTEM_OBJS=3D locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o config.o \ setdef1.o hack.So -SYSTEM_LD=3D @${LD} ${FMT} -Bdynamic -T $S/conf/ldscript.$M \ +SYSTEM_LD=3D @${LD} -Bdynamic -T $S/conf/ldscript.$M \ -e locorestart \ -export-dynamic -dynamic-linker /red/herring \ -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o SYSTEM_LD_TAIL=3D @${OBJCOPY} --strip-symbol gcc2_compiled. ${.TARGET} ; \ - ${SIZE} ${FMT} ${.TARGET} ; chmod 755 ${.TARGET} + ${SIZE} ${.TARGET} ; chmod 755 ${.TARGET} SYSTEM_DEP+=3D $S/conf/ldscript.$M =20 %BEFORE_DEPEND @@ -159,7 +153,7 @@ # in the a.out ld. For now, this works. hack.So: Makefile touch hack.c - ${CC} ${FMT} -shared -nostdlib hack.c -o hack.So + ${CC} -shared -nostdlib hack.c -o hack.So rm -f hack.c =20 .ORDER: setdefs.h setdef0.c setdef1.c Index: Makefile.i386 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/sys/conf/Makefile.i386,v retrieving revision 1.179.2.15 diff -u -r1.179.2.15 Makefile.i386 --- Makefile.i386 7 Aug 2002 16:31:53 -0000 1.179.2.15 +++ Makefile.i386 16 Nov 2002 06:58:26 -0000 @@ -57,12 +57,6 @@ # XXX LOCORE means "don't declare C stuff" not "for locore.s". ASM_CFLAGS=3D -x assembler-with-cpp -DLOCORE ${CFLAGS} =20 -# Select the correct set of tools. Can't set OBJFORMAT here because it -# doesn't get exported into the environment, and if it were exported -# then it might break building of utilities. -FMT=3D -elf -CFLAGS+=3D ${FMT} - DEFINED_PROF=3D ${PROF} .if defined(PROF) CFLAGS+=3D -malign-functions=3D4 @@ -91,11 +85,11 @@ SYSTEM_DEP=3D Makefile ${SYSTEM_OBJS} SYSTEM_OBJS=3D locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o config.o \ setdef1.o hack.So -SYSTEM_LD=3D @${LD} ${FMT} -Bdynamic -T $S/conf/ldscript.$M \ +SYSTEM_LD=3D @${LD} -Bdynamic -T $S/conf/ldscript.$M \ -export-dynamic -dynamic-linker /red/herring \ -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o SYSTEM_LD_TAIL=3D @${OBJCOPY} --strip-symbol gcc2_compiled. ${.TARGET} ; \ - ${SIZE} ${FMT} ${.TARGET} ; chmod 755 ${.TARGET} + ${SIZE} ${.TARGET} ; chmod 755 ${.TARGET} SYSTEM_DEP+=3D $S/conf/ldscript.$M =20 %BEFORE_DEPEND @@ -159,7 +153,7 @@ # in the a.out ld. For now, this works. hack.So: Makefile touch hack.c - ${CC} ${FMT} -shared -nostdlib hack.c -o hack.So + ${CC} -shared -nostdlib hack.c -o hack.So rm -f hack.c =20 .ORDER: setdefs.h setdef0.c setdef1.c Index: Makefile.pc98 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/sys/conf/Makefile.pc98,v retrieving revision 1.82.2.16 diff -u -r1.82.2.16 Makefile.pc98 --- Makefile.pc98 7 Aug 2002 16:31:53 -0000 1.82.2.16 +++ Makefile.pc98 16 Nov 2002 06:58:26 -0000 @@ -59,12 +59,6 @@ # XXX LOCORE means "don't declare C stuff" not "for locore.s". ASM_CFLAGS=3D -x assembler-with-cpp -DLOCORE ${CFLAGS} =20 -# Select the correct set of tools. Can't set OBJFORMAT here because it -# doesn't get exported into the environment, and if it were exported -# then it might break building of utilities. -FMT=3D -elf -CFLAGS+=3D ${FMT} - DEFINED_PROF=3D ${PROF} .if defined(PROF) CFLAGS+=3D -malign-functions=3D4 @@ -93,11 +87,11 @@ SYSTEM_DEP=3D Makefile ${SYSTEM_OBJS} SYSTEM_OBJS=3D locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o config.o \ setdef1.o hack.So -SYSTEM_LD=3D @${LD} ${FMT} -Bdynamic -T $S/conf/ldscript.$M \ +SYSTEM_LD=3D @${LD} -Bdynamic -T $S/conf/ldscript.$M \ -export-dynamic -dynamic-linker /red/herring \ -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o SYSTEM_LD_TAIL=3D @${OBJCOPY} --strip-symbol gcc2_compiled. ${.TARGET} ; \ - ${SIZE} ${FMT} ${.TARGET} ; chmod 755 ${.TARGET} + ${SIZE} ${.TARGET} ; chmod 755 ${.TARGET} SYSTEM_DEP+=3D $S/conf/ldscript.$M =20 %BEFORE_DEPEND @@ -161,7 +155,7 @@ # in the a.out ld. For now, this works. hack.So: Makefile touch hack.c - ${CC} ${FMT} -shared -nostdlib hack.c -o hack.So + ${CC} -shared -nostdlib hack.c -o hack.So rm -f hack.c =20 .ORDER: setdefs.h setdef0.c setdef1.c Index: files.i386 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/sys/conf/files.i386,v retrieving revision 1.307.2.35 diff -u -r1.307.2.35 files.i386 --- files.i386 5 Oct 2002 18:31:47 -0000 1.307.2.35 +++ files.i386 16 Nov 2002 06:58:26 -0000 @@ -67,8 +67,8 @@ # contrib/dev/oltr/if_oltr.c optional oltr trlld.o optional oltr \ - dependency "$S/contrib/dev/oltr/i386${FMT}.trlld.o.uu" \ - compile-with "uudecode < $S/contrib/dev/oltr/i386${FMT}.trlld.o.uu" \ + dependency "$S/contrib/dev/oltr/i386-elf.trlld.o.uu" \ + compile-with "uudecode < $S/contrib/dev/oltr/i386-elf.trlld.o.uu" \ no-implicit-rule contrib/dev/oltr/trlldbm.c optional oltr contrib/dev/oltr/trlldhm.c optional oltr Index: files.pc98 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/sys/conf/files.pc98,v retrieving revision 1.140.2.40 diff -u -r1.140.2.40 files.pc98 --- files.pc98 5 Oct 2002 18:31:47 -0000 1.140.2.40 +++ files.pc98 16 Nov 2002 06:58:26 -0000 @@ -64,8 +64,8 @@ # contrib/dev/oltr/if_oltr.c optional oltr trlld.o optional oltr \ - dependency "$S/contrib/dev/oltr/i386${FMT}.trlld.o.uu" \ - compile-with "uudecode < $S/contrib/dev/oltr/i386${FMT}.trlld.o.uu" \ + dependency "$S/contrib/dev/oltr/i386-elf.trlld.o.uu" \ + compile-with "uudecode < $S/contrib/dev/oltr/i386-elf.trlld.o.uu" \ no-implicit-rule contrib/dev/oltr/trlldbm.c optional oltr contrib/dev/oltr/trlldhm.c optional oltr %%% --=20 Ruslan Ermilov Sysadmin and DBA, ru@sunbay.com Sunbay Software AG, ru@FreeBSD.org FreeBSD committer, +380.652.512.251 Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age --GvXjxJ+pjyke8COw Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQE91ezuUkv4P6juNwoRApEyAJ9S+VgOyVPWnUWmeVjA8qfvUwZoxgCZASzL MCp0wHClzK0pRIToOCUcbzg= =ehEH -----END PGP SIGNATURE----- --GvXjxJ+pjyke8COw-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message