From f2cc0d2ae571dc44aece7c777e22811089ec18cf Mon Sep 17 00:00:00 2001
From: itohy <itohy@NetBSD.org>
Date: Tue, 12 Nov 2002 03:03:10 +0000
Subject: [PATCH] add non-ELF .align

---
 sys/crypto/blowfish/arch/i386/bf_cbc.S | 18 +++++++++++++-
 sys/crypto/des/arch/i386/des_cbc.S     | 34 +++++++++++++++++++++++++-
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/sys/crypto/blowfish/arch/i386/bf_cbc.S b/sys/crypto/blowfish/arch/i386/bf_cbc.S
index bc8a41d40f46..e5aa45b3ff99 100644
--- a/sys/crypto/blowfish/arch/i386/bf_cbc.S
+++ b/sys/crypto/blowfish/arch/i386/bf_cbc.S
@@ -1,4 +1,4 @@
-/* $NetBSD: bf_cbc.S,v 1.1 2001/09/09 11:01:01 tls Exp $ */
+/* $NetBSD: bf_cbc.S,v 1.2 2002/11/12 03:03:10 itohy Exp $ */
 
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
@@ -162,7 +162,11 @@ ENTRY(BF_cbc_encrypt)
 	movl	%eax,		(%edi)
 	movl	%ebx,		4(%edi)
 	jmp	.L003finish
+#ifdef __ELF__
 .align 16
+#else
+.align 4
+#endif
 .L000decrypt:
 	andl	$4294967288,	%ebp
 	movl	16(%esp),	%eax
@@ -244,7 +248,11 @@ ENTRY(BF_cbc_encrypt)
 	movb	%cl,		(%esi)
 .L019djend:
 	jmp	.L003finish
+#ifdef __ELF__
 .align 16
+#else
+.align 4
+#endif
 .L003finish:
 	movl	60(%esp),	%ecx
 	addl	$24,		%esp
@@ -255,7 +263,11 @@ ENTRY(BF_cbc_encrypt)
 	popl	%ebx
 	popl	%ebp
 	ret
+#ifdef __ELF__
 .align 16
+#else
+.align 4
+#endif
 .L004cbc_enc_jmp_table:
 	.long 0
 	.long .L012ej1
@@ -265,7 +277,11 @@ ENTRY(BF_cbc_encrypt)
 	.long .L007ej5
 	.long .L006ej6
 	.long .L005ej7
+#ifdef __ELF__
 .align 16
+#else
+.align 4
+#endif
 .L023cbc_dec_jmp_table:
 	.long 0
 	.long .L022dj1
diff --git a/sys/crypto/des/arch/i386/des_cbc.S b/sys/crypto/des/arch/i386/des_cbc.S
index dbb1dcd9de64..f8e3a7bc0c42 100644
--- a/sys/crypto/des/arch/i386/des_cbc.S
+++ b/sys/crypto/des/arch/i386/des_cbc.S
@@ -1,4 +1,4 @@
-/* $NetBSD: des_cbc.S,v 1.1 2001/09/09 11:01:02 tls Exp $ */
+/* $NetBSD: des_cbc.S,v 1.2 2002/11/12 03:03:11 itohy Exp $ */
 
 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
@@ -148,7 +148,11 @@ ENTRY(des_ncbc_encrypt)
 	movl	%eax,		(%edi)
 	movl	%ebx,		4(%edi)
 	jmp	.L007finish
+#ifdef __ELF__
 .align 16
+#else
+.align 4
+#endif
 .L004decrypt:
 	andl	$4294967288,	%ebp
 	movl	20(%esp),	%eax
@@ -214,7 +218,11 @@ ENTRY(des_ncbc_encrypt)
 	movb	%cl,		(%esi)
 .L023djend:
 	jmp	.L007finish
+#ifdef __ELF__
 .align 16
+#else
+.align 4
+#endif
 .L007finish:
 	movl	64(%esp),	%ecx
 	addl	$28,		%esp
@@ -225,7 +233,11 @@ ENTRY(des_ncbc_encrypt)
 	popl	%ebx
 	popl	%ebp
 	ret
+#ifdef __ELF__
 .align 16
+#else
+.align 4
+#endif
 .L008cbc_enc_jmp_table:
 	.long 0
 	.long .L016ej1
@@ -235,7 +247,11 @@ ENTRY(des_ncbc_encrypt)
 	.long .L011ej5
 	.long .L010ej6
 	.long .L009ej7
+#ifdef __ELF__
 .align 16
+#else
+.align 4
+#endif
 .L027cbc_dec_jmp_table:
 	.long 0
 	.long .L026dj1
@@ -336,7 +352,11 @@ ENTRY(des_ede3_cbc_encrypt)
 	movl	%eax,		(%edi)
 	movl	%ebx,		4(%edi)
 	jmp	.L031finish
+#ifdef __ELF__
 .align 16
+#else
+.align 4
+#endif
 .L028decrypt:
 	andl	$4294967288,	%ebp
 	movl	24(%esp),	%eax
@@ -402,7 +422,11 @@ ENTRY(des_ede3_cbc_encrypt)
 	movb	%cl,		(%esi)
 .L047djend:
 	jmp	.L031finish
+#ifdef __ELF__
 .align 16
+#else
+.align 4
+#endif
 .L031finish:
 	movl	76(%esp),	%ecx
 	addl	$32,		%esp
@@ -413,7 +437,11 @@ ENTRY(des_ede3_cbc_encrypt)
 	popl	%ebx
 	popl	%ebp
 	ret
+#ifdef __ELF__
 .align 16
+#else
+.align 4
+#endif
 .L032cbc_enc_jmp_table:
 	.long 0
 	.long .L040ej1
@@ -423,7 +451,11 @@ ENTRY(des_ede3_cbc_encrypt)
 	.long .L035ej5
 	.long .L034ej6
 	.long .L033ej7
+#ifdef __ELF__
 .align 16
+#else
+.align 4
+#endif
 .L051cbc_dec_jmp_table:
 	.long 0
 	.long .L050dj1