From: Mikko Ylinen <mikko.ylinen@intel.com>
Date: Wed, 29 Oct 2014 06:05:16 +0000 (-0700)
Subject: Merge "fix: the incorrect version of tarball generated by gbs export" into tizen
X-Git-Tag: accepted/tizen/3.0.m2/mobile/20170104.142920^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Ftizen_3.0.2015.q1_common;hp=0c1d910ec5b584acc135ac73397c3cea752b065a;p=platform%2Fupstream%2Fjs.git

Merge "fix: the incorrect version of tarball generated by gbs export" into tizen
---

diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index 7ead392..60fb926 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -382,7 +382,7 @@ CPPSRCS += 	checks.cc \
 # END enclude sources for V8 dtoa
 #############################################
 
-ifeq (,$(filter-out powerpc powerpc64 s390 s390x,$(TARGET_CPU)))
+ifeq (,$(filter-out aarch64 powerpc powerpc64 s390 s390x,$(TARGET_CPU)))
 
 VPATH +=	$(srcdir)/assembler \
 		$(srcdir)/assembler/wtf \
diff --git a/js/src/assembler/jit/ExecutableAllocator.h b/js/src/assembler/jit/ExecutableAllocator.h
index 511aebf..f17af9b 100644
--- a/js/src/assembler/jit/ExecutableAllocator.h
+++ b/js/src/assembler/jit/ExecutableAllocator.h
@@ -391,6 +391,12 @@ public:
     {
         CacheRangeFlush(code, size, CACHE_SYNC_ALL);
     }
+#elif WTF_CPU_AARCH64 && WTF_PLATFORM_LINUX
+    static void cacheFlush(void* code, size_t size)
+    {
+        intptr_t end = reinterpret_cast<intptr_t>(code) + size;
+        __builtin___clear_cache(reinterpret_cast<char*>(code), reinterpret_cast<char*>(end));
+    }
 #else
     #error "The cacheFlush support is missing on this platform."
 #endif
diff --git a/js/src/assembler/wtf/Platform.h b/js/src/assembler/wtf/Platform.h
index 3dfad2a..3d1d031 100644
--- a/js/src/assembler/wtf/Platform.h
+++ b/js/src/assembler/wtf/Platform.h
@@ -292,6 +292,10 @@
 
 #endif /* ARM */
 
+/* CPU(AArch64) - 64-bit ARM */
+#if defined(__aarch64__)
+#define WTF_CPU_AARCH64 1
+#endif
 
 
 /* Operating systems - low-level dependencies */
diff --git a/js/src/configure.in b/js/src/configure.in
index e9f3bb1..711ce06 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -1534,6 +1534,10 @@ arm*)
     CPU_ARCH=arm
     ;;
 
+aarch64)
+    CPU_ARCH=aarch64
+    ;;
+
 mips|mipsel)
     CPU_ARCH="mips"
     ;;
diff --git a/packaging/js.spec b/packaging/js.spec
index caa2d9e..ad445f0 100644
--- a/packaging/js.spec
+++ b/packaging/js.spec
@@ -52,7 +52,12 @@ you will need to install %{name}-devel.
 export MOZILLA_VERSION=%{version}
 cd js
 pushd src
-%configure --with-system-nspr --enable-threadsafe
+%ifarch aarch64
+export CPPFLAGS+=" -DENABLE_JIT=0 "
+export JIT_CONFIG_OPT="--disable-tracejit --disable-methodjit"
+%endif
+%configure --with-system-nspr --enable-threadsafe $JIT_CONFIG_OPT
+
 popd
 export BUILD_OPT=1
 %{__make} %{?_smp_mflags} -C src \