summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/ci.yml2
-rw-r--r--Contributing.md2
-rw-r--r--README.md20
-rwxr-xr-xscripts/clang-format-diff.sh2
-rwxr-xr-xscripts/clang-tidy-diff.sh2
5 files changed, 14 insertions, 14 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 23c94478e..b0367f838 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@ on:
# branches which are also PRs.
push:
branches:
- - master
+ - main
- kripken/*
pull_request:
diff --git a/Contributing.md b/Contributing.md
index 626efc3ad..6a738f9a3 100644
--- a/Contributing.md
+++ b/Contributing.md
@@ -3,7 +3,7 @@
Interested in participating? Please follow
[the same contributing guidelines as the design repository][].
- [the same contributing guidelines as the design repository]: https://github.com/WebAssembly/design/blob/master/Contributing.md
+ [the same contributing guidelines as the design repository]: https://github.com/WebAssembly/design/blob/main/Contributing.md
Also, please be sure to read [the README.md](README.md) for this repository.
diff --git a/README.md b/README.md
index 238670b4e..c1b877935 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![CI](https://github.com/WebAssembly/binaryen/workflows/CI/badge.svg?branch=master&event=push)](https://github.com/WebAssembly/binaryen/actions?query=workflow%3ACI)
+[![CI](https://github.com/WebAssembly/binaryen/workflows/CI/badge.svg?branch=main&event=push)](https://github.com/WebAssembly/binaryen/actions?query=workflow%3ACI)
# Binaryen
@@ -27,7 +27,7 @@ effective**:
Compilers using Binaryen include:
* [`AssemblyScript`](https://github.com/AssemblyScript/assemblyscript) which compiles a subset of TypeScript to WebAssembly
- * [`wasm2js`](https://github.com/WebAssembly/binaryen/blob/master/src/wasm2js.h) which compiles WebAssembly to JS
+ * [`wasm2js`](https://github.com/WebAssembly/binaryen/blob/main/src/wasm2js.h) which compiles WebAssembly to JS
* [`Asterius`](https://github.com/tweag/asterius) which compiles Haskell to WebAssembly
* [`Grain`](https://github.com/grain-lang/grain) which compiles Grain to WebAssembly
@@ -167,14 +167,14 @@ This repository contains code that builds the following tools in `bin/`:
performs emscripten-specific passes over it.
* **wasm-ctor-eval**: A tool that can execute C++ global constructors ahead of
time. Used by Emscripten.
- * **binaryen.js**: A standalone JavaScript library that exposes Binaryen methods for [creating and optimizing WASM modules](https://github.com/WebAssembly/binaryen/blob/master/test/binaryen.js/hello-world.js). For builds, see [binaryen.js on npm](https://www.npmjs.com/package/binaryen) (or download it directly from [github](https://raw.githubusercontent.com/AssemblyScript/binaryen.js/master/index.js), [rawgit](https://cdn.rawgit.com/AssemblyScript/binaryen.js/master/index.js), or [unpkg](https://unpkg.com/binaryen@latest/index.js)).
+ * **binaryen.js**: A standalone JavaScript library that exposes Binaryen methods for [creating and optimizing WASM modules](https://github.com/WebAssembly/binaryen/blob/main/test/binaryen.js/hello-world.js). For builds, see [binaryen.js on npm](https://www.npmjs.com/package/binaryen) (or download it directly from [github](https://raw.githubusercontent.com/AssemblyScript/binaryen.js/master/index.js), [rawgit](https://cdn.rawgit.com/AssemblyScript/binaryen.js/master/index.js), or [unpkg](https://unpkg.com/binaryen@latest/index.js)).
Usage instructions for each are below.
## Binaryen Optimizations
Binaryen contains
-[a lot of optimization passes](https://github.com/WebAssembly/binaryen/tree/master/src/passes)
+[a lot of optimization passes](https://github.com/WebAssembly/binaryen/tree/main/src/passes)
to make WebAssembly smaller and faster. You can run the Binaryen optimizer by
using ``wasm-opt``, but also they can be run while using other tools, like
``wasm2js`` and ``wasm-metadce``.
@@ -256,14 +256,14 @@ it works across multiple functions, but in a sense Binaryen is always “LTO”
it usually is run on the final linked wasm.
Advanced optimization techniques in the Binaryen optimizer include
-[SSAification](https://github.com/WebAssembly/binaryen/blob/master/src/passes/SSAify.cpp),
-[Flat IR](https://github.com/WebAssembly/binaryen/blob/master/src/ir/flat.h), and
-[Stack/Poppy IR](https://github.com/WebAssembly/binaryen/blob/master/src/ir/stack-utils.h).
+[SSAification](https://github.com/WebAssembly/binaryen/blob/main/src/passes/SSAify.cpp),
+[Flat IR](https://github.com/WebAssembly/binaryen/blob/main/src/ir/flat.h), and
+[Stack/Poppy IR](https://github.com/WebAssembly/binaryen/blob/main/src/ir/stack-utils.h).
Binaryen also contains various passes that do other things than optimizations,
like
-[legalization for JavaScript](https://github.com/WebAssembly/binaryen/blob/master/src/passes/LegalizeJSInterface.cpp),
-[Asyncify](https://github.com/WebAssembly/binaryen/blob/master/src/passes/Asyncify.cpp),
+[legalization for JavaScript](https://github.com/WebAssembly/binaryen/blob/main/src/passes/LegalizeJSInterface.cpp),
+[Asyncify](https://github.com/WebAssembly/binaryen/blob/main/src/passes/Asyncify.cpp),
etc.
## Building
@@ -335,7 +335,7 @@ commands.
It's easy to add your own transformation passes to the shell, just add `.cpp`
files into `src/passes`, and rebuild the shell. For example code, take a look at
-the [`lower-if-else` pass](https://github.com/WebAssembly/binaryen/blob/master/src/passes/LowerIfElse.cpp).
+the [`lower-if-else` pass](https://github.com/WebAssembly/binaryen/blob/main/src/passes/LowerIfElse.cpp).
Some more notes:
diff --git a/scripts/clang-format-diff.sh b/scripts/clang-format-diff.sh
index 2525259e9..fa858b9ab 100755
--- a/scripts/clang-format-diff.sh
+++ b/scripts/clang-format-diff.sh
@@ -12,7 +12,7 @@ fi
if [ -n "$TRAVIS_BRANCH" ]; then
BRANCH=$TRAVIS_BRANCH
else
- BRANCH=origin/master
+ BRANCH=origin/main
fi
MERGE_BASE=$(git merge-base $BRANCH HEAD)
diff --git a/scripts/clang-tidy-diff.sh b/scripts/clang-tidy-diff.sh
index c8d6b11a5..fbfa7350d 100755
--- a/scripts/clang-tidy-diff.sh
+++ b/scripts/clang-tidy-diff.sh
@@ -12,7 +12,7 @@ fi
if [ -n "$TRAVIS_BRANCH" ]; then
BRANCH=$TRAVIS_BRANCH
else
- BRANCH=origin/master
+ BRANCH=origin/main
fi
CLANG_TIDY=$(which clang-tidy)