Fixed patches, added cflags

Author: ukasiu

all.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+for arch in arm arm64 x86 x86_64
+do
+  JSC_ARCH=$arch ./toolchain.sh
+  JSC_ARCH=$arch ./icu.sh
+  JSC_ARCH=$arch ./jsc.sh
+done

common.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ROOTDIR=`pwd`
+if ! [[ $ROOTDIR ]]; then ROOTDIR=`pwd`; fi
 ARCH=$JSC_ARCH
 
 ANDROID_API=21
@@ -24,30 +24,49 @@ PLATFORM_CFLAGS_arm=" \
 -mfpu=neon \
 -mthumb \
 "
-
 PLATFORM_LDFLAGS_arm=" \
 -L$TOOLCHAIN_DIR/$CROSS_COMPILE_PLATFORM/lib/armv7-a \
 -march=armv7-a \
 -Wl,--fix-cortex-a8 \
 "
+JNI_ARCH_arm=armeabi-v7a
 
 PLATFORM_LDFLAGS_arm64=" \
 -L$TOOLCHAIN_DIR/$CROSS_COMPILE_PLATFORM/lib \
 "
-
+JNI_ARCH_arm64=arm64-v8a
+
+PLATFORM_CFLAGS_x86=" \
+-march=i686 \
+-mtune=intel \
+-mssse3 \
+-mfpmath=sse \
+-m32 \
+"
 PLATFORM_LDFLAGS_x86=" \
 -L$TOOLCHAIN_DIR/$CROSS_COMPILE_PLATFORM/lib \
 "
-
+JNI_ARCH_x86=x86
+
+PLATFORM_CFLAGS_x86_64=" \
+-march=x86-64 \
+-msse4.2 \
+-mpopcnt \
+-m64 \
+-mtune=intel \
+"
 PLATFORM_LDFLAGS_x86_64=" \
 -L$TOOLCHAIN_DIR/$CROSS_COMPILE_PLATFORM/lib \
 "
+JNI_ARCH_x86_64=x86_64
 
 # arch
 var="PLATFORM_CFLAGS_$JSC_ARCH"
 PLATFORM_CFLAGS=${!var}
 var="PLATFORM_LDFLAGS_$JSC_ARCH"
 PLATFORM_LDFLAGS=${!var}
+var="JNI_ARCH_$JSC_ARCH"
+JNI_ARCH=${!var}
 
 # checks
 err=false
@@ -83,7 +102,9 @@ COMMON_CXXFLAGS=" \
 --std=c++11 \
 "
 
-ICU_CFLAGS="$COMMON_CFLAGS $PLATFORM_CFLAGS"
-ICU_CXXFLAGS="$COMMON_CXXFLAGS $ICU_CFLAGS"
+ICU_CFLAGS="$COMMON_CFLAGS $PLATFORM_CFLAGS -Os"
+ICU_CXXFLAGS="$COMMON_CXXFLAGS $ICU_CFLAGS -Os"
 ICU_LDFLAGS="$COMMON_LDFLAGS $PLATFORM_LDFLAGS"
 
+INSTALL_DIR=$ROOTDIR/lib/distribution/jsc/lib/$JNI_ARCH
+mkdir -p $INSTALL_DIR

extra_headers/wtf/execinfo.h

@@ -2,9 +2,12 @@
 
 source './common.sh'
 
-rm -rf $ROOTDIR/target/icu/$CROSS_COMPILE_PLATFORM
-mkdir -p $ROOTDIR/target/icu/$CROSS_COMPILE_PLATFORM
-cd $ROOTDIR/target/icu/$CROSS_COMPILE_PLATFORM
+ICU_VERSION="56.1"
+
+BUILD_DIR=$ROOTDIR/target/icu/$CROSS_COMPILE_PLATFORM
+rm -rf $BUILD_DIR
+mkdir -p $BUILD_DIR
+cd $BUILD_DIR
 
 CROSS_BUILD_DIR=$(realpath ../host)
 PATH=$TOOLCHAIN_DIR/bin:$PATH
