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

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 118 insertions, 3 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/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