[Mono-dev] [PATCH v2 2/7] mini: Disable soft debugger when not using sigaction

[Zoltan Varga]

This needs to be #if defined(MONO_ARCH_HAVE_SIGACTION) ||
defined(TARGET_WIN32)

       Zoltan

On Sat, Apr 3, 2010 at 7:02 PM, Andreas Färber <andreas.faerber at web.de>wrote:

> The x86 soft debugger depends on siginfo_t. So if we're not using
> SA_SIGINFO-style signal handlers, don't enable the soft debugger.
> Fixes the build on Haiku.
>
> Cc: Zoltan Varga <vargaz at gmail.com>
>
> v1 -> v2:
> * Instead of disabling siginfo_t code inside the soft debugger,
>  disable the soft debugger itself.
>
> This commit is licensed under the MIT X11 license.
> ---
>  mono/mini/ChangeLog  |    7 +++++++
>  mono/mini/mini-x86.h |    4 ++++
>  2 files changed, 11 insertions(+), 0 deletions(-)
>
> diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
> index 9aced04..7e0e1ad 100755
> --- a/mono/mini/ChangeLog
> +++ b/mono/mini/ChangeLog
> @@ -1,3 +1,10 @@
> +2010-04-03  Andreas Faerber  <andreas.faerber at web.de>
> +
> +       * mini-x86.h: Only enable soft debugger when using sigaction.
> +       Fixes build on Haiku (lacks siginfo_t).
> +
> +       Code is contributed under MIT/X11 license.
> +
>  2010-04-02  Andreas Faerber  <andreas.faerber at web.de>
>
>        * mini.h, mini-x86.h: Suppress sigaction for Haiku, add support for
> diff --git a/mono/mini/mini-x86.h b/mono/mini/mini-x86.h
> index 30c8d06..59b895c 100644
> --- a/mono/mini/mini-x86.h
> +++ b/mono/mini/mini-x86.h
> @@ -294,7 +294,11 @@ typedef struct {
>  #define MONO_ARCH_GSHARED_SUPPORTED 1
>  #define MONO_ARCH_HAVE_LLVM_IMT_TRAMPOLINE 1
>  #define MONO_ARCH_LLVM_SUPPORTED 1
> +
> +#ifdef MONO_ARCH_USE_SIGACTION
>  #define MONO_ARCH_SOFT_DEBUG_SUPPORTED 1
> +#endif
> +
>  #define MONO_ARCH_HAVE_FIND_JIT_INFO_EXT 1
>  #define MONO_ARCH_HAVE_EXCEPTIONS_INIT 1
>  #define MONO_ARCH_HAVE_HANDLER_BLOCK_GUARD 1
> --
> 1.7.0.4
>
> _______________________________________________
> Mono-devel-list mailing list
> Mono-devel-list at lists.ximian.com
> http://lists.ximian.com/mailman/listinfo/mono-devel-list
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.ximian.com/pipermail/mono-devel-list/attachments/20100404/78cd9351/attachment.html