diff --git a/atlas-fedora-arm.patch b/atlas-fedora-arm.patch new file mode 100644 index 0000000..22a9889 --- /dev/null +++ b/atlas-fedora-arm.patch @@ -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", "ARM"}; + 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 */ ++ ARM + }; + #define MachIsX86(mach_) \ + ( (mach_) >= IntP5 && (mach_) <= x86X ) +@@ -51,6 +52,8 @@ + #endif + #define MachIsPPC(mach_) \ + ( (mach_) >= PPCG4 && (mach_) <= PPCG5 ) ++#define MachIsARM(mach_) \ ++ ( (mach_) == ARM ) + + 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 (MachIsARM(arch)) ++ return(sp); + if (MachIsMIPS(arch)) + return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32"); + if (!CompIsGcc(comp)) diff --git a/atlas.spec b/atlas.spec index 1d41172..9edce16 100644 --- a/atlas.spec +++ b/atlas.spec @@ -5,7 +5,7 @@ Version: 3.8.4 %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 @@ -23,6 +23,7 @@ Source8: IBMz19632.tgz Source9: IBMz19664.tgz Patch0: atlas-fedora_shared.patch Patch1: atlas-s390port.patch +Patch2: atlas-fedora-arm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran lapack-static @@ -231,10 +232,18 @@ optimizations for the z10 architecture. %endif %endif +%global mode %{__isa_bits} +%ifarch %{arm} +%define arch_option -A 33 +%define threads_option -t 2 +%global mode ' ' +%endif + %prep %setup -q -n ATLAS %patch0 -p0 -b .shared %patch1 -p1 -b .s390 +%patch2 -p0 -b .arm cp %{SOURCE1} CONFIG/ARCHS/ cp %{SOURCE2} CONFIG/ARCHS/ cp %{SOURCE3} doc @@ -255,12 +264,11 @@ for type in %{types}; do fi mkdir -p %{_arch}_${type} pushd %{_arch}_${type} - ../configure -b %{__isa_bits} -D c -DWALL -Fa alg '-g -Wa,--noexecstack -fPIC'\ + ../configure -b %{mode} %{?threads_option} %{?arch_option} -D c -DWALL -Fa alg '-g -Wa,--noexecstack -fPIC'\ --prefix=%{buildroot}%{_prefix} \ --incdir=%{buildroot}%{_includedir} \ --libdir=%{buildroot}%{_libdir}/${libname} \ - --with-netlib-lapack=%{_libdir}/liblapack_pic.a \ - -Si cputhrchk 0 + --with-netlib-lapack=%{_libdir}/liblapack_pic.a %if "%{?enable_native_atlas}" == "0" %ifarch x86_64 @@ -651,6 +659,10 @@ fi %endif %changelog +* Thu Sep 01 2011 Deji Akingunola - 3.8.4-3 +- Aply patch to enable arm build (Patch provided by Jitesh Shah ) +- Stop turning off throttle checking, upstream frown at it (seems O.K. for Koji) + * Mon Jun 20 2011 Dan HorĂ¡k - 3.8.4-2 - Use -march=z10 for z196 optimised build because the builder is a z10 (Christian Bornträger)