diff options
| author | markm <markm@FreeBSD.org> | 2003-01-28 22:34:21 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2003-01-28 22:34:21 +0000 |
| commit | 3f245d6325bc967e32ea631b54fb87569ded160b (patch) | |
| tree | a8ee3102ea01b359830fb8c094c644e39ce479ba /crypto/openssl/util/pl/Mingw32.pl | |
| parent | ad7148cc98d85da1fe9f1dde3e946c8c62e2df65 (diff) | |
| download | FreeBSD-src-3f245d6325bc967e32ea631b54fb87569ded160b.zip FreeBSD-src-3f245d6325bc967e32ea631b54fb87569ded160b.tar.gz | |
Merge conflicts.
This is cunning doublespeak for "use vendor code".
Diffstat (limited to 'crypto/openssl/util/pl/Mingw32.pl')
| -rw-r--r-- | crypto/openssl/util/pl/Mingw32.pl | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/crypto/openssl/util/pl/Mingw32.pl b/crypto/openssl/util/pl/Mingw32.pl index 02a5086..45ab685 100644 --- a/crypto/openssl/util/pl/Mingw32.pl +++ b/crypto/openssl/util/pl/Mingw32.pl @@ -1,7 +1,6 @@ #!/usr/local/bin/perl # # Mingw32.pl -- Mingw32 with GNU cp (Mingw32f.pl uses DOS tools) -# $FreeBSD$ # $o='/'; @@ -26,6 +25,8 @@ 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'; @@ -67,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 { |
