Merge branch 'devel' of github.com:arangodb/arangodb into devel

3rdParty/V8/V8-4.9.391/build/gyp/gyp

@@ -5,4 +5,4 @@
 
 set -e
 base=$(dirname "$0")
-exec python "${base}/gyp_main.py" "$@"
+exec ${PYTHON_EXECUTABLE} "${base}/gyp_main.py" "$@"

3rdParty/V8/V8-4.9.391/build/gyp_v8

@@ -165,7 +165,7 @@ if __name__ == '__main__':
     for f in glob.glob(os.path.join(v8_root, 'out', 'Makefile.*')):
       os.unlink(f)
     # --generator-output defines where the Makefile goes.
-    gyp_args.append('--generator-output=out')
+    # gyp_args.append('--generator-output=out')
     # -Goutput_dir defines where the build output goes, relative to the
     # Makefile. Set it to . so that the build output doesn't end up in out/out.
     gyp_args.append('-Goutput_dir=.')

3rdParty/V8/V8-4.9.391/build/gyp_v8.py

@@ -36,6 +36,9 @@
 # useful.
 
 import os
+import sys
+sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '..'))
 
 path = os.path.abspath(os.path.split(__file__)[0])
+
 execfile(os.path.join(path, 'gyp_v8'))

3rdParty/V8/V8-4.9.391/build/standalone.gypi

@@ -673,6 +673,8 @@
         ],
       },  # target_defaults
     }],  # OS=="mac"
