From 75913b727e2702b7ee3099c0388502778554f681 Mon Sep 17 00:00:00 2001 From: bellard Date: Sun, 21 Aug 2005 15:19:36 +0000 Subject: [PATCH] compilation fix for gcc3.4 on win32 (Paul Brook) git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1557 c046a42c-6fe2-441c-8c8c-71466251a162 --- exec-all.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/exec-all.h b/exec-all.h index 0f7921465a..33780660fe 100644 --- a/exec-all.h +++ b/exec-all.h @@ -320,13 +320,16 @@ TranslationBlock *tb_find_pc(unsigned long pc_ptr); #define ASM_PREVIOUS_SECTION ".previous\n" #endif +#define ASM_OP_LABEL_NAME(n, opname) \ + ASM_NAME(__op_label) #n "." ASM_NAME(opname) + #if defined(__powerpc__) /* we patch the jump instruction directly */ #define GOTO_TB(opname, tbparam, n)\ do {\ asm volatile (ASM_DATA_SECTION\ - ASM_NAME(__op_label) #n "." ASM_NAME(opname) ":\n"\ + ASM_OP_LABEL_NAME(n, opname) ":\n"\ ".long 1f\n"\ ASM_PREVIOUS_SECTION \ "b " ASM_NAME(__op_jmp) #n "\n"\ @@ -339,7 +342,7 @@ do {\ #define GOTO_TB(opname, tbparam, n)\ do {\ asm volatile (".section .data\n"\ - ASM_NAME(__op_label) #n "." ASM_NAME(opname) ":\n"\ + ASM_OP_LABEL_NAME(n, opname) ":\n"\ ".long 1f\n"\ ASM_PREVIOUS_SECTION \ "jmp " ASM_NAME(__op_jmp) #n "\n"\ @@ -353,7 +356,8 @@ do {\ #define GOTO_TB(opname, tbparam, n)\ do {\ static void __attribute__((unused)) *dummy ## n = &&dummy_label ## n;\ - static void __attribute__((unused)) *__op_label ## n = &&label ## n;\ + static void __attribute__((unused)) *__op_label ## n \ + __asm__(ASM_OP_LABEL_NAME(n, opname)) = &&label ## n;\ goto *(void *)(((TranslationBlock *)tbparam)->tb_next[n]);\ label ## n: ;\ dummy_label ## n: ;\