[src/trunk]: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64 add #i...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64 add #i...
From: christos <christos%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 23:31:57 +0000
details:   https://anonhg.NetBSD.org/src/rev/463b9f022fdc
branches:  trunk
changeset: 780707:463b9f022fdc
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Aug 04 11:03:34 2012 +0000

description:
add #include <machine/asm.h>, use PIC_PLT()

diffstat:

 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile            |  6 +++---
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S        |  1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S |  1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-x86_64.S      |  1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/bsaes-x86_64.S      |  1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S       |  1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ghash-x86_64.S      |  1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/md5-x86_64.S        |  1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/modexp512-x86_64.S  |  1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-md5-x86_64.S    |  1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S        |  1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S       |  1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha512-x86_64.S     |  1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/uplink-x86_64.S     |  1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/vpaes-x86_64.S      |  1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/wp-x86_64.S         |  1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64cpuid.S       |  3 ++-
 17 files changed, 20 insertions(+), 4 deletions(-)

diffs (154 lines):

diff -r b042e55cc07d -r 463b9f022fdc crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile    Sat Aug 04 09:24:19 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile    Sat Aug 04 11:03:34 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2012/07/27 18:16:53 christos Exp $
+#      $NetBSD: Makefile,v 1.6 2012/08/04 11:03:34 christos Exp $
 
 .include "bsd.own.mk"
 
@@ -8,9 +8,9 @@
 regen:
        for i in $$(find ${OPENSSLSRC} -name \*${MACHINE_ARCH}.pl) \
                ${OPENSSLSRC}/crypto/${MACHINE_ARCH}cpuid.pl ; do \
-                perl $$i elf | sed \
+                (echo "#include <machine/asm.h>"; perl $$i elf | sed \
                    -e 's/\(OPENSSL[A-Za-z0-9_+]*\)(%rip)/\1@GOTPCREL(%rip)/' \
                    -e 's/.hidden       OPENSSL_cpuid_setup/.globl      OPENSSL_cpuid_setup/' \
-                   -e 's/call  OPENSSL_cpuid_setup/call        OPENSSL_cpuid_setup@GOTPCREL(%rip)/' \
+                   -e 's/call  OPENSSL_cpuid_setup/call        PIC_PLT(OPENSSL_cpuid_setup)/') \
                > $$(basename $$i .pl).S; \
        done
diff -r b042e55cc07d -r 463b9f022fdc crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S        Sat Aug 04 09:24:19 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S        Sat Aug 04 11:03:34 2012 +0000
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
 .text  
 .type  _x86_64_AES_encrypt,@function
 .align 16
diff -r b042e55cc07d -r 463b9f022fdc crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S Sat Aug 04 09:24:19 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S Sat Aug 04 11:03:34 2012 +0000
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
 .text  
 
 
diff -r b042e55cc07d -r 463b9f022fdc crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-x86_64.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-x86_64.S      Sat Aug 04 09:24:19 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-x86_64.S      Sat Aug 04 11:03:34 2012 +0000
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
 .text  
 .globl aesni_encrypt
 .type  aesni_encrypt,@function
diff -r b042e55cc07d -r 463b9f022fdc crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/bsaes-x86_64.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/bsaes-x86_64.S      Sat Aug 04 09:24:19 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/bsaes-x86_64.S      Sat Aug 04 11:03:34 2012 +0000
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
 .text  
 
 
diff -r b042e55cc07d -r 463b9f022fdc crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S       Sat Aug 04 09:24:19 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S       Sat Aug 04 11:03:34 2012 +0000
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
 .text  
 
 
diff -r b042e55cc07d -r 463b9f022fdc crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ghash-x86_64.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ghash-x86_64.S      Sat Aug 04 09:24:19 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ghash-x86_64.S      Sat Aug 04 11:03:34 2012 +0000
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
 .text  
 
 .globl gcm_gmult_4bit
diff -r b042e55cc07d -r 463b9f022fdc crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/md5-x86_64.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/md5-x86_64.S        Sat Aug 04 09:24:19 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/md5-x86_64.S        Sat Aug 04 11:03:34 2012 +0000
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
 .text  
 .align 16
 
diff -r b042e55cc07d -r 463b9f022fdc crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/modexp512-x86_64.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/modexp512-x86_64.S  Sat Aug 04 09:24:19 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/modexp512-x86_64.S  Sat Aug 04 11:03:34 2012 +0000
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
 .text  
 
 .type  MULADD_128x512,@function
diff -r b042e55cc07d -r 463b9f022fdc crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-md5-x86_64.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-md5-x86_64.S    Sat Aug 04 09:24:19 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-md5-x86_64.S    Sat Aug 04 11:03:34 2012 +0000
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
 .text  
 .align 16
 
diff -r b042e55cc07d -r 463b9f022fdc crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S        Sat Aug 04 09:24:19 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S        Sat Aug 04 11:03:34 2012 +0000
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
 .text  
 
 
diff -r b042e55cc07d -r 463b9f022fdc crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S       Sat Aug 04 09:24:19 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S       Sat Aug 04 11:03:34 2012 +0000
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
 .text  
 
 
diff -r b042e55cc07d -r 463b9f022fdc crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha512-x86_64.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha512-x86_64.S     Sat Aug 04 09:24:19 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha512-x86_64.S     Sat Aug 04 11:03:34 2012 +0000
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
 .text  
 
 .globl sha256_block_data_order
diff -r b042e55cc07d -r 463b9f022fdc crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/uplink-x86_64.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/uplink-x86_64.S     Sat Aug 04 09:24:19 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/uplink-x86_64.S     Sat Aug 04 11:03:34 2012 +0000
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
 .text  
 
 .globl OPENSSL_UplinkTable
diff -r b042e55cc07d -r 463b9f022fdc crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/vpaes-x86_64.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/vpaes-x86_64.S      Sat Aug 04 09:24:19 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/vpaes-x86_64.S      Sat Aug 04 11:03:34 2012 +0000
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
 .text  
 
 
diff -r b042e55cc07d -r 463b9f022fdc crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/wp-x86_64.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/wp-x86_64.S Sat Aug 04 09:24:19 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/wp-x86_64.S Sat Aug 04 11:03:34 2012 +0000
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
 .text  
 
 .globl whirlpool_block
diff -r b042e55cc07d -r 463b9f022fdc 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 Aug 04 09:24:19 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64cpuid.S       Sat Aug 04 11:03:34 2012 +0000
@@ -1,7 +1,8 @@
+#include <machine/asm.h>
 
 .globl OPENSSL_cpuid_setup
 .section       .init
-       call    OPENSSL_cpuid_setup@GOTPCREL(%rip)
+       call    PIC_PLT(OPENSSL_cpuid_setup)
 
 .hidden        OPENSSL_ia32cap_P
 .comm  OPENSSL_ia32cap_P,8,4
Prev by Date: [src/trunk]: src/sys/coda Don't increment the mount reference count here. Oth...
Next by Date: [src/trunk]: src/sys/kern - fix typo in comment
Previous by Thread: [src/trunk]: src/sys/coda Don't increment the mount reference count here. Oth...
Next by Thread: [src/trunk]: src/sys/kern - fix typo in comment
Indexes:
Home | Main Index | Thread Index | Old Index