diff options
| author | peter <peter@FreeBSD.org> | 1996-05-31 01:01:24 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1996-05-31 01:01:24 +0000 |
| commit | dbd9016f481c32476de013292a70a785b52c3279 (patch) | |
| tree | 384007db679997e3dae438c9f583d6ffdc2cd951 /sys/conf | |
| parent | 11d90f0f2a72692d3d23245ab1c6caf46b781fd7 (diff) | |
| download | FreeBSD-src-dbd9016f481c32476de013292a70a785b52c3279.zip FreeBSD-src-dbd9016f481c32476de013292a70a785b52c3279.tar.gz | |
Instead of: cpp blah file.s | as -o file.o, use instead:
cc -c -x assembler-with-cpp -o file.o file.s.
This means that any cpp fatal errors will now be detected, as well as
running *.s files through an ansi cpp instead of a traditional cpp.
(fixes to allow *.s to compile under both ansi and traditional to follow)
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/Makefile.i386 | 8 | ||||
| -rw-r--r-- | sys/conf/Makefile.powerpc | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index 9c5ffd6..c4aaf99 100644 --- a/sys/conf/Makefile.i386 +++ b/sys/conf/Makefile.i386 @@ -1,6 +1,6 @@ # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.81 1996/05/02 21:40:50 joerg Exp $ +# $Id: Makefile.i386,v 1.82 1996/05/07 23:19:46 wosch Exp $ # # Makefile for FreeBSD # @@ -45,18 +45,16 @@ INCLUDES+= -I$S/../include INCLUDES+= -I/usr/include .endif COPTS= ${INCLUDES} ${IDENT} -DKERNEL -ASFLAGS= CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} LOAD_ADDRESS?= F0100000 NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} $< NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $< -# XXX errors leak out of all the pipes. Should use cc *.S. # XXX LOCORE means "don't declare C stuff" not "for locore.s". -NORMAL_S= ${CPP} -DLOCORE ${COPTS} $< | ${AS} ${ASFLAGS} -o $*.o +NORMAL_S= ${CC} -c -x assembler-with-cpp -DLOCORE ${COPTS} $< DRIVER_C= ${CC} -c ${CFLAGS} ${PROF} $< DRIVER_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $< -DRIVER_S= ${CPP} -DLOCORE ${COPTS} $< | ${AS} ${ASFLAGS} -o $*.o +DRIVER_S= ${CC} -c -x assembler-with-cpp -DLOCORE ${COPTS} $< PROFILE_C= ${CC} -c ${CFLAGS} ${PARAM} $< SYSTEM_CFILES= ioconf.c param.c vnode_if.c diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc index 9c5ffd6..c4aaf99 100644 --- a/sys/conf/Makefile.powerpc +++ b/sys/conf/Makefile.powerpc @@ -1,6 +1,6 @@ # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.81 1996/05/02 21:40:50 joerg Exp $ +# $Id: Makefile.i386,v 1.82 1996/05/07 23:19:46 wosch Exp $ # # Makefile for FreeBSD # @@ -45,18 +45,16 @@ INCLUDES+= -I$S/../include INCLUDES+= -I/usr/include .endif COPTS= ${INCLUDES} ${IDENT} -DKERNEL -ASFLAGS= CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} LOAD_ADDRESS?= F0100000 NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} $< NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $< -# XXX errors leak out of all the pipes. Should use cc *.S. # XXX LOCORE means "don't declare C stuff" not "for locore.s". -NORMAL_S= ${CPP} -DLOCORE ${COPTS} $< | ${AS} ${ASFLAGS} -o $*.o +NORMAL_S= ${CC} -c -x assembler-with-cpp -DLOCORE ${COPTS} $< DRIVER_C= ${CC} -c ${CFLAGS} ${PROF} $< DRIVER_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $< -DRIVER_S= ${CPP} -DLOCORE ${COPTS} $< | ${AS} ${ASFLAGS} -o $*.o +DRIVER_S= ${CC} -c -x assembler-with-cpp -DLOCORE ${COPTS} $< PROFILE_C= ${CC} -c ${CFLAGS} ${PARAM} $< SYSTEM_CFILES= ioconf.c param.c vnode_if.c |
