From 95dd00b1b18ad0c035259c4902c2e8b2aa007322 Mon Sep 17 00:00:00 2001
From: Taylor R Campbell <campbell@mumble.net>
Date: Sat, 19 Jan 2019 23:56:55 +0000
Subject: [PATCH] Fix some symbol sizing.

---
 src/microcode/cmpauxmd/aarch64.m4 | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/microcode/cmpauxmd/aarch64.m4 b/src/microcode/cmpauxmd/aarch64.m4
index e6f6cf35a..2618cb881 100644
--- a/src/microcode/cmpauxmd/aarch64.m4
+++ b/src/microcode/cmpauxmd/aarch64.m4
@@ -283,7 +283,7 @@ END(apply_setup)
 LOCAL(apply_setup_fail)
 	mov	UIDX, #0x14	// comutil_apply
 	b	SYMBOL(scheme_to_interface)
-END(apply_setup)
+END(apply_setup_fail)
 
 ///////////////////////////////////////////////////////////////////////////////
 // Scheme miscellaneous primitive subroutine hooks
@@ -315,11 +315,12 @@ END(set_interrupt_enables)
 	//	Hook that just jumps to target, no questions asked.
 	//
 define(JUMP_HOOK, `
-$1:
+LOCAL($1)
 	b	SYMBOL($2)
 	nop
 	nop
-	nop')
+	nop
+END($1)')
 
 	// UTILITY_HOOK(name, number)
 	//
@@ -331,11 +332,12 @@ $1:
 	//	utility_table in cmpint.c.
 	//
 define(UTILITY_HOOK, `
-$1:
+LOCAL($1)
 	mov	UIDX, #$2
 	b	SYMBOL(scheme_to_interface)
 	nop
-	nop')
+	nop
+END($1)')
 
 	// APPLY_HOOK(name, label, n)
 	//
@@ -346,11 +348,12 @@ $1:
 	//	callee.
 	//
 define(APPLY_HOOK, `
-$1:
+LOCAL($1)
 	mov	UARG2, #$3
 	b	SYMBOL(apply_setup)
 	nop
-	nop')
+	nop
+END($1)')
 
 	// hooks
 	//
-- 
2.25.1