[src/trunk]: src/sys/arch/i386/stand Don't depend on HAVE_GCC being always pr...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/80a47807c1c8
branches:  trunk
changeset: 780876:80a47807c1c8
user:      joerg <joerg%NetBSD.org@localhost>
date:      Fri Aug 10 12:18:14 2012 +0000

description:
Don't depend on HAVE_GCC being always present.

diffstat:

 sys/arch/i386/stand/Makefile.booters            |  4 +---
 sys/arch/i386/stand/boot/Makefile.boot          |  6 +-----
 sys/arch/i386/stand/bootxx/Makefile.bootxx      |  4 +---
 sys/arch/i386/stand/lib/Makefile                |  4 ++--
 sys/arch/i386/stand/netboot/ne2000_isa/Makefile |  4 +---
 5 files changed, 6 insertions(+), 16 deletions(-)

diffs (117 lines):

diff -r e88a16ebe5e8 -r 80a47807c1c8 sys/arch/i386/stand/Makefile.booters
--- a/sys/arch/i386/stand/Makefile.booters      Fri Aug 10 12:17:51 2012 +0000
+++ b/sys/arch/i386/stand/Makefile.booters      Fri Aug 10 12:18:14 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.booters,v 1.85 2011/06/20 06:52:37 mrg Exp $
+#      $NetBSD: Makefile.booters,v 1.86 2012/08/10 12:18:14 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -12,13 +12,11 @@
 
 # Make sure we override any optimization options specified by the
 # user.
-.if defined(HAVE_GCC)
 .if ${MACHINE_ARCH} == "x86_64"
 CPUFLAGS= -m32
 .else
 CPUFLAGS=  -march=i386 -mtune=i386
 .endif
-.endif
 COPTS= ${OPT_SIZE.${ACTIVE_CC}}
 
 I386_STAND_DIR?= $S/arch/i386/stand
diff -r e88a16ebe5e8 -r 80a47807c1c8 sys/arch/i386/stand/boot/Makefile.boot
--- a/sys/arch/i386/stand/boot/Makefile.boot    Fri Aug 10 12:17:51 2012 +0000
+++ b/sys/arch/i386/stand/boot/Makefile.boot    Fri Aug 10 12:18:14 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.57 2012/01/16 18:46:20 christos Exp $
+# $NetBSD: Makefile.boot,v 1.58 2012/08/10 12:18:15 joerg Exp $
 
 S=     ${.CURDIR}/../../../../..
 
@@ -39,7 +39,6 @@
 # Make sure we override any optimization options specified by the user
 COPTS=  -Os
 
-.if defined(HAVE_GCC)
 .if ${MACHINE_ARCH} == "x86_64"
 LDFLAGS+=  -Wl,-m,elf_i386
 AFLAGS+=   -m32
@@ -49,7 +48,6 @@
 .else
 CPUFLAGS=  -march=i386 -mtune=i386
 .endif
-.endif
 
 CFLAGS+=   -mno-sse -mno-sse2 -mno-sse3
 
@@ -87,9 +85,7 @@
 SAMISCMAKEFLAGS+= SA_USE_CREAD=yes     # Read compressed kernels
 SAMISCMAKEFLAGS+= SA_INCLUDE_NET=no    # Netboot via TFTP, NFS
 
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
 CPPFLAGS+=     -Wno-pointer-sign
-.endif
 
 # CPPFLAGS+= -DBOOTXX_RAID1_SUPPORT
 
diff -r e88a16ebe5e8 -r 80a47807c1c8 sys/arch/i386/stand/bootxx/Makefile.bootxx
--- a/sys/arch/i386/stand/bootxx/Makefile.bootxx        Fri Aug 10 12:17:51 2012 +0000
+++ b/sys/arch/i386/stand/bootxx/Makefile.bootxx        Fri Aug 10 12:18:14 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootxx,v 1.42 2011/06/20 06:52:38 mrg Exp $
+# $NetBSD: Makefile.bootxx,v 1.43 2012/08/10 12:18:15 joerg Exp $
 
 S=     ${.CURDIR}/../../../../..
 
@@ -59,7 +59,6 @@
 
 CPPFLAGS+= -DNO_LBA_CHECK
 
-.if defined(HAVE_GCC)
 .if ${MACHINE_ARCH} == "x86_64"
 LDFLAGS+=  -Wl,-m,elf_i386
 AFLAGS+=   -m32
@@ -70,7 +69,6 @@
 CPPFLAGS+= -DEPIA_HACK
 CPUFLAGS=  -march=i386 -mtune=i386
 .endif
-.endif
 
 CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes
 CPPFLAGS+= -nostdinc -D_STANDALONE
diff -r e88a16ebe5e8 -r 80a47807c1c8 sys/arch/i386/stand/lib/Makefile
--- a/sys/arch/i386/stand/lib/Makefile  Fri Aug 10 12:17:51 2012 +0000
+++ b/sys/arch/i386/stand/lib/Makefile  Fri Aug 10 12:18:14 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.35 2011/06/22 02:49:44 mrg Exp $
+#      $NetBSD: Makefile,v 1.36 2012/08/10 12:18:15 joerg Exp $
 
 S?=    ${.CURDIR}/../../../..
 
@@ -75,6 +75,6 @@
        @${LD} -r -o lib${LIB}.o `lorder ${OBJS} | tsort`
 
 # XXX
-.if ${HAVE_GCC} == 45
+.if ${HAVE_GCC:U} == 45
 COPTS.biosdisk.c+=     -fno-strict-aliasing
 .endif
diff -r e88a16ebe5e8 -r 80a47807c1c8 sys/arch/i386/stand/netboot/ne2000_isa/Makefile
--- a/sys/arch/i386/stand/netboot/ne2000_isa/Makefile   Fri Aug 10 12:17:51 2012 +0000
+++ b/sys/arch/i386/stand/netboot/ne2000_isa/Makefile   Fri Aug 10 12:18:14 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2011/06/20 08:46:28 mrg Exp $
+#      $NetBSD: Makefile,v 1.4 2012/08/10 12:18:15 joerg Exp $
 
 USE_NETIF=     ne2000_isa
 
@@ -6,7 +6,5 @@
 
 .include "../Makefile.netboot"
 
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
 COPTS.dp8390.c +=      -Wno-pointer-sign
-.endif