Fabio Erculiani
67 lines
2.5 KiB
Diff
67 lines
2.5 KiB
Diff
--- js-1.8.5.orig/js/src/configure.in
|
|
+++ js-1.8.5/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
|
|
--- js-1.8.5.orig/js/src/Makefile.in
|
|
+++ js-1.8.5/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
|
|
#
|
|
@@ -382,7 +382,7 @@ CPPSRCS += checks.cc \
|
|
# END enclude sources for V8 dtoa
|
|
#############################################
|
|
|
|
-ifeq (,$(filter arm %86 x86_64,$(TARGET_CPU)))
|
|
+ifeq (,$(filter arm% %86 x86_64,$(TARGET_CPU)))
|
|
|
|
VPATH += $(srcdir)/assembler \
|
|
$(srcdir)/assembler/wtf \
|
|
@@ -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
|
|
#
|