From 338b86e3762cd70dc135cf6537f438d079af3797 Mon Sep 17 00:00:00 2001 From: Frantisek Kluknavsky Date: Sep 18 2013 10:03:12 +0000 Subject: arm -m32 not yet working --- diff --git a/atlas-arm_m32_flag.patch b/atlas-arm_m32_flag.patch new file mode 100644 index 0000000..6bd2d68 --- /dev/null +++ b/atlas-arm_m32_flag.patch @@ -0,0 +1,26 @@ +diff -up wrk/CONFIG/src/probe_comp.c.wrk wrk/CONFIG/src/probe_comp.c +--- wrk/CONFIG/src/probe_comp.c.wrk 2013-09-17 12:53:26.863023304 +0200 ++++ wrk/CONFIG/src/probe_comp.c 2013-09-17 15:39:22.967912120 +0200 +@@ -1059,8 +1059,10 @@ void GetComps(enum OSTYPE OS, enum MACHT + * If ptrbits is set to manual override, add -m32/64 to gnu compilers + * but not on Itaniums or Apple's munged gcc 3 compiler! + */ +- if (ptrbits && arch != IA64Itan && arch != IA64Itan2) ++ printf("TU SOOOOOOOOOOOM vonku\n"); ++ if (ptrbits && arch != IA64Itan && arch != IA64Itan2 && arch != ARMv7) + { ++ printf("TU SOOOOOOOOOOOM\n"); + for (i=0; i < NCOMP; i++) + { + sp = GetPtrbitsFlag(OS, arch, ptrbits, usrcomps[i]); +diff -up wrk/CONFIG/src/SpewMakeInc.c.wrk wrk/CONFIG/src/SpewMakeInc.c +--- wrk/CONFIG/src/SpewMakeInc.c.wrk 2013-09-17 15:51:55.991929088 +0200 ++++ wrk/CONFIG/src/SpewMakeInc.c 2013-09-17 15:52:01.738952113 +0200 +@@ -386,6 +386,7 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu + * RETURNS: string forcing setting of ptrbits for gcc + */ + { ++ printf("XXXXXX\n"); + char *sp = ""; + int i, j, k; + diff --git a/atlas.spec b/atlas.spec index 7ac124f..9b15f88 100644 --- a/atlas.spec +++ b/atlas.spec @@ -35,6 +35,7 @@ Patch2: atlas-fedora-arm.patch #Patch3: atlas-melf.patch Patch4: atlas-throttling.patch Patch5: atlas-build-id.patch +Patch6: atlas-arm_m32_flag.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran @@ -261,11 +262,12 @@ ix86 architecture. %endif %endif -%global mode %{__isa_bits} %ifarch %{arm} %define arch_option -A 38 %define threads_option -t 2 -%global mode ' ' +%global mode %{nil} +%else +%global mode -b %{__isa_bits} %endif %prep @@ -283,6 +285,7 @@ ix86 architecture. #patch3 -p1 -b .melf %patch4 -p1 -b .thrott %patch5 -p1 -b .buildid +%patch6 -p1 -b .m32 cp %{SOURCE1} CONFIG/ARCHS/ #cp %{SOURCE2} CONFIG/ARCHS/ cp %{SOURCE3} doc @@ -305,7 +308,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'\ + ../configure %{mode} %{?threads_option} %{?arch_option} -D c -DWALL -Fa alg '-g -Wa,--noexecstack -fPIC'\ --prefix=%{buildroot}%{_prefix} \ --incdir=%{buildroot}%{_includedir} \ --libdir=%{buildroot}%{_libdir}/${libname} \