]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
arm64: Fix compilation failure.
authorVladimir Serbinenko <phcoder@gmail.com>
Sun, 22 Feb 2015 16:41:12 +0000 (17:41 +0100)
committerVladimir Serbinenko <phcoder@gmail.com>
Mon, 23 Feb 2015 21:29:28 +0000 (22:29 +0100)
Don't supply +nosimd to asm files.
Otherwise +nosimd coming from flags forbids some of instructions
used in cache_flush.

configure.ac

index 94f96c47d6f6c01d18ae28f91add3dec111ed211..35f430a0ae75f2e1828bfbba78726797d1fd50b5 100644 (file)
@@ -719,7 +719,16 @@ if test x"$platform" != xemu ; then
       TARGET_CFLAGS="$TARGET_CFLAGS $grub_cv_target_cc_soft_float"
       ;;
   esac
-  TARGET_CCASFLAGS="$TARGET_CCASFLAGS $grub_cv_target_cc_soft_float"
+  case x"$grub_cv_target_cc_soft_float" in
+    x"-march=armv8-a+nofp+nosimd")
+      # +nosimd disables also the cache opcodes that we need in asm.
+      TARGET_CCASFLAGS="$TARGET_CCASFLAGS -march=armv8-a+nofp"
+      ;;
+    *)
+      TARGET_CCASFLAGS="$TARGET_CCASFLAGS $grub_cv_target_cc_soft_float"
+      ;;
+  esac
+
 fi
 
 if test x"$target_cpu" = xsparc64 ; then