From 620a358444761dd2d8f4a2f45b180234f788fdd4 Mon Sep 17 00:00:00 2001 From: jsg Date: Fri, 5 Jun 2015 05:39:54 +0000 Subject: [PATCH] Use p15 for the coprocessor name not 15. gas accepts both forms, clang won't accept just a number which a comment in the gas code mentions is for backward compatibility. --- sys/arch/arm/arm/locore.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/arch/arm/arm/locore.S b/sys/arch/arm/arm/locore.S index d662383a075..da97cea1fb6 100644 --- a/sys/arch/arm/arm/locore.S +++ b/sys/arch/arm/arm/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.6 2015/01/18 14:55:02 jsg Exp $ */ +/* $OpenBSD: locore.S,v 1.7 2015/06/05 05:39:54 jsg Exp $ */ /* $NetBSD: locore.S,v 1.14 2003/04/20 16:21:40 thorpej Exp $ */ /* @@ -135,8 +135,8 @@ ENTRY_NP(cpu_reset) * Hurl ourselves into the ROM */ mov r0, #(CPU_CONTROL_32BP_ENABLE | CPU_CONTROL_32BD_ENABLE) - mcr 15, 0, r0, c1, c0, 0 - mcrne 15, 0, r2, c8, c7, 0 /* nail I+D TLB on ARMv4 and greater */ + mcr p15, 0, r0, c1, c0, 0 + mcrne p15, 0, r2, c8, c7, 0 /* nail I+D TLB on ARMv4 and greater */ mov pc, r4 /* -- 2.20.1