Updated instructions on migration and CTARGET_ALIASES for gcc-config-1.4

3 files changed, 19 insertions, 7 deletions

diff --git a/profiles/default-linux/sparc/sparc64-multilib/dev/README b/profiles/default-linux/sparc/sparc64-multilib/dev/README
index ae8511d601fa..6cd408d0347d 100644
--- a/profiles/default-linux/sparc/sparc64-multilib/dev/README
+++ b/profiles/default-linux/sparc/sparc64-multilib/dev/README
@@ -4,6 +4,9 @@ Make sure you have the latest gcc-config baselayout and portage:
 Delete the /usr/sparc64-unknown-linux-gnu symlink hackery:
 # rm /usr/sparc64-unknown-linux-gnu
 
+Unmerge the kernel compiler as you don't need it any more
+# emerge unmerge gcc-sparc64
+
 Switch to profile:
 # rm /etc/make.profile
 # ln -s /usr/portage/profiles/default-linux/sparc/sparc64-multilib/dev /etc/make.profile
@@ -21,17 +24,23 @@ Get a sparc64 binutils:
 Use binutils-config to choose sparc64-* binutils:
 # binutils-config -l
 # binutils-config <value>
+# . /etc/profile
 
 Get a stage1 sparc64 gcc:
 # CC="sparc-unknown-linux-gnu-gcc" USE="build static" GCC_MAKE_TARGET="all" emerge -v gcc
 
-Use gcc-config to set your gcc 
+Remove sparc32 gcc compiler and binutils from your system
+# emerge unmerge \=sys-devel/gcc-<version> \=sys-devel/binutils-<version>
+# rm /etc/env.d/gcc/config-sparc-unknown-linux-gnu /etc/env.d/05gcc-sparc-unknown-linux-gnu /etc/env.d/binutils/binutils/config-sparc-unknown-linux-gnu 
+
+Use gcc-config to set your gcc
 Choose the sparc64-unknown-linux-gnu one you just emerged
 # gcc-config -l
 # gcc-config <value>
+# . /etc/profile
 
 Use the stage1 gcc to build bootstrap multilib glibc
-# USE="-nptl" emerge -v glibc
+# USE="-nptl" CBUILD="sparc-unknown-linux-gnu" emerge -v glibc
 
 Now, finally emerge your full glibc and gcc
 # emerge -v glibc gcc
diff --git a/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults b/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults
index 92f199c108fb..21dda209e881 100644
--- a/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults
+++ b/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults,v 1.19 2005/02/14 12:36:13 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults,v 1.20 2005/02/19 20:52:32 eradicator Exp $
 
 FEATURES="sandbox ccache autoconfig multilib-strict"
 
@@ -16,12 +16,14 @@ DEFAULT_ABI="sparc32"
 CFLAGS_sparc64="-m64"
 LDFLAGS_sparc64="-m elf64-sparc"
 CHOST_sparc64="sparc64-unknown-linux-gnu"
+CTARGET_ALIASES_sparc64="sparc64-linux"
 CDEFINE_sparc64="__arch64__"
 LIBDIR_sparc64="lib64"
 
 CFLAGS_sparc32="-m32"
 LDFLAGS_sparc32="-m elf32-sparc"
-CHOST_sparc32="sparc64-unknown-linux-gnu"
+CHOST_sparc32="sparc-unknown-linux-gnu"
+CTARGET_ALIASES_sparc32="sparcv9-unknown-linux-gnu"
 CDEFINE_sparc64="!__arch64__"
 LIBDIR_sparc32="lib"
 
diff --git a/profiles/default-linux/sparc/sparc64-multilib/packages b/profiles/default-linux/sparc/sparc64-multilib/packages
index 834d85993123..2d6d3dfbde43 100644
--- a/profiles/default-linux/sparc/sparc64-multilib/packages
+++ b/profiles/default-linux/sparc/sparc64-multilib/packages
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/packages,v 1.18 2005/02/14 12:36:13 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/packages,v 1.19 2005/02/19 20:52:32 eradicator Exp $
 
 # Sometimes necessary to trick programs into thinking we're really
 # a sparc32 system.
@@ -14,7 +14,8 @@
 *>=sys-apps/portage-2.0.51-r13
 *>=sys-devel/binutils-2.15.92.0.2-r2
 -*<sys-devel/gcc-3.4.1
-*>=sys-devel/gcc-3.4.3-r1
+*>=sys-devel/gcc-3.3.5.20050130
 *>=sys-libs/glibc-2.3.4.20041102
-*>=sys-devel/gcc-config-1.3.10
+*>=sys-devel/gcc-config-1.4.0
 >=sys-devel/distcc-2.18.3-r4
+-sys-devel/gcc-sparc64