bvibber · TannerRogalsky · Aug 16, 2017 · Aug 16, 2017 · Aug 16, 2017 · Aug 16, 2017
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,31 @@
+sudo: required
+
+language: python
+
+env:
+- TEST_TARGET=other
+- TEST_TARGET="ALL.test_a* ALL.test_b*"
+- TEST_TARGET=ALL.test_c*
+- TEST_TARGET="default.test_d* asm1.test_d* asm2.test_d* asm2f.test_d* asm2g.test_d* asm3.test_d*"
+- TEST_TARGET=asm2i.test_d*
+- TEST_TARGET=ALL.test_e*
+- TEST_TARGET=ALL.test_f*
+- TEST_TARGET="ALL.test_g* ALL.test_h* ALL.test_i*"
+- TEST_TARGET="ALL.test_j* ALL.test_k* ALL.test_l* ALL.test_m* ALL.test_n* ALL.test_o*"
+- TEST_TARGET="default.test_p* asm1.test_p* asm2.test_p* asm2f.test_p* asm2g.test_p* asm3.test_p*"
+- TEST_TARGET=asm2i.test_p*
+- TEST_TARGET="ALL.test_q* ALL.test_r* ALL.test_s* ALL.test_t*"
+- TEST_TARGET="ALL.test_u* ALL.test_v* ALL.test_w* ALL.test_x* ALL.test_y* ALL.test_z*"
+
+services:
+- docker
+
+before_install:
+- docker pull ubuntu:16.04
+
+script:
+- echo $TEST_TARGET
+- docker build --build-arg TEST_TARGET="$TEST_TARGET" .
+
+notifications:
+  email: false
diff --git a/AUTHORS b/AUTHORS
@@ -75,7 +75,7 @@ a license to everyone to use it as detailed in LICENSE.)
 * Anthony J. Thibault <[email protected]>
 * John Allwine <[email protected]>
 * Martin Gerhardy <[email protected]>
-* James Gregory <[email protected]> (copyright owned by Zynga, Inc)
+* James Gregory <[email protected]> (copyright owned by Zynga, Inc.)
 * Dan Gohman <[email protected]> (copyright owned by Google, Inc.)
 * Jeff Gilbert <[email protected]> (copyright owned by Mozilla Foundation)
 * Frits Talbot <[email protected]>
@@ -87,7 +87,7 @@ a license to everyone to use it as detailed in LICENSE.)
 * Manfred Manik Nerurkar <nerurkar*at*made-apps.biz> (copyright owned by MADE, GmbH)
 * Joseph Gentle <[email protected]>
 * Douglas T. Crosher <[email protected]> (copyright owned by Mozilla Foundation)
-* Douglas T. Crosher <[email protected]> (copyright owned by Scieneer Pty Ltd)
+* Douglas T. Crosher <[email protected]> (copyright owned by Scieneer Pty Ltd.)
 * Soeren Balko <[email protected]>
 * Ryan Kelly ([email protected])
 * Michael Lelli <[email protected]>
@@ -269,6 +269,7 @@ a license to everyone to use it as detailed in LICENSE.)
 * Vilibald Wanča <[email protected]>
 * Alex Hixon <[email protected]>
 * Vladimir Davidovich <[email protected]>
+* Yuriy Levchenko <[email protected]>
 * Dmitry Tolmachov <[email protected]>
 * Dylan McKay <[email protected]>
 * Christophe Gragnic <[email protected]>
@@ -283,7 +284,7 @@ a license to everyone to use it as detailed in LICENSE.)
 * Evan Wallace <[email protected]>
 * Henning Pohl <[email protected]>
 * Tim Neumann <[email protected]>
