Switch i486 to i686 and equal armv7hl == armv7tnhl

Signed-off-by: Carsten Munk <carsten.munk@jollamobile.com>
sailfishos · Dec 13, 2014 · ea2b82d · ea2b82d
1 parent 00de878
commit ea2b82d
Show file tree

Hide file tree

Showing 13 changed files with 52 additions and 48 deletions.
diff --git a/cross-aarch64-gcc.spec b/cross-aarch64-gcc.spec
@@ -63,7 +63,7 @@ BuildRequires: %{cross_deps}
 %define crossextraconfig --with-fpu=vfpv3-d16 --with-arch=armv7-a
 %endif
 %if "%{crossarch}" == "armv7hl"
-%define crossextraconfig --with-float=hard --with-fpu=vfpv3-d16 --with-arch=armv7-a
+%define crossextraconfig --with-float=hard --with-fpu=neon --with-arch=armv7-a --with-mode=thumb
 %endif
 %if "%{crossarch}" == "armv7nhl"
 %define crossextraconfig --with-float=hard --with-fpu=neon --with-arch=armv7-a
@@ -78,7 +78,7 @@ BuildRequires: %{cross_deps}
 %define crossextraconfig --disable-fixed-point --disable-ssp --disable-libstdcxx-pch --with-arch=mips32
 %endif
 %if "%{crossarch}" == "i486"
-%define crossextraconfig --disable-libstdcxx-pch --with-arch=i486 --with-gnu-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-gnu-ld=/opt/cross/bin/i486-meego-linux-gnu-ld --with-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-ld=/opt/cross/bin/i486-meego-linux-gnu-ld
+%define crossextraconfig --disable-libstdcxx-pch --with-arch=i686 --with-fpmatch=sse --with-gnu-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-gnu-ld=/opt/cross/bin/i486-meego-linux-gnu-ld --with-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-ld=/opt/cross/bin/i486-meego-linux-gnu-ld
 %endif
 %if "%{crossarch}" == "x86_64"
 %define crossextraconfig --disable-libstdcxx-pch
@@ -687,7 +687,7 @@ esac
 %define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-fpu=vfpv3-d16 --with-arch=armv7-a
 %endif
 %ifarch armv7hl
-%define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-float=hard --with-fpu=vfpv3-d16 --with-arch=armv7-a
+%define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-float=hard --with-fpu=neon --with-mode=thumb --with-arch=armv7-a
 %endif
 # for armv7nhl reset the gcc specs
 %ifarch armv7nhl
@@ -756,7 +756,7 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`"
 	--with-arch=core2 --with-tune=atom --with-fpmath=sse \
 %endif
 %ifarch i486
-	--with-arch=i486 \
+	--with-arch=i686 --with-fpmath=sse  \
 %endif
 %ifarch x86_64
 	--disable-libstdcxx-pch \

diff --git a/cross-armv5tel-gcc.spec b/cross-armv5tel-gcc.spec
@@ -63,7 +63,7 @@ BuildRequires: %{cross_deps}
 %define crossextraconfig --with-fpu=vfpv3-d16 --with-arch=armv7-a
 %endif
 %if "%{crossarch}" == "armv7hl"
-%define crossextraconfig --with-float=hard --with-fpu=vfpv3-d16 --with-arch=armv7-a
+%define crossextraconfig --with-float=hard --with-fpu=neon --with-arch=armv7-a --with-mode=thumb
 %endif
 %if "%{crossarch}" == "armv7nhl"
 %define crossextraconfig --with-float=hard --with-fpu=neon --with-arch=armv7-a
@@ -78,7 +78,7 @@ BuildRequires: %{cross_deps}
 %define crossextraconfig --disable-fixed-point --disable-ssp --disable-libstdcxx-pch --with-arch=mips32
 %endif
 %if "%{crossarch}" == "i486"
-%define crossextraconfig --disable-libstdcxx-pch --with-arch=i486 --with-gnu-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-gnu-ld=/opt/cross/bin/i486-meego-linux-gnu-ld --with-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-ld=/opt/cross/bin/i486-meego-linux-gnu-ld
+%define crossextraconfig --disable-libstdcxx-pch --with-arch=i686 --with-fpmatch=sse --with-gnu-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-gnu-ld=/opt/cross/bin/i486-meego-linux-gnu-ld --with-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-ld=/opt/cross/bin/i486-meego-linux-gnu-ld
 %endif
 %if "%{crossarch}" == "x86_64"
 %define crossextraconfig --disable-libstdcxx-pch
@@ -687,7 +687,7 @@ esac
 %define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-fpu=vfpv3-d16 --with-arch=armv7-a
 %endif
 %ifarch armv7hl
-%define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-float=hard --with-fpu=vfpv3-d16 --with-arch=armv7-a
+%define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-float=hard --with-fpu=neon --with-mode=thumb --with-arch=armv7-a
 %endif
 # for armv7nhl reset the gcc specs
 %ifarch armv7nhl
@@ -756,7 +756,7 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`"
 	--with-arch=core2 --with-tune=atom --with-fpmath=sse \
 %endif
 %ifarch i486
