Browse Source

Stefan Fiedler:


			
			
				rocklinux
			
			
		
Stefan Fiedler 17 years ago
parent
commit
07b3473bf1
8 changed files with 70 additions and 40 deletions
  1. +5
    -0
      architecture/arm/gcc-options
  2. +3
    -1
      architecture/mips/archtest.sh
  3. +3
    -0
      architecture/powerpc/archtest.sh
  4. +19
    -4
      architecture/powerpc/config.in
  5. +1
    -0
      architecture/sparc/archtest.sh
  6. +4
    -0
      architecture/x86/archtest.sh
  7. +34
    -34
      architecture/x86/gcc-options
  8. +1
    -1
      architecture/x86/parse-config

+ 5
- 0
architecture/arm/gcc-options

@ -1,10 +1,15 @@
#!/bin/bash
if [ $ROCKCFG_ARM_OPT != generic ] ; then if [ $ROCKCFG_ARM_OPT != generic ] ; then
var_append GCC3_WRAPPER_INSERT " " \ var_append GCC3_WRAPPER_INSERT " " \
"-mcpu=$ROCKCFG_ARM_OPT" "-mcpu=$ROCKCFG_ARM_OPT"
var_append GCC4_WRAPPER_INSERT " " \
"-mcpu=$ROCKCFG_ARM_OPT"
fi fi
if [ $ROCKCFG_ARM_OPT_ARCH != generic ] ; then if [ $ROCKCFG_ARM_OPT_ARCH != generic ] ; then
var_append GCC3_WRAPPER_INSERT " " \ var_append GCC3_WRAPPER_INSERT " " \
"-march=$ROCKCFG_ARM_OPT_ARCH" "-march=$ROCKCFG_ARM_OPT_ARCH"
var_append GCC4_WRAPPER_INSERT " " \
"-march=$ROCKCFG_ARM_OPT_ARCH"
fi fi

+ 3
- 1
architecture/mips/archtest.sh

@ -14,5 +14,7 @@ case "$ROCKCFG_MIPS_ABI" in
arch_target="${arch_machine}${arch_endianess}-unknown-linux-gnu" ;; arch_target="${arch_machine}${arch_endianess}-unknown-linux-gnu" ;;
*64) *64)
arch_machine=mips64 arch_machine=mips64
arch_target="${arch_machine}${arch_endianess}-unknown-linux-gnu" ;;
arch_target="${arch_machine}${arch_endianess}-unknown-linux-gnu"
arch_target32="mips${arch_endianess}-unknown-linux-gnu"
;;
esac esac

+ 3
- 0
architecture/powerpc/archtest.sh

@ -0,0 +1,3 @@
if [ "$ROCKCFG_POWERPC_ISA" = powerpc64 ] ; then
arch_target32=powerpc-unknown-linux-gnu
fi

+ 19
- 4
architecture/powerpc/config.in

@ -29,10 +29,19 @@ choice ROCKCFG_POWERPC_ISA powerpc \
powerpc64 "Utilise the PowerPC64 ISA" powerpc64 "Utilise the PowerPC64 ISA"
choice ROCKCFG_POWERPC_OPT generic \ choice ROCKCFG_POWERPC_OPT generic \
generic "No special optimisation" \
common "No special optimisation" \
rios "Optimised for rios" \
rios1 "Optimised for rios1" \ rios1 "Optimised for rios1" \
rios2 "Optimised for rios2" \ rios2 "Optimised for rios2" \
rsc "Optimised for rsc" \ rsc "Optimised for rsc" \
rsc64 "Optimised for rsc64" \
401 "Optimised for 401" \
403 "Optimised for 403" \
405 "Optimised for 405" \
405fp "Optimised for 405fp" \
440 "Optimised for 440" \
440fp "Optimised for 440fp" \
505 "Optimised for 505" \
601 "Optimised for 601" \ 601 "Optimised for 601" \
602 "Optimised for 602" \ 602 "Optimised for 602" \
603 "Optimised for 603" \ 603 "Optimised for 603" \
@ -44,12 +53,18 @@ choice ROCKCFG_POWERPC_OPT generic \
750 "Optimised for 750 (G3)" \ 750 "Optimised for 750 (G3)" \
7400 "Optimised for 7400 (G4)" \ 7400 "Optimised for 7400 (G4)" \
7450 "Optimised for 7450 (G4+)" \ 7450 "Optimised for 7450 (G4+)" \
403 "Optimised for 403" \
505 "Optimised for 505" \
801 "Optimised for 801" \ 801 "Optimised for 801" \
821 "Optimised for 821" \ 821 "Optimised for 821" \
823 "Optimised for 823" \ 823 "Optimised for 823" \
860 "Optimised for 860"
8540 "Optimised for 8540" \
ec603e "Optimised for ec603e" \
G3 "Optimised for G3" \
G4 "Optimised for G4" \
G5 "Optimised for G5" \
power3 "Optimised for power3" \
power4 "Optimised for power4" \
power5+ "Optimised for power5+" \
power6 "Optimised for power6"
if [ $ROCKCFG_POWERPC_ISA != common ] ; then if [ $ROCKCFG_POWERPC_ISA != common ] ; then
ROCKCFG_ID="$ROCKCFG_ID-$ROCKCFG_POWERPC_ISA" ROCKCFG_ID="$ROCKCFG_ID-$ROCKCFG_POWERPC_ISA"

