Linking errors on IA64 and typo in aes-ia64.S.

diff --git a/crypto/aes/asm/aes-ia64.S b/crypto/aes/asm/aes-ia64.S
index c96668287c34a8efeaeafe9d3b669da1f07d3676..10a2f96234eda48f3245117ccbab87bd661b63d7 100644 (file)
--- 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 04fbb3439eb790a6b116653ef5c94dc442b89563..5836565abb310f5c67ecdc126038a719b4dc2fc1 100644 (file)
--- 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: