]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
* grub-core/kern/arm/cache_armv6.S: Remove special handling for
authorVladimir Serbinenko <phcoder@gmail.com>
Thu, 14 Nov 2013 08:15:18 +0000 (09:15 +0100)
committerVladimir Serbinenko <phcoder@gmail.com>
Thu, 14 Nov 2013 09:05:19 +0000 (10:05 +0100)
clang (not necessarry with -no-integrated-as).
* include/grub/symbol.h [__arm__]: Likewise.

ChangeLog
grub-core/kern/arm/cache_armv6.S
include/grub/symbol.h

index cbd893689bfad330ec54f89722f4eb566c0f53c8..da62f4fe76b022d2ac3ce0a449b91381de8f70f0 100644 (file)
--- 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.
index 52b81573de707be7286320aa176af4803c4fbeab..c8f94abcfdc5ba84686a1ea02c730091407a638c 100644 (file)
@@ -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
index 62d3cb1d1d9934990148dcf07448c364fd33e005..89883a3625de2207acf5b9d93f9bdadb71c4df05 100644 (file)
 #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):