Skip to content

Commit

Permalink
Fix missing export of malloc for newer versions of Emscripten.
Browse files Browse the repository at this point in the history
Work around issue with TSAN and newer kernels.

Update actions/checkout to v4.
  • Loading branch information
rmacnak committed Mar 17, 2024
1 parent 109074b commit 9d20134
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
20 changes: 11 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
linux:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Dependencies
run: |
sudo apt-get update
Expand All @@ -22,7 +22,7 @@ jobs:
linux-asan:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Dependencies
run: |
sudo apt-get update
Expand All @@ -36,7 +36,7 @@ jobs:
linux-msan:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Dependencies
run: |
sudo apt-get update
Expand All @@ -50,21 +50,23 @@ jobs:
linux-tsan:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Dependencies
run: |
sudo apt-get update
sudo apt-get install g++ scons
- name: Build
run: ./build arch=x64 sanitize=thread
- name: Reduce ASLR - https://github.com/google/sanitizers/issues/1716
run: sudo sysctl vm.mmap_rnd_bits=28
- name: Test
run: ./out/ReleaseTSanX64/primordialsoup out/snapshots/TestRunner.vfuel
env:
TSAN_OPTIONS: halt_on_error=1
linux-ubsan:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Dependencies
run: |
sudo apt-get update
Expand All @@ -78,7 +80,7 @@ jobs:
macos:
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Dependencies
run: HOMEBREW_NO_AUTO_UPDATE=1 brew install scons
- name: Build
Expand All @@ -88,7 +90,7 @@ jobs:
windows:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Dependencies
run: pip install scons
- name: Build
Expand All @@ -100,7 +102,7 @@ jobs:
android:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Dependencies
run: |
sudo apt-get update
Expand All @@ -110,7 +112,7 @@ jobs:
web:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Dependencies
run: |
sudo apt-get update
Expand Down
2 changes: 1 addition & 1 deletion SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ def BuildVM(cxx, arch, target_os, debug, sanitize):
env['LINKFLAGS'] += [
'-s', 'ALLOW_MEMORY_GROWTH=1',
'-s', 'ENVIRONMENT=web',
'-s', 'EXPORTED_FUNCTIONS=["_load_snapshot", "_handle_message", "_handle_signal", "_free"]',
'-s', 'EXPORTED_FUNCTIONS=["_load_snapshot", "_handle_message", "_handle_signal", "_malloc", "_free"]',
'-s', 'FILESYSTEM=0',
'-s', 'MALLOC=emmalloc',
'-s', 'TOTAL_STACK=131072',
Expand Down

0 comments on commit 9d20134

Please sign in to comment.