| 1 |
anarchy 12/01/30 19:36:18 |
| 2 |
|
| 3 |
Added: spidermonkey-1.8.5-arm_resprect_cflags-1.patch |
| 4 |
Removed: spidermonkey-1.8.5-arm_resprect_cflags.patch |
| 5 |
Log: |
| 6 |
Provide complete arm support, bug #401381 |
| 7 |
|
| 8 |
(Portage version: 2.1.10.44/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_resprect_cflags-1.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_resprect_cflags-1.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_resprect_cflags-1.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: spidermonkey-1.8.5-arm_resprect_cflags-1.patch |
| 17 |
=================================================================== |
| 18 |
--- a/js/src/configure.in |
| 19 |
+++ b/js/src/configure.in |
| 20 |
@@ -3550,7 +3550,7 @@ AC_MSG_CHECKING(for ARM NEON support in |
| 21 |
_SAVE_CFLAGS="$CFLAGS" |
| 22 |
if test "$GNU_CC"; then |
| 23 |
# gcc needs -mfpu=neon to recognize NEON instructions |
| 24 |
- CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp" |
| 25 |
+ CFLAGS="$CFLAGS -mfpu=neon" |
| 26 |
fi |
| 27 |
AC_TRY_COMPILE([], |
| 28 |
[asm("vadd.i8 d0, d0, d0");], |
| 29 |
@@ -4687,9 +4687,9 @@ if test -n "$MOZ_THUMB2"; then |
| 30 |
if test "$GNU_CC"; then |
| 31 |
AC_DEFINE(MOZ_THUMB2) |
| 32 |
AC_DEFINE(MOZ_ARM_ARCH) |
| 33 |
- CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" |
| 34 |
- CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" |
| 35 |
- ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" |
| 36 |
+ CFLAGS="$CFLAGS -march=armv7-a -mthumb $MOZ_ARM_VFP_FLAGS" |
| 37 |
+ CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb $MOZ_ARM_VFP_FLAGS" |
| 38 |
+ ASFLAGS="$ASFLAGS -march=armv7-a -mthumb $MOZ_ARM_VFP_FLAGS" |
| 39 |
else |
| 40 |
AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains]) |
| 41 |
fi |
| 42 |
@@ -4703,9 +4703,9 @@ elif test "$MOZ_ARM_ARCH" = "armv7"; the |
| 43 |
arm*) |
| 44 |
if test "$GNU_CC"; then |
| 45 |
AC_DEFINE(MOZ_ARM_ARCH) |
| 46 |
- CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" |
| 47 |
- CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" |
| 48 |
- ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" |
| 49 |
+ CFLAGS="$CFLAGS -march=armv7-a -marm $MOZ_ARM_VFP_FLAGS" |
| 50 |
+ CXXFLAGS="$CXXFLAGS -march=armv7-a -marm $MOZ_ARM_VFP_FLAGS" |
| 51 |
+ ASFLAGS="$ASFLAGS -march=armv7-a -marm $MOZ_ARM_VFP_FLAGS" |
| 52 |
else |
| 53 |
AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains]) |
| 54 |
fi |
| 55 |
--- a/js/src/Makefile.in |
| 56 |
+++ b/js/src/Makefile.in |
| 57 |
@@ -354,7 +354,7 @@ ASFILES += TrampolineSUNWX86.s |
| 58 |
endif |
| 59 |
endif |
| 60 |
endif |
| 61 |
-ifeq (arm, $(TARGET_CPU)) |
| 62 |
+ifeq (arm, $(findstring arm,$(TARGET_CPU))) |
| 63 |
#CPPSRCS += only_on_arm.cpp |
| 64 |
endif |
| 65 |
# |
| 66 |
@@ -436,7 +436,7 @@ else |
| 67 |
#CPPSRCS += only_on_x86.cpp |
| 68 |
endif |
| 69 |
endif |
| 70 |
-ifeq (arm, $(TARGET_CPU)) |
| 71 |
+ifeq (arm, $(findstring arm,$(TARGET_CPU))) |
| 72 |
#CPPSRCS += only_on_arm.cpp |
| 73 |
endif |
| 74 |
# |
Archives