[src/trunk]: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386 Put back...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/be99fe46696e
branches:  trunk
changeset: 770547:be99fe46696e
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Oct 21 17:57:45 2011 +0000

description:
Put back support for non PIC.

diffstat:

 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S |  4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diffs (17 lines):

diff -r 776652b5ea39 -r be99fe46696e crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S    Fri Oct 21 15:08:41 2011 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S    Fri Oct 21 17:57:45 2011 +0000
@@ -287,9 +287,13 @@
 .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: