configure: set float-abi even without armv6

[pcsx_rearmed.git] / configure

diff --git a/configure b/configure
index 42ab9f5..e8e5b2a 100755 (executable)
--- a/configure
+++ b/configure
@@ -215,28 +215,24 @@ if [ "$ARCH" = "arm" ]; then
 
   # automatically set mfpu and mfloat-abi if they are not set
   if [ "$have_arm_neon" = "yes" ]; then
-    echo "$CFLAGS" | grep -q -- '-mfpu=' || CFLAGS="$CFLAGS -mfpu=neon"
-    echo "$ASFLAGS" | grep -q -- '-mfpu=' || ASFLAGS="$ASFLAGS -mfpu=neon"
+    fpu="neon"
   elif [ "$have_armv6" = "yes" ]; then
-    echo "$CFLAGS" | grep -q -- '-mfpu=' || CFLAGS="$CFLAGS -mfpu=vfp"
-    echo "$ASFLAGS" | grep -q -- '-mfpu=' || ASFLAGS="$ASFLAGS -mfpu=vfp"
+    fpu="vfp"
   fi
-  floatabi_set_by_gcc=`$CC -v 2>&1 | grep -q -- --with-float= && echo yes` || true
-  if [ "$floatabi_set_by_gcc" != "yes" -a "$have_armv6" = "yes" ]; then
-    echo "$CFLAGS" | grep -q -- '-mfloat-abi=' || CFLAGS="$CFLAGS -mfloat-abi=softfp"
-    echo "$ASFLAGS" | grep -q -- '-mfloat-abi=' || ASFLAGS="$ASFLAGS -mfloat-abi=softfp"
+  if [ "x$fpu" != "x" ]; then
+    echo "$CFLAGS" | grep -q -- '-mfpu=' || CFLAGS="$CFLAGS -mfpu=$fpu"
+    echo "$ASFLAGS" | grep -q -- '-mfpu=' || ASFLAGS="$ASFLAGS -mfpu=$fpu"
+    floatabi_set_by_gcc=`$CC -v 2>&1 | grep -q -- --with-float= && echo yes` || true
+    if [ "$floatabi_set_by_gcc" != "yes" ]; then
+      echo "$CFLAGS" | grep -q -- '-mfloat-abi=' || CFLAGS="$CFLAGS -mfloat-abi=softfp"
+      echo "$ASFLAGS" | grep -q -- '-mfloat-abi=' || ASFLAGS="$ASFLAGS -mfloat-abi=softfp"
+    fi
   fi
 
   # must disable thumb as recompiler can't handle it
   if check_define __thumb__; then
     CFLAGS="$CFLAGS -marm"
   fi
-
-  if [ "$have_armv7" = "yes" ]; then
-    ASFLAGS="$ASFLAGS --defsym HAVE_ARMV7=1"
-  else
-    ASFLAGS="$ASFLAGS --defsym HAVE_ARMV7=0"
-  fi
 else
   # dynarec only available on ARM
   enable_dynarec="no"
@@ -281,15 +277,6 @@ EOF
   compile_binary
 }
 
-check_bzlib()
-{
-  cat > $TMPC <<EOF
-  #include <bzlib.h>
-  void main() { BZ2_bzBuffToBuffDecompress(0, 0, 0, 0, 0, 0); }
-EOF
-  compile_object
-}
-
 check_libpng()
 {
   cat > $TMPC <<EOF
@@ -330,8 +317,6 @@ EOF
 MAIN_LDLIBS="$MAIN_LDLIBS -lz"
 check_zlib || fail "please install zlib (libz-dev)"
 
-check_bzlib || fail "please install bz2lib (libbz2-dev)"
-
 MAIN_LDLIBS="-lpng $MAIN_LDLIBS"
 check_libpng || fail "please install libpng (libpng-dev)"
 
@@ -449,21 +434,7 @@ echo "ARCH = $ARCH" >> $config_mak
 echo "PLATFORM = $platform" >> $config_mak
 echo "BUILTIN_GPU = $builtin_gpu" >> $config_mak
 echo "SOUND_DRIVERS = $sound_drivers" >> $config_mak
-if [ "$ARCH" = "arm" ]; then
-  echo "PLUGINS = $plugins" >> $config_mak
-else
-  echo -n "PLUGINS =" >> $config_mak
-  for p in $plugins; do
-    echo -n " ${p}.${ARCH}" >> $config_mak
-  done
-  echo >> $config_mak
-fi
-if [ "$have_armv6" = "yes" ]; then
-  echo "HAVE_ARMV6 = 1" >> $config_mak
-fi
-if [ "$have_armv7" = "yes" ]; then
-  echo "HAVE_ARMV7 = 1" >> $config_mak
-fi
+echo "PLUGINS = $plugins" >> $config_mak
 if [ "$have_arm_neon" = "yes" ]; then
   echo "HAVE_NEON = 1" >> $config_mak
 fi