Compare commits
6 Commits
Author | SHA1 | Date |
---|---|---|
Susi Lehtola | 98b2a9d54f | |
Frantisek Kluknavsky | d57a2dc8c6 | |
Frantisek Kluknavsky | fbe742549a | |
Frantisek Kluknavsky | d9f43a9005 | |
Frantisek Kluknavsky | 111c4d0997 | |
Frantisek Kluknavsky | 215b301370 |
|
@ -0,0 +1,14 @@
|
|||
diff -up wrk/CONFIG/src/backend/archinfo_x86.c.wrk wrk/CONFIG/src/backend/archinfo_x86.c
|
||||
--- wrk/CONFIG/src/backend/archinfo_x86.c.wrk 2014-11-18 15:12:59.419444222 +0100
|
||||
+++ wrk/CONFIG/src/backend/archinfo_x86.c 2014-11-18 15:16:53.602254317 +0100
|
||||
@@ -309,9 +309,9 @@ enum MACHTYPE Chip2Mach(enum CHIP chip,
|
||||
case 0x1A:
|
||||
case 0x1E:
|
||||
case 0x1F:
|
||||
+ case 0x25:
|
||||
iret = IntCorei1;
|
||||
break;
|
||||
- case 0x25:
|
||||
case 0x2A:
|
||||
iret = IntCorei2;
|
||||
break;
|
|
@ -0,0 +1,50 @@
|
|||
--- CONFIG/include/atlconf.h 2011-05-14 13:33:24.000000000 -0400
|
||||
+++ CONFIG/include/atlconf.h.new 2011-08-30 14:25:41.427136391 -0400
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
enum ARCHFAM {AFOther=0, AFPPC, AFSPARC, AFALPHA, AFX86, AFIA64, AFMIPS};
|
||||
|
||||
-#define NMACH 37
|
||||
+#define NMACH 38
|
||||
static char *machnam[NMACH] =
|
||||
{"UNKNOWN", "POWER3", "POWER4", "POWER5", "PPCG4", "PPCG5",
|
||||
"POWER6", "POWER7",
|
||||
@@ -25,7 +25,7 @@
|
||||
"Efficeon", "K7", "HAMMER", "AMD64K10h", "UNKNOWNx86",
|
||||
"IA64Itan", "IA64Itan2",
|
||||
"USI", "USII", "USIII", "USIV", "UST2", "UnknownUS",
|
||||
- "MIPSR1xK", "MIPSICE9"};
|
||||
+ "MIPSR1xK", "MIPSICE9", "AARCH64"};
|
||||
enum MACHTYPE {MACHOther, IbmPwr3, IbmPwr4, IbmPwr5, PPCG4, PPCG5,
|
||||
IbmPwr6, IbmPwr7,
|
||||
IntP5, IntP5MMX, IntPPRO, IntPII, IntPIII, IntPM, IntCoreS,
|
||||
@@ -34,7 +34,8 @@
|
||||
IA64Itan, IA64Itan2,
|
||||
SunUSI, SunUSII, SunUSIII, SunUSIV, SunUST2, SunUSX,
|
||||
MIPSR1xK, /* includes R10K, R12K, R14K, R16K */
|
||||
- MIPSICE9 /* SiCortex ICE9 -- like MIPS5K */
|
||||
+ MIPSICE9, /* SiCortex ICE9 -- like MIPS5K */
|
||||
+ AARCH64
|
||||
};
|
||||
#define MachIsX86(mach_) \
|
||||
( (mach_) >= IntP5 && (mach_) <= x86X )
|
||||
@@ -51,6 +52,8 @@
|
||||
#endif
|
||||
#define MachIsPPC(mach_) \
|
||||
( (mach_) >= PPCG4 && (mach_) <= PPCG5 )
|
||||
+#define MachIsAARCH64(mach_) \
|
||||
+ ( (mach_) == AARCH64 )
|
||||
|
||||
static char *f2c_namestr[5] = {"UNKNOWN","Add_", "Add__", "NoChange", "UpCase"};
|
||||
static char *f2c_intstr[5] =
|
||||
--- CONFIG/src/probe_comp.c 2011-05-14 13:33:24.000000000 -0400
|
||||
+++ CONFIG/src/probe_comp.c.new 2011-08-30 14:28:31.103015151 -0400
|
||||
@@ -507,6 +507,8 @@
|
||||
|
||||
if (MachIsIA64(arch))
|
||||
return(sp);
|
||||
+ if (MachIsAARCH64(arch))
|
||||
+ return(sp);
|
||||
if (MachIsMIPS(arch))
|
||||
return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
|
||||
if (!CompIsGcc(comp))
|
56
atlas.spec
56
atlas.spec
|
@ -5,7 +5,7 @@ Version: 3.8.4
|
|||
%if "%{?enable_native_atlas}" != "0"
|
||||
%define dist .native
|
||||
%endif
|
||||
Release: 9%{?dist}
|
||||
Release: 14%{?dist}
|
||||
Summary: Automatically Tuned Linear Algebra Software
|
||||
|
||||
Group: System Environment/Libraries
|
||||
|
@ -27,6 +27,8 @@ 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
|
||||
Patch3: atlas-melf.patch
|
||||
Patch4: atlas-aarch64.patch
|
||||
Patch5: atlas-3.8.4-corei1.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: gcc-gfortran lapack-static
|
||||
|
@ -56,7 +58,7 @@ Requires(posttrans): chkconfig
|
|||
Requires(preun): chkconfig
|
||||
|
||||
%description devel
|
||||
This package contains the libraries and headers for development
|
||||
This package contains headers for development
|
||||
with ATLAS (Automatically Tuned Linear Algebra Software).
|
||||
|
||||
%define types base
|
||||
|
@ -86,9 +88,9 @@ Requires(posttrans): chkconfig
|
|||
Requires(preun): chkconfig
|
||||
|
||||
%description sse3-devel
|
||||
This package contains shared and static versions of the ATLAS
|
||||
(Automatically Tuned Linear Algebra Software) libraries compiled with
|
||||
optimizations for the SSE3 extensions to the x86_64 architecture.
|
||||
This package contains header files for ATLAS (Automatically Tuned
|
||||
Linear Algebra Software) libraries compiled with optimizations
|
||||
for the SSE3 extensions to the x86_64 architecture.
|
||||
|
||||
%endif
|
||||
|
||||
|
@ -114,7 +116,7 @@ Requires(posttrans): chkconfig
|
|||
Requires(preun): chkconfig
|
||||
|
||||
%description 3dnow-devel
|
||||
This package contains headers and shared versions of the ATLAS
|
||||
This package contains headers for ATLAS
|
||||
(Automatically Tuned Linear Algebra Software) libraries compiled with
|
||||
optimizations for the 3DNow extensions to the ix86 architecture.
|
||||
|
||||
|
@ -137,7 +139,7 @@ Requires(posttrans): chkconfig
|
|||
Requires(preun): chkconfig
|
||||
|
||||
%description sse-devel
|
||||
This package contains headers and shared versions of the ATLAS
|
||||
This package contains headers for ATLAS
|
||||
(Automatically Tuned Linear Algebra Software) libraries compiled with
|
||||
optimizations for the SSE(1) extensions to the ix86 architecture.
|
||||
|
||||
|
@ -161,7 +163,7 @@ Requires(preun): chkconfig
|
|||
|
||||
%description sse2-devel
|
||||
This package contains ATLAS (Automatically Tuned Linear Algebra Software)
|
||||
shared libraries compiled with optimizations for the SSE2 extensions to the
|
||||
header files compiled with optimizations for the SSE2 extensions to the
|
||||
ix86 architecture.
|
||||
|
||||
%package sse3
|
||||
|
@ -183,7 +185,7 @@ Requires(preun): chkconfig
|
|||
|
||||
%description sse3-devel
|
||||
This package contains ATLAS (Automatically Tuned Linear Algebra Software)
|
||||
shared libraries compiled with optimizations for the SSE3 extensions to the ix86 architecture.
|
||||
header files compiled with optimizations for the SSE3 extensions to the ix86 architecture.
|
||||
|
||||
%endif
|
||||
|
||||
|
@ -236,7 +238,7 @@ optimizations for the z10 architecture.
|
|||
%endif
|
||||
|
||||
%global mode %{__isa_bits}
|
||||
%ifarch %{arm}
|
||||
%ifarch %{arm} aarch64
|
||||
%define arch_option -A 38
|
||||
%define threads_option -t 2
|
||||
%global mode ' '
|
||||
|
@ -252,6 +254,10 @@ optimizations for the z10 architecture.
|
|||
%patch2 -p0 -b .arm
|
||||
%endif
|
||||
%patch3 -p1 -b .melf
|
||||
%ifarch %{aarch64}
|
||||
%patch4 -p0 -b .aarch64
|
||||
%endif
|
||||
%patch5 -p1 -b .corei1
|
||||
cp %{SOURCE1} CONFIG/ARCHS/
|
||||
cp %{SOURCE2} CONFIG/ARCHS/
|
||||
cp %{SOURCE3} doc
|
||||
|
@ -273,6 +279,7 @@ for type in %{types}; do
|
|||
mkdir -p %{_arch}_${type}
|
||||
pushd %{_arch}_${type}
|
||||
../configure -b %{mode} %{?threads_option} %{?arch_option} -D c -DWALL -Fa alg '-g -Wa,--noexecstack -fPIC'\
|
||||
-Si cputhrchk 0 \
|
||||
--prefix=%{buildroot}%{_prefix} \
|
||||
--incdir=%{buildroot}%{_includedir} \
|
||||
--libdir=%{buildroot}%{_libdir}/${libname} \
|
||||
|
@ -394,6 +401,17 @@ for type in %{types}; do
|
|||
> %{buildroot}/etc/ld.so.conf.d/atlas-%{_arch}-${type}.conf
|
||||
fi
|
||||
done
|
||||
|
||||
#create pkgconfig file
|
||||
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig/
|
||||
cat > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/atlas.pc << DATA
|
||||
Name: %{name}
|
||||
Version: %{version}
|
||||
Description: %{summary}
|
||||
Cflags: -I%{_includedir}/atlas/
|
||||
Libs: -L%{_libdir}/atlas/ -lf77blas -lclapack -lcblas -latlas -llapack
|
||||
DATA
|
||||
|
||||
mkdir -p %{buildroot}%{_includedir}/atlas
|
||||
|
||||
|
||||
|
@ -547,6 +565,7 @@ fi
|
|||
%{_includedir}/atlas-%{_arch}-base/
|
||||
%{_includedir}/*.h
|
||||
%ghost %{_includedir}/atlas
|
||||
%{_libdir}/pkgconfig/atlas.pc
|
||||
|
||||
%if "%{?enable_native_atlas}" == "0"
|
||||
|
||||
|
@ -667,6 +686,23 @@ fi
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Sat Dec 20 2014 Susi Lehtola <jussilehtola@fedoraproject.org> - 3.8.4-14
|
||||
- Rebuild with thread safe lapack.
|
||||
|
||||
* Tue Nov 18 2014 Frantisek Kluknavsky <fkluknav@redhat.com> - 3.8.4-13
|
||||
- fixed intel cpu detection
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1164967
|
||||
|
||||
* Fri Oct 24 2014 Frantisek Kluknavsky <fkluknav@redhat.com> - 3.8.4-12
|
||||
- added pkgconfig file
|
||||
- disabled cpu throttling detection to be able to rebuild
|
||||
|
||||
* Thu Nov 21 2013 Frantisek Kluknavsky <fkluknav@redhat.com> - 3.8.4-11
|
||||
- modified description of *-devel subpackages
|
||||
|
||||
* Wed Nov 06 2013 Frantisek Kluknavsky <fkluknav@redhat.com> - 3.8.4-10
|
||||
- support for aarch64
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.8.4-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
|
|
Loading…
Reference in New Issue