diff options
| author |   djm <djm@openbsd.org> | 2006-06-27 05:06:51 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2006-06-27 05:06:51 +0000 |
| commit | 6d388760ec629bdebe2f200913a35899243a7957 (patch) | |
| tree | ecc7cf9ca37d08421471848c6f746702ed91b8e8 /lib/libcrypto/perlasm | |
| parent | import of openssl-0.9.7j (diff) | |
| download | wireguard-openbsd-6d388760ec629bdebe2f200913a35899243a7957.tar.xz wireguard-openbsd-6d388760ec629bdebe2f200913a35899243a7957.zip | |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/perlasm')
| -rw-r--r-- | lib/libcrypto/perlasm/x86asm.pl | 2 | ||||
| -rw-r--r-- | lib/libcrypto/perlasm/x86nasm.pl | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/libcrypto/perlasm/x86asm.pl b/lib/libcrypto/perlasm/x86asm.pl index 60233f80e85..c3de90c65d7 100644 --- a/lib/libcrypto/perlasm/x86asm.pl +++ b/lib/libcrypto/perlasm/x86asm.pl @@ -96,7 +96,7 @@ $tmp #ifdef OUT #define OK 1 #define ALIGN 4 -#if defined(__CYGWIN__) || defined(__DJGPP__) +#if defined(__CYGWIN__) || defined(__DJGPP__) || defined(__MINGW32__) #undef SIZE #undef TYPE #define SIZE(a,b) diff --git a/lib/libcrypto/perlasm/x86nasm.pl b/lib/libcrypto/perlasm/x86nasm.pl index 5009acb4b31..4bdb3fe1809 100644 --- a/lib/libcrypto/perlasm/x86nasm.pl +++ b/lib/libcrypto/perlasm/x86nasm.pl @@ -221,7 +221,15 @@ sub using486 sub main'file { - push(@out, "segment .text use32\n"); + local $tmp; + $tmp=<<___; +%ifdef __omf__ +section code use32 class=code +%else +section .text +%endif +___ + push(@out,$tmp); } sub main'function_begin |