Remove all traces of __powerpc__
According to $GCC/gcc/config/rs6000/rs6000-c.c _ARCH_PPC is the
ubiquitous define which should be used to test whether gcc targets
PowerPC, on 64bit platforms _ARCH_PPC64 will be also defined.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6301 c046a42c-6fe2-441c-8c8c-71466251a162
diff --git a/Makefile.target b/Makefile.target
index fcaf4ec..58fe88f 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -98,11 +98,6 @@
OP_CFLAGS+=-mpreferred-stack-boundary=2 -fomit-frame-pointer
endif
-ifeq ($(ARCH),ppc)
-CPPFLAGS+= -D__powerpc__
-OP_CFLAGS+= -mlongcall
-endif
-
ifeq ($(ARCH),sparc)
CFLAGS+=-ffixed-g2 -ffixed-g3
OP_CFLAGS+=-fno-delayed-branch -ffixed-i0
diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c
index a045529..82f172c 100644
--- a/bsd-user/elfload.c
+++ b/bsd-user/elfload.c
@@ -12,7 +12,7 @@
#include "qemu.h"
#include "disas.h"
-#ifdef __powerpc64__
+#ifdef _ARCH_PPC64
#undef ARCH_DLINFO
#undef ELF_PLATFORM
#undef ELF_HWCAP
diff --git a/bswap.h b/bswap.h
index 08b77d9..63b81cc 100644
--- a/bswap.h
+++ b/bswap.h
@@ -134,7 +134,7 @@
/* unaligned versions (optimized for frequent unaligned accesses)*/
-#if defined(__i386__) || defined(__powerpc__)
+#if defined(__i386__) || defined(_ARCH_PPC)
#define cpu_to_le16wu(p, v) cpu_to_le16w(p, v)
#define cpu_to_le32wu(p, v) cpu_to_le32w(p, v)
diff --git a/cache-utils.c b/cache-utils.c
index 7df1fcf..b37ddd4 100644
--- a/cache-utils.c
+++ b/cache-utils.c
@@ -1,6 +1,6 @@
#include "cache-utils.h"
-#if defined HOST_PPC || defined HOST_PPC64
+#if defined(_ARCH_PPC)
struct qemu_cache_conf qemu_cache_conf = {
.dcache_bsize = 16,
.icache_bsize = 16
@@ -68,4 +68,4 @@
}
#endif
-#endif /* HOST_PPC || HOST_PPC64 */
+#endif /* _ARCH_PPC */
diff --git a/cache-utils.h b/cache-utils.h
index 8847dbb..b45fde4 100644
--- a/cache-utils.h
+++ b/cache-utils.h
@@ -1,9 +1,7 @@
#ifndef QEMU_CACHE_UTILS_H
#define QEMU_CACHE_UTILS_H
-#include "config-host.h"
-
-#if defined HOST_PPC || defined HOST_PPC64
+#if defined(_ARCH_PPC)
struct qemu_cache_conf {
unsigned long dcache_bsize;
unsigned long icache_bsize;
diff --git a/cpu-all.h b/cpu-all.h
index cceaefd..32b7a66 100644
--- a/cpu-all.h
+++ b/cpu-all.h
@@ -229,7 +229,7 @@
/* conservative code for little endian unaligned accesses */
static inline int lduw_le_p(const void *ptr)
{
-#ifdef __powerpc__
+#ifdef _ARCH_PPC
int val;
__asm__ __volatile__ ("lhbrx %0,0,%1" : "=r" (val) : "r" (ptr));
return val;
@@ -241,7 +241,7 @@
static inline int ldsw_le_p(const void *ptr)
{
-#ifdef __powerpc__
+#ifdef _ARCH_PPC
int val;
__asm__ __volatile__ ("lhbrx %0,0,%1" : "=r" (val) : "r" (ptr));
return (int16_t)val;
@@ -253,7 +253,7 @@
static inline int ldl_le_p(const void *ptr)
{
-#ifdef __powerpc__
+#ifdef _ARCH_PPC
int val;
__asm__ __volatile__ ("lwbrx %0,0,%1" : "=r" (val) : "r" (ptr));
return val;
@@ -274,7 +274,7 @@
static inline void stw_le_p(void *ptr, int v)
{
-#ifdef __powerpc__
+#ifdef _ARCH_PPC
__asm__ __volatile__ ("sthbrx %1,0,%2" : "=m" (*(uint16_t *)ptr) : "r" (v), "r" (ptr));
#else
uint8_t *p = ptr;
@@ -285,7 +285,7 @@
static inline void stl_le_p(void *ptr, int v)
{
-#ifdef __powerpc__
+#ifdef _ARCH_PPC
__asm__ __volatile__ ("stwbrx %1,0,%2" : "=m" (*(uint32_t *)ptr) : "r" (v), "r" (ptr));
#else
uint8_t *p = ptr;
@@ -985,7 +985,7 @@
/*******************************************/
/* host CPU ticks (if available) */
-#if defined(__powerpc__)
+#if defined(_ARCH_PPC)
static inline uint32_t get_tbl(void)
{
diff --git a/cpu-exec.c b/cpu-exec.c
index f574877..07ddd0e 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -1218,7 +1218,7 @@
&uc->uc_sigmask, puc);
}
-#elif defined(__powerpc__)
+#elif defined(_ARCH_PPC)
/***********************************************************************
* signal context platform-specific definitions
diff --git a/darwin-user/commpage.c b/darwin-user/commpage.c
index 2b920b5..58f429c 100644
--- a/darwin-user/commpage.c
+++ b/darwin-user/commpage.c
@@ -181,7 +181,7 @@
*/
void commpage_init(void)
{
-#if (defined(__i386__) ^ defined(TARGET_I386)) || (defined(__powerpc__) ^ defined(TARGET_PPC))
+#if (defined(__i386__) ^ defined(TARGET_I386)) || (defined(_ARCH_PPC) ^ defined(TARGET_PPC))
int i;
void * commpage = (void *)target_mmap( COMMPAGE_START, COMMPAGE_SIZE,
PROT_WRITE | PROT_READ, MAP_ANONYMOUS | MAP_FIXED, -1, 0);
diff --git a/disas.c b/disas.c
index 715c7d2..83c8826 100644
--- a/disas.c
+++ b/disas.c
@@ -250,7 +250,7 @@
#elif defined(__x86_64__)
disasm_info.mach = bfd_mach_x86_64;
print_insn = print_insn_i386;
-#elif defined(__powerpc__)
+#elif defined(_ARCH_PPC)
print_insn = print_insn_ppc;
#elif defined(__alpha__)
print_insn = print_insn_alpha;
diff --git a/dyngen-exec.h b/dyngen-exec.h
index 11e6dea..4693eac 100644
--- a/dyngen-exec.h
+++ b/dyngen-exec.h
@@ -41,7 +41,7 @@
// Linux/Sparc64 defines uint64_t
#if !(defined (__sparc_v9__) && defined(__linux__)) && !(defined(__APPLE__) && defined(__x86_64__))
/* XXX may be done for all 64 bits targets ? */
-#if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) || defined(__alpha__) || defined(__powerpc64__)
+#if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) || defined(__alpha__) || defined(_ARCH_PPC64)
typedef unsigned long uint64_t;
#else
typedef unsigned long long uint64_t;
@@ -58,7 +58,7 @@
typedef signed int int32_t;
// Linux/Sparc64 defines int64_t
#if !(defined (__sparc_v9__) && defined(__linux__)) && !(defined(__APPLE__) && defined(__x86_64__))
-#if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) || defined(__alpha__) || defined(__powerpc64__)
+#if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) || defined(__alpha__) || defined(_ARCH_PPC64)
typedef signed long int64_t;
#else
typedef signed long long int64_t;
@@ -105,7 +105,7 @@
#define AREG3 "r13"
//#define AREG4 "rbp"
//#define AREG5 "rbx"
-#elif defined(__powerpc__)
+#elif defined(_ARCH_PPC)
#define AREG0 "r27"
#define AREG1 "r24"
#define AREG2 "r25"
diff --git a/exec-all.h b/exec-all.h
index 4b828c5..dbfe5bf 100644
--- a/exec-all.h
+++ b/exec-all.h
@@ -117,7 +117,7 @@
#define CODE_GEN_AVG_BLOCK_SIZE 64
#endif
-#if defined(__powerpc__) || defined(__x86_64__) || defined(__arm__)
+#if defined(_ARCH_PPC) || defined(__x86_64__) || defined(__arm__)
#define USE_DIRECT_JUMP
#endif
#if defined(__i386__) && !defined(_WIN32)
@@ -192,7 +192,7 @@
#if defined(USE_DIRECT_JUMP)
-#if defined(__powerpc__)
+#if defined(_ARCH_PPC)
extern void ppc_tb_set_jmp_target(unsigned long jmp_addr, unsigned long addr);
#define tb_set_jmp_target1 ppc_tb_set_jmp_target
#elif defined(__i386__) || defined(__x86_64__)
diff --git a/fpu/softfloat-native.c b/fpu/softfloat-native.c
index 7273ae5..9eba035 100644
--- a/fpu/softfloat-native.c
+++ b/fpu/softfloat-native.c
@@ -51,7 +51,7 @@
#endif
#endif
-#if defined(__powerpc__)
+#if defined(_ARCH_PPC)
/* correct (but slow) PowerPC rint() (glibc version is incorrect) */
double qemu_rint(double x)
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 3433404..ba1d631 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -12,7 +12,7 @@
#include "qemu.h"
#include "disas.h"
-#ifdef __powerpc64__
+#ifdef _ARCH_PPC64
#undef ARCH_DLINFO
#undef ELF_PLATFORM
#undef ELF_HWCAP
diff --git a/qemu-lock.h b/qemu-lock.h
index afd2d5f..26661ba 100644
--- a/qemu-lock.h
+++ b/qemu-lock.h
@@ -58,7 +58,7 @@
#endif
-#if defined(__powerpc__)
+#if defined(_ARCH_PPC)
static inline int testandset (int *p)
{
int ret;
diff --git a/tcg/tcg.h b/tcg/tcg.h
index e83073b..323cc52 100644
--- a/tcg/tcg.h
+++ b/tcg/tcg.h
@@ -457,7 +457,7 @@
uint64_t tcg_helper_remu_i64(uint64_t arg1, uint64_t arg2);
extern uint8_t code_gen_prologue[];
-#if defined(__powerpc__) && !defined(__powerpc64__)
+#if defined(_ARCH_PPC) && !defined(_ARCH_PPC64)
#define tcg_qemu_tb_exec(tb_ptr) \
((long REGPARM __attribute__ ((longcall)) (*)(void *))code_gen_prologue)(tb_ptr)
#else