-	--with-arch=i486 \
+	--with-arch=i686 --with-fpmath=sse  \
 %endif
 %ifarch x86_64
 	--disable-libstdcxx-pch \

diff --git a/cross-armv6l-gcc.spec b/cross-armv6l-gcc.spec
@@ -63,7 +63,7 @@ BuildRequires: %{cross_deps}
 %define crossextraconfig --with-fpu=vfpv3-d16 --with-arch=armv7-a
 %endif
 %if "%{crossarch}" == "armv7hl"
-%define crossextraconfig --with-float=hard --with-fpu=vfpv3-d16 --with-arch=armv7-a
+%define crossextraconfig --with-float=hard --with-fpu=neon --with-arch=armv7-a --with-mode=thumb
 %endif
 %if "%{crossarch}" == "armv7nhl"
 %define crossextraconfig --with-float=hard --with-fpu=neon --with-arch=armv7-a
@@ -78,7 +78,7 @@ BuildRequires: %{cross_deps}
 %define crossextraconfig --disable-fixed-point --disable-ssp --disable-libstdcxx-pch --with-arch=mips32
 %endif
 %if "%{crossarch}" == "i486"
-%define crossextraconfig --disable-libstdcxx-pch --with-arch=i486 --with-gnu-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-gnu-ld=/opt/cross/bin/i486-meego-linux-gnu-ld --with-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-ld=/opt/cross/bin/i486-meego-linux-gnu-ld
+%define crossextraconfig --disable-libstdcxx-pch --with-arch=i686 --with-fpmatch=sse --with-gnu-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-gnu-ld=/opt/cross/bin/i486-meego-linux-gnu-ld --with-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-ld=/opt/cross/bin/i486-meego-linux-gnu-ld
 %endif
 %if "%{crossarch}" == "x86_64"
 %define crossextraconfig --disable-libstdcxx-pch
@@ -687,7 +687,7 @@ esac
 %define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-fpu=vfpv3-d16 --with-arch=armv7-a
 %endif
 %ifarch armv7hl
-%define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-float=hard --with-fpu=vfpv3-d16 --with-arch=armv7-a
+%define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-float=hard --with-fpu=neon --with-mode=thumb --with-arch=armv7-a
 %endif
 # for armv7nhl reset the gcc specs
 %ifarch armv7nhl
