diff options
| author | djm <> | 2006-06-27 05:07:03 +0000 |
|---|---|---|
| committer | djm <> | 2006-06-27 05:07:03 +0000 |
| commit | 7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d (patch) | |
| tree | 224c33f66b0b932c84dda315d9ba4236bf125b1c /src/lib/libcrypto/perlasm/x86nasm.pl | |
| parent | 3f764f48d2626a43b6eeef7652c28303269d1204 (diff) | |
| download | openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.tar.gz openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.tar.bz2 openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/perlasm/x86nasm.pl')
| -rw-r--r-- | src/lib/libcrypto/perlasm/x86nasm.pl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/lib/libcrypto/perlasm/x86nasm.pl b/src/lib/libcrypto/perlasm/x86nasm.pl index 5009acb4b3..4bdb3fe180 100644 --- a/src/lib/libcrypto/perlasm/x86nasm.pl +++ b/src/lib/libcrypto/perlasm/x86nasm.pl | |||
| @@ -221,7 +221,15 @@ sub using486 | |||
| 221 | 221 | ||
| 222 | sub main'file | 222 | sub main'file |
| 223 | { | 223 | { |
| 224 | push(@out, "segment .text use32\n"); | 224 | local $tmp; |
| 225 | $tmp=<<___; | ||
| 226 | %ifdef __omf__ | ||
| 227 | section code use32 class=code | ||
| 228 | %else | ||
| 229 | section .text | ||
| 230 | %endif | ||
| 231 | ___ | ||
| 232 | push(@out,$tmp); | ||
| 225 | } | 233 | } |
| 226 | 234 | ||
| 227 | sub main'function_begin | 235 | sub main'function_begin |