From 49aff4ec1c3109ddbc34b334afec352b65dc91ac Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 9 Sep 2019 16:01:40 +0200
Subject: [PATCH] ntoab: Use __mesabi_uldiv only for arm.

* lib/mes/ntoab.c (ntoab)[__MESC__ && __arm__]: Use __mesabi_uldiv.
* build-aux/check-mescc.sh (XFAIL_TESTS): 70-printf-simple.c and
70-printf.c now pass for x86_64 mescc.
---
 build-aux/check-mescc.sh | 4 ++--
 lib/mes/ntoab.c          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build-aux/check-mescc.sh b/build-aux/check-mescc.sh
index 858ab60c..84158697 100755
--- a/build-aux/check-mescc.sh
+++ b/build-aux/check-mescc.sh
@@ -255,9 +255,7 @@ fi
 
 if test $mes_cpu = x86_64; then
     XFAIL_TESTS="$XFAIL_TESTS
-lib/tests/stdio/70-printf-simple.c
 lib/tests/stdio/70-printf-stdarg.c
-lib/tests/stdio/70-printf.c
 "
 fi
 
@@ -273,6 +271,8 @@ if test $compiler = gcc; then
     if test $mes_cpu = x86_64; then
         XFAIL_TESTS="$XFAIL_TESTS
 lib/tests/stdio/70-printf-hello.c
+lib/tests/stdio/70-printf-simple.c
+lib/tests/stdio/70-printf.c
 lib/tests/scaffold/70-extern.c
 lib/tests/stdio/80-sscanf.c
 lib/tests/mes/90-abtod.c
diff --git a/lib/mes/ntoab.c b/lib/mes/ntoab.c
index 548e45eb..ce91c73a 100644
--- a/lib/mes/ntoab.c
+++ b/lib/mes/ntoab.c
@@ -42,8 +42,8 @@ ntoab (long x, int base, int signed_p)
   do
     {
       unsigned long i;
-#if __MESC__
-      u = __mesabi_uldiv(u, (unsigned long) base, &i);
+#if __MESC__ && __arm__
+      u = __mesabi_uldiv (u, (unsigned long) base, &i);
 #else
       i = u % base;
       u = u / base;