From 9e543f703b639157b0342782882eb938bbafb8d3 Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Mon, 29 Sep 2008 20:10:23 +0000 Subject: [PATCH] Fixing build break --- numactl-2.0.2-clearcache-fix.patch | 12 ++++++++++++ numactl.spec | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 numactl-2.0.2-clearcache-fix.patch diff --git a/numactl-2.0.2-clearcache-fix.patch b/numactl-2.0.2-clearcache-fix.patch new file mode 100644 index 0000000..691a49d --- /dev/null +++ b/numactl-2.0.2-clearcache-fix.patch @@ -0,0 +1,12 @@ +diff -up numactl-2.0.2/clearcache.c.orig numactl-2.0.2/clearcache.c +--- numactl-2.0.2/clearcache.c.orig 2008-09-29 16:08:38.000000000 -0400 ++++ numactl-2.0.2/clearcache.c 2008-09-29 16:08:49.000000000 -0400 +@@ -57,7 +57,7 @@ void clearcache(unsigned char *mem, unsi + #if defined(__i386__) || defined(__x86_64__) + unsigned i, cl, eax, feat; + /* get clflush unit and feature */ +- asm("cpuid" : "=a" (eax), "=b" (cl), "=d" (feat) : "0" (1) : "cx"); ++ asm("cpuid" : "=a" (eax), "=r" (cl), "=d" (feat) : "0" (1) : "cx"); + if (!(feat & (1 << 19))) + fallback_clearcache(); + cl = ((cl >> 8) & 0xff) * 8; diff --git a/numactl.spec b/numactl.spec index 3bfc163..dac558f 100644 --- a/numactl.spec +++ b/numactl.spec @@ -1,13 +1,15 @@ Name: numactl Summary: Library for tuning for Non Uniform Memory Access machines Version: 2.0.2 -Release: 1%{dist} +Release: 2%{dist} License: LGPLv2/GPLv2 Group: System Environment/Base URL: ftp://oss.sgi.com/www/projects/libnuma/download Source0: ftp://oss.sgi.com/www/projects/libnuma/download/numactl-%{version}.tar.gz Buildroot: %{_tmppath}/%{name}-buildroot +Patch0: numactl-2.0.2-clearcache-fix.patch + ExcludeArch: s390 s390x %description @@ -25,6 +27,7 @@ Provides development headers for numa library calls %prep %setup -q +%patch0 -p1 %build make CFLAGS="$RPM_OPT_FLAGS -I. -fPIC" @@ -69,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Mon Sep 29 2008 Neil Horman - 2.0.2-2 +- Fix build break due to register selection in asm + * Mon Sep 29 2008 Neil Horman - 2.0.2-1 - Update rawhide to version 2.0.2 of numactl