@@ -33,4 +36,8 @@ PATH=$TOOLCHAIN_DIR/bin:$PATH
 
 make -j5
 
-cp stubdata/lib* lib/
+cp stubdata/libicudata_jsc.so.$ICU_VERSION lib/
+
+cp stubdata/libicudata_jsc.so.$ICU_VERSION $INSTALL_DIR/libicudata_jsc.so
+cp lib/libicui18n_jsc.so.$ICU_VERSION $INSTALL_DIR/libicui18n_jsc.so
+cp lib/libicuuc_jsc.so.$ICU_VERSION $INSTALL_DIR/libicuuc_jsc.so

icu.sh

@@ -11,7 +11,6 @@ CMAKE_CXX_FLAGS=" \
 $COMMON_CFLAGS \
 $PLATFORM_CFLAGS \
 -fno-rtti \
--I$ROOTDIR/extra_headers/wtf/ \
 -I$ROOTDIR/target/icu/source/i18n \
 "
 CMAKE_LD_FLAGS=" \
@@ -48,4 +47,5 @@ $PLATFORM_LDFLAGS \
   -DCMAKE_VERBOSE_MAKEFILE=on \
   "
 
-  mv $ROOTDIR/target/webkit/WebKitBuild $ROOTDIR/target/webkit/$CROSS_COMPILE_PLATFORM
+mv $ROOTDIR/target/webkit/WebKitBuild $ROOTDIR/target/webkit/$CROSS_COMPILE_PLATFORM
+cp $ROOTDIR/target/webkit/WebKitBuild/Release/lib/libjsc.so $INSTALL_DIR

jsc.sh

@@ -1,4 +1,4 @@
-diff --exclude=.svn -aur webkit/Source/cmake/FindICU.cmake target/webkit/Source/cmake/FindICU.cmake
+diff --exclude=.svn -aur webkit/Source/cmake/FindICU.cmake cmake/FindICU.cmake
 --- webkit/Source/cmake/FindICU.cmake	2017-05-16 12:00:04.000000000 +0200
 +++ cmake/FindICU.cmake	2017-05-19 16:25:44.000000000 +0200
 @@ -25,7 +25,7 @@
@@ -28,7 +28,7 @@ diff --exclude=.svn -aur webkit/Source/cmake/FindICU.cmake target/webkit/Source/
          HINTS ${PC_ICU_I18N_LIBRARY_DIRS}
                ${PC_ICU_I18N_LIBDIR}
                ${WEBKIT_LIBRARIES_LINK_DIR}
-diff --exclude=.svn -aur webkit/Source/cmake/OptionsJSCOnly.cmake target/webkit/Source/cmake/OptionsJSCOnly.cmake
+diff --exclude=.svn -aur webkit/Source/cmake/OptionsJSCOnly.cmake cmake/OptionsJSCOnly.cmake
 --- webkit/Source/cmake/OptionsJSCOnly.cmake	2017-05-16 12:00:04.000000000 +0200
 +++ cmake/OptionsJSCOnly.cmake	2017-05-26 13:58:10.000000000 +0200
 @@ -23,7 +23,8 @@

patches/jsc_cmake.patch

@@ -1,14 +1,14 @@
 diff --exclude=.svn -aur WTF-org/wtf/Assertions.cpp WTF/wtf/Assertions.cpp
---- WTF-org/wtf/Assertions.cpp	2016-09-01 03:33:40.000000000 +0200
-+++ WTF/wtf/Assertions.cpp	2017-05-30 14:47:06.000000000 +0200
-@@ -72,11 +72,9 @@
+--- WTF-org/wtf/Assertions.cpp  2016-09-01 03:33:40.000000000 +0200
++++ WTF/wtf/Assertions.cpp  2017-06-05 15:35:30.000000000 +0200
+@@ -72,11 +72,8 @@
  #include <unistd.h>
  #endif
 
 -#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))
  #include <cxxabi.h>
  #include <dlfcn.h>
- #include <execinfo.h>
+-#include <execinfo.h>
 -#endif
 
  extern "C" {