Module Name: src
Committed By: ad
Date: Mon May 4 21:32:32 UTC 2009
Modified Files:
src/gnu/usr.bin/gcc4/arch/i386: configargs.h
src/gnu/usr.bin/gcc4/arch/x86_64: configargs.h
src/share/mk: bsd.own.mk
src/tools/gcc: Makefile
Log Message:
Enable -mtune=nocona by default on x86. I have tested on a range of CPUs
and this seems to give the best results.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/gnu/usr.bin/gcc4/arch/i386/configargs.h
cvs rdiff -u -r1.10 -r1.11 src/gnu/usr.bin/gcc4/arch/x86_64/configargs.h
cvs rdiff -u -r1.562 -r1.563 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.31 -r1.32 src/tools/gcc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/usr.bin/gcc4/arch/i386/configargs.h
diff -u src/gnu/usr.bin/gcc4/arch/i386/configargs.h:1.14 src/gnu/usr.bin/gcc4/arch/i386/configargs.h:1.15
--- src/gnu/usr.bin/gcc4/arch/i386/configargs.h:1.14 Fri Mar 27 19:38:43 2009
+++ src/gnu/usr.bin/gcc4/arch/i386/configargs.h Mon May 4 21:32:31 2009
@@ -3,9 +3,9 @@
/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */
/* Generated automatically. */
-static const char configuration_arguments[] = "/home/drochner/netbsd/work.src.usbdev/tools/gcc/../../gnu/dist/gcc4/configure --target=i486--netbsdelf --enable-long-long --enable-threads --enable-__cxa_atexit --with-arch=i486 --disable-multilib --disable-symvers --build=i386-unknown-netbsdelf5.99.8 --host=i486--netbsdelf";
+static const char configuration_arguments[] = "/home/drochner/netbsd/work.src.usbdev/tools/gcc/../../gnu/dist/gcc4/configure --target=i486--netbsdelf --enable-long-long --enable-threads --enable-__cxa_atexit --with-arch=i486 --with-tune=nocona --disable-multilib --disable-symvers --build=i386-unknown-netbsdelf5.99.8 --host=i486--netbsdelf";
static const char thread_model[] = "posix";
static const struct {
const char *name, *value;
-} configure_default_options[] = { { "cpu", "i486" }, { "arch", "i486" } };
+} configure_default_options[] = { { "cpu", "i486" }, { "arch", "i486" }, { "tune", "nocona" } };
Index: src/gnu/usr.bin/gcc4/arch/x86_64/configargs.h
diff -u src/gnu/usr.bin/gcc4/arch/x86_64/configargs.h:1.10 src/gnu/usr.bin/gcc4/arch/x86_64/configargs.h:1.11
--- src/gnu/usr.bin/gcc4/arch/x86_64/configargs.h:1.10 Mon Sep 1 23:52:24 2008
+++ src/gnu/usr.bin/gcc4/arch/x86_64/configargs.h Mon May 4 21:32:31 2009
@@ -3,9 +3,9 @@
/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */
/* Generated automatically. */
-static const char configuration_arguments[] = "/usr/src/tools/gcc/../../gnu/dist/gcc4/configure --enable-long-long --disable-multilib --enable-threads --disable-symvers --build=x86_64-unknown-netbsd4.99.72 --host=x86_64--netbsd --target=x86_64--netbsd --enable-__cxa_atexit";
+static const char configuration_arguments[] = "/usr/src/tools/gcc/../../gnu/dist/gcc4/configure --enable-long-long --disable-multilib --enable-threads --disable-symvers --build=x86_64-unknown-netbsd4.99.72 --host=x86_64--netbsd --target=x86_64--netbsd --enable-__cxa_atexit --with-tune=nocona";
static const char thread_model[] = "posix";
static const struct {
const char *name, *value;
-} configure_default_options[] = { { "cpu", "k8" } };
+} configure_default_options[] = { { "cpu", "k8" }, { "tune", "nocona" } };
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.562 src/share/mk/bsd.own.mk:1.563
--- src/share/mk/bsd.own.mk:1.562 Fri May 1 20:47:53 2009
+++ src/share/mk/bsd.own.mk Mon May 4 21:32:31 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.562 2009/05/01 20:47:53 apb Exp $
+# $NetBSD: bsd.own.mk,v 1.563 2009/05/04 21:32:31 ad Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@@ -538,6 +538,8 @@
GNU_ARCH.coldfire=m68k
GNU_ARCH.i386=i486
GCC_CONFIG_ARCH.i386=i486
+GCC_CONFIG_TUNE.i386=nocona
+GCC_CONFIG_TUNE.x86_64=nocona
GNU_ARCH.m68000=m68010
GNU_ARCH.sh3eb=sh
GNU_ARCH.sh3el=shle
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.31 src/tools/gcc/Makefile:1.32
--- src/tools/gcc/Makefile:1.31 Fri Mar 27 19:19:49 2009
+++ src/tools/gcc/Makefile Mon May 4 21:32:31 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2009/03/27 19:19:49 drochner Exp $
+# $NetBSD: Makefile,v 1.32 2009/05/04 21:32:31 ad Exp $
.include <bsd.own.mk>
@@ -24,6 +24,9 @@
.if defined(GCC_CONFIG_ARCH.${MACHINE_ARCH})
COMMON_CONFIGURE_ARGS+= --with-arch=${GCC_CONFIG_ARCH.${MACHINE_ARCH}}
.endif
+.if defined(GCC_CONFIG_TUNE.${MACHINE_ARCH})
+COMMON_CONFIGURE_ARGS+= --with-tune=${GCC_CONFIG_TUNE.${MACHINE_ARCH}}
+.endif
CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS} \
--disable-nls \
