Switch remaining platforms to modern CPP for assembler.

This commit is contained in:
joerg 2011-01-21 15:59:04 +00:00
parent 8df353fe72
commit 19b23810a0
28 changed files with 59 additions and 71 deletions

View File

@ -1,4 +1,4 @@
$NetBSD: UPDATING,v 1.219 2011/01/17 18:11:09 joerg Exp $
$NetBSD: UPDATING,v 1.220 2011/01/21 15:59:04 joerg Exp $
This file (UPDATING) is intended to be a brief reference to recent
changes that might cause problems in the build process, and a guide for
@ -15,17 +15,11 @@ See also: BUILDING, build.sh, Makefile.
Recent changes:
^^^^^^^^^^^^^^^
20110117:
Assembler files on the following platforms no longer use -tradition-cpp:
- Alpha,
- AMD64,
- i386,
- SPARC,
- SPARC64.
This can break the build of individual parts of the tree. This is
handled correctly by build.sh. Manual builds have to update
/usr/share/mk and re-run config(1) for any kernel configurations as
needed.
20110121:
Assembler files no longer use -tradition-cpp. This can break
the build of individual parts of the tree. This is handled
correctly by build.sh. Manual builds have to update /usr/share/mk
and re-run config(1) for any kernel configurations as needed.
20101217:
The tcpdump(8) program was changed to drop privileges and chroot(2)

View File

