PPC: Untangle PPC vs. PPCSPE target defines.

diff --git a/src/buildvm_asm.c b/src/buildvm_asm.c
index 5cfa7ae81d1929998893cb7ba2cc1c9114f221bd..94e62ce79b4c36331cc53500a8b3f023e6de3ea1 100644 (file)
--- a/src/buildvm_asm.c
+++ b/src/buildvm_asm.c
@@ -107,7 +107,7 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
            ins, sym);
     exit(1);
   }
-#elif LJ_TARGET_PPC
+#elif LJ_TARGET_PPC || LJ_TARGET_PPCSPE
   if ((ins >> 26) == 16) {
     fprintf(ctx->fp, "\t%s %d, %d, %s\n",
            (ins & 1) ? "bcl" : "bc", (ins >> 21) & 31, (ins >> 16) & 31, sym);

diff --git a/src/lib_jit.c b/src/lib_jit.c
index d1f24f524f8d06c4857e53977c129fc08921fed0..9b28520d308485f848a7c1bbed9d0afe062285de 100644 (file)
--- a/src/lib_jit.c
+++ b/src/lib_jit.c
@@ -598,7 +598,7 @@ static uint32_t jit_cpudetect(lua_State *L)
     }
   }
 #endif
-#elif LJ_TARGET_PPC
+#elif LJ_TARGET_PPC || LJ_TARGET_PPCSPE
   /* Nothing to do. */
 #else
 #error "Missing CPU detection for this architecture"

diff --git a/src/lj_arch.h b/src/lj_arch.h
index ff4628df94b768451080c78423f6ff7a52b58328..fff40838c12dfe3c359986460bc312d130dd6897 100644 (file)
--- a/src/lj_arch.h
+++ b/src/lj_arch.h
@@ -157,7 +157,6 @@
 #define LJ_ARCH_HASFPU         1
 #define LJ_ABI_SOFTFP          1
 #define LJ_ABI_EABI            1
-#define LJ_TARGET_PPC          1
 #define LJ_TARGET_PPCSPE       1
 #define LJ_TARGET_EHRETREG     3
 #define LJ_TARGET_JUMPRANGE    25      /* +-2^25 = +-32MB */
@@ -206,7 +205,7 @@
 #if !(__ARM_EABI__ || LJ_TARGET_OSX)
 #error "Only ARM EABI or iOS 3.0+ ABI is supported"
 #endif
-#elif LJ_TARGET_PPC
+#elif LJ_TARGET_PPC || LJ_TARGET_PPCSPE
 #if defined(_SOFT_FLOAT) || defined(_SOFT_DOUBLE)
 #error "No support for PowerPC CPUs without double-precision FPU"
 #endif

diff --git a/src/lj_ctype.h b/src/lj_ctype.h
index f7a7121b6c697fd695dc7421bcdbfe6ece0ad56e..82c4427a423f15e80b78f40f4e6963cab6a57ec7 100644 (file)
--- a/src/lj_ctype.h
+++ b/src/lj_ctype.h
@@ -243,7 +243,7 @@ typedef struct CTState {
 /* -- Predefined types ---------------------------------------------------- */
 
 /* Target-dependent types. */
-#if LJ_TARGET_PPC
+#if LJ_TARGET_PPC || LJ_TARGET_PPCSPE
 #define CTTYDEFP(_) \
   _(LINT32,            4,      CT_NUM, CTF_LONG|CTALIGN(2))
 #else