Source-Changes-HG archive

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

[src/trunk]: src Don't set -mmultiple or -mno-string for PowerPC, the differe...



details:   https://anonhg.NetBSD.org/src/rev/6f9fc64ddca6
branches:  trunk
changeset: 798085:6f9fc64ddca6
user:      joerg <joerg%NetBSD.org@localhost>
date:      Fri Aug 08 16:56:30 2014 +0000

description:
Don't set -mmultiple or -mno-string for PowerPC, the difference is too
small to really matter and it sometimes even increases the size.

diffstat:

 distrib/bebox/ramdisk/Makefile                              |  4 ++--
 distrib/evbppc/ramdisk/Makefile                             |  4 ++--
 distrib/ibmnws/netboot/ramdisk/Makefile                     |  3 +--
 distrib/macppc/floppies/ramdisk/Makefile                    |  4 ++--
 distrib/prep/floppies/ramdisk/Makefile                      |  4 ++--
 distrib/rs6000/ramdisk/Makefile                             |  4 ++--
 distrib/sandpoint/ramdisk/Makefile                          |  4 ++--
 sys/arch/bebox/stand/common/Makefile                        |  4 ++--
 sys/arch/evbppc/conf/Makefile.mpc85xx.inc                   |  5 ++---
 sys/arch/ibmnws/conf/GENERIC                                |  4 +---
 sys/arch/macppc/conf/INSTALL                                |  4 ++--
 sys/arch/macppc/stand/bootxx/Makefile                       |  4 ++--
 sys/arch/macppc/stand/ofwboot/Makefile                      |  4 ++--
 sys/arch/ofppc/stand/ofwboot/Makefile                       |  4 ++--
 sys/arch/powerpc/conf/Makefile.powerpc                      |  3 +--
 sys/arch/prep/conf/INSTALL                                  |  4 ++--
 sys/arch/prep/conf/INSTALL_SMALL                            |  4 ++--
 sys/arch/prep/stand/boot/Makefile                           |  4 ++--
 sys/arch/prep/stand/common/Makefile                         |  4 ++--
 sys/arch/rs6000/conf/INSTALL                                |  4 ++--
 sys/arch/rs6000/stand/boot/Makefile                         |  4 ++--
 sys/arch/rs6000/stand/common/Makefile                       |  4 ++--
 sys/arch/sandpoint/stand/altboot/Makefile                   |  4 ++--
 sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk |  4 ++--
 24 files changed, 45 insertions(+), 50 deletions(-)

diffs (truncated from 423 to 300 lines):

diff -r 1ff105d7a5ff -r 6f9fc64ddca6 distrib/bebox/ramdisk/Makefile
--- a/distrib/bebox/ramdisk/Makefile    Fri Aug 08 15:20:10 2014 +0000
+++ b/distrib/bebox/ramdisk/Makefile    Fri Aug 08 16:56:30 2014 +0000
@@ -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 @@
 MAKEFS_FLAGS=  -f 15
 
 WARNS=         1
-DBG=           -Os -mmultiple
+DBG=           -Os
 
 CRUNCHBIN=     ramdiskbin
 CRUNCHGEN_FLAGS=-d "${DBG}"
diff -r 1ff105d7a5ff -r 6f9fc64ddca6 distrib/evbppc/ramdisk/Makefile
--- a/distrib/evbppc/ramdisk/Makefile   Fri Aug 08 15:20:10 2014 +0000
+++ b/distrib/evbppc/ramdisk/Makefile   Fri Aug 08 16:56:30 2014 +0000
@@ -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 @@
 MAKEFS_FLAGS=  -f 15
 
 WARNS=         1
-DBG=           -Os -mmultiple -mno-string -fno-pie -fno-pic
+DBG=           -Os
 
 CRUNCHBIN=     ramdiskbin
 CRUNCHGEN_FLAGS=-d "${DBG}"
