From c170cb66490aa20bfc8d2c2421481dd9195dbb8b Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Fri, 6 Apr 2012 08:06:41 +0200 Subject: [PATCH] tcg/i386: Use GDB JIT debugging interface only for hosts with ELF Not all i386 / x86_64 hosts use ELF. Ask the compiler whether ELF is used. On w64, gdb crashes when ELF_HOST_MACHINE is defined. Cc: Blue Swirl Acked-by: Richard Henderson Signed-off-by: Stefan Weil --- tcg/i386/tcg-target.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tcg/i386/tcg-target.c b/tcg/i386/tcg-target.c index 871a7e74f5..79545e31c2 100644 --- a/tcg/i386/tcg-target.c +++ b/tcg/i386/tcg-target.c @@ -2102,7 +2102,9 @@ typedef struct { DebugFrameFDE fde; } DebugFrame; -#if TCG_TARGET_REG_BITS == 64 +#if !defined(__ELF__) + /* Host machine without ELF. */ +#elif TCG_TARGET_REG_BITS == 64 #define ELF_HOST_MACHINE EM_X86_64 static DebugFrame debug_frame = { .cie.len = sizeof(DebugFrameCIE)-4, /* length after .len member */ @@ -2156,6 +2158,7 @@ static DebugFrame debug_frame = { }; #endif +#if defined(ELF_HOST_MACHINE) void tcg_register_jit(void *buf, size_t buf_size) { /* We're expecting a 2 byte uleb128 encoded value. */ @@ -2166,3 +2169,4 @@ void tcg_register_jit(void *buf, size_t buf_size) tcg_register_jit_int(buf, buf_size, &debug_frame, sizeof(debug_frame)); } +#endif