honour arm cflags and properly autodetect thumb2 support in 1.8.5 for gentoo (bug 420471)

Package-Manager: portage-2.1.11.30/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

6 files changed, 124 insertions, 70 deletions

diff --git a/dev-lang/spidermonkey/ChangeLog b/dev-lang/spidermonkey/ChangeLog
index ac2b6d8daea7..c2a17f60b9e5 100644
--- a/dev-lang/spidermonkey/ChangeLog
+++ b/dev-lang/spidermonkey/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/spidermonkey
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.89 2012/10/27 14:22:40 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.90 2012/11/02 19:46:40 axs Exp $
+
+  02 Nov 2012; Ian Stakenvicius <axs@gentoo.org> spidermonkey-1.8.5-r1.ebuild,
+  spidermonkey-1.8.5-r2.ebuild,
+  +files/spidermonkey-1.8.5-arm_respect_cflags-2.patch,
+  -files/spidermonkey-1.8.5-arm_resprect_cflags-1.patch:
+  honour arm cflags and properly autodetect thumb2 support in 1.8.5 for gentoo
+  (bug 420471)
 
   27 Oct 2012; Tobias Klausmann <klausman@gentoo.org>
   spidermonkey-1.8.5-r1.ebuild:
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 653900938ef4..d974d47c8b0f 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -5,7 +5,7 @@ AUX spidermonkey-1.5-build.patch 3457 SHA256 04a2b3b1b85825f463c6eb703d32e66747e
 AUX spidermonkey-1.6-header.patch 270 SHA256 e81acd7ba025214b2ecfa5918a1652e4590eaca39307c4e8d9f5d949d315373e SHA512 f52861ad88b6624fc7e2cd7b9174f53cf0bebf339704932f36ca1d5bd6b133f6e28333fa5d10841c72ccfaccf0f7daa63a1385e2ff6ab8d0192bf70bd437479a WHIRLPOOL d076e64a52adfb9ff55aa7c6191c4a1c29c6917661a15a5cfcc0717960e63403b5557f9e28263cc19c20f3ee4e97c88f87b40b6d786ca3705dd4b2893a0f9c7d
 AUX spidermonkey-1.7.0-ldflags.patch 1076 SHA256 7dcc26496a6413652ff32ce1b1eb04c7ef526658d41a243f1ce0e44598cd809b SHA512 649dccce8206cf99e09715a0e8e7fc0db3bdff4269ab82898476d2e70fda73c420f80f915eadabf17a8bcee529e692bd195dd6df3ac58020e8dd97a91d19a847 WHIRLPOOL 270ea3c19981a597cc8cf9984f5ac358e91fb6ab3fe0ff753cbd933868177e5629b088ae7588b9b630f37ac1cc1381f6e28591e3b47e03bec39627ef332cdcb4
 AUX spidermonkey-1.7.0-threadsafe.diff 513 SHA256 3e41354e093efce3fe897814bc490aa45e17c9d6d0ca6ae7f9f1550b85be89e9 SHA512 81a6c306f4c2546921a12864ee4320b44ce4313e4972932c1929b3ccac03954f0aa4260911b4d9cffcb135cce5974c91456577a80162ed2052cdff7ebd327b9f WHIRLPOOL f21510a69e5718bef52fd0a4f139ff95cf91ae3626172c473a859c5fc2e7dda1df7e67f92190c4c6c2e74e32ac8a36163ca1164aa2f922ec7a6662b89cfe6e2f
