diff --git a/js.spec b/js.spec
index b104f6d..e61cd9b 100644
--- a/js.spec
+++ b/js.spec
@@ -4,7 +4,7 @@ Summary:		JavaScript interpreter and libraries
 Name:		js
 Epoch:		1
 Version:		1.8.5
-Release:		11%{?hgdate:.hg%{hgdate}}%{?dist}
+Release:		12%{?hgdate:.hg%{hgdate}}%{?dist}
 License:		GPLv2+ or LGPLv2+ or MPLv1.1
 Group:		Development/Languages
 URL:			http://www.mozilla.org/js/
@@ -135,6 +135,9 @@ rm -rf %{buildroot}
 %{_includedir}/js
 
 %changelog
+* Fri Jan 18 2013 Dennis Gilmore <dennis@ausil.us> - 1:1.8.5-12
+- make sure -march=armv7-a is not hardcoded in arm builds
+
 * Sat Nov 17 2012 Pavel Alexeev <Pahan@Hubbitus.info> - 1:1.8.5-11
 - Thanks to Ville Skyttä (bz#875343) build against libedit instead of readline
 	what simplify licensing apparently without any loss of functionality
diff --git a/js185-arm-nosoftfp.patch b/js185-arm-nosoftfp.patch
index e88c0ae..e971a48 100644
--- a/js185-arm-nosoftfp.patch
+++ b/js185-arm-nosoftfp.patch
@@ -14,9 +14,9 @@ diff -r -U 2 -p a/js/src/configure b/js/src/configure
 -        CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
 -        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
 -        ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-+        CFLAGS="$CFLAGS -march=armv7-a -mthumb $MOZ_ARM_VFP_FLAGS"
-+        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb $MOZ_ARM_VFP_FLAGS"
-+        ASFLAGS="$ASFLAGS -march=armv7-a -mthumb $MOZ_ARM_VFP_FLAGS"
++        CFLAGS="$CFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
++        CXXFLAGS="$CXXFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
++        ASFLAGS="$ASFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
        else
          { echo "configure: error: --enable-thumb2 is not supported for non-GNU toolchains" 1>&2; exit 1; }
 @@ -13426,7 +13426,7 @@ elif test "$MOZ_ARM_ARCH" = "armv7"; the
@@ -25,9 +25,9 @@ diff -r -U 2 -p a/js/src/configure b/js/src/configure
 -        CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
 -        CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
 -        ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-+        CFLAGS="$CFLAGS -march=armv7-a -marm $MOZ_ARM_VFP_FLAGS"
-+        CXXFLAGS="$CXXFLAGS -march=armv7-a -marm $MOZ_ARM_VFP_FLAGS"
-+        ASFLAGS="$ASFLAGS -march=armv7-a -marm $MOZ_ARM_VFP_FLAGS"
++        CFLAGS="$CFLAGS $MOZ_ARM_VFP_FLAGS"
++        CXXFLAGS="$CXXFLAGS $MOZ_ARM_VFP_FLAGS"
++        ASFLAGS="$ASFLAGS $MOZ_ARM_VFP_FLAGS"
        else
          { echo "configure: error: --with-cpu-arch=armv7 is not supported for non-GNU toolchains" 1>&2; exit 1; }
 diff -r -U 2 -p a/js/src/configure.in b/js/src/configure.in
@@ -46,9 +46,9 @@ diff -r -U 2 -p a/js/src/configure.in b/js/src/configure.in
 -        CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
 -        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
 -        ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-+        CFLAGS="$CFLAGS -march=armv7-a -mthumb $MOZ_ARM_VFP_FLAGS"
-+        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb $MOZ_ARM_VFP_FLAGS"
-+        ASFLAGS="$ASFLAGS -march=armv7-a -mthumb $MOZ_ARM_VFP_FLAGS"
++        CFLAGS="$CFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
++        CXXFLAGS="$CXXFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
++        ASFLAGS="$ASFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
        else
          AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
 @@ -4704,7 +4704,7 @@ elif test "$MOZ_ARM_ARCH" = "armv7"; the
@@ -57,8 +57,8 @@ diff -r -U 2 -p a/js/src/configure.in b/js/src/configure.in
 -        CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
 -        CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
 -        ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-+        CFLAGS="$CFLAGS -march=armv7-a -marm $MOZ_ARM_VFP_FLAGS"
-+        CXXFLAGS="$CXXFLAGS -march=armv7-a -marm $MOZ_ARM_VFP_FLAGS"
-+        ASFLAGS="$ASFLAGS -march=armv7-a -marm $MOZ_ARM_VFP_FLAGS"
++        CFLAGS="$CFLAGS $MOZ_ARM_VFP_FLAGS"
++        CXXFLAGS="$CXXFLAGS $MOZ_ARM_VFP_FLAGS"
++        ASFLAGS="$ASFLAGS $MOZ_ARM_VFP_FLAGS"
        else
          AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])