The beginning of the end for sys-devel/mips64 draws near. Mark kgcc64 stable on mips, and update it to use v4 of the r10k cache barriers patchset. It'll replace sys-devel/gcc-mips64 soon.

Package-Manager: portage-2.1.1_pre3-r5

3 files changed, 23 insertions, 30 deletions

diff --git a/sys-devel/kgcc64/ChangeLog b/sys-devel/kgcc64/ChangeLog
index 1275dee11a1d..e950f9a15980 100644
--- a/sys-devel/kgcc64/ChangeLog
+++ b/sys-devel/kgcc64/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/kgcc64
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/ChangeLog,v 1.2 2006/07/17 06:03:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/ChangeLog,v 1.3 2006/08/01 05:44:10 kumba Exp $
+
+  02 Aug 2006; Joshua Kinard <kumba@gentoo.org> kgcc64-3.4.6.ebuild:
+  The beginning of the end for sys-devel/mips64 draws near. Mark kgcc64 stable
+  on mips, and update it to use v4 of the r10k cache barriers patchset. It'll
+  replace sys-devel/gcc-mips64 soon.
 
 *kgcc64-4.1.1 (17 Jul 2006)
 *kgcc64-3.4.6 (17 Jul 2006)
diff --git a/sys-devel/kgcc64/Manifest b/sys-devel/kgcc64/Manifest
index 7fa925ad217a..68c0dc964a77 100644
--- a/sys-devel/kgcc64/Manifest
+++ b/sys-devel/kgcc64/Manifest
@@ -1,22 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST gcc-3.4.6-patches-1.2.tar.bz2 54757 RMD160 d4e1240b9e45b7661b7f8bf4f57bb2c9cac17686 SHA1 be5868d0ba17d0d8952cda5a82064aaca9168cb3 SHA256 43253a8defa6111bd6f107178cc46f425ec81efe0eb26b730c11c422a4d4de26
 DIST gcc-3.4.6.tar.bz2 28193401 RMD160 b15003368cedc7964f6ceaee0c39ddc43a46c442 SHA1 97b290fdc572c8e490b3b39f243e69bacad23c2b SHA256 7791a601878b765669022b8b3409fba33cc72f9e39340fec8af6d0e6f72dec39
 DIST gcc-4.1.1-patches-1.6.tar.bz2 29117 RMD160 deda1cc8917bb63e446048dff15eca32530aa56e SHA1 6aa1511e25a36d3ce693c839742772737bf8a2f5 SHA256 b587a9328f359162645601a7f43a2da079df05b85ed3b613b7055023e32f560b
 DIST gcc-4.1.1.tar.bz2 39172003 RMD160 0edeac242d900b075a7e36796380492b5b3c8564 SHA1 a398b95d38b6e35f4c4e02c34c0a3bff79811f8f SHA256 985cbb23a486570a8783395a42a8689218f5218a0ccdd6bec590eef341367bb7
-EBUILD kgcc64-3.4.6.ebuild 2190 RMD160 cb66dd9d9eb633e4e5dceb1f2f5f2d8d1e480dd5 SHA1 a6ab8a7f38cc112c14c9a53e7ccc7cb5c7bedc73 SHA256 dd02ab76977935fbece91c5a92382ed33c78e5e886e3ae389cce96401990406b
-MD5 4156c5f03353d81cb3a1eebb798ff837 kgcc64-3.4.6.ebuild 2190
-RMD160 cb66dd9d9eb633e4e5dceb1f2f5f2d8d1e480dd5 kgcc64-3.4.6.ebuild 2190
-SHA256 dd02ab76977935fbece91c5a92382ed33c78e5e886e3ae389cce96401990406b kgcc64-3.4.6.ebuild 2190
+EBUILD kgcc64-3.4.6.ebuild 2019 RMD160 0ef7d77cb4e07e2f1c3d24f2599cf54ea2eba8ac SHA1 2f005382ddddba23575aa7db38074580dbbab916 SHA256 161906ea7705ce6dd3b644f8cd72dd433ec53d1ad5b8b305e8f5a8ce2a96e507
+MD5 92f0c67ee57b03be8af3850032ef68eb kgcc64-3.4.6.ebuild 2019
+RMD160 0ef7d77cb4e07e2f1c3d24f2599cf54ea2eba8ac kgcc64-3.4.6.ebuild 2019
+SHA256 161906ea7705ce6dd3b644f8cd72dd433ec53d1ad5b8b305e8f5a8ce2a96e507 kgcc64-3.4.6.ebuild 2019
 EBUILD kgcc64-4.1.1.ebuild 1007 RMD160 a92dde091e0c64830051f08e5ffea4a6f9c4869c SHA1 2c96cab45ce417138851ee29577530d39742d659 SHA256 24bbe66f36f7619cfe32d5a469a05710417b5731a902c2b6d7fd37c4e8a6bc93
 MD5 7440ef1535059a78a6db79f436112333 kgcc64-4.1.1.ebuild 1007
 RMD160 a92dde091e0c64830051f08e5ffea4a6f9c4869c kgcc64-4.1.1.ebuild 1007
 SHA256 24bbe66f36f7619cfe32d5a469a05710417b5731a902c2b6d7fd37c4e8a6bc93 kgcc64-4.1.1.ebuild 1007