@@ -756,7 +756,7 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`"
 	--with-arch=core2 --with-tune=atom --with-fpmath=sse \
 %endif
 %ifarch i486
-	--with-arch=i486 \
+	--with-arch=i686 --with-fpmath=sse  \
 %endif
 %ifarch x86_64
 	--disable-libstdcxx-pch \

diff --git a/cross-armv7hl-gcc.spec b/cross-armv7hl-gcc.spec
@@ -63,7 +63,7 @@ BuildRequires: %{cross_deps}
 %define crossextraconfig --with-fpu=vfpv3-d16 --with-arch=armv7-a
 %endif
 %if "%{crossarch}" == "armv7hl"
-%define crossextraconfig --with-float=hard --with-fpu=vfpv3-d16 --with-arch=armv7-a
+%define crossextraconfig --with-float=hard --with-fpu=neon --with-arch=armv7-a --with-mode=thumb
 %endif
 %if "%{crossarch}" == "armv7nhl"
 %define crossextraconfig --with-float=hard --with-fpu=neon --with-arch=armv7-a
@@ -78,7 +78,7 @@ BuildRequires: %{cross_deps}
 %define crossextraconfig --disable-fixed-point --disable-ssp --disable-libstdcxx-pch --with-arch=mips32
 %endif
 %if "%{crossarch}" == "i486"
-%define crossextraconfig --disable-libstdcxx-pch --with-arch=i486 --with-gnu-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-gnu-ld=/opt/cross/bin/i486-meego-linux-gnu-ld --with-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-ld=/opt/cross/bin/i486-meego-linux-gnu-ld
+%define crossextraconfig --disable-libstdcxx-pch --with-arch=i686 --with-fpmatch=sse --with-gnu-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-gnu-ld=/opt/cross/bin/i486-meego-linux-gnu-ld --with-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-ld=/opt/cross/bin/i486-meego-linux-gnu-ld
 %endif
 %if "%{crossarch}" == "x86_64"
 %define crossextraconfig --disable-libstdcxx-pch
@@ -687,7 +687,7 @@ esac
 %define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-fpu=vfpv3-d16 --with-arch=armv7-a
 %endif
 %ifarch armv7hl
-%define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-float=hard --with-fpu=vfpv3-d16 --with-arch=armv7-a
+%define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-float=hard --with-fpu=neon --with-mode=thumb --with-arch=armv7-a
 %endif
 # for armv7nhl reset the gcc specs
 %ifarch armv7nhl
@@ -756,7 +756,7 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`"
 	--with-arch=core2 --with-tune=atom --with-fpmath=sse \
 %endif
 %ifarch i486
-	--with-arch=i486 \
+	--with-arch=i686 --with-fpmath=sse  \
 %endif
 %ifarch x86_64
 	--disable-libstdcxx-pch \

diff --git a/cross-armv7l-gcc.spec b/cross-armv7l-gcc.spec
@@ -63,7 +63,7 @@ BuildRequires: %{cross_deps}
 %define crossextraconfig --with-fpu=vfpv3-d16 --with-arch=armv7-a
 %endif
 %if "%{crossarch}" == "armv7hl"
-%define crossextraconfig --with-float=hard --with-fpu=vfpv3-d16 --with-arch=armv7-a
+%define crossextraconfig --with-float=hard --with-fpu=neon --with-arch=armv7-a --with-mode=thumb
 %endif
 %if "%{crossarch}" == "armv7nhl"
 %define crossextraconfig --with-float=hard --with-fpu=neon --with-arch=armv7-a
@@ -78,7 +78,7 @@ BuildRequires: %{cross_deps}
 %define crossextraconfig --disable-fixed-point --disable-ssp --disable-libstdcxx-pch --with-arch=mips32
 %endif
 %if "%{crossarch}" == "i486"
-%define crossextraconfig --disable-libstdcxx-pch --with-arch=i486 --with-gnu-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-gnu-ld=/opt/cross/bin/i486-meego-linux-gnu-ld --with-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-ld=/opt/cross/bin/i486-meego-linux-gnu-ld
+%define crossextraconfig --disable-libstdcxx-pch --with-arch=i686 --with-fpmatch=sse --with-gnu-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-gnu-ld=/opt/cross/bin/i486-meego-linux-gnu-ld --with-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-ld=/opt/cross/bin/i486-meego-linux-gnu-ld
 %endif
 %if "%{crossarch}" == "x86_64"
 %define crossextraconfig --disable-libstdcxx-pch
@@ -687,7 +687,7 @@ esac
 %define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-fpu=vfpv3-d16 --with-arch=armv7-a
 %endif
 %ifarch armv7hl
-%define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-float=hard --with-fpu=vfpv3-d16 --with-arch=armv7-a
+%define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-float=hard --with-fpu=neon --with-mode=thumb --with-arch=armv7-a
 %endif
 # for armv7nhl reset the gcc specs
 %ifarch armv7nhl
