Fix Mingw32 asm build: use the Unix

[openssl.git] / util / pl / Mingw32.pl

diff --git a/util/pl/Mingw32.pl b/util/pl/Mingw32.pl
index a47a961c27437549dfa4625667e87e59e3bb93f2..45ab685974e0aecc741ddcce9d1bf87a4fd78fe5 100644 (file)
--- a/util/pl/Mingw32.pl
+++ b/util/pl/Mingw32.pl
@@ -5,7 +5,7 @@
 
 $o='/';
 $cp='cp';
-$rm='del'; # use 'rm -f' if using GNU file utilities
+$rm='rem'; # use 'rm -f' if using GNU file utilities
 $mkdir='gmkdir';
 
 # gcc wouldn't accept backslashes in paths
@@ -17,10 +17,35 @@ $mkdir='gmkdir';
 
 $cc='gcc';
 if ($debug)
-       { $cflags="-g2 -ggdb"; }
+       { $cflags="-DL_ENDIAN -DDSO_WIN32 -g2 -ggdb"; }
 else
-       { $cflags="-O3 -fomit-frame-pointer"; }
-$dcflags='n'; # Make can't handle -DCFLAGS definition
+       { $cflags="-DL_ENDIAN -DDSO_WIN32 -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';
+        $bnco_asm_obj='$(OBJ_D)/co-win32.o';
+        $bnco_asm_src='crypto/bn/asm/co-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 ';
@@ -43,12 +68,12 @@ $lfile='';
 
 $asm='as';
 $afile='-o ';
-$bn_asm_obj="";
-$bn_asm_src="";
-$des_enc_obj="";
-$des_enc_src="";
-$bf_enc_obj="";
-$bf_enc_src="";
+#$bn_asm_obj="";
+#$bn_asm_src="";
+#$des_enc_obj="";
+#$des_enc_src="";
+#$bf_enc_obj="";
+#$bf_enc_src="";
 
 sub do_lib_rule
        {
@@ -77,4 +102,3 @@ sub do_link_rule
        return($ret);
        }
 1;
-