diff --git a/llvm.changes b/llvm.changes
index 7b9f9c0..5c206fd 100644
--- a/llvm.changes
+++ b/llvm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Dec 31 09:29:12 UTC 2012 - dmueller@suse.com
+
+- disable cross-compile mode in stage2 for armv5/v7
+
 -------------------------------------------------------------------
 Thu Dec 20 14:51:18 UTC 2012 - idonmez@suse.com
 
diff --git a/llvm.spec b/llvm.spec
index ec1eba6..4e98094 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -174,31 +174,29 @@ mkdir Release
 ln -s lib Release/lib64
 %endif
 
-%ifarch armv7l armv7hl
-# This fixes the armv7 build. (Allow to run stage2 without problem)
-export CFLAGS="-mfloat-abi=hard -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16"
-export CXXFLAGS="-mfloat-abi=hard -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16"
-%endif
-
 ../configure \
 	--enable-optimized \
 	--disable-assertions \
 	--with-optimize-option="-O0" \
-%ifarch armv5el armv5tel
+%ifarch %arm
         --disable-sjlj-exceptions \
-        --with-arch=armv5te --with-float=soft --with-mode=arm \
         --disable-werror --enable-checking=release \
+%ifarch armv5el armv5tel
+        --with-arch=armv5te --with-float=soft --with-mode=arm \
         --build=armv5tel-suse-linux-gnueabi --host=armv5tel-suse-linux-gnueabi --target=armv5tel-suse-linux-gnueabi \
 %endif
 %ifarch armv7l armv7hl
-        --disable-sjlj-exceptions \
-        --with-arch=armv7-a --with-tune=cortex-a9 --with-float=hard --with-fpu=vfpv3-d16 --with-fpmath=vfp3 \
-        --disable-werror --enable-checking=release \
+        --with-arch=armv7-a \
+        --with-tune=cortex-a9 \
+        --with-float=hard \
+        --with-fpu=vfpv3-d16 \
+        --with-abi=aapcs-vfp \
         --build=armv7hl-suse-linux-gnueabi --host=armv7hl-suse-linux-gnueabi --target=armv7hl-suse-linux-gnueabi \
 %if 0%{?suse_version} >= 1220
---with-mode=thumb \
+        --with-mode=thumb \
 %else
---with-mode=arm \
+        --with-mode=arm \
+%endif
 %endif
 %endif
 	--enable-targets=host
@@ -217,34 +215,43 @@ ln -s lib Release+Debug/lib64
 export CC=$TOPLEVEL/stage1/Release/bin/clang
 export CXX=$TOPLEVEL/stage1/Release/bin/clang++
 
+%ifarch armv7l armv7hl
+# This fixes the armv7 build. (Allow to run stage2 without problem)
+export CFLAGS="-mfloat-abi=hard -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16"
+export CXXFLAGS="-mfloat-abi=hard -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16"
+%endif
+
 ../configure \
     --prefix=%{_prefix} \
 	--enable-optimized \
 	--disable-assertions \
 	--enable-pic \
 	--disable-timestamps \
-    --enable-targets=%{_supported_archs} \
 %if 0%{?suse_version} >= 1220
 	--with-binutils-include=/usr/include \
 %endif
-%ifarch armv5el armv5tel
+%ifarch %arm
 	--with-optimize-option="-U_GLIBCXX_ATOMIC_BUILTINS" \
         --disable-sjlj-exceptions \
-        --with-arch=armv5te --with-float=soft --with-mode=arm \
         --disable-werror --enable-checking=release \
-        --build=armv5tel-suse-linux-gnueabi --host=armv5tel-suse-linux-gnueabi  --target=armv5tel-suse-linux-gnueabi \
+%ifarch armv5el armv5tel
+        --with-arch=armv5te --with-float=soft --with-mode=arm \
 %endif
 %ifarch armv7l armv7hl
-        --with-optimize-option="-U_GLIBCXX_ATOMIC_BUILTINS" \
-        --disable-sjlj-exceptions \
-        --with-arch=armv7-a --with-tune=cortex-a9 --with-float=hard --with-fpu=vfpv3-d16 --with-fpmath=vfp3 \
+        --with-arch=armv7-a \
+        --with-tune=cortex-a9 \
+        --with-float=hard \
+        --with-fpu=vfpv3-d16 \
+        --with-abi=aapcs-vfp \
 %if 0%{?suse_version} >= 1220
         --with-mode=thumb \
 %else
         --with-mode=arm \
 %endif
-        --disable-werror --enable-checking=release \
-        --build=armv7hl-suse-linux-gnueabi --host=armv7hl-suse-linux-gnueabi --target=armv7hl-suse-linux-gnueabi \
+%endif
+	--enable-targets=arm \
+%else
+        --enable-targets=%{_supported_archs} \
 %endif
 	--with-clang-resource-dir="../%{_lib}/clang/%{_release_version}" \
     --enable-debug-symbols \