@@ -756,7 +756,7 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`"
 	--with-arch=core2 --with-tune=atom --with-fpmath=sse \
 %endif
 %ifarch i486
-	--with-arch=i486 \
+	--with-arch=i686 --with-fpmath=sse  \
 %endif
 %ifarch x86_64
 	--disable-libstdcxx-pch \

diff --git a/cross-armv7nhl-gcc.spec b/cross-armv7nhl-gcc.spec
@@ -63,7 +63,7 @@ BuildRequires: %{cross_deps}
 %define crossextraconfig --with-fpu=vfpv3-d16 --with-arch=armv7-a
 %endif
 %if "%{crossarch}" == "armv7hl"
-%define crossextraconfig --with-float=hard --with-fpu=vfpv3-d16 --with-arch=armv7-a
+%define crossextraconfig --with-float=hard --with-fpu=neon --with-arch=armv7-a --with-mode=thumb
 %endif
 %if "%{crossarch}" == "armv7nhl"
 %define crossextraconfig --with-float=hard --with-fpu=neon --with-arch=armv7-a
@@ -78,7 +78,7 @@ BuildRequires: %{cross_deps}
 %define crossextraconfig --disable-fixed-point --disable-ssp --disable-libstdcxx-pch --with-arch=mips32
 %endif
 %if "%{crossarch}" == "i486"
-%define crossextraconfig --disable-libstdcxx-pch --with-arch=i486 --with-gnu-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-gnu-ld=/opt/cross/bin/i486-meego-linux-gnu-ld --with-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-ld=/opt/cross/bin/i486-meego-linux-gnu-ld
+%define crossextraconfig --disable-libstdcxx-pch --with-arch=i686 --with-fpmatch=sse --with-gnu-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-gnu-ld=/opt/cross/bin/i486-meego-linux-gnu-ld --with-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-ld=/opt/cross/bin/i486-meego-linux-gnu-ld
 %endif
 %if "%{crossarch}" == "x86_64"
 %define crossextraconfig --disable-libstdcxx-pch
@@ -687,7 +687,7 @@ esac
 %define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-fpu=vfpv3-d16 --with-arch=armv7-a
 %endif
 %ifarch armv7hl
-%define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-float=hard --with-fpu=vfpv3-d16 --with-arch=armv7-a
+%define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-float=hard --with-fpu=neon --with-mode=thumb --with-arch=armv7-a
 %endif
 # for armv7nhl reset the gcc specs
 %ifarch armv7nhl
@@ -756,7 +756,7 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`"
 	--with-arch=core2 --with-tune=atom --with-fpmath=sse \
 %endif
 %ifarch i486
-	--with-arch=i486 \
+	--with-arch=i686 --with-fpmath=sse  \
 %endif
 %ifarch x86_64
 	--disable-libstdcxx-pch \

diff --git a/cross-armv7thl-gcc.spec b/cross-armv7thl-gcc.spec
@@ -63,7 +63,7 @@ BuildRequires: %{cross_deps}
 %define crossextraconfig --with-fpu=vfpv3-d16 --with-arch=armv7-a
 %endif
 %if "%{crossarch}" == "armv7hl"
-%define crossextraconfig --with-float=hard --with-fpu=vfpv3-d16 --with-arch=armv7-a
+%define crossextraconfig --with-float=hard --with-fpu=neon --with-arch=armv7-a --with-mode=thumb
 %endif
 %if "%{crossarch}" == "armv7nhl"
 %define crossextraconfig --with-float=hard --with-fpu=neon --with-arch=armv7-a
@@ -78,7 +78,7 @@ BuildRequires: %{cross_deps}
 %define crossextraconfig --disable-fixed-point --disable-ssp --disable-libstdcxx-pch --with-arch=mips32
 %endif
 %if "%{crossarch}" == "i486"
-%define crossextraconfig --disable-libstdcxx-pch --with-arch=i486 --with-gnu-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-gnu-ld=/opt/cross/bin/i486-meego-linux-gnu-ld --with-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-ld=/opt/cross/bin/i486-meego-linux-gnu-ld
+%define crossextraconfig --disable-libstdcxx-pch --with-arch=i686 --with-fpmatch=sse --with-gnu-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-gnu-ld=/opt/cross/bin/i486-meego-linux-gnu-ld --with-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-ld=/opt/cross/bin/i486-meego-linux-gnu-ld
 %endif
 %if "%{crossarch}" == "x86_64"
 %define crossextraconfig --disable-libstdcxx-pch