-* Ondrej Stava <[email protected]> (copyright owned by Google, Inc.
+* Ondrej Stava <[email protected]> (copyright owned by Google, Inc.)
 * Jakub Jirutka <[email protected]>
 * Loo Rong Jie <[email protected]>
 * Jean-François Geyelin <[email protected]>
@@ -296,3 +297,24 @@ a license to everyone to use it as detailed in LICENSE.)
 * Yair Levinson (copyright owned by Autodesk, Inc.)
 * Matjaž Drolc <[email protected]>
 * James Swift <[email protected]> (copyright owned by PSPDFKit GmbH)
+* Ryan Lester <[email protected]> (copyright owned by Cyph, Inc.)
+* Nikolay Zapolnov <[email protected]>
+* Nazar Mokrynskyi <[email protected]>
+* Yury Delendik <[email protected]> (copyright owned by Mozilla Foundation)
+* Kenneth Perry <[email protected]>
+* Jim Mussared <[email protected]>
+* Dirk Vanden Boer <[email protected]>
+* Mitchell Foley <[email protected]> (copyright owned by Google, Inc.)
+* Oleksandr Chekhovskyi <[email protected]>
+* Michael Siebert <[email protected]>
+* Jonathan Hale <[email protected]>
+* Etienne Brateau <[email protected]>
+* Zhiming Wang <[email protected]>
+* Jameson Ernst <[email protected]>
+* Yoan Lecoq <[email protected]>
+* Jiajie Hu <[email protected]> (copyright owned by Intel Corporation)
+* Kamil Klimek <[email protected]>
+* José Carlos Pujol <josecpujol(at)gmail.com>
+* Dannii Willis <[email protected]>
+* Erik Dubbelboer <[email protected]>
+
diff --git a/ChangeLog.markdown b/ChangeLog.markdown
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,23 @@
+# For travis
+FROM buildpack-deps:xenial
+SHELL ["/bin/bash", "-c"]
+ENV DEBIAN_FRONTEND noninteractive
+RUN mkdir -p /root/emscripten/
+COPY . /root/emscripten/
+
+RUN cd /root/ \
+ && apt-get update \
+ && apt-get install -y python python-pip cmake build-essential openjdk-9-jre-headless \
+ && pip install --upgrade pip \
+ && pip install lit \
+ && wget https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portable.tar.gz \
+ && tar -xf emsdk-portable.tar.gz \
+ && pushd emsdk-portable \
+ && ./emsdk update \
+ && ./emsdk install latest \
+ && ./emsdk activate latest \
+ && popd \
+ && echo EMSCRIPTEN_ROOT="'/root/emscripten/'" >> .emscripten
+
+ARG TEST_TARGET
+RUN python /root/emscripten/tests/runner.py $TEST_TARGET skip:ALL.test_sse1_full skip:ALL.test_sse2_full skip:ALL.test_sse3_full skip:ALL.test_ssse3_full skip:ALL.test_sse4_1_full skip:other.test_native_link_error_message skip:other.test_bad_triple skip:ALL.test_binaryen skip:other.test_binaryen* skip:other.test_on_abort skip:other.test_sysconf_phys_pages skip:other.test_wasm_targets skip:other.test_symbol_map skip:other.test_legalize_js_ffi
diff --git a/cmake/Modules/Platform/Emscripten.cmake b/cmake/Modules/Platform/Emscripten.cmake
@@ -2,10 +2,10 @@
 # It teaches CMake about the Emscripten compiler, so that CMake can generate makefiles
 # from CMakeLists.txt that invoke emcc.
 
-# Since updating to LLVM 3.9, its build system requires CMake 3.4.3 or newer, so use this as a
-# baseline requirement for Emscripten toolchain as well, as developers will have this version or
-# they would have been unable to build LLVM in the first place.
-cmake_minimum_required(VERSION 3.4.3)
+# At the moment this required minimum version is not exact (i.e. we do not know of a feature that needs CMake 3.0.0 specifically)
+# It is possible that CMake 3.0.0 is too old and will not actually work. If you do find such a case, please report it at Emscripten
+# bug tracker to revise the minimum requirement. See also https://github.com/juj/emsdk/issues/108
+cmake_minimum_required(VERSION 3.0.0)
 
 # To use this toolchain file with CMake, invoke CMake with the following command line parameters
 # cmake -DCMAKE_TOOLCHAIN_FILE=<EmscriptenRoot>/cmake/Modules/Platform/Emscripten.cmake