diff -r 1ff105d7a5ff -r 6f9fc64ddca6 distrib/ibmnws/netboot/ramdisk/Makefile
--- a/distrib/ibmnws/netboot/ramdisk/Makefile   Fri Aug 08 15:20:10 2014 +0000
+++ b/distrib/ibmnws/netboot/ramdisk/Makefile   Fri Aug 08 16:56:30 2014 +0000
@@ -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 @@
 MAKEFS_FLAGS=  -f 15
 
 WARNS=         1
-# DBG=         -Os -mmultiple -mstring
 
 CRUNCHBIN=     ramdiskbin
 CRUNCHGEN_FLAGS= -d "${DBG}"
diff -r 1ff105d7a5ff -r 6f9fc64ddca6 distrib/macppc/floppies/ramdisk/Makefile
--- a/distrib/macppc/floppies/ramdisk/Makefile  Fri Aug 08 15:20:10 2014 +0000
+++ b/distrib/macppc/floppies/ramdisk/Makefile  Fri Aug 08 16:56:30 2014 +0000
@@ -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 @@
 MAKEFS_FLAGS=  -f 15
 
 WARNS=         1
-DBG=           -Os -mmultiple -mstring
+DBG=           -Os
 
 CRUNCHBIN=     ramdiskbin
 CRUNCHGEN_FLAGS= -d "${DBG}"
diff -r 1ff105d7a5ff -r 6f9fc64ddca6 distrib/prep/floppies/ramdisk/Makefile
--- a/distrib/prep/floppies/ramdisk/Makefile    Fri Aug 08 15:20:10 2014 +0000
+++ b/distrib/prep/floppies/ramdisk/Makefile    Fri Aug 08 16:56:30 2014 +0000
@@ -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 @@
 MAKEFS_FLAGS=  -f 15
 
 WARNS=         1
-DBG=           -Os -mmultiple
+DBG=           -Os
 
 CRUNCHBIN=     ramdiskbin
 CRUNCHGEN_FLAGS=-d "${DBG}"
diff -r 1ff105d7a5ff -r 6f9fc64ddca6 distrib/rs6000/ramdisk/Makefile
--- a/distrib/rs6000/ramdisk/Makefile   Fri Aug 08 15:20:10 2014 +0000
+++ b/distrib/rs6000/ramdisk/Makefile   Fri Aug 08 16:56:30 2014 +0000
@@ -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 @@
 MAKEFS_FLAGS=  -f 15
 
 WARNS=         1
-DBG=           -Os -mmultiple -mstring
+DBG=           -Os
 
 CRUNCHBIN=     ramdiskbin
 CRUNCHGEN_FLAGS= -d "${DBG}"
diff -r 1ff105d7a5ff -r 6f9fc64ddca6 distrib/sandpoint/ramdisk/Makefile
--- a/distrib/sandpoint/ramdisk/Makefile        Fri Aug 08 15:20:10 2014 +0000
+++ b/distrib/sandpoint/ramdisk/Makefile        Fri Aug 08 16:56:30 2014 +0000
@@ -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 @@
 MAKEFS_FLAGS=  -f 15
 
 WARNS=         1
-DBG=           -Os -mmultiple -mstring
+DBG=           -Os
 
 CRUNCHBIN=     ramdiskbin
 CRUNCHGEN_FLAGS=-d "${DBG}"
diff -r 1ff105d7a5ff -r 6f9fc64ddca6 sys/arch/bebox/stand/common/Makefile
--- a/sys/arch/bebox/stand/common/Makefile      Fri Aug 08 15:20:10 2014 +0000
+++ b/sys/arch/bebox/stand/common/Makefile      Fri Aug 08 16:56:30 2014 +0000
@@ -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+= -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>
diff -r 1ff105d7a5ff -r 6f9fc64ddca6 sys/arch/evbppc/conf/Makefile.mpc85xx.inc
--- a/sys/arch/evbppc/conf/Makefile.mpc85xx.inc Fri Aug 08 15:20:10 2014 +0000
+++ b/sys/arch/evbppc/conf/Makefile.mpc85xx.inc Fri Aug 08 16:56:30 2014 +0000
@@ -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
diff -r 1ff105d7a5ff -r 6f9fc64ddca6 sys/arch/ibmnws/conf/GENERIC
--- a/sys/arch/ibmnws/conf/GENERIC      Fri Aug 08 15:20:10 2014 +0000
+++ b/sys/arch/ibmnws/conf/GENERIC      Fri Aug 08 16:56:30 2014 +0000
@@ -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 @@
 
 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\""
