- drop upstreamed s390 patch

This commit is contained in:
Dan Horák 2015-06-05 11:51:27 +02:00
parent 9a6d77d550
commit 049545a9bc
2 changed files with 4 additions and 28 deletions

View File

@ -1,23 +0,0 @@
---
CONFIG/src/backend/probe_gas_s390.S | 13 +++++++++
10 files changed, 108 insertions(+), 7 deletions(-)
Index: b/CONFIG/src/backend/probe_gas_s390.S
===================================================================
--- /dev/null
+++ b/CONFIG/src/backend/probe_gas_s390.S
@@ -0,0 +1,13 @@
+#define ATL_GAS_PPC
+#include "atlas_asm.h"
+/*
+ * Linux S390 assembler for:
+ * int asm_probe(int i)
+ * RETURNS: i*3
+ */
+.globl ATL_asmdecor(asm_probe)
+ATL_asmdecor(asm_probe):
+ lr r3,r2
+ ar r2,r3
+ ar r2,r3
+ br r14

View File

@ -5,7 +5,7 @@ Version: 3.10.2
%if "%{?enable_native_atlas}" != "0"
%define dist .native
%endif
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Automatically Tuned Linear Algebra Software
Group: System Environment/Libraries
@ -28,7 +28,6 @@ Source13: IBMz964.tar.bz2
#upstream arm uses softfp abi, fedora arm uses hard
Source14: ARMv732NEON.tar.bz2
Patch1: atlas-s390port.patch
Patch2: atlas-fedora-arm.patch
# Properly pass -melf_* to the linker with -Wl, fixes FTBFS bug 817552
# https://sourceforge.net/tracker/?func=detail&atid=379484&aid=3555789&group_id=23725
@ -317,9 +316,6 @@ ix86 architecture.
#cat /proc/cpuinfo
%setup -q -n ATLAS
#patch0 -p0 -b .shared
%ifarch s390 s390x
%patch1 -p1 -b .s390
%endif
#arm patch not applicable, probably not needed
#%ifarch %{arm}
#%patch2 -p0 -b .arm
@ -831,6 +827,9 @@ fi
%endif
%changelog
* Fri Jun 05 2015 Dan Horák <dan[at]danny.cz> - 3.10.2-3
- drop upstreamed s390 patch
* Wed May 20 2015 Frantisek Kluknavsky <fkluknav@redhat.com> - 3.10.2-2
- include all single-threaded wrapper libraries in -static subpackage
- bz#1222079