Revert "Revert "Upgrade to 5.0.71.48"" DO NOT MERGE
This reverts commit f2e3994fa5148cc3d9946666f0b0596290192b0e,
and updates the x64 makefile properly so it doesn't break that
build.
FPIIM-449
Change-Id: Ib83e35bfbae6af627451c926a9650ec57c045605
(cherry picked from commit 109988c7ccb6f3fd1a58574fa3dfb88beaef6632)
diff --git a/build/standalone.gypi b/build/standalone.gypi
index 273d72b..5269b95 100644
--- a/build/standalone.gypi
+++ b/build/standalone.gypi
@@ -110,6 +110,9 @@
'use_goma%': 0,
'gomadir%': '',
+ # Check if valgrind directories are present.
+ 'has_valgrind%': '<!pymod_do_main(has_valgrind)',
+
'conditions': [
# Set default gomadir.
['OS=="win"', {
@@ -166,6 +169,7 @@
'test_isolation_mode%': '<(test_isolation_mode)',
'fastbuild%': '<(fastbuild)',
'coverage%': '<(coverage)',
+ 'has_valgrind%': '<(has_valgrind)',
# Add a simple extras solely for the purpose of the cctests
'v8_extra_library_files': ['../test/cctest/test-extra.js'],
@@ -195,6 +199,9 @@
# their own default value.
'v8_use_external_startup_data%': 1,
+ # Use a separate ignition snapshot file in standalone builds.
+ 'v8_separate_ignition_snapshot': 1,
+
# Relative path to icu.gyp from this file.
'icu_gyp_path': '../third_party/icu/icu.gyp',
@@ -313,9 +320,8 @@
['android_ndk_root==""', {
'variables': {
'android_sysroot': '<(android_toolchain)/sysroot/',
- 'android_stlport': '<(android_toolchain)/sources/cxx-stl/stlport/',
+ 'android_stl': '<(android_toolchain)/sources/cxx-stl/',
},
- 'android_include': '<(android_sysroot)/usr/include',
'conditions': [
['target_arch=="x64"', {
'android_lib': '<(android_sysroot)/usr/lib64',
@@ -323,14 +329,16 @@
'android_lib': '<(android_sysroot)/usr/lib',
}],
],
- 'android_stlport_include': '<(android_stlport)/stlport',
- 'android_stlport_libs': '<(android_stlport)/libs',
+ 'android_libcpp_include': '<(android_stl)/llvm-libc++/libcxx/include',
+ 'android_libcpp_abi_include': '<(android_stl)/llvm-libc++abi/libcxxabi/include',
+ 'android_libcpp_libs': '<(android_stl)/llvm-libc++/libs',
+ 'android_support_include': '<(android_toolchain)/sources/android/support/include',
+ 'android_sysroot': '<(android_sysroot)',
}, {
'variables': {
'android_sysroot': '<(android_ndk_root)/platforms/android-<(android_target_platform)/arch-<(android_target_arch)',
- 'android_stlport': '<(android_ndk_root)/sources/cxx-stl/stlport/',
+ 'android_stl': '<(android_ndk_root)/sources/cxx-stl/',
},
- 'android_include': '<(android_sysroot)/usr/include',
'conditions': [
['target_arch=="x64"', {
'android_lib': '<(android_sysroot)/usr/lib64',
@@ -338,11 +346,14 @@
'android_lib': '<(android_sysroot)/usr/lib',
}],
],
- 'android_stlport_include': '<(android_stlport)/stlport',
- 'android_stlport_libs': '<(android_stlport)/libs',
+ 'android_libcpp_include': '<(android_stl)/llvm-libc++/libcxx/include',
+ 'android_libcpp_abi_include': '<(android_stl)/llvm-libc++abi/libcxxabi/include',
+ 'android_libcpp_libs': '<(android_stl)/llvm-libc++/libs',
+ 'android_support_include': '<(android_ndk_root)/sources/android/support/include',
+ 'android_sysroot': '<(android_sysroot)',
}],
],
- 'android_stlport_library': 'stlport_static',
+ 'android_libcpp_library': 'c++_static',
}], # OS=="android"
['host_clang==1', {
'host_cc': '<(clang_dir)/bin/clang',
@@ -367,6 +378,9 @@
# fpxx - compatibility mode, it chooses fp32 or fp64 depending on runtime
# detection
'mips_fpu_mode%': 'fp32',
+
+ # Indicates if gcmole tools are downloaded by a hook.
+ 'gcmole%': 0,
},
'target_defaults': {
'variables': {
@@ -720,8 +734,7 @@
'cflags': [ '-fPIC', ],
}],
[ 'coverage==1', {
- 'cflags!': [ '-O3', '-O2', '-O1', ],
- 'cflags': [ '-fprofile-arcs', '-ftest-coverage', '-O0'],
+ 'cflags': [ '-fprofile-arcs', '-ftest-coverage'],
'ldflags': [ '-fprofile-arcs'],
}],
],
@@ -1005,11 +1018,7 @@
}, # configurations
'cflags': [ '-Wno-abi', '-Wall', '-W', '-Wno-unused-parameter'],
'cflags_cc': [ '-Wnon-virtual-dtor', '-fno-rtti', '-fno-exceptions',
- # Note: Using -std=c++0x will define __STRICT_ANSI__, which
- # in turn will leave out some template stuff for 'long
- # long'. What we want is -std=c++11, but this is not
- # supported by GCC 4.6 or Xcode 4.2
- '-std=gnu++0x' ],
+ '-std=gnu++11' ],
'target_conditions': [
['_toolset=="target"', {
'cflags!': [
@@ -1022,19 +1031,16 @@
'-fno-short-enums',
'-finline-limit=64',
'-Wa,--noexecstack',
- # Note: This include is in cflags to ensure that it comes after
- # all of the includes.
- '-I<(android_include)',
- '-I<(android_stlport_include)',
+ '--sysroot=<(android_sysroot)',
],
'cflags_cc': [
- '-Wno-error=non-virtual-dtor', # TODO(michaelbai): Fix warnings.
+ '-isystem<(android_libcpp_include)',
+ '-isystem<(android_libcpp_abi_include)',
+ '-isystem<(android_support_include)',
],
'defines': [
'ANDROID',
#'__GNU_SOURCE=1', # Necessary for clone()
- 'USE_STLPORT=1',
- '_STLP_USE_PTR_SPECIALIZATIONS=1',
'HAVE_OFF64_T',
'HAVE_SYS_UIO_H',
'ANDROID_BINSIZE_HACK', # Enable temporary hacks to reduce binsize.
@@ -1043,10 +1049,9 @@
'-pthread', # Not supported by Android toolchain.
],
'ldflags': [
- '-nostdlib',
'-Wl,--no-undefined',
- '-Wl,-rpath-link=<(android_lib)',
- '-L<(android_lib)',
+ '--sysroot=<(android_sysroot)',
+ '-nostdlib',
],
'libraries!': [
'-lrt', # librt is built into Bionic.
@@ -1057,12 +1062,12 @@
'-lpthread', '-lnss3', '-lnssutil3', '-lsmime3', '-lplds4', '-lplc4', '-lnspr4',
],
'libraries': [
- '-l<(android_stlport_library)',
+ '-l<(android_libcpp_library)',
+ '-latomic',
# Manually link the libgcc.a that the cross compiler uses.
'<!(<(android_toolchain)/*-gcc -print-libgcc-file-name)',
'-lc',
'-ldl',
- '-lstdc++',
'-lm',
],
'conditions': [
@@ -1079,22 +1084,22 @@
'-mfpu=vfp3',
],
'ldflags': [
- '-L<(android_stlport_libs)/armeabi-v7a',
+ '-L<(android_libcpp_libs)/armeabi-v7a',
],
}],
['target_arch=="arm" and arm_version < 7', {
'ldflags': [
- '-L<(android_stlport_libs)/armeabi',
+ '-L<(android_libcpp_libs)/armeabi',
],
}],
['target_arch=="x64"', {
'ldflags': [
- '-L<(android_stlport_libs)/x86_64',
+ '-L<(android_libcpp_libs)/x86_64',
],
}],
['target_arch=="arm64"', {
'ldflags': [
- '-L<(android_stlport_libs)/arm64-v8a',
+ '-L<(android_libcpp_libs)/arm64-v8a',
],
}],
['target_arch=="ia32" or target_arch=="x87"', {
@@ -1106,7 +1111,7 @@
'-fno-stack-protector',
],
'ldflags': [
- '-L<(android_stlport_libs)/x86',
+ '-L<(android_libcpp_libs)/x86',
],
}],
['target_arch=="mipsel"', {
@@ -1119,7 +1124,7 @@
'-fno-stack-protector',
],
'ldflags': [
- '-L<(android_stlport_libs)/mips',
+ '-L<(android_libcpp_libs)/mips',
],
}],
['(target_arch=="arm" or target_arch=="arm64" or target_arch=="x64" or target_arch=="ia32") and component!="shared_library"', {