-AUX spidermonkey-1.8.5-arm_resprect_cflags-1.patch 2227 SHA256 1e726aa83d26d20454bbfdfe2a5529ac5b07076dd13a9d6faac6341193c85f37 SHA512 374278b503bc04aaf9b5db08d28529f5943960b74f4f0b55c46b3bf820f3bd55cc52f46aaf502649745d2455e2a27c867fdc93e46662f4ee1eba91d2b6737a49 WHIRLPOOL f8f2acfae508157ad820f7d8a0f3190cfaadcf3ae76df7d6bbf7aaad02d3f908a2bf60e603f2c591310e25de25e3c9f3543619d68e179d4c937ed81f0acd4c13
+AUX spidermonkey-1.8.5-arm_respect_cflags-2.patch 3618 SHA256 076e5397d761919bc6d6662913a8eb879b00f8dcd317e3db002748d2008b7a5f SHA512 444204c4a23ddde1a70d1221fa03cca73e20338eff94ba8c32bf480f112a24928b0a3885b8f4134b6458c541bbe07d529856202e9600d5c4ca04b6f7a40c2f75 WHIRLPOOL 9a5cb57cf8a5f0a230c63e1e9f54ef801452528ce1932580ae7665cd8511b46bc8cdbf44c693b52166b06e503abb5a8d57c6aa45c50abe57f0945c4bbd536935
 AUX spidermonkey-1.8.5-fix-install-symlinks.patch 484 SHA256 4c66d490b6ff22086252ad871242d6d87de2e3fec59b91099864c7881cffd823 SHA512 738f59260900e2dee42a3a8347c5afa09cc99e0e7f267c7af80b29a115818c61dce6912d5ff98c1bbcaea816c4d8579383eb7f6a848ba5d4b9275ec6baa2f01d WHIRLPOOL 210390d31e93c7a96fb61951b93221dbd34a1572476dbbf91e0ae3bcfd06d10194205411c49c47ea7d8fa6f898d0c96366c5b6fd3927d12d787524b674d85b81
 AUX spidermonkey-1.8.5-fix-ppc64.patch 1669 SHA256 ffae38a7e5db0895e10be924e1bd084e57640c7a184cd8f1b1a90e9533202470 SHA512 0352665ae138e15aabc8b40561ac6d5328b7a1c497f9591ebe57ffacb05a0ba52c677b8174829c5328cb79ea271b519287bfb99bd418efefc3409d18a198b7d9 WHIRLPOOL 699b3d0a75d660fba0a6095b19db84504238b2c3f9f0bcddf1d6628c8a51a70301c2a3eb54712c2e7719ca5bd4184562d64fac22760e870e453ea2feb5456870
 AUX spidermonkey-1.8.7-filter_desc.patch 922 SHA256 7a3832a0a47f90b89a240b44ac580fff8740344c1d3eee0624973cb251043c46 SHA512 f4b2f3b8b48b0418ab2572dcedc927c4e415979b2dff0f89614cab8b6c6b33e8d0ecf0d298ecdd5c125e936db98028261a59b6f4917384e060999e07ff7b92be WHIRLPOOL 186c2f2ba04170005a5af7cce773ef92925015a1e4541f40d2d44641b9dda5048a2b3d8953755860e866893043ae666360c8a7b594eda77858851c937d5ca8c0
@@ -24,16 +24,16 @@ EBUILD spidermonkey-1.7.0.ebuild 1432 SHA256 5df2e8917fce96363d2128a2fdafc623aa1
 EBUILD spidermonkey-1.8.2.15-r1.ebuild 1938 SHA256 b1fc8c11374df02de4ae2136127958f3d5b7d4c9dca349e396f5127769e9c0f2 SHA512 c5c10a981e7adfc1e04f19f28137b0d227136b1b05bbd8e7bf1f49e5efa9d871ef266ec0542afddb3ab7c2437213caac61fffc81bc08b2878fa2b39c54bd843e WHIRLPOOL e5f6e72e97089cd752753d0dec44074a5cc46b1e3e31601e7dd20267578ef33d2ee9b50f93d4138dcac2a372ed32046f84b58309eb93fa08231413ef04a22560
 EBUILD spidermonkey-1.8.2.15-r2.ebuild 1974 SHA256 b775d4626cdadad8d82be3e629db078d469c0c5d111773c820acaf602c016f86 SHA512 710d35fd28a153653418168ce75f2f7f4298f6a28931a0e2262bf3c64b890faababa495d3383dbf0b26652a1b043b3679091841a5ebed5ac847ef233d42cde2b WHIRLPOOL 60b6f896570b2000610aa397d9b71e5be81da51b36845ca008e2367e46a18262c7ad7376c767bfbf617c046dede261918b81972e597b8f3d15dd7b0ed2d14066
 EBUILD spidermonkey-1.8.2.15.ebuild 1907 SHA256 e03a07403e86e8a20c7efefc59dc5e84853cb8eb459e9685de79d7d90f46de19 SHA512 a684bc61faabcd69492a40c0cad6403605397c46b53e92e3b78df07dea2295fb07f0c9370e0c033fa2a20b7ec35f90ab85e942dddeb693e3afe1d481cfad9268 WHIRLPOOL da7b06b7bda65e2835c467916e496243231303ec7dd94f41c532cb7f6f3a8c264b25d5f39ca178c0300d1c94fd1d9ded64ffe06a6c0f5b58139eeace54b02ba5
