From 02a85c1116369488784c5ed4d67f326c22455e94 Mon Sep 17 00:00:00 2001
From: Alexei Fedorov <Alexei.Fedorov@arm.com>
Date: Fri, 10 May 2019 16:55:16 +0100
Subject: [PATCH] Remove .arch directives from spinlock.S

This patch removes .arch "arm8.1-a" and "armv8-a"
directives which overwrite ASFLAGS_aarch64 option based
on ARM_ARCH_MINOR passed to Makefile and cause
translation errors like
"selected processor does not support `bti jc'"
for armv8.5-a targets when BTI support is enabled.

Change-Id: Idca5b66ed1e5d86e2188b0c0f16c3819990957c4
Signed-off-by: Alexei Fedorov <Alexei.Fedorov@arm.com>
---
 lib/locks/exclusive/aarch64/spinlock.S | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/locks/exclusive/aarch64/spinlock.S b/lib/locks/exclusive/aarch64/spinlock.S
index e2f9eaa47..d0569f1cd 100644
--- a/lib/locks/exclusive/aarch64/spinlock.S
+++ b/lib/locks/exclusive/aarch64/spinlock.S
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -39,8 +39,6 @@
 
 #if USE_CAS
 
-	.arch	armv8.1-a
-
 /*
  * Acquire lock using Compare and Swap instruction.
  *
@@ -60,8 +58,6 @@ func spin_lock
 	ret
 endfunc spin_lock
 
-	.arch	armv8-a
-
 #else /* !USE_CAS */
 
 /*
-- 
GitLab