Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386 Instead ...
details: https://anonhg.NetBSD.org/src/rev/696b46ff6699
branches: trunk
changeset: 780512:696b46ff6699
user: christos <christos%NetBSD.org@localhost>
date: Fri Jul 27 19:34:13 2012 +0000
description:
Instead of leaving the file directive which is inconsistent and may contains
paths, instead include our assembly macros
diffstat:
crypto/external/bsd/openssl/lib/libcrypto/arch/i386/Makefile | 3 ++-
crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes-586.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aesni-x86.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bf-586.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bf-686.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bn-586.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/i386/cast-586.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/i386/cmll-x86.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/i386/co-586.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypt586.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/i386/des-586.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ghash-x86.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/i386/md5-586.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rc4-586.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rc5-586.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rmd-586.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha1-586.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha256-586.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha512-586.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/i386/uplink-x86.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/i386/vpaes-x86.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S | 10 ++--------
23 files changed, 25 insertions(+), 30 deletions(-)
diffs (226 lines):
diff -r ceacb713958d -r 696b46ff6699 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/Makefile
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/Makefile Fri Jul 27 18:35:57 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/Makefile Fri Jul 27 19:34:13 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/07/05 16:53:58 spz Exp $
+# $NetBSD: Makefile,v 1.4 2012/07/27 19:34:13 christos Exp $
.include "bsd.own.mk"
@@ -10,5 +10,6 @@
${OPENSSLSRC}/crypto/x86cpuid.pl; do \
perl -I${OPENSSLSRC}/crypto/perlasm \
-I${OPENSSLSRC}/crypto/bn/asm $$i elf -fPIC \
+ | sed -e 's,^\.file.*$$,#include <machine/asm.h>,' \
> $$(basename $$i .pl).S; \
done
diff -r ceacb713958d -r 696b46ff6699 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes-586.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes-586.S Fri Jul 27 18:35:57 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes-586.S Fri Jul 27 19:34:13 2012 +0000
@@ -1,4 +1,4 @@
-.file "aes-586.s"
+#include <machine/asm.h>
.text
.type _x86_AES_encrypt_compact,@function
.align 16
diff -r ceacb713958d -r 696b46ff6699 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aesni-x86.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aesni-x86.S Fri Jul 27 18:35:57 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aesni-x86.S Fri Jul 27 19:34:13 2012 +0000
@@ -1,4 +1,4 @@
-.file "/net/quasar/src-5/NetBSD/src/crypto/external/bsd/openssl/dist/crypto/aes/asm/aesni-x86.s"
+#include <machine/asm.h>
.text
.globl aesni_encrypt
.type aesni_encrypt,@function
diff -r ceacb713958d -r 696b46ff6699 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bf-586.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bf-586.S Fri Jul 27 18:35:57 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bf-586.S Fri Jul 27 19:34:13 2012 +0000
@@ -1,4 +1,4 @@
-.file "bf-586.s"
+#include <machine/asm.h>
.text
.globl BF_encrypt
.type BF_encrypt,@function
diff -r ceacb713958d -r 696b46ff6699 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bf-686.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bf-686.S Fri Jul 27 18:35:57 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bf-686.S Fri Jul 27 19:34:13 2012 +0000
@@ -1,4 +1,4 @@
-.file "bf-686.s"
+#include <machine/asm.h>
.text
.globl BF_encrypt
.type BF_encrypt,@function
diff -r ceacb713958d -r 696b46ff6699 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bn-586.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bn-586.S Fri Jul 27 18:35:57 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bn-586.S Fri Jul 27 19:34:13 2012 +0000
@@ -1,4 +1,4 @@
-.file "/net/quasar/src-5/NetBSD/src/crypto/external/bsd/openssl/dist/crypto/bn/asm/bn-586.s"
+#include <machine/asm.h>
.text
.globl bn_mul_add_words
.type bn_mul_add_words,@function
diff -r ceacb713958d -r 696b46ff6699 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/cast-586.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/cast-586.S Fri Jul 27 18:35:57 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/cast-586.S Fri Jul 27 19:34:13 2012 +0000
@@ -1,4 +1,4 @@
-.file "cast-586.s"
+#include <machine/asm.h>
.text
.globl CAST_encrypt
.type CAST_encrypt,@function
diff -r ceacb713958d -r 696b46ff6699 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/cmll-x86.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/cmll-x86.S Fri Jul 27 18:35:57 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/cmll-x86.S Fri Jul 27 19:34:13 2012 +0000
@@ -1,4 +1,4 @@
-.file "cmll-586.s"
+#include <machine/asm.h>
.text
.globl Camellia_EncryptBlock_Rounds
.type Camellia_EncryptBlock_Rounds,@function
diff -r ceacb713958d -r 696b46ff6699 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/co-586.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/co-586.S Fri Jul 27 18:35:57 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/co-586.S Fri Jul 27 19:34:13 2012 +0000
@@ -1,4 +1,4 @@
-.file "/net/quasar/src-5/NetBSD/src/crypto/external/bsd/openssl/dist/crypto/bn/asm/co-586.s"
+#include <machine/asm.h>
.text
.globl bn_mul_comba8
.type bn_mul_comba8,@function
diff -r ceacb713958d -r 696b46ff6699 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypt586.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypt586.S Fri Jul 27 18:35:57 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypt586.S Fri Jul 27 19:34:13 2012 +0000
@@ -1,4 +1,4 @@
-.file "crypt586.s"
+#include <machine/asm.h>
.text
.globl fcrypt_body
.type fcrypt_body,@function
diff -r ceacb713958d -r 696b46ff6699 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/des-586.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/des-586.S Fri Jul 27 18:35:57 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/des-586.S Fri Jul 27 19:34:13 2012 +0000
@@ -1,4 +1,4 @@
-.file "des-586.s"
+#include <machine/asm.h>
.text
.globl DES_SPtrans
.type _x86_DES_encrypt,@function
diff -r ceacb713958d -r 696b46ff6699 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ghash-x86.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ghash-x86.S Fri Jul 27 18:35:57 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ghash-x86.S Fri Jul 27 19:34:13 2012 +0000
@@ -1,4 +1,4 @@
-.file "ghash-x86.s"
+#include <machine/asm.h>
.text
.globl gcm_gmult_4bit_x86
.type gcm_gmult_4bit_x86,@function
diff -r ceacb713958d -r 696b46ff6699 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/md5-586.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/md5-586.S Fri Jul 27 18:35:57 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/md5-586.S Fri Jul 27 19:34:13 2012 +0000
@@ -1,4 +1,4 @@
-.file "/net/quasar/src-5/NetBSD/src/crypto/external/bsd/openssl/dist/crypto/md5/asm/md5-586.s"
+#include <machine/asm.h>
.text
.globl md5_block_asm_data_order
.type md5_block_asm_data_order,@function
diff -r ceacb713958d -r 696b46ff6699 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rc4-586.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rc4-586.S Fri Jul 27 18:35:57 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rc4-586.S Fri Jul 27 19:34:13 2012 +0000
@@ -1,4 +1,4 @@
-.file "rc4-586.s"
+#include <machine/asm.h>
.text
.globl RC4
.type RC4,@function
diff -r ceacb713958d -r 696b46ff6699 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rc5-586.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rc5-586.S Fri Jul 27 18:35:57 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rc5-586.S Fri Jul 27 19:34:13 2012 +0000
@@ -1,4 +1,4 @@
-.file "rc5-586.s"
+#include <machine/asm.h>
.text
.globl RC5_32_encrypt
.type RC5_32_encrypt,@function
diff -r ceacb713958d -r 696b46ff6699 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rmd-586.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rmd-586.S Fri Jul 27 18:35:57 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rmd-586.S Fri Jul 27 19:34:13 2012 +0000
@@ -1,4 +1,4 @@
-.file "/net/quasar/src-5/NetBSD/src/crypto/external/bsd/openssl/dist/crypto/ripemd/asm/rmd-586.s"
+#include <machine/asm.h>
.text
.globl ripemd160_block_asm_data_order
.type ripemd160_block_asm_data_order,@function
diff -r ceacb713958d -r 696b46ff6699 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha1-586.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha1-586.S Fri Jul 27 18:35:57 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha1-586.S Fri Jul 27 19:34:13 2012 +0000
@@ -1,4 +1,4 @@
-.file "sha1-586.s"
+#include <machine/asm.h>
.text
.globl sha1_block_data_order
.type sha1_block_data_order,@function
diff -r ceacb713958d -r 696b46ff6699 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha256-586.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha256-586.S Fri Jul 27 18:35:57 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha256-586.S Fri Jul 27 19:34:13 2012 +0000
@@ -1,4 +1,4 @@
-.file "sha512-586.s"
+#include <machine/asm.h>
.text
.globl sha256_block_data_order
.type sha256_block_data_order,@function
diff -r ceacb713958d -r 696b46ff6699 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha512-586.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha512-586.S Fri Jul 27 18:35:57 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha512-586.S Fri Jul 27 19:34:13 2012 +0000
@@ -1,4 +1,4 @@
-.file "sha512-586.s"
+#include <machine/asm.h>
.text
.globl sha512_block_data_order
.type sha512_block_data_order,@function
diff -r ceacb713958d -r 696b46ff6699 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/uplink-x86.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/uplink-x86.S Fri Jul 27 18:35:57 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/uplink-x86.S Fri Jul 27 19:34:13 2012 +0000
@@ -1,4 +1,4 @@
-.file "uplink-x86.s"
+#include <machine/asm.h>
.text
.globl OPENSSL_UplinkTable
.type _$lazy1,@function
diff -r ceacb713958d -r 696b46ff6699 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/vpaes-x86.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/vpaes-x86.S Fri Jul 27 18:35:57 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/vpaes-x86.S Fri Jul 27 19:34:13 2012 +0000
@@ -1,4 +1,4 @@
-.file "vpaes-x86.s"
+#include <machine/asm.h>
.text
.align 64
.L_vpaes_consts:
diff -r ceacb713958d -r 696b46ff6699 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86.S Fri Jul 27 18:35:57 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86.S Fri Jul 27 19:34:13 2012 +0000
@@ -1,4 +1,4 @@
-.file "/net/quasar/src-5/NetBSD/src/crypto/external/bsd/openssl/dist/crypto/bn/asm/x86.s"
+#include <machine/asm.h>
.text
.globl bn_mul_add_words
.type bn_mul_add_words,@function
diff -r ceacb713958d -r 696b46ff6699 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S Fri Jul 27 18:35:57 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S Fri Jul 27 19:34:13 2012 +0000
@@ -1,4 +1,4 @@
-.file "x86cpuid.s"
+#include <machine/asm.h>
.text
.globl OPENSSL_ia32_cpuid
.type OPENSSL_ia32_cpuid,@function
@@ -329,10 +329,4 @@
.size OPENSSL_ia32_rdrand,.-.L_OPENSSL_ia32_rdrand_begin
.comm OPENSSL_ia32cap_P,8,4
.section .init
-#ifdef PIC
- PIC_PROLOGUE
- call PIC_PLT(_C_LABEL(OPENSSL_cpuid_setup))
- PIC_EPILOGUE
-#else
- call _C_LABEL(OPENSSL_cpuid_setup)
-#endif
+ call OPENSSL_cpuid_setup
Home |
Main Index |
Thread Index |
Old Index