Module Name: src
Committed By: joerg
Date: Sun Aug 10 17:44:26 UTC 2014
Modified Files:
src/share/mk: bsd.kmodule.mk bsd.sys.mk
src/sys/arch/evbppc/conf: Makefile.mpc85xx.inc
src/sys/arch/macppc/conf: Makefile.macppc.inc
src/sys/arch/macppc/stand/bootxx: Makefile
src/sys/arch/macppc/stand/ofwboot: Makefile
src/sys/arch/ofppc/stand: Makefile.inc
src/sys/arch/ofppc/stand/ofwboot: Makefile
src/sys/arch/powerpc/conf: Makefile.powerpc
src/sys/arch/powerpc/include: Makefile.inc
Log Message:
Put GCC/GAS specific options under ACTIVE_CC == "gcc".
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/share/mk/bsd.kmodule.mk
cvs rdiff -u -r1.241 -r1.242 src/share/mk/bsd.sys.mk
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/conf/Makefile.mpc85xx.inc
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/macppc/conf/Makefile.macppc.inc
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/macppc/stand/bootxx/Makefile
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/macppc/stand/ofwboot/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ofppc/stand/Makefile.inc
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/ofppc/stand/ofwboot/Makefile
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/powerpc/conf/Makefile.powerpc
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/include/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.43 src/share/mk/bsd.kmodule.mk:1.44
--- src/share/mk/bsd.kmodule.mk:1.43 Mon Mar 10 12:13:14 2014
+++ src/share/mk/bsd.kmodule.mk Sun Aug 10 17:44:26 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.43 2014/03/10 12:13:14 nakayama Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.44 2014/08/10 17:44:26 joerg Exp $
# We are not building this with PIE
MKPIE=no
@@ -31,7 +31,7 @@ CFLAGS+= -fno-common -fno-unwind-tables
.elif ${MACHINE_CPU} == "hppa"
CFLAGS+= -mlong-calls
.elif ${MACHINE_CPU} == "powerpc"
-CFLAGS+= -mlongcall
+CFLAGS+= ${${ACTIVE_CC} == "gcc":? -mlongcall :}
.elif ${MACHINE_CPU} == "vax"
CFLAGS+= -fno-pic
.endif
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.241 src/share/mk/bsd.sys.mk:1.242
--- src/share/mk/bsd.sys.mk:1.241 Sun Aug 10 05:57:31 2014
+++ src/share/mk/bsd.sys.mk Sun Aug 10 17:44:26 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.241 2014/08/10 05:57:31 matt Exp $
+# $NetBSD: bsd.sys.mk,v 1.242 2014/08/10 17:44:26 joerg Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -125,7 +125,7 @@ COPTS+= ${${ACTIVE_CC} == "gcc":? --para
.endif
.if ${MKSOFTFLOAT:Uno} != "no"
-COPTS+= -msoft-float
+COPTS+= ${${ACTIVE_CC} == "gcc":? -msoft-float :}
FOPTS+= -msoft-float
.elif ${MACHINE_ARCH} == "coldfire"
COPTS+= -mhard-float
Index: src/sys/arch/evbppc/conf/Makefile.mpc85xx.inc
diff -u src/sys/arch/evbppc/conf/Makefile.mpc85xx.inc:1.4 src/sys/arch/evbppc/conf/Makefile.mpc85xx.inc:1.5
--- src/sys/arch/evbppc/conf/Makefile.mpc85xx.inc:1.4 Fri Aug 8 16:56:31 2014
+++ src/sys/arch/evbppc/conf/Makefile.mpc85xx.inc Sun Aug 10 17:44:26 2014
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.mpc85xx.inc,v 1.4 2014/08/08 16:56:31 joerg Exp $
+# $NetBSD: Makefile.mpc85xx.inc,v 1.5 2014/08/10 17:44:26 joerg Exp $
-CFLAGS+= -misel -Wa,-me500
-CFLAGS+= -fno-inline-functions-called-once
-AFLAGS+= -Wa,-me500
+CFLAGS+= ${${ACTIVE_CC} == "gcc":? -misel -Wa,-me500 :}
+CFLAGS+= ${${ACTIVE_CC} == "gcc":? -fno-inline-functions-called-once :}
+AFLAGS+= ${${ACTIVE_CC} == "gcc":? -Wa,-me500 :}
# gcc emits bad code with these options
#AFLAGS+= -mcpu=8548
#CFLAGS+= -mcpu=8548
Index: src/sys/arch/macppc/conf/Makefile.macppc.inc
diff -u src/sys/arch/macppc/conf/Makefile.macppc.inc:1.1 src/sys/arch/macppc/conf/Makefile.macppc.inc:1.2
--- src/sys/arch/macppc/conf/Makefile.macppc.inc:1.1 Fri Jun 17 05:17:30 2011
+++ src/sys/arch/macppc/conf/Makefile.macppc.inc Sun Aug 10 17:44:26 2014
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile.macppc.inc,v 1.1 2011/06/17 05:17:30 matt Exp $
+# $NetBSD: Makefile.macppc.inc,v 1.2 2014/08/10 17:44:26 joerg Exp $
.if ${PPC_ARCH_MODE} == "ppc64bridge"
-AOPTS+= -Wa,-mppc64bridge
+AOPTS+= ${${ACTIVE_CC} == "gcc":? -Wa,-mppc64bridge :}
.endif
-CFLAGS+= -Wa,-maltivec
AFLAGS+= ${AOPTS}
Index: src/sys/arch/macppc/stand/bootxx/Makefile
diff -u src/sys/arch/macppc/stand/bootxx/Makefile:1.14 src/sys/arch/macppc/stand/bootxx/Makefile:1.15
--- src/sys/arch/macppc/stand/bootxx/Makefile:1.14 Fri Aug 8 16:56:31 2014
+++ src/sys/arch/macppc/stand/bootxx/Makefile Sun Aug 10 17:44:26 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2014/08/08 16:56:31 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2014/08/10 17:44:26 joerg Exp $
S!= cd ${.CURDIR}/../../../..; pwd
@@ -12,7 +12,8 @@ LIBCRTBEGIN= # nothing
LIBCRTEND= # nothing
LIBC= # nothing
-CFLAGS= -Os -Wall -msoft-float -ffreestanding
+CFLAGS= -Os -Wall -ffreestanding
+CFLAGS+= ${${ACTIVE_CC} == "gcc":? -msoft-float :}
CPPFLAGS+= -D_STANDALONE -DPPC_OEA -I${.OBJDIR} -I${S}
STRIPFLAG=
LINKFLAGS= -x -N -Ttext 4000 -e _start
Index: src/sys/arch/macppc/stand/ofwboot/Makefile
diff -u src/sys/arch/macppc/stand/ofwboot/Makefile:1.53 src/sys/arch/macppc/stand/ofwboot/Makefile:1.54
--- src/sys/arch/macppc/stand/ofwboot/Makefile:1.53 Fri Aug 8 16:56:31 2014
+++ src/sys/arch/macppc/stand/ofwboot/Makefile Sun Aug 10 17:44:26 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2014/08/08 16:56:31 joerg Exp $
+# $NetBSD: Makefile,v 1.54 2014/08/10 17:44:26 joerg Exp $
S= ${.CURDIR}/../../../..
@@ -7,7 +7,8 @@ FILES= ${PROG}.elf ${PROG}.xcf
SRCS= Locore.c boot.c ofdev.c hfs.c net.c netif_of.c alloc.c vers.c
XCOFFXTRA= Xcoffxtra.c
XCOFFXTRAOBJ= Xcoffxtra.o
-CFLAGS+= -msoft-float -ffreestanding
+CFLAGS+= -ffreestanding
+CFLAGS+= ${${ACTIVE_CC} == "gcc":? -msoft-float :}
CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
#CPPFLAGS+= -DDEBUG -DNETIF_DEBUG
CPPFLAGS+= -D_STANDALONE -DSUPPORT_DHCP
Index: src/sys/arch/ofppc/stand/Makefile.inc
diff -u src/sys/arch/ofppc/stand/Makefile.inc:1.3 src/sys/arch/ofppc/stand/Makefile.inc:1.4
--- src/sys/arch/ofppc/stand/Makefile.inc:1.3 Fri May 22 12:56:35 1998
+++ src/sys/arch/ofppc/stand/Makefile.inc Sun Aug 10 17:44:26 2014
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.3 1998/05/22 12:56:35 drochner Exp $
+# $NetBSD: Makefile.inc,v 1.4 2014/08/10 17:44:26 joerg Exp $
BINDIR= /usr/mdec
CPPFLAGS+= -D_STANDALONE
-CFLAGS+= -msoft-float
+CFLAGS+= ${${ACTIVE_CC} == "gcc":? -msoft-float :}
Index: src/sys/arch/ofppc/stand/ofwboot/Makefile
diff -u src/sys/arch/ofppc/stand/ofwboot/Makefile:1.30 src/sys/arch/ofppc/stand/ofwboot/Makefile:1.31
--- src/sys/arch/ofppc/stand/ofwboot/Makefile:1.30 Fri Aug 8 16:56:31 2014
+++ src/sys/arch/ofppc/stand/ofwboot/Makefile Sun Aug 10 17:44:26 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2014/08/08 16:56:31 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2014/08/10 17:44:26 joerg Exp $
S!= cd ${.CURDIR}/../../../.. ; pwd
@@ -6,7 +6,8 @@ PROG= ofwboot
NOMAN= # defined
SRCS= ofwstart.S Locore.c boot.c ofdev.c net.c netif_of.c
SRCS+= mbr.c rdb.c vers.c
-CFLAGS+= -msoft-float -Wno-main -ffreestanding
+CFLAGS+= ${${ACTIVE_CC} == "gcc":? -msoft-float :}
+CFLAGS+= -Wno-main -ffreestanding
CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
#CPPFLAGS+= -g -DALLOC_TRACE -DDEBUG #-DOFW_DEBUG -DNETIF_DEBUG
#CPPFLAGS+= -DOFWDUMP
Index: src/sys/arch/powerpc/conf/Makefile.powerpc
diff -u src/sys/arch/powerpc/conf/Makefile.powerpc:1.56 src/sys/arch/powerpc/conf/Makefile.powerpc:1.57
--- src/sys/arch/powerpc/conf/Makefile.powerpc:1.56 Fri Aug 8 16:56:31 2014
+++ src/sys/arch/powerpc/conf/Makefile.powerpc Sun Aug 10 17:44:26 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.powerpc,v 1.56 2014/08/08 16:56:31 joerg Exp $
+# $NetBSD: Makefile.powerpc,v 1.57 2014/08/10 17:44:26 joerg Exp $
#
# Makefile for NetBSD
#
@@ -40,15 +40,17 @@ GENASSYM_CONF+= ${THISPPC}/${MACHINE}/ge
CPPFLAGS+= -D${MACHINE}=${MACHINE}
CWARNFLAGS+= -Wreturn-type
.if ${PPCDIR} == "oea"
-CFLAGS+= -mno-strict-align
-CFLAGS+= -Wa,-maltivec
+CFLAGS+= ${${ACTIVE_CC} == "gcc":? -mno-strict-align :}
+CFLAGS+= ${${ACTIVE_CC} == "gcc":? -Wa,-maltivec :}
.endif
.if ${PPCDIR} == "booke"
DEFCOPTS= -O2
CFLAGS+= -fstack-protector
+CFLAGS+= ${${ACTIVE_CC} == "gcc":? -misel :}
.endif
-CFLAGS+= -msdata=none
-CFLAGS+= -msoft-float ${CCPUOPTS}
+CFLAGS+= ${${ACTIVE_CC} == "gcc":? -msdata=none -msoft-float :}
+CFLAGS+= ${${ACTIVE_CC} == "clang":? -mllvm -disable-ppc-float-in-variadic=true :}
+CFLAGS+= ${CCPUOPTS}
AFLAGS+= ${AOPTS} -D_NOREGNAMES
##
Index: src/sys/arch/powerpc/include/Makefile.inc
diff -u src/sys/arch/powerpc/include/Makefile.inc:1.2 src/sys/arch/powerpc/include/Makefile.inc:1.3
--- src/sys/arch/powerpc/include/Makefile.inc:1.2 Wed Oct 26 15:57:26 2011
+++ src/sys/arch/powerpc/include/Makefile.inc Sun Aug 10 17:44:26 2014
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.2 2011/10/26 15:57:26 chs Exp $
+# $NetBSD: Makefile.inc,v 1.3 2014/08/10 17:44:26 joerg Exp $
.if !defined(_POWERPC_MAKEFILE_INC)
_POWERPC_MAKEFILE_INC= yes
.if !defined(RUMPKERNEL)
-CFLAGS+= -msoft-float
+CFLAGS+= ${${ACTIVE_CC} == "gcc":? -msoft-float :}
.endif
.endif
