Merge branch 'master' into libgif

Author: saschanaz

.circleci/config.yml

@@ -399,7 +399,7 @@ jobs:
     steps:
       - run-tests:
           # also add a few asan tests
-          test_targets: "wasm2 asan.test_embind* asan.test_abort_on_exceptions asan.test_ubsan_full_left_shift_fsanitize_integer"
+          test_targets: "wasm2 asan.test_embind* asan.test_abort_on_exceptions asan.test_ubsan_full_left_shift_fsanitize_integer asan.test_pthread*"
   test-wasm3:
     executor: bionic
     steps:

AUTHORS

@@ -525,10 +525,12 @@ a license to everyone to use it as detailed in LICENSE.)
 * Jean-Sébastien Nadeau <mundusnine@gmail.com> (copyright owned by Foundry Interactive Inc.)
 * Wouter van Oortmerssen <wvo@google.com> (copyright owned by Google, LLC)
 * Alexey Sokolov <sokolov@google.com> (copyright owned by Google, LLC)
+* Lukas Rieger <rieger@progress-psd.com>
 * Ivan Romanovski <ivan.romanovski@gmail.com>
 * Max Brunsfeld <maxbrunsfeld@gmail.com>
 * Basil Fierz <basil.fierz@hotmail.com>
 * Rod Hyde <rod@badlydrawngames.com>
 * Aleksey Kliger <aleksey@lambdageek.org> (copyright owned by Microsoft, Inc.)
 * Nicolas Ollinger <nopid@free.fr>
 * Michael R. Crusoe <crusoe@debian.org>
+* Thomas Ballinger <thomasballinger@gmail.com>

ChangeLog.md

@@ -20,9 +20,17 @@ See docs/process.md for more on how version tagging works.
 
 Current Trunk
 -------------
+- Stop overriding CMake default flags based on build type. This will 
+  result in builds that are more like CMake does on other platforms. You
+  may notice that `RelWithDebInfo` will now include debug info (it did not
+  before, which appears to have been an error), and that `Release` will
+  use `-O3` instead of `-O2` (which is a better choice anyhow). (#13083)
 
 2.0.11: 12/17/2020
 ------------------
+- `emcc -v` no longer forces the running the sanity checks.  Sanity checks
+  are always run on first use or can be forced with `--check` or by setting
+  `EMCC_DEBUG` is set in the environment.
 - An upstream LLVM regression with global initializer linking has been fixed
   (#13038).
 - Remove a racy unneeded assertion about async dynamic linking (#13060).

cmake/Modules/Platform/Emscripten.cmake

@@ -268,23 +268,6 @@ set(CMAKE_HAVE_SYS_PRCTL_H 1)
 set(CMAKE_WORDS_BIGENDIAN 0)
 set(CMAKE_DL_LIBS)
 
-set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG -O2" CACHE STRING "Emscripten-overridden CMAKE_C_FLAGS_RELEASE")
-set(CMAKE_C_FLAGS_MINSIZEREL "-DNDEBUG -Os" CACHE STRING "Emscripten-overridden CMAKE_C_FLAGS_MINSIZEREL")
-set(CMAKE_C_FLAGS_RELWITHDEBINFO "-DNDEBUG -O2" CACHE STRING "Emscripten-overridden CMAKE_C_FLAGS_RELWITHDEBINFO")
-set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O2" CACHE STRING "Emscripten-overridden CMAKE_CXX_FLAGS_RELEASE")
-set(CMAKE_CXX_FLAGS_MINSIZEREL "-DNDEBUG -Os" CACHE STRING "Emscripten-overridden CMAKE_CXX_FLAGS_MINSIZEREL")
-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-DNDEBUG -O2" CACHE STRING "Emscripten-overridden CMAKE_CXX_FLAGS_RELWITHDEBINFO")
-
-set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-O2" CACHE STRING "Emscripten-overridden CMAKE_EXE_LINKER_FLAGS_RELEASE")
-set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "-Os" CACHE STRING "Emscripten-overridden CMAKE_EXE_LINKER_FLAGS_MINSIZEREL")
-set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "-O2 -g" CACHE STRING "Emscripten-overridden CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO")
-set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "-O2" CACHE STRING "Emscripten-overridden CMAKE_SHARED_LINKER_FLAGS_RELEASE")
-set(CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL "-Os" CACHE STRING "Emscripten-overridden CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL")
-set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "-O2 -g" CACHE STRING "Emscripten-overridden CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO")
-set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "-O2" CACHE STRING "Emscripten-overridden CMAKE_MODULE_LINKER_FLAGS_RELEASE")
-set(CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL "-Os" CACHE STRING "Emscripten-overridden CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL")
-set(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "-O2 -g" CACHE STRING "Emscripten-overridden CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO")
-
 function(em_validate_asmjs_after_build target)
   message(WARNING "em_validate_asmjs_after_build no longer exists")
 endfunction()

docs/emcc.txt

@@ -401,16 +401,18 @@ Options that are modified or new in *emcc* are listed below:
 "-v"
    Turns on verbose output.
 
-   This will pass "-v" to *Clang*, and also enable "EMCC_DEBUG" to
-   generate intermediate files for the compiler's various stages. It
-   will also run Emscripten's internal sanity checks on the toolchain,
-   etc.
+   This will print the internal sub-commands run by emscripten as well
+   as "-v" to *Clang*.
 
    Tip:
 
      "emcc -v" is a useful tool for diagnosing errors. It works with
      or without other arguments.
 
+"--check"
+   Runs Emscripten's internal sanity checks and reports any issues
+   with the current configuration.
+
 "--cache"
    Sets the directory to use as the Emscripten cache. The Emscripten
    cache is used to store pre-built versions of "libc", "libcxx" and

