Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- -mcpu=i386 is gone in GCC4

Browse Source 
- we need -Wno-attributes (to avoid __packed__ warnings)
- use -Wno-pointer-sign
- remove some redundancy from pxeboot/Makefile
This commit is contained in:
mrg 2006-05-12 01:23:51 +00:00
parent 126f7e1139
commit 3adabe6283
5 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/i386/stand/Makefile.booters
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.booters,v 1.62 2005/12/11 12:17:47 christos Exp $ # $NetBSD: Makefile.booters,v 1.63 2006/05/12 01:23:51 mrg Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
@ -16,7 +16,11 @@ LIBC= # nothing
CPUFLAGS= -m32 CPUFLAGS= -m32
CPPFLAGS+= -DBOOT_ELF64 CPPFLAGS+= -DBOOT_ELF64
.else .else
CPUFLAGS= -mcpu=i386 .if ${HAVE_GCC} == 3
CPUFLAGS= -mcpu=i386
.else
CPUFLAGS= -march=i386 -mtune=i386 -Wno-attributes
.endif
.endif .endif
COPTS= -Os -ffreestanding COPTS= -Os -ffreestanding

4
sys/arch/i386/stand/Makefile.inc
View File

@ -1,3 +1,5 @@
# $NetBSD: Makefile.inc,v 1.1 2002/02/17 20:03:06 thorpej Exp $ # $NetBSD: Makefile.inc,v 1.2 2006/05/12 01:23:51 mrg Exp $
BINDIR= /usr/mdec BINDIR= /usr/mdec
CFLAGS+= -Wno-pointer-sign

9
sys/arch/i386/stand/boot/Makefile.boot
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.boot,v 1.25 2005/12/11 12:17:47 christos Exp $ # $NetBSD: Makefile.boot,v 1.26 2006/05/12 01:23:51 mrg Exp $
S= ${.CURDIR}/../../../../../ S= ${.CURDIR}/../../../../../
@ -46,7 +46,11 @@ LIBKERN_ARCH=i386
KERNMISCMAKEFLAGS="LIBKERN_ARCH=i386" KERNMISCMAKEFLAGS="LIBKERN_ARCH=i386"
CPPFLAGS+= -DBOOT_ELF64 CPPFLAGS+= -DBOOT_ELF64
.else .else
.if ${HAVE_GCC} == 3
CPUFLAGS= -mcpu=i386 CPUFLAGS= -mcpu=i386
.else
CPUFLAGS= -march=i386 -mtune=i386
.endif
.endif .endif
COPTS+= -ffreestanding COPTS+= -ffreestanding
@ -77,6 +81,9 @@ SAMISCCPPFLAGS+= -DHEAP_START=0x20000 -DHEAP_LIMIT=0x50000
SAMISCMAKEFLAGS+= SA_USE_CREAD=yes # Read compressed kernels SAMISCMAKEFLAGS+= SA_USE_CREAD=yes # Read compressed kernels
SAMISCMAKEFLAGS+= SA_INCLUDE_NET=no # Netboot via TFTP, NFS SAMISCMAKEFLAGS+= SA_INCLUDE_NET=no # Netboot via TFTP, NFS
.if ${HAVE_GCC} == 4
CPPFLAGS+= -Wno-pointer-sign
.endif
# CPPFLAGS+= -DBOOTXX_RAID1_SUPPORT # CPPFLAGS+= -DBOOTXX_RAID1_SUPPORT

6
sys/arch/i386/stand/bootxx/Makefile.bootxx
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.bootxx,v 1.19 2005/12/11 12:17:48 christos Exp $ # $NetBSD: Makefile.bootxx,v 1.20 2006/05/12 01:23:51 mrg Exp $
S= ${.CURDIR}/../../../../../ S= ${.CURDIR}/../../../../../
@ -57,7 +57,11 @@ LIBKERN_ARCH=i386
KERNMISCMAKEFLAGS="LIBKERN_ARCH=i386" KERNMISCMAKEFLAGS="LIBKERN_ARCH=i386"
CPPFLAGS+= -DBOOT_ELF64 CPPFLAGS+= -DBOOT_ELF64
.else .else
.if ${HAVE_GCC} == 3
CPUFLAGS= -mcpu=i386 CPUFLAGS= -mcpu=i386
.else
CPUFLAGS= -march=i386 -mtune=i386
.endif
.endif .endif
COPTS+= -ffreestanding COPTS+= -ffreestanding

8
sys/arch/i386/stand/pxeboot/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.9 2005/11/11 21:42:13 dsl Exp $ # $NetBSD: Makefile,v 1.10 2006/05/12 01:23:51 mrg Exp $
S= ${.CURDIR}/../../../../ S= ${.CURDIR}/../../../../
@ -19,15 +19,13 @@ SRCS= main.c dev_net.c devopen.c conf.c exec.c pxe.c pxe_call.S
.PATH: ${.CURDIR}/../libsa .PATH: ${.CURDIR}/../libsa
SRCS+= nfs.c SRCS+= nfs.c
.include <bsd.own.mk>
.if ${MACHINE} == "amd64" .if ${MACHINE} == "amd64"
LD+= -m elf_i386 LD+= -m elf_i386
AFLAGS+= -m32 AFLAGS+= -m32
CPUFLAGS= -m32
LIBKERN_ARCH=i386 LIBKERN_ARCH=i386
KERNMISCMAKEFLAGS="LIBKERN_ARCH=i386" KERNMISCMAKEFLAGS="LIBKERN_ARCH=i386"
CPPFLAGS+= -DBOOT_ELF64
.else
CPUFLAGS= -mcpu=i386
.endif .endif
CPPFLAGS+= -DSLOW # for libz CPPFLAGS+= -DSLOW # for libz