summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorUlf Möller <ulf@openssl.org>2000-02-28 19:16:41 +0000
committerUlf Möller <ulf@openssl.org>2000-02-28 19:16:41 +0000
commit2da0c119260afd15433dde7c431c69c837ee840b (patch)
treee389db610196b034a516bc8625e708f129c2c847 /util
parenta4709b3d88b5a8db2f5dd2b272bd82038fcf602a (diff)
Support assembler for Mingw32.
Diffstat (limited to 'util')
-rwxr-xr-xutil/mk1mf.pl2
-rw-r--r--util/pl/Mingw32.pl25
2 files changed, 26 insertions, 1 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 6fbf3ceca6..bbeb7b62fe 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -59,6 +59,7 @@ and [options] can be one of
just-ssl - remove all non-ssl keys/digest
no-asm - No x86 asm
nasm - Use NASM for x86 asm
+ gaswin - Use GNU as with Mingw32
no-socks - No socket code
no-err - No error strings
dll/shlib - Build shared libraries (MS)
@@ -850,6 +851,7 @@ sub read_options
elsif (/^no-hmac$/) { $no_hmac=1; }
elsif (/^no-asm$/) { $no_asm=1; }
elsif (/^nasm$/) { $nasm=1; }
+ elsif (/^gaswin$/) { $gaswin=1; }
elsif (/^no-ssl2$/) { $no_ssl2=1; }
elsif (/^no-ssl3$/) { $no_ssl3=1; }
elsif (/^no-err$/) { $no_err=1; }
diff --git a/util/pl/Mingw32.pl b/util/pl/Mingw32.pl
index 585cacd820..c687d9b118 100644
--- a/util/pl/Mingw32.pl
+++ b/util/pl/Mingw32.pl
@@ -21,6 +21,30 @@ if ($debug)
else
{ $cflags="-DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall"; }
+if ($gaswin and !$no_asm)
+ {
+ $bn_asm_obj='$(OBJ_D)/bn-win32.o';
+ $bn_asm_src='crypto/bn/asm/bn-win32.s';
+ $des_enc_obj='$(OBJ_D)/d-win32.o $(OBJ_D)/y-win32.o';
+ $des_enc_src='crypto/des/asm/d-win32.s crypto/des/asm/y-win32.s';
+ $bf_enc_obj='$(OBJ_D)/b-win32.o';
+ $bf_enc_src='crypto/bf/asm/b-win32.s';
+# $cast_enc_obj='$(OBJ_D)/c-win32.o';
+# $cast_enc_src='crypto/cast/asm/c-win32.s';
+ $rc4_enc_obj='$(OBJ_D)/r4-win32.o';
+ $rc4_enc_src='crypto/rc4/asm/r4-win32.s';
+ $rc5_enc_obj='$(OBJ_D)/r5-win32.o';
+ $rc5_enc_src='crypto/rc5/asm/r5-win32.s';
+ $md5_asm_obj='$(OBJ_D)/m5-win32.o';
+ $md5_asm_src='crypto/md5/asm/m5-win32.s';
+ $rmd160_asm_obj='$(OBJ_D)/rm-win32.o';
+ $rmd160_asm_src='crypto/ripemd/asm/rm-win32.s';
+ $sha1_asm_obj='$(OBJ_D)/s1-win32.o';
+ $sha1_asm_src='crypto/sha/asm/s1-win32.s';
+ $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM";
+ }
+
+
$obj='.o';
$ofile='-o ';
@@ -76,4 +100,3 @@ sub do_link_rule
return($ret);
}
1;
-