1 files changed, 36 insertions, 31 deletions
diff --git a/src/lib/libcrypto/arch/i386/Makefile.inc b/src/lib/libcrypto/arch/i386/Makefile.inc
index 13f20d249d..a4b8c46ef3 100644
--- a/src/lib/libcrypto/arch/i386/Makefile.inc
+++ b/src/lib/libcrypto/arch/i386/Makefile.inc
@@ -1,45 +1,49 @@
-# $OpenBSD: Makefile.inc,v 1.1 2014/04/17 18:11:47 miod Exp $
+# $OpenBSD: Makefile.inc,v 1.2 2014/05/06 19:55:06 miod Exp $
 # i386-specific libcrypto build rules
-SRCS+= wp_block.c
+# aes
+CFLAGS+= -DAES_ASM
+SSLASM+= aes aes-586
+CFLAGS+= -DVPAES_ASM
+SSLASM+= aes vpaes-x86
+SSLASM+= aes aesni-x86
+# bf
 SRCS+= bf_cbc.c 
+SSLASM+= bf bf-586
-CFLAGS+= -DOPENSSL_BN_ASM_GF2m
+# bn
-CFLAGS+= -DOPENSSL_BN_ASM_MONT
-CFLAGS+= -DOPENSSL_BN_ASM_PART_WORDS
-CFLAGS+= -DOPENSSL_CPUID_OBJ
 CFLAGS+= -DOPENSSL_IA32_SSE2
+CFLAGS+= -DOPENSSL_BN_ASM_PART_WORDS
-CFLAGS+= -DAES_ASM
+SSLASM+= bn bn-586
-CFLAGS+= -DGHASH_ASM
+SSLASM+= bn co-586
+CFLAGS+= -DOPENSSL_BN_ASM_MONT
+SSLASM+= bn x86-mont
+CFLAGS+= -DOPENSSL_BN_ASM_GF2m
+SSLASM+= bn x86-gf2m
+# des
+SSLASM+= des des-586
+# md5
 CFLAGS+= -DMD5_ASM
+SSLASM+= md5 md5-586
+# modes
+CFLAGS+= -DGHASH_ASM
+SSLASM+= modes ghash-x86
+# rc4
+SSLASM+= rc4 rc4-586
+# ripemd
 CFLAGS+= -DRMD160_ASM
+SSLASM+= ripemd rmd-586
+# sha
 CFLAGS+= -DSHA1_ASM
+SSLASM+= sha sha1-586
 CFLAGS+= -DSHA256_ASM
+SSLASM+= sha sha256-586
 CFLAGS+= -DSHA512_ASM
-CFLAGS+= -DVPAES_ASM
+SSLASM+= sha sha512-586
+# whrlpool
+SRCS+= wp_block.c
 CFLAGS+= -DWHIRLPOOL_ASM
+SSLASM+= whrlpool wp-mmx
-SSLASM=\
-        aes aes-586 \
-        aes vpaes-x86 \
-        aes aesni-x86 \
-        bf bf-586 \
-        bn bn-586 \
-        bn co-586 \
-        bn x86-mont \
-        bn x86-gf2m \
-        des crypt586 \
-        des des-586 \
-        md5 md5-586 \
-        modes ghash-x86 \
-        rc4 rc4-586 \
-        ripemd rmd-586 \
-        sha sha1-586 \
-        sha sha256-586 \
-        sha sha512-586 \
-        whrlpool wp-mmx
 .for dir f in ${SSLASM}
 SRCS+=  ${f}.S
