Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Switch remaining platforms to modern CPP for assembler.
details: https://anonhg.NetBSD.org/src/rev/cdb4a0e6f845
branches: trunk
changeset: 761232:cdb4a0e6f845
user: joerg <joerg%NetBSD.org@localhost>
date: Fri Jan 21 15:59:04 2011 +0000
description:
Switch remaining platforms to modern CPP for assembler.
diffstat:
UPDATING | 18 ++++++------------
share/mk/sys.mk | 8 +-------
sys/arch/acorn26/conf/Makefile.acorn26 | 4 ++--
sys/arch/amiga/conf/Makefile.amiga | 4 ++--
sys/arch/arc/stand/boot/Makefile | 4 ++--
sys/arch/atari/conf/Makefile.atari | 4 ++--
sys/arch/bebox/stand/boot/Makefile | 4 ++--
sys/arch/cesfic/conf/Makefile.cesfic | 4 ++--
sys/arch/hp300/conf/Makefile.hp300 | 4 ++--
sys/arch/hpcmips/stand/lcboot/Makefile | 4 ++--
sys/arch/luna68k/conf/Makefile.luna68k | 4 ++--
sys/arch/mac68k/conf/Makefile.mac68k | 4 ++--
sys/arch/mips/conf/Makefile.mips | 4 ++--
sys/arch/mips/include/Makefile.inc | 4 ++--
sys/arch/mvme68k/conf/Makefile.mvme68k | 4 ++--
sys/arch/mvme68k/stand/bootxx/Makefile | 4 ++--
sys/arch/mvme68k/stand/libbug/Makefile | 4 ++--
sys/arch/mvme68k/stand/sboot/Makefile | 4 ++--
sys/arch/news68k/conf/Makefile.news68k | 4 ++--
sys/arch/next68k/conf/Makefile.next68k | 4 ++--
sys/arch/prep/stand/boot/Makefile | 4 ++--
sys/arch/rs6000/stand/boot/Makefile | 4 ++--
sys/arch/sh3/conf/Makefile.sh3 | 4 ++--
sys/arch/sun2/conf/Makefile.sun2 | 4 ++--
sys/arch/sun3/conf/Makefile.sun3 | 4 ++--
sys/arch/usermode/conf/Makefile.usermode | 4 ++--
sys/arch/vax/conf/Makefile.vax | 4 ++--
sys/arch/x68k/conf/Makefile.x68k | 4 ++--
28 files changed, 59 insertions(+), 71 deletions(-)
diffs (truncated from 514 to 300 lines):
diff -r 44dd41740640 -r cdb4a0e6f845 UPDATING
--- a/UPDATING Fri Jan 21 13:11:32 2011 +0000
+++ b/UPDATING Fri Jan 21 15:59:04 2011 +0000
@@ -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 @@
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)
diff -r 44dd41740640 -r cdb4a0e6f845 share/mk/sys.mk
--- a/share/mk/sys.mk Fri Jan 21 13:11:32 2011 +0000
+++ b/share/mk/sys.mk Fri Jan 21 15:59:04 2011 +0000
@@ -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 @@
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}
diff -r 44dd41740640 -r cdb4a0e6f845 sys/arch/acorn26/conf/Makefile.acorn26
--- a/sys/arch/acorn26/conf/Makefile.acorn26 Fri Jan 21 13:11:32 2011 +0000
+++ b/sys/arch/acorn26/conf/Makefile.acorn26 Fri Jan 21 15:59:04 2011 +0000
@@ -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 @@
# 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
diff -r 44dd41740640 -r cdb4a0e6f845 sys/arch/amiga/conf/Makefile.amiga
--- a/sys/arch/amiga/conf/Makefile.amiga Fri Jan 21 13:11:32 2011 +0000
+++ b/sys/arch/amiga/conf/Makefile.amiga Fri Jan 21 15:59:04 2011 +0000
@@ -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 @@
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
diff -r 44dd41740640 -r cdb4a0e6f845 sys/arch/arc/stand/boot/Makefile
--- a/sys/arch/arc/stand/boot/Makefile Fri Jan 21 13:11:32 2011 +0000
+++ b/sys/arch/arc/stand/boot/Makefile Fri Jan 21 15:59:04 2011 +0000
@@ -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 @@
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
diff -r 44dd41740640 -r cdb4a0e6f845 sys/arch/atari/conf/Makefile.atari
--- a/sys/arch/atari/conf/Makefile.atari Fri Jan 21 13:11:32 2011 +0000
+++ b/sys/arch/atari/conf/Makefile.atari Fri Jan 21 15:59:04 2011 +0000
@@ -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 @@
CMACHFLAGS+= -Wa,-m68030
.endif
CFLAGS+= ${CMACHFLAGS} -msoft-float
-AFLAGS+= -x assembler-with-cpp -traditional-cpp
+AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
diff -r 44dd41740640 -r cdb4a0e6f845 sys/arch/bebox/stand/boot/Makefile
--- a/sys/arch/bebox/stand/boot/Makefile Fri Jan 21 13:11:32 2011 +0000
+++ b/sys/arch/bebox/stand/boot/Makefile Fri Jan 21 15:59:04 2011 +0000
@@ -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+= 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
diff -r 44dd41740640 -r cdb4a0e6f845 sys/arch/cesfic/conf/Makefile.cesfic
--- a/sys/arch/cesfic/conf/Makefile.cesfic Fri Jan 21 13:11:32 2011 +0000
+++ b/sys/arch/cesfic/conf/Makefile.cesfic Fri Jan 21 15:59:04 2011 +0000
@@ -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 @@
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
##
diff -r 44dd41740640 -r cdb4a0e6f845 sys/arch/hp300/conf/Makefile.hp300
--- a/sys/arch/hp300/conf/Makefile.hp300 Fri Jan 21 13:11:32 2011 +0000
+++ b/sys/arch/hp300/conf/Makefile.hp300 Fri Jan 21 15:59:04 2011 +0000
@@ -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 @@
##
CPPFLAGS+= -Dhp300
CFLAGS+= -msoft-float
-AFLAGS+= -x assembler-with-cpp -traditional-cpp
+AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
diff -r 44dd41740640 -r cdb4a0e6f845 sys/arch/hpcmips/stand/lcboot/Makefile
--- a/sys/arch/hpcmips/stand/lcboot/Makefile Fri Jan 21 13:11:32 2011 +0000
+++ b/sys/arch/hpcmips/stand/lcboot/Makefile Fri Jan 21 15:59:04 2011 +0000
@@ -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 @@
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
diff -r 44dd41740640 -r cdb4a0e6f845 sys/arch/luna68k/conf/Makefile.luna68k
--- a/sys/arch/luna68k/conf/Makefile.luna68k Fri Jan 21 13:11:32 2011 +0000
+++ b/sys/arch/luna68k/conf/Makefile.luna68k Fri Jan 21 15:59:04 2011 +0000
@@ -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 @@
##
CPPFLAGS+= -Dluna68k
CFLAGS+= -msoft-float
-AFLAGS+= -x assembler-with-cpp -traditional-cpp
+AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
diff -r 44dd41740640 -r cdb4a0e6f845 sys/arch/mac68k/conf/Makefile.mac68k
--- a/sys/arch/mac68k/conf/Makefile.mac68k Fri Jan 21 13:11:32 2011 +0000
+++ b/sys/arch/mac68k/conf/Makefile.mac68k Fri Jan 21 15:59:04 2011 +0000
@@ -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 @@
##
CPPFLAGS+= -Dmac68k
CFLAGS+= -msoft-float
-AFLAGS+= -x assembler-with-cpp -traditional-cpp
+AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
diff -r 44dd41740640 -r cdb4a0e6f845 sys/arch/mips/conf/Makefile.mips
--- a/sys/arch/mips/conf/Makefile.mips Fri Jan 21 13:11:32 2011 +0000
+++ b/sys/arch/mips/conf/Makefile.mips Fri Jan 21 15:59:04 2011 +0000
@@ -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 @@
${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
diff -r 44dd41740640 -r cdb4a0e6f845 sys/arch/mips/include/Makefile.inc
--- a/sys/arch/mips/include/Makefile.inc Fri Jan 21 13:11:32 2011 +0000
+++ b/sys/arch/mips/include/Makefile.inc Fri Jan 21 15:59:04 2011 +0000
@@ -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 @@
CFLAGS+= -msym32
.endif
-AFLAGS+= -x assembler-with-cpp -traditional-cpp ${AOPTS}
+AFLAGS+= -x assembler-with-cpp ${AOPTS}
diff -r 44dd41740640 -r cdb4a0e6f845 sys/arch/mvme68k/conf/Makefile.mvme68k
--- a/sys/arch/mvme68k/conf/Makefile.mvme68k Fri Jan 21 13:11:32 2011 +0000
+++ b/sys/arch/mvme68k/conf/Makefile.mvme68k Fri Jan 21 15:59:04 2011 +0000
@@ -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 @@
.endif
.endif
CFLAGS+= ${CMACHFLAGS} -msoft-float
-AFLAGS+= -x assembler-with-cpp -traditional-cpp
+AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
diff -r 44dd41740640 -r cdb4a0e6f845 sys/arch/mvme68k/stand/bootxx/Makefile
--- a/sys/arch/mvme68k/stand/bootxx/Makefile Fri Jan 21 13:11:32 2011 +0000
+++ b/sys/arch/mvme68k/stand/bootxx/Makefile Fri Jan 21 15:59:04 2011 +0000
@@ -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
diff -r 44dd41740640 -r cdb4a0e6f845 sys/arch/mvme68k/stand/libbug/Makefile
Home |
Main Index |
Thread Index |
Old Index