aboutsummaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2006-10-17 06:41:27 +0000
committerAndy Polyakov <appro@openssl.org>2006-10-17 06:41:27 +0000
commit591e85e92813225cc4ed8840a636ea966f3053e8 (patch)
tree3a45f920c678b39669b903b64e840366fd3e60b4 /crypto
parentc69ed6ea396b184fd56327b475a441081fcade8e (diff)
downloadopenssl-591e85e92813225cc4ed8840a636ea966f3053e8.tar.gz
Linking errors on IA64 and typo in aes-ia64.S.
Diffstat (limited to 'crypto')
-rw-r--r--crypto/aes/asm/aes-ia64.S2
-rw-r--r--crypto/ia64cpuid.S5
2 files changed, 6 insertions, 1 deletions
diff --git a/crypto/aes/asm/aes-ia64.S b/crypto/aes/asm/aes-ia64.S
index c96668287c..10a2f96234 100644
--- a/crypto/aes/asm/aes-ia64.S
+++ b/crypto/aes/asm/aes-ia64.S
@@ -221,7 +221,7 @@ AES_encrypt:
ADDP in1=0,in1
(p6) br.spnt .Le_o_unaligned };;
-{ .mii; mov ar.pfs=psfsave
+{ .mii; mov ar.pfs=pfssave
mov ar.lc=lcsave }
{ .mmi; st4 [in1]=r16,8 // s0
st4 [in0]=r20,8 // s1
diff --git a/crypto/ia64cpuid.S b/crypto/ia64cpuid.S
index 04fbb3439e..5836565abb 100644
--- a/crypto/ia64cpuid.S
+++ b/crypto/ia64cpuid.S
@@ -1,6 +1,11 @@
// Works on all IA-64 platforms: Linux, HP-UX, Win64i...
// On Win64i compile with ias.exe.
.text
+.global OPENSSL_cpuid_setup#
+.proc OPENSSL_cpuid_setup#
+OPENSSL_cpuid_setup:
+{ .mib; br.ret.sptk.many b0 };;
+.endp OPENSSL_cpuid_setup#
.global OPENSSL_rdtsc#
.proc OPENSSL_rdtsc#
OPENSSL_rdtsc: