Skip to content

Commit 49e0031

Browse files
committed
Merge tag '1.38.46' of https://github.com/emscripten-core/emscripten into library_webgpu
2 parents f76fed7 + 801d177 commit 49e0031

File tree

363 files changed

+74769
-2581
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

363 files changed

+74769
-2581
lines changed

.circleci/config.yml

Lines changed: 409 additions & 320 deletions
Large diffs are not rendered by default.

.flake8

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ exclude =
1313
./tools/create_dom_pk_codes.py,
1414
./tools/asm_module.py,
1515
./tools/ffdb.py,
16+
./system/lib/ # system libraries

.github/stale.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Number of days of inactivity before an issue becomes stale
2+
daysUntilStale: 365
3+
# Number of days of inactivity before a stale issue is closed
4+
daysUntilClose: 7
5+
# Issues with these labels will never be considered stale
6+
exemptLabels:
7+
- pinned
8+
- security
9+
# Label to use when marking an issue as stale
10+
staleLabel: wontfix
11+
# Comment to post when marking an issue as stale. Set to `false` to disable
12+
markComment: >
13+
This issue has been automatically marked as stale because there has been no
14+
activity in the past year. It will be closed automatically if no further
15+
activity occurs in the next 7 days. Feel free to re-open at any time if this
16+
issue is still relevant.
17+
# Comment to post when closing a stale issue. Set to `false` to disable
18+
closeComment: false

.gitignore

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,27 @@
22
*~
33
*.swp
44

5-
*.diff
5+
# Compiled python files
66
*.pyc
7-
*.bc
87

98
# Ignore only the root node_modules, but not any further down the path
109
/node_modules/
1110

12-
# Ignore generated files
11+
# Python coverage tool output
12+
.coverage*
13+
tools/coverage/
14+
htmlcov/
15+
coverage.xml
1316