-EBUILD spidermonkey-1.8.5-r1.ebuild 3238 SHA256 f73d4b8aa498d28edd80ff4a91299db3a4b8b2b438c163c8cac49a548ebc2823 SHA512 5bd66f738c081b7055d0cf46c072bf015da3ca4e54ca55af959d18512819cdc293aa02051b9eed4b33e4c01a8b5b5de9194ea18f5b5ec2f317b24165fe639db1 WHIRLPOOL c86173bb1aa0f4aec5c36349142786bed94f1cd70cb4f8214ac5e6221cb559109c8e60e543b6210897c963ece899163101bfc86601eb7ef154ecad4cd76429f2
-EBUILD spidermonkey-1.8.5-r2.ebuild 3565 SHA256 3ea4a646d0d88a071a01482019caab86e2a526cc7f4c1a0f8e1b1ef7012212fc SHA512 afaa2cccdbfb368de5d5b9342255d8aa0be2369e9504bf39978c7ab3289c70d1e964d1352033208b38611f7a3bda6caf537d62a93d32943e9b5098c779a5b36b WHIRLPOOL a5ba905e12597cb95fcfd668b1f2403f754c1f25001191c5487e4c64134701774781f09352976bd369e2042ae5fb79b4390a3a4b356279b1a7a4356653833247
+EBUILD spidermonkey-1.8.5-r1.ebuild 3283 SHA256 29fd7089f54e538789eaa89c88b4588bf059d0d0f78e7d47ba82c4e49319d6c6 SHA512 1e4fb690fde60e12d1ed4b182702d7aa009216961bcd80cc4f26101db15df8374a0ba19fa7c799ff841472365cbd5eba7f8e5022937bf36f61761df8af2e5f3b WHIRLPOOL 12bf6ffc95b62ea58f43d6bce11378604aa0edd88685ed83f547924853bd00b0fd9391efeecd8a7978039feb4b35f0b53fa459994ac0976894f998dfc6de436c
+EBUILD spidermonkey-1.8.5-r2.ebuild 3614 SHA256 fc2de9083e3320de4e7d86508c9d674c5e7bec1b09d79801bc54eb3da3bc5854 SHA512 f679c35a17df203ba53fe8904f1bab7be63ce968e1b0dad905cdd2064e1044e59f4798806b80931b1a0e2a5cf35d9e3c34166c47132cbc9c652be70bd4c9bfda WHIRLPOOL ca2be21790b213fb8bbdd0060b9feb266b46575004a12f0c53bde24b1b22b6b287f50a66491d98ca889c8f355a52147187f070245cdfeab3d843c097ab7bdfb8
 EBUILD spidermonkey-1.8.7-r1.ebuild 3854 SHA256 7b4c8836fdca12463443bc883be5c9669dc188729109035372a7cd62621e9da4 SHA512 ff5ca1bfef1ce33652e52ec10ecdda155242880888676e9a975e66e3fbf0808314740e67b43d5494b85ac998a2cc28b543643433a65853e44ff5169c6393e78a WHIRLPOOL b35c17914b2128ee3361b302c21e0b392b9cb6e57be75bb6837d08fa5145808b06c4e02d3276e864f4c032e1d9ecaabd03bcd9eb8b226f716bc326ff343c4017
 EBUILD spidermonkey-1.8.7.ebuild 3607 SHA256 a60de62a9845cc56b0fb289ac8ffee9c31d8a6bfb9b7f68aaf37aacf849e8d70 SHA512 62cbf45fa4461057d2d3d8369cb2b8a4e29f68d225d518b89aa37e904e65dc1a79c1587d40e7c40c7f647368fc754f985c31b0a628d0a8bb976aec54bc06a88c WHIRLPOOL 579de256e755939c93d0f7ff8c26edfdd7f85e4fff2af14cb4f9d5e022a1bae2b5aa6b93eec5d6b190c3b0edaae23f804c8e342bb25e7a9f0cc3e0aa348067c2