+    ['OS=="solaris"', {'defines': ['_GLIBCXX_USE_C99_MATH']}],
+    ['OS=="solaris"', {'target_defaults': {'cflags': ['-m64'], 'ldflags': ['-march=x86-64', '-m64']}}],
     ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
        or OS=="netbsd" or OS=="aix"', {
       'target_defaults': {
@@ -861,7 +863,7 @@
             'EnableFunctionLevelLinking': 'true',
             'RuntimeTypeInfo': 'false',
             'WarningLevel': '3',
-            'WarnAsError': 'true',
+            'WarnAsError': 'false',
             'DebugInformationFormat': '3',
             'Detect64BitPortabilityProblems': 'false',
             'conditions': [

3rdParty/V8/V8-4.9.391/build/toolchain.gypi

@@ -38,7 +38,7 @@
     'ubsan%': 0,
     'ubsan_vptr%': 0,
     'v8_target_arch%': '<(target_arch)',
-    'v8_host_byteorder%': '<!(${PYTHON_EXECUTABLE} -c "import sys; print sys.byteorder")',
+    'v8_host_byteorder%': '<(byteorder)',
     # Native Client builds currently use the V8 ARM JIT and
     # arm/simulator-arm.cc to defer the significant effort required
     # for NaCl JIT support. The nacl_target_arch variable provides

3rdParty/V8/V8-4.9.391/src/base/functional.h

@@ -191,6 +191,7 @@ struct bit_hash : public std::unary_function<T, size_t> {};
   struct bit_equal_to<type> : public std::equal_to<type> {}; \
   template <>                                                \
   struct bit_hash<type> : public hash<type> {};
+V8_BASE_BIT_SPECIALIZE_TRIVIAL(char)
 V8_BASE_BIT_SPECIALIZE_TRIVIAL(signed char)
 V8_BASE_BIT_SPECIALIZE_TRIVIAL(unsigned char)
 V8_BASE_BIT_SPECIALIZE_TRIVIAL(short)           // NOLINT(runtime/int)

3rdParty/V8/V8-4.9.391/src/base/lazy-instance.h

@@ -97,7 +97,9 @@ struct StaticallyAllocatedInstanceTrait {
     char x[sizeof(T)];
   };
 
+#ifndef __INTEL_COMPILER
   STATIC_ASSERT(V8_ALIGNOF(StorageType) >= V8_ALIGNOF(T));
+#endif
 
   static T* MutableInstance(StorageType* storage) {
     return reinterpret_cast<T*>(storage);

3rdParty/V8/V8-4.9.391/src/d8.gyp

@@ -54,7 +54,8 @@
         [ 'want_separate_host_toolset==1', {
           'toolsets': [ '<(v8_toolset_for_d8)', ],
         }],
-        ['(OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="netbsd" \
+        ['OS=="solaris"', {'defines': ['_GLIBCXX_USE_C99_MATH'], 'ldflags': ['-march=x86-64', '-m64']}],
+	['(OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="netbsd" \
            or OS=="openbsd" or OS=="solaris" or OS=="android" \
            or OS=="qnx" or OS=="aix")', {
              'sources': [ 'd8-posix.cc', ]
@@ -130,7 +131,7 @@
             '<(SHARED_INTERMEDIATE_DIR)/d8-js.cc',
           ],
           'action': [
-            'python',
+            '<(PYTHON_EXECUTABLE)',
             '../tools/js2c.py',
             '<@(_outputs)',
             'D8',

3rdParty/V8/V8-4.9.391/test/cctest/cctest.gyp

@@ -335,7 +335,7 @@
             '<(generated_file)',
           ],
           'action': [
-            'python',
+            '<(PYTHON_EXECUTABLE)',
             '../../tools/js2c.py',
             '<@(_outputs)',
             'TEST',  # type

3rdParty/V8/V8-4.9.391/third_party/icu/icu.gyp

@@ -37,7 +37,8 @@
           'U_STATIC_IMPLEMENTATION',
         ],
       }],
-      ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
+      ['OS=="solaris"', {'defines': ['_GLIBCXX_USE_C99_MATH'], 'cflags': ['-m64']}],
+      ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS!="solaris" \
          or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \
         (target_arch=="arm" or target_arch=="ia32" or \
          target_arch=="mipsel")', {

3rdParty/V8/V8-4.9.391/third_party/icu/source/common/uposixdefs.h

@@ -42,8 +42,10 @@
      * and define _XOPEN_SOURCE to different values depending on __STDC_VERSION__.
      * In C++ source code (e.g., putil.cpp), __STDC_VERSION__ is not defined at all.
      */
+#if !defined(_SCO_DS)
 #   define _XOPEN_SOURCE 600
 #endif
+#endif
 
 /*
  * Make sure things like readlink and such functions work.
@@ -52,9 +54,11 @@
  *
  * z/OS needs this definition for timeval and to get usleep.
  */
+#if !defined(__sun) && !defined(_SCO_DS)
 #if !defined(_XOPEN_SOURCE_EXTENDED)
 #   define _XOPEN_SOURCE_EXTENDED 1
 #endif
+#endif
 
 /*
  * There is an issue with turning on _XOPEN_SOURCE_EXTENDED on certain platforms.

3rdParty/V8/V8-4.9.391/third_party/icu/source/config/mh-solaris-gcc

@@ -23,7 +23,7 @@ LD_RPATH=       -R'$$'ORIGIN
 LD_RPATH_PRE=   -R
 
 ## Compiler switch to embed a library name
-LD_SONAME = -h $(notdir $(MIDDLE_SO_TARGET))
+LD_SONAME = -Wl,-h,$(notdir $(MIDDLE_SO_TARGET))
 
 ## Shared library options
 LD_SOOPTIONS= -Wl,-Bsymbolic

3rdParty/V8/V8-4.9.391/tools/gyp/v8.gyp

@@ -1471,7 +1471,7 @@
           'variables': {
             'gyp_generators': '<!(echo $GYP_GENERATORS)',
           },
-          'msvs_disabled_warnings': [4351, 4355, 4800],
+          'msvs_disabled_warnings': [4312, 4351, 4355, 4800],
           # When building Official, the .lib is too large and exceeds the 2G
           # limit. This breaks it into multiple pieces to avoid the limit.
           # See http://crbug.com/485155.
@@ -1723,6 +1723,7 @@
           ]},
         ],
         ['OS=="solaris"', {
+            'defines': ['_GLIBCXX_USE_C99_MATH'],
             'link_settings': {
               'libraries': [
                 '-lnsl -lrt',
@@ -1772,7 +1773,7 @@
                 '../../src/base/platform/platform-win32.cc',
                 '../../src/base/win32-headers.h',
               ],
-              'msvs_disabled_warnings': [4351, 4355, 4800],
+              'msvs_disabled_warnings': [4312, 4351, 4355, 4800],
               'link_settings':  {
                 'libraries': [ '-lwinmm.lib', '-lws2_32.lib' ],
               },
@@ -1946,6 +1947,7 @@
         {
           'action_name': 'js2c',
           'inputs': [
+	    '<(PYTHON_EXECUTABLE)',
             '../../tools/js2c.py',
             '<@(library_files)',
             '<@(i18n_library_files)'
@@ -1963,6 +1965,7 @@
         {
           'action_name': 'js2c_bin',
           'inputs': [
+	    '<(PYTHON_EXECUTABLE)',
             '../../tools/js2c.py',
             '<@(library_files)',
             '<@(i18n_library_files)'