17+
# Files generated by test code (TODO: generate these elsewhere and remove)
1418
tests/fake/
19+
tests/fake1/
20+
tests/fake2/
1521
tests/freetype/objs/*.o
1622
tests/freetype/objs/*.lo
1723

1824
third_party/lzma.js/lzip/*.o
1925
third_party/lzma.js/lzma-native
2026
third_party/lzma.js/lzma-native.exe
2127

22-
tools/optimizer_build/
23-
2428
.DS_Store
25-
26-
.coverage*
27-
tools/coverage/
28-
htmlcov/
29-
coverage.xml

AUTHORS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,3 +422,10 @@ a license to everyone to use it as detailed in LICENSE.)
422422
* Egor Suvorov <[email protected]> (copyright owned by think-cell Software GmbH)
423423
* James Kuszmaul <[email protected]>
424424
* Wei Mingzhi <[email protected]>
425+
* Sergey karchevsky <[email protected]>
426+
* Ajay Patel <[email protected]>
427+
* Adrien Devresse <[email protected]>
428+
* Petr Penzin ([email protected]) (copyright owned by Intel Corporation)
429+
* Andrei Alexeyev <[email protected]>
430+
* Cesar Guirao Robles <[email protected]>
431+
* Mehdi Sabwat <[email protected]>

ChangeLog.md

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,42 @@ See docs/process.md for how version tagging works.
1818

1919
Current Trunk
2020
-------------
21+
22+
v.1.38.46: 09/25/2019
23+
---------------------
24+
- Rename libpthreads to libpthread to match its normal name on other platforms.
25+
This change should be completely internal to emscripten.
26+
- Remove redundnant `COMPILER_ENGINE` and `JS_ENGINE` options. We only support
27+
node as the compiler engine so just use a single `NODE_JS` option for that.
28+
- Module.abort is no longer exported by default. It can be exported in the normal
29+
way using `EXTRA_EXPORTED_RUNTIME_METHODS`, and as with other such changes in
30+
the past, forgetting to export it with show a clear error in `ASSERTIONS` mode.
31+
- Remove `EMITTING_JS` flag, and replace it with `STANDALONE_WASM`. That flag indicates
32+
that we want the wasm to be as standalone as possible. We may still emit JS in
33+
that case, but the JS would just be a convenient way to run the wasm on the Web
34+
or in Node.js.
35+
36+
v.1.38.45: 09/12/2019
37+
---------------------
38+
39+
v.1.38.44: 09/11/2019
40+
---------------------
41+
- Remove Binaryen from the ports system. This means that emscripten will
42+
no longer automatically build Binaryen from source. Instead, either use
43+
the emsdk (binaries are provided automatically, just like for LLVM), or
44+
build it yourself and point `BINARYEN_ROOT` in .emscripten to it. See #9409
45+
46+
v.1.38.43: 08/30/2019
47+
---------------------
48+
- noExitRuntime is no longer a property on the Module object. Use `noExitRuntime`
49+
instead of `Module.noExitRuntime`.
50+
51+
v.1.38.42: 08/19/2019
52+
----------------------
2153
- Add support for [address sanitizer](https://clang.llvm.org/docs/AddressSanitizer.html)
2254
and standalone [leak sanitizer](https://clang.llvm.org/docs/LeakSanitizer.html)
2355
with multiple threads. (#9060, #9076)
24-
- Remove ERROR_ON_MISSING_LIBRARIES setting (it's always on now)
56+
- Remove `ERROR_ON_MISSING_LIBRARIES` setting (it's always on now)
2557
- Remove the ability to use Python operators in flags that support KB/MB/GB/TB
2658
suffixes, e.g. `TOTAL_MEMORY`. This means that `-s TOTAL_MEMORY=1024*1024`
2759
will no longer work. This is done because the mechanism may result in

README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22

33
[![CircleCI](https://circleci.com/gh/emscripten-core/emscripten.svg?style=svg)](https://circleci.com/gh/emscripten-core/emscripten/tree/incoming)
44

5-
Emscripten is an [LLVM](https://en.wikipedia.org/wiki/LLVM)-to-JavaScript compiler. It takes LLVM bitcode - which can be generated
6-
from C/C++, using `llvm-gcc` (DragonEgg) or `clang`, or any other language that can be
7-
converted into LLVM - and compiles that into JavaScript, which can be run on the web (or
5+
Emscripten is an [LLVM](https://en.wikipedia.org/wiki/LLVM)-to-JavaScript
6+
compiler. It takes LLVM bitcode - which can be generated from C/C++, using
7+
`llvm-gcc` (DragonEgg) or `clang`, or any other language that can be converted
8+
into LLVM - and compiles that into JavaScript, which can be run on the web (or
89
anywhere else JavaScript can run).
910

10-
Links to **demos**, **tutorial**, **FAQ**, etc: <https://github.com/emscripten-core/emscripten/wiki>
11+
Links to **demos**, **tutorial**, **FAQ**, etc:
12+
<https://github.com/emscripten-core/emscripten/wiki>
1113

1214
Main project page: <http://emscripten.org>
1315

docs/process.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,6 @@ the `.emscripten` file, which it does at the `activate step.) Some of the
192192
key values in that file include:
193193

194194
* `LLVM_ROOT`: The path to the LLVM binaries.
195-
* `BINARYEN_ROOT`: The path to binaryen (the binaries are expected in `/bin` there).
195+
* `BINARYEN_ROOT`: The path to binaryen (the binaries are expected in `/bin` under there; note that
196+
despite the name this differs from `LLVM_ROOT` which points directly to the binaries).
196197
* `NODE_JS`: The path to Node.js, which is needed internally.
197-
* `COMPILER_ENGINE`: The VM used internally for the JS compiler. Normally this should be `NODE_JS`.
198-
* `JS_ENGINES`: The full list of JS engines (or just `[NODE_JS]`). Used in the test suite.
199-

emar.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@
3434
# Main run() function
3535
#
3636
def run():
37-
args = substitute_response_files(sys.argv)
37+
try:
38+
args = substitute_response_files(sys.argv)
39+
except IOError as e:
40+
shared.exit_with_error(e)
3841
newargs = [shared.LLVM_AR] + args[1:]
3942

4043
to_delete = []

0 commit comments

Comments
 (0)