Module Name: src Committed By: christos Date: Sat Feb 10 05:51:06 UTC 2018
Modified Files: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386: Makefile aes-586.S crypt586.S Log Message: Fix TEXTREL's To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/Makefile cvs rdiff -u -r1.8 -r1.9 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes-586.S cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypt586.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/Makefile diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/Makefile:1.9 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/Makefile:1.10 --- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/Makefile:1.9 Fri Feb 9 11:06:59 2018 +++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/Makefile Sat Feb 10 00:51:06 2018 @@ -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 @@ regen: 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 Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes-586.S diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes-586.S:1.8 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes-586.S:1.9 --- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes-586.S:1.8 Fri Feb 9 11:06:59 2018 +++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes-586.S Sat Feb 10 00:51:06 2018 @@ -1000,7 +1000,9 @@ AES_encrypt: 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 @@ AES_decrypt: 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 @@ AES_cbc_encrypt: 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 Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypt586.S diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypt586.S:1.5 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypt586.S:1.6 --- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypt586.S:1.5 Fri Feb 9 11:06:59 2018 +++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypt586.S Sat Feb 10 00:51:06 2018 @@ -13,7 +13,9 @@ fcrypt_body: 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