[src/trunk]: src/crypto/external/bsd/openssl revert, everything coredumps wit...

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

details:   https://anonhg.NetBSD.org/src/rev/4e6cf3e81438
branches:  trunk
changeset: 345669:4e6cf3e81438
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jun 04 18:22:45 2016 +0000

description:
revert, everything coredumps with this change.

diffstat:

 crypto/external/bsd/openssl/dist/crypto/perlasm/x86gas.pl           |  10 ++++++++--
 crypto/external/bsd/openssl/dist/crypto/x86_64cpuid.pl              |   5 ++---
 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S      |   6 ++++--
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64cpuid.S |   5 ++---
 4 files changed, 16 insertions(+), 10 deletions(-)

diffs (63 lines):

diff -r f578d4d39884 -r 4e6cf3e81438 crypto/external/bsd/openssl/dist/crypto/perlasm/x86gas.pl
--- a/crypto/external/bsd/openssl/dist/crypto/perlasm/x86gas.pl Sat Jun 04 16:29:35 2016 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/perlasm/x86gas.pl Sat Jun 04 18:22:45 2016 +0000
@@ -215,8 +215,14 @@
 .long  $f
 ___
     }
-    elsif ($::elf || $::coff) # Let the linker use whatever it wants.
-    {   $initseg.=<<___;
+    elsif ($::elf)
+    {  $initseg.=<<___;
+.section       .init
+       call    $f
+___
+    }
+    elsif ($::coff)
+    {   $initseg.=<<___;       # applies to both Cygwin and Mingw
 .section       .ctors
 .long  $f
 ___
diff -r f578d4d39884 -r 4e6cf3e81438 crypto/external/bsd/openssl/dist/crypto/x86_64cpuid.pl
--- a/crypto/external/bsd/openssl/dist/crypto/x86_64cpuid.pl    Sat Jun 04 16:29:35 2016 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/x86_64cpuid.pl    Sat Jun 04 18:22:45 2016 +0000
@@ -20,9 +20,8 @@
 print<<___;
 .extern                OPENSSL_cpuid_setup
 .hidden                OPENSSL_cpuid_setup
-.section       .ctors
-       .align 8
-       .quad   OPENSSL_cpuid_setup
+.section       .init
+       call    OPENSSL_cpuid_setup
 
 .hidden        OPENSSL_ia32cap_P
 .comm  OPENSSL_ia32cap_P,8,4
diff -r f578d4d39884 -r 4e6cf3e81438 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S    Sat Jun 04 16:29:35 2016 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S    Sat Jun 04 18:22:45 2016 +0000
@@ -342,5 +342,7 @@
        ret
 .size  OPENSSL_ia32_rdrand,.-.L_OPENSSL_ia32_rdrand_begin
 .comm  OPENSSL_ia32cap_P,8,4
-.section       .ctors
-.long  OPENSSL_cpuid_setup
+.section       .init
+       PIC_PROLOGUE
+       call    PIC_PLT(OPENSSL_cpuid_setup)
+       PIC_EPILOGUE
diff -r f578d4d39884 -r 4e6cf3e81438 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64cpuid.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64cpuid.S       Sat Jun 04 16:29:35 2016 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64cpuid.S       Sat Jun 04 18:22:45 2016 +0000
@@ -1,9 +1,8 @@
 #include <machine/asm.h>
 
 .globl OPENSSL_cpuid_setup
-.section       .ctors
-.align 8
-.quad  OPENSSL_cpuid_setup
+.section       .init
+       call    PIC_PLT(OPENSSL_cpuid_setup)
 
 .hidden        OPENSSL_ia32cap_P
 .comm  OPENSSL_ia32cap_P,8,4