From 2b74ff94db3c547cfec890e7f0c64cd7fedadac4 Mon Sep 17 00:00:00 2001 From: "Bernhard C. Schrenk" Date: Mon, 29 Nov 2004 18:59:13 +0000 Subject: [PATCH] Bernhard C. Schrenk: added athlon64 gcc march option Set both (gcc2 and gcc3) options for athlon64 at once [2004111820474700507] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4868 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- architecture/x86/gcc-options | 77 +++++++++++++++++++++--------------- 1 file changed, 45 insertions(+), 32 deletions(-) diff --git a/architecture/x86/gcc-options b/architecture/x86/gcc-options index a0a8a388f..caeff3399 100644 --- a/architecture/x86/gcc-options +++ b/architecture/x86/gcc-options @@ -1,36 +1,49 @@ -case "$ROCKCFG_X86_OPT" in - generic) ;; - via-c3) - var_append GCC3_WRAPPER_INSERT " " "-march=k62" ;; - via-c3-improved) - var_append GCC3_WRAPPER_INSERT " " "-march=i686" ;; - via-c3-2) - var_append GCC3_WRAPPER_INSERT " " "-march=pentium-mmx" ;; - k6*) - var_append GCC3_WRAPPER_INSERT " " "-march=$ROCKCFG_X86_OPT" - # workaround and should be removed when gcc 3.x got fixed ... - var_append GCC3_WRAPPER_INSERT " " "-fno-branch-count-reg" - ;; - *) - var_append GCC3_WRAPPER_INSERT " " "-march=$ROCKCFG_X86_OPT" ;; -esac - -case "$ROCKCFG_X86_OPT" in - i386|i486) - var_append GCC2_WRAPPER_INSERT " " "-march=$ROCKCFG_X86_OPT" ;; - - pentium|pentium-mmx) - var_append GCC2_WRAPPER_INSERT " " "-march=pentium" ;; - - pentium*|via-c3-2) - var_append GCC2_WRAPPER_INSERT " " "-march=pentiumpro" ;; - - k6*|athlon*|via-c3) - var_append GCC2_WRAPPER_INSERT " " "-march=k6" ;; - via-c3-improved) - var_append GCC2_WRAPPER_INSERT " " "-march=i686" ;; -esac +if [ "$ROCKCFG_X86_BITS" = 32 ] ; then + case "$ROCKCFG_X86_OPT" in + generic) ;; + via-c3) + var_append GCC3_WRAPPER_INSERT " " "-march=k62" ;; + via-c3-improved) + var_append GCC3_WRAPPER_INSERT " " "-march=i686" ;; + via-c3-2) + var_append GCC3_WRAPPER_INSERT " " "-march=pentium-mmx" ;; + k6*) + var_append GCC3_WRAPPER_INSERT " " "-march=$ROCKCFG_X86_OPT" + # workaround and should be removed when gcc 3.x got fixed ... + var_append GCC3_WRAPPER_INSERT " " "-fno-branch-count-reg" + ;; + *) + var_append GCC3_WRAPPER_INSERT " " "-march=$ROCKCFG_X86_OPT" ;; + esac + + case "$ROCKCFG_X86_OPT" in + i386|i486) + var_append GCC2_WRAPPER_INSERT " " "-march=$ROCKCFG_X86_OPT" ;; + + pentium|pentium-mmx) + var_append GCC2_WRAPPER_INSERT " " "-march=pentium" ;; + + pentium*|via-c3-2) + var_append GCC2_WRAPPER_INSERT " " "-march=pentiumpro" ;; + + k6*|athlon*|via-c3) + var_append GCC2_WRAPPER_INSERT " " "-march=k6" ;; + via-c3-improved) + var_append GCC2_WRAPPER_INSERT " " "-march=i686" ;; + esac + +else + + case "$ROCKCFG_X86_OPT" in + generic) ;; + athlon) + var_append GCC2_WRAPPER_INSERT " " "-march=x86_64" + var_append GCC3_WRAPPER_INSERT " " "-march=k8" + ;; + esac + +fi # remove other -march and -mcpu options from the argument list var_insert GCC_WRAPPER_REMOVE " " "-march=* -mcpu=*"