From 7d038e9d4d83e7c7120e78418e108df70b9025d6 Mon Sep 17 00:00:00 2001 From: markus <> Date: Tue, 10 Sep 2002 16:31:57 +0000 Subject: merge openssl-0.9.7-beta3, tested on vax by miod@ --- src/lib/libcrypto/perlasm/x86asm.pl | 6 ++++++ src/lib/libcrypto/perlasm/x86nasm.pl | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src/lib/libcrypto/perlasm') diff --git a/src/lib/libcrypto/perlasm/x86asm.pl b/src/lib/libcrypto/perlasm/x86asm.pl index 81c6e64e87..9a3d85b098 100644 --- a/src/lib/libcrypto/perlasm/x86asm.pl +++ b/src/lib/libcrypto/perlasm/x86asm.pl @@ -87,6 +87,12 @@ $tmp #ifdef OUT #define OK 1 #define ALIGN 4 +#if defined(__CYGWIN__) || defined(__DJGPP__) +#undef SIZE +#undef TYPE +#define SIZE(a,b) +#define TYPE(a,b) +#endif /* __CYGWIN || __DJGPP */ #endif #if defined(BSDI) && !defined(ELF) diff --git a/src/lib/libcrypto/perlasm/x86nasm.pl b/src/lib/libcrypto/perlasm/x86nasm.pl index b4da364bbf..519d8a5867 100644 --- a/src/lib/libcrypto/perlasm/x86nasm.pl +++ b/src/lib/libcrypto/perlasm/x86nasm.pl @@ -209,7 +209,7 @@ sub using486 sub main'file { - push(@out, "segment .text\n"); + push(@out, "segment .text use32\n"); } sub main'function_begin -- cgit v1.2.3-55-g6feb