Fix alpha build issues in new alpha-mont.pl file #330915.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 124 insertions, 8 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index db899df33a6f..7a3e51f9172d 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.349 2010/09/12 04:17:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.350 2010/09/12 05:18:25 vapier Exp $
+
+  12 Sep 2010; Mike Frysinger <vapier@gentoo.org> openssl-1.0.0a-r3.ebuild,
+  +files/openssl-1.0.0a-alpha-mont.patch:
+  Fix alpha build issues in new alpha-mont.pl file #330915.
 
   12 Sep 2010; Mike Frysinger <vapier@gentoo.org> openssl-1.0.0a-r3.ebuild,
   +files/openssl-1.0.0a-alphacpuid.patch:
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 80ec295b7738..fd82bb3abb3d 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -9,6 +9,7 @@ AUX openssl-0.9.8e-bsd-sparc64.patch 1484 RMD160 dd3d18caccd8167673a438cc83fa44f
 AUX openssl-0.9.8h-ldflags.patch 1000 RMD160 1e87b16d841360d790f06d714ea5f0111e83ca97 SHA1 72e7ccca848425d7cfc3f58f4476fb8fda4ec2d1 SHA256 00179ad3dc3fecc9193658202d7bb5c81169bbb2be59e8a90201ed43eacec805
 AUX openssl-0.9.8l-binutils.patch 2655 RMD160 d801d719b4fc4a6818313c27def8e7a184f40b99 SHA1 f7aaae0d3a0163105d495661c3a48673655a3b82 SHA256 c81d8b70e7ccbe3e7ee2fc81a4658d058301d0129adcc380c24066aa42cb390c
 AUX openssl-0.9.8m-binutils.patch 684 RMD160 78ee10d906423a77aff91aac2166bb5f58c386e6 SHA1 b7514556196a730541b0c99754b4ef79484e27fe SHA256 1e4475f7183ec237d129b686d4ca5265bf7eb34642e7d9e77cbe8ad9a97b4876
+AUX openssl-1.0.0a-alpha-mont.patch 2074 RMD160 237f0ea74b376eb4f075bd58f5e7dd3484d2faed SHA1 de894449914c557e0eb0fc865e9e949250c28e9d SHA256 7f0eeea560578e839b1cba539d4c33375c4af3ee6777a94ea75a72e467931a80
 AUX openssl-1.0.0a-alphacpuid.patch 342 RMD160 98c6ad7e6b643c4adb13dc566a54faa3d0235807 SHA1 0f093ab2015727fe675d971a4ff2a3cdea633590 SHA256 6f9bf3284204c363295e735a8b23752274e5de90229ece8df2595f6651aa6fa1
 AUX openssl-1.0.0a-fix-double-free.patch 252 RMD160 4cf11701c503eb28ce2cea834523b9ec3e38bd4a SHA1 4006be947a41f77c471504d4770dbf8b36b315b8 SHA256 a179daada4021897dc2759e9555b22f5dcb511c1d011bbab8106b35fd2332b96
 AUX openssl-1.0.0a-ldflags.patch 914 RMD160 1e057330b3fc84d7f799976c0ba5cce02f505f57 SHA1 9bada0fb576b4f78b046b77b77248b352e1953a6 SHA256 33f5d39e2b6464ed33654214a0148a6f6546fe319793ae04f54d2106422ddba1
@@ -19,13 +20,13 @@ EBUILD openssl-0.9.8o-r1.ebuild 4251 RMD160 ba06206d1d8a6d0109fe2b53f05f2a363fac
 EBUILD openssl-0.9.8o-r2.ebuild 4313 RMD160 a1aa2220bdbd73216434afd5215bcbda2fa76540 SHA1 ecd3225826defc1f052df8730313f5ec941fd194 SHA256 2d54dc83c0bffb53d8a6142b97e574ca7560c2ca1224e4d3f6a3fe3571efb952
 EBUILD openssl-0.9.8o.ebuild 5355 RMD160 944bcef12c47a34a29f9d41c071e084daec2e715 SHA1 8984a9f092d75365e9506999edab77a042dbd1d9 SHA256 aafeacde45a423a2ef7a43fff95dcc22776371ca9a5dd475ebf8fdf992d96786
 EBUILD openssl-1.0.0a-r1.ebuild 5608 RMD160 73338932e4f1b8447957a9b4b58351775f2d9c7f SHA1 03cb9241ca0b452f653a0b6922dfb0c05f99ae83 SHA256 798a8e68b20b305967eeb143a0310866b43b24f6eb11fbacdea402d752168d9c
