From a752c20fda86bcc14a23539fc20bea32fb541e18 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 26 Sep 2019 13:49:45 +0100
Subject: [PATCH] base/regdump.h: Add missing `F(...)' around `callext'
 targets.

Probably broke Windows.
---
 base/regdump.h | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/base/regdump.h b/base/regdump.h
index 66933fcf..aae35bc5 100644
--- a/base/regdump.h
+++ b/base/regdump.h
@@ -403,11 +403,11 @@ DO8(REGDEF_SIMD)
 	mov	[esp + 4*REGIX_BX], ebx
 	ldgot
 #  endif
-	callext	regdump_gpsave
+	callext	F(regdump_gpsave)
 
 	// Make space for the extended registers.
 	sub	R_sp(r), R_c(r)
-	callext	regdump_xtsave
+	callext	F(regdump_xtsave)
 
 	// Prepare for calling back into C.  On 32-bit x86, leave space for
 	// the arguments and set up the GOT pointer; on AMD64 Windows, leave
@@ -425,9 +425,9 @@ DO8(REGDEF_SIMD)
 	// Restore registers.
 
 	// We assume r/ebp still points to the register map.
-	callext	regdump_xtrstr
+	callext	F(regdump_xtrstr)
 	mov	R_sp(r), R_bp(r)
-	callext	regdump_gprstr
+	callext	F(regdump_gprstr)
 	popf
 	lea	R_sp(r), [R_sp(r) + REGDUMP_SPADJ]
 .endm
@@ -885,7 +885,7 @@ extern void regdump_freshline(void);
 
 .macro	terpri
 	_saveregs
-	callext	regdump_freshline
+	callext	F(regdump_freshline)
 	_rstrregs
 .endm
 
@@ -897,7 +897,7 @@ extern void regdump_freshline(void);
 		 (((\fmt&REGF_TYMASK) == 0)&regty.\rn) | \
 		 (((\fmt&REGF_FMTMASK) == 0)&regfmt.\rn)
 	_regfmt	.L$reg.fmt$\@
-	callext	regdump
+	callext	F(regdump)
 	_rstrregs
 .endm
 
@@ -909,7 +909,7 @@ extern void regdump_freshline(void);
 		 (((\fmt&REGF_TYMASK) == 0)&REGF_32) | \
 		 (((\fmt&REGF_FMTMASK) == 0)&REGF_HEX)
 	_regfmt	.L$mem.fmt$\@
-	callext	regdump
+	callext	F(regdump)
 	_rstrregs
 .endm
 
@@ -917,15 +917,15 @@ extern void regdump_freshline(void);
 	_saveregs
   .ifnes "\gp", "nil"
 	_regbase
-	callext	regdump_gp
+	callext	F(regdump_gp)
   .endif
   .ifnes "\fp", "nil"
 	_regbase
-	callext	regdump_fp
+	callext	F(regdump_fp)
   .endif
   .ifnes "\simd", "nil"
 	_regbase
-	callext	regdump_simd
+	callext	F(regdump_simd)
   .endif
 	_rstrregs
 .endm
-- 
2.11.0