Skip to content

Commit

Permalink
Merge pull request #1 from emscripten-core/incoming
Browse files Browse the repository at this point in the history
Upstream merge
  • Loading branch information
gabrielcuvillier authored Jul 26, 2019
2 parents c28a629 + f335b0e commit 9707c42
Show file tree
Hide file tree
Showing 299 changed files with 29,342 additions and 27,829 deletions.
27 changes: 13 additions & 14 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
defaults: &defaults
docker:
- image: buildpack-deps:xenial
- image: buildpack-deps:bionic
environment:
LANG: C.UTF-8
EMTEST_DETECT_TEMPFILE_LEAKS: 1
Expand Down Expand Up @@ -49,8 +49,8 @@ test-firefox: &test-firefox
command: |
# we should pin a version here, but llvm upstream now emits bulk memory for pthreads
# which requires very latest nightly as of Jul 13 2019
wget -O nightly.tar.bz2 "https://download.mozilla.org/?product=firefox-nightly-latest-ssl&os=linux64&lang=en-US"
tar xf nightly.tar.bz2
wget -O ff.tar.bz2 "https://download.mozilla.org/?product=firefox-beta-latest-ssl&os=linux64&lang=en-US"
tar xf ff.tar.bz2
- run:
name: configure firefox
command: |
Expand Down Expand Up @@ -159,8 +159,8 @@ test-chrome: &test-chrome
- run:
name: download chrome
command: |
wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
dpkg -i google-chrome-stable_current_amd64.deb
wget -O chrome.deb https://dl.google.com/linux/direct/google-chrome-beta_current_amd64.deb
dpkg -i chrome.deb
- run:
name: run tests
command: |
Expand All @@ -170,8 +170,7 @@ test-chrome: &test-chrome
CHROME_FLAGS_HEADLESS="--headless --remote-debugging-port=1234"
CHROME_FLAGS_WASM="--enable-features=WebAssembly --enable-features=SharedArrayBuffer --disable-features=WebAssemblyTrapHandler --js-flags=\"--experimental-wasm-threads --harmony-sharedarraybuffer --no-wasm-disable-structured-cloning\""
CHROME_FLAGS_NOCACHE="--disk-cache-dir=/dev/null --disk-cache-size=1 --media-cache-size=1 --disable-application-cache --incognito"
export EMTEST_BROWSER="/usr/bin/google-chrome-stable $CHROME_FLAGS_BASE $CHROME_FLAGS_HEADLESS $CHROME_FLAGS_WASM $CHROME_FLAGS_NOCACHE"
export EMTEST_LACKS_GRAPHICS_HARDWARE=1
export EMTEST_BROWSER="/usr/bin/google-chrome $CHROME_FLAGS_BASE $CHROME_FLAGS_HEADLESS $CHROME_FLAGS_WASM $CHROME_FLAGS_NOCACHE"
export EMCC_CORES=4
./emscripten/tests/runner.py browser
Expand Down Expand Up @@ -226,15 +225,11 @@ jobs:
<<: *defaults
steps:
- checkout
- run:
name: install pip
command: |
apt-get update -q
apt-get install -q -y python-pip
- run:
name: install sphinx
command: |
pip install sphinx==1.7.8
apt-get update -q
DEBIAN_FRONTEND=noninteractive apt-get install -q -y sphinx-common
- run: make -C site html
flake8:
<<: *defaults
Expand Down Expand Up @@ -342,9 +337,14 @@ jobs:
# persistent workspace and to avoid any confusion with the version
# we are trying to test.
rm -Rf `find -name "emscripten"`
echo "V8_ENGINE = '`pwd`/upstream/bin/d8'" >> ~/.emscripten
echo "JS_ENGINES = [NODE_JS, V8_ENGINE]" >> ~/.emscripten
cd -
echo "final .emscripten:"
cat ~/.emscripten
# Remove any system libs the emsdk installed: we want to rebuild
# them all from source here, to check whether new changes work.
rm -Rf ~/.emscripten_cache
- run:
name: embuilder build ALL
command: |
Expand Down Expand Up @@ -475,4 +475,3 @@ workflows:
- test-upstream-browser-firefox:
requires:
- build-upstream

3 changes: 3 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -418,3 +418,6 @@ a license to everyone to use it as detailed in LICENSE.)
* Fernando Serboncini <[email protected]>
* Christian Clauss <[email protected]> (copyright owned by IBM)
* Henry Kleynhans <[email protected]> (copyright owned by Bloomberg L.P.)
* FUJI Goro <[email protected]>
* Egor Suvorov <[email protected]> (copyright owned by think-cell Software GmbH)
* James Kuszmaul <[email protected]>
30 changes: 27 additions & 3 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,42 @@ See docs/process.md for how version tagging works.

Current Trunk
-------------

- Remove fastcomp's implementation of Asyncify. This has been deprecated for
a long time, since we added Emterpreter-Async, and now we have a new Asyncify
implementation in the upstream wasm backend. It is recommended to upgrade to
the upstream backend and use Asyncify there if you need it. (If you do still
need the older version, you can use 1.38.40.)

v.1.38.40: 07/24/2019
---------------------
- LLVM backend pthread builds no longer use external memory initialization
files, replacing them with passive data segments.
- LLVM backend now supports thread local storage via the C extension `__thread`
and C11/C++11 keyword `thread_local`. (#8976)
- Internal API change: Move read, readAsync, readBinary, setWindowTitle from
the Module object to normal JS variables. If you use those internal APIs,
you must change Module.readAsync()/Module['readAsync']() to readAsync().
Note that read is also renamed to read_ (since "read" is an API call in
the SpiderMonkey shell). In builds with ASSERTIONS an error message is
shown about the API change. This change allows better JS minification
(the names read, readAsync etc. can be minified, and if the variables are
not used they can be removed entirely). Defining these APIs on Module
(which was never documented or intended, but happened to work) is also
no longer allowed (but you can override read_ etc. from JS).

v1.38.39: 07/16/2019
--------------------
- Add support for [address sanitizer](https://clang.llvm.org/docs/AddressSanitizer.html). (#8884)
- Currently, only supports one thread without dynamic linking.
- Rename Bysyncify (the name used during development) to Asyncify. This keeps the name consistent
with the old ASYNCIFY flag, no need for a new one, as they do basically the same thing.

v1.38.38: 07/08/2019
--------------------

- Add support for standalone [leak sanitizer](https://clang.llvm.org/docs/LeakSanitizer.html). (#8711)

v1.38.37: 06/26/2019
--------------------

- Set ENV['LANG'] following the user's preferred language (HTTP Accept-Language / navigator.languages[0])
- `emscripten_run_script_string` now returns C `NULL` instead of the string `null`
or `undefined` when the result of the `eval` is JavaScript `null` or `undefined`.
Expand Down
Loading

0 comments on commit 9707c42

Please sign in to comment.