diff options
author | beck <> | 1998-10-12 05:26:13 +0000 |
---|---|---|
committer | beck <> | 1998-10-12 05:26:13 +0000 |
commit | dfc8dc699c7537a774920541d1517de4a3d01502 (patch) | |
tree | cd71ade1608e603cabf38d649d945cfdc8733ff4 /src | |
parent | 6d7465ed57dc209c50f2936a017603a6cd23b064 (diff) | |
download | openbsd-dfc8dc699c7537a774920541d1517de4a3d01502.tar.gz openbsd-dfc8dc699c7537a774920541d1517de4a3d01502.tar.bz2 openbsd-dfc8dc699c7537a774920541d1517de4a3d01502.zip |
*UNTESTED* Makefile and configure changes that may work with pmax and arc.
*These need to be tested by someone who has one!!*
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libssl/Makefile.bsd-wrapper | 8 | ||||
-rw-r--r-- | src/lib/libssl/crypto-patent/Makefile | 8 | ||||
-rw-r--r-- | src/lib/libssl/crypto/Makefile | 8 | ||||
-rw-r--r-- | src/lib/libssl/src/Configure | 2 | ||||
-rw-r--r-- | src/lib/libssl/ssl-patent/Makefile | 9 | ||||
-rw-r--r-- | src/lib/libssl/ssl/Makefile | 9 |
6 files changed, 44 insertions, 0 deletions
diff --git a/src/lib/libssl/Makefile.bsd-wrapper b/src/lib/libssl/Makefile.bsd-wrapper index 12347cbb97..b8189988cd 100644 --- a/src/lib/libssl/Makefile.bsd-wrapper +++ b/src/lib/libssl/Makefile.bsd-wrapper | |||
@@ -11,6 +11,12 @@ LNDIR= /usr/bin/lndir | |||
11 | .if ${MACHINE_ARCH} == "i386" | 11 | .if ${MACHINE_ARCH} == "i386" |
12 | SSLCONF= OpenBSD-x86 | 12 | SSLCONF= OpenBSD-x86 |
13 | .else | 13 | .else |
14 | .if ${MACHINE_ARCH} == "pmax" | ||
15 | SSLCONF= OpenBSD-pmax | ||
16 | .else | ||
17 | .if ${MACHINE_ARCH} == "arc" | ||
18 | SSLCONF= OpenBSD-arc | ||
19 | .else | ||
14 | .if ${MACHINE_ARCH} == "alpha" | 20 | .if ${MACHINE_ARCH} == "alpha" |
15 | SSLCONF= OpenBSD-alpha | 21 | SSLCONF= OpenBSD-alpha |
16 | .else | 22 | .else |
@@ -22,6 +28,8 @@ SSLCONF= OpenBSD-bigendian | |||
22 | .endif | 28 | .endif |
23 | .endif | 29 | .endif |
24 | .endif | 30 | .endif |
31 | .endif | ||
32 | .endif | ||
25 | 33 | ||
26 | 34 | ||
27 | .include <bsd.own.mk> | 35 | .include <bsd.own.mk> |
diff --git a/src/lib/libssl/crypto-patent/Makefile b/src/lib/libssl/crypto-patent/Makefile index a52124b7fb..b7ced9435a 100644 --- a/src/lib/libssl/crypto-patent/Makefile +++ b/src/lib/libssl/crypto-patent/Makefile | |||
@@ -8,12 +8,20 @@ LCRYPTO_SRC= ${.CURDIR}/../${SSLEAYDIST}/crypto | |||
8 | .if ${MACHINE_ARCH} == "i386" | 8 | .if ${MACHINE_ARCH} == "i386" |
9 | CFLAGS+= -DL_ENDIAN -DBN_ASM | 9 | CFLAGS+= -DL_ENDIAN -DBN_ASM |
10 | .else | 10 | .else |
11 | .if ${MACHINE_ARCH} == "arc" | ||
12 | CFLAGS+= -DL_ENDIAN | ||
13 | .else | ||
14 | .if ${MACHINE_ARCH} == "pmax" | ||
15 | CFLAGS+= -DL_ENDIAN | ||
16 | .else | ||
11 | .if ${MACHINE_ARCH} == "alpha" | 17 | .if ${MACHINE_ARCH} == "alpha" |
12 | # no ENDIAN stuff defined for alpha | 18 | # no ENDIAN stuff defined for alpha |
13 | .else | 19 | .else |
14 | CFLAGS+= -DB_ENDIAN | 20 | CFLAGS+= -DB_ENDIAN |
15 | .endif | 21 | .endif |
16 | .endif | 22 | .endif |
23 | .endif | ||
24 | .endif | ||
17 | 25 | ||
18 | CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE | 26 | CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE |
19 | CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST} | 27 | CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST} |
diff --git a/src/lib/libssl/crypto/Makefile b/src/lib/libssl/crypto/Makefile index 214c1e2350..fc1a092225 100644 --- a/src/lib/libssl/crypto/Makefile +++ b/src/lib/libssl/crypto/Makefile | |||
@@ -8,12 +8,20 @@ LCRYPTO_SRC= ${.CURDIR}/../${SSLEAYDIST}/crypto | |||
8 | .if ${MACHINE_ARCH} == "i386" | 8 | .if ${MACHINE_ARCH} == "i386" |
9 | CFLAGS+= -DL_ENDIAN -DBN_ASM | 9 | CFLAGS+= -DL_ENDIAN -DBN_ASM |
10 | .else | 10 | .else |
11 | .if ${MACHINE_ARCH} == "arc" | ||
12 | CFLAGS+= -DL_ENDIAN | ||
13 | .else | ||
14 | .if ${MACHINE_ARCH} == "pmax" | ||
15 | CFLAGS+= -DL_ENDIAN | ||
16 | .else | ||
11 | .if ${MACHINE_ARCH} == "alpha" | 17 | .if ${MACHINE_ARCH} == "alpha" |
12 | # no ENDIAN stuff defined for alpha | 18 | # no ENDIAN stuff defined for alpha |
13 | .else | 19 | .else |
14 | CFLAGS+= -DB_ENDIAN | 20 | CFLAGS+= -DB_ENDIAN |
15 | .endif | 21 | .endif |
16 | .endif | 22 | .endif |
23 | .endif | ||
24 | .endif | ||
17 | 25 | ||
18 | CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE | 26 | CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE |
19 | CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST} | 27 | CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST} |
diff --git a/src/lib/libssl/src/Configure b/src/lib/libssl/src/Configure index 1dc0ed320c..8b9ecbcdef 100644 --- a/src/lib/libssl/src/Configure +++ b/src/lib/libssl/src/Configure | |||
@@ -135,6 +135,8 @@ $x86_bsdi_asm="asm/bn86bsdi.o:asm/dx86bsdi.o asm/yx86bsdi.o:asm/bx86bsdi.o:asm/m | |||
135 | "OpenBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::SIXTY_FOUR_BIT_LONGS DES_INT DES_PTR DES_RISC2:::", | 135 | "OpenBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::SIXTY_FOUR_BIT_LONGS DES_INT DES_PTR DES_RISC2:::", |
136 | "OpenBSD-x86", "gcc:-DTERMIOS -DBN_ASM -DL_ENDIAN -D_ANSI_SOURCE -fomit-frame-pointer -O3 -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm", | 136 | "OpenBSD-x86", "gcc:-DTERMIOS -DBN_ASM -DL_ENDIAN -D_ANSI_SOURCE -fomit-frame-pointer -O3 -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm", |
137 | "OpenBSD-bigendian", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::", | 137 | "OpenBSD-bigendian", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::", |
138 | "OpenBSD-pmax", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DL_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::", | ||
139 | "OpenBSD-arc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DL_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::", | ||
138 | "FreeBSD", "gcc:-DTERMIOS -DBN_ASM -DL_ENDIAN -D_ANSI_SOURCE -fomit-frame-pointer -O3 -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm", | 140 | "FreeBSD", "gcc:-DTERMIOS -DBN_ASM -DL_ENDIAN -D_ANSI_SOURCE -fomit-frame-pointer -O3 -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm", |
139 | #"bsdi-gcc", "gcc:-O3 -ffast-math -DBN_ASM -DL_ENDIAN -DPERL5 -m486::RSA_LLONG $x86_gc_des $x86_gcc_opts:$x86_bsdi_asm", | 141 | #"bsdi-gcc", "gcc:-O3 -ffast-math -DBN_ASM -DL_ENDIAN -DPERL5 -m486::RSA_LLONG $x86_gc_des $x86_gcc_opts:$x86_bsdi_asm", |
140 | "nextstep", "cc:-O3 -Wall -DBN_ASM::BN_LLONG $x86_gcc_des $x86_gcc_opts:::", | 142 | "nextstep", "cc:-O3 -Wall -DBN_ASM::BN_LLONG $x86_gcc_des $x86_gcc_opts:::", |
diff --git a/src/lib/libssl/ssl-patent/Makefile b/src/lib/libssl/ssl-patent/Makefile index 09e9de7fb4..0a4db98979 100644 --- a/src/lib/libssl/ssl-patent/Makefile +++ b/src/lib/libssl/ssl-patent/Makefile | |||
@@ -9,12 +9,21 @@ LCRYPTO_SRC= ${.CURDIR}/../${SSLEAYDIST}/crypto | |||
9 | .if ${MACHINE_ARCH} == "i386" | 9 | .if ${MACHINE_ARCH} == "i386" |
10 | CFLAGS+= -DL_ENDIAN -DBN_ASM | 10 | CFLAGS+= -DL_ENDIAN -DBN_ASM |
11 | .else | 11 | .else |
12 | .if ${MACHINE_ARCH} == "arc" | ||
13 | CFLAGS+= -DL_ENDIAN | ||
14 | .else | ||
15 | .if ${MACHINE_ARCH} == "pmax" | ||
16 | CFLAGS+= -DL_ENDIAN | ||
17 | .else | ||
12 | .if ${MACHINE_ARCH} == "alpha" | 18 | .if ${MACHINE_ARCH} == "alpha" |
13 | # no ENDIAN stuff defined for alpha | 19 | # no ENDIAN stuff defined for alpha |
14 | .else | 20 | .else |
15 | CFLAGS+= -DB_ENDIAN | 21 | CFLAGS+= -DB_ENDIAN |
16 | .endif | 22 | .endif |
17 | .endif | 23 | .endif |
24 | .endif | ||
25 | .endif | ||
26 | |||
18 | CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE | 27 | CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE |
19 | CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST} | 28 | CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST} |
20 | CFLAGS+= -I${LSSL_SRC} -I${LCRYPTO_SRC} | 29 | CFLAGS+= -I${LSSL_SRC} -I${LCRYPTO_SRC} |
diff --git a/src/lib/libssl/ssl/Makefile b/src/lib/libssl/ssl/Makefile index facbfa9ca7..6fffdd9ef2 100644 --- a/src/lib/libssl/ssl/Makefile +++ b/src/lib/libssl/ssl/Makefile | |||
@@ -9,12 +9,21 @@ LCRYPTO_SRC= ${.CURDIR}/../${SSLEAYDIST}/crypto | |||
9 | .if ${MACHINE_ARCH} == "i386" | 9 | .if ${MACHINE_ARCH} == "i386" |
10 | CFLAGS+= -DL_ENDIAN -DBN_ASM | 10 | CFLAGS+= -DL_ENDIAN -DBN_ASM |
11 | .else | 11 | .else |
12 | .if ${MACHINE_ARCH} == "arc" | ||
13 | CFLAGS+= -DL_ENDIAN | ||
14 | .else | ||
15 | .if ${MACHINE_ARCH} == "pmax" | ||
16 | CFLAGS+= -DL_ENDIAN | ||
17 | .else | ||
12 | .if ${MACHINE_ARCH} == "alpha" | 18 | .if ${MACHINE_ARCH} == "alpha" |
13 | # no ENDIAN stuff defined for alpha | 19 | # no ENDIAN stuff defined for alpha |
14 | .else | 20 | .else |
15 | CFLAGS+= -DB_ENDIAN | 21 | CFLAGS+= -DB_ENDIAN |
16 | .endif | 22 | .endif |
17 | .endif | 23 | .endif |
24 | .endif | ||
25 | .endif | ||
26 | |||
18 | CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE | 27 | CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE |
19 | CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST} | 28 | CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST} |
20 | CFLAGS+= -I${LSSL_SRC} -I${LCRYPTO_SRC} | 29 | CFLAGS+= -I${LSSL_SRC} -I${LCRYPTO_SRC} |