Module Name: src
Committed By: joerg
Date: Fri Aug 8 16:56:32 UTC 2014
Modified Files:
src/distrib/bebox/ramdisk: Makefile
src/distrib/evbppc/ramdisk: Makefile
src/distrib/ibmnws/netboot/ramdisk: Makefile
src/distrib/macppc/floppies/ramdisk: Makefile
src/distrib/prep/floppies/ramdisk: Makefile
src/distrib/rs6000/ramdisk: Makefile
src/distrib/sandpoint/ramdisk: Makefile
src/sys/arch/bebox/stand/common: Makefile
src/sys/arch/evbppc/conf: Makefile.mpc85xx.inc
src/sys/arch/ibmnws/conf: GENERIC
src/sys/arch/macppc/conf: INSTALL
src/sys/arch/macppc/stand/bootxx: Makefile
src/sys/arch/macppc/stand/ofwboot: Makefile
src/sys/arch/ofppc/stand/ofwboot: Makefile
src/sys/arch/powerpc/conf: Makefile.powerpc
src/sys/arch/prep/conf: INSTALL INSTALL_SMALL
src/sys/arch/prep/stand/boot: Makefile
src/sys/arch/prep/stand/common: Makefile
src/sys/arch/rs6000/conf: INSTALL
src/sys/arch/rs6000/stand/boot: Makefile
src/sys/arch/rs6000/stand/common: Makefile
src/sys/arch/sandpoint/stand/altboot: Makefile
src/sys/modules/arch/powerpc/powerpc-booke: bsd.powerpc-booke.mk
Log Message:
Don't set -mmultiple or -mno-string for PowerPC, the difference is too
small to really matter and it sometimes even increases the size.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/bebox/ramdisk/Makefile
cvs rdiff -u -r1.16 -r1.17 src/distrib/evbppc/ramdisk/Makefile
cvs rdiff -u -r1.11 -r1.12 src/distrib/ibmnws/netboot/ramdisk/Makefile
cvs rdiff -u -r1.45 -r1.46 src/distrib/macppc/floppies/ramdisk/Makefile
cvs rdiff -u -r1.20 -r1.21 src/distrib/prep/floppies/ramdisk/Makefile
cvs rdiff -u -r1.6 -r1.7 src/distrib/rs6000/ramdisk/Makefile
cvs rdiff -u -r1.10 -r1.11 src/distrib/sandpoint/ramdisk/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/bebox/stand/common/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbppc/conf/Makefile.mpc85xx.inc
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/ibmnws/conf/GENERIC
cvs rdiff -u -r1.122 -r1.123 src/sys/arch/macppc/conf/INSTALL
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/macppc/stand/bootxx/Makefile
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/macppc/stand/ofwboot/Makefile
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/ofppc/stand/ofwboot/Makefile
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/powerpc/conf/Makefile.powerpc
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/prep/conf/INSTALL
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/prep/conf/INSTALL_SMALL
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/prep/stand/boot/Makefile
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/prep/stand/common/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/rs6000/conf/INSTALL
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/rs6000/stand/boot/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/rs6000/stand/common/Makefile
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sandpoint/stand/altboot/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/bebox/ramdisk/Makefile
diff -u src/distrib/bebox/ramdisk/Makefile:1.1 src/distrib/bebox/ramdisk/Makefile:1.2
--- src/distrib/bebox/ramdisk/Makefile:1.1 Sun Oct 17 11:05:18 2010
+++ src/distrib/bebox/ramdisk/Makefile Fri Aug 8 16:56:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/10/17 11:05:18 kiyohara Exp $
+# $NetBSD: Makefile,v 1.2 2014/08/08 16:56:30 joerg Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -8,7 +8,7 @@ IMAGESIZE= 2048k
MAKEFS_FLAGS= -f 15
WARNS= 1
-DBG= -Os -mmultiple
+DBG= -Os
CRUNCHBIN= ramdiskbin
CRUNCHGEN_FLAGS=-d "${DBG}"
Index: src/distrib/evbppc/ramdisk/Makefile
diff -u src/distrib/evbppc/ramdisk/Makefile:1.16 src/distrib/evbppc/ramdisk/Makefile:1.17
--- src/distrib/evbppc/ramdisk/Makefile:1.16 Tue Aug 14 07:24:40 2012
+++ src/distrib/evbppc/ramdisk/Makefile Fri Aug 8 16:56:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/08/14 07:24:40 martin Exp $
+# $NetBSD: Makefile,v 1.17 2014/08/08 16:56:30 joerg Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -8,7 +8,7 @@ IMAGESIZE= 2880k
MAKEFS_FLAGS= -f 15
WARNS= 1
-DBG= -Os -mmultiple -mno-string -fno-pie -fno-pic
+DBG= -Os
CRUNCHBIN= ramdiskbin
CRUNCHGEN_FLAGS=-d "${DBG}"
Index: src/distrib/ibmnws/netboot/ramdisk/Makefile
diff -u src/distrib/ibmnws/netboot/ramdisk/Makefile:1.11 src/distrib/ibmnws/netboot/ramdisk/Makefile:1.12
--- src/distrib/ibmnws/netboot/ramdisk/Makefile:1.11 Tue Aug 14 07:24:41 2012
+++ src/distrib/ibmnws/netboot/ramdisk/Makefile Fri Aug 8 16:56:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/08/14 07:24:41 martin Exp $
+# $NetBSD: Makefile,v 1.12 2014/08/08 16:56:31 joerg Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -8,7 +8,6 @@ IMAGESIZE= 2048k
MAKEFS_FLAGS= -f 15
WARNS= 1
-# DBG= -Os -mmultiple -mstring
CRUNCHBIN= ramdiskbin
CRUNCHGEN_FLAGS= -d "${DBG}"
Index: src/distrib/macppc/floppies/ramdisk/Makefile
diff -u src/distrib/macppc/floppies/ramdisk/Makefile:1.45 src/distrib/macppc/floppies/ramdisk/Makefile:1.46
--- src/distrib/macppc/floppies/ramdisk/Makefile:1.45 Thu Aug 7 16:51:57 2014
+++ src/distrib/macppc/floppies/ramdisk/Makefile Fri Aug 8 16:56:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2014/08/07 16:51:57 gdt Exp $
+# $NetBSD: Makefile,v 1.46 2014/08/08 16:56:31 joerg Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -12,7 +12,7 @@ IMAGESIZE= 2248k
MAKEFS_FLAGS= -f 15
WARNS= 1
-DBG= -Os -mmultiple -mstring
+DBG= -Os
CRUNCHBIN= ramdiskbin
CRUNCHGEN_FLAGS= -d "${DBG}"
Index: src/distrib/prep/floppies/ramdisk/Makefile
diff -u src/distrib/prep/floppies/ramdisk/Makefile:1.20 src/distrib/prep/floppies/ramdisk/Makefile:1.21
--- src/distrib/prep/floppies/ramdisk/Makefile:1.20 Thu Feb 11 09:06:50 2010
+++ src/distrib/prep/floppies/ramdisk/Makefile Fri Aug 8 16:56:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2010/02/11 09:06:50 roy Exp $
+# $NetBSD: Makefile,v 1.21 2014/08/08 16:56:31 joerg Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -8,7 +8,7 @@ IMAGESIZE= 2048k
MAKEFS_FLAGS= -f 15
WARNS= 1
-DBG= -Os -mmultiple
+DBG= -Os
CRUNCHBIN= ramdiskbin
CRUNCHGEN_FLAGS=-d "${DBG}"
Index: src/distrib/rs6000/ramdisk/Makefile
diff -u src/distrib/rs6000/ramdisk/Makefile:1.6 src/distrib/rs6000/ramdisk/Makefile:1.7
--- src/distrib/rs6000/ramdisk/Makefile:1.6 Thu Feb 11 09:06:50 2010
+++ src/distrib/rs6000/ramdisk/Makefile Fri Aug 8 16:56:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/02/11 09:06:50 roy Exp $
+# $NetBSD: Makefile,v 1.7 2014/08/08 16:56:31 joerg Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -8,7 +8,7 @@ IMAGESIZE= 2048k
MAKEFS_FLAGS= -f 15
WARNS= 1
-DBG= -Os -mmultiple -mstring
+DBG= -Os
CRUNCHBIN= ramdiskbin
CRUNCHGEN_FLAGS= -d "${DBG}"
Index: src/distrib/sandpoint/ramdisk/Makefile
diff -u src/distrib/sandpoint/ramdisk/Makefile:1.10 src/distrib/sandpoint/ramdisk/Makefile:1.11
--- src/distrib/sandpoint/ramdisk/Makefile:1.10 Tue Aug 14 07:24:41 2012
+++ src/distrib/sandpoint/ramdisk/Makefile Fri Aug 8 16:56:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/08/14 07:24:41 martin Exp $
+# $NetBSD: Makefile,v 1.11 2014/08/08 16:56:31 joerg Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -8,7 +8,7 @@ IMAGESIZE= 2048k
MAKEFS_FLAGS= -f 15
WARNS= 1
-DBG= -Os -mmultiple -mstring
+DBG= -Os
CRUNCHBIN= ramdiskbin
CRUNCHGEN_FLAGS=-d "${DBG}"
Index: src/sys/arch/bebox/stand/common/Makefile
diff -u src/sys/arch/bebox/stand/common/Makefile:1.3 src/sys/arch/bebox/stand/common/Makefile:1.4
--- src/sys/arch/bebox/stand/common/Makefile:1.3 Wed Aug 21 06:53:10 2013
+++ src/sys/arch/bebox/stand/common/Makefile Fri Aug 8 16:56:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/08/21 06:53:10 matt Exp $
+# $NetBSD: Makefile,v 1.4 2014/08/08 16:56:31 joerg Exp $
S= ${.CURDIR}/../../../..
@@ -9,7 +9,7 @@ CPPFLAGS+= -D__daddr_t=int32_t
CPPFLAGS+= -I. -I${S} -I${.OBJDIR}
CPPFLAGS+= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes
-CFLAGS= -Os -mmultiple -ffreestanding
+CFLAGS= -Os -ffreestanding
.include <bsd.prog.mk>
.include <bsd.klinks.mk>
Index: src/sys/arch/evbppc/conf/Makefile.mpc85xx.inc
diff -u src/sys/arch/evbppc/conf/Makefile.mpc85xx.inc:1.3 src/sys/arch/evbppc/conf/Makefile.mpc85xx.inc:1.4
--- src/sys/arch/evbppc/conf/Makefile.mpc85xx.inc:1.3 Sat May 28 00:07:24 2011
+++ src/sys/arch/evbppc/conf/Makefile.mpc85xx.inc Fri Aug 8 16:56:31 2014
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.mpc85xx.inc,v 1.3 2011/05/28 00:07:24 matt Exp $
+# $NetBSD: Makefile.mpc85xx.inc,v 1.4 2014/08/08 16:56:31 joerg Exp $
-CFLAGS+= -mmultiple
-CFLAGS+= -mno-string -misel -Wa,-me500
+CFLAGS+= -misel -Wa,-me500
CFLAGS+= -fno-inline-functions-called-once
AFLAGS+= -Wa,-me500
# gcc emits bad code with these options
Index: src/sys/arch/ibmnws/conf/GENERIC
diff -u src/sys/arch/ibmnws/conf/GENERIC:1.42 src/sys/arch/ibmnws/conf/GENERIC:1.43
--- src/sys/arch/ibmnws/conf/GENERIC:1.42 Sat Apr 27 21:43:30 2013
+++ src/sys/arch/ibmnws/conf/GENERIC Fri Aug 8 16:56:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.42 2013/04/27 21:43:30 christos Exp $
+# $NetBSD: GENERIC,v 1.43 2014/08/08 16:56:31 joerg Exp $
#
#
@@ -6,8 +6,6 @@ include "arch/ibmnws/conf/std.ibmnws"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#makeoptions COPTS="-Os -mmultiple" # -Os -mmultiple to reduce size.
-
# Console settings
options CONSOLE="\"genfb\""
#options CONSOLE="\"com\""
Index: src/sys/arch/macppc/conf/INSTALL
diff -u src/sys/arch/macppc/conf/INSTALL:1.122 src/sys/arch/macppc/conf/INSTALL:1.123
--- src/sys/arch/macppc/conf/INSTALL:1.122 Thu Aug 7 16:51:56 2014
+++ src/sys/arch/macppc/conf/INSTALL Fri Aug 8 16:56:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.122 2014/08/07 16:51:56 gdt Exp $
+# $NetBSD: INSTALL,v 1.123 2014/08/08 16:56:31 joerg Exp $
#
# config file for INSTALL FLOPPY
#
@@ -7,7 +7,7 @@ include "arch/macppc/conf/std.macppc"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-makeoptions COPTS="-Os -mmultiple -pipe" # -Os -mmultiple to reduce size.
+makeoptions COPTS="-Os" # Reduce size.
maxusers 12
Index: src/sys/arch/macppc/stand/bootxx/Makefile
diff -u src/sys/arch/macppc/stand/bootxx/Makefile:1.13 src/sys/arch/macppc/stand/bootxx/Makefile:1.14
--- src/sys/arch/macppc/stand/bootxx/Makefile:1.13 Sun Jan 12 15:26:30 2014
+++ src/sys/arch/macppc/stand/bootxx/Makefile Fri Aug 8 16:56:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/01/12 15:26:30 tsutsui Exp $
+# $NetBSD: Makefile,v 1.14 2014/08/08 16:56:31 joerg Exp $
S!= cd ${.CURDIR}/../../../..; pwd
@@ -12,7 +12,7 @@ LIBCRTBEGIN= # nothing
LIBCRTEND= # nothing
LIBC= # nothing
-CFLAGS= -Os -mmultiple -Wall -msoft-float -ffreestanding
+CFLAGS= -Os -Wall -msoft-float -ffreestanding
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.52 src/sys/arch/macppc/stand/ofwboot/Makefile:1.53
--- src/sys/arch/macppc/stand/ofwboot/Makefile:1.52 Sun Jan 12 15:26:30 2014
+++ src/sys/arch/macppc/stand/ofwboot/Makefile Fri Aug 8 16:56:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2014/01/12 15:26:30 tsutsui Exp $
+# $NetBSD: Makefile,v 1.53 2014/08/08 16:56:31 joerg Exp $
S= ${.CURDIR}/../../../..
@@ -7,7 +7,7 @@ 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 -mmultiple -ffreestanding
+CFLAGS+= -msoft-float -ffreestanding
CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
#CPPFLAGS+= -DDEBUG -DNETIF_DEBUG
CPPFLAGS+= -D_STANDALONE -DSUPPORT_DHCP
Index: src/sys/arch/ofppc/stand/ofwboot/Makefile
diff -u src/sys/arch/ofppc/stand/ofwboot/Makefile:1.29 src/sys/arch/ofppc/stand/ofwboot/Makefile:1.30
--- src/sys/arch/ofppc/stand/ofwboot/Makefile:1.29 Sun Jan 12 15:26:30 2014
+++ src/sys/arch/ofppc/stand/ofwboot/Makefile Fri Aug 8 16:56:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2014/01/12 15:26:30 tsutsui Exp $
+# $NetBSD: Makefile,v 1.30 2014/08/08 16:56:31 joerg Exp $
S!= cd ${.CURDIR}/../../../.. ; pwd
@@ -16,7 +16,7 @@ CPPFLAGS+= -DHEAP_VARIABLE
.include <bsd.own.mk>
.include <bsd.klinks.mk>
-DBG= -Os -mmultiple
+DBG= -Os
SRCS+= ofwmagic.S
.PATH: ${S}/arch/powerpc/powerpc
Index: src/sys/arch/powerpc/conf/Makefile.powerpc
diff -u src/sys/arch/powerpc/conf/Makefile.powerpc:1.55 src/sys/arch/powerpc/conf/Makefile.powerpc:1.56
--- src/sys/arch/powerpc/conf/Makefile.powerpc:1.55 Tue Aug 5 15:40:59 2014
+++ src/sys/arch/powerpc/conf/Makefile.powerpc Fri Aug 8 16:56:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.powerpc,v 1.55 2014/08/05 15:40:59 apb Exp $
+# $NetBSD: Makefile.powerpc,v 1.56 2014/08/08 16:56:31 joerg Exp $
#
# Makefile for NetBSD
#
@@ -46,7 +46,6 @@ CFLAGS+= -Wa,-maltivec
.if ${PPCDIR} == "booke"
DEFCOPTS= -O2
CFLAGS+= -fstack-protector
-CFLAGS+= -mmultiple -misel
.endif
CFLAGS+= -msdata=none
CFLAGS+= -msoft-float ${CCPUOPTS}
Index: src/sys/arch/prep/conf/INSTALL
diff -u src/sys/arch/prep/conf/INSTALL:1.59 src/sys/arch/prep/conf/INSTALL:1.60
--- src/sys/arch/prep/conf/INSTALL:1.59 Sat Apr 27 21:43:39 2013
+++ src/sys/arch/prep/conf/INSTALL Fri Aug 8 16:56:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.59 2013/04/27 21:43:39 christos Exp $
+# $NetBSD: INSTALL,v 1.60 2014/08/08 16:56:31 joerg Exp $
#
# INSTALL -- Installation kernel
#
@@ -7,7 +7,7 @@ include "arch/prep/conf/std.prep"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-makeoptions COPTS="-Os -mmultiple" # -Os -mmultiple to reduce size.
+makeoptions COPTS="-Os" # Reduce size.
# Enable the hooks used for initializing the ram-disk.
options MEMORY_DISK_HOOKS
Index: src/sys/arch/prep/conf/INSTALL_SMALL
diff -u src/sys/arch/prep/conf/INSTALL_SMALL:1.14 src/sys/arch/prep/conf/INSTALL_SMALL:1.15
--- src/sys/arch/prep/conf/INSTALL_SMALL:1.14 Fri Aug 17 20:11:41 2012
+++ src/sys/arch/prep/conf/INSTALL_SMALL Fri Aug 8 16:56:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_SMALL,v 1.14 2012/08/17 20:11:41 abs Exp $
+# $NetBSD: INSTALL_SMALL,v 1.15 2014/08/08 16:56:31 joerg Exp $
#
# INSTALL -- Installation kernel
#
@@ -7,7 +7,7 @@ include "arch/prep/conf/std.prep"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-makeoptions COPTS="-Os -mmultiple" # -Os -mmultiple to reduce size.
+makeoptions COPTS="-Os" # Reduce size.
# Enable the hooks used for initializing the ram-disk.
options MEMORY_DISK_HOOKS
Index: src/sys/arch/prep/stand/boot/Makefile
diff -u src/sys/arch/prep/stand/boot/Makefile:1.28 src/sys/arch/prep/stand/boot/Makefile:1.29
--- src/sys/arch/prep/stand/boot/Makefile:1.28 Sun Jan 12 15:26:30 2014
+++ src/sys/arch/prep/stand/boot/Makefile Fri Aug 8 16:56:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2014/01/12 15:26:30 tsutsui Exp $
+# $NetBSD: Makefile,v 1.29 2014/08/08 16:56:31 joerg Exp $
NOMAN= # defined
@@ -24,7 +24,7 @@ SRCS+= filesystem.c inkernel.c io.c tget
SRCS+= kbd.c ns16550.c vers.c vreset.c vga.c
SRCS+= pci.c sd.c siop.c
-CFLAGS= -Os -mmultiple -ffreestanding
+CFLAGS= -Os -ffreestanding
CFLAGS+= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes
AFLAGS= -x assembler-with-cpp
Index: src/sys/arch/prep/stand/common/Makefile
diff -u src/sys/arch/prep/stand/common/Makefile:1.11 src/sys/arch/prep/stand/common/Makefile:1.12
--- src/sys/arch/prep/stand/common/Makefile:1.11 Wed Aug 21 06:49:45 2013
+++ src/sys/arch/prep/stand/common/Makefile Fri Aug 8 16:56:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2013/08/21 06:49:45 matt Exp $
+# $NetBSD: Makefile,v 1.12 2014/08/08 16:56:31 joerg Exp $
S= ${.CURDIR}/../../../..
@@ -9,7 +9,7 @@ CPPFLAGS+= -D__daddr_t=int32_t
CPPFLAGS+= -I. -I${S} -I${.OBJDIR}
CPPFLAGS+= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes
-CFLAGS= -Os -mmultiple -ffreestanding
+CFLAGS= -Os -ffreestanding
.include <bsd.prog.mk>
.include <bsd.klinks.mk>
Index: src/sys/arch/rs6000/conf/INSTALL
diff -u src/sys/arch/rs6000/conf/INSTALL:1.1 src/sys/arch/rs6000/conf/INSTALL:1.2
--- src/sys/arch/rs6000/conf/INSTALL:1.1 Thu Apr 30 12:47:40 2009
+++ src/sys/arch/rs6000/conf/INSTALL Fri Aug 8 16:56:32 2014
@@ -1,10 +1,10 @@
-# $NetBSD: INSTALL,v 1.1 2009/04/30 12:47:40 tsutsui Exp $
+# $NetBSD: INSTALL,v 1.2 2014/08/08 16:56:32 joerg Exp $
include "arch/rs6000/conf/GENERIC"
no options INCLUDE_CONFIG_FILE
-makeoptions COPTS="-Os -mmultiple"
+makeoptions COPTS="-Os" # Reduce size.
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # Force root on ram-disk
Index: src/sys/arch/rs6000/stand/boot/Makefile
diff -u src/sys/arch/rs6000/stand/boot/Makefile:1.6 src/sys/arch/rs6000/stand/boot/Makefile:1.7
--- src/sys/arch/rs6000/stand/boot/Makefile:1.6 Sun Jan 12 15:26:30 2014
+++ src/sys/arch/rs6000/stand/boot/Makefile Fri Aug 8 16:56:32 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/01/12 15:26:30 tsutsui Exp $
+# $NetBSD: Makefile,v 1.7 2014/08/08 16:56:32 joerg Exp $
NOMAN= # defined
@@ -25,7 +25,7 @@ SRCS+= filesystem.c inkernel.c io.c tget
SRCS+= ns16550.c vers.c
SRCS+= iplcb.c
-CFLAGS= -Os -mmultiple -ffreestanding
+CFLAGS= -Os -ffreestanding
CFLAGS+= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes
AFLAGS= -x assembler-with-cpp
Index: src/sys/arch/rs6000/stand/common/Makefile
diff -u src/sys/arch/rs6000/stand/common/Makefile:1.3 src/sys/arch/rs6000/stand/common/Makefile:1.4
--- src/sys/arch/rs6000/stand/common/Makefile:1.3 Wed Aug 21 06:20:49 2013
+++ src/sys/arch/rs6000/stand/common/Makefile Fri Aug 8 16:56:32 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/08/21 06:20:49 matt Exp $
+# $NetBSD: Makefile,v 1.4 2014/08/08 16:56:32 joerg Exp $
S= ${.CURDIR}/../../../..
@@ -11,7 +11,7 @@ CPPFLAGS+= -D__daddr_t=int32_t
CPPFLAGS+= -I. -I${S} -I${.OBJDIR}
CPPFLAGS+= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes -Wno-pointer-sign
-CFLAGS= -Os -mmultiple -ffreestanding
+CFLAGS= -Os -ffreestanding
.include <bsd.prog.mk>
Index: src/sys/arch/sandpoint/stand/altboot/Makefile
diff -u src/sys/arch/sandpoint/stand/altboot/Makefile:1.14 src/sys/arch/sandpoint/stand/altboot/Makefile:1.15
--- src/sys/arch/sandpoint/stand/altboot/Makefile:1.14 Sun Jan 12 15:26:30 2014
+++ src/sys/arch/sandpoint/stand/altboot/Makefile Fri Aug 8 16:56:32 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2014/01/12 15:26:30 tsutsui Exp $
+# $NetBSD: Makefile,v 1.15 2014/08/08 16:56:32 joerg Exp $
S= ${.CURDIR}/../../../..
@@ -10,7 +10,7 @@ SRCS+= nif.c fxp.c tlp.c rge.c skg.c st
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 -mmultiple
+CFLAGS+= -Wall -Wno-main -ffreestanding -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
Index: src/sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk
diff -u src/sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk:1.1 src/sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk:1.2
--- src/sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk:1.1 Wed Jun 15 09:45:59 2011
+++ src/sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk Fri Aug 8 16:56:32 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.powerpc-booke.mk,v 1.1 2011/06/15 09:45:59 mrg Exp $
+# $NetBSD: bsd.powerpc-booke.mk,v 1.2 2014/08/08 16:56:32 joerg Exp $
.ifndef _BSD_POWERPC_BOOKE_MK_
_BSD_POWERPC_BOOKE_MK_=1
@@ -7,7 +7,7 @@ KMODULEARCHDIR:= powerpc-booke
# gcc emits bad code with these options
#CPPFLAGS+= -mcpu=8548
-CPPFLAGS+= -mmultiple -mno-string -misel -Wa,-me500
+CPPFLAGS+= -misel -Wa,-me500
PPC_BOOKE= 1
# hack into bsd.kmodule.mk
