Revert "[depends] add m4 macros for compiler flag testing"

This reverts commit 6097ea3.
weiszg · Jun 2, 2014 · e194dd7 · e194dd7
1 parent fe8940b
commit e194dd7
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 300 deletions.
diff --git a/m4/ax_append_compile_flags.m4 b/m4/ax_append_compile_flags.m4
diff --git a/m4/ax_append_flag.m4 b/m4/ax_append_flag.m4
diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4
diff --git a/m4/ax_require_defined.m4 b/m4/ax_require_defined.m4
diff --git a/tools/depends/configure.in b/tools/depends/configure.in
@@ -5,11 +5,6 @@ AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_FILES([target/config.site native/config.site.native Makefile.include target/Toolchain.cmake])
 AC_CANONICAL_HOST
 m4_include([../../m4/xbmc_arch.m4])
-m4_include([../../m4/ax_require_defined.m4])
-m4_include([../../m4/ax_append_flag.m4])
-m4_include([../../m4/ax_check_compile_flag.m4])
-m4_include([../../m4/ax_append_compile_flags.m4])
-
 
 AC_ARG_WITH([toolchain],
   [AS_HELP_STRING([--with-toolchain],
@@ -112,19 +107,14 @@ case $host in
   arm*-*linux-android*)
     if test "x$use_cpu" = "xauto" || test "x$use_cpu" = "xarmeabi-v7a"; then
       use_cpu="armeabi-v7a"
-      AX_APPEND_COMPILE_FLAGS([$passed_cflags -march=armv7-a -mtune=cortex-a9 -mfloat-abi=softfp], [platform_cflags])
+      platform_cflags+=" -march=armv7-a -mtune=cortex-a9 -mfloat-abi=softfp"
       use_neon="yes"
     fi
     if test "$use_neon" = "yes"; then
-      AX_APPEND_COMPILE_FLAGS([$passed_cflags -mfpu=neon -mvectorize-with-neon-quad], [platform_cflags])
+      platform_cflags+="-mfpu=neon -mvectorize-with-neon-quad"
     fi
     if test "$use_tegra" = "yes"; then
-      AX_CHECK_COMPILE_FLAG(-mfpu=vfpv3-d16,
-        [AX_APPEND_COMPILE_FLAGS([$passed_cflags -Wno-psabi -Wa,-march=arv7a -mtune=cortex-a9 -mfpu=vfpv3-d16 -mthumb-interwork],
-          [platform_cflags])],
-        [AX_APPEND_COMPILE_FLAGS([$passed_cflags -Wa,-march=armv6 -mtune=cortex-a8 -mthumb-interwork],
-          [platform_cflags])],
-      )
+      platform_cflags+="-Wno-psabi -Wa,-march=armv7a -mtune=cortex-a9 -mfpu=vfpv3-d16 -mthumb-interwork"
     fi
     use_sdk="${use_sdk:-android-14}"
     deps_dir="$use_host-$use_sdk"
@@ -162,15 +152,10 @@ case $host in
         use_cpu=$host_cpu
       fi
       if test "$use_neon" = "yes"; then
-        AX_APPEND_COMPILE_FLAGS([$passed_cflags -mfpu=neon -mvectorize-with-neon-quad], [platform_cflags])
+        platform_cflags+="-mfpu=neon -mvectorize-with-neon-quad"
       fi
       if test "$use_tegra" = "yes"; then
-        AX_CHECK_COMPILE_FLAG(-mfpu=vfpv3-d16,
-          [AX_APPEND_COMPILE_FLAGS([$passed_cflags -Wno-psabi -Wa,-march=arv7a -mtune=cortex-a9 -mfpu=vfpv3-d16 -mthumb-interwork],
-            [platform_cflags])],
-          [AX_APPEND_COMPILE_FLAGS([$passed_cflags -Wa,-march=armv6 -mtune=cortex-a8 -mthumb-interwork],
-            [platform_cflags])],
-        )
+        platform_cflags+="-Wno-psabi -Wa,-march=armv7a -mtune=cortex-a9 -mfpu=vfpv3-d16 -mthumb-interwork"
       fi
       use_toolchain="${use_toolchain:-/usr}"
       platform_cflags="-Os -fPIC -DPIC"