|
 |
4fe85b |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
4fe85b |
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
4fe85b |
Date: Wed, 25 Dec 2013 23:31:42 +0100
|
|
|
4fe85b |
Subject: [PATCH] * grub-core/kern/arm/cache_armv6.S: Remove .arch directive.
|
|
|
4fe85b |
|
|
|
4fe85b |
As these functions are used on pre-ARMv6 CPUs as well we don't want
|
|
|
4fe85b |
to make assembler assume that architecture is higher than default one.
|
|
|
4fe85b |
---
|
|
|
4fe85b |
grub-core/kern/arm/cache_armv6.S | 1 -
|
|
|
4fe85b |
ChangeLog | 7 +++++++
|
|
|
4fe85b |
2 files changed, 7 insertions(+), 1 deletion(-)
|
|
|
4fe85b |
|
|
|
4fe85b |
diff --git a/grub-core/kern/arm/cache_armv6.S b/grub-core/kern/arm/cache_armv6.S
|
|
|
4fe85b |
index 39da1dfc606..dfaded0eb30 100644
|
|
|
4fe85b |
--- a/grub-core/kern/arm/cache_armv6.S
|
|
|
4fe85b |
+++ b/grub-core/kern/arm/cache_armv6.S
|
|
|
4fe85b |
@@ -22,7 +22,6 @@
|
|
|
4fe85b |
.text
|
|
|
4fe85b |
.syntax unified
|
|
|
4fe85b |
.arm
|
|
|
4fe85b |
- .arch armv6
|
|
|
4fe85b |
|
|
|
4fe85b |
# define DMB mcr p15, 0, r0, c7, c10, 5
|
|
|
4fe85b |
# define DSB mcr p15, 0, r0, c7, c10, 4
|
|
|
4fe85b |
diff --git a/ChangeLog b/ChangeLog
|
|
|
4fe85b |
index 21ec1c77c57..153bc43c1c5 100644
|
|
|
4fe85b |
--- a/ChangeLog
|
|
|
4fe85b |
+++ b/ChangeLog
|
|
|
4fe85b |
@@ -1,3 +1,10 @@
|
|
|
4fe85b |
+2013-12-25 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
4fe85b |
+
|
|
|
4fe85b |
+ * grub-core/kern/arm/cache_armv6.S: Remove .arch directive.
|
|
|
4fe85b |
+
|
|
|
4fe85b |
+ As these functions are used on pre-ARMv6 CPUs as well we don't want
|
|
|
4fe85b |
+ to make assembler assume that architecture is higher than default one.
|
|
|
4fe85b |
+
|
|
|
4fe85b |
2013-12-25 Andrey Borzenkov <arvidjaar@gmail.com>
|
|
|
4fe85b |
|
|
|
4fe85b |
* grub-core/osdep/windows/platform.c (get_platform): Fix EFI
|