ported the change in r56828 to dynarec (is the check in psxBASIC() really necessary?), removed powerpc dynarec (cannot test and likely broken).

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@56896 e17a0e51-4ae3-4d35-97c3-1a29b211df97

1 files changed, 15 insertions, 64 deletions

diff --git a/configure b/configure
index 3ef2fa4a..b41689a1 100755
--- a/configure
+++ b/configure
@@ -786,8 +786,6 @@ ac_includes_default="\
 gt_needs=
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-ARCH_PPC_FALSE
-ARCH_PPC_TRUE
 ARCH_X86_64_FALSE
 ARCH_X86_64_TRUE
 ARCH_X86_FALSE
@@ -1651,7 +1649,7 @@ Optional Features:
   --enable-sound=...      force selection of sound backend (alsa/null/oss/pulseaudio/sdl) (default: sdl)
   --enable-libcdio        use GNU libcdio for CD-ROM support (default=no)
   --enable-opengl         build OpenGL plugin (default=no)
-  --enable-dynarec=...    force selection of dynamic recompiler platform (auto/no/x86/x86_64/ppc) (default: auto)
+  --enable-dynarec=...    force selection of dynamic recompiler platform (auto/no/x86/x86_64) (default: auto)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -4634,13 +4632,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4637: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4635: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4640: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4638: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4643: output\"" >&5)
+  (eval echo "\"\$as_me:4641: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5846,7 +5844,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5849 "configure"' > conftest.$ac_ext
+  echo '#line 5847 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7669,11 +7667,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7672: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7670: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7676: \$? = $ac_status" >&5
+   echo "$as_me:7674: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8008,11 +8006,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8011: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8009: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8015: \$? = $ac_status" >&5
+   echo "$as_me:8013: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8113,11 +8111,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8116: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8114: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8120: \$? = $ac_status" >&5
+   echo "$as_me:8118: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8168,11 +8166,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8171: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8169: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8175: \$? = $ac_status" >&5
+   echo "$as_me:8173: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10981,7 +10979,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10984 "configure"
+#line 10982 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11077,7 +11075,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11080 "configure"
+#line 11078 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16192,14 +16190,6 @@ else
   ARCH_X86_64_FALSE=
 fi
 
- if false; then
-  ARCH_PPC_TRUE=
-  ARCH_PPC_FALSE='#'
-else
-  ARCH_PPC_TRUE='#'
-  ARCH_PPC_FALSE=
-fi
-
 
 # Check whether --enable-dynarec was given.
 if test "${enable_dynarec+set}" = set; then
@@ -16215,8 +16205,6 @@ else if test "x$DYNAREC" = xx86; then
 	DYNARECSEL="x86"
 else if test "x$DYNAREC" = xx86_64; then
 	DYNARECSEL="x86_64"
-else if test "x$DYNAREC" = xppc; then
-	DYNARECSEL="ppc"
 else if test "x$DYNAREC" = xno; then
 	DYNARECSEL="no"
 else
@@ -16227,7 +16215,6 @@ fi
 fi
 fi
 fi
-fi
 
 if test "x$DYNARECSEL" = xauto; then
 	if expr x"$target_cpu" : 'xi.86' > /dev/null; then
@@ -16237,10 +16224,6 @@ if test "x$DYNARECSEL" = xauto; then
 	if expr x"$target_cpu" : 'xx86_64' > /dev/null; then
 		DYNARECSEL="x86_64"
 	fi
-
-	if expr x"$target_cpu" : 'xpowerpc' > /dev/null; then
-		DYNARECSEL="ppc"
-	fi
 fi
 
 if test "x$DYNARECSEL" = xno; then
@@ -16288,24 +16271,6 @@ fi
 $as_echo "Dynamic Recompiler selected: x86_64" >&6; }
 fi
 
-if test "x$DYNARECSEL" = xppc; then
-
-cat >>confdefs.h <<\_ACEOF
-#define __ppc__ 1
-_ACEOF
-
-         if true; then
-  ARCH_PPC_TRUE=
-  ARCH_PPC_FALSE='#'
-else
-  ARCH_PPC_TRUE='#'
-  ARCH_PPC_FALSE=
-fi
-
-	{ $as_echo "$as_me:$LINENO: result: Dynamic Recompiler selected: ppc" >&5
-$as_echo "Dynamic Recompiler selected: ppc" >&6; }
-fi
-
 
  { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
@@ -16962,13 +16927,6 @@ $as_echo "$as_me: error: conditional \"ARCH_X86_64\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${ARCH_PPC_TRUE}" && test -z "${ARCH_PPC_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"ARCH_PPC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"ARCH_PPC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 if test -z "${ARCH_X86_TRUE}" && test -z "${ARCH_X86_FALSE}"; then
   { { $as_echo "$as_me:$LINENO: error: conditional \"ARCH_X86\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -16983,13 +16941,6 @@ $as_echo "$as_me: error: conditional \"ARCH_X86_64\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${ARCH_PPC_TRUE}" && test -z "${ARCH_PPC_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"ARCH_PPC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"ARCH_PPC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 
 
 : ${CONFIG_STATUS=./config.status}