[src/trunk]: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386 Fix TEXT...

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

details:   https://anonhg.NetBSD.org/src/rev/76be4f1a2237
branches:  trunk
changeset: 359441:76be4f1a2237
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Feb 10 05:51:06 2018 +0000

description:
Fix TEXTREL's

diffstat:

 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/Makefile   |   7 ++++-
 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes-586.S  |  12 +++++++--
 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypt586.S |   4 ++-
 3 files changed, 17 insertions(+), 6 deletions(-)

diffs (70 lines):

diff -r a16731e630dc -r 76be4f1a2237 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/Makefile
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/Makefile      Sat Feb 10 03:55:58 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/Makefile      Sat Feb 10 05:51:06 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2018/02/09 16:06:59 christos Exp $
+#      $NetBSD: Makefile,v 1.10 2018/02/10 05:51:06 christos Exp $
 
 .include "bsd.own.mk"
 
@@ -11,6 +11,9 @@
                perl -I${OPENSSLSRC}/crypto/perlasm \
                -I${OPENSSLSRC}/crypto/bn/asm $$i elf /dev/stdout \
                | sed -e 's,^\.file.*$$,#include <machine/asm.h>,' \
-                       -e 's/  call    OPENSSL_cpuid_setup/    PIC_PROLOGUE!   call    PIC_PLT(OPENSSL_cpuid_setup)!   PIC_EPILOGUE/' | tr '!' '\n' \
+                       -e 's/  call    OPENSSL_cpuid_setup/    PIC_PROLOGUE!   call    PIC_PLT(OPENSSL_cpuid_setup)!   PIC_EPILOGUE/' \
+                       -e 's/  leal    DES_SPtrans,%edx/       PIC_PROLOGUE!   leal    PIC_GOT(DES_SPtrans),%edx!      PIC_EPOLOGUE/' \
+                       -e 's/  leal    OPENSSL_ia32cap_P,%eax/ PIC_PROLOGUE!   leal    PIC_GOT(OPENSSL_ia32cap_P),%eax!        PIC_EPOLOGUE/' \
+                       | tr '!' '\n' \
                > $$(basename $$i .pl).S; \
        done
diff -r a16731e630dc -r 76be4f1a2237 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes-586.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes-586.S     Sat Feb 10 03:55:58 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes-586.S     Sat Feb 10 05:51:06 2018 +0000
@@ -1000,7 +1000,9 @@
        call    .L004pic_point
 .L004pic_point:
        popl    %ebp
-       leal    OPENSSL_ia32cap_P,%eax
+       PIC_PROLOGUE
+       leal    PIC_GOT(OPENSSL_ia32cap_P),%eax
+       PIC_EPOLOGUE
        leal    .LAES_Te-.L004pic_point(%ebp),%ebp
        leal    764(%esp),%ebx
        subl    %ebp,%ebx
@@ -2192,7 +2194,9 @@
        call    .L010pic_point
 .L010pic_point:
        popl    %ebp
-       leal    OPENSSL_ia32cap_P,%eax
+       PIC_PROLOGUE
+       leal    PIC_GOT(OPENSSL_ia32cap_P),%eax
+       PIC_EPOLOGUE
        leal    .LAES_Td-.L010pic_point(%ebp),%ebp
        leal    764(%esp),%ebx
        subl    %ebp,%ebx
@@ -2248,7 +2252,9 @@
        call    .L013pic_point
 .L013pic_point:
        popl    %ebp
-       leal    OPENSSL_ia32cap_P,%eax
+       PIC_PROLOGUE
+       leal    PIC_GOT(OPENSSL_ia32cap_P),%eax
+       PIC_EPOLOGUE
        cmpl    $0,40(%esp)
        leal    .LAES_Te-.L013pic_point(%ebp),%ebp
        jne     .L014picked_te
diff -r a16731e630dc -r 76be4f1a2237 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypt586.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypt586.S    Sat Feb 10 03:55:58 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypt586.S    Sat Feb 10 05:51:06 2018 +0000
@@ -13,7 +13,9 @@
 
        xorl    %edi,%edi
        xorl    %esi,%esi
-       leal    DES_SPtrans,%edx
+       PIC_PROLOGUE
+       leal    PIC_GOT(DES_SPtrans),%edx
+       PIC_EPOLOGUE
        pushl   %edx
        movl    28(%esp),%ebp
        pushl   $25