[PATCH] build: fix factor build failure on aarch64

[Pádraig Brady]

From: Torbjorn Granlund <address@hidden>

* src/longlong.h (__aarch64__): Make add_ssaaaa and sub_ddmmss work.
* NEWS: Mention the build fix.
Reported at https://bugzilla.redhat.com/917735
---
 NEWS           |    4 ++++
 src/longlong.h |   21 +++++++--------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/NEWS b/NEWS
index 5b28c92..e0cc08a 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,10 @@ GNU coreutils NEWS                                    -*- 
outline -*-
   uniq accepts a new option: --group to print all items, while separating
   unique groups with empty lines.
 
+** Build-related
+
+  factor now builds on aarch64 based systems [bug introduced in coreutils-8.20]
+
 
 * Noteworthy changes in release 8.21 (2013-02-14) [stable]
 
diff --git a/src/longlong.h b/src/longlong.h
index 4681642..eba2417 100644
--- a/src/longlong.h
+++ b/src/longlong.h
@@ -529,23 +529,16 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype *, UWtype, 
UWtype, UWtype);
 #endif /* __arm__ */
 
 #if defined (__aarch64__) && W_TYPE_SIZE == 64
+/* FIXME: Extend the immediate range for the low word by using both
+   ADDS and SUBS, since they set carry in the same way.  */
 #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-  __asm__ ("adds\t%1, %4, %5\n\tadc\t%0, %2, %3"                       \
+  __asm__ ("adds\t%1, %x4, %5\n\tadc\t%0, %x2, %x3"                     \
           : "=r" (sh), "=&r" (sl)                                      \
-          : "r" (ah), "rZ" (bh), "%r" (al), "rI" (bl) __CLOBBER_CC)
+           : "rZ" (ah), "rZ" (bh), "%r" (al), "rI" (bl) __CLOBBER_CC)
 #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-  do {                                                                 \
-    if (__builtin_constant_p (bl))                                     \
-      {                                                                        
\
-       __asm__ ("subs\t%1, %4, %5\n\tsbc\t%0, %2, %3"                  \
-                : "=r" (sh), "=&r" (sl)                                \
-                : "r" (ah), "r" (bh), "r" (al), "rI" (bl) __CLOBBER_CC); \
-      }                                                                        
\
-    else /* only bh might be a constant */                             \
-      __asm__ ("subs\t%1, %4, %5\n\tsbc\t%0, %2, %3"                   \
-              : "=r" (sh), "=&r" (sl)                                  \
-              : "r" (ah), "rZ" (bh), "r" (al), "rI" (bl) __CLOBBER_CC);\
-    } while (0)
+  __asm__ ("subs\t%1, %x4, %5\n\tsbc\t%0, %x2, %x3"                     \
+           : "=r,r" (sh), "=&r,&r" (sl)                                 \
+           : "rZ,rZ" (ah), "rZ,rZ" (bh), "r,Z" (al), "rI,r" (bl) __CLOBBER_CC)
 #define umul_ppmm(ph, pl, m0, m1) \
   do {                                                                 \
     UDItype __m0 = (m0), __m1 = (m1);                                  \
-- 
1.7.7.6