Module Name: src Committed By: joerg Date: Fri Jun 3 15:42:15 UTC 2016
Modified Files: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386: x86cpuid.S src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: x86_64cpuid.S Log Message: Regenerate to use .ctor. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64cpuid.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.9 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S:1.10 --- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S:1.9 Sat May 16 17:32:54 2015 +++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S Fri Jun 3 15:42:15 2016 @@ -342,7 +342,5 @@ OPENSSL_ia32_rdrand: ret .size OPENSSL_ia32_rdrand,.-.L_OPENSSL_ia32_rdrand_begin .comm OPENSSL_ia32cap_P,8,4 -.section .init - PIC_PROLOGUE - call PIC_PLT(OPENSSL_cpuid_setup) - PIC_EPILOGUE +.section .ctors +.long OPENSSL_cpuid_setup Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64cpuid.S diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64cpuid.S:1.6 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64cpuid.S:1.7 --- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64cpuid.S:1.6 Mon Mar 21 19:13:15 2016 +++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64cpuid.S Fri Jun 3 15:42:15 2016 @@ -1,8 +1,9 @@ #include <machine/asm.h> .globl OPENSSL_cpuid_setup -.section .init - call PIC_PLT(OPENSSL_cpuid_setup) +.section .ctors +.align 8 +.quad OPENSSL_cpuid_setup .hidden OPENSSL_ia32cap_P .comm OPENSSL_ia32cap_P,8,4