Module Name: src
Committed By: christos
Date: Fri Jul 27 19:34:16 UTC 2012
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386: Makefile
aes-586.S aesni-x86.S bf-586.S bf-686.S bn-586.S cast-586.S
cmll-x86.S co-586.S crypt586.S des-586.S ghash-x86.S md5-586.S
rc4-586.S rc5-586.S rmd-586.S sha1-586.S sha256-586.S sha512-586.S
uplink-x86.S vpaes-x86.S x86.S x86cpuid.S
Log Message:
Instead of leaving the file directive which is inconsistent and may contains
paths, instead include our assembly macros
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/Makefile \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes-586.S
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aesni-x86.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bn-586.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/co-586.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/md5-586.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rmd-586.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bf-586.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bf-686.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypt586.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ghash-x86.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rc5-586.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha512-586.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/uplink-x86.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/vpaes-x86.S
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/cast-586.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/cmll-x86.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/des-586.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rc4-586.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha1-586.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha256-586.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.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/Makefile:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/Makefile:1.3 Tue Jul 5 12:53:58 2011
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/Makefile Fri Jul 27 15:34:13 2012
@@ -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 @@ regen:
${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
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.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes-586.S:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes-586.S:1.3 Thu Jul 26 15:58:40 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes-586.S Fri Jul 27 15:34:13 2012
@@ -1,4 +1,4 @@
-.file "aes-586.s"
+#include <machine/asm.h>
.text
.type _x86_AES_encrypt_compact,@function
.align 16
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aesni-x86.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aesni-x86.S:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aesni-x86.S:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aesni-x86.S:1.4 Thu Jul 26 15:58:40 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aesni-x86.S Fri Jul 27 15:34:13 2012
@@ -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
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bn-586.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bn-586.S:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bn-586.S:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bn-586.S:1.4 Thu Jul 26 15:58:40 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bn-586.S Fri Jul 27 15:34:14 2012
@@ -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
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/co-586.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/co-586.S:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/co-586.S:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/co-586.S:1.4 Thu Jul 26 15:58:40 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/co-586.S Fri Jul 27 15:34:14 2012
@@ -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
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/md5-586.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/md5-586.S:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/md5-586.S:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/md5-586.S:1.4 Thu Jul 26 15:58:40 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/md5-586.S Fri Jul 27 15:34:14 2012
@@ -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
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rmd-586.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rmd-586.S:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rmd-586.S:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rmd-586.S:1.4 Thu Jul 26 15:58:40 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rmd-586.S Fri Jul 27 15:34:15 2012
@@ -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
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86.S:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86.S:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86.S:1.4 Thu Jul 26 15:58:40 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86.S Fri Jul 27 15:34:15 2012
@@ -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
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S:1.4 Thu Jul 26 15:58:40 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86cpuid.S Fri Jul 27 15:34:15 2012
@@ -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 @@ OPENSSL_ia32_rdrand:
.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
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bf-586.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bf-586.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bf-586.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bf-586.S:1.1 Sun Jul 19 19:30:45 2009
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bf-586.S Fri Jul 27 15:34:13 2012
@@ -1,4 +1,4 @@
-.file "bf-586.s"
+#include <machine/asm.h>
.text
.globl BF_encrypt
.type BF_encrypt,@function
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bf-686.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bf-686.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bf-686.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bf-686.S:1.1 Sun Jul 19 19:30:45 2009
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bf-686.S Fri Jul 27 15:34:14 2012
@@ -1,4 +1,4 @@
-.file "bf-686.s"
+#include <machine/asm.h>
.text
.globl BF_encrypt
.type BF_encrypt,@function
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.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypt586.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypt586.S:1.1 Sun Jul 19 19:30:45 2009
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypt586.S Fri Jul 27 15:34:14 2012
@@ -1,4 +1,4 @@
-.file "crypt586.s"
+#include <machine/asm.h>
.text
.globl fcrypt_body
.type fcrypt_body,@function
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ghash-x86.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ghash-x86.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ghash-x86.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ghash-x86.S:1.1 Thu Jul 26 15:58:40 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ghash-x86.S Fri Jul 27 15:34:14 2012
@@ -1,4 +1,4 @@
-.file "ghash-x86.s"
+#include <machine/asm.h>
.text
.globl gcm_gmult_4bit_x86
.type gcm_gmult_4bit_x86,@function
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rc5-586.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rc5-586.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rc5-586.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rc5-586.S:1.1 Sun Jul 19 19:30:46 2009
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rc5-586.S Fri Jul 27 15:34:15 2012
@@ -1,4 +1,4 @@
-.file "rc5-586.s"
+#include <machine/asm.h>
.text
.globl RC5_32_encrypt
.type RC5_32_encrypt,@function
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha512-586.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha512-586.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha512-586.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha512-586.S:1.1 Sun Jul 19 19:30:46 2009
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha512-586.S Fri Jul 27 15:34:15 2012
@@ -1,4 +1,4 @@
-.file "sha512-586.s"
+#include <machine/asm.h>
.text
.globl sha512_block_data_order
.type sha512_block_data_order,@function
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/uplink-x86.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/uplink-x86.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/uplink-x86.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/uplink-x86.S:1.1 Mon Jun 6 02:08:52 2011
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/uplink-x86.S Fri Jul 27 15:34:15 2012
@@ -1,4 +1,4 @@
-.file "uplink-x86.s"
+#include <machine/asm.h>
.text
.globl OPENSSL_UplinkTable
.type _$lazy1,@function
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/vpaes-x86.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/vpaes-x86.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/vpaes-x86.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/vpaes-x86.S:1.1 Thu Jul 26 15:58:40 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/vpaes-x86.S Fri Jul 27 15:34:15 2012
@@ -1,4 +1,4 @@
-.file "vpaes-x86.s"
+#include <machine/asm.h>
.text
.align 64
.L_vpaes_consts:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/cast-586.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/cast-586.S:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/cast-586.S:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/cast-586.S:1.2 Thu Jul 26 15:58:40 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/cast-586.S Fri Jul 27 15:34:14 2012
@@ -1,4 +1,4 @@
-.file "cast-586.s"
+#include <machine/asm.h>
.text
.globl CAST_encrypt
.type CAST_encrypt,@function
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/cmll-x86.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/cmll-x86.S:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/cmll-x86.S:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/cmll-x86.S:1.2 Thu Jul 26 15:58:40 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/cmll-x86.S Fri Jul 27 15:34:14 2012
@@ -1,4 +1,4 @@
-.file "cmll-586.s"
+#include <machine/asm.h>
.text
.globl Camellia_EncryptBlock_Rounds
.type Camellia_EncryptBlock_Rounds,@function
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/des-586.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/des-586.S:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/des-586.S:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/des-586.S:1.2 Sun Jun 5 19:09:50 2011
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/des-586.S Fri Jul 27 15:34:14 2012
@@ -1,4 +1,4 @@
-.file "des-586.s"
+#include <machine/asm.h>
.text
.globl DES_SPtrans
.type _x86_DES_encrypt,@function
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rc4-586.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rc4-586.S:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rc4-586.S:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rc4-586.S:1.2 Thu Jul 26 15:58:40 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rc4-586.S Fri Jul 27 15:34:14 2012
@@ -1,4 +1,4 @@
-.file "rc4-586.s"
+#include <machine/asm.h>
.text
.globl RC4
.type RC4,@function
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha1-586.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha1-586.S:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha1-586.S:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha1-586.S:1.2 Thu Jul 26 15:58:40 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha1-586.S Fri Jul 27 15:34:15 2012
@@ -1,4 +1,4 @@
-.file "sha1-586.s"
+#include <machine/asm.h>
.text
.globl sha1_block_data_order
.type sha1_block_data_order,@function
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha256-586.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha256-586.S:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha256-586.S:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha256-586.S:1.2 Thu Jul 26 15:58:40 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/sha256-586.S Fri Jul 27 15:34:15 2012
@@ -1,4 +1,4 @@
-.file "sha512-586.s"
+#include <machine/asm.h>
.text
.globl sha256_block_data_order
.type sha256_block_data_order,@function
