Module Name: src
Committed By: christos
Date: Sat Aug 4 11:03:35 UTC 2012
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: Makefile
aes-x86_64.S aesni-sha1-x86_64.S aesni-x86_64.S bsaes-x86_64.S
cmll-x86_64.S ghash-x86_64.S md5-x86_64.S modexp512-x86_64.S
rc4-md5-x86_64.S rc4-x86_64.S sha1-x86_64.S sha512-x86_64.S
uplink-x86_64.S vpaes-x86_64.S wp-x86_64.S x86_64cpuid.S
Log Message:
add #include <machine/asm.h>, use PIC_PLT()
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-x86_64.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha512-x86_64.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/wp-x86_64.S
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/bsaes-x86_64.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ghash-x86_64.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/md5-x86_64.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/vpaes-x86_64.S
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/modexp512-x86_64.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-md5-x86_64.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/uplink-x86_64.S
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64cpuid.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/x86_64/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile:1.5 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile:1.6
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile:1.5 Fri Jul 27 14:16:53 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile Sat Aug 4 07:03:34 2012
@@ -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 @@ CRYPTODIST=${NETBSDSRCDIR}/crypto
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
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S:1.5 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S:1.6
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S:1.5 Thu Jul 26 17:22:47 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S Sat Aug 4 07:03:34 2012
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
.text
.type _x86_64_AES_encrypt,@function
.align 16
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-x86_64.S:1.5 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-x86_64.S:1.6
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-x86_64.S:1.5 Thu Jul 26 17:22:47 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-x86_64.S Sat Aug 4 07:03:34 2012
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
.text
.globl aesni_encrypt
.type aesni_encrypt,@function
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S:1.5 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S:1.6
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S:1.5 Thu Jul 26 17:22:47 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S Sat Aug 4 07:03:35 2012
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
.text
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha512-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha512-x86_64.S:1.5 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha512-x86_64.S:1.6
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha512-x86_64.S:1.5 Thu Jul 26 17:22:47 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha512-x86_64.S Sat Aug 4 07:03:35 2012
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
.text
.globl sha256_block_data_order
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/wp-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/wp-x86_64.S:1.5 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/wp-x86_64.S:1.6
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/wp-x86_64.S:1.5 Thu Jul 26 17:22:47 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/wp-x86_64.S Sat Aug 4 07:03:35 2012
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
.text
.globl whirlpool_block
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S:1.2 Thu Jul 26 17:22:47 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S Sat Aug 4 07:03:34 2012
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
.text
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/bsaes-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/bsaes-x86_64.S:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/bsaes-x86_64.S:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/bsaes-x86_64.S:1.2 Thu Jul 26 17:22:47 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/bsaes-x86_64.S Sat Aug 4 07:03:34 2012
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
.text
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ghash-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ghash-x86_64.S:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ghash-x86_64.S:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ghash-x86_64.S:1.2 Thu Jul 26 17:22:47 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ghash-x86_64.S Sat Aug 4 07:03:34 2012
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
.text
.globl gcm_gmult_4bit
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/md5-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/md5-x86_64.S:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/md5-x86_64.S:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/md5-x86_64.S:1.2 Sun Jun 5 19:09:50 2011
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/md5-x86_64.S Sat Aug 4 07:03:34 2012
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
.text
.align 16
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/vpaes-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/vpaes-x86_64.S:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/vpaes-x86_64.S:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/vpaes-x86_64.S:1.2 Thu Jul 26 17:22:47 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/vpaes-x86_64.S Sat Aug 4 07:03:35 2012
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
.text
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S:1.4 Thu Jul 26 17:22:47 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S Sat Aug 4 07:03:34 2012
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
.text
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S:1.4 Thu Jul 26 17:22:47 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S Sat Aug 4 07:03:35 2012
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
.text
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/modexp512-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/modexp512-x86_64.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/modexp512-x86_64.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/modexp512-x86_64.S:1.1 Thu Jul 26 15:58:42 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/modexp512-x86_64.S Sat Aug 4 07:03:35 2012
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
.text
.type MULADD_128x512,@function
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-md5-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-md5-x86_64.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-md5-x86_64.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-md5-x86_64.S:1.1 Thu Jul 26 15:58:42 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-md5-x86_64.S Sat Aug 4 07:03:35 2012
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
.text
.align 16
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/uplink-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/uplink-x86_64.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/uplink-x86_64.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/uplink-x86_64.S:1.1 Mon Jun 6 02:08:53 2011
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/uplink-x86_64.S Sat Aug 4 07:03:35 2012
@@ -1,3 +1,4 @@
+#include <machine/asm.h>
.text
.globl OPENSSL_UplinkTable
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64cpuid.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64cpuid.S:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64cpuid.S:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64cpuid.S:1.3 Fri Jul 27 12:04:30 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64cpuid.S Sat Aug 4 07:03:35 2012
@@ -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
