commit 12ca3469a99f40df59f8a66f9636861f9b1511d0
author Martin Storsjö <martin@martin.st> Thu Aug 03 23:34:37 2017 +0300
committer Martin Storsjö <martin@martin.st> Sat Aug 05 13:12:48 2017 +0300
tree 079e204836d1722f5121e954412bd93507964728
parent bf9313335ca72fb136fd0a149d77255c5ff571ff

stdio: Pass the function to call to the v*scanf asm wrapper

This unifies the wrappers, allowing to share them as on x86.

Signed-off-by: Martin Storsjö <martin@martin.st>

mingw-w64-crt/stdio/vsscanf.c

diff --git a/mingw-w64-crt/stdio/vsscanf.c b/mingw-w64-crt/stdio/vsscanf.c
index 7c72b6c..995657d 100644
--- a/mingw-w64-crt/stdio/vsscanf.c
+++ b/mingw-w64-crt/stdio/vsscanf.c
@@ -19,11 +19,9 @@
 
 #elif defined (__arm__) || defined (_ARM_)
 
-#define QUOTE_(x) #x
-#define QUOTE(x) QUOTE_(x)
-
 int __ms_vsscanf_internal (const char * __restrict__,
-  const char * __restrict__, va_list);
+  const char * __restrict__, va_list,
+  int (*func)(const char * __restrict__,  const char * __restrict__, ...));
 asm("\t.text\n"
     "\t.align 2\n"
     "\t.thumb_func\n"
@@ -31,6 +29,7 @@
     "__ms_vsscanf_internal:\n\t"
     "push {r4-r7, lr}\n\t"
     "sub sp, sp, #128\n\t"
+    "mov r12, r3\n\t"
     "mov r4, sp\n\t"
 
     "ldr r5, [r2], #4\n\t"
@@ -44,7 +43,7 @@
 
     "mov r2, r5\n\t"
     "mov r3, r6\n\t"
-    "bl " QUOTE(__MINGW_USYMBOL(sscanf)) "\n\t"
+    "blx r12\n\t"
     "add sp, sp, #128\n\t"
     "pop {r4-r7, pc}");
 
@@ -56,10 +55,9 @@
   int ret;
 
 #if defined(_AMD64_) || defined(__x86_64__) || \
-  defined(_X86_) || defined(__i386__)
+  defined(_X86_) || defined(__i386__) || \
+  defined(_ARM_) || defined(__arm__)
   ret = __ms_vsscanf_internal (s, format, arg, sscanf);
-#elif defined (_ARM_) || defined (__arm__)
-  ret = __ms_vsscanf_internal (s, format, arg);
 #else
 #error "unknown platform"
 #endif