embuilder.py

@@ -142,8 +142,6 @@ def main():
     force = True
 
   # process tasks
-  libname = system_libs.Ports.get_lib_name
-
   auto_tasks = False
   tasks = args.targets
   if 'SYSTEM' in tasks:
@@ -183,59 +181,59 @@ def main():
         shared.Cache.erase_file('generated_struct_info.json')
       emscripten.generate_struct_info()
     elif what == 'icu':
-      build_port('icu', libname('libicuuc'))
+      build_port('icu', 'libicuuc.a')
     elif what == 'zlib':
       shared.Settings.USE_ZLIB = 1
       build_port('zlib', 'libz.a')
       shared.Settings.USE_ZLIB = 0
     elif what == 'bzip2':
       build_port('bzip2', 'libbz2.a')
     elif what == 'bullet':
-      build_port('bullet', libname('libbullet'))
+      build_port('bullet', 'libbullet.a')
     elif what == 'vorbis':
-      build_port('vorbis', libname('libvorbis'))
+      build_port('vorbis', 'libvorbis.a')
     elif what == 'ogg':
-      build_port('ogg', libname('libogg'))
+      build_port('ogg', 'libogg.a')
     elif what == 'giflib':
-      build_port('giflib', libname('libgif'))
+      build_port('giflib', 'libgif.a')
     elif what == 'libjpeg':
-      build_port('libjpeg', libname('libjpeg'))
+      build_port('libjpeg', 'libjpeg.a')
     elif what == 'libpng':
-      build_port('libpng', libname('libpng'))
+      build_port('libpng', 'libpng.a')
     elif what == 'sdl2':
-      build_port('sdl2', libname('libSDL2'))
+      build_port('sdl2', 'libSDL2.a')
     elif what == 'sdl2-mt':
       shared.Settings.USE_PTHREADS = 1
-      build_port('sdl2', libname('libSDL2-mt'))
+      build_port('sdl2', 'libSDL2-mt.a')
       shared.Settings.USE_PTHREADS = 0
     elif what == 'sdl2-gfx':
-      build_port('sdl2_gfx', libname('libSDL2_gfx'))
+      build_port('sdl2_gfx', 'libSDL2_gfx.a')
     elif what == 'sdl2-image':
-      build_port('sdl2_image', libname('libSDL2_image'))
+      build_port('sdl2_image', 'libSDL2_image.a')
     elif what == 'sdl2-image-png':
       shared.Settings.SDL2_IMAGE_FORMATS = ["png"]
-      build_port('sdl2_image', libname('libSDL2_image_png'))
+      build_port('sdl2_image', 'libSDL2_image_png.a')
       shared.Settings.SDL2_IMAGE_FORMATS = []
     elif what == 'sdl2-image-jpg':
       shared.Settings.SDL2_IMAGE_FORMATS = ["jpg"]
-      build_port('sdl2_image', libname('libSDL2_image_jpg'))
+      build_port('sdl2_image', 'libSDL2_image_jpg.a')
       shared.Settings.SDL2_IMAGE_FORMATS = []
     elif what == 'sdl2-net':
-      build_port('sdl2_net', libname('libSDL2_net'))
+      build_port('sdl2_net', 'libSDL2_net.a')
     elif what == 'sdl2-mixer':
       old_formats = shared.Settings.SDL2_MIXER_FORMATS
       shared.Settings.SDL2_MIXER_FORMATS = []
-      build_port('sdl2_mixer', libname('libSDL2_mixer'))
+      build_port('sdl2_mixer', 'libSDL2_mixer.a')
       shared.Settings.SDL2_MIXER_FORMATS = old_formats
     elif what == 'sdl2-mixer-ogg':
       old_formats = shared.Settings.SDL2_MIXER_FORMATS
       shared.Settings.SDL2_MIXER_FORMATS = ["ogg"]
-      build_port('sdl2_mixer', libname('libSDL2_mixer_ogg'))
+      build_port('sdl2_mixer', 'libSDL2_mixer_ogg.a')
       shared.Settings.SDL2_MIXER_FORMATS = old_formats
     elif what == 'sdl2-mixer-mp3':
       old_formats = shared.Settings.SDL2_MIXER_FORMATS
       shared.Settings.SDL2_MIXER_FORMATS = ["mp3"]
-      build_port('sdl2_mixer', libname('libSDL2_mixer_mp3'))
+      build_port('sdl2_mixer', 'libSDL2_mixer_mp3.a')
       shared.Settings.SDL2_MIXER_FORMATS = old_formats
     elif what == 'freetype':
       build_port('freetype', 'libfreetype.a')
@@ -246,17 +244,17 @@ def main():
       build_port('harfbuzz', 'libharfbuzz-mt.a')
       shared.Settings.USE_PTHREADS = 0
     elif what == 'sdl2-ttf':
-      build_port('sdl2_ttf', libname('libSDL2_ttf'))
+      build_port('sdl2_ttf', 'libSDL2_ttf.a')
     elif what == 'cocos2d':
-      build_port('cocos2d', libname('libcocos2d'))
+      build_port('cocos2d', 'libcocos2d.a')
     elif what == 'regal':
-      build_port('regal', libname('libregal'))
+      build_port('regal', 'libregal.a')
     elif what == 'regal-mt':
       shared.Settings.USE_PTHREADS = 1
-      build_port('regal', libname('libregal-mt'))
+      build_port('regal', 'libregal-mt.a')
       shared.Settings.USE_PTHREADS = 0
     elif what == 'boost_headers':
-      build_port('boost_headers', libname('libboost_headers'))
+      build_port('boost_headers', 'libboost_headers.a')
     else:
       logger.error('unfamiliar build target: ' + what)
       return 1