-EBUILD openssl-1.0.0a-r3.ebuild 5955 RMD160 fc9aad2a2475afa3d50e27cb385b11f510758f69 SHA1 5440441c5ceed30533b7f54578752488343adf8b SHA256 874208b7f671aef50356540af1fb091bfe98d4bb334fef282101a17856234f29
-MISC ChangeLog 52603 RMD160 8ae5825bcc0bc066e9cf3d7154ad36cb45abaee9 SHA1 70e6b31f7094469830d84fbd0938f1b83c96cc3f SHA256 02ab56da004f9058aafbba7ebaabcc0e57151bb9918d3693298dc01ca93b97d1
+EBUILD openssl-1.0.0a-r3.ebuild 6015 RMD160 aa567f5341029eded57b708e60c9248f191f0628 SHA1 5aeff98290db35330fcd2483fb48584c6d1cfc42 SHA256 c8b84db4f146de573c73827f9f1f79257ed59030dd8ad3302fced0505763f3ef
+MISC ChangeLog 52782 RMD160 afb157e25d510e9aac255f17b92eb4d57c9ebf56 SHA1 810540ae4a780b915ec70f68b8b1dc50b8814fca SHA256 ff7e97bef6c37c6cca46abd1f8007aba895e46ee6ac277a76948ca118150d52d
 MISC metadata.xml 290 RMD160 5aee06348916e9fbcdab233e8babb0ed08260ca5 SHA1 f798e6a59f370931dc151fcff9a473eabda44ab9 SHA256 828c7b974fc1bbac92f75490c85897b27cd3cacce021f56ad1b4ef06d28fe7bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkyMVMIACgkQTwhj9JtAlp6ihgEAox42dffglnKoCpfHSKXbsAJv
