Commit ba026602 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Richard Henderson
Browse files

tcg/ppc: disable atomic write check on ppc32 



This fixes building for ppc64 on ppc32 (changed in 5964fca8):

tcg/ppc/tcg-target.inc.c: In function 'tb_target_set_jmp_target':
include/qemu/compiler.h:86:30: error: static assertion failed: \
  "not expecting: sizeof(*(uint64_t *)jmp_addr) > ATOMIC_REG_SIZE"
	QEMU_BUILD_BUG_ON(sizeof(*ptr) > ATOMIC_REG_SIZE); \
	^
tcg/ppc/tcg-target.inc.c:1377:9: note: in expansion of macro 'atomic_set'
	atomic_set((uint64_t *)jmp_addr, pair);
	^

Suggested-by: default avatarRichard Henderson <rth@twiddle.net>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20170911204936.5020-1-f4bug@amsat.org>
[rth: Added commentary requested by pmm.]
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
parent 5ee53d15

tcg/ppc/tcg-target.inc.c

+3 −1
Original line number Diff line number Diff line
@@ -1374,7 +1374,9 @@ void tb_target_set_jmp_target(uintptr_t tc_ptr, uintptr_t jmp_addr, 
        pair = (uint64_t)i2 << 32 | i1;

#endif



        atomic_set((uint64_t *)jmp_addr, pair);

        /* As per the enclosing if, this is ppc64.  Avoid the _Static_assert

           within atomic_set that would fail to build a ppc32 host.  */

        atomic_set__nocheck((uint64_t *)jmp_addr, pair);

        flush_icache_range(jmp_addr, jmp_addr + 8);

    } else {

        intptr_t diff = addr - jmp_addr;