@@ -50,6 +54,7 @@ ${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl ${LCRYPTO_SRC}/perlasm/x86gas.pl
                    openbsd-elf ${CFLAGS} 386 ${PICFLAG} > ${.TARGET}
 .endfor
+CFLAGS+= -DOPENSSL_CPUID_OBJ
 SRCS+=  x86cpuid.S
 GENERATED+=x86cpuid.S

diff --git a/src/lib/libcrypto/arch/i386/Makefile.inc b/src/lib/libcrypto/arch/i386/Makefile.inc index 13f20d249d..a4b8c46ef3 100644 --- a/src/lib/libcrypto/arch/i386/Makefile.inc +++ b/src/lib/libcrypto/arch/i386/Makefile.inc
@@ -1,45 +1,49 @@
1	# $OpenBSD: Makefile.inc,v 1.1 2014/04/17 18:11:47 miod Exp $	1	# $OpenBSD: Makefile.inc,v 1.2 2014/05/06 19:55:06 miod Exp $
2		2
3	# i386-specific libcrypto build rules	3	# i386-specific libcrypto build rules
4		4
5	SRCS+= wp_block.c	5	# aes
		6	CFLAGS+= -DAES_ASM
		7	SSLASM+= aes aes-586
		8	CFLAGS+= -DVPAES_ASM
		9	SSLASM+= aes vpaes-x86
		10	SSLASM+= aes aesni-x86
		11	# bf
6	SRCS+= bf_cbc.c	12	SRCS+= bf_cbc.c
7		13	SSLASM+= bf bf-586
8	CFLAGS+= -DOPENSSL_BN_ASM_GF2m	14	# bn
9	CFLAGS+= -DOPENSSL_BN_ASM_MONT
10	CFLAGS+= -DOPENSSL_BN_ASM_PART_WORDS
11	CFLAGS+= -DOPENSSL_CPUID_OBJ
12	CFLAGS+= -DOPENSSL_IA32_SSE2	15	CFLAGS+= -DOPENSSL_IA32_SSE2
13		16	CFLAGS+= -DOPENSSL_BN_ASM_PART_WORDS
14	CFLAGS+= -DAES_ASM	17	SSLASM+= bn bn-586
15	CFLAGS+= -DGHASH_ASM	18	SSLASM+= bn co-586
		19	CFLAGS+= -DOPENSSL_BN_ASM_MONT
		20	SSLASM+= bn x86-mont
		21	CFLAGS+= -DOPENSSL_BN_ASM_GF2m
		22	SSLASM+= bn x86-gf2m
		23	# des
		24	SSLASM+= des des-586
		25	# md5
16	CFLAGS+= -DMD5_ASM	26	CFLAGS+= -DMD5_ASM
		27	SSLASM+= md5 md5-586
		28	# modes
		29	CFLAGS+= -DGHASH_ASM
		30	SSLASM+= modes ghash-x86
		31	# rc4
		32	SSLASM+= rc4 rc4-586
		33	# ripemd
17	CFLAGS+= -DRMD160_ASM	34	CFLAGS+= -DRMD160_ASM
		35	SSLASM+= ripemd rmd-586
		36	# sha
18	CFLAGS+= -DSHA1_ASM	37	CFLAGS+= -DSHA1_ASM
		38	SSLASM+= sha sha1-586
19	CFLAGS+= -DSHA256_ASM	39	CFLAGS+= -DSHA256_ASM
		40	SSLASM+= sha sha256-586
20	CFLAGS+= -DSHA512_ASM	41	CFLAGS+= -DSHA512_ASM
21	CFLAGS+= -DVPAES_ASM	42	SSLASM+= sha sha512-586
		43	# whrlpool
		44	SRCS+= wp_block.c
22	CFLAGS+= -DWHIRLPOOL_ASM	45	CFLAGS+= -DWHIRLPOOL_ASM
23		46	SSLASM+= whrlpool wp-mmx
24	SSLASM=\
25	aes aes-586 \
26	aes vpaes-x86 \
27	aes aesni-x86 \
28	bf bf-586 \
29	bn bn-586 \
30	bn co-586 \
31	bn x86-mont \
32	bn x86-gf2m \
33	des crypt586 \
34	des des-586 \
35	md5 md5-586 \
36	modes ghash-x86 \
37	rc4 rc4-586 \
38	ripemd rmd-586 \
39	sha sha1-586 \
40	sha sha256-586 \
41	sha sha512-586 \
42	whrlpool wp-mmx
43		47
44	.for dir f in ${SSLASM}	48	.for dir f in ${SSLASM}
45	SRCS+= ${f}.S	49	SRCS+= ${f}.S
@@ -50,6 +54,7 @@ ${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl ${LCRYPTO_SRC}/perlasm/x86gas.pl
50	openbsd-elf ${CFLAGS} 386 ${PICFLAG} > ${.TARGET}	54	openbsd-elf ${CFLAGS} 386 ${PICFLAG} > ${.TARGET}
51	.endfor	55	.endfor
52		56
		57	CFLAGS+= -DOPENSSL_CPUID_OBJ
53	SRCS+= x86cpuid.S	58	SRCS+= x86cpuid.S
54	GENERATED+=x86cpuid.S	59	GENERATED+=x86cpuid.S
55		60