+ 1
- 0
architecture/sparc/archtest.sh

@ -7,6 +7,7 @@ case "$ROCKCFG_SPARC_BITS" in
64) 64)
arch_machine=sparc64 arch_machine=sparc64
arch_target="sparc64-unknown-linux-gnu" arch_target="sparc64-unknown-linux-gnu"
arch_target32="sparc-unknown-linux-gnu"
arch_sizeof_char_p=8 ;; arch_sizeof_char_p=8 ;;
esac esac

+ 4
- 0
architecture/x86/archtest.sh

@ -14,7 +14,11 @@ else
arch_sizeof_long=8 arch_sizeof_long=8
arch_sizeof_char_p=8 arch_sizeof_char_p=8
arch_machine="x86_64" arch_machine="x86_64"
arch_target32="i686-pc-linux-gnu"
fi fi
arch_target="${arch_machine}-unknown-linux-gnu" arch_target="${arch_machine}-unknown-linux-gnu"
if [ "$ROCKCFG_X86_BITS" = 64 ] ; then
arch_target64="$arch_target"
fi

+ 34
- 34
architecture/x86/gcc-options

@ -1,62 +1,62 @@
#!/bin/bash
if [ "$ROCKCFG_X86_BITS" = 32 ] if [ "$ROCKCFG_X86_BITS" = 32 ]
then then
case "$ROCKCFG_X86_OPT" in case "$ROCKCFG_X86_OPT" in
generic) generic)
var_append GCC4_WRAPPER_INSERT " " "-march=i486" ;;
via-c3)
var_append GCC4_WRAPPER_INSERT " " "-march=k62" ;;
via-c3-improved)
var_append GCC4_WRAPPER_INSERT " " "-march=i686" ;;
via-c3-2)
var_append GCC4_WRAPPER_INSERT " " "-march=pentium-mmx" ;;
k6*)
var_append GCC4_WRAPPER_INSERT " " "-march=$ROCKCFG_X86_OPT"
# workaround and should be removed when gcc 3.x got fixed ...
var_append GCC4_WRAPPER_INSERT " " "-fno-branch-count-reg"
var_append GCC_WRAPPER_INSERT " " "-march=i486"
;; ;;
*)
var_append GCC4_WRAPPER_INSERT " " "-march=$ROCKCFG_X86_OPT" ;;
esac
case "$ROCKCFG_X86_OPT" in
generic)
var_append GCC3_WRAPPER_INSERT " " "-march=i486" ;;
via-c3) via-c3)
var_append GCC3_WRAPPER_INSERT " " "-march=k62" ;;
var_append GCC2_WRAPPER_INSERT " " "-march=k6"
var_append GCC3_WRAPPER_INSERT " " "-march=k62"
var_append GCC4_WRAPPER_INSERT " " "-march=k62"
;;
via-c3-improved) via-c3-improved)
var_append GCC3_WRAPPER_INSERT " " "-march=i686" ;;
var_append GCC_WRAPPER_INSERT " " "-march=i686"
;;
via-c3-2) via-c3-2)
var_append GCC3_WRAPPER_INSERT " " "-march=pentium-mmx" ;;
var_append GCC2_WRAPPER_INSERT " " "-march=pentiumpro"
var_append GCC3_WRAPPER_INSERT " " "-march=pentium-mmx"
var_append GCC4_WRAPPER_INSERT " " "-march=pentium-mmx"
;;
k6*) k6*)
var_append GCC2_WRAPPER_INSERT " " "-march=k6"
var_append GCC3_WRAPPER_INSERT " " "-march=$ROCKCFG_X86_OPT" var_append GCC3_WRAPPER_INSERT " " "-march=$ROCKCFG_X86_OPT"
# workaround and should be removed when gcc 3.x got fixed ... # 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 " " "-fno-branch-count-reg"
var_append GCC4_WRAPPER_INSERT " " "-march=$ROCKCFG_X86_OPT"
# # workaround and should be removed when gcc 3.x got fixed ...
# var_append GCC4_WRAPPER_INSERT " " "-fno-branch-count-reg"
;; ;;
*) *)
var_append GCC3_WRAPPER_INSERT " " "-march=$ROCKCFG_X86_OPT" ;;
var_append GCC3_WRAPPER_INSERT " " "-march=$ROCKCFG_X86_OPT"
var_append GCC4_WRAPPER_INSERT " " "-march=$ROCKCFG_X86_OPT"
;;
esac esac
case "$ROCKCFG_X86_OPT" in case "$ROCKCFG_X86_OPT" in
generic)
var_append GCC2_WRAPPER_INSERT " " "-march=i486" ;;
i386|i486) i386|i486)
var_append GCC2_WRAPPER_INSERT " " "-march=$ROCKCFG_X86_OPT" ;; var_append GCC2_WRAPPER_INSERT " " "-march=$ROCKCFG_X86_OPT" ;;
pentium|pentium-mmx) pentium|pentium-mmx)
var_append GCC2_WRAPPER_INSERT " " "-march=pentium" ;; var_append GCC2_WRAPPER_INSERT " " "-march=pentium" ;;
pentium*|via-c3-2)
pentium*)
var_append GCC2_WRAPPER_INSERT " " "-march=pentiumpro" ;; var_append GCC2_WRAPPER_INSERT " " "-march=pentiumpro" ;;
k6*|athlon*|via-c3)
athlon*)
var_append GCC2_WRAPPER_INSERT " " "-march=k6" ;; var_append GCC2_WRAPPER_INSERT " " "-march=k6" ;;
via-c3-improved)
var_append GCC2_WRAPPER_INSERT " " "-march=i686" ;;
esac esac
else else
case "$ROCKCFG_X86_OPT" in case "$ROCKCFG_X86_OPT" in
generic) ;;
generic)
# Other values like i686 or pentiumpro cause a build error in e.g.
# glibc 2.6.1 when building with gcc 4.2.1.
if [[ "$xpkg" = *-32bit ]] ; then
var_append GCC_WRAPPER_INSERT " " "-march=pentium4"
fi
;;
intel) intel)
var_append GCC2_WRAPPER_INSERT " " "-march=x86_64" var_append GCC2_WRAPPER_INSERT " " "-march=x86_64"
var_append GCC3_WRAPPER_INSERT " " "-march=nocona" var_append GCC3_WRAPPER_INSERT " " "-march=nocona"
@ -68,9 +68,9 @@ else
var_append GCC4_WRAPPER_INSERT " " "-march=k8" var_append GCC4_WRAPPER_INSERT " " "-march=k8"
;; ;;
esac esac
fi fi
# remove other -march and -mcpu options from the argument list
var_insert GCC_WRAPPER_REMOVE " " "-march=* -mcpu=*"
# remove other -march and -mtune options from the argument list
var_insert GCC_WRAPPER_REMOVE " " "-march=* -mtune=*"
# Remove deprecated options:
var_insert GCC_WRAPPER_REMOVE " " "-mcpu=* -m386 -m486 -mpentium -mpentiumpro"

+ 1
- 1
architecture/x86/parse-config

@ -1,3 +1,4 @@
#!/bin/bash
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
# #
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
@ -23,4 +24,3 @@
if [ "$ROCKCFG_X86_BITS" = 64 -a "$forcefpic" = "" ]; then if [ "$ROCKCFG_X86_BITS" = 64 -a "$forcefpic" = "" ]; then
forcefpic="1" forcefpic="1"
fi fi

Loading…
Cancel
Save