Use upstream patch for aarch64 (includes ppc64le too)

This commit is contained in:
Peter Robinson 2014-05-22 11:21:40 +01:00
parent 0ff0a00fd2
commit f7de1e1263
2 changed files with 39 additions and 22 deletions

View File

@ -1,25 +1,36 @@
Index: userspace-rcu-0.8.1/configure
===================================================================
--- userspace-rcu-0.8.1.orig/configure
+++ userspace-rcu-0.8.1/configure
@@ -12685,6 +12685,8 @@ case $host_cpu in #(
ARCHTYPE="mips" ;; #(
tile*) :
ARCHTYPE="gcc" ;; #(
+ aarch64) :
+ ARCHTYPE="gcc" ;; #(
*) :
ARCHTYPE="unknown"
;;
Index: userspace-rcu-0.8.1/configure.ac
===================================================================
--- userspace-rcu-0.8.1.orig/configure.ac
+++ userspace-rcu-0.8.1/configure.ac
@@ -79,6 +79,7 @@ AS_CASE([$host_cpu],
From: Dimitri John Ledkov <xnox@ubuntu.com>
Date: Wed, 12 Mar 2014 12:17:51 +0000 (-0400)
Subject: Use gcc atomics on aarch64/powerpc64le
X-Git-Url: http://git.lttng.org/?p=userspace-rcu.git;a=commitdiff_plain;h=3913336f0e763b4ab614aa6b6e41e20b481e50c3
Use gcc atomics on aarch64/powerpc64le
Currently there are two fairly recent architectures, which at the
moment can only be compiled with "gcc atomics" code path.
The two new architectures are (GNU Types):
* aarch64-linux-gnu (aka ARMv8, ARM64, AARCH64, etc)
* powerpc64le-linux-gnu
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
diff --git a/configure.ac b/configure.ac
index 079c145..3368b33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,6 +69,7 @@ AS_CASE([$host_cpu],
[powerpc], [ARCHTYPE="ppc"],
[ppc64], [ARCHTYPE="ppc"],
[powerpc64], [ARCHTYPE="ppc"],
+ [powerpc64le], [ARCHTYPE="gcc"],
[ppc], [ARCHTYPE="ppc"],
[s390], [ARCHTYPE="s390"],
[s390x], [ARCHTYPE="s390"],
@@ -77,6 +78,7 @@ AS_CASE([$host_cpu],
[alpha*], [ARCHTYPE="alpha"],
[ia64], [ARCHTYPE="gcc"],
[arm*], [ARCHTYPE="arm"],
+ [aarch64], [ARCHTYPE="gcc"],
[mips*], [ARCHTYPE="mips"],
[tile*], [ARCHTYPE="gcc"],
+ [aarch64], [ARCHTYPE="gcc"],
[ARCHTYPE="unknown"]
)

View File

@ -1,6 +1,6 @@
Name: userspace-rcu
Version: 0.8.1
Release: 2%{?dist}
Release: 3%{?dist}
Summary: RCU (read-copy-update) implementation in user space
Group: System Environment/Libraries
@ -8,6 +8,7 @@ License: LGPLv2+
URL: http://lttng.org/urcu/
Source0: http://lttng.org/files/urcu/%{name}-%{version}.tar.bz2
Patch0: userspace-rcu-aarch64.patch
BuildRequires: autoconf automake libtool
BuildRequires: pkgconfig
# Upstream do not yet support mips
ExcludeArch: mips
@ -35,6 +36,8 @@ developing applications that use %{name}.
%build
# Patch for AArch64 and PPC64LE needs it
autoreconf -vif
%configure --disable-static
#Remove Rpath from build system
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@ -72,6 +75,9 @@ rm -vf $RPM_BUILD_ROOT%{_libdir}/*.la
%changelog
* Thu May 22 2014 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 0.8.1-3
- Use upstream patch for aarch64 (includes ppc64le too)
* Thu May 22 2014 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 0.8.1-2
- Added AArch64 support