Attachment 179670 Details for Bug 212462 – armv6 fix

[patch] armv6 fix

lang_spidermonkey185.patch (text/plain), 4.18 KB, created by Mikael Urankar on 2017-02-06 09:24:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikael Urankar

Created: 2017-02-06 09:24:28 UTC

Size: 4.18 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 433477)
>+++ Makefile	(working copy)
>@@ -25,7 +25,6 @@
> WRKSRC=			${WRKDIR}/js-${PORTVERSION}/js/src
> 
> BROKEN_aarch64=		Does not compile: error: cacheFlush support is missing on this platform
>-BROKEN_armv6=		Does not configure: error: compiler does not follow the C++ specification for temporary object destruction order
> BROKEN_mips64=		Does not compile: error: const union jsval_layout has no member named word
> BROKEN_sparc64=		Does not build: fails to link
> 
>Index: files/patch-assemberl_jit_ExecutableAllocator.h
>===================================================================
>--- files/patch-assemberl_jit_ExecutableAllocator.h	(nonexistent)
>+++ files/patch-assemberl_jit_ExecutableAllocator.h	(working copy)
>@@ -0,0 +1,14 @@
>+--- assembler/jit/ExecutableAllocator.h.orig	2016-09-07 UTC
>++++ assembler/jit/ExecutableAllocator.h
>+@@ -391,6 +391,11 @@ public:
>+     {
>+         CacheRangeFlush(code, size, CACHE_SYNC_ALL);
>+     }
>++#elif WTF_CPU_ARM_TRADITIONAL && WTF_PLATFORM_FREEBSD
>++    static void cacheFlush(void* code, size_t size)
>++    {
>++	__clear_cache(code, reinterpret_cast<char*>(code) + size);
>++    }
>+ #else
>+     #error "The cacheFlush support is missing on this platform."
>+ #endif
>Index: files/patch-assembler_wtf_Platform.h
>===================================================================
>--- files/patch-assembler_wtf_Platform.h	(nonexistent)
>+++ files/patch-assembler_wtf_Platform.h	(working copy)
>@@ -0,0 +1,18 @@
>+--- ./assembler/wtf/Platform.h.orig	2016-09-07 UTC
>++++ ./assembler/wtf/Platform.h
>+@@ -213,6 +213,7 @@
>+ #elif defined(__ARM_ARCH_6__) \
>+    || defined(__ARM_ARCH_6J__) \
>+    || defined(__ARM_ARCH_6K__) \
>++   || defined(__ARM_ARCH_6KZ__) \
>+    || defined(__ARM_ARCH_6Z__) \
>+    || defined(__ARM_ARCH_6ZK__) \
>+    || defined(__ARM_ARCH_6T2__) \
>+@@ -243,6 +244,7 @@
>+ 
>+ #elif defined(__ARM_ARCH_6J__) \
>+    || defined(__ARM_ARCH_6K__) \
>++   || defined(__ARM_ARCH_6KZ__) \
>+    || defined(__ARM_ARCH_6Z__) \
>+    || defined(__ARM_ARCH_6ZK__) \
>+    || defined(__ARM_ARCH_6M__)
>Index: files/patch-configure.in
>===================================================================
>--- files/patch-configure.in	(revision 433477)
>+++ files/patch-configure.in	(working copy)
>@@ -10,3 +10,27 @@
>            VISIBILITY_FLAGS='-I$(DIST)/system_wrappers_js -include $(topsrcdir)/config/gcc_hidden.h'
>            WRAP_SYSTEM_INCLUDES=1
>            STL_FLAGS='-I$(DIST)/stl_wrappers'
>+@@ -4656,6 +4657,9 @@ MOZ_ARG_HEADER(Individual module options
>+ 
>+ dnl Setup default CPU arch for arm target
>+ case "$target_cpu" in
>++  armv6*)
>++    MOZ_ARM_ARCH=armv6
>++  ;;
>+   arm*)
>+     MOZ_ARM_ARCH=armv7
>+   ;;
>+@@ -4716,6 +4720,13 @@ elif test "$MOZ_ARM_ARCH" = "armv7"; the
>+   esac
>+ else
>+   case "$target_cpu" in
>++    armv6*)
>++      if test "$GNU_CC"; then
>++        CFLAGS="$CFLAGS"
>++        CXXFLAGS="$CXXFLAGS"
>++        ASFLAGS="$ASFLAGS"
>++      fi
>++      ;;
>+     arm*)
>+       if test "$GNU_CC"; then
>+         CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -msoft-float"
>Index: files/patch-nanojit_CodeAlloc.cpp
>===================================================================
>--- files/patch-nanojit_CodeAlloc.cpp	(nonexistent)
>+++ files/patch-nanojit_CodeAlloc.cpp	(working copy)
>@@ -0,0 +1,10 @@
>+--- nanojit/CodeAlloc.cpp.orig	2016-09-07 UTC
>++++ nanojit/CodeAlloc.cpp
>+@@ -261,7 +261,6 @@ namespace nanojit
>+ #endif
>+ 
>+ #if defined(AVMPLUS_UNIX) && defined(NANOJIT_ARM)
>+-#include <asm/unistd.h>
>+ extern "C" void __clear_cache(char *BEG, char *END);
>+ #endif
>+ 
>Index: files/patch-nanojit_njcpudetect.h
>===================================================================
>--- files/patch-nanojit_njcpudetect.h	(nonexistent)
>+++ files/patch-nanojit_njcpudetect.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- nanojit/njcpudetect.h.orig	2016-09-07 UTC
>++++ nanojit/njcpudetect.h
>+@@ -77,6 +77,8 @@
>+ #elif   defined(__ARM_ARCH_6__) || \
>+         defined(__ARM_ARCH_6J__) || \
>+         defined(__ARM_ARCH_6T2__) || \
>++        defined(__ARM_ARCH_6K__) || \
>++        defined(__ARM_ARCH_6KZ__) || \
>+         defined(__ARM_ARCH_6Z__) || \
>+         defined(__ARM_ARCH_6ZK__) || \
>+         defined(__ARM_ARCH_6M__) || \

Actions: View | Diff

Attachments on bug 212462: 174481 | 179670