Module Name: src
Committed By: christos
Date: Fri Oct 21 17:57:45 UTC 2011
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386: x86cpuid.S
Log Message:
Put back support for non PIC.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S:1.2 Fri Oct 21 11:08:41 2011
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S Fri Oct 21 13:57:45 2011
@@ -287,9 +287,13 @@ OPENSSL_cleanse:
.size OPENSSL_cleanse,.-.L_OPENSSL_cleanse_begin
.comm OPENSSL_ia32cap_P,4,4
.section .init
+#ifdef PIC
PIC_PROLOGUE
call PIC_PLT(_C_LABEL(OPENSSL_cpuid_setup))
PIC_EPILOGUE
+#else
+ call _C_LABEL(OPENSSL_cpuid_setup)
+#endif
jmp .Linitalign
.align 16
.Linitalign:
