From a75f379f0d2cb1ea9edc7eb8f38b51af493d166b Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Sun, 3 Aug 2003 18:19:34 +0000 Subject: [PATCH] sparc forces the use of the cross toolchain if 64bit kernel and 32bit userspace is selected ... git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@991 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- architecture/sparc/config.hlp | 5 +---- architecture/sparc/config.in | 9 +++++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/architecture/sparc/config.hlp b/architecture/sparc/config.hlp index d99fbca12..fe9108cda 100644 --- a/architecture/sparc/config.hlp +++ b/architecture/sparc/config.hlp @@ -26,10 +26,7 @@ ROCKCFG_SPARC_BITS with the glibc - and is so _not_ recommended!) ROCKCFG_SPARC_64BIT_KERNEL - This options controls whether to buildt a 64-Bit kernel. - -ROCKCFG_MULTILIB - Enable installing several versions of the same library. + This options controls whether to build a 64-Bit kernel. ROCKCFG_SPARC_OPT Please select the CPU you want to optimise for. diff --git a/architecture/sparc/config.in b/architecture/sparc/config.in index 7cda010bb..a6f2b14fd 100644 --- a/architecture/sparc/config.in +++ b/architecture/sparc/config.in @@ -25,7 +25,7 @@ # General architecture switch choice ROCKCFG_SPARC_BITS 32 \ 32 "build 32 bit user-space SPARC (v7 and above)" \ - 64 "build 64 bit user-space SPARC (v9 - Ultra SPARC)" + 64 "build 64 bit user-space SPARC (v9 - Ultra SPARC) (EXPERIMENTAL)" # Some architecture special switches if [ "$ROCKCFG_SPARC_BITS" = 32 ] ; then @@ -33,8 +33,13 @@ if [ "$ROCKCFG_SPARC_BITS" = 32 ] ; then # later set multilib here fi -# Now the optimisations that result from the options above +# Enable cross compiler if a 64bit kernel is requested +if [ "$ROCKCFG_SPARC_64BIT_KERNEL" = 1 ] ; then + ROCKCFGSET_PKG_CROSSCC=1 + ROCKCFGSET_PKG_CROSSCC_ARCH_TARGET="sparc64-unknown-linux-gnu" +fi +# Now the optimisations that result from the options above if [ "$ROCKCFG_SPARC_BITS" = 64 -o "$ROCKCFG_SPARC_64BIT_KERNEL" = 1 ] ; then choice ROCKCFG_SPARC_OPT generic \ generic "No special optimisation" \