-MISC ChangeLog 13981 SHA256 f264db4f05b866b39213b547ff567e4afe027ceb609e52caa6794c9d5e191ff4 SHA512 5e7edb882ca269ae924149874fd82ab5f057fb4cd850cb58191c7182c5b121b32c1cbb93b1f569e3cb1a15b8505a9be4fa2ec18453cbf987d5b66f6c381d34dc WHIRLPOOL 89beb4a922fb86ca44dd31c205b521b7d02acb6b774973a7f7db9670ecd1fe4b11a742a7ed6efe5da1ae12ed4cb02d0d2c013bf637e7f70eca648486433ae318
+MISC ChangeLog 14295 SHA256 a0475f92d667ca002e827f0ec4929de0e2084eef208761abfa472db939d08dd5 SHA512 b35de1f7cf0f2ce3b6f2478e5b96c52e56a6368b138cd0f7f12cb6c648634e48256938c2db914c6d611409383a43180c00bb888fd6ea4f8fe542261e87cb7140 WHIRLPOOL e1816481ae4daab444bdd9d38d8655edcb55dd690174b762a58368b9033844de13e9756372d6b73b20b731415eb53cc693c057e07ec62037bb0c7330962d0860
 MISC metadata.xml 337 SHA256 198d1a23238f7b069df2def08e41451d40c225f8a93a2005ed83166f8fae7d35 SHA512 8f7d13e732629734cdcf5db9b8d4279820517c68b80f3ab840f1dfa6117d38eae70feb6894f1f51e76b33cfc058a39a3ecb6ec3fa33199c7a1bc64bc1897bf89 WHIRLPOOL 8ea694f3e700dc58c787f1c9c91621ed83cf06785172045bd4d2d436fb8e7153ea2631db9e7113a59d765fc67fa32aba5275809cad1d96ed2154fc65da0c803d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCL7jIACgkQA+4Doc5dVOgZdgCdF//pdxKZ3XzcSZLIenqfyb2g
