05cc138851
- Update I18N patch from Fedora:
(coreutils-i18n.patch)
* sort: fix multibyte incompabilities (rh#821264)
* pr -e, with a mix of backspaces and TABs, could corrupt the
heap in multibyte locales (analyzed by J.Koncicky)
* path in the testsuite to cover i18n regressions
* Enable cut and sort-merge perl tests for multibyte as well
- Refresh longlong-aarch64.patch.
OBS-URL: https://build.opensuse.org/request/show/209118
OBS-URL: https://build.opensuse.org/package/show/Base:System/coreutils?expand=0&rev=209
49 lines
2.1 KiB
Diff
49 lines
2.1 KiB
Diff
From 9fe7c5b6eb373d859390dd5a7844a666d8b7818b Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Torbj=C3=B6rn=20Granlund?= <tg@gmplib.org>
|
|
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
|
|
---
|
|
NEWS | 4 ++++
|
|
src/longlong.h | 21 +++++++--------------
|
|
2 files changed, 11 insertions(+), 14 deletions(-)
|
|
|
|
Index: coreutils-8.21/src/longlong.h
|
|
===================================================================
|
|
--- coreutils-8.21.orig/src/longlong.h
|
|
+++ coreutils-8.21/src/longlong.h
|
|
@@ -529,23 +529,16 @@ extern UWtype __MPN(udiv_qrnnd) (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); \
|