From f112bdc4ac41ef85c6a5987645dfd29a3989492b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Torbj=C3=B6rn=20Granlund?= Date: Mon, 4 Mar 2013 17:57:33 +0000 Subject: [PATCH] build: fix factor build failure on aarch64 * src/longlong.h (__aarch64__): Make add_ssaaaa and sub_ddmmss work. * NEWS: Mention the build fix. Reported at https://bugzilla.redhat.com/917735 Change-Id: Id8e1373521fdf43935b4fdd5147a4461a0d1ca29 Signed-off-by: Chanho Park --- NEWS | 5 +++++ src/longlong.h | 21 +++++++-------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/NEWS b/NEWS index 41ead74..0bbd839 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,10 @@ GNU coreutils NEWS -*- outline -*- +** 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] ** New programs 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); \ -- 2.7.4