-MISC ChangeLog 590 RMD160 21c476b0f7331206a8d2bb3e191cb317e7e87eed SHA1 93e59ad7b7a24df73c8186f57c967845591d47aa SHA256 1b4c01ff99a51ed98914f9e1b5502ef79d772150000326a03ca1a39a3077b313
-MD5 3919dcc8064b9e49d2616dbb8a25cf1a ChangeLog 590
-RMD160 21c476b0f7331206a8d2bb3e191cb317e7e87eed ChangeLog 590
-SHA256 1b4c01ff99a51ed98914f9e1b5502ef79d772150000326a03ca1a39a3077b313 ChangeLog 590
+MISC ChangeLog 853 RMD160 53ea7f232f56d53637d5ddd6c26ecfec99fc73d1 SHA1 73b119697985f92938a57efce3bbb62a01dbc346 SHA256 317703a3ba988e2eca58a332d0d8625c4821a0058a7873c8d27c7acb55612483
+MD5 e603ee36fb1225eee1a1ac83a12684b1 ChangeLog 853
+RMD160 53ea7f232f56d53637d5ddd6c26ecfec99fc73d1 ChangeLog 853
+SHA256 317703a3ba988e2eca58a332d0d8625c4821a0058a7873c8d27c7acb55612483 ChangeLog 853
 MISC metadata.xml 181 RMD160 7465beade8e76f7016fd193585f417e53e908229 SHA1 43fca5b81984359fdafd0a56d27b6b48e4c26584 SHA256 36a55914e329ec534fda878fbe5d81b1c9acebfbddba708255ed2e088bcf100d
 MD5 5202e1034c4eac034458ff2f5472d825 metadata.xml 181
 RMD160 7465beade8e76f7016fd193585f417e53e908229 metadata.xml 181
@@ -27,10 +24,3 @@ SHA256 bb79c5fd62ac0739e3ba7e30f0b2663937baf488182a84e05a8add65dcbc28b8 files/di
 MD5 2b39ae12a8619b04c8b506213833e057 files/digest-kgcc64-4.1.1 503
 RMD160 3315285322406d139142d3622ba2c8a1e268792f files/digest-kgcc64-4.1.1 503
 SHA256 b3f15b2f7e8aaefd2ba55e07a0c0f827dfe19749ec685a5dcf5775ddc2ae9762 files/digest-kgcc64-4.1.1 503
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEuyiFamhnQswr0vIRAonnAJ9Ot2FWnFFcWUMslIQh5TeP4LW+DwCgm7EF
-puKN7Dv0hxM33sr747jC4gs=
-=/S4U
------END PGP SIGNATURE-----
diff --git a/sys-devel/kgcc64/kgcc64-3.4.6.ebuild b/sys-devel/kgcc64/kgcc64-3.4.6.ebuild
index 56fab43c9cea..e6b773f16875 100644
--- a/sys-devel/kgcc64/kgcc64-3.4.6.ebuild
+++ b/sys-devel/kgcc64/kgcc64-3.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-3.4.6.ebuild,v 1.1 2006/07/17 06:03:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-3.4.6.ebuild,v 1.2 2006/08/01 05:44:10 kumba Exp $
 
 case ${CHOST} in
 	hppa*)    CTARGET=hppa64-${CHOST#*-};;
@@ -22,7 +22,7 @@ inherit toolchain eutils
 
 DESCRIPTION="64bit kernel compiler"
 
-KEYWORDS="-* ~hppa ~mips ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="-* ~hppa mips ~ppc ~s390 ~sparc ~x86"
 
 # unlike every other target, hppa has not unified the 32/64 bit
 # ports in binutils yet
@@ -39,21 +39,19 @@ src_unpack() {
 			# Patch forward-ported from a gcc-3.0.x patch that adds -march=r10000 and
 			# -mtune=r10000 support to gcc (Allows the compiler to generate code to
 			# take advantage of R10k's second ALU, perform shifts, etc..
-			#
-			# Needs re-porting to DFA in gcc-4.0 - Any Volunteers? :)
 			epatch "${GCC_FILESDIR}"/3.4.2/gcc-3.4.x-mips-add-march-r10k.patch
 
-			# This is a very special patch -- it allows us to build semi-usable kernels
-			# on SGI IP28 (Indigo2 Impact R10000) systems.  The patch is henceforth
-			# regarded as a kludge by upstream, and thus, it will never get accepted upstream,
-			# but for our purposes of building a kernel, it works.
+			# This is a very special patch -- it allows us to build kernels on SGI IP28
+			# (Indigo2 Impact R10000) systems.
 			# Unless you're building an IP28 kernel, you really don't need care about what
 			# this patch does, because if you are, you are probably already aware of what
 			# it does.
 			# All that said, the abilities of this patch are disabled by default and need
-			# to be enabled by passing -mip28-cache-barrier.  Only used to build kernels, 
-			# There is the possibility it may be used for very specific userland apps too.
-			epatch "${GCC_FILESDIR}"/3.4.2/gcc-3.4.2-mips-ip28_cache_barriers-v2.patch
+			# to be enabled by passing -mr10k-cache-barrier.
+			# The option also accepts a flag, which are highlighted below:
+			#	-mr10k-cache-barrier=1 - Protect stores only (IP28)
+			#	-mr10k-cache-barrier=2 - Protect stores and loads (IP32 R10K)
+			epatch "${GCC_FILESDIR}"/3.4.2/gcc-3.4.2-mips-ip28_cache_barriers-v4.patch
 			;;
 	esac
 }