Module Name: src
Committed By: joerg
Date: Mon Jan 17 18:11:10 UTC 2011
Modified Files:
src: UPDATING
src/common/lib/libc/arch/sparc/atomic: atomic_op_asm.h
src/common/lib/libc/arch/sparc64/atomic: atomic_op_asm.h
src/share/mk: sys.mk
src/sys/arch/sparc/conf: Makefile.sparc
src/sys/arch/sparc/stand/ofwboot: Makefile
src/sys/arch/sparc64/conf: Makefile.sparc64
Log Message:
Move SPARC and SPARC64 to modern CPP. Update UPDATING note for this and
Alpha.
To generate a diff of this commit:
cvs rdiff -u -r1.218 -r1.219 src/UPDATING
cvs rdiff -u -r1.5 -r1.6 \
src/common/lib/libc/arch/sparc/atomic/atomic_op_asm.h
cvs rdiff -u -r1.5 -r1.6 \
src/common/lib/libc/arch/sparc64/atomic/atomic_op_asm.h
cvs rdiff -u -r1.102 -r1.103 src/share/mk/sys.mk
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/sparc/conf/Makefile.sparc
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sparc/stand/ofwboot/Makefile
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/sparc64/conf/Makefile.sparc64
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/UPDATING
diff -u src/UPDATING:1.218 src/UPDATING:1.219
--- src/UPDATING:1.218 Sat Jan 15 16:13:59 2011
+++ src/UPDATING Mon Jan 17 18:11:09 2011
@@ -1,4 +1,4 @@
-$NetBSD: UPDATING,v 1.218 2011/01/15 16:13:59 joerg Exp $
+$NetBSD: UPDATING,v 1.219 2011/01/17 18:11:09 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,8 +15,13 @@
Recent changes:
^^^^^^^^^^^^^^^
-20110112:
- Assembler files on amd64 and i386 no longer use -traditional-cpp.
+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
Index: src/common/lib/libc/arch/sparc/atomic/atomic_op_asm.h
diff -u src/common/lib/libc/arch/sparc/atomic/atomic_op_asm.h:1.5 src/common/lib/libc/arch/sparc/atomic/atomic_op_asm.h:1.6
--- src/common/lib/libc/arch/sparc/atomic/atomic_op_asm.h:1.5 Mon Apr 28 20:22:52 2008
+++ src/common/lib/libc/arch/sparc/atomic/atomic_op_asm.h Mon Jan 17 18:11:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_op_asm.h,v 1.5 2008/04/28 20:22:52 martin Exp $ */
+/* $NetBSD: atomic_op_asm.h,v 1.6 2011/01/17 18:11:09 joerg Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -39,9 +39,9 @@
#define ATOMIC_OP_ALIAS(a,s) STRONG_ALIAS(a,s)
#ifdef __arch64__
-#define ATOMIC_OP_ALIAS_SIZE(a,s) STRONG_ALIAS(a,s/**/_64)
+#define ATOMIC_OP_ALIAS_SIZE(a,s) STRONG_ALIAS(a,s ## _64)
#else
-#define ATOMIC_OP_ALIAS_SIZE(a,s) STRONG_ALIAS(a,s/**/_32)
+#define ATOMIC_OP_ALIAS_SIZE(a,s) STRONG_ALIAS(a,s ## _32)
#endif
#else /* _KERNEL */
@@ -49,17 +49,17 @@
#define ATOMIC_OP_ALIAS(a,s) WEAK_ALIAS(a,s)
#ifdef __arch64__
-#define ATOMIC_OP_ALIAS_SIZE(a,s) WEAK_ALIAS(a,s/**/_64)
+#define ATOMIC_OP_ALIAS_SIZE(a,s) WEAK_ALIAS(a,s ## _64)
#else
-#define ATOMIC_OP_ALIAS_SIZE(a,s) WEAK_ALIAS(a,s/**/_32)
+#define ATOMIC_OP_ALIAS_SIZE(a,s) WEAK_ALIAS(a,s ## _32)
#endif
#endif /* _KERNEL */
#ifdef __arch64__
-#define STRONG_ALIAS_SIZE(a,s) STRONG_ALIAS(a,s/**/_64)
+#define STRONG_ALIAS_SIZE(a,s) STRONG_ALIAS(a,s ## _64)
#else
-#define STRONG_ALIAS_SIZE(a,s) STRONG_ALIAS(a,s/**/_32)
+#define STRONG_ALIAS_SIZE(a,s) STRONG_ALIAS(a,s ## _32)
#endif
#endif /* _ATOMIC_OP_ASM_H_ */
Index: src/common/lib/libc/arch/sparc64/atomic/atomic_op_asm.h
diff -u src/common/lib/libc/arch/sparc64/atomic/atomic_op_asm.h:1.5 src/common/lib/libc/arch/sparc64/atomic/atomic_op_asm.h:1.6
--- src/common/lib/libc/arch/sparc64/atomic/atomic_op_asm.h:1.5 Mon Apr 28 20:22:52 2008
+++ src/common/lib/libc/arch/sparc64/atomic/atomic_op_asm.h Mon Jan 17 18:11:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_op_asm.h,v 1.5 2008/04/28 20:22:52 martin Exp $ */
+/* $NetBSD: atomic_op_asm.h,v 1.6 2011/01/17 18:11:10 joerg Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -39,9 +39,9 @@
#define ATOMIC_OP_ALIAS(a,s) STRONG_ALIAS(a,s)
#ifdef __arch64__
-#define ATOMIC_OP_ALIAS_SIZE(a,s) STRONG_ALIAS(a,s/**/_64)
+#define ATOMIC_OP_ALIAS_SIZE(a,s) STRONG_ALIAS(a,s ## _64)
#else
-#define ATOMIC_OP_ALIAS_SIZE(a,s) STRONG_ALIAS(a,s/**/_32)
+#define ATOMIC_OP_ALIAS_SIZE(a,s) STRONG_ALIAS(a,s ## _32)
#endif
#else /* _KERNEL */
@@ -49,17 +49,17 @@
#define ATOMIC_OP_ALIAS(a,s) WEAK_ALIAS(a,s)
#ifdef __arch64__
-#define ATOMIC_OP_ALIAS_SIZE(a,s) WEAK_ALIAS(a,s/**/_64)
+#define ATOMIC_OP_ALIAS_SIZE(a,s) WEAK_ALIAS(a,s ## _64)
#else
-#define ATOMIC_OP_ALIAS_SIZE(a,s) WEAK_ALIAS(a,s/**/_32)
+#define ATOMIC_OP_ALIAS_SIZE(a,s) WEAK_ALIAS(a,s ## _32)
#endif
#endif /* _KERNEL */
#ifdef __arch64__
-#define STRONG_ALIAS_SIZE(a,s) STRONG_ALIAS(a,s/**/_64)
+#define STRONG_ALIAS_SIZE(a,s) STRONG_ALIAS(a,s ## _64)
#else
-#define STRONG_ALIAS_SIZE(a,s) STRONG_ALIAS(a,s/**/_32)
+#define STRONG_ALIAS_SIZE(a,s) STRONG_ALIAS(a,s ## _32)
#endif
#endif /* _ATOMIC_OP_ASM_H_ */
Index: src/share/mk/sys.mk
diff -u src/share/mk/sys.mk:1.102 src/share/mk/sys.mk:1.103
--- src/share/mk/sys.mk:1.102 Sun Jan 16 19:29:59 2011
+++ src/share/mk/sys.mk Mon Jan 17 18:11:10 2011
@@ -1,4 +1,4 @@
-# $NetBSD: sys.mk,v 1.102 2011/01/16 19:29:59 joerg Exp $
+# $NetBSD: sys.mk,v 1.103 2011/01/17 18:11:10 joerg Exp $
# @(#)sys.mk 8.2 (Berkeley) 3/21/94
unix?= We run NetBSD.
@@ -16,7 +16,8 @@
COMPILE.s?= ${CC} ${AFLAGS} -c
LINK.s?= ${CC} ${AFLAGS} ${LDFLAGS}
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
- ${MACHINE_ARCH} == "alpha"
+ ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc" || \
+ ${MACHINE_ARCH} == "sparc64"
_ASM_TRADITIONAL_CPP= -x assembler-with-cpp
.else
_ASM_TRADITIONAL_CPP= -traditional-cpp
Index: src/sys/arch/sparc/conf/Makefile.sparc
diff -u src/sys/arch/sparc/conf/Makefile.sparc:1.87 src/sys/arch/sparc/conf/Makefile.sparc:1.88
--- src/sys/arch/sparc/conf/Makefile.sparc:1.87 Tue Jul 6 06:00:01 2010
+++ src/sys/arch/sparc/conf/Makefile.sparc Mon Jan 17 18:11:10 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sparc,v 1.87 2010/07/06 06:00:01 mrg Exp $
+# $NetBSD: Makefile.sparc,v 1.88 2011/01/17 18:11:10 joerg Exp $
# Makefile for NetBSD
#
@@ -34,7 +34,7 @@
# work around GCC (egcs-2.91.66) bug which is liable
# to use FPU registers as temporaries:
CFLAGS+= -mno-fpu
-AFLAGS+= -x assembler-with-cpp -traditional-cpp
+AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
Index: src/sys/arch/sparc/stand/ofwboot/Makefile
diff -u src/sys/arch/sparc/stand/ofwboot/Makefile:1.25 src/sys/arch/sparc/stand/ofwboot/Makefile:1.26
--- src/sys/arch/sparc/stand/ofwboot/Makefile:1.25 Wed Aug 25 20:16:49 2010
+++ src/sys/arch/sparc/stand/ofwboot/Makefile Mon Jan 17 18:11:10 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2010/08/25 20:16:49 christos Exp $
+# $NetBSD: Makefile,v 1.26 2011/01/17 18:11:10 joerg Exp $
CURDIR= ${.CURDIR}
S= ${CURDIR}/../../../..
@@ -117,10 +117,10 @@
.endif
.if CROSS
-AFLAGS+= -x assembler-with-cpp -traditional-cpp -D_LOCORE -D__ELF__
+AFLAGS+= -x assembler-with-cpp -D_LOCORE -D__ELF__
CEXTRAFLAGS?= -D_LP64
.else
-AFLAGS+= -x assembler-with-cpp -traditional-cpp -D_LOCORE -D__ELF__ ${CEXTRAFLAGS}
+AFLAGS+= -x assembler-with-cpp -D_LOCORE -D__ELF__ ${CEXTRAFLAGS}
.endif
NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
Index: src/sys/arch/sparc64/conf/Makefile.sparc64
diff -u src/sys/arch/sparc64/conf/Makefile.sparc64:1.69 src/sys/arch/sparc64/conf/Makefile.sparc64:1.70
--- src/sys/arch/sparc64/conf/Makefile.sparc64:1.69 Sun May 23 18:49:14 2010
+++ src/sys/arch/sparc64/conf/Makefile.sparc64 Mon Jan 17 18:11:10 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sparc64,v 1.69 2010/05/23 18:49:14 martin Exp $
+# $NetBSD: Makefile.sparc64,v 1.70 2011/01/17 18:11:10 joerg Exp $
#=========================================================================
#
@@ -75,7 +75,7 @@
CC_NOOPT= ${NORMAL_C:C/-O./-O0/}
.endif
CFLAGS+= -mno-fpu
-AFLAGS+= -x assembler-with-cpp -traditional-cpp
+AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