@@ -110,7 +110,7 @@ if (EMSCRIPTEN_FORCE_COMPILERS)
 		if (NOT "${_cmake_compiler_output}" MATCHES "[Ee]mscripten")
 			message(FATAL_ERROR "System LLVM compiler cannot be used to build with Emscripten! Check Emscripten's LLVM toolchain location in .emscripten configuration file, and make sure to point CMAKE_C_COMPILER to where emcc is located. (was pointing to \"${CMAKE_C_COMPILER}\")")
 		endif()
-		string(REGEX MATCH "clang version ([0-9\.]+)" _dummy_unused "${_cmake_compiler_output}")
+		string(REGEX MATCH "clang version ([0-9\\.]+)" _dummy_unused "${_cmake_compiler_output}")
 		if (NOT CMAKE_MATCH_1)
 			message(FATAL_ERROR "Failed to regex parse Clang compiler version from version string: ${_cmake_compiler_output}")
 		endif()
@@ -137,15 +137,27 @@ if (EMSCRIPTEN_FORCE_COMPILERS)
 	set(CMAKE_C_PLATFORM_ID "emscripten")
 	set(CMAKE_CXX_PLATFORM_ID "emscripten")
 
-	set(CMAKE_C_COMPILE_FEATURES "c_function_prototypes;c_restrict;c_variadic_macros;c_static_assert")
-	set(CMAKE_C90_COMPILE_FEATURES "c_function_prototypes")
-	set(CMAKE_C99_COMPILE_FEATURES "c_restrict;c_variadic_macros")
-	set(CMAKE_C11_COMPILE_FEATURES "c_static_assert")
-
-	set(CMAKE_CXX_COMPILE_FEATURES "cxx_template_template_parameters;cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates;cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates")
-	set(CMAKE_CXX98_COMPILE_FEATURES "cxx_template_template_parameters")
-	set(CMAKE_CXX11_COMPILE_FEATURES "cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates")
-	set(CMAKE_CXX14_COMPILE_FEATURES "cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates")
+	if ("${CMAKE_VERSION}" VERSION_LESS "3.8")
+		set(CMAKE_C_COMPILE_FEATURES "c_function_prototypes;c_restrict;c_variadic_macros;c_static_assert")
+		set(CMAKE_C90_COMPILE_FEATURES "c_function_prototypes")
+		set(CMAKE_C99_COMPILE_FEATURES "c_restrict;c_variadic_macros")
+		set(CMAKE_C11_COMPILE_FEATURES "c_static_assert")
+
+		set(CMAKE_CXX_COMPILE_FEATURES "cxx_template_template_parameters;cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates;cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates")
+		set(CMAKE_CXX98_COMPILE_FEATURES "cxx_template_template_parameters")
+		set(CMAKE_CXX11_COMPILE_FEATURES "cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates")
+		set(CMAKE_CXX14_COMPILE_FEATURES "cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates")
+	else()
+		set(CMAKE_C_COMPILE_FEATURES "c_std_90;c_function_prototypes;c_std_99;c_restrict;c_variadic_macros;c_std_11;c_static_assert")
+		set(CMAKE_C90_COMPILE_FEATURES "c_std_90;c_function_prototypes")
+		set(CMAKE_C99_COMPILE_FEATURES "c_std_99;c_restrict;c_variadic_macros")
+		set(CMAKE_C11_COMPILE_FEATURES "c_std_11;c_static_assert")
+
+		set(CMAKE_CXX_COMPILE_FEATURES "cxx_std_98;cxx_template_template_parameters;cxx_std_11;cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates;cxx_std_14;cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates;cxx_std_17")
+		set(CMAKE_CXX98_COMPILE_FEATURES "cxx_std_98;cxx_template_template_parameters")
+		set(CMAKE_CXX11_COMPILE_FEATURES "cxx_std_11;cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates")
+		set(CMAKE_CXX14_COMPILE_FEATURES "cxx_std_14;cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates")
+	endif()
 endif()
 
 # To find programs to execute during CMake run time with find_program(), e.g. 'git' or so, we allow looking

