Add x86_64 support

Author: leeight

.buckconfig

@@ -1,7 +1,10 @@
 [buildfile]
     includes = //BUILD_DEFS
 [ndk]
-    ndk_version = r10c
+    ndk_version = r10e
+    cpu_abis = armv7, x86, x86_64
+    gcc_version = 4.9
+    app_platform = android-21
     cppflags = \
         -std=gnu11 \
         -Wall \
@@ -88,6 +91,18 @@
         -mfloat-abi=softfp \
         -mthumb \
         -Os
+    x86_64_cppflags = \
+        -O2
+    x86_64_cflags = \
+        -funswitch-loops \
+        -finline-limit=300 \
+        -O2
+    x86_64_cxxppflags = \
+        -O2
+    x86_64_cxxflags = \
+        -funswitch-loops \
+        -finline-limit=300 \
+        -O2
     x86_cppflags = \
         -O2
     x86_cflags = \

install.sh

@@ -10,7 +10,7 @@ AAR_PATH=buck-out/gen/android-jsc.aar
 
 # Make sure that AAR is build, call buck
 echo "Building JSC & ICU for Android"
-buck build :android-jsc
+# buck build :android-jsc
 
 # Remove gnustl_shared binaries from AAR. This is due to gradle inability to
 # handle native libraries with conflicting names coming from multiple

jsc/BUCK

@@ -2,7 +2,7 @@
 
 import os
 
-SUPPORTED_PLATFORMS = '^android-(armv7|x86)$'
+SUPPORTED_PLATFORMS = '^android-(armv7|x86|x86_64)$'
 
 def unpack_rule(source, from_rule):
   genrule(
@@ -26,19 +26,6 @@ WTF_EXPORTED_PREPROCESSOR_FLAGS = [
   '-DENABLE_GLOBAL_FASTMALLOC_NEW=0',
 ]
 
-# Dirty hack, StdLibExtras.h assumes incorrectly that is_trivially_destructible
-# have been added in 4.8.1 version while it was added in 4.8.0. We emulate PATCH
-# version to be 1 so that StdLibExtra.h doesn't try to declare
-# is_trivially_destructible
-# Except from this single place JSC code doesn't check for 4.8.1 anywhere else
-WTF_EXPORTED_PREPROCESSOR_FLAGS.extend([
-  '-U__GNUC_PATCHLEVEL__',
-  '-D__GNUC_PATCHLEVEL__=1',
-  '-DPTHREAD_KEYS_MAX=1024',
-  '-DINTPTR_MAX=LONG_MAX',
-  '-Dlog2(x)=(log(x)/log(2.0))',
-])
-
 cxx_library(
   name = 'wtfassertions',
   force_static = True,
@@ -165,6 +152,7 @@ cxx_library(
   supported_platforms_regex = SUPPORTED_PLATFORMS,
   header_namespace = '',
   headers = subdir_glob([
+    ('WTF', '*.h'),
     ('WTF/wtf', '*.h'),
     ('', 'extra_headers/*.h'),
   ]),
@@ -936,7 +924,7 @@ SOURCES = glob([
   'JavaScriptCore/*.asm',
 ])
 SOURCES.append(':InitBytecodes.asm')
-for platform in ('android-armv7', 'android-x86'):
+for platform in ('android-armv7', 'android-x86', 'android-x86_64'):
   source = 'LLIntAssembly.{0}.h'.format(platform)
   genrule(
     name = source,

jsc/extra_headers/LLIntAssembly.h

@@ -4,6 +4,10 @@
 #include "LLIntAssembly.android-armv7.h"
 #elif defined(__ANDROID__) && defined(__i386__)
 #include "LLIntAssembly.android-x86.h"
+#elif defined(__ANDROID__) && defined(__x86_64__)
+#include "LLIntAssembly.android-x86_64.h"
+#elif defined(__ANDROID__) && defined(__aarch64__)
+#include "LLIntAssembly.android-arm64.h"
 #else
 #error "Platform not supported"
 #endif