@@ -671,6 +671,7 @@ HAVE_LIST="

     memalign

     mlib

     os2

+    ppc64

     sdl

     sdl_video_size

     soundcard_h

@@ -1289,7 +1290,6 @@ enabled needmdynamicnopic && add_cflags -mdynamic-no-pic

 disabled optimize || add_cflags -fomit-frame-pointer

 # Add processor-specific flags

-POWERPCMODE="32bits"

 if test $cpu != "generic"; then

     warn_altivec(){

         $1 altivec && echo "WARNING: Tuning for $2 but AltiVec $1.";

@@ -1322,12 +1322,12 @@ if test $cpu != "generic"; then

         G5|g5|970|ppc970|PowerPC970|power4*|Power4*)

             add_cflags "-mcpu=970 -mpowerpc-gfxopt -mpowerpc64"

             warn_altivec disabled PPC970

-            POWERPCMODE="64bits"

+            enable ppc64

         ;;

         Cell|CELL|cell)

             add_cflags "-mcpu=cell"

             warn_altivec disabled Cell

-            POWERPCMODE="64bits"

+            enable ppc64

         ;;

         # targets that do NOT support conditional mov (cmov)

         i[345]86|pentium|pentium-mmx|k6|k6-[23]|winchip-c6|winchip2|c3)

@@ -1894,14 +1894,6 @@ echo "SLIBPREF=$SLIBPREF" >> config.mak

 echo "SLIBSUF=\${BUILDSUF}$SLIBSUF" >> config.mak

 echo "EXESUF=\${BUILDSUF}$EXESUF" >> config.mak

-case "$arch" in

-    powerpc)

-        if test "$POWERPCMODE" = "64bits"; then

-            echo "#define POWERPC_MODE_64BITS 1" >> $TMPH

-        fi

-        ;;

-esac

-

 if enabled bigendian; then

   echo "WORDS_BIGENDIAN=yes" >> config.mak

   echo "#define WORDS_BIGENDIAN 1" >> $TMPH

@@ -25,7 +25,7 @@

 void powerpc_display_perf_report(void);

 /* the 604* have 2, the G3* have 4, the G4s have 6,

    and the G5 are completely different (they MUST use

-   POWERPC_MODE_64BITS, and let's hope all future 64 bis PPC

+   HAVE_PPC64, and let's hope all future 64 bis PPC

    will use the same PMCs... */

 #define POWERPC_NUM_PMC_ENABLED 6

 /* if you add to the enum below, also add to the perfname array

@@ -68,7 +68,7 @@ enum powerpc_data_index {

 };

 extern unsigned long long perfdata[POWERPC_NUM_PMC_ENABLED][powerpc_perf_total][powerpc_data_total];

-#ifndef POWERPC_MODE_64BITS

+#ifndef HAVE_PPC64

 #define POWERP_PMC_DATATYPE unsigned long

 #define POWERPC_GET_PMC1(a) asm volatile("mfspr %0, 937" : "=r" (a))

 #define POWERPC_GET_PMC2(a) asm volatile("mfspr %0, 938" : "=r" (a))

@@ -86,7 +86,7 @@ extern unsigned long long perfdata[POWERPC_NUM_PMC_ENABLED][powerpc_perf_total][

 #define POWERPC_GET_PMC5(a) do {} while (0)

 #define POWERPC_GET_PMC6(a) do {} while (0)

 #endif

-#else /* POWERPC_MODE_64BITS */

+#else /* HAVE_PPC64 */

 #define POWERP_PMC_DATATYPE unsigned long long

 #define POWERPC_GET_PMC1(a) asm volatile("mfspr %0, 771" : "=r" (a))

 #define POWERPC_GET_PMC2(a) asm volatile("mfspr %0, 772" : "=r" (a))

@@ -104,7 +104,7 @@ extern unsigned long long perfdata[POWERPC_NUM_PMC_ENABLED][powerpc_perf_total][

 #define POWERPC_GET_PMC5(a) do {} while (0)

 #define POWERPC_GET_PMC6(a) do {} while (0)

 #endif

-#endif /* POWERPC_MODE_64BITS */

+#endif /* HAVE_PPC64 */

 #define POWERPC_PERF_DECLARE(a, cond)   \

   POWERP_PMC_DATATYPE                   \

     pmc_start[POWERPC_NUM_PMC_ENABLED], \