@@ -687,7 +687,7 @@ esac
 %define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-fpu=vfpv3-d16 --with-arch=armv7-a
 %endif
 %ifarch armv7hl
-%define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-float=hard --with-fpu=vfpv3-d16 --with-arch=armv7-a
+%define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-float=hard --with-fpu=neon --with-mode=thumb --with-arch=armv7-a
 %endif
 # for armv7nhl reset the gcc specs
 %ifarch armv7nhl
@@ -756,7 +756,7 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`"
 	--with-arch=core2 --with-tune=atom --with-fpmath=sse \
 %endif
 %ifarch i486
-	--with-arch=i486 \
+	--with-arch=i686 --with-fpmath=sse  \
 %endif
 %ifarch x86_64
 	--disable-libstdcxx-pch \

diff --git a/cross-armv7tnhl-gcc.spec b/cross-armv7tnhl-gcc.spec
@@ -63,7 +63,7 @@ BuildRequires: %{cross_deps}
 %define crossextraconfig --with-fpu=vfpv3-d16 --with-arch=armv7-a
 %endif
 %if "%{crossarch}" == "armv7hl"
-%define crossextraconfig --with-float=hard --with-fpu=vfpv3-d16 --with-arch=armv7-a
+%define crossextraconfig --with-float=hard --with-fpu=neon --with-arch=armv7-a --with-mode=thumb
 %endif
 %if "%{crossarch}" == "armv7nhl"
 %define crossextraconfig --with-float=hard --with-fpu=neon --with-arch=armv7-a
@@ -78,7 +78,7 @@ BuildRequires: %{cross_deps}
 %define crossextraconfig --disable-fixed-point --disable-ssp --disable-libstdcxx-pch --with-arch=mips32
 %endif
 %if "%{crossarch}" == "i486"
-%define crossextraconfig --disable-libstdcxx-pch --with-arch=i486 --with-gnu-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-gnu-ld=/opt/cross/bin/i486-meego-linux-gnu-ld --with-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-ld=/opt/cross/bin/i486-meego-linux-gnu-ld
+%define crossextraconfig --disable-libstdcxx-pch --with-arch=i686 --with-fpmatch=sse --with-gnu-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-gnu-ld=/opt/cross/bin/i486-meego-linux-gnu-ld --with-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-ld=/opt/cross/bin/i486-meego-linux-gnu-ld
 %endif
 %if "%{crossarch}" == "x86_64"
 %define crossextraconfig --disable-libstdcxx-pch
@@ -687,7 +687,7 @@ esac
 %define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-fpu=vfpv3-d16 --with-arch=armv7-a
 %endif
 %ifarch armv7hl
-%define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-float=hard --with-fpu=vfpv3-d16 --with-arch=armv7-a
+%define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-float=hard --with-fpu=neon --with-mode=thumb --with-arch=armv7-a
 %endif
 # for armv7nhl reset the gcc specs
 %ifarch armv7nhl
@@ -756,7 +756,7 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`"
 	--with-arch=core2 --with-tune=atom --with-fpmath=sse \
 %endif
 %ifarch i486
-	--with-arch=i486 \
+	--with-arch=i686 --with-fpmath=sse  \
 %endif
 %ifarch x86_64
 	--disable-libstdcxx-pch \

diff --git a/cross-i486-gcc.spec b/cross-i486-gcc.spec
@@ -63,7 +63,7 @@ BuildRequires: %{cross_deps}
 %define crossextraconfig --with-fpu=vfpv3-d16 --with-arch=armv7-a
 %endif
 %if "%{crossarch}" == "armv7hl"
-%define crossextraconfig --with-float=hard --with-fpu=vfpv3-d16 --with-arch=armv7-a
+%define crossextraconfig --with-float=hard --with-fpu=neon --with-arch=armv7-a --with-mode=thumb
 %endif
 %if "%{crossarch}" == "armv7nhl"
 %define crossextraconfig --with-float=hard --with-fpu=neon --with-arch=armv7-a
@@ -78,7 +78,7 @@ BuildRequires: %{cross_deps}
 %define crossextraconfig --disable-fixed-point --disable-ssp --disable-libstdcxx-pch --with-arch=mips32
 %endif
 %if "%{crossarch}" == "i486"
