From 78fd5ce7d6550f2f9821a7a689f4f6ab180aef4a Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 3 Jun 2016 15:42:15 +0000 Subject: [PATCH] Regenerate to use .ctor. --- .../external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S | 6 ++---- .../bsd/openssl/lib/libcrypto/arch/x86_64/x86_64cpuid.S | 5 +++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S index ef1541053631..0d8882ee56f3 100644 --- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S +++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S @@ -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 diff --git a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64cpuid.S b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64cpuid.S index f14456447600..77cc7d0f5afb 100644 --- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64cpuid.S +++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64cpuid.S @@ -1,8 +1,9 @@ #include .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