@ -1,4 +1,4 @@
# $NetBSD: sys.mk,v 1.103 2011/01/17 18:11:10 joerg Exp $
# $NetBSD: sys.mk,v 1.104 2011/01/21 15:59:04 joerg Exp $
# @(#)sys.mk 8.2 (Berkeley) 3/21/94
unix?= We run NetBSD.
@ -15,13 +15,7 @@ AS?= as
AFLAGS?=
COMPILE.s?= ${CC} ${AFLAGS} -c
LINK.s?= ${CC} ${AFLAGS} ${LDFLAGS}
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc" || \
${MACHINE_ARCH} == "sparc64"
_ASM_TRADITIONAL_CPP= -x assembler-with-cpp
.else
_ASM_TRADITIONAL_CPP= -traditional-cpp
.endif
COMPILE.S?= ${CC} ${AFLAGS} ${CPPFLAGS} ${_ASM_TRADITIONAL_CPP} -c
LINK.S?= ${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.acorn26,v 1.10 2008/02/13 23:37:17 joerg Exp $
# $NetBSD: Makefile.acorn26,v 1.11 2011/01/21 15:59:04 joerg Exp $
# Makefile for NetBSD
#
@ -36,7 +36,7 @@ CWARNFLAGS+= -Wcomment
# We'd like GCC to leave R14 alone as much as possible (so page faults in the
# kernel are safer).
CFLAGS+= -ffixed-r14 -mapcs-frame -fno-omit-frame-pointer
AFLAGS+= -x assembler-with-cpp -traditional-cpp
AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.amiga,v 1.106 2009/01/25 22:25:08 abs Exp $
# $NetBSD: Makefile.amiga,v 1.107 2011/01/21 15:59:05 joerg Exp $
# Makefile for NetBSD
#
@ -37,7 +37,7 @@ CPPFLAGS+= -Damiga -DFPCOPROC
CMACHFLAGS+= -Wa,-m68030 -Wa,-m68851
.endif
CFLAGS+= ${CMACHFLAGS} -msoft-float
AFLAGS+= -x assembler-with-cpp -traditional-cpp
AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.9 2010/05/27 06:58:12 dholland Exp $
# $NetBSD: Makefile,v 1.10 2011/01/21 15:59:05 joerg Exp $
.include <bsd.own.mk>
.include <bsd.sys.mk> # for ${HOST_SH}
@ -21,7 +21,7 @@ LIBC=
LIBCRTBEGIN=
LIBCRTEND=
AFLAGS= -x assembler-with-cpp -traditional-cpp -mno-abicalls -mips2
AFLAGS= -x assembler-with-cpp -mno-abicalls -mips2
AFLAGS+= -D_LOCORE -D_KERNEL
CFLAGS= -Os -mmemcpy -G 1024
CFLAGS+= -ffreestanding -mno-abicalls -msoft-float -mips2

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.atari,v 1.74 2009/10/19 13:40:28 tsutsui Exp $
# $NetBSD: Makefile.atari,v 1.75 2011/01/21 15:59:05 joerg Exp $
# Makefile for NetBSD
#
@ -32,7 +32,7 @@ CPPFLAGS+= -Datari
CMACHFLAGS+= -Wa,-m68030
.endif
CFLAGS+= ${CMACHFLAGS} -msoft-float
AFLAGS+= -x assembler-with-cpp -traditional-cpp
AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.29 2010/10/14 06:58:22 kiyohara Exp $
# $NetBSD: Makefile,v 1.30 2011/01/21 15:59:05 joerg Exp $
NOMAN= # defined
@ -27,7 +27,7 @@ SRCS+= pci.c prf.c sd.c siop.c tgets.c vers.c vga.c video.c vreset.c wdc.c wd.c
SRCS+= setjmp.S
CFLAGS= -Wno-main -ffreestanding
AFLAGS= -x assembler-with-cpp -traditional-cpp
AFLAGS= -x assembler-with-cpp
CPPFLAGS= -nostdinc
CPPFLAGS+= -I${.OBJDIR} -I${S} -I${COMMONLIBDIR}/include -I${S}/lib/libsa

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.cesfic,v 1.15 2006/09/01 13:07:51 matt Exp $
# $NetBSD: Makefile.cesfic,v 1.16 2011/01/21 15:59:05 joerg Exp $
# Makefile for NetBSD
#
@ -34,7 +34,7 @@ GENASSYM_CONF= ${CESFIC}/cesfic/genassym.cf
CPPFLAGS+= -Dcesfic
CWARNFLAGS+= -Wno-format
CFLAGS+= -msoft-float
AFLAGS+= -x assembler-with-cpp -traditional-cpp
AFLAGS+= -x assembler-with-cpp
AFLAGS+= -Wa,-m68040 -Wa,-m68030 -Wa,-m68851
##

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.hp300,v 1.87 2005/12/11 12:17:13 christos Exp $
# $NetBSD: Makefile.hp300,v 1.88 2011/01/21 15:59:06 joerg Exp $
# Makefile for NetBSD
#
@ -33,7 +33,7 @@ GENASSYM_CONF= ${HP300}/hp300/genassym.cf
##
CPPFLAGS+= -Dhp300
CFLAGS+= -msoft-float
AFLAGS+= -x assembler-with-cpp -traditional-cpp
AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.9 2006/06/02 19:46:24 mrg Exp $
# $NetBSD: Makefile,v 1.10 2011/01/21 15:59:06 joerg Exp $
.include <bsd.own.mk>
ROMICE?= no
@ -27,7 +27,7 @@ COPTS=
DBG=
AFLAGS+= -D_LOCORE -D_KERNEL
AFLAGS+= -x assembler-with-cpp -traditional-cpp -mips2 -mno-abicalls
AFLAGS+= -x assembler-with-cpp -mips2 -mno-abicalls
INCLUDES= -I${.OBJDIR} -I${S} -I${S}/arch
CPPFLAGS+= ${INCLUDES} -nostdinc -D_STANDALONE -DHEAP_LIMIT=0x8002ffff
CFLAGS+= -mips2 -EL -mno-abicalls -ffreestanding -mmemcpy

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.luna68k,v 1.19 2008/02/19 14:38:14 joerg Exp $
# $NetBSD: Makefile.luna68k,v 1.20 2011/01/21 15:59:06 joerg Exp $
# Makefile for NetBSD
#
@ -32,7 +32,7 @@ GENASSYM_CONF= ${LUNA68K}/luna68k/genassym.cf
##
CPPFLAGS+= -Dluna68k
CFLAGS+= -msoft-float
AFLAGS+= -x assembler-with-cpp -traditional-cpp
AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.mac68k,v 1.89 2008/02/18 14:01:17 joerg Exp $
# $NetBSD: Makefile.mac68k,v 1.90 2011/01/21 15:59:07 joerg Exp $
# Makefile for NetBSD
#
@ -33,7 +33,7 @@ GENASSYM_CONF= ${MAC68K}/mac68k/genassym.cf
##
CPPFLAGS+= -Dmac68k
CFLAGS+= -msoft-float
AFLAGS+= -x assembler-with-cpp -traditional-cpp
AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.mips,v 1.55 2009/12/14 00:46:04 matt Exp $
# $NetBSD: Makefile.mips,v 1.56 2011/01/21 15:59:07 joerg Exp $
# Makefile for NetBSD
#
@ -67,7 +67,7 @@ SYSTEM_LD_TAIL_EXTRA+= \
${OBJCOPY} -O elf32-nlittlemips $@ $@.elf32
.endif
.endif # LP64=yes
AFLAGS+= -mno-abicalls -x assembler-with-cpp -traditional-cpp ${AOPTS}
AFLAGS+= -mno-abicalls -x assembler-with-cpp ${AOPTS}
##
## (3) libkern and compat

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.8 2009/11/29 23:46:41 pooka Exp $
# $NetBSD: Makefile.inc,v 1.9 2011/01/21 15:59:07 joerg Exp $
CFLAGS+= -G 0 -ffixed-23
@ -12,4 +12,4 @@ AFLAGS+= -mno-abicalls
CFLAGS+= -msym32
.endif
AFLAGS+= -x assembler-with-cpp -traditional-cpp ${AOPTS}
AFLAGS+= -x assembler-with-cpp ${AOPTS}

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.mvme68k,v 1.61 2008/02/18 14:11:48 joerg Exp $
# $NetBSD: Makefile.mvme68k,v 1.62 2011/01/21 15:59:07 joerg Exp $
# Makefile for NetBSD
#
@ -46,7 +46,7 @@ CMACHFLAGS= -m68020-60 -Wa,-m68030 -Wa,-m68851
.endif
.endif
CFLAGS+= ${CMACHFLAGS} -msoft-float
AFLAGS+= -x assembler-with-cpp -traditional-cpp
AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat

View File

@ -1,7 +1,7 @@
# from: @(#)Makefile 8.1 (Berkeley) 6/10/93
# $NetBSD: Makefile,v 1.9 2011/01/02 05:30:12 tsutsui Exp $
# $NetBSD: Makefile,v 1.10 2011/01/21 15:59:07 joerg Exp $
COMPILE.S= $(CC) -x assembler-with-cpp -traditional-cpp \
COMPILE.S= $(CC) -x assembler-with-cpp \
$(ASFLAGS) $(CPPFLAGS) $(INCPATH) -c -o $*.o
SRCS= bootxx.c conf.c block_x.S

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.15 2009/12/06 13:31:16 tsutsui Exp $
# $NetBSD: Makefile,v 1.16 2011/01/21 15:59:08 joerg Exp $
LIB=bug
@ -22,7 +22,7 @@ libinstall::
# separate rule for bugstart.c
# this is build separately from rest of libbug
bugstart.o: bugstart.s
${CC} -x assembler-with-cpp -traditional-cpp -nostdinc ${INCPATH} \
${CC} -x assembler-with-cpp -nostdinc ${INCPATH} \
-D_STANDALONE -c ${.IMPSRC}
all realall: lib${LIB}.a

View File

@ -1,11 +1,11 @@
# $NetBSD: Makefile,v 1.13 2002/04/09 19:37:22 scw Exp $
# $NetBSD: Makefile,v 1.14 2011/01/21 15:59:08 joerg Exp $
#
# sboot would like a newer GNU ld because it can generate S-Records.
# Until then, we convert.
#
COMPILE.s= $(CC) -x assembler-with-cpp -traditional-cpp \
COMPILE.s= $(CC) -x assembler-with-cpp \
$(ASFLAGS) $(CPPFLAGS) $(INCPATH) -c -o $*.o
RELOC= 0x4000

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.news68k,v 1.19 2008/03/01 14:00:30 joerg Exp $
# $NetBSD: Makefile.news68k,v 1.20 2011/01/21 15:59:08 joerg Exp $
#
# Makefile for NetBSD
#
@ -36,7 +36,7 @@ GENASSYM_CONF= ${NEWS68K}/news68k/genassym.cf
##
CPPFLAGS+= -Dnews68k
CFLAGS+= -msoft-float
AFLAGS+= -x assembler-with-cpp -traditional-cpp
AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.next68k,v 1.29 2008/02/14 00:09:36 joerg Exp $
# $NetBSD: Makefile.next68k,v 1.30 2011/01/21 15:59:08 joerg Exp $
# Makefile for NetBSD
#
@ -33,7 +33,7 @@ GENASSYM_CONF= ${NEXT68K}/next68k/genassym.cf
##
CPPFLAGS+= -Dnext68k
CFLAGS+= -msoft-float
AFLAGS+= -x assembler-with-cpp -traditional-cpp
AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.23 2009/01/12 07:51:02 tsutsui Exp $
# $NetBSD: Makefile,v 1.24 2011/01/21 15:59:08 joerg Exp $
NOMAN= # defined
@ -25,7 +25,7 @@ SRCS+= kbd.c ns16550.c vers.c vreset.c vga.c
CFLAGS= -Os -mmultiple -ffreestanding
CFLAGS+= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes
AFLAGS= -x assembler-with-cpp -traditional-cpp
AFLAGS= -x assembler-with-cpp
CPPFLAGS= -nostdinc -I${.OBJDIR} -I${MKBOOTIMAGE} -I${S}
CPPFLAGS+= -D_STANDALONE -DRELOC=${RELOC} -DUSE_SCAN

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.2 2009/01/12 07:16:17 tsutsui Exp $
# $NetBSD: Makefile,v 1.3 2011/01/21 15:59:09 joerg Exp $
NOMAN= # defined
@ -26,7 +26,7 @@ SRCS+= iplcb.c
CFLAGS= -Os -mmultiple -ffreestanding
CFLAGS+= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes
AFLAGS= -x assembler-with-cpp -traditional-cpp
AFLAGS= -x assembler-with-cpp
CPPFLAGS= -nostdinc -I${.OBJDIR} -I${MKBOOTIMAGE} -I${S}
CPPFLAGS+= -D_STANDALONE -DRELOC=${RELOC} -DUSE_SCAN

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.sh3,v 1.26 2008/05/06 02:25:19 uwe Exp $
# $NetBSD: Makefile.sh3,v 1.27 2011/01/21 15:59:09 joerg Exp $
# Makefile for NetBSD
#
@ -33,7 +33,7 @@ GENASSYM_CONF= ${SH3}/sh3/genassym.cf
## (2) compile settings
##
CPPFLAGS+= -D${MACHINE}
AFLAGS+= -x assembler-with-cpp -traditional-cpp
AFLAGS+= -x assembler-with-cpp
# -O2 is too -falign-* zealous for low-memory sh3 machines
COPTS?= -Os -freorder-blocks

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.sun2,v 1.19 2008/01/22 15:24:50 joerg Exp $
# $NetBSD: Makefile.sun2,v 1.20 2011/01/21 15:59:09 joerg Exp $
# Makefile for NetBSD
#
@ -33,7 +33,7 @@ GENASSYM_CONF= ${SUN2}/sun2/genassym.cf
##
CPPFLAGS+= -Dsun2
CFLAGS+= -msoft-float -fno-defer-pop
AFLAGS+= -x assembler-with-cpp -traditional-cpp
AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.sun3,v 1.100 2008/02/19 14:31:40 joerg Exp $
# $NetBSD: Makefile.sun3,v 1.101 2011/01/21 15:59:09 joerg Exp $
# Makefile for NetBSD
#
@ -33,7 +33,7 @@ GENASSYM_CONF= ${SUN3}/${MACHTYPE}/genassym.cf
##
CPPFLAGS+= -Dsun3
CFLAGS+= ${CMACHFLAGS} -msoft-float -fno-defer-pop
AFLAGS+= -x assembler-with-cpp -traditional-cpp
AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.usermode,v 1.3 2007/12/29 17:48:23 jmcneill Exp $
# $NetBSD: Makefile.usermode,v 1.4 2011/01/21 15:59:09 joerg Exp $
MACHINE_ARCH= usermode
USETOOLS?= no
@ -19,7 +19,7 @@ GENASSYM_CONF= ${USERMODE}/usermode/genassym.cf
DEFCOPTS= -O2
CPPFLAGS+= -Dusermode -Dmalloc=kernmalloc -Dfree=kernfree
CPPFLAGS.init_main.c+= -Dmain=kernmain
AFLAGS+= -x assembler-with-cpp -traditional-cpp
AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.vax,v 1.80 2008/03/01 13:59:56 joerg Exp $
# $NetBSD: Makefile.vax,v 1.81 2011/01/21 15:59:10 joerg Exp $
# Makefile for NetBSD
#
@ -32,7 +32,7 @@ GENASSYM_CONF= ${VAX}/vax/genassym.cf
## (2) compile settings
##
CPPFLAGS+= -D_VAX_INLINE_
AFLAGS+= -x assembler-with-cpp -traditional-cpp -fno-pic
AFLAGS+= -x assembler-with-cpp -fno-pic
CFLAGS+= -fno-pic
##

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.x68k,v 1.61 2008/02/12 18:26:48 joerg Exp $
# $NetBSD: Makefile.x68k,v 1.62 2011/01/21 15:59:10 joerg Exp $
#
# Makefile for NetBSD
#
@ -32,7 +32,7 @@ GENASSYM_CONF= ${X68K}/x68k/genassym.cf
## (2) compile settings
##
CPPFLAGS+= -Dx68k
AFLAGS+= -x assembler-with-cpp -traditional-cpp
AFLAGS+= -x assembler-with-cpp
CMACHFLAGS?= -m68020-60 -Wa,-m68030 -Wa,-m68851
CFLAGS+= ${CMACHFLAGS} -msoft-float