From 57ffe93485b715e691ab905a075d5b463cce04d8 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Thu, 14 Nov 2013 09:15:18 +0100
Subject: [PATCH] 	* grub-core/kern/arm/cache_armv6.S: Remove special
 handling for 	clang (not necessarry with -no-integrated-as). 	*
 include/grub/symbol.h [__arm__]: Likewise.

---
 ChangeLog                        | 6 ++++++
 grub-core/kern/arm/cache_armv6.S | 3 +--
 include/grub/symbol.h            | 4 ----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cbd893689..da62f4fe7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/arm/cache_armv6.S: Remove special handling for
+	clang (not necessarry with -no-integrated-as).
+	* include/grub/symbol.h [__arm__]: Likewise.
+
 2013-11-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* configure.ac: Use -no-integrated-as on arm with clang.
diff --git a/grub-core/kern/arm/cache_armv6.S b/grub-core/kern/arm/cache_armv6.S
index 52b81573d..c8f94abcf 100644
--- a/grub-core/kern/arm/cache_armv6.S
+++ b/grub-core/kern/arm/cache_armv6.S
@@ -22,9 +22,8 @@
 	.text
 	.syntax	unified
 	.arm
-#ifndef __clang__
 	.arch	armv6
-#endif
+
 # define DMB	mcr	p15, 0, r0, c7, c10, 5
 # define DSB	mcr	p15, 0, r0, c7, c10, 4
 # define ISB	mcr	p15, 0, r0, c7, c5, 4
diff --git a/include/grub/symbol.h b/include/grub/symbol.h
index 62d3cb1d1..89883a362 100644
--- a/include/grub/symbol.h
+++ b/include/grub/symbol.h
@@ -38,12 +38,8 @@
 #endif
 
 #ifdef __arm__
-#ifdef __clang__
-#define END
-#else
 #define END .end
 #endif
-#endif
 
 #if defined (__APPLE__)
 #define FUNCTION(x)	.globl EXT_C(x) ; EXT_C(x):