diff -r 1ff105d7a5ff -r 6f9fc64ddca6 sys/arch/macppc/conf/INSTALL
--- a/sys/arch/macppc/conf/INSTALL      Fri Aug 08 15:20:10 2014 +0000
+++ b/sys/arch/macppc/conf/INSTALL      Fri Aug 08 16:56:30 2014 +0000
@@ -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 @@
 
 #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
 
diff -r 1ff105d7a5ff -r 6f9fc64ddca6 sys/arch/macppc/stand/bootxx/Makefile
--- a/sys/arch/macppc/stand/bootxx/Makefile     Fri Aug 08 15:20:10 2014 +0000
+++ b/sys/arch/macppc/stand/bootxx/Makefile     Fri Aug 08 16:56:30 2014 +0000
@@ -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 @@
 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
diff -r 1ff105d7a5ff -r 6f9fc64ddca6 sys/arch/macppc/stand/ofwboot/Makefile
--- a/sys/arch/macppc/stand/ofwboot/Makefile    Fri Aug 08 15:20:10 2014 +0000
+++ b/sys/arch/macppc/stand/ofwboot/Makefile    Fri Aug 08 16:56:30 2014 +0000
@@ -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 @@
 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
diff -r 1ff105d7a5ff -r 6f9fc64ddca6 sys/arch/ofppc/stand/ofwboot/Makefile
--- a/sys/arch/ofppc/stand/ofwboot/Makefile     Fri Aug 08 15:20:10 2014 +0000
+++ b/sys/arch/ofppc/stand/ofwboot/Makefile     Fri Aug 08 16:56:30 2014 +0000
@@ -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 @@
 .include <bsd.own.mk>
 .include <bsd.klinks.mk>
 
-DBG=           -Os -mmultiple
+DBG=           -Os
 
 SRCS+=         ofwmagic.S
 .PATH:         ${S}/arch/powerpc/powerpc
diff -r 1ff105d7a5ff -r 6f9fc64ddca6 sys/arch/powerpc/conf/Makefile.powerpc
--- a/sys/arch/powerpc/conf/Makefile.powerpc    Fri Aug 08 15:20:10 2014 +0000
+++ b/sys/arch/powerpc/conf/Makefile.powerpc    Fri Aug 08 16:56:30 2014 +0000
@@ -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 @@
 .if ${PPCDIR} == "booke"
 DEFCOPTS=      -O2
 CFLAGS+=       -fstack-protector
-CFLAGS+=       -mmultiple -misel
 .endif
 CFLAGS+=       -msdata=none
 CFLAGS+=       -msoft-float ${CCPUOPTS}
diff -r 1ff105d7a5ff -r 6f9fc64ddca6 sys/arch/prep/conf/INSTALL
--- a/sys/arch/prep/conf/INSTALL        Fri Aug 08 15:20:10 2014 +0000
+++ b/sys/arch/prep/conf/INSTALL        Fri Aug 08 16:56:30 2014 +0000
@@ -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 @@
 
 #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
diff -r 1ff105d7a5ff -r 6f9fc64ddca6 sys/arch/prep/conf/INSTALL_SMALL
--- a/sys/arch/prep/conf/INSTALL_SMALL  Fri Aug 08 15:20:10 2014 +0000
+++ b/sys/arch/prep/conf/INSTALL_SMALL  Fri Aug 08 16:56:30 2014 +0000
@@ -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 @@
 
 #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
diff -r 1ff105d7a5ff -r 6f9fc64ddca6 sys/arch/prep/stand/boot/Makefile



Home | Main Index | Thread Index | Old Index