Module Name: src
Committed By: joerg
Date: Fri Aug 10 12:18:15 UTC 2012
Modified Files:
src/sys/arch/i386/stand: Makefile.booters
src/sys/arch/i386/stand/boot: Makefile.boot
src/sys/arch/i386/stand/bootxx: Makefile.bootxx
src/sys/arch/i386/stand/lib: Makefile
src/sys/arch/i386/stand/netboot/ne2000_isa: Makefile
Log Message:
Don't depend on HAVE_GCC being always present.
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/i386/stand/Makefile.booters
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/i386/stand/boot/Makefile.boot
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/i386/stand/bootxx/Makefile.bootxx
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/i386/stand/lib/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/i386/stand/netboot/ne2000_isa/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/Makefile.booters
diff -u src/sys/arch/i386/stand/Makefile.booters:1.85 src/sys/arch/i386/stand/Makefile.booters:1.86
--- src/sys/arch/i386/stand/Makefile.booters:1.85 Mon Jun 20 06:52:37 2011
+++ src/sys/arch/i386/stand/Makefile.booters Fri Aug 10 12:18:14 2012
@@ -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 @@ LIBC= # nothing
# 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
Index: src/sys/arch/i386/stand/boot/Makefile.boot
diff -u src/sys/arch/i386/stand/boot/Makefile.boot:1.57 src/sys/arch/i386/stand/boot/Makefile.boot:1.58
--- src/sys/arch/i386/stand/boot/Makefile.boot:1.57 Mon Jan 16 18:46:20 2012
+++ src/sys/arch/i386/stand/boot/Makefile.boot Fri Aug 10 12:18:15 2012
@@ -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 @@ CPPFLAGS+= -I ${.OBJDIR}
# 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 @@ KERNMISCMAKEFLAGS="LIBKERN_ARCH=i386"
.else
CPUFLAGS= -march=i386 -mtune=i386
.endif
-.endif
CFLAGS+= -mno-sse -mno-sse2 -mno-sse3
@@ -87,9 +85,7 @@ SAMISCCPPFLAGS+= -DLIBSA_PRINTF_LONGLONG
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
Index: src/sys/arch/i386/stand/bootxx/Makefile.bootxx
diff -u src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.42 src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.43
--- src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.42 Mon Jun 20 06:52:38 2011
+++ src/sys/arch/i386/stand/bootxx/Makefile.bootxx Fri Aug 10 12:18:15 2012
@@ -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 @@ DBG=
CPPFLAGS+= -DNO_LBA_CHECK
-.if defined(HAVE_GCC)
.if ${MACHINE_ARCH} == "x86_64"
LDFLAGS+= -Wl,-m,elf_i386
AFLAGS+= -m32
@@ -70,7 +69,6 @@ KERNMISCMAKEFLAGS="LIBKERN_ARCH=i386"
CPPFLAGS+= -DEPIA_HACK
CPUFLAGS= -march=i386 -mtune=i386
.endif
-.endif
CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes
CPPFLAGS+= -nostdinc -D_STANDALONE
Index: src/sys/arch/i386/stand/lib/Makefile
diff -u src/sys/arch/i386/stand/lib/Makefile:1.35 src/sys/arch/i386/stand/lib/Makefile:1.36
--- src/sys/arch/i386/stand/lib/Makefile:1.35 Wed Jun 22 02:49:44 2011
+++ src/sys/arch/i386/stand/lib/Makefile Fri Aug 10 12:18:15 2012
@@ -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 @@ lib${LIB}.o:: ${OBJS}
@${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
Index: src/sys/arch/i386/stand/netboot/ne2000_isa/Makefile
diff -u src/sys/arch/i386/stand/netboot/ne2000_isa/Makefile:1.3 src/sys/arch/i386/stand/netboot/ne2000_isa/Makefile:1.4
--- src/sys/arch/i386/stand/netboot/ne2000_isa/Makefile:1.3 Mon Jun 20 08:46:28 2011
+++ src/sys/arch/i386/stand/netboot/ne2000_isa/Makefile Fri Aug 10 12:18:15 2012
@@ -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 @@ CPPFLAGS+= -DBASEREG=0x300
.include "../Makefile.netboot"
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.dp8390.c += -Wno-pointer-sign
-.endif
