Date: Sat, 16 Nov 2002 08:59:58 +0200 From: Ruslan Ermilov <ru@FreeBSD.org> To: Peter Wemm <peter@wemm.org> 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> In-Reply-To: <20021115210723.E38B32A88D@canning.wemm.org> References: <200211151946.gAFJkfDE025786@repoman.freebsd.org> <20021115210723.E38B32A88D@canning.wemm.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Fri, Nov 15, 2002 at 01:07:23PM -0800, Peter Wemm wrote:
> Ruslan Ermilov wrote:
> > ru 2002/11/15 11:46:41 PST
> >
> > Modified files: (Branch: RELENG_4)
> > sys/boot/i386/btx/lib Makefile
> > Log:
> > MFC: 1.10.
> >
> > 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?
> >
> > (This is to restore the ability to downgrade to RELENG_4.)
>
> Actually, getobjformat(3) was supposed to go away the moment the gcc folks.
> 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?
>
This is now necessary to build a RELENG_4 kernel on 5.0-CURRENT:
%%%
Index: Makefile.alpha
===================================================================
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= -x assembler-with-cpp -DLOCORE ${CFLAGS}
-# 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= -elf
-CFLAGS+= ${FMT}
-
DEFINED_PROF= ${PROF}
.if defined(PROF)
CFLAGS+= -malign-functions=4
@@ -91,12 +85,12 @@
SYSTEM_DEP= Makefile ${SYSTEM_OBJS}
SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o config.o \
setdef1.o hack.So
-SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/conf/ldscript.$M \
+SYSTEM_LD= @${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= @${OBJCOPY} --strip-symbol gcc2_compiled. ${.TARGET} ; \
- ${SIZE} ${FMT} ${.TARGET} ; chmod 755 ${.TARGET}
+ ${SIZE} ${.TARGET} ; chmod 755 ${.TARGET}
SYSTEM_DEP+= $S/conf/ldscript.$M
%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
.ORDER: setdefs.h setdef0.c setdef1.c
Index: Makefile.i386
===================================================================
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= -x assembler-with-cpp -DLOCORE ${CFLAGS}
-# 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= -elf
-CFLAGS+= ${FMT}
-
DEFINED_PROF= ${PROF}
.if defined(PROF)
CFLAGS+= -malign-functions=4
@@ -91,11 +85,11 @@
SYSTEM_DEP= Makefile ${SYSTEM_OBJS}
SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o config.o \
setdef1.o hack.So
-SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/conf/ldscript.$M \
+SYSTEM_LD= @${LD} -Bdynamic -T $S/conf/ldscript.$M \
-export-dynamic -dynamic-linker /red/herring \
-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
SYSTEM_LD_TAIL= @${OBJCOPY} --strip-symbol gcc2_compiled. ${.TARGET} ; \
- ${SIZE} ${FMT} ${.TARGET} ; chmod 755 ${.TARGET}
+ ${SIZE} ${.TARGET} ; chmod 755 ${.TARGET}
SYSTEM_DEP+= $S/conf/ldscript.$M
%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
.ORDER: setdefs.h setdef0.c setdef1.c
Index: Makefile.pc98
===================================================================
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= -x assembler-with-cpp -DLOCORE ${CFLAGS}
-# 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= -elf
-CFLAGS+= ${FMT}
-
DEFINED_PROF= ${PROF}
.if defined(PROF)
CFLAGS+= -malign-functions=4
@@ -93,11 +87,11 @@
SYSTEM_DEP= Makefile ${SYSTEM_OBJS}
SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o config.o \
setdef1.o hack.So
-SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/conf/ldscript.$M \
+SYSTEM_LD= @${LD} -Bdynamic -T $S/conf/ldscript.$M \
-export-dynamic -dynamic-linker /red/herring \
-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
SYSTEM_LD_TAIL= @${OBJCOPY} --strip-symbol gcc2_compiled. ${.TARGET} ; \
- ${SIZE} ${FMT} ${.TARGET} ; chmod 755 ${.TARGET}
+ ${SIZE} ${.TARGET} ; chmod 755 ${.TARGET}
SYSTEM_DEP+= $S/conf/ldscript.$M
%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
.ORDER: setdefs.h setdef0.c setdef1.c
Index: files.i386
===================================================================
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
===================================================================
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
%%%
--
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
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (FreeBSD)
iD8DBQE91ezuUkv4P6juNwoRApEyAJ9S+VgOyVPWnUWmeVjA8qfvUwZoxgCZASzL
MCp0wHClzK0pRIToOCUcbzg=
=ehEH
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021116065958.GA53717>