-voYAnjz/5P/XTbiqpdrA7/QMmTiKvT1e
-=KSoV
+iF4EAREIAAYFAlCUIyoACgkQ2ugaI38ACPCpGgD+P59IJ5WiN2jT7qRqXjLnzVPP
+UGji3w3Y+JmAypW3A6cA/RLGBu1V+ykC2NvofQ+pPAAsLyDne2odK1dfPgsdQ+M7
+=/4we
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_respect_cflags-2.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_respect_cflags-2.patch
new file mode 100644
index 000000000000..106ec144f893
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_respect_cflags-2.patch
@@ -0,0 +1,102 @@
+--- a/js-1.8.5/js/src/configure.in	2011-03-31 15:08:36.000000000 -0400
++++ b/js-1.8.5/js/src/configure.in	2012-11-02 15:32:38.000000000 -0400
+@@ -3550,7 +3550,7 @@
+ _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([],
+                [asm("vadd.i8 d0, d0, d0");],
+@@ -4654,12 +4654,6 @@
+ dnl ========================================================
+ MOZ_ARG_HEADER(Individual module options)
+ 
+-dnl Setup default CPU arch for arm target
+-case "$target_cpu" in
+-  arm*)
+-    MOZ_ARM_ARCH=armv7
+-  ;;
+-esac
+ dnl ========================================================
+ dnl = Enable building the Thumb2 instruction set
+ dnl ========================================================
+@@ -4668,66 +4662,35 @@
+     MOZ_THUMB2=1,
+     MOZ_THUMB2=)
+ if test -n "$MOZ_THUMB2"; then
+-  MOZ_ARM_ARCH=armv7
++    AC_MSG_WARN([thumb2 enabled instead of autodetected -- hope you know what you are doing])
++else
++    AC_MSG_CHECKING([for thumb2 support in arm architecture])
++    AC_LANG_SAVE
++    AC_LANG_C
++    AC_TRY_LINK([int ac_test(int i) { return i; }],[asm(".syntax unified\n.thumb\nb.w ac_test\n.arm"); if (ac_test(1)) return 1;],
++      [MOZ_THUMB2=1
++        AC_MSG_RESULT([yes])],
++      [MOZ_THUMB2=
++        AC_MSG_RESULT([no])])
++    AC_LANG_RESTORE
+ fi
+ 
+ dnl ========================================================
+ dnl = Enable building for ARM specific CPU features
+ dnl ========================================================
+-MOZ_ARG_WITH_STRING(cpu-arch,
+-[  --with-cpu-arch=arch      Use specific arm architecture CPU features, default armv7],
+-    MOZ_ARM_ARCH=$withval)
+-
+ if test -n "$MOZ_THUMB2"; then
+   case "$target_cpu" in
+     arm*)
+-      if test "$MOZ_ARM_ARCH" != "armv7"; then
+-        AC_MSG_ERROR([--enable-thumb2 is not compatible with cpu-arch=$MOZ_ARM_ARCH])
+-      fi
+       if test "$GNU_CC"; 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"
+       else
+         AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
+       fi
+     ;;
+-    *)
+-      AC_MSG_ERROR([--enable-thumb2 is not supported for non-ARM CPU architectures])
+-    ;;
+-  esac
+-elif test "$MOZ_ARM_ARCH" = "armv7"; then
+-  case "$target_cpu" in
+-    arm*)
+-      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"
+-      else
+-        AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
+-      fi
+-    ;;
+-    *)
+-      AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-ARM CPU architectures])
+-    ;;
+-  esac
+-else
+-  case "$target_cpu" in
+-    arm*)
+-      if test "$GNU_CC"; then
+-        CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -msoft-float"
+-        CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -msoft-float"
+-        ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork -msoft-float"
+-      fi
+-      ;;
+   esac
+ fi
+ 
+ AC_SUBST(MOZ_THUMB2)
+-AC_SUBST(MOZ_ARM_ARCH)
+ 
+ dnl ========================================================
+ dnl =
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_resprect_cflags-1.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_resprect_cflags-1.patch
deleted file mode 100644
index 7c9dd843afdb..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_resprect_cflags-1.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/js/src/configure.in
-+++ b/js/src/configure.in
-@@ -3550,7 +3550,7 @@ AC_MSG_CHECKING(for ARM NEON support in
- _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([],
-                [asm("vadd.i8 d0, d0, d0");],
-@@ -4687,9 +4687,9 @@ if test -n "$MOZ_THUMB2"; then
-       if test "$GNU_CC"; 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])
-       fi
-@@ -4703,9 +4703,9 @@ elif test "$MOZ_ARM_ARCH" = "armv7"; the
-     arm*)
-       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])
-       fi
---- a/js/src/Makefile.in
-+++ b/js/src/Makefile.in
-@@ -354,7 +354,7 @@ ASFILES +=	TrampolineSUNWX86.s
- endif
- endif
- endif
--ifeq (arm, $(TARGET_CPU))
-+ifeq (arm, $(findstring arm,$(TARGET_CPU)))
- #CPPSRCS		+= only_on_arm.cpp
- endif
- #
-@@ -436,7 +436,7 @@ else
- #CPPSRCS		+= only_on_x86.cpp
- endif
- endif
--ifeq (arm, $(TARGET_CPU))
-+ifeq (arm, $(findstring arm,$(TARGET_CPU)))
- #CPPSRCS		+= only_on_arm.cpp
- endif
- #
-
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild
index 70e88ae6bdae..539edc691dda 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild,v 1.17 2012/10/27 14:22:40 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild,v 1.18 2012/11/02 19:46:40 axs Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -40,10 +40,12 @@ src_prepare() {
 	# https://bugzilla.mozilla.org/show_bug.cgi?id=638056#c9
 	epatch "${FILESDIR}/${P}-fix-ppc64.patch"
 	# https://bugs.gentoo.org/show_bug.cgi?id=400727
-	epatch "${FILESDIR}/${P}-arm_resprect_cflags-1.patch"
+	# https://bugs.gentoo.org/show_bug.cgi?id=420471
+	epatch "${FILESDIR}/${P}-arm_respect_cflags-2.patch"
 	# https://bugs.gentoo.org/show_bug.cgi?id=438746
 	epatch "${FILESDIR}"/${PN}-1.8.7-freebsd-pthreads.patch
 
+
 	epatch_user
 
 	if [[ ${CHOST} == *-freebsd* ]]; then
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r2.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r2.ebuild
index ba400c448f2b..9a010b55e87c 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r2.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r2.ebuild,v 1.1 2012/10/23 19:07:07 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r2.ebuild,v 1.2 2012/11/02 19:46:40 axs Exp $
 
 EAPI="5"
 WANT_AUTOCONF="2.1"
@@ -40,7 +40,8 @@ src_prepare() {
 	# https://bugzilla.mozilla.org/show_bug.cgi?id=638056#c9
 	epatch "${FILESDIR}/${P}-fix-ppc64.patch"
 	# https://bugs.gentoo.org/show_bug.cgi?id=400727
-	epatch "${FILESDIR}/${P}-arm_resprect_cflags-1.patch"
+	# https://bugs.gentoo.org/show_bug.cgi?id=420471
+	epatch "${FILESDIR}/${P}-arm_respect_cflags-2.patch"
 	# https://bugs.gentoo.org/show_bug.cgi?id=438746
 	epatch "${FILESDIR}"/${PN}-1.8.7-freebsd-pthreads.patch