From a983e5812a7b6e8261f4f155de0c449e367c394c Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Jan 10 2012 17:40:22 +0000
Subject: add patch to enable js to build on both hard and soft floating point arm distros


---

diff --git a/js.spec b/js.spec
index 4d2ad05..3f64de6 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:		8%{?hgdate:.hg%{hgdate}}%{?dist}
+Release:		9%{?hgdate:.hg%{hgdate}}%{?dist}
 # The sources are triple licensed, but when we link against readline which is
 # GPL, the result can only be GPL.
 %if 0%{?_without_readline:1}
@@ -19,6 +19,7 @@ Patch0:			js-1.8.5-64bit-big-endian.patch
 Patch1:			js-1.8.5-secondary-jit.patch
 Patch2:			js185-destdir.patch
 Patch3:			js-1.8.5-537701.patch
+Patch4:                 js185-arm-nosoftfp.patch
 Provides:		libjs = %{version}-%{release}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 Buildrequires:	nspr-devel >= 4.7
@@ -57,6 +58,7 @@ you will need to install %{name}-devel.
 %patch1 -p2 -b .secondary-jit
 %patch2 -p0 -b .destdir
 %patch3 -p1 -b .537701
+%patch4 -p1 -b .armhfp
 cd js
 
 # Rm parts with spurios licenses, binaries
@@ -140,6 +142,9 @@ rm -rf %{buildroot}
 %{_includedir}/js
 
 %changelog
+* Tue Jan 10 2011 Dennis Gilmore <dennis@ausil.us> - 1.8.5-9
+- add patch to enable js to build on both hard and soft floating point arm distros
+
 * Fri Dec 02 2011 Karsten Hopp <karsten@redhat.com> 1.8.5-8
 - add patch from bugzilla 749604, fixes PPC failures
 
diff --git a/js185-arm-nosoftfp.patch b/js185-arm-nosoftfp.patch
new file mode 100644
index 0000000..e88c0ae
--- /dev/null
+++ b/js185-arm-nosoftfp.patch
@@ -0,0 +1,64 @@
+diff -r -U 2 -p a/js/src/configure b/js/src/configure
+--- a/js/src/configure	2011-10-14 18:27:00.000000000 -0400
++++ b/js/src/configure	2011-10-14 18:37:07.264794994 -0400
+@@ -10741,5 +10741,5 @@ _SAVE_CFLAGS="$CFLAGS"
+ if test "$GNU_CC"; then
+   # gcc needs -mfpu=neon to recognize NEON instructions
+-  CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp"
++  CFLAGS="$CFLAGS -mfpu=neon"
+ fi
+ cat > conftest.$ac_ext <<EOF
+@@ -13407,7 +13407,7 @@ EOF
+ EOF
+ 
+-        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"
+       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
+ EOF
+ 
+-        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"
+       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
+--- a/js/src/configure.in	2011-03-31 15:08:36.000000000 -0400
++++ b/js/src/configure.in	2011-10-14 18:37:40.496180956 -0400
+@@ -3551,5 +3551,5 @@ _SAVE_CFLAGS="$CFLAGS"
+ if test "$GNU_CC"; then
+   # gcc needs -mfpu=neon to recognize NEON instructions
+-  CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp"
++  CFLAGS="$CFLAGS -mfpu=neon"
+ fi
+ AC_TRY_COMPILE([],
+@@ -4688,7 +4688,7 @@ if test -n "$MOZ_THUMB2"; then
+         AC_DEFINE(MOZ_THUMB2)
+         AC_DEFINE(MOZ_ARM_ARCH)
+-        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"
+       else
+         AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
+@@ -4704,7 +4704,7 @@ elif test "$MOZ_ARM_ARCH" = "armv7"; the
+       if test "$GNU_CC"; then
+         AC_DEFINE(MOZ_ARM_ARCH)
+-        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"
+       else
+         AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])