Update version and change for 0.12.3 release

[qemu.git] / dyngen-exec.h

diff --git a/dyngen-exec.h b/dyngen-exec.h
index ae744f24f3e43f73fbadc771e1ea997a6a535099..0353f36cdd420cd4b7d32f4177859be59d3fca12 100644 (file)
--- a/dyngen-exec.h
+++ b/dyngen-exec.h
@@ -37,7 +37,7 @@
 #endif
 
 /* XXX: This may be wrong for 64-bit ILP32 hosts.  */
-typedef void * a_host_reg;
+typedef void * host_reg_t;
 
 #ifdef CONFIG_BSD
 typedef struct __sFILE FILE;
@@ -117,7 +117,7 @@ extern int printf(const char *, ...);
 
 /* The return address may point to the start of the next instruction.
    Subtracting one gets us the call instruction itself.  */
-#if defined(__s390__)
+#if defined(__s390__) && !defined(__s390x__)
 # define GETPC() ((void*)(((unsigned long)__builtin_return_address(0) & 0x7fffffffUL) - 1))
 #elif defined(__arm__)
 /* Thumb return addresses have the low bit set, so we need to subtract two.