-%define crossextraconfig --disable-libstdcxx-pch --with-arch=i486 --with-gnu-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-gnu-ld=/opt/cross/bin/i486-meego-linux-gnu-ld --with-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-ld=/opt/cross/bin/i486-meego-linux-gnu-ld
+%define crossextraconfig --disable-libstdcxx-pch --with-arch=i686 --with-fpmatch=sse --with-gnu-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-gnu-ld=/opt/cross/bin/i486-meego-linux-gnu-ld --with-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-ld=/opt/cross/bin/i486-meego-linux-gnu-ld
 %endif
 %if "%{crossarch}" == "x86_64"
 %define crossextraconfig --disable-libstdcxx-pch
@@ -687,7 +687,7 @@ esac
 %define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-fpu=vfpv3-d16 --with-arch=armv7-a
 %endif
 %ifarch armv7hl
-%define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-float=hard --with-fpu=vfpv3-d16 --with-arch=armv7-a
+%define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-float=hard --with-fpu=neon --with-mode=thumb --with-arch=armv7-a
 %endif
 # for armv7nhl reset the gcc specs
 %ifarch armv7nhl
@@ -756,7 +756,7 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`"
 	--with-arch=core2 --with-tune=atom --with-fpmath=sse \
 %endif
 %ifarch i486
-	--with-arch=i486 \
+	--with-arch=i686 --with-fpmath=sse  \
 %endif
 %ifarch x86_64
 	--disable-libstdcxx-pch \

diff --git a/cross-mipsel-gcc.spec b/cross-mipsel-gcc.spec
@@ -63,7 +63,7 @@ BuildRequires: %{cross_deps}
 %define crossextraconfig --with-fpu=vfpv3-d16 --with-arch=armv7-a
 %endif
 %if "%{crossarch}" == "armv7hl"
-%define crossextraconfig --with-float=hard --with-fpu=vfpv3-d16 --with-arch=armv7-a
+%define crossextraconfig --with-float=hard --with-fpu=neon --with-arch=armv7-a --with-mode=thumb
 %endif
 %if "%{crossarch}" == "armv7nhl"
 %define crossextraconfig --with-float=hard --with-fpu=neon --with-arch=armv7-a
@@ -78,7 +78,7 @@ BuildRequires: %{cross_deps}
 %define crossextraconfig --disable-fixed-point --disable-ssp --disable-libstdcxx-pch --with-arch=mips32
 %endif
 %if "%{crossarch}" == "i486"
-%define crossextraconfig --disable-libstdcxx-pch --with-arch=i486 --with-gnu-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-gnu-ld=/opt/cross/bin/i486-meego-linux-gnu-ld --with-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-ld=/opt/cross/bin/i486-meego-linux-gnu-ld
+%define crossextraconfig --disable-libstdcxx-pch --with-arch=i686 --with-fpmatch=sse --with-gnu-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-gnu-ld=/opt/cross/bin/i486-meego-linux-gnu-ld --with-as=/opt/cross/bin/i486-meego-linux-gnu-as --with-ld=/opt/cross/bin/i486-meego-linux-gnu-ld
 %endif
 %if "%{crossarch}" == "x86_64"
 %define crossextraconfig --disable-libstdcxx-pch
@@ -687,7 +687,7 @@ esac
 %define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-fpu=vfpv3-d16 --with-arch=armv7-a
 %endif
 %ifarch armv7hl
-%define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-float=hard --with-fpu=vfpv3-d16 --with-arch=armv7-a
+%define ARM_EXTRA_CONFIGURE --disable-libstdcxx-pch --with-float=hard --with-fpu=neon --with-mode=thumb --with-arch=armv7-a
 %endif
 # for armv7nhl reset the gcc specs
 %ifarch armv7nhl
@@ -756,7 +756,7 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`"
 	--with-arch=core2 --with-tune=atom --with-fpmath=sse \
 %endif
 %ifarch i486
-	--with-arch=i486 \
+	--with-arch=i686 --with-fpmath=sse  \
 %endif
 %ifarch x86_64
 	--disable-libstdcxx-pch \