* configure.ac: Use -no-integrated-as on arm with clang.

	* INSTALL: Mention ARM compilation with clang.

diff --git a/ChangeLog b/ChangeLog
index a4b834c8d4aac2b8a956774f1ef60e090860ea90..cbd893689bfad330ec54f89722f4eb566c0f53c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * configure.ac: Use -no-integrated-as on arm with clang.
+       * INSTALL: Mention ARM compilation with clang.
+
 2013-11-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * conf/Makefile.common (CCASFLAGS_PLATFORM) [COND_arm]: Add

diff --git a/INSTALL b/INSTALL
index 82dd3663e7f11adc0dcfee68b31e1d8a8f01fd30..39718ecde0dc541050203061103d5fafb80f2d63 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -15,6 +15,7 @@ configuring the GRUB.
   Note: older versions may work but support is limited
   Note: clang 3.2 or later works for i386 and x86_64 targets but results in
         much bigger binaries.
+  Note: clang 3.2 or later works for arm
   Note: clang 3.4 or later works for powerpc
 * GNU Make
 * GNU Bison 2.3 or later

diff --git a/configure.ac b/configure.ac
index 4ad75843079f5542ed7f7e13ec3eda45ec54d75f..8eda6b4ff880d24643e307dc321a88b456446a87 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -487,8 +487,9 @@ AC_CACHE_CHECK([if compiling with clang], [grub_cv_cc_target_clang]
 ]])],
 [grub_cv_cc_target_clang=no], [grub_cv_cc_target_clang=yes])])
 
-# clang doesn't support .code16
-if test "x$grub_cv_cc_target_clang" = xyes && ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ); then
+# on x86 clang doesn't support .code16
+# on arm clang doesn't support .arch directive
+if test "x$grub_cv_cc_target_clang" = xyes && ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 || test "x$target_cpu" = xarm ); then
    TARGET_CCASFLAGS="$TARGET_CCASFLAGS -no-integrated-as"
 fi