fix factor on 32bit powerpc (upstream, #884715)

This commit is contained in:
Ondřej Vašík 2012-12-06 17:11:49 +01:00
parent 7e4f1a381e
commit d9f99cf09b
2 changed files with 18 additions and 1 deletions

View File

@ -0,0 +1,12 @@
diff -urNp coreutils-8.20-orig/src/longlong.h coreutils-8.20/src/longlong.h
--- coreutils-8.20-orig/src/longlong.h 2012-10-23 16:14:12.000000000 +0200
+++ coreutils-8.20/src/longlong.h 2012-12-06 17:09:12.865695463 +0100
@@ -1392,7 +1392,7 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype
/* We should test _IBMR2 here when we add assembly support for the system
vendor compilers. */
-#if HAVE_HOST_CPU_FAMILY_powerpc && W_TYPE_SIZE == 64
+#if HAVE_HOST_CPU_FAMILY_powerpc && W_TYPE_SIZE == 64 && defined (_LP64)
#if !defined (_LONG_LONG_LIMB)
/* _LONG_LONG_LIMB is ABI=mode32 where adde operates on 32-bit values. So
use adde etc only when not _LONG_LONG_LIMB. */

View File

@ -1,7 +1,7 @@
Summary: A set of basic GNU tools commonly used in shell scripts
Name: coreutils
Version: 8.20
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv3+
Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/
@ -14,6 +14,7 @@ Source105: coreutils-colorls.sh
Source106: coreutils-colorls.csh
# From upstream
Patch1: coreutils-8.20-powerpcfactor.patch
# Our patches
#general patch to workaround koji build system issues
@ -126,6 +127,7 @@ the old GNU fileutils, sh-utils, and textutils packages.
%setup -q
# From upstream
%patch1 -p1 -b .ppcfactor
# Our patches
%patch100 -p1 -b .configure
@ -375,6 +377,9 @@ fi
%{_sbindir}/chroot
%changelog
* Thu Dec 06 2012 Ondrej Vasik <ovasik@redhat.com> 8.20-3
- fix factor on 32bit powerpc (upstream, #884715)
* Mon Nov 05 2012 Ondrej Vasik <ovasik@redhat.com> 8.20-2
- disable the temporary O_SYNC fix (glibc is fixed - #872366)