From f049fcb125b8e74a86986f7f9ca325bcd30e30ad Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Mon, 11 Sep 2006 19:05:02 +0000 Subject: [PATCH] 2006-09-11 Zoltan Varga * mini-x86.h mini-amd64.h mini-exceptions.c: Move the bsd specific MAP_ANON stuff to mini-exceptions.c where it is used. svn path=/trunk/mono/; revision=65252 --- mono/mini/mini-amd64.h | 10 ---------- mono/mini/mini-exceptions.c | 10 ++++++++++ mono/mini/mini-x86.h | 10 ---------- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/mono/mini/mini-amd64.h b/mono/mini/mini-amd64.h index 29b36b602fc..ecdcc3aa2c2 100644 --- a/mono/mini/mini-amd64.h +++ b/mono/mini/mini-amd64.h @@ -187,16 +187,6 @@ typedef struct { #define MONO_ARCH_SIGSEGV_ON_ALTSTACK -/* FreeBSD and NetBSD need SA_STACK and MAP_ANON re-definitions */ -# if defined(__FreeBSD__) || defined(__NetBSD__) -# ifndef SA_STACK -# define SA_STACK SA_ONSTACK -# endif -# ifndef MAP_ANONYMOUS -# define MAP_ANONYMOUS MAP_ANON -# endif -# endif /* BSDs */ - #endif #endif /* PLATFORM_WIN32 */ diff --git a/mono/mini/mini-exceptions.c b/mono/mini/mini-exceptions.c index 9124907ccad..7212707ad68 100644 --- a/mono/mini/mini-exceptions.c +++ b/mono/mini/mini-exceptions.c @@ -32,6 +32,16 @@ #include #endif +/* FreeBSD and NetBSD need SA_STACK and MAP_ANON re-definitions */ +# if defined(__FreeBSD__) || defined(__NetBSD__) +# ifndef SA_STACK +# define SA_STACK SA_ONSTACK +# endif +# ifndef MAP_ANONYMOUS +# define MAP_ANONYMOUS MAP_ANON +# endif +# endif /* BSDs */ + #define IS_ON_SIGALTSTACK(jit_tls) ((jit_tls) && ((guint8*)&(jit_tls) > (guint8*)(jit_tls)->signal_stack) && ((guint8*)&(jit_tls) < ((guint8*)(jit_tls)->signal_stack + (jit_tls)->signal_stack_size))) #ifndef MONO_ARCH_CONTEXT_DEF diff --git a/mono/mini/mini-x86.h b/mono/mini/mini-x86.h index 8a08a0920d1..4b9771644b7 100644 --- a/mono/mini/mini-x86.h +++ b/mono/mini/mini-x86.h @@ -53,16 +53,6 @@ LONG CALLBACK seh_handler(EXCEPTION_POINTERS* ep); #define MONO_ARCH_SIGSEGV_ON_ALTSTACK #define MONO_ARCH_USE_SIGACTION -/* FreeBSD and NetBSD need SA_STACK and MAP_ANON re-definitions */ -# if defined(__FreeBSD__) || defined(__NetBSD__) -# ifndef SA_STACK -# define SA_STACK SA_ONSTACK -# endif -# ifndef MAP_ANONYMOUS -# define MAP_ANONYMOUS MAP_ANON -# endif -# endif /* BSDs */ - #endif /* HAVE_WORKING_SIGALTSTACK */ #endif /* !PLATFORM_WIN32 */ -- 2.25.1