Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys Put GCC/GAS options under ACTIVE_CC == "gcc".



details:   https://anonhg.NetBSD.org/src/rev/de2ad1b9ac71
branches:  trunk
changeset: 331415:de2ad1b9ac71
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sun Aug 10 17:46:54 2014 +0000

description:
Put GCC/GAS options under ACTIVE_CC == "gcc".

diffstat:

 sys/arch/sandpoint/stand/altboot/Makefile                   |  5 +++--
 sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk |  6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (44 lines):

diff -r f0980a4217e7 -r de2ad1b9ac71 sys/arch/sandpoint/stand/altboot/Makefile
--- a/sys/arch/sandpoint/stand/altboot/Makefile Sun Aug 10 17:44:26 2014 +0000
+++ b/sys/arch/sandpoint/stand/altboot/Makefile Sun Aug 10 17:46:54 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.15 2014/08/08 16:56:32 joerg Exp $
+#      $NetBSD: Makefile,v 1.16 2014/08/10 17:46:54 joerg Exp $
 
 S=             ${.CURDIR}/../../../..
 
@@ -10,7 +10,8 @@
 SRCS+=         dsk.c pciide.c siisata.c
 SRCS+=         exception.c vers.c
 CLEANFILES+=   vers.c ${PROG} ${PROG}.bin ${PROG}.img
-CFLAGS+=       -Wall -Wno-main -ffreestanding -msoft-float
+CFLAGS+=       -Wall -Wno-main -ffreestanding
+CFLAGS+=       ${${ACTIVE_CC} == "gcc":? -msoft-float :}
 CFLAGS+=       -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
 CPPFLAGS+=     -D_STANDALONE -DSUPPORT_DHCP -DLIBSA_PRINTF_WIDTH_SUPPORT
 #CPPFLAGS+=    -DCONSNAME=\"com\" -DCONSPORT=0x3f8 -DCONSSPEED=115200
diff -r f0980a4217e7 -r de2ad1b9ac71 sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk
--- a/sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk       Sun Aug 10 17:44:26 2014 +0000
+++ b/sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk       Sun Aug 10 17:46:54 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.powerpc-booke.mk,v 1.2 2014/08/08 16:56:32 joerg Exp $
+#      $NetBSD: bsd.powerpc-booke.mk,v 1.3 2014/08/10 17:46:54 joerg Exp $
 
 .ifndef _BSD_POWERPC_BOOKE_MK_
 _BSD_POWERPC_BOOKE_MK_=1
@@ -7,13 +7,13 @@
 
 # gcc emits bad code with these options
 #CPPFLAGS+=    -mcpu=8548
-CPPFLAGS+=     -misel -Wa,-me500
+CPPFLAGS+=     ${${ACTIVE_CC} == "gcc":? -misel -Wa,-me500 :}
 PPC_BOOKE=     1
 
 # hack into bsd.kmodule.mk
 PPC_INTR_IMPL=\"powerpc/booke/intr.h\"
 PPC_PCI_MACHDEP_IMPL=\"powerpc/pci_machdep.h\"
 
-AFLAGS+=       -Wa,-me500
+AFLAGS+=       ${${ACTIVE_CC} == "gcc":? -Wa,-me500 :}
 
 .endif # _BSD_POWERPC_BOOKE_MK_



Home | Main Index | Thread Index | Old Index