Re: buildworld failure in /usr/src/sys/boot/i386/boot2 this morning

On Tue, 17 Feb 2004, David O'Brien wrote:

> On Tue, Feb 17, 2004 at 06:28:24PM +0200, Ruslan Ermilov wrote:
> > On Tue, Feb 17, 2004 at 07:52:32AM -0800, David O'Brien wrote:
> > > Where are you headed with this?  The file works fine using straight 'as'.
> > > Why do we need to bring the C preprocessor into this?
> > >
> > Because it's being preprocessed.  Formerly it was handled by
> > AFLAGS, now it's handled by CFLAGS.  The tendency is to get
> > rid of as many custom make rules in sys/boot/ makefiles as we
> > can.  Thanks for asking.
>
> Why is getting rid of custom make rules overriding using the simplest
> tool for the job?   AFLAGS was fine, there is no need to bring the C
> preprocssor into this.

The C preprocessor was already used, using an explicit pipeline to recover
recover from the foot shooting of spelling the file name with an "s".

% Index: Makefile
% ===================================================================
% RCS file: /home/ncvs/src/sys/boot/i386/boot2/Makefile,v
% retrieving revision 1.54
% retrieving revision 1.55
% diff -u -2 -r1.54 -r1.55
% --- Makefile	9 Feb 2004 14:11:56 -0000	1.54
% +++ Makefile	17 Feb 2004 07:13:03 -0000	1.55
% _at__at_ -1,3 +1,3 _at__at_
% -# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.54 2004/02/09 14:11:56 ru Exp $
% +# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.55 2004/02/17 07:13:03 ru Exp $
%
%  FILES=		boot boot1 boot2
% _at__at_ -21,9 +21,4 _at__at_
%  #BOOT2_UFS?=	UFS1_ONLY
%
% -AFLAGS+=--defsym FLAGS=${B1FLAGS} \
% -	--defsym SIOPRT=${BOOT_COMCONSOLE_PORT} \
% -	--defsym SIOFMT=${B2SIOFMT} \
% -	--defsym SIOSPD=${BOOT_COMCONSOLE_SPEED}
% -

Special assembler flags.  The assembler is rarely used directly these
days, so the way to pass definitions to it is much less well known than
the way to pass definitions to C programs.

%  CFLAGS=	-Os \
%  	-fno-guess-branch-probability -fomit-frame-pointer\
% _at__at_ -31,4 +26,8 _at__at_
%  	-mrtd \
%  	-D${BOOT2_UFS} \
% +	-DFLAGS=${B1FLAGS} \
% +	-DSIOPRT=${BOOT_COMCONSOLE_PORT} \
% +	-DSIOFMT=${B2SIOFMT} \
% +	-DSIOSPD=${BOOT_COMCONSOLE_SPEED} \

Normal CFLAGS definitions in new version.

%  	-I${.CURDIR}/../../common \
%  	-I${.CURDIR}/../btx/lib -I. \
% _at__at_ -54,8 +53,4 _at__at_
%  boot1.out: boot1.o
%  	${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o
% -
% -boot1.o: boot1.s
% -	${CPP} ${CFLAGS} ${.CURDIR}/boot1.s | \
% -	    ${AS} ${AFLAGS} -o ${.TARGET}
  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Explicit pipeline in old version.

%
%  CLEANFILES+=	boot2 boot2.ld boot2.ldr boot2.bin boot2.out boot2.o \

Bruce