diff --git a/em++ b/em++
@@ -18,4 +18,4 @@ if sys.version_info.major == 2:
 else:
   import os, subprocess
   if __name__ == '__main__':
-    sys.exit(subprocess.call(['python2', os.path.join(os.path.dirname(__file__), 'emcc.py')] + sys.argv[1:]))
+    sys.exit(subprocess.call(['python2', os.path.join(os.path.dirname(os.path.realpath(__file__)), 'emcc.py')] + sys.argv[1:]))
diff --git a/em++.py b/em++.py
@@ -14,4 +14,4 @@
 else:
   import os, subprocess
   if __name__ == '__main__':
-    sys.exit(subprocess.call(['python2', os.path.join(os.path.dirname(__file__), 'emcc.py')] + sys.argv[1:]))
+    sys.exit(subprocess.call(['python2', os.path.join(os.path.dirname(os.path.realpath(__file__)), 'emcc.py')] + sys.argv[1:]))
diff --git a/em-config b/em-config
@@ -11,14 +11,15 @@ This tool prints the value of the variable to stdout if one
 is found, or exits with 1 if the variable does not exist.
 '''
 
+from __future__ import print_function
 import os, sys, re
 from tools import shared
 
 if len(sys.argv) != 2 or \
   not re.match(r"^[\w\W_][\w\W_\d]*$", sys.argv[1]) or \
   not (sys.argv[1] in dir(shared)):
-  print 'Usage: em-config VAR_NAME'
+  print('Usage: em-config VAR_NAME')
   exit(1)
 
-print eval('shared.' + sys.argv[1])
+print(eval('shared.' + sys.argv[1]))
 
diff --git a/emar b/emar
@@ -15,4 +15,4 @@ if sys.version_info.major == 2:
 else:
   import os, subprocess
   if __name__ == '__main__':
-    sys.exit(subprocess.call(['python2', os.path.join(os.path.dirname(__file__), 'emar.py')] + sys.argv[1:]))
+    sys.exit(subprocess.call(['python2', os.path.join(os.path.dirname(os.path.realpath(__file__)), 'emar.py')] + sys.argv[1:]))
diff --git a/emar.py b/emar.py
@@ -7,6 +7,7 @@
 This script acts as a frontend replacement for ar. See emcc.
 '''
 
+from __future__ import print_function
 from tools.toolchain_profiler import ToolchainProfiler
 if __name__ == '__main__':
   ToolchainProfiler.record_process_start()
@@ -25,10 +26,10 @@ def run():
   newargs = [shared.LLVM_AR] + sys.argv[1:]
 
   if DEBUG:
-    print >> sys.stderr, 'emar:', sys.argv, '  ==>  ', newargs
+    print('emar:', sys.argv, '  ==>  ', newargs, file=sys.stderr)
 
+  to_delete = []
   if len(newargs) > 2:
-    to_delete = []
     if 'r' in newargs[1]:
       # we are adding files to the archive.
       # find the .a; everything after it is an input file.
@@ -58,9 +59,12 @@ def run():
                 pass
           break
         i += 1
-    subprocess.call(newargs)
-    for d in to_delete:
-      shared.try_delete(d)
+
+  if DEBUG:
+    print('Invoking ' + str(newargs))
+  subprocess.call(newargs, stdin=sys.stdin)
+  for d in to_delete:
+    shared.try_delete(d)
 
 if __name__ == '__main__':
   run()