-nZhdOsPvncbVN9Sjy+UA/iIeu1IUNdtkRGvLy6k3TLz/hTUWZn3lM1h266ftMB2K
-=MfZ5
+iF4EAREIAAYFAkyMYwcACgkQTwhj9JtAlp54aAD/UOXjTYSAlJ+xt5qVd7tmcWX2
+rUCzw1jZaZVpZstNnzQA/0etp6R2TN8qoK/Q5dtmKFJjDAs4+S4jA4OrqOPBGIly
+=SdSU
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/files/openssl-1.0.0a-alpha-mont.patch b/dev-libs/openssl/files/openssl-1.0.0a-alpha-mont.patch
new file mode 100644
index 000000000000..3beea07557a9
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.0.0a-alpha-mont.patch
@@ -0,0 +1,110 @@
+get the new alpha-mont code building with GNU toolchains
+
+https://bugs.gentoo.org/330915
+
+--- a/crypto/bn/asm/alpha-mont.pl
++++ b/crypto/bn/asm/alpha-mont.pl
+@@ -41,8 +41,12 @@ $j="s4";
+ $m1="s5";
+ 
+ $code=<<___;
++#ifdef __linux__
++#include <asm/regdef.h>
++#else
+ #include <asm.h>
+ #include <regdef.h>
++#endif
+ 
+ .text
+ 
+@@ -106,9 +110,9 @@ bn_mul_mont:
+ .align	4
+ .L1st:
+ 	.set	noreorder
+-	ldq	$aj,($aj)
++	ldq	$aj,0($aj)
+ 	addl	$j,1,$j
+-	ldq	$nj,($nj)
++	ldq	$nj,0($nj)
+ 	lda	$tp,8($tp)
+ 
+ 	addq	$alo,$hi0,$lo0
+@@ -159,12 +163,12 @@ bn_mul_mont:
+ .align	4
+ .Louter:
+ 	s8addq	$i,$bp,$bi
+-	ldq	$hi0,($ap)
++	ldq	$hi0,0($ap)
+ 	ldq	$aj,8($ap)
+-	ldq	$bi,($bi)
+-	ldq	$hi1,($np)
++	ldq	$bi,0($bi)
++	ldq	$hi1,0($np)
+ 	ldq	$nj,8($np)
+-	ldq	$tj,(sp)
++	ldq	$tj,0(sp)
+ 
+ 	mulq	$hi0,$bi,$lo0
+ 	umulh	$hi0,$bi,$hi0
+@@ -195,10 +199,10 @@ bn_mul_mont:
+ 	.set	noreorder
+ 	ldq	$tj,8($tp)	#L0
+ 	nop			#U1
+-	ldq	$aj,($aj)	#L1
++	ldq	$aj,0($aj)	#L1
+ 	s8addq	$j,$np,$nj	#U0
+ 
+-	ldq	$nj,($nj)	#L0
++	ldq	$nj,0($nj)	#L0
+ 	nop			#U1
+ 	addq	$alo,$hi0,$lo0	#L1
+ 	lda	$tp,8($tp)
+@@ -247,7 +251,7 @@ bn_mul_mont:
+ 	addq	$hi1,v0,$hi1
+ 
+ 	addq	$hi1,$hi0,$lo1
+-	stq	$j,($tp)
++	stq	$j,0($tp)
+ 	cmpult	$lo1,$hi0,$hi1
+ 	addq	$lo1,$tj,$lo1
+ 	cmpult	$lo1,$tj,AT
+@@ -265,8 +269,8 @@ bn_mul_mont:
+ 	mov	0,$hi0		# clear borrow bit
+ 
+ .align	4
+-.Lsub:	ldq	$lo0,($tp)
+-	ldq	$lo1,($np)
++.Lsub:	ldq	$lo0,0($tp)
++	ldq	$lo1,0($np)
+ 	lda	$tp,8($tp)
+ 	lda	$np,8($np)
+ 	subq	$lo0,$lo1,$lo1	# tp[i]-np[i]
+@@ -274,7 +278,7 @@ bn_mul_mont:
+ 	subq	$lo1,$hi0,$lo0
+ 	cmpult	$lo1,$lo0,$hi0
+ 	or	$hi0,AT,$hi0
+-	stq	$lo0,($rp)
++	stq	$lo0,0($rp)
+ 	cmpult	$tp,$tj,v0
+ 	lda	$rp,8($rp)
+ 	bne	v0,.Lsub
+@@ -288,7 +292,7 @@ bn_mul_mont:
+ 	bis	$bp,$ap,$ap	# ap=borrow?tp:rp
+ 
+ .align	4
+-.Lcopy:	ldq	$aj,($ap)	# copy or in-place refresh
++.Lcopy:	ldq	$aj,0($ap)	# copy or in-place refresh
+ 	lda	$tp,8($tp)
+ 	lda	$rp,8($rp)
+ 	lda	$ap,8($ap)
+@@ -309,8 +313,10 @@ bn_mul_mont:
+ 	lda	sp,48(sp)
+ 	ret	(ra)
+ .end	bn_mul_mont
++#if 0
+ .rdata
+ .asciiz	"Montgomery Multiplication for Alpha, CRYPTOGAMS by <appro\@openssl.org>"
++#endif
+ ___
+ 
+ print $code;
diff --git a/dev-libs/openssl/openssl-1.0.0a-r3.ebuild b/dev-libs/openssl/openssl-1.0.0a-r3.ebuild
index ec865affce21..b165aa144060 100644
--- a/dev-libs/openssl/openssl-1.0.0a-r3.ebuild
+++ b/dev-libs/openssl/openssl-1.0.0a-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0a-r3.ebuild,v 1.3 2010/09/12 04:17:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0a-r3.ebuild,v 1.4 2010/09/12 05:18:25 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://openssl/source/${P}.tar.gz
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="-alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="bindist gmp kerberos rfc3779 sse2 test zlib"
 
 RDEPEND="gmp? ( dev-libs/gmp )
@@ -34,6 +34,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-fix-double-free.patch #332027
 	cp "${FILESDIR}"/alphacpuid.s "${S}"/crypto/ || die #330915
 	epatch "${FILESDIR}"/${PN}-1.0.0a-alphacpuid.patch #330915
+	epatch "${FILESDIR}"/${PN}-1.0.0a-alpha-mont.patch #330915
 	epatch_user #332661
 
 	# disable fips in the build