dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0002-grub-core-kern-arm-cache_armv6.S-Remove-.arch-direct.patch

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