diff options
| author | simon <simon@FreeBSD.org> | 2006-10-01 07:46:16 +0000 |
|---|---|---|
| committer | simon <simon@FreeBSD.org> | 2006-10-01 07:46:16 +0000 |
| commit | de193995a6a9d9e27843cce071dfa49ae516f199 (patch) | |
| tree | b164db4488aaabb1052a147a47aba8c4edb39387 /crypto/openssl/util | |
| parent | b2881e9eb192a2eb3b0153ebffc29eb8504b2fd3 (diff) | |
| download | FreeBSD-src-de193995a6a9d9e27843cce071dfa49ae516f199.zip FreeBSD-src-de193995a6a9d9e27843cce071dfa49ae516f199.tar.gz | |
Resolve conflicts after import of OpenSSL 0.9.8d.
Diffstat (limited to 'crypto/openssl/util')
| -rw-r--r-- | crypto/openssl/util/pl/Mingw32.pl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/openssl/util/pl/Mingw32.pl b/crypto/openssl/util/pl/Mingw32.pl index 500d266..6ea5179 100644 --- a/crypto/openssl/util/pl/Mingw32.pl +++ b/crypto/openssl/util/pl/Mingw32.pl @@ -20,7 +20,7 @@ $cc='gcc'; if ($debug) { $cflags="-DL_ENDIAN -DDSO_WIN32 -g2 -ggdb"; } else - { $cflags="-DL_ENDIAN -DDSO_WIN32 -fomit-frame-pointer -O3 -mcpu=i486 -Wall"; } + { $cflags="-DL_ENDIAN -DDSO_WIN32 -fomit-frame-pointer -O3 -march=i486 -Wall"; } if ($gaswin and !$no_asm) { @@ -44,6 +44,8 @@ if ($gaswin and !$no_asm) $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'; + $cpuid_asm_obj='$(OBJ_D)\cpu-win32.o'; + $cpuid_asm_src='crypto/cpu-win32.s'; $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM -DOPENSSL_BN_ASM_PART_WORDS"; } |
