wasm/js: use standard library syscall package

This switches -target=wasm (browser wasm) over from our own syscall package to the one used in the Go standard library. While this doesn't remove any code (so we can't simplify anything), the idea is that this improves compatibility with existing code a bit more. So It's a similar reasoning as for https://github.com/tinygo-org/tinygo/pull/4417.
2026-07-26 14:48:40 +00:00 · 2024-10-02 22:16:23 +02:00
891 changed files with 13806 additions and 48316 deletions
@@ -0,0 +1,125 @@
+version: 2.1
+
+commands:
+  submodules:
+    steps:
+      - run:
+          name: "Pull submodules"
+          command: git submodule update --init
+  llvm-source-linux:
+    steps:
+      - restore_cache:
+          keys:
+            - llvm-source-18-v1
+      - run:
+          name: "Fetch LLVM source"
+          command: make llvm-source
+      - save_cache:
+          key: llvm-source-18-v1
+          paths:
+            - llvm-project/clang/lib/Headers
+            - llvm-project/clang/include
+            - llvm-project/compiler-rt
+            - llvm-project/lld/include
+            - llvm-project/llvm/include
+  hack-ninja-jobs:
+    steps:
+      - run:
+          name: "Hack Ninja to use less jobs"
+          command: |
+            echo -e '#!/bin/sh\n/usr/bin/ninja -j3 "$@"' > /go/bin/ninja
+            chmod +x /go/bin/ninja
+  build-binaryen-linux:
+    steps:
+      - restore_cache:
+          keys:
+            - binaryen-linux-v3
+      - run:
+          name: "Build Binaryen"
+          command: |
+            make binaryen
+      - save_cache:
+          key: binaryen-linux-v3
+          paths:
+            - build/wasm-opt
+  test-linux:
+    parameters:
+      llvm:
+        type: string
+      fmt-check:
+        type: boolean
+        default: true
+    steps:
+      - checkout
+      - submodules
+      - run:
+          name: "Install apt dependencies"
+          command: |
+            echo 'deb https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-<<parameters.llvm>> main' > /etc/apt/sources.list.d/llvm.list
+            wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
+            apt-get update
+            apt-get install --no-install-recommends -y \
+                llvm-<<parameters.llvm>>-dev \
+                clang-<<parameters.llvm>> \
+                libclang-<<parameters.llvm>>-dev \
+                lld-<<parameters.llvm>> \
+                cmake \
+                ninja-build
+      - hack-ninja-jobs
+      - build-binaryen-linux
+      - restore_cache:
+          keys:
+            - go-cache-v4-{{ checksum "go.mod" }}-{{ .Environment.CIRCLE_PREVIOUS_BUILD_NUM }}
+            - go-cache-v4-{{ checksum "go.mod" }}
+      - llvm-source-linux
+      - run: go install -tags=llvm<<parameters.llvm>> .
+      - restore_cache:
+          keys:
+            - wasi-libc-sysroot-systemclang-v7
+      - run: make wasi-libc
+      - save_cache:
+          key: wasi-libc-sysroot-systemclang-v7
+          paths:
+            - lib/wasi-libc/sysroot
+      - when:
+          condition: <<parameters.fmt-check>>
+          steps:
+          - run:
+              # Do this before gen-device so that it doesn't check the
+              # formatting of generated files.
+              name: Check Go code formatting
+              command: make fmt-check lint
+      - run: make gen-device -j4
+      - run: make smoketest XTENSA=0
+      - save_cache:
+          key: go-cache-v4-{{ checksum "go.mod" }}-{{ .Environment.CIRCLE_BUILD_NUM }}
+          paths:
+            - ~/.cache/go-build
+            - /go/pkg/mod
+
+jobs:
+  test-llvm15-go119:
+    docker:
+      - image: golang:1.19-bullseye
+    steps:
+      - test-linux:
+          llvm: "15"
+          # "make lint" fails before go 1.21 because internal/tools/go.mod specifies packages that require go 1.21
+          fmt-check: false
+    resource_class: large
+  test-llvm18-go123:
+    docker:
+      - image: golang:1.23-bullseye
+    steps:
+      - test-linux:
+          llvm: "18"
+    resource_class: large
+
+workflows:
+  test-all:
+    jobs:
+      # This tests our lowest supported versions of Go and LLVM, to make sure at
+      # least the smoke tests still pass.
+      - test-llvm15-go119
+      # This tests LLVM 18 support when linking against system libraries.
+      - test-llvm18-go123
@@ -1,4 +1,5 @@
 build/
 llvm-*/
 .github
+.circleci

@@ -1,3 +0,0 @@
-# These are supported funding model platforms
-
-open_collective: tinygo
@@ -16,37 +16,34 @@ jobs:
    name: build-macos
    strategy:
      matrix:
-        # macos-14: arm64 (oldest supported version as of 18-11-2025)
-        # macos-15-intel: amd64 (last intel version to be supported by github runners)
-        # See https://github.com/actions/runner-images/issues/13046
-        os: [macos-14, macos-15-intel]
+        # macos-12: amd64 (oldest supported version as of 05-02-2024)
+        # macos-14: arm64 (oldest arm64 version)
+        os: [macos-12, macos-14]
        include:
+          - os: macos-12
+            goarch: amd64
          - os: macos-14
            goarch: arm64
-          - os: macos-15-intel
-            goarch: amd64
    runs-on: ${{ matrix.os }}
    steps:
      - name: Install Dependencies
+        shell: bash
        run: |
          HOMEBREW_NO_AUTO_UPDATE=1 brew install qemu binaryen
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          submodules: true
-      - name: Extract TinyGo version
-        id: version
-        run: ./.github/workflows/tinygo-extract-version.sh | tee -a "$GITHUB_OUTPUT"
      - name: Install Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
        with:
-          go-version: '1.26.2'
+          go-version: '1.23'
          cache: true
      - name: Restore LLVM source cache
-        uses: actions/cache/restore@v5
+        uses: actions/cache/restore@v4
        id: cache-llvm-source
        with:
-          key: llvm-source-20-${{ matrix.os }}-v1
+          key: llvm-source-18-${{ matrix.os }}-v2
          path: |
            llvm-project/clang/lib/Headers
            llvm-project/clang/include
@@ -57,7 +54,7 @@ jobs:
        if: steps.cache-llvm-source.outputs.cache-hit != 'true'
        run: make llvm-source
      - name: Save LLVM source cache
-        uses: actions/cache/save@v5
+        uses: actions/cache/save@v4
        if: steps.cache-llvm-source.outputs.cache-hit != 'true'
        with:
          key: ${{ steps.cache-llvm-source.outputs.cache-primary-key }}
@@ -68,55 +65,73 @@ jobs:
            llvm-project/lld/include
            llvm-project/llvm/include
      - name: Restore LLVM build cache
-        uses: actions/cache/restore@v5
+        uses: actions/cache/restore@v4
        id: cache-llvm-build
        with:
-          key: llvm-build-20-${{ matrix.os }}-v2
+          key: llvm-build-18-${{ matrix.os }}-v3
          path: llvm-build
      - name: Build LLVM
        if: steps.cache-llvm-build.outputs.cache-hit != 'true'
+        shell: bash
        run: |
          # fetch LLVM source
          rm -rf llvm-project
          make llvm-source
          # install dependencies
-          HOMEBREW_NO_AUTO_UPDATE=1 brew install ninja
+          HOMEBREW_NO_AUTO_UPDATE=1 brew install cmake ninja
          # build!
          make llvm-build
          find llvm-build -name CMakeFiles -prune -exec rm -r '{}' \;
      - name: Save LLVM build cache
-        uses: actions/cache/save@v5
+        uses: actions/cache/save@v4
        if: steps.cache-llvm-build.outputs.cache-hit != 'true'
        with:
          key: ${{ steps.cache-llvm-build.outputs.cache-primary-key }}
          path: llvm-build
+      - name: Cache wasi-libc sysroot
+        uses: actions/cache@v4
+        id: cache-wasi-libc
+        with:
+          key: wasi-libc-sysroot-${{ matrix.os }}-v1
+          path: lib/wasi-libc/sysroot
+      - name: Build wasi-libc
+        if: steps.cache-wasi-libc.outputs.cache-hit != 'true'
+        run: make wasi-libc
      - name: make gen-device
        run: make -j3 gen-device
      - name: Test TinyGo
-        run: make test GOTESTFLAGS="-only-current-os"
+        shell: bash
+        run: make test GOTESTFLAGS="-short"
      - name: Build TinyGo release tarball
        run: make release -j3
      - name: Test stdlib packages
        run: make tinygo-test
      - name: Make release artifact
-        run: cp -p build/release.tar.gz build/tinygo${{ steps.version.outputs.version }}.darwin-${{ matrix.goarch }}.tar.gz
+        shell: bash
+        run: cp -p build/release.tar.gz build/tinygo.darwin-${{ matrix.goarch }}.tar.gz
      - name: Publish release artifact
-        uses: actions/upload-artifact@v7
+        # Note: this release artifact is double-zipped, see:
+        # https://github.com/actions/upload-artifact/issues/39
+        # We can essentially pick one of these:
+        # - have a double-zipped artifact when downloaded from the UI
+        # - have a very slow artifact upload
+        # We're doing the former here, to keep artifact uploads fast.
+        uses: actions/upload-artifact@v4
        with:
-          name: darwin-${{ matrix.goarch }}-double-zipped-${{ steps.version.outputs.version }}
-          path: build/tinygo${{ steps.version.outputs.version }}.darwin-${{ matrix.goarch }}.tar.gz
-          archive: false
+          name: darwin-${{ matrix.goarch }}-double-zipped
+          path: build/tinygo.darwin-${{ matrix.goarch }}.tar.gz
      - name: Smoke tests
+        shell: bash
        run: make smoketest TINYGO=$(PWD)/build/tinygo
  test-macos-homebrew:
    name: homebrew-install
    runs-on: macos-latest
    strategy:
      matrix:
-        version: [16, 17, 18, 19, 20]
+        version: [16, 17, 18]
    steps:
      - name: Set up Homebrew
-        uses: Homebrew/actions/setup-homebrew@main
+        uses: Homebrew/actions/setup-homebrew@master
      - name: Fix Python symlinks
        run: |
          # Github runners have broken symlinks, so relink
@@ -125,21 +140,20 @@ jobs:
      - name: Install LLVM
        run: |
          brew install llvm@${{ matrix.version }}
-          brew link llvm@${{ matrix.version }}
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
      - name: Install Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
        with:
-          go-version: '1.26.2'
+          go-version: '1.23'
          cache: true
      - name: Build TinyGo (LLVM ${{ matrix.version }})
        run: go install -tags=llvm${{ matrix.version }}
      - name: Check binary
        run: tinygo version
      - name: Build TinyGo (default LLVM)
-        if: matrix.version == 20
+        if: matrix.version == 18
        run: go install
      - name: Check binary
-        if: matrix.version == 20
+        if: matrix.version == 18
        run: tinygo version
@@ -31,14 +31,14 @@ jobs:
          sudo rm -rf /usr/local/share/boost
          df -h
      - name: Check out the repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          submodules: recursive
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3
      - name: Docker meta
        id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
        with:
          images: |
            tinygo/tinygo-dev
@@ -47,18 +47,18 @@ jobs:
            type=sha,format=long
            type=raw,value=latest
      - name: Log in to Docker Hub
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKER_HUB_USERNAME }}
          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
      - name: Log in to Github Container Registry
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}
      - name: Build and push
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v5
        with:
          context: .
          push: true
@@ -66,3 +66,45 @@ jobs:
          labels: ${{ steps.meta.outputs.labels }}
          cache-from: type=gha
          cache-to: type=gha,mode=max
+      - name: Trigger Drivers repo build on Github Actions
+        run: |
+          curl -X POST \
+          -H "Authorization: Bearer ${{secrets.GHA_ACCESS_TOKEN}}" \
+          -H "Accept: application/vnd.github.v3+json" \
+          https://api.github.com/repos/tinygo-org/drivers/actions/workflows/build.yml/dispatches \
+          -d '{"ref": "dev"}'
+      - name: Trigger Bluetooth repo build on Github Actions
+        run: |
+          curl -X POST \
+          -H "Authorization: Bearer ${{secrets.GHA_ACCESS_TOKEN}}" \
+          -H "Accept: application/vnd.github.v3+json" \
+          https://api.github.com/repos/tinygo-org/bluetooth/actions/workflows/linux.yml/dispatches \
+          -d '{"ref": "dev"}'
+      - name: Trigger TinyFS repo build on Github Actions
+        run: |
+          curl -X POST \
+          -H "Authorization: Bearer ${{secrets.GHA_ACCESS_TOKEN}}" \
+          -H "Accept: application/vnd.github.v3+json" \
+          https://api.github.com/repos/tinygo-org/tinyfs/actions/workflows/build.yml/dispatches \
+          -d '{"ref": "dev"}'
+      - name: Trigger TinyFont repo build on Github Actions
+        run: |
+          curl -X POST \
+          -H "Authorization: Bearer ${{secrets.GHA_ACCESS_TOKEN}}" \
+          -H "Accept: application/vnd.github.v3+json" \
+          https://api.github.com/repos/tinygo-org/tinyfont/actions/workflows/build.yml/dispatches \
+          -d '{"ref": "dev"}'
+      - name: Trigger TinyDraw repo build on Github Actions
+        run: |
+          curl -X POST \
+          -H "Authorization: Bearer ${{secrets.GHA_ACCESS_TOKEN}}" \
+          -H "Accept: application/vnd.github.v3+json" \
+          https://api.github.com/repos/tinygo-org/tinydraw/actions/workflows/build.yml/dispatches \
+          -d '{"ref": "dev"}'
+      - name: Trigger TinyTerm repo build on Github Actions
+        run: |
+          curl -X POST \
+          -H "Authorization: Bearer ${{secrets.GHA_ACCESS_TOKEN}}" \
+          -H "Accept: application/vnd.github.v3+json" \
+          https://api.github.com/repos/tinygo-org/tinyterm/actions/workflows/build.yml/dispatches \
+          -d '{"ref": "dev"}'
@@ -18,37 +18,32 @@ jobs:
    # statically linked binary.
    runs-on: ubuntu-latest
    container:
-      image: golang:1.26-alpine
-    outputs:
-      version: ${{ steps.version.outputs.version }}
+      image: golang:1.23-alpine
    steps:
      - name: Install apk dependencies
-        # tar: needed for actions/cache@v5
+        # tar: needed for actions/cache@v4
        # git+openssh: needed for checkout (I think?)
        # ruby: needed to install fpm
-        run: apk add tar git openssh make g++ ruby-dev mold
+        run: apk add tar git openssh make g++ ruby-dev
      - name: Work around CVE-2022-24765
        # We're not on a multi-user machine, so this is safe.
        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          submodules: true
-      - name: Extract TinyGo version
-        id: version
-        run: ./.github/workflows/tinygo-extract-version.sh | tee -a "$GITHUB_OUTPUT"
      - name: Cache Go
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        with:
-          key: go-cache-linux-alpine-v2-${{ hashFiles('go.mod') }}
+          key: go-cache-linux-alpine-v1-${{ hashFiles('go.mod') }}
          path: |
            ~/.cache/go-build
            ~/go/pkg/mod
      - name: Restore LLVM source cache
-        uses: actions/cache/restore@v5
+        uses: actions/cache/restore@v4
        id: cache-llvm-source
        with:
-          key: llvm-source-20-linux-alpine-v2
+          key: llvm-source-18-linux-alpine-v1
          path: |
            llvm-project/clang/lib/Headers
            llvm-project/clang/include
@@ -59,7 +54,7 @@ jobs:
        if: steps.cache-llvm-source.outputs.cache-hit != 'true'
        run: make llvm-source
      - name: Save LLVM source cache
-        uses: actions/cache/save@v5
+        uses: actions/cache/save@v4
        if: steps.cache-llvm-source.outputs.cache-hit != 'true'
        with:
          key: ${{ steps.cache-llvm-source.outputs.cache-primary-key }}
@@ -70,10 +65,10 @@ jobs:
            llvm-project/lld/include
            llvm-project/llvm/include
      - name: Restore LLVM build cache
-        uses: actions/cache/restore@v5
+        uses: actions/cache/restore@v4
        id: cache-llvm-build
        with:
-          key: llvm-build-20-linux-alpine-v2
+          key: llvm-build-18-linux-alpine-v2
          path: llvm-build
      - name: Build LLVM
        if: steps.cache-llvm-build.outputs.cache-hit != 'true'
@@ -88,22 +83,31 @@ jobs:
          # Remove unnecessary object files (to reduce cache size).
          find llvm-build -name CMakeFiles -prune -exec rm -r '{}' \;
      - name: Save LLVM build cache
-        uses: actions/cache/save@v5
+        uses: actions/cache/save@v4
        if: steps.cache-llvm-build.outputs.cache-hit != 'true'
        with:
          key: ${{ steps.cache-llvm-build.outputs.cache-primary-key }}
          path: llvm-build
      - name: Cache Binaryen
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        id: cache-binaryen
        with:
-          key: binaryen-linux-alpine-v2
+          key: binaryen-linux-alpine-v1
          path: build/wasm-opt
      - name: Build Binaryen
        if: steps.cache-binaryen.outputs.cache-hit != 'true'
        run: |
          apk add cmake samurai python3
          make binaryen STATIC=1
+      - name: Cache wasi-libc
+        uses: actions/cache@v4
+        id: cache-wasi-libc
+        with:
+          key: wasi-libc-sysroot-linux-alpine-v2
+          path: lib/wasi-libc/sysroot
+      - name: Build wasi-libc
+        if: steps.cache-wasi-libc.outputs.cache-hit != 'true'
+        run: make wasi-libc
      - name: Install fpm
        run: |
          gem install --version 4.0.7 public_suffix
@@ -116,52 +120,46 @@ jobs:
      - name: Build TinyGo release
        run: |
          make release deb -j3 STATIC=1
-          cp -p build/release.tar.gz /tmp/tinygo${{ steps.version.outputs.version }}.linux-amd64.tar.gz
-          cp -p build/release.deb    /tmp/tinygo_${{ steps.version.outputs.version }}_amd64.deb
-      - name: "Publish release artifact: tarball"
-        uses: actions/upload-artifact@v7
+          cp -p build/release.tar.gz /tmp/tinygo.linux-amd64.tar.gz
+          cp -p build/release.deb    /tmp/tinygo_amd64.deb
+      - name: Publish release artifact
+        uses: actions/upload-artifact@v4
        with:
-          name: tinygo${{ steps.version.outputs.version }}.linux-amd64.tar.gz
-          path: /tmp/tinygo${{ steps.version.outputs.version }}.linux-amd64.tar.gz
-          archive: false
-      - name: "Publish release artifact: Debian package"
-        uses: actions/upload-artifact@v7
-        with:
-          name: tinygo_${{ steps.version.outputs.version }}_amd64.deb
-          path: /tmp/tinygo_${{ steps.version.outputs.version }}_amd64.deb
-          archive: false
+          name: linux-amd64-double-zipped
+          path: |
+            /tmp/tinygo.linux-amd64.tar.gz
+            /tmp/tinygo_amd64.deb
  test-linux-build:
    # Test the binaries built in the build-linux job by running the smoke tests.
    runs-on: ubuntu-latest
    needs: build-linux
    steps:
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          submodules: true
      - name: Install Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
        with:
-          go-version: '1.26.2'
+          go-version: '1.23'
          cache: true
      - name: Install wasmtime
        uses: bytecodealliance/actions/wasmtime/setup@v1
        with:
-          version: "29.0.1"
+          version: "19.0.1"
      - name: Install wasm-tools
        uses: bytecodealliance/actions/wasm-tools/setup@v1
      - name: Download release artifact
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v4
        with:
-          name: tinygo${{ needs.build-linux.outputs.version }}.linux-amd64.tar.gz
+          name: linux-amd64-double-zipped
      - name: Extract release tarball
        run: |
          mkdir -p ~/lib
-          tar -C ~/lib -xf tinygo${{ needs.build-linux.outputs.version }}.linux-amd64.tar.gz
+          tar -C ~/lib -xf tinygo.linux-amd64.tar.gz
          ln -s ~/lib/tinygo/bin/tinygo ~/go/bin/tinygo
      - run: make tinygo-test-wasip1-fast
      - run: make tinygo-test-wasip2-fast
-      - run: make tinygo-test-wasm
      - run: make smoketest
  assert-test-linux:
    # Run all tests that can run on Linux, with LLVM assertions enabled to catch
@@ -169,7 +167,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          submodules: true
      - name: Install apt dependencies
@@ -184,25 +182,25 @@ jobs:
              simavr \
              ninja-build
      - name: Install Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
        with:
-          go-version: '1.26.2'
+          go-version: '1.23'
          cache: true
      - name: Install Node.js
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
        with:
          node-version: '18'
      - name: Install wasmtime
        uses: bytecodealliance/actions/wasmtime/setup@v1
        with:
-          version: "29.0.1"
+          version: "19.0.1"
      - name: Setup `wasm-tools`
        uses: bytecodealliance/actions/wasm-tools/setup@v1
      - name: Restore LLVM source cache
-        uses: actions/cache/restore@v5
+        uses: actions/cache/restore@v4
        id: cache-llvm-source
        with:
-          key: llvm-source-20-linux-asserts-v1
+          key: llvm-source-18-linux-asserts-v1
          path: |
            llvm-project/clang/lib/Headers
            llvm-project/clang/include
@@ -213,7 +211,7 @@ jobs:
        if: steps.cache-llvm-source.outputs.cache-hit != 'true'
        run: make llvm-source
      - name: Save LLVM source cache
-        uses: actions/cache/save@v5
+        uses: actions/cache/save@v4
        if: steps.cache-llvm-source.outputs.cache-hit != 'true'
        with:
          key: ${{ steps.cache-llvm-source.outputs.cache-primary-key }}
@@ -224,10 +222,10 @@ jobs:
            llvm-project/lld/include
            llvm-project/llvm/include
      - name: Restore LLVM build cache
-        uses: actions/cache/restore@v5
+        uses: actions/cache/restore@v4
        id: cache-llvm-build
        with:
-          key: llvm-build-20-linux-asserts-v1
+          key: llvm-build-18-linux-asserts-v2
          path: llvm-build
      - name: Build LLVM
        if: steps.cache-llvm-build.outputs.cache-hit != 'true'
@@ -240,13 +238,13 @@ jobs:
          # Remove unnecessary object files (to reduce cache size).
          find llvm-build -name CMakeFiles -prune -exec rm -r '{}' \;
      - name: Save LLVM build cache
-        uses: actions/cache/save@v5
+        uses: actions/cache/save@v4
        if: steps.cache-llvm-build.outputs.cache-hit != 'true'
        with:
          key: ${{ steps.cache-llvm-build.outputs.cache-primary-key }}
          path: llvm-build
      - name: Cache Binaryen
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        id: cache-binaryen
        with:
          key: binaryen-linux-asserts-v1
@@ -254,6 +252,15 @@ jobs:
      - name: Build Binaryen
        if: steps.cache-binaryen.outputs.cache-hit != 'true'
        run: make binaryen
+      - name: Cache wasi-libc
+        uses: actions/cache@v4
+        id: cache-wasi-libc
+        with:
+          key: wasi-libc-sysroot-linux-asserts-v6
+          path: lib/wasi-libc/sysroot
+      - name: Build wasi-libc
+        if: steps.cache-wasi-libc.outputs.cache-hit != 'true'
+        run: make wasi-libc
      - run: make gen-device -j4
      - name: Test TinyGo
        run: make ASSERT=1 test
@@ -265,7 +272,7 @@ jobs:
        run: make tinygo-test
      - run: make smoketest
      - run: make wasmtest
-      - run: make tinygo-test-baremetal
+      - run: make tinygo-baremetal
  build-linux-cross:
    # Build ARM Linux binaries, ready for release.
    # This intentionally uses an older Linux image, so that we compile against
@@ -285,14 +292,11 @@ jobs:
          - goarch: arm
            toolchain: arm-linux-gnueabihf
            libc: armhf
-    runs-on: ubuntu-22.04 # note: use the oldest image available! (see above)
+    runs-on: ubuntu-20.04
    needs: build-linux
    steps:
      - name: Checkout
-        uses: actions/checkout@v6
-      - name: Get TinyGo version
-        id: version
-        run: ./.github/workflows/tinygo-extract-version.sh | tee -a "$GITHUB_OUTPUT"
+        uses: actions/checkout@v4
      - name: Install apt dependencies
        run: |
          sudo apt-get update
@@ -301,15 +305,15 @@ jobs:
              g++-${{ matrix.toolchain }} \
              libc6-dev-${{ matrix.libc }}-cross
      - name: Install Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
        with:
-          go-version: '1.26.2'
+          go-version: '1.23'
          cache: true
      - name: Restore LLVM source cache
-        uses: actions/cache/restore@v5
+        uses: actions/cache/restore@v4
        id: cache-llvm-source
        with:
-          key: llvm-source-20-linux-v1
+          key: llvm-source-18-linux-v1
          path: |
            llvm-project/clang/lib/Headers
            llvm-project/clang/include
@@ -320,7 +324,7 @@ jobs:
        if: steps.cache-llvm-source.outputs.cache-hit != 'true'
        run: make llvm-source
      - name: Save LLVM source cache
-        uses: actions/cache/save@v5
+        uses: actions/cache/save@v4
        if: steps.cache-llvm-source.outputs.cache-hit != 'true'
        with:
          key: ${{ steps.cache-llvm-source.outputs.cache-primary-key }}
@@ -331,10 +335,10 @@ jobs:
            llvm-project/lld/include
            llvm-project/llvm/include
      - name: Restore LLVM build cache
-        uses: actions/cache/restore@v5
+        uses: actions/cache/restore@v4
        id: cache-llvm-build
        with:
-          key: llvm-build-20-linux-${{ matrix.goarch }}-v1
+          key: llvm-build-18-linux-${{ matrix.goarch }}-v2
          path: llvm-build
      - name: Build LLVM
        if: steps.cache-llvm-build.outputs.cache-hit != 'true'
@@ -349,13 +353,13 @@ jobs:
          # Remove unnecessary object files (to reduce cache size).
          find llvm-build -name CMakeFiles -prune -exec rm -r '{}' \;
      - name: Save LLVM build cache
-        uses: actions/cache/save@v5
+        uses: actions/cache/save@v4
        if: steps.cache-llvm-build.outputs.cache-hit != 'true'
        with:
          key: ${{ steps.cache-llvm-build.outputs.cache-primary-key }}
          path: llvm-build
      - name: Cache Binaryen
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        id: cache-binaryen
        with:
          key: binaryen-linux-${{ matrix.goarch }}-v4
@@ -375,13 +379,13 @@ jobs:
        run: |
          make CROSS=${{ matrix.toolchain }}
      - name: Download amd64 release
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v4
        with:
-          name: tinygo${{ needs.build-linux.outputs.version }}.linux-amd64.tar.gz
+          name: linux-amd64-double-zipped
      - name: Extract amd64 release
        run: |
          mkdir -p build/release
-          tar -xf tinygo${{ needs.build-linux.outputs.version }}.linux-amd64.tar.gz -C build/release tinygo
+          tar -xf tinygo.linux-amd64.tar.gz -C build/release tinygo
      - name: Modify release
        run: |
          cp -p build/tinygo   build/release/tinygo/bin
@@ -389,17 +393,12 @@ jobs:
      - name: Create ${{ matrix.goarch }} release
        run: |
          make release deb RELEASEONLY=1 DEB_ARCH=${{ matrix.libc }}
-          cp -p build/release.tar.gz /tmp/tinygo${{ needs.build-linux.outputs.version }}.linux-${{ matrix.goarch }}.tar.gz
-          cp -p build/release.deb    /tmp/tinygo_${{ needs.build-linux.outputs.version }}_${{ matrix.libc }}.deb
-      - name: "Publish release artifact: tarball"
-        uses: actions/upload-artifact@v7
+          cp -p build/release.tar.gz /tmp/tinygo.linux-${{ matrix.goarch }}.tar.gz
+          cp -p build/release.deb    /tmp/tinygo_${{ matrix.libc }}.deb
+      - name: Publish release artifact
+        uses: actions/upload-artifact@v4
        with:
-          name: linux-${{ matrix.goarch }}-double-zipped-${{ needs.build-linux.outputs.version }}
-          path: /tmp/tinygo${{ needs.build-linux.outputs.version }}.linux-${{ matrix.goarch }}.tar.gz
-          archive: false
-      - name: "Publish release artifact: Debian package"
-        uses: actions/upload-artifact@v7
-        with:
-          name: linux-${{ matrix.goarch }}-double-zipped-${{ needs.build-linux.outputs.version }}
-          path: /tmp/tinygo_${{ needs.build-linux.outputs.version }}_${{ matrix.libc }}.deb
-          archive: false
+          name: linux-${{ matrix.goarch }}-double-zipped
+          path: |
+            /tmp/tinygo.linux-${{ matrix.goarch }}.tar.gz
+            /tmp/tinygo_${{ matrix.libc }}.deb
@@ -25,18 +25,18 @@ jobs:
      contents: read
    steps:
      - name: Check out the repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          submodules: recursive
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3
      - name: Docker meta
        id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
        with:
          images: |
-            tinygo/llvm-20
-            ghcr.io/${{ github.repository_owner }}/llvm-20
+            tinygo/llvm-18
+            ghcr.io/${{ github.repository_owner }}/llvm-18
          tags: |
            type=sha,format=long
            type=raw,value=latest
@@ -46,13 +46,13 @@ jobs:
          username: ${{ secrets.DOCKER_HUB_USERNAME }}
          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
      - name: Log in to Github Container Registry
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}
      - name: Build and push
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v5
        with:
          target: tinygo-llvm-build
          context: .
@@ -15,34 +15,29 @@ jobs:
  nix-test:
    runs-on: ubuntu-latest
    steps:
-      - name: Uninstall system LLVM
-        # Hack to work around issue where we still include system headers for
-        # some reason.
-        # See: https://github.com/tinygo-org/tinygo/pull/4516#issuecomment-2416363668
-        run: sudo apt-get remove llvm-18
      - name: Checkout
-        uses: actions/checkout@v6
-      - name: Pull musl, bdwgc
+        uses: actions/checkout@v4
+      - name: Pull musl
        run: |
-            git submodule update --init lib/musl lib/bdwgc
+            git submodule update --init lib/musl
      - name: Restore LLVM source cache
-        uses: actions/cache/restore@v5
+        uses: actions/cache/restore@v4
        id: cache-llvm-source
        with:
-          key: llvm-source-20-linux-nix-v1
+          key: llvm-source-18-linux-nix-v1
          path: |
            llvm-project/compiler-rt
      - name: Download LLVM source
        if: steps.cache-llvm-source.outputs.cache-hit != 'true'
        run: make llvm-source
      - name: Save LLVM source cache
-        uses: actions/cache/save@v5
+        uses: actions/cache/save@v4
        if: steps.cache-llvm-source.outputs.cache-hit != 'true'
        with:
          key: ${{ steps.cache-llvm-source.outputs.cache-primary-key }}
          path: |
            llvm-project/compiler-rt
-      - uses: cachix/install-nix-action@v31
+      - uses: cachix/install-nix-action@v22
      - name: Test
        run: |
          nix develop --ignore-environment --keep HOME --command bash -c "go install && ~/go/bin/tinygo version && ~/go/bin/tinygo build -o test ./testdata/cgo"
@@ -2,11 +2,11 @@
 # still works after checking out the dev branch (that is, when going from LLVM
 # 16 to LLVM 17 for example, both Clang 16 and Clang 17 are installed).

-echo 'deb https://apt.llvm.org/noble/ llvm-toolchain-noble-20 main' | sudo tee /etc/apt/sources.list.d/llvm.list
+echo 'deb https://apt.llvm.org/noble/ llvm-toolchain-noble-18 main' | sudo tee /etc/apt/sources.list.d/llvm.list
 wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
 sudo apt-get update
 sudo apt-get install --no-install-recommends -y \
-    llvm-20-dev \
-    clang-20 \
-    libclang-20-dev \
-    lld-20
+    llvm-18-dev \
+    clang-18 \
+    libclang-18-dev \
+    lld-18
@@ -20,24 +20,24 @@ jobs:
        run: |
          echo "$HOME/go/bin" >> $GITHUB_PATH
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0 # fetch all history (no sparse checkout)
          submodules: true
      - name: Install apt dependencies
        run: ./.github/workflows/sizediff-install-pkgs.sh
      - name: Restore LLVM source cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        id: cache-llvm-source
        with:
-          key: llvm-source-20-sizediff-v1
+          key: llvm-source-18-sizediff-v1
          path: |
            llvm-project/compiler-rt
      - name: Download LLVM source
        if: steps.cache-llvm-source.outputs.cache-hit != 'true'
        run: make llvm-source
      - name: Cache Go
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        with:
          key: go-cache-linux-sizediff-v2-${{ hashFiles('go.mod') }}
          path: |
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# Extract the version string from the source code, to be stored in a variable.
-grep 'const version' goenv/version.go | sed 's/^const version = "\(.*\)"$/version=\1/g'
@@ -14,8 +14,6 @@ concurrency:
 jobs:
  build-windows:
    runs-on: windows-2022
-    outputs:
-      version: ${{ steps.version.outputs.version }}
    steps:
      - name: Configure pagefile
        uses: al-cheb/configure-pagefile-action@v1.4
@@ -23,30 +21,27 @@ jobs:
          minimum-size: 8GB
          maximum-size: 24GB
          disk-root: "C:"
-      - uses: MinoruSekine/setup-scoop@v4
+      - uses: brechtm/setup-scoop@v2
+        with:
+          scoop_update: 'false'
      - name: Install Dependencies
        shell: bash
        run: |
-          scoop config use_external_7zip true
          scoop install ninja binaryen
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          submodules: true
-      - name: Extract TinyGo version
-        id: version
-        shell: bash
-        run: ./.github/workflows/tinygo-extract-version.sh | tee -a "$GITHUB_OUTPUT"
      - name: Install Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
        with:
-          go-version: '1.26.2'
+          go-version: '1.23'
          cache: true
      - name: Restore cached LLVM source
-        uses: actions/cache/restore@v5
+        uses: actions/cache/restore@v4
        id: cache-llvm-source
        with:
-          key: llvm-source-20-windows-v1
+          key: llvm-source-18-windows-v1
          path: |
            llvm-project/clang/lib/Headers
            llvm-project/clang/include
@@ -57,7 +52,7 @@ jobs:
        if: steps.cache-llvm-source.outputs.cache-hit != 'true'
        run: make llvm-source
      - name: Save cached LLVM source
-        uses: actions/cache/save@v5
+        uses: actions/cache/save@v4
        if: steps.cache-llvm-source.outputs.cache-hit != 'true'
        with:
          key: ${{ steps.cache-llvm-source.outputs.cache-primary-key }}
@@ -68,10 +63,10 @@ jobs:
            llvm-project/lld/include
            llvm-project/llvm/include
      - name: Restore cached LLVM build
-        uses: actions/cache/restore@v5
+        uses: actions/cache/restore@v4
        id: cache-llvm-build
        with:
-          key: llvm-build-20-windows-v2
+          key: llvm-build-18-windows-v2
          path: llvm-build
      - name: Build LLVM
        if: steps.cache-llvm-build.outputs.cache-hit != 'true'
@@ -85,40 +80,46 @@ jobs:
          # Remove unnecessary object files (to reduce cache size).
          find llvm-build -name CMakeFiles -prune -exec rm -r '{}' \;
      - name: Save cached LLVM build
-        uses: actions/cache/save@v5
+        uses: actions/cache/save@v4
        if: steps.cache-llvm-build.outputs.cache-hit != 'true'
        with:
          key: ${{ steps.cache-llvm-build.outputs.cache-primary-key }}
          path: llvm-build
-      - name: Cache Go cache
-        uses: actions/cache@v5
+      - name: Cache wasi-libc sysroot
+        uses: actions/cache@v4
+        id: cache-wasi-libc
        with:
-          key: go-cache-windows-v2-${{ hashFiles('go.mod') }}
-          path: |
-            C:/Users/runneradmin/AppData/Local/go-build
-            C:/Users/runneradmin/go/pkg/mod
+          key: wasi-libc-sysroot-v5
+          path: lib/wasi-libc/sysroot
+      - name: Build wasi-libc
+        if: steps.cache-wasi-libc.outputs.cache-hit != 'true'
+        run: make wasi-libc
      - name: Install wasmtime
        run: |
-          scoop config use_external_7zip true
-          scoop install wasmtime@29.0.1
+          scoop install wasmtime@14.0.4
      - name: make gen-device
        run: make -j3 gen-device
      - name: Test TinyGo
        shell: bash
-        run: make test GOTESTFLAGS="-only-current-os"
+        run: make test GOTESTFLAGS="-short"
      - name: Build TinyGo release tarball
        shell: bash
        run: make build/release -j4
      - name: Make release artifact
        shell: bash
        working-directory: build/release
-        run: 7z -tzip a tinygo${{ steps.version.outputs.version }}.windows-amd64.zip tinygo
+        run: 7z -tzip a release.zip tinygo
      - name: Publish release artifact
-        uses: actions/upload-artifact@v7
+        # Note: this release artifact is double-zipped, see:
+        # https://github.com/actions/upload-artifact/issues/39
+        # We can essentially pick one of these:
+        # - have a dobule-zipped artifact when downloaded from the UI
+        # - have a very slow artifact upload
+        # We're doing the former here, to keep artifact uploads fast.
+        uses: actions/upload-artifact@v4
        with:
-          name: tinygo${{ steps.version.outputs.version }}.windows-amd64.zip
-          path: build/release/tinygo${{ steps.version.outputs.version }}.windows-amd64.zip
-          archive: false
+          name: windows-amd64-double-zipped
+          path: build/release/release.zip

  smoke-test-windows:
    runs-on: windows-2022
@@ -130,25 +131,29 @@ jobs:
          minimum-size: 8GB
          maximum-size: 24GB
          disk-root: "C:"
-      - uses: MinoruSekine/setup-scoop@v4
+      - uses: brechtm/setup-scoop@v2
+        with:
+          scoop_update: 'false'
      - name: Install Dependencies
        shell: bash
        run: |
-          scoop config use_external_7zip true
          scoop install binaryen
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
      - name: Install Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
        with:
-          go-version: '1.26.2'
+          go-version: '1.23'
          cache: true
      - name: Download TinyGo build
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v4
        with:
-          name: tinygo${{ needs.build-windows.outputs.version }}.windows-amd64.zip
+          name: windows-amd64-double-zipped
          path: build/
-        # This build is already unzipped.
+      - name: Unzip TinyGo build
+        shell: bash
+        working-directory: build
+        run: 7z x release.zip -r
      - name: Smoke tests
        shell: bash
        run: make smoketest TINYGO=$(PWD)/build/tinygo/bin/tinygo
@@ -164,18 +169,21 @@ jobs:
          maximum-size: 24GB
          disk-root: "C:"
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
      - name: Install Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
        with:
-          go-version: '1.26.2'
+          go-version: '1.23'
          cache: true
      - name: Download TinyGo build
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v4
        with:
-          name: tinygo${{ needs.build-windows.outputs.version }}.windows-amd64.zip
+          name: windows-amd64-double-zipped
          path: build/
-        # This build is already unzipped.
+      - name: Unzip TinyGo build
+        shell: bash
+        working-directory: build
+        run: 7z x release.zip -r
      - name: Test stdlib packages
        run: make tinygo-test TINYGO=$(PWD)/build/tinygo/bin/tinygo

@@ -189,24 +197,28 @@ jobs:
          minimum-size: 8GB
          maximum-size: 24GB
          disk-root: "C:"
-      - uses: MinoruSekine/setup-scoop@v4
+      - uses: brechtm/setup-scoop@v2
+        with:
+          scoop_update: 'false'
      - name: Install Dependencies
        shell: bash
        run: |
-          scoop config use_external_7zip true
-          scoop install binaryen wasmtime@29.0.1
+          scoop install binaryen && scoop install wasmtime@14.0.4
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
      - name: Install Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
        with:
-          go-version: '1.26.2'
+          go-version: '1.23'
          cache: true
      - name: Download TinyGo build
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v4
        with:
-          name: tinygo${{ needs.build-windows.outputs.version }}.windows-amd64.zip
+          name: windows-amd64-double-zipped
          path: build/
-        # This build is already unzipped.
+      - name: Unzip TinyGo build
+        shell: bash
+        working-directory: build
+        run: 7z x release.zip -r
      - name: Test stdlib packages on wasip1
        run: make tinygo-test-wasip1-fast TINYGO=$(PWD)/build/tinygo/bin/tinygo
@@ -37,9 +37,5 @@ test.exe
 test.gba
 test.hex
 test.nro
-test.uf2
 test.wasm
 wasm.wasm
-
-*.uf2
-*.elf
@@ -16,13 +16,13 @@
 	url = https://github.com/WebAssembly/wasi-libc
 [submodule "lib/picolibc"]
 	path = lib/picolibc
-	url = https://github.com/picolibc/picolibc.git
+	url = https://github.com/keith-packard/picolibc.git
 [submodule "lib/stm32-svd"]
 	path = lib/stm32-svd
 	url = https://github.com/tinygo-org/stm32-svd
 [submodule "lib/musl"]
 	path = lib/musl
-	url = https://github.com/tinygo-org/musl-libc.git
+	url = git://git.musl-libc.org/musl
 [submodule "lib/binaryen"]
 	path = lib/binaryen
 	url = https://github.com/WebAssembly/binaryen.git
@@ -35,9 +35,7 @@
 [submodule "src/net"]
 	path = src/net
 	url = https://github.com/tinygo-org/net.git
+	branch = dev
 [submodule "lib/wasi-cli"]
 	path = lib/wasi-cli
 	url = https://github.com/WebAssembly/wasi-cli
-[submodule "lib/bdwgc"]
-	path = lib/bdwgc
-	url = https://github.com/ivmai/bdwgc.git
@@ -85,17 +85,11 @@ Try running TinyGo:

    ./build/tinygo help

-Also, make sure the `tinygo` binary really is statically linked. The command to check for 
-dynamic dependencies differs depending on your operating system.
-
-On Linux, use `ldd` (not to be confused with `lld`):
+Also, make sure the `tinygo` binary really is statically linked. Check this
+using `ldd` (not to be confused with `lld`):

    ldd ./build/tinygo

-On macOS, use otool -L:
-
-    otool -L ./build/tinygo
-
 The result should not contain libclang or libLLVM.

 ## Make a release tarball
@@ -1,648 +1,3 @@
-0.41.1
---
-* **machine**
-  - esp32c3: correct pin interrupt setup call that was overlooked from #5320
-* **runtime**
-  - esp32s3: wait for TIMG0 update register to clear before reading timer registers
-* **net**
-  - update net module to a version that is backwards compatible with Go 1.25.x to fix #5332
-
-0.41.0
---
-* **general**
-  - go.mod, compiler: bump minimum Go version to 1.23
-  - builder: support Go 1.26 now
-  - feat: add inheritable-only field to filter processor-level targets (#5270)
-  - feature: add esp32flash flash method for esp32s3/esp32c3/esp32/esp8266
-  - flashing: introduce flash method 'esp32jtag' for esp32c3/esp32s3 targets
-  - fashing: add "adb" flash method using Android Debug Bridge
-  - main: auto-use best available flashing options on esp32
-  - espflasher: update to espflasher 0.6.0
-* **compiler**
-  - implement method-set based AssignableTo and Implements (#5304)
-  - simplify createObjectLayout
-  - implement copy directly
-  - fix min/max on floats by using intrinsics
-  - add element layout to sliceAppend
-  - add intrinsic for crypto/internal/constanttime.boolToUint8
-  - fix SyscallN handling for Windows on Go 1.26+
-* **core**
-  - reflect: add TypeAssert
-  - reflect: fix TypeAssert for structs
-  - sync: add WaitGroup.Go
-  - os: add UserCacheDir and UserConfigDir
-  - os: implement Lchown function for changing file ownership (#5161)
-  - testing: add b.ReportMetric()
-  - errors: add errors package to passing list
-  - internal/gclayout: use correct lengths
-  - internal/abi: add EscapeNonString, EscapeToResultNonString
-  - internal, runtime: add internal fips bool
-  - internal/itoa: resurrect from Go stdlib
-  - internal/syscall/unix: implement GetRandom for WASI targets
-  - interp: make ptrtoint size mismatch a recoverable error
-  - loader: support "all:" prefix in //go:embed patterns
-  - loader, crypto/internal/entropy: fix 32 MiB RAM overflow on microcontrollers
-  - loader, unicode/utf8: fix hiBits overflow on 16-bit AVR targets
-  - builder: order embedded files deterministically
-  - builder: fix panic in findPackagePath when using -size short
-  - builder: fix SIGSEGV when stripping duplicate function definitions
-  - builder, runtime: fix duplicate symbol error with Go 1.26+ on Windows
-  - builder: use target-specific -march for RISC-V library compilation
-  - transform: modify output format from the -print-allocs flag to match the go coverage tool format
-  - cgo: allow for changes to 'short-enums' flag
-  - wasm: add more stubbed file operations
-* **machine**
-  - esp32c3: implement BlockDevice for esp32c3 flash
-  - esp32c3: clear GPIO STATUS before dispatching pin callbacks
-  - esp32c3: implement USBDevice using interrupts
-  - esp32c3: add Enable stub for QEMU test target
-  - esp32c3: fix interrupt disable handling
-  - esp32c3: clear MCAUSE after handling interrupt
-  - esp32c3: map missing IRAM sections in linker script
-  - esp32c3: fix to use PROVIDE() for WiFi/BLE ROM function addresses to allow blob overrides
-  - esp32c3: add WiFi/BLE ROM linker support
-  - esp32c3: use TIMG0 alarm interrupt for sleepTicks instead of busy-waiting
-  - esp32s3: implement Pin.SetInterrupt for GPIO pin change interrupts
-  - esp32s3: use edge-triggered CPU interrupt for GPIO pin interrupts
-  - esp32s3: add interrupt support (#5244)
-  - esp32s3: switch USB implementation to use interrupts instead of polling
-  - esp32s3: replace inline ISR with full interrupt vector handler
-  - esp32s3: use TIMG0 alarm interrupt for sleepTicks
-  - esp32s3: improve exception handlers, add procPin/procUnpin, and linker wrap flags
-  - esp32s3: fix Xtensa register window spill using recursive call4 in task switching
-  - esp32s3: update linker script and boot assembly for multi-page flash XIP mapping
-  - esp32s3: add flash XIP boot assembly with cache/MMU init
-  - esp32s3: implement SPI (#5169)
-  - esp32s3: implement I2C interface (#5210)
-  - esp32s3: implement RNG based on onboard hardware random number generator
-  - esp32s3,esp32c3: add USB serial support
-  - esp32s3,esp32c3: add txStalled flag to skip USB serial spin when no host
-  - esp32s3,esp32c3: make USB Serial/JTAG writes non-blocking when FIFO is full
-  - esp32c3/esp32s3: refactor ADC implementation to reduce code duplication
-  - esp32s3,esp32c3: add ADC support (#5231)
-  - esp32s3,esp32c3: add PWM support (#5215)
-  - esp32c3/esp32s3: refactoring and corrections for SPI implementation
-  - esp32xx: add WASM simulator support for ESP32-C3/ESP32-S3 targets
-  - esp32: default SPI CS pin to NoPin when unset
-  - esp: fix tinygo_scanCurrentStack to spill register windows
-  - stm32: fix UART interrupt storm caused by uncleared overrun error
-  - stm32: fix PWM problem due to register shifting
-  - stm32: add STM32U585 target definition and runtime
-  - stm32: add STM32U5 GPIO, pin interrupts, and UART support
-  - stm32: add STM32U5 I2C support
-  - stm32: add STM32U5 SPI support
-  - stm32u585: implement ADC
-  - stm32g0b1: add support (#5150)
-  - stm32g0b1: add Watchdog + ADC support (#5158)
-  - stm32l0: add flash support
-  - stm32l0x1,l0x2: TIM: adapt to 32-bit register access
-  - stm32g0: sync with updated stm32 device files
-  - attiny85: add USI-based SPI support (#5181)
-  - attiny85: add PWM support (#5171)
-  - rp: add Close function to UART to allow for removing all system resources/power usage
-  - rp: use blockReset() and unresetBlockWait() helper functions for peripheral reset/unreset
-  - rp2: prevent PWM Period method overflow
-  - rp2: add per-byte timeout budget for I2C (#5189)
-  - feather-m0: export UART0 and pins
-  - usb/cdc: better ring buffer implementation (#5209)
-  - fix: replace ! with ~ for register mask
-  - atmega328p_simulator: add correct build tag for arduino_uno after renaming
-* **net**
-  - update to Go 1.26.2 net package with UDP and JS improvements
-* **runtime**
-  - implement fminimum/fmaximum
-  - make timeoffset atomic
-  - add MemStats.HeapObjects
-  - handle GODEBUG on wasip2 (#5312)
-  - fix Darwin syscall return value truncation and lost arguments
-  - add syscall.runtimeClearenv for Go 1.26
-  - split syscall functions for darwin changes for 1.26
-  - fix: init heap before random number seed on wasm platforms
-* **targets**
-  - add esp32s3-supermini board target
-  - add support for Seeedstudio Xiao-RP2350 board
-  - add Shrike Lite board (#5170)
-  - rename arduino target to arduino-uno
-  - add pins/setup for Arduino UNO Q board QWIIC connector
-  - correct pin mapping for Arduino UNO Q STM32 MCU
-  - add stm32u585 openocd commands for flashing on Arduino UNO Q
-  - correct name/tag use for esp32s3-wroom1 board
-  - modify esp32, esp32s3, esp32c3, & esp8266 targets to use built-in esp32flash
-  - switch rp2040/rp2350 to default to tasks scheduler
-  - change default stack size for esp32c3 and esp32s3 to 8196
-  - swan: rename group build tag stm32l4x5 => stm32l4y5 to avoid clash with stm32 device name
-  - nucleo-f722ze: add build-tag stm32f722
-  - fix: set stm32u5x clock rate to default
-  - create generic targets for esp32 boards
-* **libs**
-  - stm32-svd: update submodule
-  - update tools/gen-device-svd for recent changes to stm32-svd file structure (#5212)
-* **build/test**
-  - build: use Golang 1.26 for all builds
-  - build: actually use the version of llvm we are supposed to be testing by using brew link command
-  - build: let scoop run updates to resolve binaryen install failures on Windows
-  - ci: don't double zip release artifacts
-  - test: increase default timeout from 1 to 2 minutes to prevent spurious CI fails
-  - testdata: fix flaky timers test by draining ticker channel after Stop
-  - testdata: more corpus entries (#5182)
-  - add soypat/lneto to corpus
-  - GNUmakefile: add context and expvar to stdlib tests
-  - GNUmakefile: add encoding/xml to stdlib tests on Linux
-  - main (test): skip mipsle test if the emulator is missing
-  - make: remove machine without board from smoketest
-  - stm32: add Arduino UNO Q to smoketests
-  - flake: bump to nixpkgs 25.11
-  - chore: update all github actions to latest versions
-  - fix: use external 7zip for scoop installs on Windows
-
-0.40.1
---
-* **machine**
-  - nrf: fix flash writes when SoftDevice is enabled
-* **runtime**
-  - runtime: avoid fixed math/rand sequence on RP2040/RP2350 (#5124)
-  - runtime: add calls to initRand() during run() for all schedulers
-  - runtime: call initRand() before initHeap() during initialization
-  - runtime: use rand_hwrng hardwareRand for RP2040/RP2350 (#5135)
-* **libs**
-  - picolibc: use updated location for git repo
-
-0.40.0
---
-* **general**
-  - all: add full LLVM 20 support
-  - core: feat: enable //go:linkname pragma for globals
-  - core: feature: Add flag to ignore go compatibility matrix (#5078)
-  - chore: update version for 0.40 development cycle
-* **compiler**
-  - emit an error when the actual arch doesn't match GOARCH
-  - mark string parameters as readonly
-  - use Tarjan's SCC algorithm to detect loops for defer
-  - lower "large stack" limit to 16kb
-* **core**
-  - shrink bdwgc library
-  - Fix linker errors for runtime.vgetrandom and crypto/internal/sysrand.fatal
-  - fix: add TryLock to sync.RWMutex
-  - fix: correct linter issues exposed by the fix in #4679
-  - fix: don't hardcode success return state
-  - fix: expand RTT debugger compatibility
-  - internal/task (threads): save stack bounds instead of scanning under a lock
-  - internal/task: create detached threads and fix error handling
-  - interp: better errors when debugging interp
-  - transform (gc): create stack slots in callers of external functions
-  - internal/task: prevent semaphore resource leak for threads scheduler
-* **machine**
-  - cortexm: optimize code size for the HardFault_Handler
-  - fe310: add I2C pins for the HiFive1b
-  - clarify WriteAt semantics of BlockDevice
-  - fix deprecated AsmFull comment (#5005)
-  - make sure DMA buffers do not escape unnecessarily
-  - only enable USB-CDC when needed
-  - use larger SPI MAXCNT on nrf52833 and nrf52840
-  - fix: update m.queuedBytes when clamping output to avoid corrupting sentBytes
-  - fix: use int64 in ReadTemperature to avoid overflow
-  - fix(rp2): disable DBGPAUSE on startup
-  - fix(rp2): possible integer overflow while computing factors for SPI baudrate
-  - fix(rp2): reset spinlocks at startup
-  - fix(rp2): switch spinlock busy loop to wfe
-  - fix(rp2): use side-effect-free spinlocks
-  - nrf: add ADC_VDDH which is an ADC pin for VDDH
-  - nrf: don't block SPI transfer
-  - nrf: don't set PSELN, it's ignored in single ended mode anyway
-  - nrf: fix typo in ADC configuration
-  - nrf: refactor SoftDevice enabled check
-  - nrf: rename pwmPin to adcPin
-  - nrf: support flash operations while the SoftDevice is enabled
-  - rp2040: allow writing to the UART inside interrupts
-  - machine,nrf528: stop the bus only once on I2C bus error and ensures the first error is returned
-* **net**
-  - update submodule to latest commits
-* **runtime**
-  - (avr): fix infinite longjmp loop if stack is aligned to 256 bytes
-  - (gc_blocks.go): clear full size of allocation
-  - (gc_blocks.go): make sweep branchless
-  - (gc_blocks.go): simplify scanning logic
-  - (gc_blocks.go): use a linked stack to scan marked objects
-  - (gc_blocks.go): use best-fit allocation
-  - (gc_boehm.go): fix world already stopped check
-  - (wasm): scan the system stack
-  - fix sleep duration for long sleeps
-  - remove copied code for nrf52840
-  - src/syscall: update src buffer after write
-  - wasm: fix C realloc and optimize it a bit
-* **targets**
-  - add xiao-esp32s3 board target
-  - Add ESP32-S3 support (#5091)
-  - Added Gopher ARCADE board
-  - Create "pico2-ice" target board (#5062)
-* **build/test**
-  - Add testing.T.Context() and testing.B.Context()
-  - create separate go.mod file for testing dependencies for wasm tests that use Chromium headless browser to avoid use of older incompatible version.
-  - go back to normal scheduler instead of tasks scheduler for macos CI
-  - update CI to use Go 1.25.5
-  - update macOS GH actions builds to handle sunset of macOS 13
-  - use task scheduler on macOS builds to avoid test race condition lockups
-  - update all CI builds to use latest stable Go release. Also update some of the actions to their latest releases.
-  - update GH actions builds to use Go 1.25.4
-  - uninstall cmake before install
-  - fix: point the submodule for musl-lib to a mirror in the TinyGo GitHub org
-  - fix: remove macOS 15 from CI build matrix (conflicts with macOS 14 build)
-  - fix: separate host expected bytes from device intended bytes
-  - fix/typo: makeESPFirmwareImage
-  - make: GNUmakefile: shrink TinyGo binaries on Linux
-  - move the directory list into a variable
-  - several improvements to the macOS GH actions build
-  - Fix for #4678: top-level 'make lint' wasn't working
-  - fix: increase the timeout for chromedp to connect to the headless browser used for running the wasm tests.
-  - testdata: some more packages for the test corpus
-
-0.39.0
---
-* **general**
-  - all: add Go 1.25 support
-  - net: update to latest tinygo net package
-  - docs: clarify build verification step for macOS users
-  - Add flag to skip Renesas SVD builds
-* **build**
-  - Makefile: install missing dlmalloc files
-  - flash: add -o flag support to save built binary (Fixes #4937) (#4942)
-  - fix: update version of clang to 17 to accommodate latest Go 1.25 docker base image
-* **ci**
-  - chore: update all CI builds to test Go 1.25 release
-  - fix: disable test-newest since CircleCI seems unable to download due to rate-limits on Dockerhub
-  - ci: rename some jobs to avoid churn on every Go/LLVM version bump
-  - ci: make the goroutines test less racy
-  - tests: de-flake goroutines test
-* **compiler**
-  - compiler: implement internal/abi.Escape
-* **main**
-  - main: show the compiler error (if any) for `tinygo test -c`
-  - chore: correct GOOS=js name in error messages for WASM
-* **machine**
-  - machine: add international keys
-  - machine: remove some unnecessary "// peripherals:" comments
-  - machine: add I2C pin comments
-  - machine: standardize I2C errors with "i2c:" prefix
-  - machine: make I2C usable in the simulator
-  - fix: add SPI and I2C to teensy 4.1 (#4943)
-  - `rp2`: use the correct channel mask for rp2350 ADC; hold lock during read (#4938)
-  - `rp2`: disable digital input for analog inputs
-* **runtime**
-  - runtime: ensure time.Sleep(d) sleeps at least d
-  - runtime: stub out weak pointer support
-  - runtime: implement dummy AddCleanup
-  - runtime: enable multi-core scheduler for rp2350
-  - `internal/task`: use -stack-size flag when starting a new thread
-  - `internal/task`: add SA_RESTART flag to GC interrupts
-  - `internal/task`: a few small correctness fixes
-  - `internal/gclayout`: make gclayout values constants
-  - darwin: add threading support and use it by default
-* **standard library**
-  - `sync`: implement sync.Swap
-  - `reflect`: implement Method.IsExported
-* **testing**
-  - testing: stub out testing.B.Loop
-* **targets**
-  - `stm32`: add support for the STM32L031G6U6
-  - add metro-rp2350 board definition (#4989)
-  - `rp2040/rp2350`: set the default stack size to 8k for rp2040/rp2350 based boards where this was not already the case
-
-
-0.38.0
---
-* **general**
-  - `go.*`: upgrade `golang.org/x/tools` to v0.30.0
-  - `all`: add support for LLVM 20
-* **build**
-  - go back to using MinoruSekine/setup-scoop for Windows CI builds
-  - `flake.*`: upgrade to nixpkgs 25.05, LLVM 20
-  - `Makefile`: only detect ccache command when needed
-  - `Makefile`: create random filename inside rule
-  - `Makefile`: don't set GOROOT
-  - `Makefile`: call uname at most once
-  - `Makefile`: only read NodeJS version when it is needed
-* **compiler**
-  - add support for `GODEBUG=gotypesalias=1`
-  - `interp`: fix `copy()` from/to external buffers
-  - add `-nobounds` (similar to `-gcflags=-B`)
-  - `compileopts`: add library version to cached library path
-  - `builder`: build wasi-libc inside TinyGo
-  - `builder`: simplify bdwgc libc dependency
-  - `builder`: don't use precompiled libraries
-  - `compileopts`: enable support for `GOARCH=wasm` in `tinygo test`
-* **fixes**
-  - `rp2350`: Fix DMA to SPI transmits on RP2350 (#4903)
-  - `microbit v2`: use OpenOCD flash method on microbit v2 when using Nordic Semi SoftDevice
-  - `main`: display all of the current GC options for the `-gc` flag
-  - Remove duplicated error handling
-  - `sync`: fix `TestMutexConcurrent` test
-  - fix race condition in `testdata/goroutines.go`
-  - fix build warnings on Windows ARM
-* **machine**
-  - `usb`: add USB mass storage class support
-  - implement usb receive message throttling
-  - declare usb endpoints per-platform
-  - `samd21`: implement watchdog
-  - `samd51`: write to flash memory in 512 byte long chunks
-  - `samd21`: write to flash memory in 64 byte long chunks
-  - don't inline RTT `WriteByte` everywhere
-  - `rp2`: unexport machine-specific errors
-  - `rp2`: discount scheduling delays in I2C timeouts (#4876)
-  - use pointer receiver in simulated PWM peripherals
-  - add simulated PWM/timer peripherals
-  - `rp2`: expose usb endpoint stall handling
-  - `arm`: clear pending interrupts before enabling them
-  - `rp2`: merge common usb code (#4856)
-* **main**
-  - add "cores" and "threads" schedulers to help text
-  - add `StartPos` and `EndPos` to `-json` build output
-  - change `-json` flag to match upstream Go
-* **runtime**
-  - don't lock the print output inside interrupts
-  - don't try to interrupt other cores before they are started
-  - implement `NumCPU` for the multicore scheduler
-  - add support for multicore scheduler
-  - refactor obtaining the system stack
-  - `interrupt`: add `Checkpoint` type
-  - add `exportedFuncPtr`
-  - avoid an allocation in `(*time.Timer).Reset`
-  - stub runtime signal functions for `os/signal` on wasip1
-  - move `timeUnit` to a single place
-  - implement `NumCPU` for `-scheduler=threads`
-  - move `mainExited` boolean
-  - `internal/task`: rename `tinygo_pause` to `tinygo_task_exit`
-  - map every goroutine to a new OS thread
-  - refactor `timerQueue`
-  - make conservative and precise GC MT-safe
-  - `internal/task`: implement atomic primitives for preemptive scheduling
-  - Use diskutil on macOS to extract volume name and path for FAT mounts #4928
-* **standard library**
-  - `net`: update submodule to latest commits
-  - `runtime/debug`: add GC related stubs
-  - `metrics`: flesh out some of the metric types
-  - `reflect`: Chan related stubs
-  - `os`: handle relative and abs paths in `Executable()`
-  - `os`: add `os.Executable()` for Darwin
-  - `sync`: implement `RWMutex` using futexes
-  - `reflect`: Add `SliceOf`, `ArrayOf`, `StructOf`, `MapOf`, `FuncOf`
-* **targets**
-  - `rp2040`: add multicore support
-  - `riscv32`: use `gdb` binary as a fallback
-  - add target for Microbit v2 with SoftDevice S140 support for both peripheral and central
-  - `windows`: use MSVCRT.DLL instead of UCRT on i386
-  - `windows`: add windows/386 support
-  - `arm64`: remove unnecessary `.section` directive
-  - `riscv-qemu`: actually sleep in `time.Sleep()`
-  - `riscv`: define CSR constants and use them where possible
-  - `darwin`: support Boehm GC (and use by default)
-  - `windows`: add support for the Boehm-Demers-Weiser GC
-  - `windows`: fix wrong register for first parameter
-* **wasm**
-  - add Boehm GC support
-  - refactor/modify stub signal handling
-  - don't block `//go:wasmexport` because of running goroutines
-  - use `int64` instead of `float64` for the `timeUnit`
-* **boards**
-  - Add board support for BigTreeTech SKR Pico (#4842)
-
-
-0.37.0
---
-* **general**
-  - add the Boehm-Demers-Weiser GC on Linux
-* **ci**
-  - add more tests for wasm and baremetal
-* **compiler**
-  - crypto/internal/sysrand is allowed to use unsafe signatures
-* **examples**
-  - add goroutine benchmark to examples
-* **fixes**
-  - ensure use of pointers for SPI interface on atsam21/atsam51 and other machines/boards that were missing implementation (#4798)
-  - replace loop counter with hw timer for USB SetAddressReq on rp2040 (#4796)
-* **internal**
-  - update to go.bytecodealliance.org@v0.6.2 in GNUmakefile and internal/wasm-tools
-  - exclude certain files when copying package in internal/cm
-  - update to go.bytecodealliance.org/cm@v0.2.2 in internal/cm
-  - remove old reflect.go in internal/reflectlite
-* **loader**
-  - use build tags for package iter and iter methods on reflect.Value in loader, iter, reflect
-  - add shim for go1.22 and earlier in loader, iter
-* **machine**
-  - bump rp2040 to 200MHz (#4768)
-  - correct register address for Pin.SetInterrupt for rp2350 (#4782)
-  - don't block the rp2xxx UART interrupt handler
-  - fix RP2040 Pico board on the playground
-  - add flash support for rp2350 (#4803)
-* **os**
-  - add stub Symlink for wasm
-* **refactor**
-  - use *SPI everywhere to make consistent for implementations. Fixes #4663 "in reverse" by making SPI a pointer everywhere, as discussed in the comments.
-* **reflect**
-  - add Value.SetIter{Key,Value} and MapIter.Reset in reflect, internal/reflectlite
-  - embed reflectlite types into reflect types in reflect, internal/reflectlite
-  - add Go 1.24 iter.Seq[2] methods
-  - copy reflect iter tests from upstream Go
-  - panic on Type.CanSeq[2] instead of returning false
-  - remove strconv.go
-  - remove unused go:linkname functions
-* **riscv-qemu**
-  - add VirtIO RNG device
-  - increase stack size
-* **runtime**
-  - only allocate heap memory when needed
-  - remove unused file func.go
-  - use package reflectlite
-* **transform**
-  - cherry-pick from #4774
-
-
-0.36.0
---
-* **general**
-  - add initial Go 1.24 support
-  - add support for LLVM 19
-  - update license for 2025
-  - make small corrections for README regarding wasm
-  - use GOOS and GOARCH for building wasm simulated boards
-  - only infer target for wasm when GOOS and GOARCH are set correctly, not just based on file extension
-  - add test-corpus-wasip2
-  - use older image for cross-compiling builds
-  - update Linux builds to run on ubuntu-latest since 20.04 is being retired
-  - ensure build output directory is created
-  - add NoSandbox flag to chrome headless that is run during WASM tests, since this is now required for Ubuntu 23+ and we are using Ubuntu 24+ when running Github Actions
-  - update wasmtime used for CI to 29.0.1 to fix issue with install during CI tests
-  - update to use `Get-CimInstance` as `wmic` is being deprecated on WIndows
-  - remove unnecessary executable permissions
-  - `goenv`: update to new v0.36.0 development version
-* **compiler**
-  - `builder`: fix parsing of external ld.lld error messages
-  - `cgo`: mangle identifier names
-  - `interp`: correctly mark functions as modifying memory
-  - add buildmode=wasi-legacy to support existing base of users who expected the older behavior for wasi modules to not return an exit code as if they were reactors
-* **standard library**
-  - `crypto/tls`: add Dialer.DialContext() to fix websocket client
-  - `crypto/tls`: add VersionTLS constants and VersionName(version uint16) method that turns it into a string, copied from big go
-  - `internal/syscall/unix`: use our own version of this package
-  - `machine`: replace hard-coded cpu frequencies on rp2xxx
-  - `machine`: bump rp2350 CPUFrequency to 150 MHz
-  - `machine`: compute rp2 clock dividers from crystal and target frequency
-  - `machine`: remove bytes package dependency in flash code
-  - `machine/usb/descriptor`: avoid bytes package
-  - `net`: update to latest submodule with httptest subpackage and ResolveIPAddress implementation
-  - `os`: add File.Chdir support
-  - `os`: implement stub Chdir for non-OS systems
-  - `os/file`: add file.Chmod
-  - `reflect`: implement Value.Equal
-  - `runtime`: add FIPS helper functions
-  - `runtime`: manually initialize xorshift state
-  - `sync`: move Mutex to internal/task
-  - `syscall`: add wasip1 RandomGet
-  - `testing`: add Chdir
-  - `wasip2`: add stubs to get internal/syscall/unix to work
-* **fixes**
-  - correctly handle calls for GetRNG() when being made from nrf devices with SoftDevice enabled
-  - fix stm32f103 ADC
-  - `wasm`: correctly handle id lookup for finalizeRef call
-  - `wasm`: avoid total failure on wasm finalizer call
-  - `wasm`: convert offset as signed int into unsigned int in syscall/js.stringVal in wasm_exec.js
-* **targets**
-  - rp2350: add pll generalized solution; fix ADC handles; pwm period fix
-  - rp2350: extending support to include the rp2350b
-  - rp2350: cleanup: unexport internal USB and clock package variable, consts and types
-  - nrf: make ADC resolution changeable
-  - turn on GC for TKey1 device, since it does in fact work
-  - match Pico2 stack size to Pico
-* **boards**
-  - add support for Pimoroni Pico Plus2
-  - add target for pico2-w board
-  - add comboat_fw tag for elecrow W5 boards with Combo-AT Wifi firmware
-  - add support for Elecrow Pico rp2350 W5 boards
-  - add support for Elecrow Pico rp2040 W5 boards
-  - add support for NRF51 HW-651
-  - add support for esp32c3-supermini
-  - add support for waveshare-rp2040-tiny
-* **examples**
-  - add naive debouncing for pininterrupt example
-
-
-0.35.0
---
-* **general**
-  - update cmsis-svd library
-  - use default UART settings in the echo example
-  - `goenv`: also show git hash with custom build of TinyGo
-  - `goenv`: support parsing development versions of Go
-  - `main`: parse extldflags early so we can report the error message
-* **compiler**
-  - `builder`: whitelist temporary directory env var for Clang invocation to fix Windows bug
-  - `builder`: fix cache paths in `-size=full` output
-  - `builder`: work around incorrectly escaped DWARF paths on Windows (Clang bug)
-  - `builder`: fix wasi-libc path names on Windows with `-size=full`
-  - `builder`: write HTML size report
-  - `cgo`: support C identifiers only referred to from within macros
-  - `cgo`: support function-like macros
-  - `cgo`: support errno value as second return parameter
-  - `cgo`: add support for `#cgo noescape` lines
-  - `compiler`: fix bug in interrupt lowering
-  - `compiler`: allow panic directly in `defer`
-  - `compiler`: fix wasmimport -> wasmexport in error message
-  - `compiler`: support `//go:noescape` pragma
-  - `compiler`: report error instead of crashing when instantiating a generic function without body
-  - `interp`: align created globals
-* **standard library**
-  - `machine`: modify i2s interface/implementation to better match specification
-  - `os`: implement `StartProcess`
-  - `reflect`: add `Value.Clear`
-  - `reflect`: add interface support to `NumMethods`
-  - `reflect`: fix `AssignableTo` for named + non-named types
-  - `reflect`: implement `CanConvert`
-  - `reflect`: handle more cases in `Convert`
-  - `reflect`: fix Copy of non-pointer array with size > 64bits
-  - `runtime`: don't call sleepTicks with a negative duration
-  - `runtime`: optimize GC scanning (findHead)
-  - `runtime`: move constants into shared package
-  - `runtime`: add `runtime.fcntl` function for internal/syscall/unix
-  - `runtime`: heapptr only needs to be initialized once
-  - `runtime`: refactor scheduler (this fixes a few bugs with `-scheduler=none`)
-  - `runtime`: rewrite channel implementation to be smaller and more flexible
-  - `runtime`: use `SA_RESTART` when registering a signal for os/signal
-  - `runtime`: implement race-free signals using futexes
-  - `runtime`: run deferred functions in `Goexit`
-  - `runtime`: remove `Cond` which seems to be unused
-  - `runtime`: properly handle unix read on directory
-  - `runtime/trace`: stub all public methods
-  - `sync`: don't use volatile in `Mutex`
-  - `sync`: implement `WaitGroup` using a (pseudo)futex
-  - `sync`: make `Cond` parallelism-safe
-  - `syscall`: use wasi-libc tables for wasm/js target
-* **targets**
-  - `mips`: fix a bug when scanning the stack
-  - `nintendoswitch`: get this target to compile again
-  - `rp2350`: add support for the new RP2350
-  - `rp2040/rp2350` : make I2C implementation shared for rp2040/rp2350
-  - `rp2040/rp2350` : make SPI implementation shared for rp2040/rp2350
-  - `rp2040/rp2350` : make RNG implementation shared for rp2040/rp2350
-  - `wasm`: revise and simplify wasmtime argument handling
-  - `wasm`: support `//go:wasmexport` functions after a call to `time.Sleep`
-  - `wasm`: correctly return from run() in wasm_exec.js
-  - `wasm`: call process.exit() when go.run() returns
-  - `windows`: don't return, exit via exit(0) instead to flush stdout buffer
-* **boards**
-  - add support for the Tillitis TKey
-  - add support for the Raspberry Pi Pico2 (based on the RP2040)
-  - add support for Pimoroni Tiny2350
-
-
-0.34.0
---
-* **general**
-  - fix `GOOS=wasip1` for `tinygo test`
-  - add `-C DIR` flag
-  - add initial documentation for project governance
-  - add `-ldflags='-extldflags=...'` support
-  - improve usage message with `tinygo help` and when passing invalid parameters
-* **compiler**
-  - `builder`: remove environment variables when invoking Clang, to avoid the environment changing the behavior
-  - `builder`: check for the Go toolchain version used to compile TinyGo
-  - `cgo`: add `C.CBytes` implementation
-  - `compiler`: fix passing weirdly-padded structs as parameters to new goroutines
-  - `compiler`: support pragmas on generic functions
-  - `compiler`: do not let the slice buffer escape when casting a `[]byte` or `[]rune` to a string, to help escape analysis
-  - `compiler`: conform to the latest iteration of the wasm types proposal
-  - `loader`: don't panic when main package is not named 'main'
-  - `loader`: make sure we always return type checker errors even without type errors
-  - `transform`: optimize range over `[]byte(string)`
-* **standard library**
-  - `crypto/x509`: add package stub to build crypto/x509 on macOS
-  - `machine/usb/adc/midi`: fix `PitchBend`
-  - `os`: add `Truncate` stub for baremetal
-  - `os`: add stubs for `os.File` deadlines
-  - `os`: add internal `net.newUnixFile` for the net package
-  - `runtime`: stub runtime_{Before,After}Exec for linkage
-  - `runtime`: randomize map accesses
-  - `runtime`: support `maps.Clone`
-  - `runtime`: add more fields to `MemStats`
-  - `runtime`: implement newcoro, coroswitch to support package iter
-  - `runtime`: disallow defer in interrupts
-  - `runtime`: add support for os/signal on Linux and MacOS
-  - `runtime`: add gc layout info for some basic types to help the precise GC
-  - `runtime`: bump GC mark stack size to avoid excessive heap rescans
-* **targets**
-  - `darwin`: use Go standard library syscall package instead of a custom one
-  - `fe310`: support GPIO `PinInput`
-  - `mips`: fix compiler crash with GOMIPS=softfloat and defer
-  - `mips`: add big-endian (GOARCH=mips) support
-  - `mips`: use MIPS32 (instead of MIPS32R2) as the instruction set for wider compatibility
-  - `wasi`: add relative and absolute --dir options to wasmtime args
-  - `wasip2`: add wasmtime -S args to support network interfaces
-  - `wasm`: add `//go:wasmexport` support (for all WebAssembly targets)
-  - `wasm`: use precise instead of conservative GC for WebAssembly (including WASI)
-  - `wasm-unknown`: add bulk memory flags since basically every runtime has it now
-* **boards**
-  - add RAKwireless RAK4631
-  - add WaveShare ESP-C3-32S-Kit
-
-
 0.33.0
 ---

@@ -1,8 +1,8 @@
 # tinygo-llvm stage obtains the llvm source for TinyGo
-FROM golang:1.26 AS tinygo-llvm
+FROM golang:1.23 AS tinygo-llvm

 RUN apt-get update && \
-    apt-get install -y apt-utils make cmake clang-17 ninja-build && \
+    apt-get install -y apt-utils make cmake clang-15 ninja-build && \
    rm -rf \
        /var/lib/apt/lists/* \
        /var/log/* \
@@ -33,7 +33,7 @@ RUN cd /tinygo/ && \

 # tinygo-compiler copies the compiler build over to a base Go container (without
 # all the build tools etc).
-FROM golang:1.26 AS tinygo-compiler
+FROM golang:1.23 AS tinygo-compiler

 # Copy tinygo build.
 COPY --from=tinygo-compiler-build /tinygo/build/release/tinygo /tinygo
@@ -8,20 +8,13 @@ LLVM_PROJECTDIR ?= llvm-project
 CLANG_SRC ?= $(LLVM_PROJECTDIR)/clang
 LLD_SRC ?= $(LLVM_PROJECTDIR)/lld

-ifeq ($(OS),Windows_NT)
-    # avoid calling uname on Windows
-    uname := Windows_NT
-else
-    uname := $(shell uname -s)
-endif
-
 # Try to autodetect LLVM build tools.
 # Versions are listed here in descending priority order.
-LLVM_VERSIONS = 19 18 17 16 15
+LLVM_VERSIONS = 18 17 16 15
 errifempty = $(if $(1),$(1),$(error $(2)))
 detect = $(shell which $(call errifempty,$(firstword $(foreach p,$(2),$(shell command -v $(p) 2> /dev/null && echo $(p)))),failed to locate $(1) at any of: $(2)))
 toolSearchPathsVersion = $(1)-$(2)
-ifeq ($(uname),Darwin)
+ifeq ($(shell uname -s),Darwin)
 	# Also explicitly search Brew's copy, which is not in PATH by default.
 	BREW_PREFIX := $(shell brew --prefix)
 	toolSearchPathsVersion += $(BREW_PREFIX)/opt/llvm@$(2)/bin/$(1)-$(2) $(BREW_PREFIX)/opt/llvm@$(2)/bin/$(1)
@@ -34,6 +27,7 @@ LLVM_NM ?= $(call findLLVMTool,llvm-nm)

 # Go binary and GOROOT to select
 GO ?= go
+export GOROOT = $(shell $(GO) env GOROOT)

 # Flags to pass to go test.
 GOTESTFLAGS ?=
@@ -44,10 +38,14 @@ TINYGO ?= $(call detect,tinygo,tinygo $(CURDIR)/build/tinygo)

 # Check for ccache if the user hasn't set it to on or off.
 ifeq (, $(CCACHE))
-    LLVM_OPTION += '-DLLVM_CCACHE_BUILD=$(if $(shell command -v ccache 2> /dev/null),ON,OFF)'
-else
-    LLVM_OPTION += '-DLLVM_CCACHE_BUILD=$(CCACHE)'
+    # Use CCACHE for LLVM if possible
+    ifneq (, $(shell command -v ccache 2> /dev/null))
+        CCACHE := ON
+    else
+        CCACHE := OFF
+    endif
 endif
+LLVM_OPTION += '-DLLVM_CCACHE_BUILD=$(CCACHE)'

 # Allow enabling LLVM assertions
 ifeq (1, $(ASSERT))
@@ -79,26 +77,6 @@ ifeq (1, $(STATIC))
    BINARYEN_OPTION += -DCMAKE_CXX_FLAGS="-static" -DCMAKE_C_FLAGS="-static"
 endif

-# Optimize the binary size for Linux.
-# These flags may work on other platforms, but have only been tested on Linux.
-ifeq ($(uname),Linux)
-    HAS_MOLD := $(shell command -v ld.mold 2> /dev/null)
-    HAS_LLD := $(shell command -v ld.lld 2> /dev/null)
-    LLVM_CFLAGS := -ffunction-sections -fdata-sections -fvisibility=hidden
-    LLVM_LDFLAGS := -Wl,--gc-sections
-    ifneq ($(HAS_MOLD),)
-        # Mold might be slightly faster.
-        LLVM_LDFLAGS += -fuse-ld=mold -Wl,--icf=all
-    else ifneq ($(HAS_LLD),)
-        # LLD is more commonly available.
-        LLVM_LDFLAGS += -fuse-ld=lld -Wl,--icf=all
-    endif
-    LLVM_OPTION += \
-        -DCMAKE_C_FLAGS="$(LLVM_CFLAGS)" \
-        -DCMAKE_CXX_FLAGS="$(LLVM_CFLAGS)"
-    CGO_LDFLAGS += $(LLVM_LDFLAGS)
-endif
-
 # Cross compiling support.
 ifneq ($(CROSS),)
    CC = $(CROSS)-gcc
@@ -149,14 +127,14 @@ ifeq ($(OS),Windows_NT)

    USE_SYSTEM_BINARYEN ?= 1

-else ifeq ($(uname),Darwin)
+else ifeq ($(shell uname -s),Darwin)
    MD5SUM ?= md5

    CGO_LDFLAGS += -lxar

    USE_SYSTEM_BINARYEN ?= 1

-else ifeq ($(uname),FreeBSD)
+else ifeq ($(shell uname -s),FreeBSD)
    MD5SUM ?= md5
    START_GROUP = -Wl,--start-group
    END_GROUP = -Wl,--end-group
@@ -169,7 +147,7 @@ endif
 MD5SUM ?= md5sum

 # Libraries that should be linked in for the statically linked Clang.
-CLANG_LIB_NAMES = clangAnalysis clangAPINotes clangAST clangASTMatchers clangBasic clangCodeGen clangCrossTU clangDriver clangDynamicASTMatchers clangEdit clangExtractAPI clangFormat clangFrontend clangFrontendTool clangHandleCXX clangHandleLLVM clangIndex clangInstallAPI clangLex clangParse clangRewrite clangRewriteFrontend clangSema clangSerialization clangSupport clangTooling clangToolingASTDiff clangToolingCore clangToolingInclusions
+CLANG_LIB_NAMES = clangAnalysis clangAPINotes clangAST clangASTMatchers clangBasic clangCodeGen clangCrossTU clangDriver clangDynamicASTMatchers clangEdit clangExtractAPI clangFormat clangFrontend clangFrontendTool clangHandleCXX clangHandleLLVM clangIndex clangLex clangParse clangRewrite clangRewriteFrontend clangSema clangSerialization clangSupport clangTooling clangToolingASTDiff clangToolingCore clangToolingInclusions
 CLANG_LIBS = $(START_GROUP) $(addprefix -l,$(CLANG_LIB_NAMES)) $(END_GROUP) -lstdc++

 # Libraries that should be linked in for the statically linked LLD.
@@ -207,10 +185,7 @@ fmt-check: ## Warn if any source needs reformatting
 	@unformatted=$$(gofmt -l $(FMT_PATHS)); [ -z "$$unformatted" ] && exit 0; echo "Unformatted:"; for fn in $$unformatted; do echo "  $$fn"; done; exit 1


-gen-device: gen-device-avr gen-device-esp gen-device-nrf gen-device-sam gen-device-sifive gen-device-kendryte gen-device-nxp gen-device-rp ## Generate microcontroller-specific sources
-ifneq ($(RENESAS), 0)
-gen-device: gen-device-renesas
-endif
+gen-device: gen-device-avr gen-device-esp gen-device-nrf gen-device-sam gen-device-sifive gen-device-kendryte gen-device-nxp gen-device-rp gen-device-renesas ## Generate microcontroller-specific sources
 ifneq ($(STM32), 0)
 gen-device: gen-device-stm32
 endif
@@ -263,7 +238,7 @@ gen-device-renesas: build/gen-device-svd
 	GO111MODULE=off $(GO) fmt ./src/device/renesas

 $(LLVM_PROJECTDIR)/llvm:
-	git clone -b tinygo_20.x --depth=1 https://github.com/tinygo-org/llvm-project $(LLVM_PROJECTDIR)
+	git clone -b tinygo_xtensa_release_18.1.2 --depth=1 https://github.com/tinygo-org/llvm-project $(LLVM_PROJECTDIR)
 llvm-source: $(LLVM_PROJECTDIR)/llvm ## Get LLVM sources

 # Configure LLVM.
@@ -284,35 +259,41 @@ build/wasm-opt$(EXE):
 	cp lib/binaryen/bin/wasm-opt$(EXE) build/wasm-opt$(EXE)
 endif

+# Build wasi-libc sysroot
+.PHONY: wasi-libc
+wasi-libc: lib/wasi-libc/sysroot/lib/wasm32-wasi/libc.a
+lib/wasi-libc/sysroot/lib/wasm32-wasi/libc.a:
+	@if [ ! -e lib/wasi-libc/Makefile ]; then echo "Submodules have not been downloaded. Please download them using:\n  git submodule update --init"; exit 1; fi
+	cd lib/wasi-libc && $(MAKE) -j4 EXTRA_CFLAGS="-O2 -g -DNDEBUG -mnontrapping-fptoint -msign-ext" MALLOC_IMPL=none CC="$(CLANG)" AR=$(LLVM_AR) NM=$(LLVM_NM)
+
 # Generate WASI syscall bindings
-WASM_TOOLS_MODULE=go.bytecodealliance.org
+WASM_TOOLS_MODULE=github.com/bytecodealliance/wasm-tools-go
 .PHONY: wasi-syscall
 wasi-syscall: wasi-cm
-	rm -rf ./src/internal/wasi/*
-	go run $(WASM_TOOLS_MODULE)/cmd/wit-bindgen-go generate --versioned -o ./src/internal -p internal --cm internal/cm ./lib/wasi-cli/wit
+	go run -modfile ./internal/wasm-tools/go.mod $(WASM_TOOLS_MODULE)/cmd/wit-bindgen-go generate --versioned -o ./src/internal -p internal --cm internal/cm ./lib/wasi-cli/wit

 # Copy package cm into src/internal/cm
 .PHONY: wasi-cm
 wasi-cm:
-	rm -rf ./src/internal/cm/*
-	rsync -rv --delete --exclude go.mod --exclude '*_test.go' --exclude '*_json.go' --exclude '*.md' --exclude LICENSE $(shell go list -m -f {{.Dir}} $(WASM_TOOLS_MODULE)/cm)/ ./src/internal/cm
+	# rm -rf ./src/internal/cm
+	rsync -rv --delete --exclude '*_test.go' $(shell go list -modfile ./internal/wasm-tools/go.mod -m -f {{.Dir}} $(WASM_TOOLS_MODULE))/cm ./src/internal/

 # Check for Node.js used during WASM tests.
+NODEJS_VERSION := $(word 1,$(subst ., ,$(shell node -v | cut -c 2-)))
 MIN_NODEJS_VERSION=18

 .PHONY: check-nodejs-version
 check-nodejs-version:
-	@# Check whether NodeJS is available.
-	@if ! command -v node 2>&1 >/dev/null; then echo "Install NodeJS version ${MIN_NODEJS_VERSION}+ to run tests."; exit 1; fi
-
-	@# Check whether the version is high enough.
-	@if [ "`node -v | sed 's/v\([0-9]\+\).*/\\1/g'`" -lt $(MIN_NODEJS_VERSION) ]; then echo "Install NodeJS version $(MIN_NODEJS_VERSION)+ to run tests."; exit 1; fi
+ifeq (, $(shell which node))
+	@echo "Install NodeJS version 18+ to run tests."; exit 1;
+endif
+	@if [ $(NODEJS_VERSION) -lt $(MIN_NODEJS_VERSION) ]; then echo "Install NodeJS version 18+ to run tests."; exit 1; fi

 tinygo: ## Build the TinyGo compiler
 	@if [ ! -f "$(LLVM_BUILDDIR)/bin/llvm-config" ]; then echo "Fetch and build LLVM first by running:"; echo "  $(MAKE) llvm-source"; echo "  $(MAKE) $(LLVM_BUILDDIR)"; exit 1; fi
-	CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GOENVFLAGS) $(GO) build -buildmode exe -o build/tinygo$(EXE) -tags "byollvm osusergo" .
-test: check-nodejs-version
-	CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) test $(GOTESTFLAGS) -timeout=1h -buildmode exe -tags "byollvm osusergo" $(GOTESTPKGS)
+	CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GOENVFLAGS) $(GO) build -buildmode exe -o build/tinygo$(EXE) -tags "byollvm osusergo" -ldflags="-X github.com/tinygo-org/tinygo/goenv.GitSha1=`git rev-parse --short HEAD`" .
+test: wasi-libc check-nodejs-version
+	CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) test $(GOTESTFLAGS) -timeout=20m -buildmode exe -tags "byollvm osusergo" $(GOTESTPKGS)

 # Standard library packages that pass tests on darwin, linux, wasi, and windows, but take over a minute in wasi
 TEST_PACKAGES_SLOW = \
@@ -322,35 +303,26 @@ TEST_PACKAGES_SLOW = \

 # Standard library packages that pass tests quickly on darwin, linux, wasi, and windows
 TEST_PACKAGES_FAST = \
-	cmp \
 	compress/lzw \
 	compress/zlib \
 	container/heap \
 	container/list \
 	container/ring \
-	crypto/ecdsa \
-	crypto/elliptic \
+	crypto/des \
 	crypto/md5 \
+	crypto/rc4 \
 	crypto/sha1 \
 	crypto/sha256 \
 	crypto/sha512 \
-	database/sql/driver \
 	debug/macho \
 	embed/internal/embedtest \
 	encoding \
 	encoding/ascii85 \
-	errors \
-	encoding/asn1 \
 	encoding/base32 \
 	encoding/base64 \
 	encoding/csv \
 	encoding/hex \
-	expvar \
-	go/ast \
-	go/format \
 	go/scanner \
-	go/token \
-	go/version \
 	hash \
 	hash/adler32 \
 	hash/crc64 \
@@ -362,7 +334,6 @@ TEST_PACKAGES_FAST = \
 	math/cmplx \
 	net/http/internal/ascii \
 	net/mail \
-	net/url \
 	os \
 	path \
 	reflect \
@@ -376,22 +347,21 @@ TEST_PACKAGES_FAST = \
 	unique \
 	$(nil)

+# Assume this will go away before Go2, so only check minor version.
+ifeq ($(filter $(shell $(GO) env GOVERSION | cut -f 2 -d.), 16 17 18), )
+TEST_PACKAGES_FAST += crypto/internal/nistec/fiat
+else
+TEST_PACKAGES_FAST += crypto/elliptic/internal/fiat
+endif
+
 # archive/zip requires os.ReadAt, which is not yet supported on windows
 # bytes requires mmap
 # compress/flate appears to hang on wasi
-# crypto/aes fails on wasi, needs panic()/recover()
-# crypto/des fails on wasi, needs panic()/recover()
 # crypto/hmac fails on wasi, it exits with a "slice out of range" panic
 # debug/plan9obj requires os.ReadAt, which is not yet supported on windows
-# encoding/xml takes a minute on linux and gives a stack overflow on wasi
 # image requires recover(), which is not yet supported on wasi
 # io/ioutil requires os.ReadDir, which is not yet supported on windows or wasi
-# mime: fail on wasi; neds panic()/recover()
-# mime/multipart: needs wasip1 syscall.FDFLAG_NONBLOCK
 # mime/quotedprintable requires syscall.Faccessat
-# net/mail: needs wasip1  syscall.FDFLAG_NONBLOCK
-# net/ntextproto: needs wasip1 syscall.FDFLAG_NONBLOCK
-# regexp/syntax: fails on wasip1; needs panic()/recover()
 # strconv requires recover() which is not yet supported on wasi
 # text/tabwriter requires recover(), which is not yet supported on wasi
 # text/template/parse requires recover(), which is not yet supported on wasi
@@ -401,72 +371,31 @@ TEST_PACKAGES_FAST = \
 TEST_PACKAGES_LINUX := \
 	archive/zip \
 	compress/flate \
-	context \
-	crypto/aes \
-	crypto/des \
 	crypto/hmac \
 	debug/dwarf \
 	debug/plan9obj \
-	encoding/xml \
 	image \
 	io/ioutil \
-	mime \
-	mime/multipart \
 	mime/quotedprintable \
 	net \
-	net/mail \
-	net/textproto \
 	os/user \
-	regexp/syntax \
 	strconv \
 	text/tabwriter \
 	text/template/parse

 TEST_PACKAGES_DARWIN := $(TEST_PACKAGES_LINUX)

-# os/user requires t.Skip() support
 TEST_PACKAGES_WINDOWS := \
 	compress/flate \
-	crypto/des \
 	crypto/hmac \
+	os/user \
 	strconv \
 	text/template/parse \
 	$(nil)

-
-# These packages cannot be tested on wasm, mostly because these tests assume a
-# working filesystem. This could perhaps be fixed, by supporting filesystem
-# access when running inside Node.js.
-TEST_PACKAGES_WASM = $(filter-out $(TEST_PACKAGES_NONWASM), $(TEST_PACKAGES_FAST))
-TEST_PACKAGES_NONWASM = \
-	compress/lzw \
-	compress/zlib \
-	crypto/ecdsa \
-	debug/macho \
-	embed/internal/embedtest \
-	expvar \
-	go/format \
-	os \
-	testing \
-	$(nil)
-
-# These packages cannot be tested on baremetal.
-#
-# Some reasons why the tests don't pass on baremetal:
-#
-#   * No filesystem is available, so packages like compress/zlib can't be tested
-#     (just like wasm).
-#   * picolibc math functions apparently are less precise, the math package
-#     fails on baremetal.
-TEST_PACKAGES_BAREMETAL = $(filter-out $(TEST_PACKAGES_NONBAREMETAL), $(TEST_PACKAGES_FAST))
-TEST_PACKAGES_NONBAREMETAL = \
-	$(TEST_PACKAGES_NONWASM) \
-	math \
-	$(nil)
-
 # Report platforms on which each standard library package is known to pass tests
+jointmp := $(shell echo /tmp/join.$$$$)
 report-stdlib-tests-pass:
-	$(eval jointmp := $(shell echo /tmp/join.$$$$))
 	@for t in $(TEST_PACKAGES_DARWIN); do echo "$$t darwin"; done | sort > $(jointmp).darwin
 	@for t in $(TEST_PACKAGES_LINUX); do echo "$$t linux"; done | sort > $(jointmp).linux
 	@for t in $(TEST_PACKAGES_FAST) $(TEST_PACKAGES_SLOW); do echo "$$t darwin linux wasi windows"; done | sort > $(jointmp).portable
@@ -475,11 +404,11 @@ report-stdlib-tests-pass:
 	@rm $(jointmp).*

 # Standard library packages that pass tests quickly on the current platform
-ifeq ($(uname),Darwin)
+ifeq ($(shell uname),Darwin)
 TEST_PACKAGES_HOST := $(TEST_PACKAGES_FAST) $(TEST_PACKAGES_DARWIN)
 TEST_IOFS := true
 endif
-ifeq ($(uname),Linux)
+ifeq ($(shell uname),Linux)
 TEST_PACKAGES_HOST := $(TEST_PACKAGES_FAST) $(TEST_PACKAGES_LINUX)
 TEST_IOFS := true
 endif
@@ -488,16 +417,11 @@ TEST_PACKAGES_HOST := $(TEST_PACKAGES_FAST) $(TEST_PACKAGES_WINDOWS)
 TEST_IOFS := false
 endif

-TEST_SKIP_FLAG := -skip='TestExtraMethods|TestParseAndBytesRoundTrip/P256/Generic|TestAsValidation'
-TEST_ADDITIONAL_FLAGS ?=
-
 # Test known-working standard library packages.
 # TODO: parallelize, and only show failing tests (no implied -v flag).
 .PHONY: tinygo-test
 tinygo-test:
-	@# TestExtraMethods: used by many crypto packages and uses reflect.Type.Method which is not implemented.
-	@# TestParseAndBytesRoundTrip/P256/Generic: relies on t.Skip() which is not implemented
-	$(TINYGO) test $(TEST_ADDITIONAL_FLAGS) $(TEST_SKIP_FLAG) $(TEST_PACKAGES_HOST) $(TEST_PACKAGES_SLOW)
+	$(TINYGO) test $(TEST_PACKAGES_HOST) $(TEST_PACKAGES_SLOW)
 	@# io/fs requires os.ReadDir, not yet supported on windows or wasi. It also
 	@# requires a large stack-size. Hence, io/fs is only run conditionally.
 	@# For more details, see the comments on issue #3143.
@@ -505,26 +429,24 @@ ifeq ($(TEST_IOFS),true)
 	$(TINYGO) test -stack-size=6MB io/fs
 endif
 tinygo-test-fast:
-	$(TINYGO) test $(TEST_SKIP_FLAG) $(TEST_PACKAGES_HOST)
+	$(TINYGO) test $(TEST_PACKAGES_HOST)
 tinygo-bench:
 	$(TINYGO) test -bench . $(TEST_PACKAGES_HOST) $(TEST_PACKAGES_SLOW)
 tinygo-bench-fast:
 	$(TINYGO) test -bench . $(TEST_PACKAGES_HOST)

 # Same thing, except for wasi rather than the current platform.
-tinygo-test-wasm:
-	$(TINYGO) test -target wasm $(TEST_SKIP_FLAG) $(TEST_PACKAGES_WASM)
 tinygo-test-wasi:
-	$(TINYGO) test -target wasip1 $(TEST_SKIP_FLAG) $(TEST_PACKAGES_FAST) $(TEST_PACKAGES_SLOW) ./tests/runtime_wasi
+	$(TINYGO) test -target wasip1 $(TEST_PACKAGES_FAST) $(TEST_PACKAGES_SLOW) ./tests/runtime_wasi
 tinygo-test-wasip1:
-	GOOS=wasip1 GOARCH=wasm $(TINYGO) test $(TEST_SKIP_FLAG) $(TEST_PACKAGES_FAST) $(TEST_PACKAGES_SLOW) ./tests/runtime_wasi
+	GOOS=wasip1 GOARCH=wasm $(TINYGO) test $(TEST_PACKAGES_FAST) $(TEST_PACKAGES_SLOW) ./tests/runtime_wasi
 tinygo-test-wasip1-fast:
-	$(TINYGO) test -target=wasip1 $(TEST_SKIP_FLAG) $(TEST_PACKAGES_FAST) ./tests/runtime_wasi
+	$(TINYGO) test -target=wasip1 $(TEST_PACKAGES_FAST) ./tests/runtime_wasi

 tinygo-test-wasip2-slow:
-	$(TINYGO) test -target=wasip2 $(TEST_SKIP_FLAG) $(TEST_PACKAGES_SLOW)
+	$(TINYGO) test -target=wasip2 $(TEST_PACKAGES_SLOW)
 tinygo-test-wasip2-fast:
-	$(TINYGO) test -target=wasip2 $(TEST_SKIP_FLAG) $(TEST_PACKAGES_FAST) ./tests/runtime_wasi
+	$(TINYGO) test -target=wasip2 $(TEST_PACKAGES_FAST) ./tests/runtime_wasi

 tinygo-test-wasip2-sum-slow:
 	TINYGO=$(TINYGO) \
@@ -548,31 +470,21 @@ tinygo-bench-wasip2:
 tinygo-bench-wasip2-fast:
 	$(TINYGO) test -target wasip2 -bench . $(TEST_PACKAGES_FAST)

-# Run tests on riscv-qemu since that one provides a large amount of memory.
-tinygo-test-baremetal:
-	$(TINYGO) test -target riscv-qemu $(TEST_SKIP_FLAG) $(TEST_PACKAGES_BAREMETAL)
-
 # Test external packages in a large corpus.
 test-corpus:
 	CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) test $(GOTESTFLAGS) -timeout=1h -buildmode exe -tags byollvm -run TestCorpus . -corpus=testdata/corpus.yaml
 test-corpus-fast:
 	CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) test $(GOTESTFLAGS) -timeout=1h -buildmode exe -tags byollvm -run TestCorpus -short . -corpus=testdata/corpus.yaml
-test-corpus-wasi:
+test-corpus-wasi: wasi-libc
 	CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) test $(GOTESTFLAGS) -timeout=1h -buildmode exe -tags byollvm -run TestCorpus . -corpus=testdata/corpus.yaml -target=wasip1
-test-corpus-wasip2:
-	CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) test $(GOTESTFLAGS) -timeout=1h -buildmode exe -tags byollvm -run TestCorpus . -corpus=testdata/corpus.yaml -target=wasip2

-.PHONY: testchdir
-testchdir:
-	# test 'build' command with{,out} -C argument
-	$(TINYGO) build -C tests/testing/chdir chdir.go && rm tests/testing/chdir/chdir
-	$(TINYGO) build ./tests/testing/chdir/chdir.go && rm chdir
-	# test 'run' command with{,out} -C argument
-	EXPECT_DIR=$(PWD)/tests/testing/chdir $(TINYGO) run -C tests/testing/chdir chdir.go
-	EXPECT_DIR=$(PWD) $(TINYGO) run ./tests/testing/chdir/chdir.go
+tinygo-baremetal:
+	# Regression tests that run on a baremetal target and don't fit in either main_test.go or smoketest.
+	# regression test for #2666: e.g. encoding/hex must pass on baremetal
+	$(TINYGO) test -target cortex-m-qemu encoding/hex

 .PHONY: smoketest
-smoketest: testchdir
+smoketest:
 	$(TINYGO) version
 	$(TINYGO) targets > /dev/null
 	# regression test for #2892
@@ -582,8 +494,6 @@ smoketest: testchdir
 	# regression test for #2563
 	cd tests/os/smoke && $(TINYGO) test -c -target=pybadge && rm smoke.test
 	# test all examples (except pwm)
-	$(TINYGO) build -size short -o test.hex -target=pga2350             examples/echo
-	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=pca10040            examples/blinky1
 	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=pca10040            examples/adc
@@ -630,29 +540,23 @@ smoketest: testchdir
 	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=feather-rp2040      examples/device-id
 	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=pico2-ice           examples/blinky1
-	@$(MD5SUM) test.hex
 	# test simulated boards on play.tinygo.org
 ifneq ($(WASM), 0)
-	GOOS=js GOARCH=wasm $(TINYGO) build -size short -o test.wasm -tags=arduino_uno          examples/blinky1
+	$(TINYGO) build -size short -o test.wasm -tags=arduino              examples/blinky1
 	@$(MD5SUM) test.wasm
-	GOOS=js GOARCH=wasm $(TINYGO) build -size short -o test.wasm -tags=hifive1b             examples/blinky1
+	$(TINYGO) build -size short -o test.wasm -tags=hifive1b             examples/blinky1
 	@$(MD5SUM) test.wasm
-	GOOS=js GOARCH=wasm $(TINYGO) build -size short -o test.wasm -tags=reelboard            examples/blinky1
+	$(TINYGO) build -size short -o test.wasm -tags=reelboard            examples/blinky1
 	@$(MD5SUM) test.wasm
-	GOOS=js GOARCH=wasm $(TINYGO) build -size short -o test.wasm -tags=microbit             examples/microbit-blink
+	$(TINYGO) build -size short -o test.wasm -tags=microbit             examples/microbit-blink
 	@$(MD5SUM) test.wasm
-	GOOS=js GOARCH=wasm $(TINYGO) build -size short -o test.wasm -tags=circuitplay_express  examples/blinky1
+	$(TINYGO) build -size short -o test.wasm -tags=circuitplay_express  examples/blinky1
 	@$(MD5SUM) test.wasm
-	GOOS=js GOARCH=wasm $(TINYGO) build -size short -o test.wasm -tags=circuitplay_bluefruit examples/blinky1
+	$(TINYGO) build -size short -o test.wasm -tags=circuitplay_bluefruit examples/blinky1
 	@$(MD5SUM) test.wasm
-	GOOS=js GOARCH=wasm $(TINYGO) build -size short -o test.wasm -tags=mch2022              examples/machinetest
+	$(TINYGO) build -size short -o test.wasm -tags=mch2022              examples/machinetest
 	@$(MD5SUM) test.wasm
-	GOOS=js GOARCH=wasm $(TINYGO) build -size short -o test.wasm -tags=gopher_badge         examples/blinky1
-	@$(MD5SUM) test.wasm
-	GOOS=js GOARCH=wasm $(TINYGO) build -size short -o test.wasm -tags=pico                 examples/blinky1
-	@$(MD5SUM) test.wasm
-	GOOS=js GOARCH=wasm $(TINYGO) build -size short -o test.wasm -tags=xiao_esp32s3         examples/blinky1
+	$(TINYGO) build -size short -o test.wasm -tags=gopher_badge         examples/blinky1
 	@$(MD5SUM) test.wasm
 endif
 	# test all targets/boards
@@ -666,12 +570,8 @@ endif
 	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=microbit-v2-s113v7  examples/microbit-blink
 	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=microbit-v2-s140v7  examples/microbit-blink
-	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=nrf52840-mdk        examples/blinky1
 	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=btt-skr-pico        examples/uart
-	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=pca10031            examples/blinky1
 	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=reelboard           examples/blinky1
@@ -808,26 +708,10 @@ endif
 	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=gopher-badge      examples/blinky1
 	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=gopher-arcade      examples/blinky1
-	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=ae-rp2040           examples/echo
 	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=thumby              examples/echo
 	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=pico2               examples/blinky1
-	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=tiny2350            examples/blinky1
-	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=pico-plus2          examples/blinky1
-	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=metro-rp2350        examples/blinky1
-	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=waveshare-rp2040-tiny examples/echo
-	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=vicharak_shrike-lite examples/echo
-	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=xiao-rp2350        examples/blinky1
-	@$(MD5SUM) test.hex
 	# test pwm
 	$(TINYGO) build -size short -o test.hex -target=itsybitsy-m0        examples/pwm
 	@$(MD5SUM) test.hex
@@ -842,10 +726,6 @@ endif
 	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=feather-nrf52840    examples/usb-midi
 	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=pico    			examples/usb-storage
-	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=pico2    			examples/usb-storage
-	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=nrf52840-s140v6-uf2-generic	examples/machinetest
 	@$(MD5SUM) test.hex
 ifneq ($(STM32), 0)
@@ -885,26 +765,18 @@ ifneq ($(STM32), 0)
 	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=mksnanov3           examples/blinky1
 	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=stm32l0x1           examples/serial
-	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=arduino-uno-q       examples/blinky1
-	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=arduino-uno-q       examples/serial
-	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=arduino-uno-q       examples/blinkm
-	@$(MD5SUM) test.hex
 endif
 	$(TINYGO) build -size short -o test.hex -target=atmega328pb         examples/blinkm
 	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=atmega1284p         examples/machinetest
 	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=arduino-uno         examples/blinky1
+	$(TINYGO) build -size short -o test.hex -target=arduino             examples/blinky1
 	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=arduino-leonardo    examples/blinky1
 	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=arduino-uno         examples/pwm
+	$(TINYGO) build -size short -o test.hex -target=arduino             examples/pwm
 	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=arduino-uno -scheduler=tasks  examples/blinky1
+	$(TINYGO) build -size short -o test.hex -target=arduino -scheduler=tasks  examples/blinky1
 	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=arduino-mega1280    examples/blinky1
 	@$(MD5SUM) test.hex
@@ -916,25 +788,11 @@ endif
 	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=digispark           examples/blinky1
 	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=digispark           examples/pwm
-	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=digispark           examples/mcp3008
-	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=digispark -gc=leaking examples/blinky1
 	@$(MD5SUM) test.hex
 ifneq ($(XTENSA), 0)
-	$(TINYGO) build -size short -o test.bin -target=esp32-generic       examples/machinetest
-	@$(MD5SUM) test.bin
-	$(TINYGO) build -size short -o test.bin -target=esp32c3-generic     examples/machinetest
-	@$(MD5SUM) test.bin
-	$(TINYGO) build -size short -o test.bin -target=esp32s3-generic     examples/machinetest
-	@$(MD5SUM) test.bin
 	$(TINYGO) build -size short -o test.bin -target=esp32-mini32      	examples/blinky1
 	@$(MD5SUM) test.bin
-	$(TINYGO) build -size short -o test.bin -target=esp32c3-supermini   examples/blinky1
-	@$(MD5SUM) test.bin
-	$(TINYGO) build -size short -o test.bin -target=esp32c3-supermini   examples/blinkm
-	@$(MD5SUM) test.bin
 	$(TINYGO) build -size short -o test.bin -target=nodemcu             examples/blinky1
 	@$(MD5SUM) test.bin
 	$(TINYGO) build -size short -o test.bin -target m5stack-core2       examples/machinetest
@@ -947,68 +805,17 @@ ifneq ($(XTENSA), 0)
 	@$(MD5SUM) test.bin
 	$(TINYGO) build -size short -o test.bin -target mch2022             examples/machinetest
 	@$(MD5SUM) test.bin
-	# xiao-esp32s3
-	$(TINYGO) build -size short -o test.bin -target=xiao-esp32s3   		examples/blinky1
-	@$(MD5SUM) test.bin
-	$(TINYGO) build -size short -o test.bin -target=xiao-esp32s3   		examples/blinkm
-	@$(MD5SUM) test.bin
-	$(TINYGO) build -size short -o test.bin -target=xiao-esp32s3   		examples/mcp3008
-	@$(MD5SUM) test.bin
-	$(TINYGO) build -size short -o test.bin -target=xiao-esp32s3   		examples/pwm
-	@$(MD5SUM) test.bin
-	$(TINYGO) build -size short -o test.bin -target=xiao-esp32s3   		examples/adc
-	@$(MD5SUM) test.bin
-	# esp32s3-supermini
-	$(TINYGO) build -size short -o test.bin -target=esp32s3-supermini	    examples/blinky1
-	@$(MD5SUM) test.bin
-	$(TINYGO) build -size short -o test.bin -target=esp32s3-supermini	    examples/blinkm
-	@$(MD5SUM) test.bin
-	$(TINYGO) build -size short -o test.bin -target=esp32s3-supermini	    examples/mcp3008
-	@$(MD5SUM) test.bin
-	$(TINYGO) build -size short -o test.bin -target=esp32s3-supermini   	examples/adc
-	@$(MD5SUM) test.bin
 endif
-    # esp32c3-supermini
-	$(TINYGO) build -size short -o test.bin -target=esp32c3-supermini	    examples/blinky1
-	@$(MD5SUM) test.bin
-	$(TINYGO) build -size short -o test.bin -target=esp32c3-supermini	    examples/blinkm
-	@$(MD5SUM) test.bin
-	$(TINYGO) build -size short -o test.bin -target=esp32c3-supermini	    examples/mcp3008
-	@$(MD5SUM) test.bin
-	$(TINYGO) build -size short -o test.bin -target=esp32c3-supermini   	examples/pwm
-	@$(MD5SUM) test.bin
-	$(TINYGO) build -size short -o test.bin -target=esp32c3-supermini   	examples/adc
-	@$(MD5SUM) test.bin
-
-	$(TINYGO) build -size short -o test.bin -target=esp-c3-32s-kit      examples/blinky1
-	@$(MD5SUM) test.bin
 	$(TINYGO) build -size short -o test.bin -target=qtpy-esp32c3        examples/machinetest
 	@$(MD5SUM) test.bin
 	$(TINYGO) build -size short -o test.bin -target=m5stamp-c3          examples/machinetest
 	@$(MD5SUM) test.bin
 	$(TINYGO) build -size short -o test.bin -target=xiao-esp32c3        examples/machinetest
 	@$(MD5SUM) test.bin
-	$(TINYGO) build -size short -o test.bin -target=esp32-c3-devkit-rust-1 examples/blinky1
-	@$(MD5SUM) test.bin
-	$(TINYGO) build -size short -o test.bin -target=esp32c3-12f         examples/blinky1
-	@$(MD5SUM) test.bin
-
-	$(TINYGO) build -size short -o test.bin -target=makerfabs-esp32c3spi35 examples/machinetest
-	@$(MD5SUM) test.bin
 	$(TINYGO) build -size short -o test.hex -target=hifive1b            examples/blinky1
 	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=maixbit             examples/blinky1
 	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=tkey                examples/blinky1
-	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=elecrow-rp2040      examples/blinky1
-	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=elecrow-rp2350      examples/blinky1
-	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=hw-651              examples/machinetest
-	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=hw-651-s110v8       examples/machinetest
-	@$(MD5SUM) test.hex
 ifneq ($(WASM), 0)
 	$(TINYGO) build -size short -o wasm.wasm -target=wasm               examples/wasm/export
 	$(TINYGO) build -size short -o wasm.wasm -target=wasm               examples/wasm/main
@@ -1023,7 +830,7 @@ endif
 	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=pca10040 -serial=rtt examples/echo
 	@$(MD5SUM) test.hex
-	$(TINYGO) build             -o test.nro -target=nintendoswitch      examples/echo2
+	$(TINYGO) build             -o test.nro -target=nintendoswitch      examples/serial
 	@$(MD5SUM) test.nro
 	$(TINYGO) build -size short -o test.hex -target=pca10040 -opt=0     ./testdata/stdlib.go
 	@$(MD5SUM) test.hex
@@ -1041,17 +848,15 @@ endif


 wasmtest:
-	cd ./tests/wasm && $(GO) test .
+	$(GO) test ./tests/wasm

-build/release: tinygo gen-device $(if $(filter 1,$(USE_SYSTEM_BINARYEN)),,binaryen)
+build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN)),,binaryen)
 	@mkdir -p build/release/tinygo/bin
-	@mkdir -p build/release/tinygo/lib/bdwgc
 	@mkdir -p build/release/tinygo/lib/clang/include
 	@mkdir -p build/release/tinygo/lib/CMSIS/CMSIS
 	@mkdir -p build/release/tinygo/lib/macos-minimal-sdk
-	@mkdir -p build/release/tinygo/lib/mingw-w64/mingw-w64-crt/crt
-	@mkdir -p build/release/tinygo/lib/mingw-w64/mingw-w64-crt/math
 	@mkdir -p build/release/tinygo/lib/mingw-w64/mingw-w64-crt/lib-common
+	@mkdir -p build/release/tinygo/lib/mingw-w64/mingw-w64-crt/stdio
 	@mkdir -p build/release/tinygo/lib/mingw-w64/mingw-w64-headers/defaults
 	@mkdir -p build/release/tinygo/lib/musl/arch
 	@mkdir -p build/release/tinygo/lib/musl/crt
@@ -1059,8 +864,7 @@ build/release: tinygo gen-device $(if $(filter 1,$(USE_SYSTEM_BINARYEN)),,binary
 	@mkdir -p build/release/tinygo/lib/nrfx
 	@mkdir -p build/release/tinygo/lib/picolibc/newlib/libc
 	@mkdir -p build/release/tinygo/lib/picolibc/newlib/libm
-	@mkdir -p build/release/tinygo/lib/wasi-libc/dlmalloc
-	@mkdir -p build/release/tinygo/lib/wasi-libc/libc-bottom-half
+	@mkdir -p build/release/tinygo/lib/wasi-libc/libc-bottom-half/headers
 	@mkdir -p build/release/tinygo/lib/wasi-libc/libc-top-half/musl/arch
 	@mkdir -p build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src
 	@mkdir -p build/release/tinygo/lib/wasi-cli/
@@ -1069,7 +873,6 @@ build/release: tinygo gen-device $(if $(filter 1,$(USE_SYSTEM_BINARYEN)),,binary
 ifneq ($(USE_SYSTEM_BINARYEN),1)
 	@cp -p  build/wasm-opt$(EXE)         build/release/tinygo/bin
 endif
-	@cp -rp lib/bdwgc/*                  build/release/tinygo/lib/bdwgc
 	@cp -p $(abspath $(CLANG_SRC))/lib/Headers/*.h build/release/tinygo/lib/clang/include
 	@cp -rp lib/CMSIS/CMSIS/Include      build/release/tinygo/lib/CMSIS/CMSIS
 	@cp -rp lib/CMSIS/README.md          build/release/tinygo/lib/CMSIS
@@ -1083,12 +886,9 @@ endif
 	@cp -rp lib/musl/crt/crt1.c          build/release/tinygo/lib/musl/crt
 	@cp -rp lib/musl/COPYRIGHT           build/release/tinygo/lib/musl
 	@cp -rp lib/musl/include             build/release/tinygo/lib/musl
-	@cp -rp lib/musl/src/conf            build/release/tinygo/lib/musl/src
-	@cp -rp lib/musl/src/ctype           build/release/tinygo/lib/musl/src
 	@cp -rp lib/musl/src/env             build/release/tinygo/lib/musl/src
 	@cp -rp lib/musl/src/errno           build/release/tinygo/lib/musl/src
 	@cp -rp lib/musl/src/exit            build/release/tinygo/lib/musl/src
-	@cp -rp lib/musl/src/fcntl           build/release/tinygo/lib/musl/src
 	@cp -rp lib/musl/src/include         build/release/tinygo/lib/musl/src
 	@cp -rp lib/musl/src/internal        build/release/tinygo/lib/musl/src
 	@cp -rp lib/musl/src/legacy          build/release/tinygo/lib/musl/src
@@ -1097,31 +897,19 @@ endif
 	@cp -rp lib/musl/src/malloc          build/release/tinygo/lib/musl/src
 	@cp -rp lib/musl/src/mman            build/release/tinygo/lib/musl/src
 	@cp -rp lib/musl/src/math            build/release/tinygo/lib/musl/src
-	@cp -rp lib/musl/src/misc            build/release/tinygo/lib/musl/src
 	@cp -rp lib/musl/src/multibyte       build/release/tinygo/lib/musl/src
-	@cp -rp lib/musl/src/sched           build/release/tinygo/lib/musl/src
 	@cp -rp lib/musl/src/signal          build/release/tinygo/lib/musl/src
 	@cp -rp lib/musl/src/stdio           build/release/tinygo/lib/musl/src
-	@cp -rp lib/musl/src/stdlib          build/release/tinygo/lib/musl/src
 	@cp -rp lib/musl/src/string          build/release/tinygo/lib/musl/src
 	@cp -rp lib/musl/src/thread          build/release/tinygo/lib/musl/src
 	@cp -rp lib/musl/src/time            build/release/tinygo/lib/musl/src
 	@cp -rp lib/musl/src/unistd          build/release/tinygo/lib/musl/src
-	@cp -rp lib/musl/src/process         build/release/tinygo/lib/musl/src
-	@cp -rp lib/mingw-w64/mingw-w64-crt/crt/pseudo-reloc.c          build/release/tinygo/lib/mingw-w64/mingw-w64-crt/crt
 	@cp -rp lib/mingw-w64/mingw-w64-crt/def-include                 build/release/tinygo/lib/mingw-w64/mingw-w64-crt
-	@cp -rp lib/mingw-w64/mingw-w64-crt/gdtoa                       build/release/tinygo/lib/mingw-w64/mingw-w64-crt
-	@cp -rp lib/mingw-w64/mingw-w64-crt/include                     build/release/tinygo/lib/mingw-w64/mingw-w64-crt
 	@cp -rp lib/mingw-w64/mingw-w64-crt/lib-common/api-ms-win-crt-* build/release/tinygo/lib/mingw-w64/mingw-w64-crt/lib-common
-	@cp -rp lib/mingw-w64/mingw-w64-crt/lib-common/advapi32.def.in  build/release/tinygo/lib/mingw-w64/mingw-w64-crt/lib-common
 	@cp -rp lib/mingw-w64/mingw-w64-crt/lib-common/kernel32.def.in  build/release/tinygo/lib/mingw-w64/mingw-w64-crt/lib-common
-	@cp -rp lib/mingw-w64/mingw-w64-crt/lib-common/msvcrt.def.in    build/release/tinygo/lib/mingw-w64/mingw-w64-crt/lib-common
-	@cp -rp lib/mingw-w64/mingw-w64-crt/math/x86                    build/release/tinygo/lib/mingw-w64/mingw-w64-crt/math
-	@cp -rp lib/mingw-w64/mingw-w64-crt/misc                        build/release/tinygo/lib/mingw-w64/mingw-w64-crt
-	@cp -rp lib/mingw-w64/mingw-w64-crt/stdio                       build/release/tinygo/lib/mingw-w64/mingw-w64-crt
+	@cp -rp lib/mingw-w64/mingw-w64-crt/stdio/ucrt_*                build/release/tinygo/lib/mingw-w64/mingw-w64-crt/stdio
 	@cp -rp lib/mingw-w64/mingw-w64-headers/crt/                    build/release/tinygo/lib/mingw-w64/mingw-w64-headers
 	@cp -rp lib/mingw-w64/mingw-w64-headers/defaults/include        build/release/tinygo/lib/mingw-w64/mingw-w64-headers/defaults
-	@cp -rp lib/mingw-w64/mingw-w64-headers/include                 build/release/tinygo/lib/mingw-w64/mingw-w64-headers
 	@cp -rp lib/nrfx/*                   build/release/tinygo/lib/nrfx
 	@cp -rp lib/picolibc/newlib/libc/ctype       build/release/tinygo/lib/picolibc/newlib/libc
 	@cp -rp lib/picolibc/newlib/libc/include     build/release/tinygo/lib/picolibc/newlib/libc
@@ -1131,37 +919,15 @@ endif
 	@cp -rp lib/picolibc/newlib/libm/common      build/release/tinygo/lib/picolibc/newlib/libm
 	@cp -rp lib/picolibc/newlib/libm/math        build/release/tinygo/lib/picolibc/newlib/libm
 	@cp -rp lib/picolibc-stdio.c         build/release/tinygo/lib
-	@cp -rp lib/wasi-libc/dlmalloc/src                              build/release/tinygo/lib/wasi-libc/dlmalloc
-	@cp -rp lib/wasi-libc/libc-bottom-half/cloudlibc                build/release/tinygo/lib/wasi-libc/libc-bottom-half
-	@cp -rp lib/wasi-libc/libc-bottom-half/headers                  build/release/tinygo/lib/wasi-libc/libc-bottom-half
-	@cp -rp lib/wasi-libc/libc-bottom-half/sources                  build/release/tinygo/lib/wasi-libc/libc-bottom-half
-	@cp -rp lib/wasi-libc/libc-top-half/headers                     build/release/tinygo/lib/wasi-libc/libc-top-half
+	@cp -rp lib/wasi-libc/libc-bottom-half/headers/public           build/release/tinygo/lib/wasi-libc/libc-bottom-half/headers
 	@cp -rp lib/wasi-libc/libc-top-half/musl/arch/generic           build/release/tinygo/lib/wasi-libc/libc-top-half/musl/arch
 	@cp -rp lib/wasi-libc/libc-top-half/musl/arch/wasm32            build/release/tinygo/lib/wasi-libc/libc-top-half/musl/arch
-	@cp -rp lib/wasi-libc/libc-top-half/musl/include                build/release/tinygo/lib/wasi-libc/libc-top-half/musl
-	@cp -rp lib/wasi-libc/libc-top-half/musl/src/conf               build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src
-	@cp -rp lib/wasi-libc/libc-top-half/musl/src/dirent             build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src
-	@cp -rp lib/wasi-libc/libc-top-half/musl/src/env                build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src
-	@cp -rp lib/wasi-libc/libc-top-half/musl/src/errno              build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src
-	@cp -rp lib/wasi-libc/libc-top-half/musl/src/exit               build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src
-	@cp -rp lib/wasi-libc/libc-top-half/musl/src/fcntl              build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src
-	@cp -rp lib/wasi-libc/libc-top-half/musl/src/fenv               build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src
 	@cp -rp lib/wasi-libc/libc-top-half/musl/src/include            build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src
 	@cp -rp lib/wasi-libc/libc-top-half/musl/src/internal           build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src
-	@cp -rp lib/wasi-libc/libc-top-half/musl/src/legacy             build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src
-	@cp -rp lib/wasi-libc/libc-top-half/musl/src/locale             build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src
 	@cp -rp lib/wasi-libc/libc-top-half/musl/src/math               build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src
-	@cp -rp lib/wasi-libc/libc-top-half/musl/src/misc               build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src
-	@cp -rp lib/wasi-libc/libc-top-half/musl/src/multibyte          build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src
-	@cp -rp lib/wasi-libc/libc-top-half/musl/src/network            build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src
-	@cp -rp lib/wasi-libc/libc-top-half/musl/src/stat               build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src
-	@cp -rp lib/wasi-libc/libc-top-half/musl/src/stdio              build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src
-	@cp -rp lib/wasi-libc/libc-top-half/musl/src/stdlib             build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src
 	@cp -rp lib/wasi-libc/libc-top-half/musl/src/string             build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src
-	@cp -rp lib/wasi-libc/libc-top-half/musl/src/thread             build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src
-	@cp -rp lib/wasi-libc/libc-top-half/musl/src/time               build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src
-	@cp -rp lib/wasi-libc/libc-top-half/musl/src/unistd             build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src
-	@cp -rp lib/wasi-libc/libc-top-half/sources                     build/release/tinygo/lib/wasi-libc/libc-top-half
+	@cp -rp lib/wasi-libc/libc-top-half/musl/include                build/release/tinygo/lib/wasi-libc/libc-top-half/musl
+	@cp -rp lib/wasi-libc/sysroot                                   build/release/tinygo/lib/wasi-libc/sysroot
 	@cp -rp lib/wasi-cli/wit                                        build/release/tinygo/lib/wasi-cli/wit
 	@cp -rp llvm-project/compiler-rt/lib/builtins build/release/tinygo/lib/compiler-rt-builtins
 	@cp -rp llvm-project/compiler-rt/LICENSE.TXT  build/release/tinygo/lib/compiler-rt-builtins
@@ -1186,9 +952,8 @@ endif

 .PHONY: tools
 tools:
-	go generate -tags tools ./
+	cd internal/tools && go generate -tags tools ./

-LINTDIRS=src/os/ src/reflect/
 .PHONY: lint
 lint: tools ## Lint source tree
 	revive -version
@@ -1196,10 +961,7 @@ lint: tools ## Lint source tree
 	# revive.toml isn't flexible enough to filter out just one kind of error from a checker, so do it with grep here.
 	# Can't use grep with friendly formatter.  Plain output isn't too bad, though.
 	# Use 'grep .' to get rid of stray blank line
-	revive -config revive.toml compiler/... $$( find $(LINTDIRS) -type f -name '*.go' ) \
-		| grep -v "should have comment or be unexported" \
-		| grep '.' \
-		| awk '{print}; END {exit NR>0}'
+	revive -config revive.toml compiler/... src/{os,reflect}/*.go | grep -v "should have comment or be unexported" | grep '.' | awk '{print}; END {exit NR>0}'

 SPELLDIRSCMD=find . -depth 1 -type d  | egrep -wv '.git|lib|llvm|src'; find src -depth 1 | egrep -wv 'device|internal|net|vendor'; find src/internal -depth 1 -type d | egrep -wv src/internal/wasi
 .PHONY: spell
@@ -1,32 +0,0 @@
-TinyGo Team Members
-===================
-
-The team of humans who maintain TinyGo.
-
-*   **Purpose**: To maintain the community, code, documentation, and tools for the TinyGo compiler.
-*   **Board**: The group of people who share responsibility for key decisions for the TinyGo organization.  
-    *   **Majority Voting**: The board makes decisions by majority vote.
-    *   **Membership**: The board elects its own members.
-*   **Do-ocracy**: Those who step forward to do a given task propose how it should be done. Then other interested people can make comments.
-*   **Proof of Work**: Power in decision-making is slightly weighted based on a participant's labor for the community.
-*   **Initiation**: We need to establish a procedure for how people join the team of maintainers.
-*   **Transparency**: Important information should be made publicly available, ideally in a way that allows for public comment.
-*   **Code of Conduct**: Participants agree to abide by the current project Code of Conduct.
-
-## Members
-
-* Ayke van Laethem (@aykevl)
-* Daniel Esteban (@conejoninja)
-* Ron Evans (@deadprogram)
-* Damian Gryski (@dgryski)
-* Masaaki Takasago (@sago35)
-* Patricio Whittingslow (@soypat)
-* Yurii Soldak (@ysoldak)
-
-## Experimental
-
-*   **Monthly Meeting**: A monthly meeting for the team and any other interested participants.  
-    Duration: 1 hour  
-    Facilitation: @deadprogram
-    Schedule: See https://github.com/tinygo-org/tinygo/wiki/Meetings for more information
-
@@ -1,8 +1,7 @@
-Copyright (c) 2018-2026 The TinyGo Authors. All rights reserved.
+Copyright (c) 2018-2023 The TinyGo Authors. All rights reserved.

 TinyGo includes portions of the Go standard library.
-Copyright 2009 The Go Authors. All rights reserved.
-See https://github.com/golang/go/blob/master/LICENSE for license information.
+Copyright (c) 2009-2023 The Go Authors. All rights reserved.

 TinyGo includes portions of LLVM, which is under the Apache License v2.0 with
 LLVM Exceptions. See https://llvm.org/LICENSE.txt for license information.
@@ -1,14 +1,11 @@
 # TinyGo - Go compiler for small places

-[![Linux](https://github.com/tinygo-org/tinygo/actions/workflows/linux.yml/badge.svg?branch=dev)](https://github.com/tinygo-org/tinygo/actions/workflows/linux.yml) [![macOS](https://github.com/tinygo-org/tinygo/actions/workflows/build-macos.yml/badge.svg?branch=dev)](https://github.com/tinygo-org/tinygo/actions/workflows/build-macos.yml) [![Windows](https://github.com/tinygo-org/tinygo/actions/workflows/windows.yml/badge.svg?branch=dev)](https://github.com/tinygo-org/tinygo/actions/workflows/windows.yml) [![Docker](https://github.com/tinygo-org/tinygo/actions/workflows/docker.yml/badge.svg?branch=dev)](https://github.com/tinygo-org/tinygo/actions/workflows/docker.yml) [![Nix](https://github.com/tinygo-org/tinygo/actions/workflows/nix.yml/badge.svg?branch=dev)](https://github.com/tinygo-org/tinygo/actions/workflows/nix.yml)
+[![Linux](https://github.com/tinygo-org/tinygo/actions/workflows/linux.yml/badge.svg?branch=dev)](https://github.com/tinygo-org/tinygo/actions/workflows/linux.yml) [![macOS](https://github.com/tinygo-org/tinygo/actions/workflows/build-macos.yml/badge.svg?branch=dev)](https://github.com/tinygo-org/tinygo/actions/workflows/build-macos.yml) [![Windows](https://github.com/tinygo-org/tinygo/actions/workflows/windows.yml/badge.svg?branch=dev)](https://github.com/tinygo-org/tinygo/actions/workflows/windows.yml) [![Docker](https://github.com/tinygo-org/tinygo/actions/workflows/docker.yml/badge.svg?branch=dev)](https://github.com/tinygo-org/tinygo/actions/workflows/docker.yml) [![Nix](https://github.com/tinygo-org/tinygo/actions/workflows/nix.yml/badge.svg?branch=dev)](https://github.com/tinygo-org/tinygo/actions/workflows/nix.yml) [![CircleCI](https://circleci.com/gh/tinygo-org/tinygo/tree/dev.svg?style=svg)](https://circleci.com/gh/tinygo-org/tinygo/tree/dev)

 TinyGo is a Go compiler intended for use in small places such as microcontrollers, WebAssembly (wasm/wasi), and command-line tools.

 It reuses libraries used by the [Go language tools](https://golang.org/pkg/go/) alongside [LLVM](http://llvm.org) to provide an alternative way to compile programs written in the Go programming language.

-> [!IMPORTANT]
-> You can help TinyGo with a financial contribution using OpenCollective. Please see https://opencollective.com/tinygo for more information. Thank you!
-
 ## Embedded

 Here is an example program that blinks the built-in LED when run directly on any supported board with onboard LED:
@@ -34,10 +31,10 @@ func main() {
 }
 ```

-The above program can be compiled and run without modification on an [Arduino Uno](https://tinygo.org/docs/reference/microcontrollers/boards/arduino-uno), an [Adafruit Circuit Playground Express](https://tinygo.org/docs/reference/microcontrollers/featured/circuitplay-express), a [Seeed Studio XIAO-ESP32S3](https://tinygo.org/docs/reference/microcontrollers/featured/xiao-esp32s3) or any of the many supported boards that have a built-in LED, just by setting the correct TinyGo compiler target. For example, this compiles and flashes an Arduino Uno:
+The above program can be compiled and run without modification on an Arduino Uno, an Adafruit ItsyBitsy M0, or any of the supported boards that have a built-in LED, just by setting the correct TinyGo compiler target. For example, this compiles and flashes an Arduino Uno:

 ```shell
-tinygo flash -target arduino-uno examples/blinky1
+tinygo flash -target arduino examples/blinky1
 ```

 ## WebAssembly
@@ -51,22 +48,20 @@ Here is a small TinyGo program for use by a WASI host application:
 ```go
 package main

-//go:wasmexport add
+//go:wasm-module yourmodulename
+//export add
 func add(x, y uint32) uint32 {
 	return x + y
 }
+
+// main is required for the `wasip1` target, even if it isn't used.
+func main() {}
 ```

-This compiles the above TinyGo program for use on any WASI Preview 1 runtime:
+This compiles the above TinyGo program for use on any WASI runtime:

 ```shell
-tinygo build -buildmode=c-shared -o add.wasm -target=wasip1 add.go
-```
-
-You can also use the same syntax as Go 1.24+:
-
-```shell
-GOOS=wasip1 GOARCH=wasm tinygo build -buildmode=c-shared -o add.wasm add.go
+tinygo build -o main.wasm -target=wasip1 main.go
 ```

 ## Installation
@@ -77,7 +72,7 @@ See the [getting started instructions](https://tinygo.org/getting-started/) for

 ### Embedded

-You can compile TinyGo programs for over 150 different microcontroller boards.
+You can compile TinyGo programs for over 94 different microcontroller boards.

 For more information, please see https://tinygo.org/docs/reference/microcontrollers/

@@ -142,7 +137,7 @@ Non-goals:

 ## Why this project exists

-> We never expected Go to be an embedded language, and so it’s got serious problems...
+> We never expected Go to be an embedded language and so its got serious problems...

 -- Rob Pike, [GopherCon 2014 Opening Keynote](https://www.youtube.com/watch?v=VoS7DsT1rdM&feature=youtu.be&t=2799)

@@ -3,7 +3,6 @@ package builder
 import (
 	"bytes"
 	"debug/elf"
-	"debug/macho"
 	"debug/pe"
 	"encoding/binary"
 	"errors"
@@ -63,20 +62,6 @@ func makeArchive(arfile *os.File, objs []string) error {
 					fileIndex int
 				}{symbol.Name, i})
 			}
-		} else if dbg, err := macho.NewFile(objfile); err == nil {
-			for _, symbol := range dbg.Symtab.Syms {
-				// See mach-o/nlist.h
-				if symbol.Type&0x0e != 0xe { // (symbol.Type & N_TYPE) != N_SECT
-					continue // undefined symbol
-				}
-				if symbol.Type&0x01 == 0 { // (symbol.Type & N_EXT) == 0
-					continue // internal symbol (static, etc)
-				}
-				symbolTable = append(symbolTable, struct {
-					name      string
-					fileIndex int
-				}{symbol.Name, i})
-			}
 		} else if dbg, err := pe.NewFile(objfile); err == nil {
 			for _, symbol := range dbg.Symbols {
 				if symbol.StorageClass != 2 {
@@ -1,91 +0,0 @@
-package builder
-
-// The well-known conservative Boehm-Demers-Weiser GC.
-// This file provides a way to compile this GC for use with TinyGo.
-
-import (
-	"path/filepath"
-	"strings"
-
-	"github.com/tinygo-org/tinygo/goenv"
-)
-
-var BoehmGC = Library{
-	name: "bdwgc",
-	cflags: func(target, headerPath string) []string {
-		libdir := filepath.Join(goenv.Get("TINYGOROOT"), "lib/bdwgc")
-		flags := []string{
-			// use a modern environment
-			"-DUSE_MMAP",              // mmap is available
-			"-DUSE_MUNMAP",            // return memory to the OS using munmap
-			"-DGC_BUILTIN_ATOMIC",     // use compiler intrinsics for atomic operations
-			"-DNO_EXECUTE_PERMISSION", // don't make the heap executable
-
-			// specific flags for TinyGo
-			"-DALL_INTERIOR_POINTERS",  // scan interior pointers (needed for Go)
-			"-DIGNORE_DYNAMIC_LOADING", // we don't support dynamic loading at the moment
-			"-DNO_GETCONTEXT",          // musl doesn't support getcontext()
-			"-DGC_DISABLE_INCREMENTAL", // don't mess with SIGSEGV and such
-
-			// Use a minimal environment.
-			"-DNO_MSGBOX_ON_ERROR", // don't call MessageBoxA on Windows
-			"-DDONT_USE_ATEXIT",
-			"-DNO_GETENV",          // smaller binary, more predictable configuration
-			"-DNO_CLOCK",           // don't use system clock
-			"-DNO_DEBUGGING",       // reduce code size
-			"-DGC_NO_FINALIZATION", // finalization is not used at the moment
-
-			// Special flag to work around the lack of __data_start in ld.lld.
-			// TODO: try to fix this in LLVM/lld directly so we don't have to
-			// work around it anymore.
-			"-DGC_DONT_REGISTER_MAIN_STATIC_DATA",
-
-			// Do not scan the stack. We have our own mechanism to do this.
-			"-DSTACK_NOT_SCANNED",
-			"-DNO_PROC_STAT",  // we scan the stack manually (don't read /proc/self/stat on Linux)
-			"-DSTACKBOTTOM=0", // dummy value, we scan the stack manually
-
-			// Assertions can be enabled while debugging GC issues.
-			//"-DGC_ASSERTIONS",
-
-			// We use our own way of dealing with threads (that is a bit hacky).
-			// See src/runtime/gc_boehm.go.
-			//"-DGC_THREADS",
-			//"-DTHREAD_LOCAL_ALLOC",
-
-			"-I" + libdir + "/include",
-		}
-		return flags
-	},
-	needsLibc: true,
-	sourceDir: func() string {
-		return filepath.Join(goenv.Get("TINYGOROOT"), "lib/bdwgc")
-	},
-	librarySources: func(target string, _ bool) ([]string, error) {
-		sources := []string{
-			"allchblk.c",
-			"alloc.c",
-			"blacklst.c",
-			"dbg_mlc.c",
-			"dyn_load.c",
-			"headers.c",
-			"mach_dep.c",
-			"malloc.c",
-			"mark.c",
-			"mark_rts.c",
-			"misc.c",
-			"new_hblk.c",
-			"os_dep.c",
-			"reclaim.c",
-		}
-		if strings.Split(target, "-")[2] == "windows" {
-			// Due to how the linker on Windows works (that doesn't allow
-			// undefined functions), we need to include these extra files.
-			sources = append(sources,
-				"mallocx.c",
-				"ptr_chck.c",
-			)
-		}
-		return sources, nil
-	},
-}
@@ -14,12 +14,12 @@ import (
 	"fmt"
 	"go/types"
 	"hash/crc32"
+	"io/fs"
 	"math/bits"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"runtime"
-	"slices"
 	"sort"
 	"strconv"
 	"strings"
@@ -61,10 +61,6 @@ type BuildResult struct {
 	// correctly printing test results: the import path isn't always the same as
 	// the path listed on the command line.
 	ImportPath string
-
-	// Map from path to package name. It is needed to attribute binary size to
-	// the right Go package.
-	PackagePathMap map[string]string
 }

 // packageAction is the struct that is serialized to JSON and hashed, to work as
@@ -149,17 +145,16 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe
 	var libcDependencies []*compileJob
 	switch config.Target.Libc {
 	case "darwin-libSystem":
-		libcJob := makeDarwinLibSystemJob(config, tmpdir)
-		libcDependencies = append(libcDependencies, libcJob)
+		job := makeDarwinLibSystemJob(config, tmpdir)
+		libcDependencies = append(libcDependencies, job)
 	case "musl":
-		var unlock func()
-		libcJob, unlock, err := libMusl.load(config, tmpdir)
+		job, unlock, err := libMusl.load(config, tmpdir)
 		if err != nil {
 			return BuildResult{}, err
 		}
 		defer unlock()
-		libcDependencies = append(libcDependencies, dummyCompileJob(filepath.Join(filepath.Dir(libcJob.result), "crt1.o")))
-		libcDependencies = append(libcDependencies, libcJob)
+		libcDependencies = append(libcDependencies, dummyCompileJob(filepath.Join(filepath.Dir(job.result), "crt1.o")))
+		libcDependencies = append(libcDependencies, job)
 	case "picolibc":
 		libcJob, unlock, err := libPicolibc.load(config, tmpdir)
 		if err != nil {
@@ -168,12 +163,11 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe
 		defer unlock()
 		libcDependencies = append(libcDependencies, libcJob)
 	case "wasi-libc":
-		libcJob, unlock, err := libWasiLibc.load(config, tmpdir)
-		if err != nil {
-			return BuildResult{}, err
+		path := filepath.Join(root, "lib/wasi-libc/sysroot/lib/wasm32-wasi/libc.a")
+		if _, err := os.Stat(path); errors.Is(err, fs.ErrNotExist) {
+			return BuildResult{}, errors.New("could not find wasi-libc, perhaps you need to run `make wasi-libc`?")
 		}
-		defer unlock()
-		libcDependencies = append(libcDependencies, libcJob)
+		libcDependencies = append(libcDependencies, dummyCompileJob(path))
 	case "wasmbuiltins":
 		libcJob, unlock, err := libWasmBuiltins.load(config, tmpdir)
 		if err != nil {
@@ -182,12 +176,12 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe
 		defer unlock()
 		libcDependencies = append(libcDependencies, libcJob)
 	case "mingw-w64":
-		libcJob, unlock, err := libMinGW.load(config, tmpdir)
+		job, unlock, err := libMinGW.load(config, tmpdir)
 		if err != nil {
 			return BuildResult{}, err
 		}
 		defer unlock()
-		libcDependencies = append(libcDependencies, libcJob)
+		libcDependencies = append(libcDependencies, job)
 		libcDependencies = append(libcDependencies, makeMinGWExtraLibs(tmpdir, config.GOARCH())...)
 	case "":
 		// no library specified, so nothing to do
@@ -203,7 +197,6 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe
 		ABI:             config.ABI(),
 		GOOS:            config.GOOS(),
 		GOARCH:          config.GOARCH(),
-		BuildMode:       config.BuildMode(),
 		CodeModel:       config.CodeModel(),
 		RelocationModel: config.RelocationModel(),
 		SizeLevel:       sizeLevel,
@@ -215,7 +208,6 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe
 		MaxStackAlloc:      config.MaxStackAlloc(),
 		NeedsStackObjects:  config.NeedsStackObjects(),
 		Debug:              !config.Options.SkipDWARF, // emit DWARF except when -internal-nodwarf is passed
-		Nobounds:           config.Options.Nobounds,
 		PanicStrategy:      config.PanicStrategy(),
 	}

@@ -249,24 +241,6 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe
 		return result, err
 	}

-	// Store which filesystem paths map to which package name.
-	result.PackagePathMap = make(map[string]string, len(lprogram.Packages))
-	for _, pkg := range lprogram.Sorted() {
-		result.PackagePathMap[pkg.OriginalDir()] = pkg.Pkg.Path()
-	}
-
-	// Strip default initializers for -X globals from the type info before
-	// building SSA. This prevents go/ssa from emitting init stores for them,
-	// so that makeGlobalsModule can supply the correct values at final link
-	// time without any runtime init overwriting them. The -X values themselves
-	// are kept out of the per-package build cache; only the variable names
-	// appear in the cache key.
-	for _, pkg := range lprogram.Sorted() {
-		for name := range globalValues[pkg.Pkg.Path()] {
-			pkg.StripVarInitializer(name)
-		}
-	}
-
 	// Create the *ssa.Program. This does not yet build the entire SSA of the
 	// program so it's pretty fast and doesn't need to be parallelized.
 	program := lprogram.LoadSSA()
@@ -294,13 +268,9 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe
 				allFiles[file.Name] = append(allFiles[file.Name], file)
 			}
 		}
-		// Sort embedded files by name to maintain output determinism.
-		embedNames := make([]string, 0, len(allFiles))
-		for _, files := range allFiles {
-			embedNames = append(embedNames, files[0].Name)
-		}
-		slices.Sort(embedNames)
-		for _, name := range embedNames {
+		for name, files := range allFiles {
+			name := name
+			files := files
 			job := &compileJob{
 				description: "make object file for " + name,
 				run: func(job *compileJob) error {
@@ -315,7 +285,7 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe
 					sum := sha256.Sum256(data)
 					hexSum := hex.EncodeToString(sum[:16])

-					for _, file := range allFiles[name] {
+					for _, file := range files {
 						file.Size = uint64(len(data))
 						file.Hash = hexSum
 						if file.NeedsData {
@@ -468,15 +438,8 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe
 					if global.IsNil() {
 						return errors.New("global not found: " + globalName)
 					}
-					globalType := global.GlobalValueType()
-					if globalType.TypeKind() != llvm.StructTypeKind || globalType.StructName() != "runtime._string" {
-						// Verify this is indeed a string. This is needed so
-						// that makeGlobalsModule can just create the right
-						// globals of string type without checking.
-						return fmt.Errorf("%s: not a string", globalName)
-					}
 					name := global.Name()
-					newGlobal := llvm.AddGlobal(mod, globalType, name+".tmp")
+					newGlobal := llvm.AddGlobal(mod, global.GlobalValueType(), name+".tmp")
 					global.ReplaceAllUsesWith(newGlobal)
 					global.EraseFromParentAsGlobal()
 					newGlobal.SetName(name)
@@ -489,7 +452,7 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe
 				if pkgInit.IsNil() {
 					panic("init not found for " + pkg.Pkg.Path())
 				}
-				err := interp.RunFunc(pkgInit, config.Options.InterpTimeout, config.Options.InterpMaxLoopIterations, config.DumpSSA())
+				err := interp.RunFunc(pkgInit, config.Options.InterpTimeout, config.DumpSSA())
 				if err != nil {
 					return err
 				}
@@ -558,38 +521,12 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe
 				if err != nil {
 					return fmt.Errorf("failed to load bitcode file: %w", err)
 				}
-				// Resolve duplicate function definitions before linking.
-				// This can happen when a newer Go version adds a function
-				// body in a standard library package that was previously
-				// just a declaration provided by //go:linkname from the
-				// runtime. In that case, keep the existing (runtime)
-				// definition by weakening the new one's linkage so the
-				// LLVM linker discards it in favor of the existing one.
-				for fn := pkgMod.FirstFunction(); !fn.IsNil(); fn = llvm.NextFunction(fn) {
-					if fn.IsDeclaration() {
-						continue
-					}
-					existing := mod.NamedFunction(fn.Name())
-					if existing.IsNil() || existing.IsDeclaration() {
-						continue
-					}
-					fn.SetLinkage(llvm.LinkOnceODRLinkage)
-				}
 				err = llvm.LinkModules(mod, pkgMod)
 				if err != nil {
 					return fmt.Errorf("failed to link module: %w", err)
 				}
 			}

-			// Insert values from -ldflags="-X ..." into the IR.
-			// This is a separate module, so that the "runtime._string" type
-			// doesn't need to match precisely. LLVM tends to rename that type
-			// sometimes, leading to errors. But linking in a separate module
-			// works fine. See:
-			// https://github.com/tinygo-org/tinygo/issues/4810
-			globalsMod := makeGlobalsModule(ctx, globalValues, machine)
-			llvm.LinkModules(mod, globalsMod)
-
 			// Create runtime.initAll function that calls the runtime
 			// initializer of each package.
 			llvmInitFn := mod.NamedFunction("runtime.initAll")
@@ -642,7 +579,7 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe

 			// Run all optimization passes, which are much more effective now
 			// that the optimizer can see the whole program at once.
-			err := optimizeProgram(mod, config)
+			err := optimizeProgram(mod, config, globalValues)
 			if err != nil {
 				return err
 			}
@@ -656,11 +593,6 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe
 		},
 	}

-	// Create the output directory, if needed
-	if err := os.MkdirAll(filepath.Dir(outpath), 0777); err != nil {
-		return result, err
-	}
-
 	// Check whether we only need to create an object file.
 	// If so, we don't need to link anything and will be finished quickly.
 	outext := filepath.Ext(outpath)
@@ -717,23 +649,6 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe
 	result.Binary = result.Executable // final file
 	ldflags := append(config.LDFlags(), "-o", result.Executable)

-	if config.Options.BuildMode == "c-shared" {
-		if !strings.HasPrefix(config.Triple(), "wasm32-") {
-			return result, fmt.Errorf("buildmode c-shared is only supported on wasm at the moment")
-		}
-		ldflags = append(ldflags, "--no-entry")
-	}
-
-	if config.Options.BuildMode == "wasi-legacy" {
-		if !strings.HasPrefix(config.Triple(), "wasm32-") {
-			return result, fmt.Errorf("buildmode wasi-legacy is only supported on wasm")
-		}
-
-		if config.Options.Scheduler != "none" {
-			return result, fmt.Errorf("buildmode wasi-legacy only supports scheduler=none")
-		}
-	}
-
 	// Add compiler-rt dependency if needed. Usually this is a simple load from
 	// a cache.
 	if config.Target.RTLib == "compiler-rt" {
@@ -745,16 +660,6 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe
 		linkerDependencies = append(linkerDependencies, job)
 	}

-	// The Boehm collector is stored in a separate C library.
-	if config.GC() == "boehm" {
-		job, unlock, err := BoehmGC.load(config, tmpdir)
-		if err != nil {
-			return BuildResult{}, err
-		}
-		defer unlock()
-		linkerDependencies = append(linkerDependencies, job)
-	}
-
 	// Add jobs to compile extra files. These files are in C or assembly and
 	// contain things like the interrupt vector table and low level operations
 	// such as stack switching.
@@ -777,7 +682,7 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe
 	for _, pkg := range lprogram.Sorted() {
 		pkg := pkg
 		for _, filename := range pkg.CFiles {
-			abspath := filepath.Join(pkg.OriginalDir(), filename)
+			abspath := filepath.Join(pkg.Dir, filename)
 			job := &compileJob{
 				description: "compile CGo file " + abspath,
 				run: func(job *compileJob) error {
@@ -899,12 +804,6 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe
 					return fmt.Errorf("could not modify stack sizes: %w", err)
 				}
 			}
-
-			// Apply patches of bootloader in the order they appear.
-			if len(config.Target.BootPatches) > 0 {
-				err = applyPatches(result.Executable, config.Target.BootPatches)
-			}
-
 			if config.RP2040BootPatch() {
 				// Patch the second stage bootloader CRC into the .boot2 section
 				err = patchRP2040BootCRC(result.Executable)
@@ -924,13 +823,19 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe
 					args = append(args, "--asyncify")
 				}

-				inputFile := result.Binary
-				result.Binary = result.Executable + ".wasmopt"
+				exeunopt := result.Executable
+
+				if config.Options.Work {
+					// Keep the work direction around => don't overwrite the .wasm binary with the optimized version
+					exeunopt += ".pre-wasm-opt"
+					os.Rename(result.Executable, exeunopt)
+				}
+
 				args = append(args,
 					opt,
 					"-g",
-					inputFile,
-					"--output", result.Binary,
+					exeunopt,
+					"--output", result.Executable,
 				)

 				wasmopt := goenv.Get("WASMOPT")
@@ -960,15 +865,13 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe

 				// wasm-tools component embed -w wasi:cli/command
 				// 		$$(tinygo env TINYGOROOT)/lib/wasi-cli/wit/ main.wasm -o embedded.wasm
-				componentEmbedInputFile := result.Binary
-				result.Binary = result.Executable + ".wasm-component-embed"
 				args := []string{
 					"component",
 					"embed",
 					"-w", witWorld,
 					witPackage,
-					componentEmbedInputFile,
-					"-o", result.Binary,
+					result.Executable,
+					"-o", result.Executable,
 				}

 				wasmtools := goenv.Get("WASMTOOLS")
@@ -981,17 +884,15 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe

 				err := cmd.Run()
 				if err != nil {
-					return fmt.Errorf("`wasm-tools component embed` failed: %w", err)
+					return fmt.Errorf("wasm-tools failed: %w", err)
 				}

 				// wasm-tools component new embedded.wasm -o component.wasm
-				componentNewInputFile := result.Binary
-				result.Binary = result.Executable + ".wasm-component-new"
 				args = []string{
 					"component",
 					"new",
-					componentNewInputFile,
-					"-o", result.Binary,
+					result.Executable,
+					"-o", result.Executable,
 				}

 				if config.Options.PrintCommands != nil {
@@ -1003,21 +904,24 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe

 				err = cmd.Run()
 				if err != nil {
-					return fmt.Errorf("`wasm-tools component new` failed: %w", err)
+					return fmt.Errorf("wasm-tools failed: %w", err)
 				}
 			}

 			// Print code size if requested.
-			if config.Options.PrintSizes != "" {
-				sizes, err := loadProgramSize(result.Executable, result.PackagePathMap)
+			if config.Options.PrintSizes == "short" || config.Options.PrintSizes == "full" {
+				packagePathMap := make(map[string]string, len(lprogram.Packages))
+				for _, pkg := range lprogram.Sorted() {
+					packagePathMap[pkg.OriginalDir()] = pkg.Pkg.Path()
+				}
+				sizes, err := loadProgramSize(result.Executable, packagePathMap)
 				if err != nil {
 					return err
 				}
-				switch config.Options.PrintSizes {
-				case "short":
+				if config.Options.PrintSizes == "short" {
 					fmt.Printf("   code    data     bss |   flash     ram\n")
 					fmt.Printf("%7d %7d %7d | %7d %7d\n", sizes.Code+sizes.ROData, sizes.Data, sizes.BSS, sizes.Flash(), sizes.RAM())
-				case "full":
+				} else {
 					if !config.Debug() {
 						fmt.Println("warning: data incomplete, remove the -no-debug flag for more detail")
 					}
@@ -1029,13 +933,6 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe
 					}
 					fmt.Printf("------------------------------- | --------------- | -------\n")
 					fmt.Printf("%7d %7d %7d %7d | %7d %7d | total\n", sizes.Code, sizes.ROData, sizes.Data, sizes.BSS, sizes.Code+sizes.ROData+sizes.Data, sizes.Data+sizes.BSS)
-				case "html":
-					const filename = "size-report.html"
-					err := writeSizeReport(sizes, filename, pkgName)
-					if err != nil {
-						return err
-					}
-					fmt.Println("Wrote size report to", filename)
 				}
 			}

@@ -1076,11 +973,11 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe
 		if err != nil {
 			return result, err
 		}
-	case "esp32", "esp32-img", "esp32c3", "esp32s3", "esp8266":
+	case "esp32", "esp32-img", "esp32c3", "esp8266":
 		// Special format for the ESP family of chips (parsed by the ROM
 		// bootloader).
 		result.Binary = filepath.Join(tmpdir, "main"+outext)
-		err := makeESPFirmwareImage(result.Executable, result.Binary, outputBinaryFormat)
+		err := makeESPFirmareImage(result.Executable, result.Binary, outputBinaryFormat)
 		if err != nil {
 			return result, err
 		}
@@ -1207,8 +1104,8 @@ func createEmbedObjectFile(data, hexSum, sourceFile, sourceDir, tmpdir string, c
 // optimizeProgram runs a series of optimizations and transformations that are
 // needed to convert a program to its final form. Some transformations are not
 // optional and must be run as the compiler expects them to run.
-func optimizeProgram(mod llvm.Module, config *compileopts.Config) error {
-	err := interp.Run(mod, config.Options.InterpTimeout, config.Options.InterpMaxLoopIterations, config.DumpSSA())
+func optimizeProgram(mod llvm.Module, config *compileopts.Config, globalValues map[string]map[string]string) error {
+	err := interp.Run(mod, config.Options.InterpTimeout, config.DumpSSA())
 	if err != nil {
 		return err
 	}
@@ -1225,6 +1122,12 @@ func optimizeProgram(mod llvm.Module, config *compileopts.Config) error {
 		}
 	}

+	// Insert values from -ldflags="-X ..." into the IR.
+	err = setGlobalValues(mod, globalValues)
+	if err != nil {
+		return err
+	}
+
 	// Run most of the whole-program optimizations (including the whole
 	// O0/O1/O2/Os/Oz optimization pipeline).
 	errs := transform.Optimize(mod, config)
@@ -1238,19 +1141,10 @@ func optimizeProgram(mod llvm.Module, config *compileopts.Config) error {
 	return nil
 }

-func makeGlobalsModule(ctx llvm.Context, globals map[string]map[string]string, machine llvm.TargetMachine) llvm.Module {
-	mod := ctx.NewModule("cmdline-globals")
-	targetData := machine.CreateTargetData()
-	defer targetData.Dispose()
-	mod.SetDataLayout(targetData.String())
-
-	stringType := ctx.StructCreateNamed("runtime._string")
-	uintptrType := ctx.IntType(targetData.PointerSize() * 8)
-	stringType.StructSetBody([]llvm.Type{
-		llvm.PointerType(ctx.Int8Type(), 0),
-		uintptrType,
-	}, false)
-
+// setGlobalValues sets the global values from the -ldflags="-X ..." compiler
+// option in the given module. An error may be returned if the global is not of
+// the expected type.
+func setGlobalValues(mod llvm.Module, globals map[string]map[string]string) error {
 	var pkgPaths []string
 	for pkgPath := range globals {
 		pkgPaths = append(pkgPaths, pkgPath)
@@ -1266,6 +1160,24 @@ func makeGlobalsModule(ctx llvm.Context, globals map[string]map[string]string, m
 		for _, name := range names {
 			value := pkg[name]
 			globalName := pkgPath + "." + name
+			global := mod.NamedGlobal(globalName)
+			if global.IsNil() || !global.Initializer().IsNil() {
+				// The global either does not exist (optimized away?) or has
+				// some value, in which case it has already been initialized at
+				// package init time.
+				continue
+			}
+
+			// A strin is a {ptr, len} pair. We need these types to build the
+			// initializer.
+			initializerType := global.GlobalValueType()
+			if initializerType.TypeKind() != llvm.StructTypeKind || initializerType.StructName() == "" {
+				return fmt.Errorf("%s: not a string", globalName)
+			}
+			elementTypes := initializerType.StructElementTypes()
+			if len(elementTypes) != 2 {
+				return fmt.Errorf("%s: not a string", globalName)
+			}

 			// Create a buffer for the string contents.
 			bufInitializer := mod.Context().ConstString(value, false)
@@ -1276,20 +1188,22 @@ func makeGlobalsModule(ctx llvm.Context, globals map[string]map[string]string, m
 			buf.SetLinkage(llvm.PrivateLinkage)

 			// Create the string value, which is a {ptr, len} pair.
-			length := llvm.ConstInt(uintptrType, uint64(len(value)), false)
-			initializer := llvm.ConstNamedStruct(stringType, []llvm.Value{
-				buf,
+			zero := llvm.ConstInt(mod.Context().Int32Type(), 0, false)
+			ptr := llvm.ConstGEP(bufInitializer.Type(), buf, []llvm.Value{zero, zero})
+			if ptr.Type() != elementTypes[0] {
+				return fmt.Errorf("%s: not a string", globalName)
+			}
+			length := llvm.ConstInt(elementTypes[1], uint64(len(value)), false)
+			initializer := llvm.ConstNamedStruct(initializerType, []llvm.Value{
+				ptr,
 				length,
 			})

-			// Create the string global.
-			global := llvm.AddGlobal(mod, stringType, globalName)
+			// Set the initializer. No initializer should be set at this point.
 			global.SetInitializer(initializer)
-			global.SetAlignment(targetData.PrefTypeAlignment(stringType))
 		}
 	}
-
-	return mod
+	return nil
 }

 // functionStackSizes keeps stack size information about a single function
@@ -1508,23 +1422,6 @@ func printStacks(calculatedStacks []string, stackSizes map[string]functionStackS
 	}
 }

-func applyPatches(executable string, bootPatches []string) (err error) {
-	for _, patch := range bootPatches {
-		switch patch {
-		case "rp2040":
-			err = patchRP2040BootCRC(executable)
-		// case "rp2350":
-		// 	err = patchRP2350BootIMAGE_DEF(executable)
-		default:
-			err = errors.New("undefined boot patch name")
-		}
-		if err != nil {
-			return fmt.Errorf("apply boot patch %q: %w", patch, err)
-		}
-	}
-	return nil
-}
-
 // RP2040 second stage bootloader CRC32 calculation
 //
 // Spec: https://datasheets.raspberrypi.org/rp2040/rp2040-datasheet.pdf
@@ -1536,7 +1433,7 @@ func patchRP2040BootCRC(executable string) error {
 	}

 	if len(bytes) != 256 {
-		return fmt.Errorf("rp2040 .boot2 section must be exactly 256 bytes, got %d", len(bytes))
+		return fmt.Errorf("rp2040 .boot2 section must be exactly 256 bytes")
 	}

 	// From the 'official' RP2040 checksum script:
@@ -1575,10 +1472,3 @@ func lock(path string) func() {

 	return func() { flock.Close() }
 }
-
-func b2u8(b bool) uint8 {
-	if b {
-		return 1
-	}
-	return 0
-}
@@ -28,13 +28,11 @@ func TestClangAttributes(t *testing.T) {
 		"cortex-m4",
 		"cortex-m7",
 		"esp32c3",
-		"esp32s3",
 		"fe310",
 		"gameboy-advance",
 		"k210",
 		"nintendoswitch",
 		"riscv-qemu",
-		"tkey",
 		"wasip1",
 		"wasip2",
 		"wasm",
@@ -68,9 +66,9 @@ func TestClangAttributes(t *testing.T) {
 		{GOOS: "linux", GOARCH: "mipsle", GOMIPS: "softfloat"},
 		{GOOS: "darwin", GOARCH: "amd64"},
 		{GOOS: "darwin", GOARCH: "arm64"},
-		{GOOS: "windows", GOARCH: "386"},
 		{GOOS: "windows", GOARCH: "amd64"},
 		{GOOS: "windows", GOARCH: "arm64"},
+		{GOOS: "wasip1", GOARCH: "wasm"},
 	} {
 		name := "GOOS=" + options.GOOS + ",GOARCH=" + options.GOARCH
 		if options.GOARCH == "arm" {
@@ -3,7 +3,6 @@ package builder
 import (
 	"os"
 	"path/filepath"
-	"strings"

 	"github.com/tinygo-org/tinygo/compileopts"
 	"github.com/tinygo-org/tinygo/goenv"
@@ -202,11 +201,6 @@ var avrBuiltins = []string{
 	"avr/udivmodqi4.S",
 }

-// Builtins needed specifically for windows/386.
-var windowsI386Builtins = []string{
-	"i386/chkstk.S", // also _alloca
-}
-
 // libCompilerRT is a library with symbols required by programs compiled with
 // LLVM. These symbols are for operations that cannot be emitted with a single
 // instruction or a short sequence of instructions for that target.
@@ -226,7 +220,7 @@ var libCompilerRT = Library{
 		// Development build.
 		return filepath.Join(goenv.Get("TINYGOROOT"), "lib/compiler-rt-builtins")
 	},
-	librarySources: func(target string, _ bool) ([]string, error) {
+	librarySources: func(target string) ([]string, error) {
 		builtins := append([]string{}, genericBuiltins...) // copy genericBuiltins
 		switch compileopts.CanonicalArchName(target) {
 		case "arm":
@@ -235,10 +229,6 @@ var libCompilerRT = Library{
 			builtins = append(builtins, avrBuiltins...)
 		case "x86_64", "aarch64", "riscv64": // any 64-bit arch
 			builtins = append(builtins, genericBuiltins128...)
-		case "i386":
-			if strings.Split(target, "-")[2] == "windows" {
-				builtins = append(builtins, windowsI386Builtins...)
-			}
 		}
 		return builtins, nil
 	},
@@ -144,6 +144,7 @@ bool AssemblerInvocation::CreateFromArgs(AssemblerInvocation &Opts,
            .Default(llvm::DebugCompressionType::None);
  }

+  Opts.RelaxELFRelocations = !Args.hasArg(OPT_mrelax_relocations_no);
  if (auto *DwarfFormatArg = Args.getLastArg(OPT_gdwarf64, OPT_gdwarf32))
    Opts.Dwarf64 = DwarfFormatArg->getOption().matches(OPT_gdwarf64);
  Opts.DwarfVersion = getLastArgIntValue(Args, OPT_dwarf_version_EQ, 2, Diags);
@@ -233,10 +234,6 @@ bool AssemblerInvocation::CreateFromArgs(AssemblerInvocation &Opts,

  Opts.EmitCompactUnwindNonCanonical =
      Args.hasArg(OPT_femit_compact_unwind_non_canonical);
-  Opts.Crel = Args.hasArg(OPT_crel);
-  Opts.ImplicitMapsyms = Args.hasArg(OPT_mmapsyms_implicit);
-  Opts.X86RelaxRelocations = !Args.hasArg(OPT_mrelax_relocations_no);
-  Opts.X86Sse2Avx = Args.hasArg(OPT_msse2avx);

  Opts.AsSecureLogFile = Args.getLastArgValue(OPT_as_secure_log_file);

@@ -290,15 +287,8 @@ static bool ExecuteAssemblerImpl(AssemblerInvocation &Opts,
  assert(MRI && "Unable to create target register info!");

  MCTargetOptions MCOptions;
-  MCOptions.MCRelaxAll = Opts.RelaxAll;
  MCOptions.EmitDwarfUnwind = Opts.EmitDwarfUnwind;
  MCOptions.EmitCompactUnwindNonCanonical = Opts.EmitCompactUnwindNonCanonical;
-  MCOptions.MCSaveTempLabels = Opts.SaveTemporaryLabels;
-  MCOptions.Crel = Opts.Crel;
-  MCOptions.ImplicitMapSyms = Opts.ImplicitMapsyms;
-  MCOptions.X86RelaxRelocations = Opts.X86RelaxRelocations;
-  MCOptions.X86Sse2Avx = Opts.X86Sse2Avx;
-  MCOptions.CompressDebugSections = Opts.CompressDebugSections;
  MCOptions.AsSecureLogFile = Opts.AsSecureLogFile;

  std::unique_ptr<MCAsmInfo> MAI(
@@ -307,7 +297,9 @@ static bool ExecuteAssemblerImpl(AssemblerInvocation &Opts,

  // Ensure MCAsmInfo initialization occurs before any use, otherwise sections
  // may be created with a combination of default and explicit settings.
+  MAI->setCompressDebugSections(Opts.CompressDebugSections);

+  MAI->setRelaxELFRelocations(Opts.RelaxELFRelocations);

  bool IsBinary = Opts.OutputType == AssemblerInvocation::FT_Obj;
  if (Opts.OutputPath.empty())
@@ -345,8 +337,14 @@ static bool ExecuteAssemblerImpl(AssemblerInvocation &Opts,
  // MCObjectFileInfo needs a MCContext reference in order to initialize itself.
  std::unique_ptr<MCObjectFileInfo> MOFI(
      TheTarget->createMCObjectFileInfo(Ctx, PIC));
+  if (Opts.DarwinTargetVariantTriple)
+    MOFI->setDarwinTargetVariantTriple(*Opts.DarwinTargetVariantTriple);
+  if (!Opts.DarwinTargetVariantSDKVersion.empty())
+    MOFI->setDarwinTargetVariantSDKVersion(Opts.DarwinTargetVariantSDKVersion);
  Ctx.setObjectFileInfo(MOFI.get());

+  if (Opts.SaveTemporaryLabels)
+    Ctx.setAllowTemporaryLabels(false);
  if (Opts.GenDwarfForAssembly)
    Ctx.setGenDwarfForAssembly(true);
  if (!Opts.DwarfDebugFlags.empty())
@@ -383,9 +381,6 @@ static bool ExecuteAssemblerImpl(AssemblerInvocation &Opts,
  MCOptions.MCNoWarn = Opts.NoWarn;
  MCOptions.MCFatalWarnings = Opts.FatalWarnings;
  MCOptions.MCNoTypeCheck = Opts.NoTypeCheck;
-  MCOptions.ShowMCInst = Opts.ShowInst;
-  MCOptions.AsmVerbose = true;
-  MCOptions.MCUseDwarfDirectory = MCTargetOptions::EnableDwarfDirectory;
  MCOptions.ABIName = Opts.TargetABI;

  // FIXME: There is a bit of code duplication with addPassesToEmitFile.
@@ -400,8 +395,10 @@ static bool ExecuteAssemblerImpl(AssemblerInvocation &Opts,
        TheTarget->createMCAsmBackend(*STI, *MRI, MCOptions));

    auto FOut = std::make_unique<formatted_raw_ostream>(*Out);
-    Str.reset(TheTarget->createAsmStreamer(Ctx, std::move(FOut), IP,
-                                           std::move(CE), std::move(MAB)));
+    Str.reset(TheTarget->createAsmStreamer(
+        Ctx, std::move(FOut), /*asmverbose*/ true,
+        /*useDwarfDirectory*/ true, IP, std::move(CE), std::move(MAB),
+        Opts.ShowInst));
  } else if (Opts.OutputType == AssemblerInvocation::FT_Null) {
    Str.reset(createNullStreamer(Ctx));
  } else {
@@ -424,15 +421,10 @@ static bool ExecuteAssemblerImpl(AssemblerInvocation &Opts,

    Triple T(Opts.Triple);
    Str.reset(TheTarget->createMCObjectStreamer(
-        T, Ctx, std::move(MAB), std::move(OW), std::move(CE), *STI));
+        T, Ctx, std::move(MAB), std::move(OW), std::move(CE), *STI,
+        Opts.RelaxAll, Opts.IncrementalLinkerCompatible,
+        /*DWARFMustBeAtTheEnd*/ true));
    Str.get()->initSections(Opts.NoExecStack, *STI);
-    if (T.isOSBinFormatMachO() && T.isOSDarwin()) {
-      Triple *TVT = Opts.DarwinTargetVariantTriple
-                        ? &*Opts.DarwinTargetVariantTriple
-                        : nullptr;
-      Str->emitVersionForTarget(T, VersionTuple(), TVT,
-                                Opts.DarwinTargetVariantSDKVersion);
-    }
  }

  // When -fembed-bitcode is passed to clang_as, a 1-byte marker
@@ -444,6 +436,9 @@ static bool ExecuteAssemblerImpl(AssemblerInvocation &Opts,
    Str.get()->emitZeros(1);
  }

+  // Assembly to object compilation should leverage assembly info.
+  Str->setUseAssemblerInfoForParsing(true);
+
  bool Failed = false;

  std::unique_ptr<MCAsmParser> Parser(
@@ -38,13 +38,10 @@ struct AssemblerInvocation {
  /// @{

  std::vector<std::string> IncludePaths;
-  LLVM_PREFERRED_TYPE(bool)
  unsigned NoInitialTextSection : 1;
-  LLVM_PREFERRED_TYPE(bool)
  unsigned SaveTemporaryLabels : 1;
-  LLVM_PREFERRED_TYPE(bool)
  unsigned GenDwarfForAssembly : 1;
-  LLVM_PREFERRED_TYPE(bool)
+  unsigned RelaxELFRelocations : 1;
  unsigned Dwarf64 : 1;
  unsigned DwarfVersion;
  std::string DwarfDebugFlags;
@@ -69,9 +66,7 @@ struct AssemblerInvocation {
    FT_Obj   ///< Object file output.
  };
  FileType OutputType;
-  LLVM_PREFERRED_TYPE(bool)
  unsigned ShowHelp : 1;
-  LLVM_PREFERRED_TYPE(bool)
  unsigned ShowVersion : 1;

  /// @}
@@ -79,28 +74,19 @@ struct AssemblerInvocation {
  /// @{

  unsigned OutputAsmVariant;
-  LLVM_PREFERRED_TYPE(bool)
  unsigned ShowEncoding : 1;
-  LLVM_PREFERRED_TYPE(bool)
  unsigned ShowInst : 1;

  /// @}
  /// @name Assembler Options
  /// @{

-  LLVM_PREFERRED_TYPE(bool)
  unsigned RelaxAll : 1;
-  LLVM_PREFERRED_TYPE(bool)
  unsigned NoExecStack : 1;
-  LLVM_PREFERRED_TYPE(bool)
  unsigned FatalWarnings : 1;
-  LLVM_PREFERRED_TYPE(bool)
  unsigned NoWarn : 1;
-  LLVM_PREFERRED_TYPE(bool)
  unsigned NoTypeCheck : 1;
-  LLVM_PREFERRED_TYPE(bool)
  unsigned IncrementalLinkerCompatible : 1;
-  LLVM_PREFERRED_TYPE(bool)
  unsigned EmbedBitcode : 1;

  /// Whether to emit DWARF unwind info.
@@ -108,19 +94,8 @@ struct AssemblerInvocation {

  // Whether to emit compact-unwind for non-canonical entries.
  // Note: maybe overridden by other constraints.
-  LLVM_PREFERRED_TYPE(bool)
  unsigned EmitCompactUnwindNonCanonical : 1;

-  LLVM_PREFERRED_TYPE(bool)
-  unsigned Crel : 1;
-  LLVM_PREFERRED_TYPE(bool)
-  unsigned ImplicitMapsyms : 1;
-
-  LLVM_PREFERRED_TYPE(bool)
-  unsigned X86RelaxRelocations : 1;
-  LLVM_PREFERRED_TYPE(bool)
-  unsigned X86Sse2Avx : 1;
-
  /// The name of the relocation model to use.
  std::string RelocationModel;

@@ -161,10 +136,6 @@ public:
    EmbedBitcode = 0;
    EmitDwarfUnwind = EmitDwarfUnwindType::Default;
    EmitCompactUnwindNonCanonical = false;
-    Crel = false;
-    ImplicitMapsyms = 0;
-    X86RelaxRelocations = 0;
-    X86Sse2Avx = 0;
  }

  static bool CreateFromArgs(AssemblerInvocation &Res,
@@ -60,7 +60,7 @@ bool tinygo_clang_driver(int argc, char **argv) {
 			}

 			// Create the actual diagnostics engine.
-			Clang->createDiagnostics(*llvm::vfs::getRealFileSystem());
+			Clang->createDiagnostics();
 			if (!Clang->hasDiagnostics()) {
 				return false;
 			}
@@ -3,6 +3,7 @@ package builder
 import (
 	"errors"
 	"fmt"
+	"os"
 	"os/exec"
 	"runtime"
 	"strings"
@@ -75,3 +76,14 @@ func LookupCommand(name string) (string, error) {
 	}
 	return "", errors.New("none of these commands were found in your $PATH: " + strings.Join(commands[name], " "))
 }
+
+func execCommand(name string, args ...string) error {
+	name, err := LookupCommand(name)
+	if err != nil {
+		return err
+	}
+	cmd := exec.Command(name, args...)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	return cmd.Run()
+}
@@ -2,7 +2,6 @@ package builder

 import (
 	"fmt"
-	"runtime"

 	"github.com/tinygo-org/tinygo/compileopts"
 	"github.com/tinygo-org/tinygo/goenv"
@@ -24,40 +23,20 @@ func NewConfig(options *compileopts.Options) (*compileopts.Config, error) {
 		spec.OpenOCDCommands = options.OpenOCDCommands
 	}

-	// Version range supported by TinyGo.
-	const minorMin = 19
-	const minorMax = 26
-
-	// Check that we support this Go toolchain version.
-	gorootMajor, gorootMinor, err := goenv.GetGorootVersion()
+	major, minor, err := goenv.GetGorootVersion()
 	if err != nil {
 		return nil, err
 	}
-
-	if options.GoCompatibility {
-		if gorootMajor != 1 || gorootMinor < minorMin || gorootMinor > minorMax {
-			// Note: when this gets updated, also update the Go compatibility matrix:
-			// https://github.com/tinygo-org/tinygo-site/blob/dev/content/docs/reference/go-compat-matrix.md
-			return nil, fmt.Errorf("requires go version 1.%d through 1.%d, got go%d.%d", minorMin, minorMax, gorootMajor, gorootMinor)
-		}
-	}
-
-	// Check that the Go toolchain version isn't too new, if we haven't been
-	// compiled with the latest Go version.
-	// This may be a bit too aggressive: if the newer version doesn't change the
-	// Go language we will most likely be able to compile it.
-	buildMajor, buildMinor, _, err := goenv.Parse(runtime.Version())
-	if err != nil {
-		return nil, err
-	}
-	if buildMajor != 1 || buildMinor < gorootMinor {
-		return nil, fmt.Errorf("cannot compile with Go toolchain version go%d.%d (TinyGo was built using toolchain version %s)", gorootMajor, gorootMinor, runtime.Version())
+	if major != 1 || minor < 19 || minor > 23 {
+		// Note: when this gets updated, also update the Go compatibility matrix:
+		// https://github.com/tinygo-org/tinygo-site/blob/dev/content/docs/reference/go-compat-matrix.md
+		return nil, fmt.Errorf("requires go version 1.19 through 1.23, got go%d.%d", major, minor)
 	}

 	return &compileopts.Config{
 		Options:        options,
 		Target:         spec,
-		GoMinorVersion: gorootMinor,
+		GoMinorVersion: minor,
 		TestConfig:     options.TestConfig,
 	}, nil
 }
@@ -23,7 +23,7 @@ type espImageSegment struct {
 	data []byte
 }

-// makeESPFirmwareImage converts an input ELF file to an image file for an ESP32 or
+// makeESPFirmareImage converts an input ELF file to an image file for an ESP32 or
 // ESP8266 chip. This is a special purpose image format just for the ESP chip
 // family, and is parsed by the on-chip mask ROM bootloader.
 //
@@ -31,7 +31,7 @@ type espImageSegment struct {
 // https://github.com/espressif/esptool/wiki/Firmware-Image-Format
 // https://github.com/espressif/esp-idf/blob/8fbb63c2a701c22ccf4ce249f43aded73e134a34/components/bootloader_support/include/esp_image_format.h#L58
 // https://github.com/espressif/esptool/blob/master/esptool.py
-func makeESPFirmwareImage(infile, outfile, format string) error {
+func makeESPFirmareImage(infile, outfile, format string) error {
 	inf, err := elf.Open(infile)
 	if err != nil {
 		return err
@@ -100,12 +100,11 @@ func makeESPFirmwareImage(infile, outfile, format string) error {
 	chip_id := map[string]uint16{
 		"esp32":   0x0000,
 		"esp32c3": 0x0005,
-		"esp32s3": 0x0009,
 	}[chip]

 	// Image header.
 	switch chip {
-	case "esp32", "esp32c3", "esp32s3":
+	case "esp32", "esp32c3":
 		// Header format:
 		// https://github.com/espressif/esp-idf/blob/v4.3/components/bootloader_support/include/esp_app_format.h#L71
 		// Note: not adding a SHA256 hash as the binary is modified by
@@ -17,6 +17,14 @@ import (
 // concurrency or performance issues.
 const jobRunnerDebug = false

+type jobState uint8
+
+const (
+	jobStateQueued   jobState = iota // not yet running
+	jobStateRunning                  // running
+	jobStateFinished                 // finished running
+)
+
 // compileJob is a single compiler job, comparable to a single Makefile target.
 // It is used to orchestrate various compiler tasks that can be run in parallel
 // but that have dependencies and thus have limitations in how they can be run.
@@ -47,11 +55,12 @@ func dummyCompileJob(result string) *compileJob {
 // ordered as such in the job dependencies.
 func runJobs(job *compileJob, sema chan struct{}) error {
 	if sema == nil {
-		// Have a default, if the semaphore isn't set. This is useful for tests.
+		// Have a default, if the semaphore isn't set. This is useful for
+		// tests.
 		sema = make(chan struct{}, runtime.NumCPU())
 	}
 	if cap(sema) == 0 {
-		return errors.New("cannot run 0 jobs at a time")
+		return errors.New("cannot 0 jobs at a time")
 	}

 	// Create a slice of jobs to run, where all dependencies are run in order.
@@ -72,10 +81,10 @@ func runJobs(job *compileJob, sema chan struct{}) error {

 	waiting := make(map[*compileJob]map[*compileJob]struct{}, len(jobs))
 	dependents := make(map[*compileJob][]*compileJob, len(jobs))
-	compileJobs := make(map[*compileJob]int)
+	jidx := make(map[*compileJob]int)
 	var ready intHeap
 	for i, job := range jobs {
-		compileJobs[job] = i
+		jidx[job] = i
 		if len(job.dependencies) == 0 {
 			// This job is ready to run.
 			ready.Push(i)
@@ -96,7 +105,8 @@ func runJobs(job *compileJob, sema chan struct{}) error {
 	// Create a channel to accept notifications of completion.
 	doneChan := make(chan *compileJob)

-	// Send each job in the jobs slice to a worker, taking care of job dependencies.
+	// Send each job in the jobs slice to a worker, taking care of job
+	// dependencies.
 	numRunningJobs := 0
 	var totalTime time.Duration
 	start := time.Now()
@@ -146,7 +156,7 @@ func runJobs(job *compileJob, sema chan struct{}) error {
 			delete(wait, completed)
 			if len(wait) == 0 {
 				// This job is now ready to run.
-				ready.Push(compileJobs[j])
+				ready.Push(jidx[j])
 				delete(waiting, j)
 			}
 		}
@@ -15,9 +15,6 @@ import (

 // Library is a container for information about a single C library, such as a
 // compiler runtime or libc.
-//
-// Note: whenever a library gets changed, the version in compileopts/config.go
-// probably also needs to be incremented.
 type Library struct {
 	// The library name, such as compiler-rt or picolibc.
 	name string
@@ -28,17 +25,11 @@ type Library struct {
 	// cflags returns the C flags specific to this library
 	cflags func(target, headerPath string) []string

-	// cflagsForFile returns additional C flags for a particular source file.
-	cflagsForFile func(path string) []string
-
-	// needsLibc is set to true if this library needs libc headers.
-	needsLibc bool
-
 	// The source directory.
 	sourceDir func() string

 	// The source files, relative to sourceDir.
-	librarySources func(target string, libcNeedsMalloc bool) ([]string, error)
+	librarySources func(target string) ([]string, error)

 	// The source code for the crt1.o file, relative to sourceDir.
 	crt1Source string
@@ -53,8 +44,13 @@ type Library struct {
 // As a side effect, this call creates the library header files if they didn't
 // exist yet.
 func (l *Library) load(config *compileopts.Config, tmpdir string) (job *compileJob, abortLock func(), err error) {
-	outdir := config.LibraryPath(l.name)
+	outdir, precompiled := config.LibcPath(l.name)
 	archiveFilePath := filepath.Join(outdir, "lib.a")
+	if precompiled {
+		// Found a precompiled library for this OS/architecture. Return the path
+		// directly.
+		return dummyCompileJob(archiveFilePath), func() {}, nil
+	}

 	// Create a lock on the output (if supported).
 	// This is a bit messy, but avoids a deadlock because it is ordered consistently with other library loads within a build.
@@ -167,9 +163,9 @@ func (l *Library) load(config *compileopts.Config, tmpdir string) (job *compileJ
 		// double.
 		args = append(args, "-mdouble=64")
 	case "riscv32":
-		args = append(args, "-march="+riscvMarch(config, "rv32imac"), "-fforce-enable-int128")
+		args = append(args, "-march=rv32imac", "-fforce-enable-int128")
 	case "riscv64":
-		args = append(args, "-march="+riscvMarch(config, "rv64gc"))
+		args = append(args, "-march=rv64gc")
 	case "mips":
 		args = append(args, "-fno-pic")
 	}
@@ -185,9 +181,6 @@ func (l *Library) load(config *compileopts.Config, tmpdir string) (job *compileJ
 			args = append(args, "-mfpu=vfpv2")
 		}
 	}
-	if l.needsLibc {
-		args = append(args, config.LibcCFlags()...)
-	}

 	var once sync.Once

@@ -226,13 +219,12 @@ func (l *Library) load(config *compileopts.Config, tmpdir string) (job *compileJ

 	// Create jobs to compile all sources. These jobs are depended upon by the
 	// archive job above, so must be run first.
-	paths, err := l.librarySources(target, config.LibcNeedsMalloc())
+	paths, err := l.librarySources(target)
 	if err != nil {
 		return nil, nil, err
 	}
 	for _, path := range paths {
 		// Strip leading "../" parts off the path.
-		path := path
 		cleanpath := path
 		for strings.HasPrefix(cleanpath, "../") {
 			cleanpath = cleanpath[3:]
@@ -241,14 +233,11 @@ func (l *Library) load(config *compileopts.Config, tmpdir string) (job *compileJ
 		objpath := filepath.Join(dir, cleanpath+".o")
 		os.MkdirAll(filepath.Dir(objpath), 0o777)
 		objs = append(objs, objpath)
-		objfile := &compileJob{
+		job.dependencies = append(job.dependencies, &compileJob{
 			description: "compile " + srcpath,
 			run: func(*compileJob) error {
 				var compileArgs []string
 				compileArgs = append(compileArgs, args...)
-				if l.cflagsForFile != nil {
-					compileArgs = append(compileArgs, l.cflagsForFile(path)...)
-				}
 				compileArgs = append(compileArgs, "-o", objpath, srcpath)
 				if config.Options.PrintCommands != nil {
 					config.Options.PrintCommands("clang", compileArgs...)
@@ -259,8 +248,7 @@ func (l *Library) load(config *compileopts.Config, tmpdir string) (job *compileJ
 				}
 				return nil
 			},
-		}
-		job.dependencies = append(job.dependencies, objfile)
+		})
 	}

 	// Create crt1.o job, if needed.
@@ -269,7 +257,7 @@ func (l *Library) load(config *compileopts.Config, tmpdir string) (job *compileJ
 	// won't make much of a difference in speed).
 	if l.crt1Source != "" {
 		srcpath := filepath.Join(sourceDir, l.crt1Source)
-		crt1Job := &compileJob{
+		job.dependencies = append(job.dependencies, &compileJob{
 			description: "compile " + srcpath,
 			run: func(*compileJob) error {
 				var compileArgs []string
@@ -289,8 +277,7 @@ func (l *Library) load(config *compileopts.Config, tmpdir string) (job *compileJ
 				}
 				return os.Rename(tmpfile.Name(), filepath.Join(outdir, "crt1.o"))
 			},
-		}
-		job.dependencies = append(job.dependencies, crt1Job)
+		})
 	}

 	ok = true
@@ -298,17 +285,3 @@ func (l *Library) load(config *compileopts.Config, tmpdir string) (job *compileJ
 		once.Do(unlock)
 	}, nil
 }
-
-// riscvMarch returns the -march value for RISC-V library compilation.
-// It extracts the value from the target's cflags if present, otherwise
-// falls back to the provided default. This ensures libraries are compiled
-// with the correct ISA extensions for each target (e.g. rv32imc for
-// ESP32-C3 which lacks the atomic extension).
-func riscvMarch(config *compileopts.Config, defaultMarch string) string {
-	for _, flag := range config.Target.CFlags {
-		if strings.HasPrefix(flag, "-march=") {
-			return flag[len("-march="):]
-		}
-	}
-	return defaultMarch
-}
@@ -30,62 +30,25 @@ var libMinGW = Library{
 	sourceDir: func() string { return filepath.Join(goenv.Get("TINYGOROOT"), "lib/mingw-w64") },
 	cflags: func(target, headerPath string) []string {
 		mingwDir := filepath.Join(goenv.Get("TINYGOROOT"), "lib/mingw-w64")
-		flags := []string{
+		return []string{
 			"-nostdlibinc",
-			"-isystem", mingwDir + "/mingw-w64-crt/include",
 			"-isystem", mingwDir + "/mingw-w64-headers/crt",
-			"-isystem", mingwDir + "/mingw-w64-headers/include",
 			"-I", mingwDir + "/mingw-w64-headers/defaults/include",
 			"-I" + headerPath,
 		}
-		if strings.Split(target, "-")[0] == "i386" {
-			flags = append(flags,
-				"-D__MSVCRT_VERSION__=0x700", // Microsoft Visual C++ .NET 2002
-				"-D_WIN32_WINNT=0x0501",      // target Windows XP
-				"-D_CRTBLD",
-				"-Wno-pragma-pack",
-			)
-		}
-		return flags
 	},
-	librarySources: func(target string, _ bool) ([]string, error) {
+	librarySources: func(target string) ([]string, error) {
 		// These files are needed so that printf and the like are supported.
-		var sources []string
-		if strings.Split(target, "-")[0] == "i386" {
-			// Old 32-bit x86 systems use msvcrt.dll.
-			sources = []string{
-				"mingw-w64-crt/crt/pseudo-reloc.c",
-				"mingw-w64-crt/gdtoa/dmisc.c",
-				"mingw-w64-crt/gdtoa/gdtoa.c",
-				"mingw-w64-crt/gdtoa/gmisc.c",
-				"mingw-w64-crt/gdtoa/misc.c",
-				"mingw-w64-crt/math/x86/exp2.S",
-				"mingw-w64-crt/math/x86/trunc.S",
-				"mingw-w64-crt/misc/___mb_cur_max_func.c",
-				"mingw-w64-crt/misc/lc_locale_func.c",
-				"mingw-w64-crt/misc/mbrtowc.c",
-				"mingw-w64-crt/misc/strnlen.c",
-				"mingw-w64-crt/misc/wcrtomb.c",
-				"mingw-w64-crt/misc/wcsnlen.c",
-				"mingw-w64-crt/stdio/acrt_iob_func.c",
-				"mingw-w64-crt/stdio/mingw_lock.c",
-				"mingw-w64-crt/stdio/mingw_pformat.c",
-				"mingw-w64-crt/stdio/mingw_vfprintf.c",
-				"mingw-w64-crt/stdio/mingw_vsnprintf.c",
-			}
-		} else {
-			// Anything somewhat modern (amd64, arm64) uses UCRT.
-			sources = []string{
-				"mingw-w64-crt/stdio/ucrt_fprintf.c",
-				"mingw-w64-crt/stdio/ucrt_fwprintf.c",
-				"mingw-w64-crt/stdio/ucrt_printf.c",
-				"mingw-w64-crt/stdio/ucrt_snprintf.c",
-				"mingw-w64-crt/stdio/ucrt_sprintf.c",
-				"mingw-w64-crt/stdio/ucrt_vfprintf.c",
-				"mingw-w64-crt/stdio/ucrt_vprintf.c",
-				"mingw-w64-crt/stdio/ucrt_vsnprintf.c",
-				"mingw-w64-crt/stdio/ucrt_vsprintf.c",
-			}
+		sources := []string{
+			"mingw-w64-crt/stdio/ucrt_fprintf.c",
+			"mingw-w64-crt/stdio/ucrt_fwprintf.c",
+			"mingw-w64-crt/stdio/ucrt_printf.c",
+			"mingw-w64-crt/stdio/ucrt_snprintf.c",
+			"mingw-w64-crt/stdio/ucrt_sprintf.c",
+			"mingw-w64-crt/stdio/ucrt_vfprintf.c",
+			"mingw-w64-crt/stdio/ucrt_vprintf.c",
+			"mingw-w64-crt/stdio/ucrt_vsnprintf.c",
+			"mingw-w64-crt/stdio/ucrt_vsprintf.c",
 		}
 		return sources, nil
 	},
@@ -100,41 +63,27 @@ var libMinGW = Library{
 func makeMinGWExtraLibs(tmpdir, goarch string) []*compileJob {
 	var jobs []*compileJob
 	root := goenv.Get("TINYGOROOT")
-	var libs []string
-	if goarch == "386" {
-		libs = []string{
-			// x86 uses msvcrt.dll instead of UCRT for compatibility with old
-			// Windows versions.
-			"advapi32.def.in",
-			"kernel32.def.in",
-			"msvcrt.def.in",
-		}
-	} else {
-		// Use the modernized UCRT on new systems.
-		// Normally all the api-ms-win-crt-*.def files are all compiled to a
-		// single .lib file. But to simplify things, we're going to leave them
-		// as separate files.
-		libs = []string{
-			"advapi32.def.in",
-			"kernel32.def.in",
-			"api-ms-win-crt-conio-l1-1-0.def",
-			"api-ms-win-crt-convert-l1-1-0.def.in",
-			"api-ms-win-crt-environment-l1-1-0.def",
-			"api-ms-win-crt-filesystem-l1-1-0.def",
-			"api-ms-win-crt-heap-l1-1-0.def",
-			"api-ms-win-crt-locale-l1-1-0.def",
-			"api-ms-win-crt-math-l1-1-0.def.in",
-			"api-ms-win-crt-multibyte-l1-1-0.def",
-			"api-ms-win-crt-private-l1-1-0.def.in",
-			"api-ms-win-crt-process-l1-1-0.def",
-			"api-ms-win-crt-runtime-l1-1-0.def.in",
-			"api-ms-win-crt-stdio-l1-1-0.def",
-			"api-ms-win-crt-string-l1-1-0.def",
-			"api-ms-win-crt-time-l1-1-0.def",
-			"api-ms-win-crt-utility-l1-1-0.def",
-		}
-	}
-	for _, name := range libs {
+	// Normally all the api-ms-win-crt-*.def files are all compiled to a single
+	// .lib file. But to simplify things, we're going to leave them as separate
+	// files.
+	for _, name := range []string{
+		"kernel32.def.in",
+		"api-ms-win-crt-conio-l1-1-0.def",
+		"api-ms-win-crt-convert-l1-1-0.def.in",
+		"api-ms-win-crt-environment-l1-1-0.def",
+		"api-ms-win-crt-filesystem-l1-1-0.def",
+		"api-ms-win-crt-heap-l1-1-0.def",
+		"api-ms-win-crt-locale-l1-1-0.def",
+		"api-ms-win-crt-math-l1-1-0.def.in",
+		"api-ms-win-crt-multibyte-l1-1-0.def",
+		"api-ms-win-crt-private-l1-1-0.def.in",
+		"api-ms-win-crt-process-l1-1-0.def",
+		"api-ms-win-crt-runtime-l1-1-0.def.in",
+		"api-ms-win-crt-stdio-l1-1-0.def",
+		"api-ms-win-crt-string-l1-1-0.def",
+		"api-ms-win-crt-time-l1-1-0.def",
+		"api-ms-win-crt-utility-l1-1-0.def",
+	} {
 		outpath := filepath.Join(tmpdir, filepath.Base(name)+".lib")
 		inpath := filepath.Join(root, "lib/mingw-w64/mingw-w64-crt/lib-common/"+name)
 		job := &compileJob{
@@ -144,9 +93,6 @@ func makeMinGWExtraLibs(tmpdir, goarch string) []*compileJob {
 				defpath := inpath
 				var archDef, emulation string
 				switch goarch {
-				case "386":
-					archDef = "-DDEF_I386"
-					emulation = "i386pe"
 				case "amd64":
 					archDef = "-DDEF_X64"
 					emulation = "i386pep"
@@ -12,45 +12,6 @@ import (
 	"github.com/tinygo-org/tinygo/goenv"
 )

-// Create the alltypes.h file from the appropriate alltypes.h.in files.
-func buildMuslAllTypes(arch, muslDir, outputBitsDir string) error {
-	// Create the file alltypes.h.
-	f, err := os.Create(filepath.Join(outputBitsDir, "alltypes.h"))
-	if err != nil {
-		return err
-	}
-	infiles := []string{
-		filepath.Join(muslDir, "arch", arch, "bits", "alltypes.h.in"),
-		filepath.Join(muslDir, "include", "alltypes.h.in"),
-	}
-	for _, infile := range infiles {
-		data, err := os.ReadFile(infile)
-		if err != nil {
-			return err
-		}
-		lines := strings.Split(string(data), "\n")
-		for _, line := range lines {
-			if strings.HasPrefix(line, "TYPEDEF ") {
-				matches := regexp.MustCompile(`TYPEDEF (.*) ([^ ]*);`).FindStringSubmatch(line)
-				value := matches[1]
-				name := matches[2]
-				line = fmt.Sprintf("#if defined(__NEED_%s) && !defined(__DEFINED_%s)\ntypedef %s %s;\n#define __DEFINED_%s\n#endif\n", name, name, value, name, name)
-			}
-			if strings.HasPrefix(line, "STRUCT ") {
-				matches := regexp.MustCompile(`STRUCT * ([^ ]*) (.*);`).FindStringSubmatch(line)
-				name := matches[1]
-				value := matches[2]
-				line = fmt.Sprintf("#if defined(__NEED_struct_%s) && !defined(__DEFINED_struct_%s)\nstruct %s %s;\n#define __DEFINED_struct_%s\n#endif\n", name, name, name, value, name)
-			}
-			_, err := f.WriteString(line + "\n")
-			if err != nil {
-				return err
-			}
-		}
-	}
-	return f.Close()
-}
-
 var libMusl = Library{
 	name: "musl",
 	makeHeaders: func(target, includeDir string) error {
@@ -63,13 +24,41 @@ var libMusl = Library{
 		arch := compileopts.MuslArchitecture(target)
 		muslDir := filepath.Join(goenv.Get("TINYGOROOT"), "lib", "musl")

-		err = buildMuslAllTypes(arch, muslDir, bits)
+		// Create the file alltypes.h.
+		f, err := os.Create(filepath.Join(bits, "alltypes.h"))
 		if err != nil {
 			return err
 		}
+		infiles := []string{
+			filepath.Join(muslDir, "arch", arch, "bits", "alltypes.h.in"),
+			filepath.Join(muslDir, "include", "alltypes.h.in"),
+		}
+		for _, infile := range infiles {
+			data, err := os.ReadFile(infile)
+			if err != nil {
+				return err
+			}
+			lines := strings.Split(string(data), "\n")
+			for _, line := range lines {
+				if strings.HasPrefix(line, "TYPEDEF ") {
+					matches := regexp.MustCompile(`TYPEDEF (.*) ([^ ]*);`).FindStringSubmatch(line)
+					value := matches[1]
+					name := matches[2]
+					line = fmt.Sprintf("#if defined(__NEED_%s) && !defined(__DEFINED_%s)\ntypedef %s %s;\n#define __DEFINED_%s\n#endif\n", name, name, value, name, name)
+				}
+				if strings.HasPrefix(line, "STRUCT ") {
+					matches := regexp.MustCompile(`STRUCT * ([^ ]*) (.*);`).FindStringSubmatch(line)
+					name := matches[1]
+					value := matches[2]
+					line = fmt.Sprintf("#if defined(__NEED_struct_%s) && !defined(__DEFINED_struct_%s)\nstruct %s %s;\n#define __DEFINED_struct_%s\n#endif\n", name, name, name, value, name)
+				}
+				f.WriteString(line + "\n")
+			}
+		}
+		f.Close()

 		// Create the file syscall.h.
-		f, err := os.Create(filepath.Join(bits, "syscall.h"))
+		f, err = os.Create(filepath.Join(bits, "syscall.h"))
 		if err != nil {
 			return err
 		}
@@ -121,55 +110,37 @@ var libMusl = Library{
 		return cflags
 	},
 	sourceDir: func() string { return filepath.Join(goenv.Get("TINYGOROOT"), "lib/musl/src") },
-	librarySources: func(target string, _ bool) ([]string, error) {
+	librarySources: func(target string) ([]string, error) {
 		arch := compileopts.MuslArchitecture(target)
 		globs := []string{
-			"conf/*.c",
-			"ctype/*.c",
 			"env/*.c",
 			"errno/*.c",
 			"exit/*.c",
-			"fcntl/*.c",
 			"internal/defsysinfo.c",
-			"internal/intscan.c",
 			"internal/libc.c",
-			"internal/shgetc.c",
 			"internal/syscall_ret.c",
 			"internal/vdso.c",
 			"legacy/*.c",
 			"locale/*.c",
 			"linux/*.c",
-			"locale/*.c",
 			"malloc/*.c",
 			"malloc/mallocng/*.c",
 			"mman/*.c",
 			"math/*.c",
-			"misc/*.c",
 			"multibyte/*.c",
-			"sched/*.c",
-			"signal/" + arch + "/*.s",
 			"signal/*.c",
 			"stdio/*.c",
-			"stdlib/*.c",
 			"string/*.c",
 			"thread/" + arch + "/*.s",
 			"thread/*.c",
 			"time/*.c",
 			"unistd/*.c",
-			"process/*.c",
 		}
-
 		if arch == "arm" {
 			// These files need to be added to the start for some reason.
 			globs = append([]string{"thread/arm/*.c"}, globs...)
 		}

-		if arch != "aarch64" && arch != "mips" {
-			//aarch64 and mips have no architecture specific code, either they
-			// are not supported or don't need any?
-			globs = append([]string{"process/" + arch + "/*.s"}, globs...)
-		}
-
 		var sources []string
 		seenSources := map[string]struct{}{}
 		basepath := goenv.Get("TINYGOROOT") + "/lib/musl/src/"
@@ -34,7 +34,6 @@ var libPicolibc = Library{
 			"-D__OBSOLETE_MATH_FLOAT=1", // use old math code that doesn't expect a FPU
 			"-D__OBSOLETE_MATH_DOUBLE=0",
 			"-D_WANT_IO_C99_FORMATS",
-			"-D__PICOLIBC_ERRNO_FUNCTION=__errno_location",
 			"-nostdlibinc",
 			"-isystem", newlibDir + "/libc/include",
 			"-I" + newlibDir + "/libc/tinystdio",
@@ -43,7 +42,7 @@ var libPicolibc = Library{
 		}
 	},
 	sourceDir: func() string { return filepath.Join(goenv.Get("TINYGOROOT"), "lib/picolibc/newlib") },
-	librarySources: func(target string, _ bool) ([]string, error) {
+	librarySources: func(target string) ([]string, error) {
 		sources := append([]string(nil), picolibcSources...)
 		if !strings.HasPrefix(target, "avr") {
 			// Small chips without long jumps can't compile many files (printf,
@@ -1,56 +0,0 @@
-package builder
-
-import (
-	_ "embed"
-	"fmt"
-	"html/template"
-	"os"
-)
-
-//go:embed size-report.html
-var sizeReportBase string
-
-func writeSizeReport(sizes *programSize, filename, pkgName string) error {
-	tmpl, err := template.New("report").Parse(sizeReportBase)
-	if err != nil {
-		return err
-	}
-
-	f, err := os.Create(filename)
-	if err != nil {
-		return fmt.Errorf("could not open report file: %w", err)
-	}
-	defer f.Close()
-
-	// Prepare data for the report.
-	type sizeLine struct {
-		Name string
-		Size *packageSize
-	}
-	programData := []sizeLine{}
-	for _, name := range sizes.sortedPackageNames() {
-		pkgSize := sizes.Packages[name]
-		programData = append(programData, sizeLine{
-			Name: name,
-			Size: pkgSize,
-		})
-	}
-	sizeTotal := map[string]uint64{
-		"code":   sizes.Code,
-		"rodata": sizes.ROData,
-		"data":   sizes.Data,
-		"bss":    sizes.BSS,
-		"flash":  sizes.Flash(),
-	}
-
-	// Write the report.
-	err = tmpl.Execute(f, map[string]any{
-		"pkgName":   pkgName,
-		"sizes":     programData,
-		"sizeTotal": sizeTotal,
-	})
-	if err != nil {
-		return fmt.Errorf("could not create report file: %w", err)
-	}
-	return nil
-}
@@ -1,109 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <title>Size Report for {{.pkgName}}</title>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
-    <style>
-
-.table-vertical-border {
-  border-left: calc(var(--bs-border-width) * 2) solid currentcolor;
-}
-
-/* Hover on only the rows that are clickable. */
-.row-package:hover > * {
-  --bs-table-color-state: var(--bs-table-hover-color);
-  --bs-table-bg-state: var(--bs-table-hover-bg);
-}
-
-    </style>
-  </head>
-  <body>
-    <div class="container-xxl">
-      <h1>Size Report for {{.pkgName}}</h1>
-
-      <p>How much space is used by Go packages, C libraries, and other bits to set up the program environment.</p>
-
-      <ul>
-        <li><strong>Code</strong> is the actual program code (machine code instructions).</li>
-        <li><strong>Read-only data</strong> are read-only global variables. On most microcontrollers, these are stored in flash and do not take up any RAM.</li>
-        <li><strong>Data</strong> are writable global variables with a non-zero initializer. On microcontrollers, they are copied from flash to RAM on reset.</li>
-        <li><strong>BSS</strong> are writable global variables that are zero initialized. They do not take up any space in the binary, but do take up RAM. On microcontrollers, this area is zeroed on reset.</li>
-      </ul>
-
-      <p>The binary size consists of code, read-only data, and data. On microcontrollers, this is exactly the size of the firmware image. On other systems, there is some extra overhead: binary metadata (headers of the ELF/MachO/COFF file), debug information, exception tables, symbol names, etc. Using <code>-no-debug</code> strips most of those.</p>
-
-      <h2>Program breakdown</h2>
-
-      <p>You can click on the rows below to see which files contribute to the binary size.</p>
-
-      <div class="table-responsive">
-        <table class="table w-auto">
-          <thead>
-            <tr>
-              <th>Package</th>
-              <th class="table-vertical-border">Code</th>
-              <th>Read-only data</th>
-              <th>Data</th>
-              <th title="zero-initialized data">BSS</th>
-              <th class="table-vertical-border" style="min-width: 16em">Binary size</th>
-            </tr>
-          </thead>
-          <tbody class="table-group-divider">
-            {{range $i, $pkg := .sizes}}
-            <tr class="row-package" data-collapse=".collapse-row-{{$i}}">
-              <td>{{.Name}}</td>
-              <td class="table-vertical-border">{{.Size.Code}}</td>
-              <td>{{.Size.ROData}}</td>
-              <td>{{.Size.Data}}</td>
-              <td>{{.Size.BSS}}</td>
-              <td class="table-vertical-border" style="background: linear-gradient(to right, var(--bs-info-bg-subtle) {{.Size.FlashPercent}}%, var(--bs-table-bg) {{.Size.FlashPercent}}%)">
-                {{.Size.Flash}}
-              </td>
-            </tr>
-            {{range $filename, $sizes := .Size.Sub}}
-            <tr class="table-secondary collapse collapse-row-{{$i}}">
-              <td class="ps-4">
-                {{if eq $filename ""}}
-                  (unknown file)
-                {{else}}
-                  {{$filename}}
-                {{end}}
-              </td>
-              <td class="table-vertical-border">{{$sizes.Code}}</td>
-              <td>{{$sizes.ROData}}</td>
-              <td>{{$sizes.Data}}</td>
-              <td>{{$sizes.BSS}}</td>
-              <td class="table-vertical-border" style="background: linear-gradient(to right, var(--bs-info-bg-subtle) {{$sizes.FlashPercent}}%, var(--bs-table-bg) {{$sizes.FlashPercent}}%)">
-                {{$sizes.Flash}}
-              </td>
-            </tr>
-            {{end}}
-            {{end}}
-          </tbody>
-          <tfoot class="table-group-divider">
-            <tr>
-              <th>Total</th>
-              <td class="table-vertical-border">{{.sizeTotal.code}}</td>
-              <td>{{.sizeTotal.rodata}}</td>
-              <td>{{.sizeTotal.data}}</td>
-              <td>{{.sizeTotal.bss}}</td>
-              <td class="table-vertical-border">{{.sizeTotal.flash}}</td>
-            </tr>
-          </tfoot>
-        </table>
-      </div>
-    </div>
-    <script>
-// Make table rows toggleable to show filenames.
-for (let clickable of document.querySelectorAll('.row-package')) {
-  clickable.addEventListener('click', e => {
-    for (let row of document.querySelectorAll(clickable.dataset.collapse)) {
-      row.classList.toggle('show');
-    }
-  });
-}
-    </script>
-  </body>
-</html>
@@ -12,7 +12,6 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
-	"runtime"
 	"sort"
 	"strings"

@@ -25,7 +24,7 @@ const sizesDebug = false

 // programSize contains size statistics per package of a compiled program.
 type programSize struct {
-	Packages map[string]*packageSize
+	Packages map[string]packageSize
 	Code     uint64
 	ROData   uint64
 	Data     uint64
@@ -53,29 +52,13 @@ func (ps *programSize) RAM() uint64 {
 	return ps.Data + ps.BSS
 }

-// Return the package size information for a given package path, creating it if
-// it doesn't exist yet.
-func (ps *programSize) getPackage(path string) *packageSize {
-	if field, ok := ps.Packages[path]; ok {
-		return field
-	}
-	field := &packageSize{
-		Program: ps,
-		Sub:     map[string]*packageSize{},
-	}
-	ps.Packages[path] = field
-	return field
-}
-
 // packageSize contains the size of a package, calculated from the linked object
 // file.
 type packageSize struct {
-	Program *programSize
-	Code    uint64
-	ROData  uint64
-	Data    uint64
-	BSS     uint64
-	Sub     map[string]*packageSize
+	Code   uint64
+	ROData uint64
+	Data   uint64
+	BSS    uint64
 }

 // Flash usage in regular microcontrollers.
@@ -88,31 +71,6 @@ func (ps *packageSize) RAM() uint64 {
 	return ps.Data + ps.BSS
 }

-// Flash usage in regular microcontrollers, as a percentage of the total flash
-// usage of the program.
-func (ps *packageSize) FlashPercent() float64 {
-	return float64(ps.Flash()) / float64(ps.Program.Flash()) * 100
-}
-
-// Add a single size data point to this package.
-// This must only be called while calculating package size, not afterwards.
-func (ps *packageSize) addSize(getField func(*packageSize, bool) *uint64, filename string, size uint64, isVariable bool) {
-	if size == 0 {
-		return
-	}
-
-	// Add size for the package.
-	*getField(ps, isVariable) += size
-
-	// Add size for file inside package.
-	sub, ok := ps.Sub[filename]
-	if !ok {
-		sub = &packageSize{Program: ps.Program}
-		ps.Sub[filename] = sub
-	}
-	*getField(sub, isVariable) += size
-}
-
 // A mapping of a single chunk of code or data to a file path.
 type addressLine struct {
 	Address    uint64
@@ -236,22 +194,11 @@ func readProgramSizeFromDWARF(data *dwarf.Data, codeOffset, codeAlignment uint64
 				if !prevLineEntry.EndSequence {
 					// The chunk describes the code from prevLineEntry to
 					// lineEntry.
-					path := prevLineEntry.File.Name
-					if runtime.GOOS == "windows" {
-						// Work around a Clang bug on Windows:
-						// https://github.com/llvm/llvm-project/issues/117317
-						path = strings.ReplaceAll(path, "\\\\", "\\")
-
-						// wasi-libc likes to use forward slashes, but we
-						// canonicalize everything to use backwards slashes as
-						// is common on Windows.
-						path = strings.ReplaceAll(path, "/", "\\")
-					}
 					line := addressLine{
 						Address: prevLineEntry.Address + codeOffset,
 						Length:  lineEntry.Address - prevLineEntry.Address,
 						Align:   codeAlignment,
-						File:    path,
+						File:    prevLineEntry.File.Name,
 					}
 					if line.Length != 0 {
 						addresses = append(addresses, line)
@@ -490,7 +437,7 @@ func loadProgramSize(path string, packagePathMap map[string]string) (*programSiz
 				continue
 			}
 			if section.Type == elf.SHT_NOBITS {
-				if strings.HasPrefix(section.Name, ".stack") {
+				if section.Name == ".stack" {
 					// TinyGo emits stack sections on microcontroller using the
 					// ".stack" name.
 					// This is a bit ugly, but I don't think there is a way to
@@ -826,40 +773,49 @@ func loadProgramSize(path string, packagePathMap map[string]string) (*programSiz

 	// Now finally determine the binary/RAM size usage per package by going
 	// through each allocated section.
-	sizes := make(map[string]*packageSize)
-	program := &programSize{
-		Packages: sizes,
-	}
+	sizes := make(map[string]packageSize)
 	for _, section := range sections {
 		switch section.Type {
 		case memoryCode:
-			readSection(section, addresses, program, func(ps *packageSize, isVariable bool) *uint64 {
+			readSection(section, addresses, func(path string, size uint64, isVariable bool) {
+				field := sizes[path]
 				if isVariable {
-					return &ps.ROData
+					field.ROData += size
+				} else {
+					field.Code += size
 				}
-				return &ps.Code
+				sizes[path] = field
 			}, packagePathMap)
 		case memoryROData:
-			readSection(section, addresses, program, func(ps *packageSize, isVariable bool) *uint64 {
-				return &ps.ROData
+			readSection(section, addresses, func(path string, size uint64, isVariable bool) {
+				field := sizes[path]
+				field.ROData += size
+				sizes[path] = field
 			}, packagePathMap)
 		case memoryData:
-			readSection(section, addresses, program, func(ps *packageSize, isVariable bool) *uint64 {
-				return &ps.Data
+			readSection(section, addresses, func(path string, size uint64, isVariable bool) {
+				field := sizes[path]
+				field.Data += size
+				sizes[path] = field
 			}, packagePathMap)
 		case memoryBSS:
-			readSection(section, addresses, program, func(ps *packageSize, isVariable bool) *uint64 {
-				return &ps.BSS
+			readSection(section, addresses, func(path string, size uint64, isVariable bool) {
+				field := sizes[path]
+				field.BSS += size
+				sizes[path] = field
 			}, packagePathMap)
 		case memoryStack:
 			// We store the C stack as a pseudo-package.
-			program.getPackage("C stack").addSize(func(ps *packageSize, isVariable bool) *uint64 {
-				return &ps.BSS
-			}, "", section.Size, false)
+			sizes["C stack"] = packageSize{
+				BSS: section.Size,
+			}
 		}
 	}

 	// ...and summarize the results.
+	program := &programSize{
+		Packages: sizes,
+	}
 	for _, pkg := range sizes {
 		program.Code += pkg.Code
 		program.ROData += pkg.ROData
@@ -870,8 +826,8 @@ func loadProgramSize(path string, packagePathMap map[string]string) (*programSiz
 }

 // readSection determines for each byte in this section to which package it
-// belongs.
-func readSection(section memorySection, addresses []addressLine, program *programSize, getField func(*packageSize, bool) *uint64, packagePathMap map[string]string) {
+// belongs. It reports this usage through the addSize callback.
+func readSection(section memorySection, addresses []addressLine, addSize func(string, uint64, bool), packagePathMap map[string]string) {
 	// The addr variable tracks at which address we are while going through this
 	// section. We start at the beginning.
 	addr := section.Address
@@ -893,9 +849,9 @@ func readSection(section memorySection, addresses []addressLine, program *progra
 			addrAligned := (addr + line.Align - 1) &^ (line.Align - 1)
 			if line.Align > 1 && addrAligned >= line.Address {
 				// It is, assume that's what causes the gap.
-				program.getPackage("(padding)").addSize(getField, "", line.Address-addr, true)
+				addSize("(padding)", line.Address-addr, true)
 			} else {
-				program.getPackage("(unknown)").addSize(getField, "", line.Address-addr, false)
+				addSize("(unknown)", line.Address-addr, false)
 				if sizesDebug {
 					fmt.Printf("%08x..%08x %5d:  unknown (gap), alignment=%d\n", addr, line.Address, line.Address-addr, line.Align)
 				}
@@ -917,8 +873,7 @@ func readSection(section memorySection, addresses []addressLine, program *progra
 			length = line.Length - (addr - line.Address)
 		}
 		// Finally, mark this chunk of memory as used by the given package.
-		packagePath, filename := findPackagePath(line.File, packagePathMap)
-		program.getPackage(packagePath).addSize(getField, filename, length, line.IsVariable)
+		addSize(findPackagePath(line.File, packagePathMap), length, line.IsVariable)
 		addr = line.Address + line.Length
 	}
 	if addr < sectionEnd {
@@ -927,9 +882,9 @@ func readSection(section memorySection, addresses []addressLine, program *progra
 		if section.Align > 1 && addrAligned >= sectionEnd {
 			// The gap is caused by the section alignment.
 			// For example, if a .rodata section ends with a non-aligned string.
-			program.getPackage("(padding)").addSize(getField, "", sectionEnd-addr, true)
+			addSize("(padding)", sectionEnd-addr, true)
 		} else {
-			program.getPackage("(unknown)").addSize(getField, "", sectionEnd-addr, false)
+			addSize("(unknown)", sectionEnd-addr, false)
 			if sizesDebug {
 				fmt.Printf("%08x..%08x %5d:  unknown (end), alignment=%d\n", addr, sectionEnd, sectionEnd-addr, section.Align)
 			}
@@ -939,29 +894,17 @@ func readSection(section memorySection, addresses []addressLine, program *progra

 // findPackagePath returns the Go package (or a pseudo package) for the given
 // path. It uses some heuristics, for example for some C libraries.
-func findPackagePath(path string, packagePathMap map[string]string) (packagePath, filename string) {
+func findPackagePath(path string, packagePathMap map[string]string) string {
 	// Check whether this path is part of one of the compiled packages.
 	packagePath, ok := packagePathMap[filepath.Dir(path)]
-	if ok {
-		// Directory is known as a Go package.
-		// Add the file itself as well.
-		filename = filepath.Base(path)
-	} else {
+	if !ok {
 		if strings.HasPrefix(path, filepath.Join(goenv.Get("TINYGOROOT"), "lib")) {
 			// Emit C libraries (in the lib subdirectory of TinyGo) as a single
-			// package, with a "C" prefix. For example: "C picolibc" for the
-			// baremetal libc.
-			libPath := strings.TrimPrefix(path, filepath.Join(goenv.Get("TINYGOROOT"), "lib")+string(os.PathSeparator))
-			parts := strings.SplitN(libPath, string(os.PathSeparator), 2)
-			packagePath = "C " + parts[0]
-			if len(parts) > 1 {
-				filename = parts[1]
-			} else {
-				filename = parts[0]
-			}
-		} else if prefix := filepath.Join(goenv.Get("TINYGOROOT"), "llvm-project", "compiler-rt"); strings.HasPrefix(path, prefix) {
+			// package, with a "C" prefix. For example: "C compiler-rt" for the
+			// compiler runtime library from LLVM.
+			packagePath = "C " + strings.Split(strings.TrimPrefix(path, filepath.Join(goenv.Get("TINYGOROOT"), "lib")), string(os.PathSeparator))[1]
+		} else if strings.HasPrefix(path, filepath.Join(goenv.Get("TINYGOROOT"), "llvm-project")) {
 			packagePath = "C compiler-rt"
-			filename = strings.TrimPrefix(path, prefix+string(os.PathSeparator))
 		} else if packageSymbolRegexp.MatchString(path) {
 			// Parse symbol names like main$alloc or runtime$string.
 			packagePath = path[:strings.LastIndex(path, "$")]
@@ -984,11 +927,9 @@ func findPackagePath(path string, packagePathMap map[string]string) (packagePath
 			// fixed in the compiler.
 			packagePath = "-"
 		} else {
-			// This is some other path. Not sure what it is, so just emit its
-			// directory as a fallback.
-			packagePath = filepath.Dir(path)
-			filename = filepath.Base(path)
+			// This is some other path. Not sure what it is, so just emit its directory.
+			packagePath = filepath.Dir(path) // fallback
 		}
 	}
-	return
+	return packagePath
 }
@@ -1,7 +1,6 @@
 package builder

 import (
-	"regexp"
 	"runtime"
 	"testing"
 	"time"
@@ -42,9 +41,9 @@ func TestBinarySize(t *testing.T) {
 	// This is a small number of very diverse targets that we want to test.
 	tests := []sizeTest{
 		// microcontrollers
-		{"hifive1b", "examples/echo", 3680, 280, 0, 2252},
-		{"microbit", "examples/serial", 2694, 342, 8, 2248},
-		{"wioterminal", "examples/pininterrupt", 7074, 1510, 120, 7248},
+		{"hifive1b", "examples/echo", 4484, 280, 0, 2252},
+		{"microbit", "examples/serial", 2732, 388, 8, 2256},
+		{"wioterminal", "examples/pininterrupt", 6016, 1484, 116, 6816},

 		// TODO: also check wasm. Right now this is difficult, because
 		// wasm binaries are run through wasm-opt and therefore the
@@ -56,7 +55,26 @@ func TestBinarySize(t *testing.T) {
 			t.Parallel()

 			// Build the binary.
-			result := buildBinary(t, tc.target, tc.path)
+			options := compileopts.Options{
+				Target:        tc.target,
+				Opt:           "z",
+				Semaphore:     sema,
+				InterpTimeout: 60 * time.Second,
+				Debug:         true,
+				VerifyIR:      true,
+			}
+			target, err := compileopts.LoadTarget(&options)
+			if err != nil {
+				t.Fatal("could not load target:", err)
+			}
+			config := &compileopts.Config{
+				Options: &options,
+				Target:  target,
+			}
+			result, err := Build(tc.path, "", t.TempDir(), config)
+			if err != nil {
+				t.Fatal("could not build:", err)
+			}

 			// Check whether the size of the binary matches the expected size.
 			sizes, err := loadProgramSize(result.Executable, nil)
@@ -72,69 +90,3 @@ func TestBinarySize(t *testing.T) {
 		})
 	}
 }
-
-// Check that the -size=full flag attributes binary size to the correct package
-// without filesystem paths and things like that.
-func TestSizeFull(t *testing.T) {
-	tests := []string{
-		"microbit",
-		"wasip1",
-	}
-
-	libMatch := regexp.MustCompile(`^C [a-z -]+$`) // example: "C interrupt vector"
-	pkgMatch := regexp.MustCompile(`^[a-z/]+$`)    // example: "internal/task"
-
-	for _, target := range tests {
-		target := target
-		t.Run(target, func(t *testing.T) {
-			t.Parallel()
-
-			// Build the binary.
-			result := buildBinary(t, target, "examples/serial")
-
-			// Check whether the binary doesn't contain any unexpected package
-			// names.
-			sizes, err := loadProgramSize(result.Executable, result.PackagePathMap)
-			if err != nil {
-				t.Fatal("could not read program size:", err)
-			}
-			for _, pkg := range sizes.sortedPackageNames() {
-				if pkg == "(padding)" || pkg == "(unknown)" {
-					// TODO: correctly attribute all unknown binary size.
-					continue
-				}
-				if libMatch.MatchString(pkg) {
-					continue
-				}
-				if pkgMatch.MatchString(pkg) {
-					continue
-				}
-				t.Error("unexpected package name in size output:", pkg)
-			}
-		})
-	}
-}
-
-func buildBinary(t *testing.T, targetString, pkgName string) BuildResult {
-	options := compileopts.Options{
-		Target:        targetString,
-		Opt:           "z",
-		Semaphore:     sema,
-		InterpTimeout: 60 * time.Second,
-		Debug:         true,
-		VerifyIR:      true,
-	}
-	target, err := compileopts.LoadTarget(&options)
-	if err != nil {
-		t.Fatal("could not load target:", err)
-	}
-	config := &compileopts.Config{
-		Options: &options,
-		Target:  target,
-	}
-	result, err := Build(pkgName, "", t.TempDir(), config)
-	if err != nil {
-		t.Fatal("could not build:", err)
-	}
-	return result
-}
@@ -28,7 +28,7 @@ func RunTool(tool string, args ...string) error {
 	var cflag *C.char
 	buf := C.calloc(C.size_t(len(args)), C.size_t(unsafe.Sizeof(cflag)))
 	defer C.free(buf)
-	cflags := unsafe.Slice((**C.char)(buf), len(args))
+	cflags := (*[1 << 10]*C.char)(unsafe.Pointer(buf))[:len(args):len(args)]
 	for i, flag := range args {
 		cflag := C.CString(flag)
 		cflags[i] = cflag
@@ -14,45 +14,16 @@ import (

 // runCCompiler invokes a C compiler with the given arguments.
 func runCCompiler(flags ...string) error {
-	// Find the right command to run Clang.
-	var cmd *exec.Cmd
 	if hasBuiltinTools {
 		// Compile this with the internal Clang compiler.
-		cmd = exec.Command(os.Args[0], append([]string{"clang"}, flags...)...)
-	} else {
-		// Compile this with an external invocation of the Clang compiler.
-		name, err := LookupCommand("clang")
-		if err != nil {
-			return err
-		}
-		cmd = exec.Command(name, flags...)
+		cmd := exec.Command(os.Args[0], append([]string{"clang"}, flags...)...)
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
+		return cmd.Run()
 	}

-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-
-	// Make sure the command doesn't use any environmental variables.
-	// Most importantly, it should not use C_INCLUDE_PATH and the like.
-	cmd.Env = []string{}
-
-	// Let some environment variables through. One important one is the
-	// temporary directory, especially on Windows it looks like Clang breaks if
-	// the temporary directory has not been set.
-	// See: https://github.com/tinygo-org/tinygo/issues/4557
-	// Also see: https://github.com/llvm/llvm-project/blob/release/18.x/llvm/lib/Support/Unix/Path.inc#L1435
-	for _, env := range os.Environ() {
-		// We could parse the key and look it up in a map, but since there are
-		// only a few keys iterating through them is easier and maybe even
-		// faster.
-		for _, prefix := range []string{"TMPDIR=", "TMP=", "TEMP=", "TEMPDIR="} {
-			if strings.HasPrefix(env, prefix) {
-				cmd.Env = append(cmd.Env, env)
-				break
-			}
-		}
-	}
-
-	return cmd.Run()
+	// Compile this with an external invocation of the Clang compiler.
+	return execCommand("clang", flags...)
 }

 // link invokes a linker with the given name and flags.
@@ -114,33 +85,29 @@ func parseLLDErrors(text string) error {

 		// Check for undefined symbols.
 		// This can happen in some cases like with CGo and //go:linkname tricker.
-		if matches := regexp.MustCompile(`^ld.lld(-[0-9]+)?: error: undefined symbol: (.*)\n`).FindStringSubmatch(message); matches != nil {
-			symbolName := matches[2]
+		if matches := regexp.MustCompile(`^ld.lld: error: undefined symbol: (.*)\n`).FindStringSubmatch(message); matches != nil {
+			symbolName := matches[1]
 			for _, line := range strings.Split(message, "\n") {
 				matches := regexp.MustCompile(`referenced by .* \(((.*):([0-9]+))\)`).FindStringSubmatch(line)
 				if matches != nil {
 					parsedError = true
 					line, _ := strconv.Atoi(matches[3])
 					// TODO: detect common mistakes like -gc=none?
-					msg := "linker could not find symbol " + symbolName
-					if symbolName == "runtime.alloc_noheap" {
-						msg = "object allocated on the heap in //go:noheap function"
-					}
 					linkErrors = append(linkErrors, scanner.Error{
 						Pos: token.Position{
 							Filename: matches[2],
 							Line:     line,
 						},
-						Msg: msg,
+						Msg: "linker could not find symbol " + symbolName,
 					})
 				}
 			}
 		}

 		// Check for flash/RAM overflow.
-		if matches := regexp.MustCompile(`^ld.lld(-[0-9]+)?: error: section '(.*?)' will not fit in region '(.*?)': overflowed by ([0-9]+) bytes$`).FindStringSubmatch(message); matches != nil {
-			region := matches[3]
-			n, err := strconv.ParseUint(matches[4], 10, 64)
+		if matches := regexp.MustCompile(`^ld.lld: error: section '(.*?)' will not fit in region '(.*?)': overflowed by ([0-9]+) bytes$`).FindStringSubmatch(message); matches != nil {
+			region := matches[2]
+			n, err := strconv.ParseUint(matches[3], 10, 64)
 			if err != nil {
 				// Should not happen at all (unless it overflows an uint64 for some reason).
 				continue
@@ -1,284 +0,0 @@
-package builder
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/tinygo-org/tinygo/goenv"
-)
-
-var libWasiLibc = Library{
-	name: "wasi-libc",
-	makeHeaders: func(target, includeDir string) error {
-		bits := filepath.Join(includeDir, "bits")
-		err := os.Mkdir(bits, 0777)
-		if err != nil {
-			return err
-		}
-
-		muslDir := filepath.Join(goenv.Get("TINYGOROOT"), "lib", "wasi-libc/libc-top-half/musl")
-		err = buildMuslAllTypes("wasm32", muslDir, bits)
-		if err != nil {
-			return err
-		}
-
-		// See MUSL_OMIT_HEADERS in the Makefile.
-		omitHeaders := map[string]struct{}{
-			"syslog.h":   {},
-			"wait.h":     {},
-			"ucontext.h": {},
-			"paths.h":    {},
-			"utmp.h":     {},
-			"utmpx.h":    {},
-			"lastlog.h":  {},
-			"elf.h":      {},
-			"link.h":     {},
-			"pwd.h":      {},
-			"shadow.h":   {},
-			"grp.h":      {},
-			"mntent.h":   {},
-			"netdb.h":    {},
-			"resolv.h":   {},
-			"pty.h":      {},
-			"dlfcn.h":    {},
-			"setjmp.h":   {},
-			"ulimit.h":   {},
-			"wordexp.h":  {},
-			"spawn.h":    {},
-			"termios.h":  {},
-			"libintl.h":  {},
-			"aio.h":      {},
-
-			"stdarg.h": {},
-			"stddef.h": {},
-
-			"pthread.h": {},
-		}
-
-		for _, glob := range [][2]string{
-			{"libc-bottom-half/headers/public/*.h", ""},
-			{"libc-bottom-half/headers/public/wasi/*.h", "wasi"},
-			{"libc-top-half/musl/arch/wasm32/bits/*.h", "bits"},
-			{"libc-top-half/musl/include/*.h", ""},
-			{"libc-top-half/musl/include/netinet/*.h", "netinet"},
-			{"libc-top-half/musl/include/sys/*.h", "sys"},
-		} {
-			matches, _ := filepath.Glob(filepath.Join(goenv.Get("TINYGOROOT"), "lib/wasi-libc", glob[0]))
-			outDir := filepath.Join(includeDir, glob[1])
-			os.MkdirAll(outDir, 0o777)
-			for _, match := range matches {
-				name := filepath.Base(match)
-				if _, ok := omitHeaders[name]; ok {
-					continue
-				}
-				data, err := os.ReadFile(match)
-				if err != nil {
-					return err
-				}
-				err = os.WriteFile(filepath.Join(outDir, name), data, 0o666)
-				if err != nil {
-					return err
-				}
-			}
-		}
-
-		return nil
-	},
-	cflags: func(target, headerPath string) []string {
-		libcDir := filepath.Join(goenv.Get("TINYGOROOT"), "lib/wasi-libc")
-		return []string{
-			"-Werror",
-			"-Wall",
-			"-std=gnu11",
-			"-nostdlibinc",
-			"-mnontrapping-fptoint", "-msign-ext", "-mbulk-memory",
-			"-Wno-null-pointer-arithmetic", "-Wno-unused-parameter", "-Wno-sign-compare", "-Wno-unused-variable", "-Wno-unused-function", "-Wno-ignored-attributes", "-Wno-missing-braces", "-Wno-ignored-pragmas", "-Wno-unused-but-set-variable", "-Wno-unknown-warning-option",
-			"-Wno-parentheses", "-Wno-shift-op-parentheses", "-Wno-bitwise-op-parentheses", "-Wno-logical-op-parentheses", "-Wno-string-plus-int", "-Wno-dangling-else", "-Wno-unknown-pragmas",
-			"-DNDEBUG",
-			"-D__wasilibc_printscan_no_long_double",
-			"-D__wasilibc_printscan_full_support_option=\"long double support is disabled\"",
-			"-DBULK_MEMORY_THRESHOLD=32", // default threshold in wasi-libc
-			"-isystem", headerPath,
-			"-I" + libcDir + "/libc-top-half/musl/src/include",
-			"-I" + libcDir + "/libc-top-half/musl/src/internal",
-			"-I" + libcDir + "/libc-top-half/musl/arch/wasm32",
-			"-I" + libcDir + "/libc-top-half/musl/arch/generic",
-			"-I" + libcDir + "/libc-top-half/headers/private",
-		}
-	},
-	cflagsForFile: func(path string) []string {
-		if strings.HasPrefix(path, "libc-bottom-half"+string(os.PathSeparator)) {
-			libcDir := filepath.Join(goenv.Get("TINYGOROOT"), "lib/wasi-libc")
-			return []string{
-				"-I" + libcDir + "/libc-bottom-half/headers/private",
-				"-I" + libcDir + "/libc-bottom-half/cloudlibc/src/include",
-				"-I" + libcDir + "/libc-bottom-half/cloudlibc/src",
-			}
-		}
-		return nil
-	},
-	sourceDir: func() string { return filepath.Join(goenv.Get("TINYGOROOT"), "lib/wasi-libc") },
-	librarySources: func(target string, libcNeedsMalloc bool) ([]string, error) {
-		type filePattern struct {
-			glob    string
-			exclude []string
-		}
-
-		// See: LIBC_TOP_HALF_MUSL_SOURCES in the Makefile
-		globs := []filePattern{
-			// Top half: mostly musl sources.
-			{glob: "libc-top-half/sources/*.c"},
-			{glob: "libc-top-half/musl/src/conf/*.c"},
-			{glob: "libc-top-half/musl/src/internal/*.c", exclude: []string{
-				"procfdname.c", "syscall.c", "syscall_ret.c", "vdso.c", "version.c",
-			}},
-			{glob: "libc-top-half/musl/src/locale/*.c", exclude: []string{
-				"dcngettext.c", "textdomain.c", "bind_textdomain_codeset.c"}},
-			{glob: "libc-top-half/musl/src/math/*.c", exclude: []string{
-				"__signbit.c", "__signbitf.c", "__signbitl.c",
-				"__fpclassify.c", "__fpclassifyf.c", "__fpclassifyl.c",
-				"ceilf.c", "ceil.c",
-				"floorf.c", "floor.c",
-				"truncf.c", "trunc.c",
-				"rintf.c", "rint.c",
-				"nearbyintf.c", "nearbyint.c",
-				"sqrtf.c", "sqrt.c",
-				"fabsf.c", "fabs.c",
-				"copysignf.c", "copysign.c",
-				"fminf.c", "fmaxf.c",
-				"fmin.c", "fmax.c,",
-			}},
-			{glob: "libc-top-half/musl/src/multibyte/*.c"},
-			{glob: "libc-top-half/musl/src/stdio/*.c", exclude: []string{
-				"vfwscanf.c", "vfwprintf.c", // long double is unsupported
-				"__lockfile.c", "flockfile.c", "funlockfile.c", "ftrylockfile.c",
-				"rename.c",
-				"tmpnam.c", "tmpfile.c", "tempnam.c",
-				"popen.c", "pclose.c",
-				"remove.c",
-				"gets.c"}},
-			{glob: "libc-top-half/musl/src/stdlib/*.c"},
-			{glob: "libc-top-half/musl/src/string/*.c", exclude: []string{
-				"strsignal.c"}},
-
-			// Bottom half: connect top half to WASI equivalents.
-			{glob: "libc-bottom-half/cloudlibc/src/libc/*/*.c"},
-			{glob: "libc-bottom-half/cloudlibc/src/libc/sys/*/*.c"},
-			{glob: "libc-bottom-half/sources/*.c"},
-		}
-
-		// We're using the Boehm GC, so we need a heap implementation in the libc.
-		if libcNeedsMalloc {
-			globs = append(globs, filePattern{glob: "dlmalloc/src/dlmalloc.c"})
-		}
-
-		// See: LIBC_TOP_HALF_MUSL_SOURCES in the Makefile
-		sources := []string{
-			"libc-top-half/musl/src/misc/a64l.c",
-			"libc-top-half/musl/src/misc/basename.c",
-			"libc-top-half/musl/src/misc/dirname.c",
-			"libc-top-half/musl/src/misc/ffs.c",
-			"libc-top-half/musl/src/misc/ffsl.c",
-			"libc-top-half/musl/src/misc/ffsll.c",
-			"libc-top-half/musl/src/misc/fmtmsg.c",
-			"libc-top-half/musl/src/misc/getdomainname.c",
-			"libc-top-half/musl/src/misc/gethostid.c",
-			"libc-top-half/musl/src/misc/getopt.c",
-			"libc-top-half/musl/src/misc/getopt_long.c",
-			"libc-top-half/musl/src/misc/getsubopt.c",
-			"libc-top-half/musl/src/misc/uname.c",
-			"libc-top-half/musl/src/misc/nftw.c",
-			"libc-top-half/musl/src/errno/strerror.c",
-			"libc-top-half/musl/src/network/htonl.c",
-			"libc-top-half/musl/src/network/htons.c",
-			"libc-top-half/musl/src/network/ntohl.c",
-			"libc-top-half/musl/src/network/ntohs.c",
-			"libc-top-half/musl/src/network/inet_ntop.c",
-			"libc-top-half/musl/src/network/inet_pton.c",
-			"libc-top-half/musl/src/network/inet_aton.c",
-			"libc-top-half/musl/src/network/in6addr_any.c",
-			"libc-top-half/musl/src/network/in6addr_loopback.c",
-			"libc-top-half/musl/src/fenv/fenv.c",
-			"libc-top-half/musl/src/fenv/fesetround.c",
-			"libc-top-half/musl/src/fenv/feupdateenv.c",
-			"libc-top-half/musl/src/fenv/fesetexceptflag.c",
-			"libc-top-half/musl/src/fenv/fegetexceptflag.c",
-			"libc-top-half/musl/src/fenv/feholdexcept.c",
-			"libc-top-half/musl/src/exit/exit.c",
-			"libc-top-half/musl/src/exit/atexit.c",
-			"libc-top-half/musl/src/exit/assert.c",
-			"libc-top-half/musl/src/exit/quick_exit.c",
-			"libc-top-half/musl/src/exit/at_quick_exit.c",
-			"libc-top-half/musl/src/time/strftime.c",
-			"libc-top-half/musl/src/time/asctime.c",
-			"libc-top-half/musl/src/time/asctime_r.c",
-			"libc-top-half/musl/src/time/ctime.c",
-			"libc-top-half/musl/src/time/ctime_r.c",
-			"libc-top-half/musl/src/time/wcsftime.c",
-			"libc-top-half/musl/src/time/strptime.c",
-			"libc-top-half/musl/src/time/difftime.c",
-			"libc-top-half/musl/src/time/timegm.c",
-			"libc-top-half/musl/src/time/ftime.c",
-			"libc-top-half/musl/src/time/gmtime.c",
-			"libc-top-half/musl/src/time/gmtime_r.c",
-			"libc-top-half/musl/src/time/timespec_get.c",
-			"libc-top-half/musl/src/time/getdate.c",
-			"libc-top-half/musl/src/time/localtime.c",
-			"libc-top-half/musl/src/time/localtime_r.c",
-			"libc-top-half/musl/src/time/mktime.c",
-			"libc-top-half/musl/src/time/__tm_to_secs.c",
-			"libc-top-half/musl/src/time/__month_to_secs.c",
-			"libc-top-half/musl/src/time/__secs_to_tm.c",
-			"libc-top-half/musl/src/time/__year_to_secs.c",
-			"libc-top-half/musl/src/time/__tz.c",
-			"libc-top-half/musl/src/fcntl/creat.c",
-			"libc-top-half/musl/src/dirent/alphasort.c",
-			"libc-top-half/musl/src/dirent/versionsort.c",
-			"libc-top-half/musl/src/env/__stack_chk_fail.c",
-			"libc-top-half/musl/src/env/clearenv.c",
-			"libc-top-half/musl/src/env/getenv.c",
-			"libc-top-half/musl/src/env/putenv.c",
-			"libc-top-half/musl/src/env/setenv.c",
-			"libc-top-half/musl/src/env/unsetenv.c",
-			"libc-top-half/musl/src/unistd/posix_close.c",
-			"libc-top-half/musl/src/stat/futimesat.c",
-			"libc-top-half/musl/src/legacy/getpagesize.c",
-			"libc-top-half/musl/src/thread/thrd_sleep.c",
-		}
-
-		basepath := goenv.Get("TINYGOROOT") + "/lib/wasi-libc/"
-		for _, pattern := range globs {
-			matches, err := filepath.Glob(basepath + pattern.glob)
-			if err != nil {
-				// From the documentation:
-				// > Glob ignores file system errors such as I/O errors reading
-				// > directories. The only possible returned error is
-				// > ErrBadPattern, when pattern is malformed.
-				// So the only possible error is when the (statically defined)
-				// pattern is wrong. In other words, a programming bug.
-				return nil, fmt.Errorf("wasi-libc: could not glob source dirs: %w", err)
-			}
-			if len(matches) == 0 {
-				return nil, fmt.Errorf("wasi-libc: did not find any files for pattern %#v", pattern)
-			}
-			excludeSet := map[string]struct{}{}
-			for _, exclude := range pattern.exclude {
-				excludeSet[exclude] = struct{}{}
-			}
-			for _, match := range matches {
-				if _, ok := excludeSet[filepath.Base(match)]; ok {
-					continue
-				}
-				relpath, err := filepath.Rel(basepath, match)
-				if err != nil {
-					// Not sure if this is even possible.
-					return nil, err
-				}
-				sources = append(sources, relpath)
-			}
-		}
-		return sources, nil
-	},
-}
@@ -29,8 +29,6 @@ var libWasmBuiltins = Library{
 			"-Wall",
 			"-std=gnu11",
 			"-nostdlibinc",
-			"-mnontrapping-fptoint", // match wasm-unknown (default on in LLVM 20)
-			"-mno-bulk-memory",      // same here
 			"-isystem", libcDir + "/libc-top-half/musl/arch/wasm32",
 			"-isystem", libcDir + "/libc-top-half/musl/arch/generic",
 			"-isystem", libcDir + "/libc-top-half/musl/src/internal",
@@ -41,7 +39,7 @@ var libWasmBuiltins = Library{
 		}
 	},
 	sourceDir: func() string { return filepath.Join(goenv.Get("TINYGOROOT"), "lib/wasi-libc") },
-	librarySources: func(target string, _ bool) ([]string, error) {
+	librarySources: func(target string) ([]string, error) {
 		return []string{
 			// memory builtins needed for llvm.memcpy.*, llvm.memmove.*, and
 			// llvm.memset.* LLVM intrinsics.
@@ -18,7 +18,6 @@ import (
 	"go/scanner"
 	"go/token"
 	"path/filepath"
-	"sort"
 	"strconv"
 	"strings"

@@ -43,7 +42,6 @@ type cgoPackage struct {
 	fset            *token.FileSet
 	tokenFiles      map[string]*token.File
 	definedGlobally map[string]ast.Node
-	noescapingFuncs map[string]*noescapingFunc // #cgo noescape lines
 	anonDecls       map[interface{}]string
 	cflags          []string // CFlags from #cgo lines
 	ldflags         []string // LDFlags from #cgo lines
@@ -82,28 +80,21 @@ type bitfieldInfo struct {
 	endBit   int64 // may be 0 meaning "until the end of the field"
 }

-// Information about a #cgo noescape line in the source code.
-type noescapingFunc struct {
-	name string
-	pos  token.Pos
-	used bool // true if used somewhere in the source (for proper error reporting)
-}
-
 // cgoAliases list type aliases between Go and C, for types that are equivalent
 // in both languages. See addTypeAliases.
 var cgoAliases = map[string]string{
-	"_Cgo_int8_t":    "int8",
-	"_Cgo_int16_t":   "int16",
-	"_Cgo_int32_t":   "int32",
-	"_Cgo_int64_t":   "int64",
-	"_Cgo_uint8_t":   "uint8",
-	"_Cgo_uint16_t":  "uint16",
-	"_Cgo_uint32_t":  "uint32",
-	"_Cgo_uint64_t":  "uint64",
-	"_Cgo_uintptr_t": "uintptr",
-	"_Cgo_float":     "float32",
-	"_Cgo_double":    "float64",
-	"_Cgo__Bool":     "bool",
+	"C.int8_t":    "int8",
+	"C.int16_t":   "int16",
+	"C.int32_t":   "int32",
+	"C.int64_t":   "int64",
+	"C.uint8_t":   "uint8",
+	"C.uint16_t":  "uint16",
+	"C.uint32_t":  "uint32",
+	"C.uint64_t":  "uint64",
+	"C.uintptr_t": "uintptr",
+	"C.float":     "float32",
+	"C.double":    "float64",
+	"C._Bool":     "bool",
 }

 // builtinAliases are handled specially because they only exist on the Go side
@@ -145,105 +136,31 @@ typedef unsigned long long  _Cgo_ulonglong;
 // The string/bytes functions below implement C.CString etc. To make sure the
 // runtime doesn't need to know the C int type, lengths are converted to uintptr
 // first.
-const generatedGoFilePrefixBase = `
-import "syscall"
+// These functions will be modified to get a "C." prefix, so the source below
+// doesn't reflect the final AST.
+const generatedGoFilePrefix = `
 import "unsafe"

 var _ unsafe.Pointer

-//go:linkname _Cgo_CString runtime.cgo_CString
-func _Cgo_CString(string) *_Cgo_char
+//go:linkname C.CString runtime.cgo_CString
+func CString(string) *C.char

-//go:linkname _Cgo_GoString runtime.cgo_GoString
-func _Cgo_GoString(*_Cgo_char) string
+//go:linkname C.GoString runtime.cgo_GoString
+func GoString(*C.char) string

-//go:linkname _Cgo___GoStringN runtime.cgo_GoStringN
-func _Cgo___GoStringN(*_Cgo_char, uintptr) string
+//go:linkname C.__GoStringN runtime.cgo_GoStringN
+func __GoStringN(*C.char, uintptr) string

-func _Cgo_GoStringN(cstr *_Cgo_char, length _Cgo_int) string {
-	return _Cgo___GoStringN(cstr, uintptr(length))
+func GoStringN(cstr *C.char, length C.int) string {
+	return C.__GoStringN(cstr, uintptr(length))
 }

-//go:linkname _Cgo___GoBytes runtime.cgo_GoBytes
-func _Cgo___GoBytes(unsafe.Pointer, uintptr) []byte
+//go:linkname C.__GoBytes runtime.cgo_GoBytes
+func __GoBytes(unsafe.Pointer, uintptr) []byte

-func _Cgo_GoBytes(ptr unsafe.Pointer, length _Cgo_int) []byte {
-	return _Cgo___GoBytes(ptr, uintptr(length))
-}
-
-//go:linkname _Cgo___CBytes runtime.cgo_CBytes
-func _Cgo___CBytes([]byte) unsafe.Pointer
-
-func _Cgo_CBytes(b []byte) unsafe.Pointer {
-	return _Cgo___CBytes(b)
-}
-
-//go:linkname _Cgo___get_errno_num runtime.cgo_errno
-func _Cgo___get_errno_num() uintptr
-`
-
-const generatedGoFilePrefixOther = generatedGoFilePrefixBase + `
-func _Cgo___get_errno() error {
-	return syscall.Errno(_Cgo___get_errno_num())
-}
-`
-
-// Windows uses fake errno values in the syscall package.
-// See for example: https://github.com/golang/go/issues/23468
-// TinyGo uses mingw-w64 though, which does have defined errno values. Since the
-// syscall package is the standard library one we can't change it, but we can
-// map the errno values to match the values in the syscall package.
-// Source of the errno values: lib/mingw-w64/mingw-w64-headers/crt/errno.h
-const generatedGoFilePrefixWindows = generatedGoFilePrefixBase + `
-var _Cgo___errno_mapping = [...]syscall.Errno{
-	1:  syscall.EPERM,
-	2:  syscall.ENOENT,
-	3:  syscall.ESRCH,
-	4:  syscall.EINTR,
-	5:  syscall.EIO,
-	6:  syscall.ENXIO,
-	7:  syscall.E2BIG,
-	8:  syscall.ENOEXEC,
-	9:  syscall.EBADF,
-	10: syscall.ECHILD,
-	11: syscall.EAGAIN,
-	12: syscall.ENOMEM,
-	13: syscall.EACCES,
-	14: syscall.EFAULT,
-	16: syscall.EBUSY,
-	17: syscall.EEXIST,
-	18: syscall.EXDEV,
-	19: syscall.ENODEV,
-	20: syscall.ENOTDIR,
-	21: syscall.EISDIR,
-	22: syscall.EINVAL,
-	23: syscall.ENFILE,
-	24: syscall.EMFILE,
-	25: syscall.ENOTTY,
-	27: syscall.EFBIG,
-	28: syscall.ENOSPC,
-	29: syscall.ESPIPE,
-	30: syscall.EROFS,
-	31: syscall.EMLINK,
-	32: syscall.EPIPE,
-	33: syscall.EDOM,
-	34: syscall.ERANGE,
-	36: syscall.EDEADLK,
-	38: syscall.ENAMETOOLONG,
-	39: syscall.ENOLCK,
-	40: syscall.ENOSYS,
-	41: syscall.ENOTEMPTY,
-	42: syscall.EILSEQ,
-}
-
-func _Cgo___get_errno() error {
-	num := _Cgo___get_errno_num()
-	if num < uintptr(len(_Cgo___errno_mapping)) {
-		if mapped := _Cgo___errno_mapping[num]; mapped != 0 {
-			return mapped
-		}
-	}
-	return syscall.Errno(num)
+func GoBytes(ptr unsafe.Pointer, length C.int) []byte {
+	return C.__GoBytes(ptr, uintptr(length))
 }
 `

@@ -254,7 +171,7 @@ func _Cgo___get_errno() error {
 // functions), the CFLAGS and LDFLAGS found in #cgo lines, and a map of file
 // hashes of the accessed C header files. If there is one or more error, it
 // returns these in the []error slice but still modifies the AST.
-func Process(files []*ast.File, dir, importPath string, fset *token.FileSet, cflags []string, goos string) ([]*ast.File, []string, []string, []string, map[string][]byte, []error) {
+func Process(files []*ast.File, dir, importPath string, fset *token.FileSet, cflags []string) ([]*ast.File, []string, []string, []string, map[string][]byte, []error) {
 	p := &cgoPackage{
 		packageName:     files[0].Name.Name,
 		currentDir:      dir,
@@ -262,7 +179,6 @@ func Process(files []*ast.File, dir, importPath string, fset *token.FileSet, cfl
 		fset:            fset,
 		tokenFiles:      map[string]*token.File{},
 		definedGlobally: map[string]ast.Node{},
-		noescapingFuncs: map[string]*noescapingFunc{},
 		anonDecls:       map[interface{}]string{},
 		visitedFiles:    map[string][]byte{},
 	}
@@ -287,12 +203,7 @@ func Process(files []*ast.File, dir, importPath string, fset *token.FileSet, cfl
 	// Construct a new in-memory AST for CGo declarations of this package.
 	// The first part is written as Go code that is then parsed, but more code
 	// is added later to the AST to declare functions, globals, etc.
-	goCode := "package " + files[0].Name.Name + "\n\n"
-	if goos == "windows" {
-		goCode += generatedGoFilePrefixWindows
-	} else {
-		goCode += generatedGoFilePrefixOther
-	}
+	goCode := "package " + files[0].Name.Name + "\n\n" + generatedGoFilePrefix
 	p.generated, err = parser.ParseFile(fset, dir+"/!cgo.go", goCode, parser.ParseComments)
 	if err != nil {
 		// This is always a bug in the cgo package.
@@ -302,6 +213,23 @@ func Process(files []*ast.File, dir, importPath string, fset *token.FileSet, cfl
 	// If the Comments field is not set to nil, the go/format package will get
 	// confused about where comments should go.
 	p.generated.Comments = nil
+	// Adjust some of the functions in there.
+	for _, decl := range p.generated.Decls {
+		switch decl := decl.(type) {
+		case *ast.FuncDecl:
+			switch decl.Name.Name {
+			case "CString", "GoString", "GoStringN", "__GoStringN", "GoBytes", "__GoBytes":
+				// Adjust the name to have a "C." prefix so it is correctly
+				// resolved.
+				decl.Name.Name = "C." + decl.Name.Name
+			}
+		}
+	}
+	// Patch some types, for example *C.char in C.CString.
+	cf := p.newCGoFile(nil, -1) // dummy *cgoFile for the walker
+	astutil.Apply(p.generated, func(cursor *astutil.Cursor) bool {
+		return cf.walker(cursor, nil)
+	}, nil)

 	// Find `import "C"` C fragments in the file.
 	p.cgoHeaders = make([]string, len(files)) // combined CGo header fragment for each file
@@ -380,7 +308,7 @@ func Process(files []*ast.File, dir, importPath string, fset *token.FileSet, cfl
 			Tok:    token.TYPE,
 		}
 		for _, name := range builtinAliases {
-			typeSpec := p.getIntegerType("_Cgo_"+name, names["_Cgo_"+name])
+			typeSpec := p.getIntegerType("C."+name, names["_Cgo_"+name])
 			gen.Specs = append(gen.Specs, typeSpec)
 		}
 		p.generated.Decls = append(p.generated.Decls, gen)
@@ -409,22 +337,6 @@ func Process(files []*ast.File, dir, importPath string, fset *token.FileSet, cfl
 		})
 	}

-	// Show an error when a #cgo noescape line isn't used in practice.
-	// This matches upstream Go. I think the goal is to avoid issues with
-	// misspelled function names, which seems very useful.
-	var unusedNoescapeLines []*noescapingFunc
-	for _, value := range p.noescapingFuncs {
-		if !value.used {
-			unusedNoescapeLines = append(unusedNoescapeLines, value)
-		}
-	}
-	sort.SliceStable(unusedNoescapeLines, func(i, j int) bool {
-		return unusedNoescapeLines[i].pos < unusedNoescapeLines[j].pos
-	})
-	for _, value := range unusedNoescapeLines {
-		p.addError(value.pos, fmt.Sprintf("function %#v in #cgo noescape line is not used", value.name))
-	}
-
 	// Print the newly generated in-memory AST, for debugging.
 	//ast.Print(fset, p.generated)

@@ -490,33 +402,6 @@ func (p *cgoPackage) parseCGoPreprocessorLines(text string, pos token.Pos) strin
 		}
 		text = text[:lineStart] + string(spaces) + text[lineEnd:]

-		allFields := strings.Fields(line[4:])
-		switch allFields[0] {
-		case "noescape":
-			// The code indicates that pointer parameters will not be captured
-			// by the called C function.
-			if len(allFields) < 2 {
-				p.addErrorAfter(pos, text[:lineStart], "missing function name in #cgo noescape line")
-				continue
-			}
-			if len(allFields) > 2 {
-				p.addErrorAfter(pos, text[:lineStart], "multiple function names in #cgo noescape line")
-				continue
-			}
-			name := allFields[1]
-			p.noescapingFuncs[name] = &noescapingFunc{
-				name: name,
-				pos:  pos,
-				used: false,
-			}
-			continue
-		case "nocallback":
-			// We don't do anything special when calling a C function, so there
-			// appears to be no optimization that we can do here.
-			// Accept, but ignore the parameter for compatibility.
-			continue
-		}
-
 		// Get the text before the colon in the #cgo directive.
 		colon := strings.IndexByte(line, ':')
 		if colon < 0 {
@@ -1253,22 +1138,22 @@ func (p *cgoPackage) getUnnamedDeclName(prefix string, itf interface{}) string {
 func (f *cgoFile) getASTDeclName(name string, found clangCursor, iscall bool) string {
 	// Some types are defined in stdint.h and map directly to a particular Go
 	// type.
-	if alias := cgoAliases["_Cgo_"+name]; alias != "" {
+	if alias := cgoAliases["C."+name]; alias != "" {
 		return alias
 	}
-	node := f.getASTDeclNode(name, found)
+	node := f.getASTDeclNode(name, found, iscall)
 	if node, ok := node.(*ast.FuncDecl); ok {
 		if !iscall {
 			return node.Name.Name + "$funcaddr"
 		}
 		return node.Name.Name
 	}
-	return "_Cgo_" + name
+	return "C." + name
 }

 // getASTDeclNode will declare the given C AST node (if not already defined) and
 // returns it.
-func (f *cgoFile) getASTDeclNode(name string, found clangCursor) ast.Node {
+func (f *cgoFile) getASTDeclNode(name string, found clangCursor, iscall bool) ast.Node {
 	if node, ok := f.defined[name]; ok {
 		// Declaration was found in the current file, so return it immediately.
 		return node
@@ -1363,8 +1248,8 @@ extern __typeof(%s) %s __attribute__((alias(%#v)));
 	case *elaboratedTypeInfo:
 		// Add struct bitfields.
 		for _, bitfield := range elaboratedType.bitfields {
-			f.createBitfieldGetter(bitfield, "_Cgo_"+name)
-			f.createBitfieldSetter(bitfield, "_Cgo_"+name)
+			f.createBitfieldGetter(bitfield, "C."+name)
+			f.createBitfieldSetter(bitfield, "C."+name)
 		}
 		if elaboratedType.unionSize != 0 {
 			// Create union getters/setters.
@@ -1373,7 +1258,7 @@ extern __typeof(%s) %s __attribute__((alias(%#v)));
 					f.addError(elaboratedType.pos, fmt.Sprintf("union must have field with a single name, it has %d names", len(field.Names)))
 					continue
 				}
-				f.createUnionAccessor(field, "_Cgo_"+name)
+				f.createUnionAccessor(field, "C."+name)
 			}
 		}
 	}
@@ -1387,45 +1272,6 @@ extern __typeof(%s) %s __attribute__((alias(%#v)));
 // separate namespace (no _Cgo_ hacks like in gc).
 func (f *cgoFile) walker(cursor *astutil.Cursor, names map[string]clangCursor) bool {
 	switch node := cursor.Node().(type) {
-	case *ast.AssignStmt:
-		// An assign statement could be something like this:
-		//
-		//   val, errno := C.some_func()
-		//
-		// Check whether it looks like that, and if so, read the errno value and
-		// return it as the second return value. The call will be transformed
-		// into something like this:
-		//
-		//   val, errno := C.some_func(), C.__get_errno()
-		if len(node.Lhs) != 2 || len(node.Rhs) != 1 {
-			return true
-		}
-		rhs, ok := node.Rhs[0].(*ast.CallExpr)
-		if !ok {
-			return true
-		}
-		fun, ok := rhs.Fun.(*ast.SelectorExpr)
-		if !ok {
-			return true
-		}
-		x, ok := fun.X.(*ast.Ident)
-		if !ok {
-			return true
-		}
-		if found, ok := names[fun.Sel.Name]; ok && x.Name == "C" {
-			// Replace "C"."some_func" into "C.somefunc".
-			rhs.Fun = &ast.Ident{
-				NamePos: x.NamePos,
-				Name:    f.getASTDeclName(fun.Sel.Name, found, true),
-			}
-			// Add the errno value as the second value in the statement.
-			node.Rhs = append(node.Rhs, &ast.CallExpr{
-				Fun: &ast.Ident{
-					NamePos: node.Lhs[1].End(),
-					Name:    "_Cgo___get_errno",
-				},
-			})
-		}
 	case *ast.CallExpr:
 		fun, ok := node.Fun.(*ast.SelectorExpr)
 		if !ok {
@@ -1447,7 +1293,7 @@ func (f *cgoFile) walker(cursor *astutil.Cursor, names map[string]clangCursor) b
 			return true
 		}
 		if x.Name == "C" {
-			name := "_Cgo_" + node.Sel.Name
+			name := "C." + node.Sel.Name
 			if found, ok := names[node.Sel.Name]; ok {
 				name = f.getASTDeclName(node.Sel.Name, found, false)
 			}
@@ -56,7 +56,7 @@ func TestCGo(t *testing.T) {
 			}

 			// Process the AST with CGo.
-			cgoFiles, _, _, _, _, cgoErrors := Process([]*ast.File{f}, "testdata", "main", fset, cflags, "linux")
+			cgoFiles, _, _, _, _, cgoErrors := Process([]*ast.File{f}, "testdata", "main", fset, cflags)

 			// Check the AST for type errors.
 			var typecheckErrors []error
@@ -64,7 +64,7 @@ func TestCGo(t *testing.T) {
 				Error: func(err error) {
 					typecheckErrors = append(typecheckErrors, err)
 				},
-				Importer: newSimpleImporter(),
+				Importer: simpleImporter{},
 				Sizes:    types.SizesFor("gccgo", "arm"),
 			}
 			_, err = config.Check("", fset, append([]*ast.File{f}, cgoFiles...), nil)
@@ -202,33 +202,14 @@ func Test_cgoPackage_isEquivalentAST(t *testing.T) {
 }

 // simpleImporter implements the types.Importer interface, but only allows
-// importing the syscall and unsafe packages.
+// importing the unsafe package.
 type simpleImporter struct {
-	syscallPkg *types.Package
-}
-
-func newSimpleImporter() *simpleImporter {
-	i := &simpleImporter{}
-
-	// Implement a dummy syscall package with the Errno type.
-	i.syscallPkg = types.NewPackage("syscall", "syscall")
-	obj := types.NewTypeName(token.NoPos, i.syscallPkg, "Errno", nil)
-	named := types.NewNamed(obj, nil, nil)
-	i.syscallPkg.Scope().Insert(obj)
-	named.SetUnderlying(types.Typ[types.Uintptr])
-	sig := types.NewSignatureType(nil, nil, nil, types.NewTuple(), types.NewTuple(types.NewParam(token.NoPos, i.syscallPkg, "", types.Typ[types.String])), false)
-	named.AddMethod(types.NewFunc(token.NoPos, i.syscallPkg, "Error", sig))
-	i.syscallPkg.MarkComplete()
-
-	return i
 }

 // Import implements the Importer interface. For testing usage only: it only
 // supports importing the unsafe package.
-func (i *simpleImporter) Import(path string) (*types.Package, error) {
+func (i simpleImporter) Import(path string) (*types.Package, error) {
 	switch path {
-	case "syscall":
-		return i.syscallPkg, nil
 	case "unsafe":
 		return types.Unsafe, nil
 	default:
@@ -54,72 +54,8 @@ func init() {
 }

 // parseConst parses the given string as a C constant.
-func parseConst(pos token.Pos, fset *token.FileSet, value string, params []ast.Expr, callerPos token.Pos, f *cgoFile) (ast.Expr, *scanner.Error) {
-	t := newTokenizer(pos, fset, value, f)
-
-	// If params is non-nil (could be a zero length slice), this const is
-	// actually a function-call like expression from another macro.
-	// This means we have to parse a string like "(a, b) (a+b)".
-	// We do this by parsing the parameters at the start and then treating the
-	// following like a normal constant expression.
-	if params != nil {
-		// Parse opening paren.
-		if t.curToken != token.LPAREN {
-			return nil, unexpectedToken(t, token.LPAREN)
-		}
-		t.Next()
-
-		// Parse parameters (identifiers) and closing paren.
-		var paramIdents []string
-		for i := 0; ; i++ {
-			if i == 0 && t.curToken == token.RPAREN {
-				// No parameters, break early.
-				t.Next()
-				break
-			}
-
-			// Read the parameter name.
-			if t.curToken != token.IDENT {
-				return nil, unexpectedToken(t, token.IDENT)
-			}
-			paramIdents = append(paramIdents, t.curValue)
-			t.Next()
-
-			// Read the next token: either a continuation (comma) or end of list
-			// (rparen).
-			if t.curToken == token.RPAREN {
-				// End of parameter list.
-				t.Next()
-				break
-			} else if t.curToken == token.COMMA {
-				// Comma, so there will be another parameter name.
-				t.Next()
-			} else {
-				return nil, &scanner.Error{
-					Pos: t.fset.Position(t.curPos),
-					Msg: "unexpected token " + t.curToken.String() + " inside macro parameters, expected ',' or ')'",
-				}
-			}
-		}
-
-		// Report an error if there is a mismatch in parameter length.
-		// The error is reported at the location of the closing paren from the
-		// caller location.
-		if len(params) != len(paramIdents) {
-			return nil, &scanner.Error{
-				Pos: t.fset.Position(callerPos),
-				Msg: fmt.Sprintf("unexpected number of parameters: expected %d, got %d", len(paramIdents), len(params)),
-			}
-		}
-
-		// Assign values to the parameters.
-		// These parameter names are closer in 'scope' than other identifiers so
-		// will be used first when parsing an identifier.
-		for i, name := range paramIdents {
-			t.params[name] = params[i]
-		}
-	}
-
+func parseConst(pos token.Pos, fset *token.FileSet, value string) (ast.Expr, *scanner.Error) {
+	t := newTokenizer(pos, fset, value)
 	expr, err := parseConstExpr(t, precedenceLowest)
 	t.Next()
 	if t.curToken != token.EOF {
@@ -160,68 +96,6 @@ func parseConstExpr(t *tokenizer, precedence int) (ast.Expr, *scanner.Error) {
 }

 func parseIdent(t *tokenizer) (ast.Expr, *scanner.Error) {
-	// If the identifier is one of the parameters of this function-like macro,
-	// use the parameter value.
-	if val, ok := t.params[t.curValue]; ok {
-		return val, nil
-	}
-
-	if t.f != nil {
-		// Check whether this identifier is actually a macro "call" with
-		// parameters. In that case, we should parse the parameters and pass it
-		// on to a new invocation of parseConst.
-		if t.peekToken == token.LPAREN {
-			if cursor, ok := t.f.names[t.curValue]; ok && t.f.isFunctionLikeMacro(cursor) {
-				// We know the current and peek tokens (the peek one is the '('
-				// token). So skip ahead until the current token is the first
-				// unknown token.
-				t.Next()
-				t.Next()
-
-				// Parse the list of parameters until ')' (rparen) is found.
-				params := []ast.Expr{}
-				for i := 0; ; i++ {
-					if i == 0 && t.curToken == token.RPAREN {
-						break
-					}
-					x, err := parseConstExpr(t, precedenceLowest)
-					if err != nil {
-						return nil, err
-					}
-					params = append(params, x)
-					t.Next()
-					if t.curToken == token.COMMA {
-						t.Next()
-					} else if t.curToken == token.RPAREN {
-						break
-					} else {
-						return nil, &scanner.Error{
-							Pos: t.fset.Position(t.curPos),
-							Msg: "unexpected token " + t.curToken.String() + ", ',' or ')'",
-						}
-					}
-				}
-
-				// Evaluate the macro value and use it as the identifier value.
-				rparen := t.curPos
-				pos, text := t.f.getMacro(cursor)
-				return parseConst(pos, t.fset, text, params, rparen, t.f)
-			}
-		}
-
-		// Normally the name is something defined in the file (like another
-		// macro) which we get the declaration from using getASTDeclName.
-		// This ensures that names that are only referenced inside a macro are
-		// still getting defined.
-		if cursor, ok := t.f.names[t.curValue]; ok {
-			return &ast.Ident{
-				NamePos: t.curPos,
-				Name:    t.f.getASTDeclName(t.curValue, cursor, false),
-			}, nil
-		}
-	}
-
-	// t.f is nil during testing. This is a fallback.
 	return &ast.Ident{
 		NamePos: t.curPos,
 		Name:    "C." + t.curValue,
@@ -290,25 +164,21 @@ func unexpectedToken(t *tokenizer, expected token.Token) *scanner.Error {

 // tokenizer reads C source code and converts it to Go tokens.
 type tokenizer struct {
-	f                   *cgoFile
 	curPos, peekPos     token.Pos
 	fset                *token.FileSet
 	curToken, peekToken token.Token
 	curValue, peekValue string
 	buf                 string
-	params              map[string]ast.Expr
 }

 // newTokenizer initializes a new tokenizer, positioned at the first token in
 // the string.
-func newTokenizer(start token.Pos, fset *token.FileSet, buf string, f *cgoFile) *tokenizer {
+func newTokenizer(start token.Pos, fset *token.FileSet, buf string) *tokenizer {
 	t := &tokenizer{
-		f:         f,
 		peekPos:   start,
 		fset:      fset,
 		buf:       buf,
 		peekToken: token.ILLEGAL,
-		params:    make(map[string]ast.Expr),
 	}
 	// Parse the first two tokens (cur and peek).
 	t.Next()
@@ -360,7 +230,7 @@ func (t *tokenizer) Next() {
 			t.peekValue = t.buf[:2]
 			t.buf = t.buf[2:]
 			return
-		case c == '(' || c == ')' || c == ',' || c == '+' || c == '-' || c == '*' || c == '/' || c == '%' || c == '&' || c == '|' || c == '^':
+		case c == '(' || c == ')' || c == '+' || c == '-' || c == '*' || c == '/' || c == '%' || c == '&' || c == '|' || c == '^':
 			// Single-character tokens.
 			// TODO: ++ (increment) and -- (decrement) operators.
 			switch c {
@@ -368,8 +238,6 @@ func (t *tokenizer) Next() {
 				t.peekToken = token.LPAREN
 			case ')':
 				t.peekToken = token.RPAREN
-			case ',':
-				t.peekToken = token.COMMA
 			case '+':
 				t.peekToken = token.ADD
 			case '-':
@@ -59,7 +59,7 @@ func TestParseConst(t *testing.T) {
 	} {
 		fset := token.NewFileSet()
 		startPos := fset.AddFile("", -1, 1000).Pos(0)
-		expr, err := parseConst(startPos, fset, tc.C, nil, token.NoPos, nil)
+		expr, err := parseConst(startPos, fset, tc.C)
 		s := "<invalid>"
 		if err != nil {
 			if !strings.HasPrefix(tc.Go, "error: ") {
@@ -63,24 +63,10 @@ long long tinygo_clang_getEnumConstantDeclValue(GoCXCursor c);
 CXType tinygo_clang_getEnumDeclIntegerType(GoCXCursor c);
 unsigned tinygo_clang_Cursor_isAnonymous(GoCXCursor c);
 unsigned tinygo_clang_Cursor_isBitField(GoCXCursor c);
-unsigned tinygo_clang_Cursor_isMacroFunctionLike(GoCXCursor c);

-// Fix some warnings on Windows ARM. Without the __declspec(dllexport), it gives warnings like this:
-//     In file included from _cgo_export.c:4:
-//     cgo-gcc-export-header-prolog:49:34: warning: redeclaration of 'tinygo_clang_globals_visitor' should not add 'dllexport' attribute [-Wdll-attribute-on-redeclaration]
-//     libclang.go:68:5: note: previous declaration is here
-// See: https://github.com/golang/go/issues/49721
-#if defined(_WIN32)
-#define CGO_DECL __declspec(dllexport)
-#else
-#define CGO_DECL
-#endif
-
-CGO_DECL
 int tinygo_clang_globals_visitor(GoCXCursor c, GoCXCursor parent, CXClientData client_data);
-CGO_DECL
 int tinygo_clang_struct_visitor(GoCXCursor c, GoCXCursor parent, CXClientData client_data);
-CGO_DECL
+int tinygo_clang_enum_visitor(GoCXCursor c, GoCXCursor parent, CXClientData client_data);
 void tinygo_clang_inclusion_visitor(CXFile included_file, CXSourceLocation *inclusion_stack, unsigned include_len, CXClientData client_data);
 */
 import "C"
@@ -130,7 +116,7 @@ func (f *cgoFile) readNames(fragment string, cflags []string, filename string, c
 	// convert Go slice of strings to C array of strings.
 	cmdargsC := C.malloc(C.size_t(len(cflags)) * C.size_t(unsafe.Sizeof(uintptr(0))))
 	defer C.free(cmdargsC)
-	cmdargs := unsafe.Slice((**C.char)(cmdargsC), len(cflags))
+	cmdargs := (*[1 << 16]*C.char)(cmdargsC)
 	for i, cflag := range cflags {
 		s := C.CString(cflag)
 		cmdargs[i] = s
@@ -190,7 +176,7 @@ func (f *cgoFile) readNames(fragment string, cflags []string, filename string, c
 			// Sanity check. This should (hopefully) never trigger.
 			panic("libclang: file contents was not loaded")
 		}
-		data := unsafe.Slice((*byte)(unsafe.Pointer(rawData)), size)
+		data := (*[1 << 24]byte)(unsafe.Pointer(rawData))[:size]

 		// Hash the contents if it isn't hashed yet.
 		if _, ok := f.visitedFiles[path]; !ok {
@@ -219,7 +205,7 @@ func (f *cgoFile) createASTNode(name string, c clangCursor) (ast.Node, any) {
 		numArgs := int(C.tinygo_clang_Cursor_getNumArguments(c))
 		obj := &ast.Object{
 			Kind: ast.Fun,
-			Name: "_Cgo_" + name,
+			Name: "C." + name,
 		}
 		exportName := name
 		localName := name
@@ -257,7 +243,7 @@ func (f *cgoFile) createASTNode(name string, c clangCursor) (ast.Node, any) {
 			},
 			Name: &ast.Ident{
 				NamePos: pos,
-				Name:    "_Cgo_" + localName,
+				Name:    "C." + localName,
 				Obj:     obj,
 			},
 			Type: &ast.FuncType{
@@ -269,18 +255,10 @@ func (f *cgoFile) createASTNode(name string, c clangCursor) (ast.Node, any) {
 				},
 			},
 		}
-		var doc []string
 		if C.clang_isFunctionTypeVariadic(cursorType) != 0 {
-			doc = append(doc, "//go:variadic")
-		}
-		if _, ok := f.noescapingFuncs[name]; ok {
-			doc = append(doc, "//go:noescape")
-			f.noescapingFuncs[name].used = true
-		}
-		if len(doc) != 0 {
 			decl.Doc.List = append(decl.Doc.List, &ast.Comment{
 				Slash: pos - 1,
-				Text:  strings.Join(doc, "\n"),
+				Text:  "//go:variadic",
 			})
 		}
 		for i := 0; i < numArgs; i++ {
@@ -319,7 +297,7 @@ func (f *cgoFile) createASTNode(name string, c clangCursor) (ast.Node, any) {
 		return decl, stringSignature
 	case C.CXCursor_StructDecl, C.CXCursor_UnionDecl:
 		typ := f.makeASTRecordType(c, pos)
-		typeName := "_Cgo_" + name
+		typeName := "C." + name
 		typeExpr := typ.typeExpr
 		if typ.unionSize != 0 {
 			// Convert to a single-field struct type.
@@ -340,7 +318,7 @@ func (f *cgoFile) createASTNode(name string, c clangCursor) (ast.Node, any) {
 		obj.Decl = typeSpec
 		return typeSpec, typ
 	case C.CXCursor_TypedefDecl:
-		typeName := "_Cgo_" + name
+		typeName := "C." + name
 		underlyingType := C.tinygo_clang_getTypedefDeclUnderlyingType(c)
 		obj := &ast.Object{
 			Kind: ast.Typ,
@@ -378,12 +356,12 @@ func (f *cgoFile) createASTNode(name string, c clangCursor) (ast.Node, any) {
 		}
 		obj := &ast.Object{
 			Kind: ast.Var,
-			Name: "_Cgo_" + name,
+			Name: "C." + name,
 		}
 		valueSpec := &ast.ValueSpec{
 			Names: []*ast.Ident{{
 				NamePos: pos,
-				Name:    "_Cgo_" + name,
+				Name:    "C." + name,
 				Obj:     obj,
 			}},
 			Type: typeExpr,
@@ -392,8 +370,45 @@ func (f *cgoFile) createASTNode(name string, c clangCursor) (ast.Node, any) {
 		gen.Specs = append(gen.Specs, valueSpec)
 		return gen, nil
 	case C.CXCursor_MacroDefinition:
-		tokenPos, value := f.getMacro(c)
-		expr, scannerError := parseConst(tokenPos, f.fset, value, nil, token.NoPos, f)
+		// Extract tokens from the Clang tokenizer.
+		// See: https://stackoverflow.com/a/19074846/559350
+		sourceRange := C.tinygo_clang_getCursorExtent(c)
+		tu := C.tinygo_clang_Cursor_getTranslationUnit(c)
+		var rawTokens *C.CXToken
+		var numTokens C.unsigned
+		C.clang_tokenize(tu, sourceRange, &rawTokens, &numTokens)
+		tokens := unsafe.Slice(rawTokens, numTokens)
+		// Convert this range of tokens back to source text.
+		// Ugly, but it works well enough.
+		sourceBuf := &bytes.Buffer{}
+		var startOffset int
+		for i, token := range tokens {
+			spelling := getString(C.clang_getTokenSpelling(tu, token))
+			location := C.clang_getTokenLocation(tu, token)
+			var tokenOffset C.unsigned
+			C.clang_getExpansionLocation(location, nil, nil, nil, &tokenOffset)
+			if i == 0 {
+				// The first token is the macro name itself.
+				// Skip it (after using its location).
+				startOffset = int(tokenOffset) + len(name)
+			} else {
+				// Later tokens are the macro contents.
+				for int(tokenOffset) > (startOffset + sourceBuf.Len()) {
+					// Pad the source text with whitespace (that must have been
+					// present in the original source as well).
+					sourceBuf.WriteByte(' ')
+				}
+				sourceBuf.WriteString(spelling)
+			}
+		}
+		C.clang_disposeTokens(tu, rawTokens, numTokens)
+		value := sourceBuf.String()
+		// Try to convert this #define into a Go constant expression.
+		tokenPos := token.NoPos
+		if pos != token.NoPos {
+			tokenPos = pos + token.Pos(len(name))
+		}
+		expr, scannerError := parseConst(tokenPos, f.fset, value)
 		if scannerError != nil {
 			f.errors = append(f.errors, *scannerError)
 			return nil, nil
@@ -407,12 +422,12 @@ func (f *cgoFile) createASTNode(name string, c clangCursor) (ast.Node, any) {
 		}
 		obj := &ast.Object{
 			Kind: ast.Con,
-			Name: "_Cgo_" + name,
+			Name: "C." + name,
 		}
 		valueSpec := &ast.ValueSpec{
 			Names: []*ast.Ident{{
 				NamePos: pos,
-				Name:    "_Cgo_" + name,
+				Name:    "C." + name,
 				Obj:     obj,
 			}},
 			Values: []ast.Expr{expr},
@@ -423,7 +438,7 @@ func (f *cgoFile) createASTNode(name string, c clangCursor) (ast.Node, any) {
 	case C.CXCursor_EnumDecl:
 		obj := &ast.Object{
 			Kind: ast.Typ,
-			Name: "_Cgo_" + name,
+			Name: "C." + name,
 		}
 		underlying := C.tinygo_clang_getEnumDeclIntegerType(c)
 		// TODO: gc's CGo implementation uses types such as `uint32` for enums
@@ -431,7 +446,7 @@ func (f *cgoFile) createASTNode(name string, c clangCursor) (ast.Node, any) {
 		typeSpec := &ast.TypeSpec{
 			Name: &ast.Ident{
 				NamePos: pos,
-				Name:    "_Cgo_" + name,
+				Name:    "C." + name,
 				Obj:     obj,
 			},
 			Assign: pos,
@@ -454,12 +469,12 @@ func (f *cgoFile) createASTNode(name string, c clangCursor) (ast.Node, any) {
 		}
 		obj := &ast.Object{
 			Kind: ast.Con,
-			Name: "_Cgo_" + name,
+			Name: "C." + name,
 		}
 		valueSpec := &ast.ValueSpec{
 			Names: []*ast.Ident{{
 				NamePos: pos,
-				Name:    "_Cgo_" + name,
+				Name:    "C." + name,
 				Obj:     obj,
 			}},
 			Values: []ast.Expr{expr},
@@ -473,62 +488,6 @@ func (f *cgoFile) createASTNode(name string, c clangCursor) (ast.Node, any) {
 	}
 }

-// Return whether this is a macro that's also function-like, like this:
-//
-//	#define add(a, b) (a+b)
-func (f *cgoFile) isFunctionLikeMacro(c clangCursor) bool {
-	if C.tinygo_clang_getCursorKind(c) != C.CXCursor_MacroDefinition {
-		return false
-	}
-	return C.tinygo_clang_Cursor_isMacroFunctionLike(c) != 0
-}
-
-// Get the macro value: the position in the source file and the string value of
-// the macro.
-func (f *cgoFile) getMacro(c clangCursor) (pos token.Pos, value string) {
-	// Extract tokens from the Clang tokenizer.
-	// See: https://stackoverflow.com/a/19074846/559350
-	sourceRange := C.tinygo_clang_getCursorExtent(c)
-	tu := C.tinygo_clang_Cursor_getTranslationUnit(c)
-	var rawTokens *C.CXToken
-	var numTokens C.unsigned
-	C.clang_tokenize(tu, sourceRange, &rawTokens, &numTokens)
-	tokens := unsafe.Slice(rawTokens, numTokens)
-	defer C.clang_disposeTokens(tu, rawTokens, numTokens)
-
-	// Convert this range of tokens back to source text.
-	// Ugly, but it works well enough.
-	sourceBuf := &bytes.Buffer{}
-	var startOffset int
-	for i, token := range tokens {
-		spelling := getString(C.clang_getTokenSpelling(tu, token))
-		location := C.clang_getTokenLocation(tu, token)
-		var tokenOffset C.unsigned
-		C.clang_getExpansionLocation(location, nil, nil, nil, &tokenOffset)
-		if i == 0 {
-			// The first token is the macro name itself.
-			// Skip it (after using its location).
-			startOffset = int(tokenOffset)
-		} else {
-			// Later tokens are the macro contents.
-			for int(tokenOffset) > (startOffset + sourceBuf.Len()) {
-				// Pad the source text with whitespace (that must have been
-				// present in the original source as well).
-				sourceBuf.WriteByte(' ')
-			}
-			sourceBuf.WriteString(spelling)
-		}
-	}
-	value = sourceBuf.String()
-
-	// Obtain the position of this token. This is the position of the first
-	// character in the 'value' string and is used to report errors at the
-	// correct location in the source file.
-	pos = f.getCursorPosition(c)
-
-	return
-}
-
 func getString(clangString C.CXString) (s string) {
 	rawString := C.clang_getCString(clangString)
 	s = C.GoString(rawString)
@@ -624,7 +583,7 @@ func (p *cgoPackage) getClangLocationPosition(location C.CXSourceLocation, tu C.
 		// now by reading the file from libclang.
 		var size C.size_t
 		sourcePtr := C.clang_getFileContents(tu, file, &size)
-		source := unsafe.Slice((*byte)(unsafe.Pointer(sourcePtr)), size)
+		source := ((*[1 << 28]byte)(unsafe.Pointer(sourcePtr)))[:size:size]
 		lines := []int{0}
 		for i := 0; i < len(source)-1; i++ {
 			if source[i] == '\n' {
@@ -745,27 +704,27 @@ func (f *cgoFile) makeASTType(typ C.CXType, pos token.Pos) ast.Expr {
 	var typeName string
 	switch typ.kind {
 	case C.CXType_Char_S, C.CXType_Char_U:
-		typeName = "_Cgo_char"
+		typeName = "C.char"
 	case C.CXType_SChar:
-		typeName = "_Cgo_schar"
+		typeName = "C.schar"
 	case C.CXType_UChar:
-		typeName = "_Cgo_uchar"
+		typeName = "C.uchar"
 	case C.CXType_Short:
-		typeName = "_Cgo_short"
+		typeName = "C.short"
 	case C.CXType_UShort:
-		typeName = "_Cgo_ushort"
+		typeName = "C.ushort"
 	case C.CXType_Int:
-		typeName = "_Cgo_int"
+		typeName = "C.int"
 	case C.CXType_UInt:
-		typeName = "_Cgo_uint"
+		typeName = "C.uint"
 	case C.CXType_Long:
-		typeName = "_Cgo_long"
+		typeName = "C.long"
 	case C.CXType_ULong:
-		typeName = "_Cgo_ulong"
+		typeName = "C.ulong"
 	case C.CXType_LongLong:
-		typeName = "_Cgo_longlong"
+		typeName = "C.longlong"
 	case C.CXType_ULongLong:
-		typeName = "_Cgo_ulonglong"
+		typeName = "C.ulonglong"
 	case C.CXType_Bool:
 		typeName = "bool"
 	case C.CXType_Float, C.CXType_Double, C.CXType_LongDouble:
@@ -896,7 +855,7 @@ func (f *cgoFile) makeASTType(typ C.CXType, pos token.Pos) ast.Expr {
 		typeSpelling := getString(C.clang_getTypeSpelling(typ))
 		typeKindSpelling := getString(C.clang_getTypeKindSpelling(typ.kind))
 		f.addError(pos, fmt.Sprintf("unknown C type: %v (libclang type kind %s)", typeSpelling, typeKindSpelling))
-		typeName = "_Cgo_<unknown>"
+		typeName = "C.<unknown>"
 	}
 	return &ast.Ident{
 		NamePos: pos,
@@ -913,7 +872,7 @@ func (p *cgoPackage) getIntegerType(name string, cursor clangCursor) *ast.TypeSp
 	var goName string
 	typeSize := C.clang_Type_getSizeOf(underlyingType)
 	switch name {
-	case "_Cgo_char":
+	case "C.char":
 		if typeSize != 1 {
 			// This happens for some very special purpose architectures
 			// (DSPs etc.) that are not currently targeted.
@@ -926,7 +885,7 @@ func (p *cgoPackage) getIntegerType(name string, cursor clangCursor) *ast.TypeSp
 		case C.CXType_Char_U:
 			goName = "uint8"
 		}
-	case "_Cgo_schar", "_Cgo_short", "_Cgo_int", "_Cgo_long", "_Cgo_longlong":
+	case "C.schar", "C.short", "C.int", "C.long", "C.longlong":
 		switch typeSize {
 		case 1:
 			goName = "int8"
@@ -937,7 +896,7 @@ func (p *cgoPackage) getIntegerType(name string, cursor clangCursor) *ast.TypeSp
 		case 8:
 			goName = "int64"
 		}
-	case "_Cgo_uchar", "_Cgo_ushort", "_Cgo_uint", "_Cgo_ulong", "_Cgo_ulonglong":
+	case "C.uchar", "C.ushort", "C.uint", "C.ulong", "C.ulonglong":
 		switch typeSize {
 		case 1:
 			goName = "uint8"
@@ -1,4 +1,4 @@
-//go:build !byollvm && llvm18
+//go:build !byollvm && !llvm15 && !llvm16 && !llvm17

 package cgo

@@ -1,15 +0,0 @@
-//go:build !byollvm && llvm19
-
-package cgo
-
-/*
-#cgo linux        CFLAGS:  -I/usr/include/llvm-19 -I/usr/include/llvm-c-19 -I/usr/lib/llvm-19/include -I/usr/lib64/llvm19/include
-#cgo darwin,amd64 CFLAGS:  -I/usr/local/opt/llvm@19/include
-#cgo darwin,arm64 CFLAGS:  -I/opt/homebrew/opt/llvm@19/include
-#cgo freebsd      CFLAGS:  -I/usr/local/llvm19/include
-#cgo linux        LDFLAGS: -L/usr/lib/llvm-19/lib -lclang
-#cgo darwin,amd64 LDFLAGS: -L/usr/local/opt/llvm@19/lib -lclang
-#cgo darwin,arm64 LDFLAGS: -L/opt/homebrew/opt/llvm@19/lib -lclang
-#cgo freebsd      LDFLAGS: -L/usr/local/llvm19/lib -lclang
-*/
-import "C"
@@ -1,15 +0,0 @@
-//go:build !byollvm && !llvm15 && !llvm16 && !llvm17 && !llvm18 && !llvm19
-
-package cgo
-
-/*
-#cgo linux        CFLAGS:  -I/usr/include/llvm-20 -I/usr/include/llvm-c-20 -I/usr/lib/llvm-20/include -I/usr/lib64/llvm20/include
-#cgo darwin,amd64 CFLAGS:  -I/usr/local/opt/llvm@20/include
-#cgo darwin,arm64 CFLAGS:  -I/opt/homebrew/opt/llvm@20/include
-#cgo freebsd      CFLAGS:  -I/usr/local/llvm20/include
-#cgo linux        LDFLAGS: -L/usr/lib/llvm-20/lib -lclang
-#cgo darwin,amd64 LDFLAGS: -L/usr/local/opt/llvm@20/lib -lclang
-#cgo darwin,arm64 LDFLAGS: -L/opt/homebrew/opt/llvm@20/lib -lclang
-#cgo freebsd      LDFLAGS: -L/usr/local/llvm20/lib -lclang
-*/
-import "C"
@@ -84,7 +84,3 @@ unsigned tinygo_clang_Cursor_isAnonymous(CXCursor c) {
 unsigned tinygo_clang_Cursor_isBitField(CXCursor c) {
 	return clang_Cursor_isBitField(c);
 }
-
-unsigned tinygo_clang_Cursor_isMacroFunctionLike(CXCursor c) {
-	return clang_Cursor_isMacroFunctionLike(c);
-}
@@ -78,7 +78,6 @@ var validCompilerFlags = []*regexp.Regexp{
 	re(`-f(no-)?(pic|PIC|pie|PIE)`),
 	re(`-f(no-)?plt`),
 	re(`-f(no-)?rtti`),
-	re(`-f(no-)?short-enums`),
 	re(`-f(no-)?split-stack`),
 	re(`-f(no-)?stack-(.+)`),
 	re(`-f(no-)?strict-aliasing`),
@@ -1,54 +1,39 @@
 package main

-import "syscall"
 import "unsafe"

 var _ unsafe.Pointer

-//go:linkname _Cgo_CString runtime.cgo_CString
-func _Cgo_CString(string) *_Cgo_char
+//go:linkname C.CString runtime.cgo_CString
+func C.CString(string) *C.char

-//go:linkname _Cgo_GoString runtime.cgo_GoString
-func _Cgo_GoString(*_Cgo_char) string
+//go:linkname C.GoString runtime.cgo_GoString
+func C.GoString(*C.char) string

-//go:linkname _Cgo___GoStringN runtime.cgo_GoStringN
-func _Cgo___GoStringN(*_Cgo_char, uintptr) string
+//go:linkname C.__GoStringN runtime.cgo_GoStringN
+func C.__GoStringN(*C.char, uintptr) string

-func _Cgo_GoStringN(cstr *_Cgo_char, length _Cgo_int) string {
-	return _Cgo___GoStringN(cstr, uintptr(length))
+func C.GoStringN(cstr *C.char, length C.int) string {
+	return C.__GoStringN(cstr, uintptr(length))
 }

-//go:linkname _Cgo___GoBytes runtime.cgo_GoBytes
-func _Cgo___GoBytes(unsafe.Pointer, uintptr) []byte
+//go:linkname C.__GoBytes runtime.cgo_GoBytes
+func C.__GoBytes(unsafe.Pointer, uintptr) []byte

-func _Cgo_GoBytes(ptr unsafe.Pointer, length _Cgo_int) []byte {
-	return _Cgo___GoBytes(ptr, uintptr(length))
-}
-
-//go:linkname _Cgo___CBytes runtime.cgo_CBytes
-func _Cgo___CBytes([]byte) unsafe.Pointer
-
-func _Cgo_CBytes(b []byte) unsafe.Pointer {
-	return _Cgo___CBytes(b)
-}
-
-//go:linkname _Cgo___get_errno_num runtime.cgo_errno
-func _Cgo___get_errno_num() uintptr
-
-func _Cgo___get_errno() error {
-	return syscall.Errno(_Cgo___get_errno_num())
+func C.GoBytes(ptr unsafe.Pointer, length C.int) []byte {
+	return C.__GoBytes(ptr, uintptr(length))
 }

 type (
-	_Cgo_char      uint8
-	_Cgo_schar     int8
-	_Cgo_uchar     uint8
-	_Cgo_short     int16
-	_Cgo_ushort    uint16
-	_Cgo_int       int32
-	_Cgo_uint      uint32
-	_Cgo_long      int32
-	_Cgo_ulong     uint32
-	_Cgo_longlong  int64
-	_Cgo_ulonglong uint64
+	C.char      uint8
+	C.schar     int8
+	C.uchar     uint8
+	C.short     int16
+	C.ushort    uint16
+	C.int       int32
+	C.uint      uint32
+	C.long      int32
+	C.ulong     uint32
+	C.longlong  int64
+	C.ulonglong uint64
 )
@@ -3,26 +3,10 @@ package main
 /*
 #define foo 3
 #define bar foo
-
-#define unreferenced 4
-#define referenced unreferenced
-
-#define fnlike() 5
-#define fnlike_val fnlike()
-#define square(n) (n*n)
-#define square_val square(20)
-#define add(a, b) (a + b)
-#define add_val add(3, 5)
 */
 import "C"

 const (
 	Foo = C.foo
 	Bar = C.bar
-
-	Baz = C.referenced
-
-	fnlike = C.fnlike_val
-	square = C.square_val
-	add    = C.add_val
 )
@@ -1,62 +1,42 @@
 package main

-import "syscall"
 import "unsafe"

 var _ unsafe.Pointer

-//go:linkname _Cgo_CString runtime.cgo_CString
-func _Cgo_CString(string) *_Cgo_char
+//go:linkname C.CString runtime.cgo_CString
+func C.CString(string) *C.char

-//go:linkname _Cgo_GoString runtime.cgo_GoString
-func _Cgo_GoString(*_Cgo_char) string
+//go:linkname C.GoString runtime.cgo_GoString
+func C.GoString(*C.char) string

-//go:linkname _Cgo___GoStringN runtime.cgo_GoStringN
-func _Cgo___GoStringN(*_Cgo_char, uintptr) string
+//go:linkname C.__GoStringN runtime.cgo_GoStringN
+func C.__GoStringN(*C.char, uintptr) string

-func _Cgo_GoStringN(cstr *_Cgo_char, length _Cgo_int) string {
-	return _Cgo___GoStringN(cstr, uintptr(length))
+func C.GoStringN(cstr *C.char, length C.int) string {
+	return C.__GoStringN(cstr, uintptr(length))
 }

-//go:linkname _Cgo___GoBytes runtime.cgo_GoBytes
-func _Cgo___GoBytes(unsafe.Pointer, uintptr) []byte
+//go:linkname C.__GoBytes runtime.cgo_GoBytes
+func C.__GoBytes(unsafe.Pointer, uintptr) []byte

-func _Cgo_GoBytes(ptr unsafe.Pointer, length _Cgo_int) []byte {
-	return _Cgo___GoBytes(ptr, uintptr(length))
-}
-
-//go:linkname _Cgo___CBytes runtime.cgo_CBytes
-func _Cgo___CBytes([]byte) unsafe.Pointer
-
-func _Cgo_CBytes(b []byte) unsafe.Pointer {
-	return _Cgo___CBytes(b)
-}
-
-//go:linkname _Cgo___get_errno_num runtime.cgo_errno
-func _Cgo___get_errno_num() uintptr
-
-func _Cgo___get_errno() error {
-	return syscall.Errno(_Cgo___get_errno_num())
+func C.GoBytes(ptr unsafe.Pointer, length C.int) []byte {
+	return C.__GoBytes(ptr, uintptr(length))
 }

 type (
-	_Cgo_char      uint8
-	_Cgo_schar     int8
-	_Cgo_uchar     uint8
-	_Cgo_short     int16
-	_Cgo_ushort    uint16
-	_Cgo_int       int32
-	_Cgo_uint      uint32
-	_Cgo_long      int32
-	_Cgo_ulong     uint32
-	_Cgo_longlong  int64
-	_Cgo_ulonglong uint64
+	C.char      uint8
+	C.schar     int8
+	C.uchar     uint8
+	C.short     int16
+	C.ushort    uint16
+	C.int       int32
+	C.uint      uint32
+	C.long      int32
+	C.ulong     uint32
+	C.longlong  int64
+	C.ulonglong uint64
 )

-const _Cgo_foo = 3
-const _Cgo_bar = _Cgo_foo
-const _Cgo_unreferenced = 4
-const _Cgo_referenced = _Cgo_unreferenced
-const _Cgo_fnlike_val = 5
-const _Cgo_square_val = (20 * 20)
-const _Cgo_add_val = (3 + 5)
+const C.foo = 3
+const C.bar = C.foo
@@ -10,11 +10,6 @@ typedef struct {

 typedef someType noType; // undefined type

-// Some invalid noescape lines
-#cgo noescape
-#cgo noescape foo bar
-#cgo noescape unusedFunction
-
 #define SOME_CONST_1 5) // invalid const syntax
 #define SOME_CONST_2 6) // const not used (so no error)
 #define SOME_CONST_3 1234 // const too large for byte
@@ -31,11 +26,6 @@ import "C"
 // #warning another warning
 import "C"

-// #define add(a, b) (a+b)
-// #define add_toomuch add(1, 2, 3)
-// #define add_toolittle add(1)
-import "C"
-
 // Make sure that errors for the following lines won't change with future
 // additions to the CGo preamble.
 //
@@ -61,7 +51,4 @@ var (
 	// constants passed by a command line parameter
 	_ = C.SOME_PARAM_CONST_invalid
 	_ = C.SOME_PARAM_CONST_valid
-
-	_ = C.add_toomuch
-	_ = C.add_toolittle
 )
@@ -1,89 +1,67 @@
 // CGo errors:
-//     testdata/errors.go:14:1: missing function name in #cgo noescape line
-//     testdata/errors.go:15:1: multiple function names in #cgo noescape line
 //     testdata/errors.go:4:2: warning: some warning
 //     testdata/errors.go:11:9: error: unknown type name 'someType'
-//     testdata/errors.go:31:5: warning: another warning
-//     testdata/errors.go:18:23: unexpected token ), expected end of expression
-//     testdata/errors.go:26:26: unexpected token ), expected end of expression
-//     testdata/errors.go:21:33: unexpected token ), expected end of expression
-//     testdata/errors.go:22:34: unexpected token ), expected end of expression
+//     testdata/errors.go:26:5: warning: another warning
+//     testdata/errors.go:13:23: unexpected token ), expected end of expression
+//     testdata/errors.go:21:26: unexpected token ), expected end of expression
+//     testdata/errors.go:16:33: unexpected token ), expected end of expression
+//     testdata/errors.go:17:34: unexpected token ), expected end of expression
 //     -: unexpected token INT, expected end of expression
-//     testdata/errors.go:35:35: unexpected number of parameters: expected 2, got 3
-//     testdata/errors.go:36:31: unexpected number of parameters: expected 2, got 1
-//     testdata/errors.go:3:1: function "unusedFunction" in #cgo noescape line is not used

 // Type checking errors after CGo processing:
-//     testdata/errors.go:102: cannot use 2 << 10 (untyped int constant 2048) as _Cgo_char value in variable declaration (overflows)
+//     testdata/errors.go:102: cannot use 2 << 10 (untyped int constant 2048) as C.char value in variable declaration (overflows)
 //     testdata/errors.go:105: unknown field z in struct literal
-//     testdata/errors.go:108: undefined: _Cgo_SOME_CONST_1
-//     testdata/errors.go:110: cannot use _Cgo_SOME_CONST_3 (untyped int constant 1234) as byte value in variable declaration (overflows)
-//     testdata/errors.go:112: undefined: _Cgo_SOME_CONST_4
-//     testdata/errors.go:114: undefined: _Cgo_SOME_CONST_b
-//     testdata/errors.go:116: undefined: _Cgo_SOME_CONST_startspace
-//     testdata/errors.go:119: undefined: _Cgo_SOME_PARAM_CONST_invalid
-//     testdata/errors.go:122: undefined: _Cgo_add_toomuch
-//     testdata/errors.go:123: undefined: _Cgo_add_toolittle
+//     testdata/errors.go:108: undefined: C.SOME_CONST_1
+//     testdata/errors.go:110: cannot use C.SOME_CONST_3 (untyped int constant 1234) as byte value in variable declaration (overflows)
+//     testdata/errors.go:112: undefined: C.SOME_CONST_4
+//     testdata/errors.go:114: undefined: C.SOME_CONST_b
+//     testdata/errors.go:116: undefined: C.SOME_CONST_startspace
+//     testdata/errors.go:119: undefined: C.SOME_PARAM_CONST_invalid

 package main

-import "syscall"
 import "unsafe"

 var _ unsafe.Pointer

-//go:linkname _Cgo_CString runtime.cgo_CString
-func _Cgo_CString(string) *_Cgo_char
+//go:linkname C.CString runtime.cgo_CString
+func C.CString(string) *C.char

-//go:linkname _Cgo_GoString runtime.cgo_GoString
-func _Cgo_GoString(*_Cgo_char) string
+//go:linkname C.GoString runtime.cgo_GoString
+func C.GoString(*C.char) string

-//go:linkname _Cgo___GoStringN runtime.cgo_GoStringN
-func _Cgo___GoStringN(*_Cgo_char, uintptr) string
+//go:linkname C.__GoStringN runtime.cgo_GoStringN
+func C.__GoStringN(*C.char, uintptr) string

-func _Cgo_GoStringN(cstr *_Cgo_char, length _Cgo_int) string {
-	return _Cgo___GoStringN(cstr, uintptr(length))
+func C.GoStringN(cstr *C.char, length C.int) string {
+	return C.__GoStringN(cstr, uintptr(length))
 }

-//go:linkname _Cgo___GoBytes runtime.cgo_GoBytes
-func _Cgo___GoBytes(unsafe.Pointer, uintptr) []byte
+//go:linkname C.__GoBytes runtime.cgo_GoBytes
+func C.__GoBytes(unsafe.Pointer, uintptr) []byte

-func _Cgo_GoBytes(ptr unsafe.Pointer, length _Cgo_int) []byte {
-	return _Cgo___GoBytes(ptr, uintptr(length))
-}
-
-//go:linkname _Cgo___CBytes runtime.cgo_CBytes
-func _Cgo___CBytes([]byte) unsafe.Pointer
-
-func _Cgo_CBytes(b []byte) unsafe.Pointer {
-	return _Cgo___CBytes(b)
-}
-
-//go:linkname _Cgo___get_errno_num runtime.cgo_errno
-func _Cgo___get_errno_num() uintptr
-
-func _Cgo___get_errno() error {
-	return syscall.Errno(_Cgo___get_errno_num())
+func C.GoBytes(ptr unsafe.Pointer, length C.int) []byte {
+	return C.__GoBytes(ptr, uintptr(length))
 }

 type (
-	_Cgo_char      uint8
-	_Cgo_schar     int8
-	_Cgo_uchar     uint8
-	_Cgo_short     int16
-	_Cgo_ushort    uint16
-	_Cgo_int       int32
-	_Cgo_uint      uint32
-	_Cgo_long      int32
-	_Cgo_ulong     uint32
-	_Cgo_longlong  int64
-	_Cgo_ulonglong uint64
+	C.char      uint8
+	C.schar     int8
+	C.uchar     uint8
+	C.short     int16
+	C.ushort    uint16
+	C.int       int32
+	C.uint      uint32
+	C.long      int32
+	C.ulong     uint32
+	C.longlong  int64
+	C.ulonglong uint64
 )
-type _Cgo_struct_point_t struct {
-	x _Cgo_int
-	y _Cgo_int
+type C.struct_point_t struct {
+	x C.int
+	y C.int
 }
-type _Cgo_point_t = _Cgo_struct_point_t
+type C.point_t = C.struct_point_t

-const _Cgo_SOME_CONST_3 = 1234
-const _Cgo_SOME_PARAM_CONST_valid = 3 + 4
+const C.SOME_CONST_3 = 1234
+const C.SOME_PARAM_CONST_valid = 3 + 4
@@ -5,58 +5,43 @@

 package main

-import "syscall"
 import "unsafe"

 var _ unsafe.Pointer

-//go:linkname _Cgo_CString runtime.cgo_CString
-func _Cgo_CString(string) *_Cgo_char
+//go:linkname C.CString runtime.cgo_CString
+func C.CString(string) *C.char

-//go:linkname _Cgo_GoString runtime.cgo_GoString
-func _Cgo_GoString(*_Cgo_char) string
+//go:linkname C.GoString runtime.cgo_GoString
+func C.GoString(*C.char) string

-//go:linkname _Cgo___GoStringN runtime.cgo_GoStringN
-func _Cgo___GoStringN(*_Cgo_char, uintptr) string
+//go:linkname C.__GoStringN runtime.cgo_GoStringN
+func C.__GoStringN(*C.char, uintptr) string

-func _Cgo_GoStringN(cstr *_Cgo_char, length _Cgo_int) string {
-	return _Cgo___GoStringN(cstr, uintptr(length))
+func C.GoStringN(cstr *C.char, length C.int) string {
+	return C.__GoStringN(cstr, uintptr(length))
 }

-//go:linkname _Cgo___GoBytes runtime.cgo_GoBytes
-func _Cgo___GoBytes(unsafe.Pointer, uintptr) []byte
+//go:linkname C.__GoBytes runtime.cgo_GoBytes
+func C.__GoBytes(unsafe.Pointer, uintptr) []byte

-func _Cgo_GoBytes(ptr unsafe.Pointer, length _Cgo_int) []byte {
-	return _Cgo___GoBytes(ptr, uintptr(length))
-}
-
-//go:linkname _Cgo___CBytes runtime.cgo_CBytes
-func _Cgo___CBytes([]byte) unsafe.Pointer
-
-func _Cgo_CBytes(b []byte) unsafe.Pointer {
-	return _Cgo___CBytes(b)
-}
-
-//go:linkname _Cgo___get_errno_num runtime.cgo_errno
-func _Cgo___get_errno_num() uintptr
-
-func _Cgo___get_errno() error {
-	return syscall.Errno(_Cgo___get_errno_num())
+func C.GoBytes(ptr unsafe.Pointer, length C.int) []byte {
+	return C.__GoBytes(ptr, uintptr(length))
 }

 type (
-	_Cgo_char      uint8
-	_Cgo_schar     int8
-	_Cgo_uchar     uint8
-	_Cgo_short     int16
-	_Cgo_ushort    uint16
-	_Cgo_int       int32
-	_Cgo_uint      uint32
-	_Cgo_long      int32
-	_Cgo_ulong     uint32
-	_Cgo_longlong  int64
-	_Cgo_ulonglong uint64
+	C.char      uint8
+	C.schar     int8
+	C.uchar     uint8
+	C.short     int16
+	C.ushort    uint16
+	C.int       int32
+	C.uint      uint32
+	C.long      int32
+	C.ulong     uint32
+	C.longlong  int64
+	C.ulonglong uint64
 )

-const _Cgo_BAR = 3
-const _Cgo_FOO_H = 1
+const C.BAR = 3
+const C.FOO_H = 1
@@ -9,10 +9,6 @@ static void staticfunc(int x);

 // Global variable signatures.
 extern int someValue;
-
-void notEscapingFunction(int *a);
-
-#cgo noescape notEscapingFunction
 */
 import "C"

@@ -22,7 +18,6 @@ func accessFunctions() {
 	C.variadic0()
 	C.variadic2(3, 5)
 	C.staticfunc(3)
-	C.notEscapingFunction(nil)
 }

 func accessGlobals() {
@@ -1,84 +1,64 @@
 package main

-import "syscall"
 import "unsafe"

 var _ unsafe.Pointer

-//go:linkname _Cgo_CString runtime.cgo_CString
-func _Cgo_CString(string) *_Cgo_char
+//go:linkname C.CString runtime.cgo_CString
+func C.CString(string) *C.char

-//go:linkname _Cgo_GoString runtime.cgo_GoString
-func _Cgo_GoString(*_Cgo_char) string
+//go:linkname C.GoString runtime.cgo_GoString
+func C.GoString(*C.char) string

-//go:linkname _Cgo___GoStringN runtime.cgo_GoStringN
-func _Cgo___GoStringN(*_Cgo_char, uintptr) string
+//go:linkname C.__GoStringN runtime.cgo_GoStringN
+func C.__GoStringN(*C.char, uintptr) string

-func _Cgo_GoStringN(cstr *_Cgo_char, length _Cgo_int) string {
-	return _Cgo___GoStringN(cstr, uintptr(length))
+func C.GoStringN(cstr *C.char, length C.int) string {
+	return C.__GoStringN(cstr, uintptr(length))
 }

-//go:linkname _Cgo___GoBytes runtime.cgo_GoBytes
-func _Cgo___GoBytes(unsafe.Pointer, uintptr) []byte
+//go:linkname C.__GoBytes runtime.cgo_GoBytes
+func C.__GoBytes(unsafe.Pointer, uintptr) []byte

-func _Cgo_GoBytes(ptr unsafe.Pointer, length _Cgo_int) []byte {
-	return _Cgo___GoBytes(ptr, uintptr(length))
-}
-
-//go:linkname _Cgo___CBytes runtime.cgo_CBytes
-func _Cgo___CBytes([]byte) unsafe.Pointer
-
-func _Cgo_CBytes(b []byte) unsafe.Pointer {
-	return _Cgo___CBytes(b)
-}
-
-//go:linkname _Cgo___get_errno_num runtime.cgo_errno
-func _Cgo___get_errno_num() uintptr
-
-func _Cgo___get_errno() error {
-	return syscall.Errno(_Cgo___get_errno_num())
+func C.GoBytes(ptr unsafe.Pointer, length C.int) []byte {
+	return C.__GoBytes(ptr, uintptr(length))
 }

 type (
-	_Cgo_char      uint8
-	_Cgo_schar     int8
-	_Cgo_uchar     uint8
-	_Cgo_short     int16
-	_Cgo_ushort    uint16
-	_Cgo_int       int32
-	_Cgo_uint      uint32
-	_Cgo_long      int32
-	_Cgo_ulong     uint32
-	_Cgo_longlong  int64
-	_Cgo_ulonglong uint64
+	C.char      uint8
+	C.schar     int8
+	C.uchar     uint8
+	C.short     int16
+	C.ushort    uint16
+	C.int       int32
+	C.uint      uint32
+	C.long      int32
+	C.ulong     uint32
+	C.longlong  int64
+	C.ulonglong uint64
 )

 //export foo
-func _Cgo_foo(a _Cgo_int, b _Cgo_int) _Cgo_int
+func C.foo(a C.int, b C.int) C.int

-var _Cgo_foo$funcaddr unsafe.Pointer
+var C.foo$funcaddr unsafe.Pointer

 //export variadic0
 //go:variadic
-func _Cgo_variadic0()
+func C.variadic0()

-var _Cgo_variadic0$funcaddr unsafe.Pointer
+var C.variadic0$funcaddr unsafe.Pointer

 //export variadic2
 //go:variadic
-func _Cgo_variadic2(x _Cgo_int, y _Cgo_int)
+func C.variadic2(x C.int, y C.int)

-var _Cgo_variadic2$funcaddr unsafe.Pointer
+var C.variadic2$funcaddr unsafe.Pointer

 //export _Cgo_static_173c95a79b6df1980521_staticfunc
-func _Cgo_staticfunc!symbols.go(x _Cgo_int)
+func C.staticfunc!symbols.go(x C.int)

-var _Cgo_staticfunc!symbols.go$funcaddr unsafe.Pointer
+var C.staticfunc!symbols.go$funcaddr unsafe.Pointer

-//export notEscapingFunction
-//go:noescape
-func _Cgo_notEscapingFunction(a *_Cgo_int)
-
-var _Cgo_notEscapingFunction$funcaddr unsafe.Pointer
 //go:extern someValue
-var _Cgo_someValue _Cgo_int
+var C.someValue C.int
@@ -1,166 +1,147 @@
 package main

-import "syscall"
 import "unsafe"

 var _ unsafe.Pointer

-//go:linkname _Cgo_CString runtime.cgo_CString
-func _Cgo_CString(string) *_Cgo_char
+//go:linkname C.CString runtime.cgo_CString
+func C.CString(string) *C.char

-//go:linkname _Cgo_GoString runtime.cgo_GoString
-func _Cgo_GoString(*_Cgo_char) string
+//go:linkname C.GoString runtime.cgo_GoString
+func C.GoString(*C.char) string

-//go:linkname _Cgo___GoStringN runtime.cgo_GoStringN
-func _Cgo___GoStringN(*_Cgo_char, uintptr) string
+//go:linkname C.__GoStringN runtime.cgo_GoStringN
+func C.__GoStringN(*C.char, uintptr) string

-func _Cgo_GoStringN(cstr *_Cgo_char, length _Cgo_int) string {
-	return _Cgo___GoStringN(cstr, uintptr(length))
+func C.GoStringN(cstr *C.char, length C.int) string {
+	return C.__GoStringN(cstr, uintptr(length))
 }

-//go:linkname _Cgo___GoBytes runtime.cgo_GoBytes
-func _Cgo___GoBytes(unsafe.Pointer, uintptr) []byte
+//go:linkname C.__GoBytes runtime.cgo_GoBytes
+func C.__GoBytes(unsafe.Pointer, uintptr) []byte

-func _Cgo_GoBytes(ptr unsafe.Pointer, length _Cgo_int) []byte {
-	return _Cgo___GoBytes(ptr, uintptr(length))
-}
-
-//go:linkname _Cgo___CBytes runtime.cgo_CBytes
-func _Cgo___CBytes([]byte) unsafe.Pointer
-
-func _Cgo_CBytes(b []byte) unsafe.Pointer {
-	return _Cgo___CBytes(b)
-}
-
-//go:linkname _Cgo___get_errno_num runtime.cgo_errno
-func _Cgo___get_errno_num() uintptr
-
-func _Cgo___get_errno() error {
-	return syscall.Errno(_Cgo___get_errno_num())
+func C.GoBytes(ptr unsafe.Pointer, length C.int) []byte {
+	return C.__GoBytes(ptr, uintptr(length))
 }

 type (
-	_Cgo_char      uint8
-	_Cgo_schar     int8
-	_Cgo_uchar     uint8
-	_Cgo_short     int16
-	_Cgo_ushort    uint16
-	_Cgo_int       int32
-	_Cgo_uint      uint32
-	_Cgo_long      int32
-	_Cgo_ulong     uint32
-	_Cgo_longlong  int64
-	_Cgo_ulonglong uint64
+	C.char      uint8
+	C.schar     int8
+	C.uchar     uint8
+	C.short     int16
+	C.ushort    uint16
+	C.int       int32
+	C.uint      uint32
+	C.long      int32
+	C.ulong     uint32
+	C.longlong  int64
+	C.ulonglong uint64
 )
-type _Cgo_myint = _Cgo_int
-type _Cgo_struct_point2d_t struct {
-	x _Cgo_int
-	y _Cgo_int
+type C.myint = C.int
+type C.struct_point2d_t struct {
+	x C.int
+	y C.int
 }
-type _Cgo_point2d_t = _Cgo_struct_point2d_t
-type _Cgo_struct_point3d struct {
-	x _Cgo_int
-	y _Cgo_int
-	z _Cgo_int
+type C.point2d_t = C.struct_point2d_t
+type C.struct_point3d struct {
+	x C.int
+	y C.int
+	z C.int
 }
-type _Cgo_point3d_t = _Cgo_struct_point3d
-type _Cgo_struct_type1 struct {
-	_type   _Cgo_int
-	__type  _Cgo_int
-	___type _Cgo_int
+type C.point3d_t = C.struct_point3d
+type C.struct_type1 struct {
+	_type   C.int
+	__type  C.int
+	___type C.int
 }
-type _Cgo_struct_type2 struct{ _type _Cgo_int }
-type _Cgo_union_union1_t struct{ i _Cgo_int }
-type _Cgo_union1_t = _Cgo_union_union1_t
-type _Cgo_union_union3_t struct{ $union uint64 }
+type C.struct_type2 struct{ _type C.int }
+type C.union_union1_t struct{ i C.int }
+type C.union1_t = C.union_union1_t
+type C.union_union3_t struct{ $union uint64 }

-func (union *_Cgo_union_union3_t) unionfield_i() *_Cgo_int {
-	return (*_Cgo_int)(unsafe.Pointer(&union.$union))
-}
-func (union *_Cgo_union_union3_t) unionfield_d() *float64 {
+func (union *C.union_union3_t) unionfield_i() *C.int { return (*C.int)(unsafe.Pointer(&union.$union)) }
+func (union *C.union_union3_t) unionfield_d() *float64 {
 	return (*float64)(unsafe.Pointer(&union.$union))
 }
-func (union *_Cgo_union_union3_t) unionfield_s() *_Cgo_short {
-	return (*_Cgo_short)(unsafe.Pointer(&union.$union))
+func (union *C.union_union3_t) unionfield_s() *C.short {
+	return (*C.short)(unsafe.Pointer(&union.$union))
 }

-type _Cgo_union3_t = _Cgo_union_union3_t
-type _Cgo_union_union2d struct{ $union [2]uint64 }
+type C.union3_t = C.union_union3_t
+type C.union_union2d struct{ $union [2]uint64 }

-func (union *_Cgo_union_union2d) unionfield_i() *_Cgo_int {
-	return (*_Cgo_int)(unsafe.Pointer(&union.$union))
-}
-func (union *_Cgo_union_union2d) unionfield_d() *[2]float64 {
+func (union *C.union_union2d) unionfield_i() *C.int { return (*C.int)(unsafe.Pointer(&union.$union)) }
+func (union *C.union_union2d) unionfield_d() *[2]float64 {
 	return (*[2]float64)(unsafe.Pointer(&union.$union))
 }

-type _Cgo_union2d_t = _Cgo_union_union2d
-type _Cgo_union_unionarray_t struct{ arr [10]_Cgo_uchar }
-type _Cgo_unionarray_t = _Cgo_union_unionarray_t
-type _Cgo__Ctype_union___0 struct{ $union [3]uint32 }
+type C.union2d_t = C.union_union2d
+type C.union_unionarray_t struct{ arr [10]C.uchar }
+type C.unionarray_t = C.union_unionarray_t
+type C._Ctype_union___0 struct{ $union [3]uint32 }

-func (union *_Cgo__Ctype_union___0) unionfield_area() *_Cgo_point2d_t {
-	return (*_Cgo_point2d_t)(unsafe.Pointer(&union.$union))
+func (union *C._Ctype_union___0) unionfield_area() *C.point2d_t {
+	return (*C.point2d_t)(unsafe.Pointer(&union.$union))
 }
-func (union *_Cgo__Ctype_union___0) unionfield_solid() *_Cgo_point3d_t {
-	return (*_Cgo_point3d_t)(unsafe.Pointer(&union.$union))
+func (union *C._Ctype_union___0) unionfield_solid() *C.point3d_t {
+	return (*C.point3d_t)(unsafe.Pointer(&union.$union))
 }

-type _Cgo_struct_struct_nested_t struct {
-	begin _Cgo_point2d_t
-	end   _Cgo_point2d_t
-	tag   _Cgo_int
+type C.struct_struct_nested_t struct {
+	begin C.point2d_t
+	end   C.point2d_t
+	tag   C.int

-	coord _Cgo__Ctype_union___0
+	coord C._Ctype_union___0
 }
-type _Cgo_struct_nested_t = _Cgo_struct_struct_nested_t
-type _Cgo_union_union_nested_t struct{ $union [2]uint64 }
+type C.struct_nested_t = C.struct_struct_nested_t
+type C.union_union_nested_t struct{ $union [2]uint64 }

-func (union *_Cgo_union_union_nested_t) unionfield_point() *_Cgo_point3d_t {
-	return (*_Cgo_point3d_t)(unsafe.Pointer(&union.$union))
+func (union *C.union_union_nested_t) unionfield_point() *C.point3d_t {
+	return (*C.point3d_t)(unsafe.Pointer(&union.$union))
 }
-func (union *_Cgo_union_union_nested_t) unionfield_array() *_Cgo_unionarray_t {
-	return (*_Cgo_unionarray_t)(unsafe.Pointer(&union.$union))
+func (union *C.union_union_nested_t) unionfield_array() *C.unionarray_t {
+	return (*C.unionarray_t)(unsafe.Pointer(&union.$union))
 }
-func (union *_Cgo_union_union_nested_t) unionfield_thing() *_Cgo_union3_t {
-	return (*_Cgo_union3_t)(unsafe.Pointer(&union.$union))
+func (union *C.union_union_nested_t) unionfield_thing() *C.union3_t {
+	return (*C.union3_t)(unsafe.Pointer(&union.$union))
 }

-type _Cgo_union_nested_t = _Cgo_union_union_nested_t
-type _Cgo_enum_option = _Cgo_int
-type _Cgo_option_t = _Cgo_enum_option
-type _Cgo_enum_option2_t = _Cgo_uint
-type _Cgo_option2_t = _Cgo_enum_option2_t
-type _Cgo_struct_types_t struct {
+type C.union_nested_t = C.union_union_nested_t
+type C.enum_option = C.int
+type C.option_t = C.enum_option
+type C.enum_option2_t = C.uint
+type C.option2_t = C.enum_option2_t
+type C.struct_types_t struct {
 	f   float32
 	d   float64
-	ptr *_Cgo_int
+	ptr *C.int
 }
-type _Cgo_types_t = _Cgo_struct_types_t
-type _Cgo_myIntArray = [10]_Cgo_int
-type _Cgo_struct_bitfield_t struct {
-	start        _Cgo_uchar
-	__bitfield_1 _Cgo_uchar
+type C.types_t = C.struct_types_t
+type C.myIntArray = [10]C.int
+type C.struct_bitfield_t struct {
+	start        C.uchar
+	__bitfield_1 C.uchar

-	d _Cgo_uchar
-	e _Cgo_uchar
+	d C.uchar
+	e C.uchar
 }

-func (s *_Cgo_struct_bitfield_t) bitfield_a() _Cgo_uchar { return s.__bitfield_1 & 0x1f }
-func (s *_Cgo_struct_bitfield_t) set_bitfield_a(value _Cgo_uchar) {
+func (s *C.struct_bitfield_t) bitfield_a() C.uchar { return s.__bitfield_1 & 0x1f }
+func (s *C.struct_bitfield_t) set_bitfield_a(value C.uchar) {
 	s.__bitfield_1 = s.__bitfield_1&^0x1f | value&0x1f<<0
 }
-func (s *_Cgo_struct_bitfield_t) bitfield_b() _Cgo_uchar {
+func (s *C.struct_bitfield_t) bitfield_b() C.uchar {
 	return s.__bitfield_1 >> 5 & 0x1
 }
-func (s *_Cgo_struct_bitfield_t) set_bitfield_b(value _Cgo_uchar) {
+func (s *C.struct_bitfield_t) set_bitfield_b(value C.uchar) {
 	s.__bitfield_1 = s.__bitfield_1&^0x20 | value&0x1<<5
 }
-func (s *_Cgo_struct_bitfield_t) bitfield_c() _Cgo_uchar {
+func (s *C.struct_bitfield_t) bitfield_c() C.uchar {
 	return s.__bitfield_1 >> 6
 }
-func (s *_Cgo_struct_bitfield_t) set_bitfield_c(value _Cgo_uchar,
+func (s *C.struct_bitfield_t) set_bitfield_c(value C.uchar,

 ) { s.__bitfield_1 = s.__bitfield_1&0x3f | value<<6 }

-type _Cgo_bitfield_t = _Cgo_struct_bitfield_t
+type C.bitfield_t = C.struct_bitfield_t
@@ -8,24 +8,12 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
-	"strconv"
 	"strings"

 	"github.com/google/shlex"
 	"github.com/tinygo-org/tinygo/goenv"
 )

-// Library versions. Whenever an existing library is changed, this number should
-// be added/increased so that existing caches are invalidated.
-//
-// (This is a bit of a layering violation, this should really be part of the
-// builder.Library struct but that's hard to do since we want to know the
-// library path in advance in several places).
-var libVersions = map[string]int{
-	"musl":  3,
-	"bdwgc": 2,
-}
-
 // Config keeps all configuration affecting the build in a single struct.
 type Config struct {
 	Options        *Options
@@ -45,17 +33,6 @@ func (c *Config) CPU() string {
 	return c.Target.CPU
 }

-// The current build mode (like the `-buildmode` command line flag).
-func (c *Config) BuildMode() string {
-	if c.Options.BuildMode != "" {
-		return c.Options.BuildMode
-	}
-	if c.Target.BuildMode != "" {
-		return c.Target.BuildMode
-	}
-	return "default"
-}
-
 // Features returns a list of features this CPU supports. For example, for a
 // RISC-V processor, that could be "+a,+c,+m". For many targets, an empty list
 // will be returned.
@@ -111,11 +88,6 @@ func (c *Config) BuildTags() []string {
 		"math_big_pure_go",                           // to get math/big to work
 		"gc." + c.GC(), "scheduler." + c.Scheduler(), // used inside the runtime package
 		"serial." + c.Serial()}...) // used inside the machine package
-	switch c.Scheduler() {
-	case "threads", "cores":
-	default:
-		tags = append(tags, "tinygo.unicore")
-	}
 	for i := 1; i <= c.GoMinorVersion; i++ {
 		tags = append(tags, fmt.Sprintf("go1.%d", i))
 	}
@@ -139,7 +111,7 @@ func (c *Config) GC() string {
 // that can be traced by the garbage collector.
 func (c *Config) NeedsStackObjects() bool {
 	switch c.GC() {
-	case "conservative", "custom", "precise", "boehm":
+	case "conservative", "custom", "precise":
 		for _, tag := range c.BuildTags() {
 			if tag == "tinygo.wasm" {
 				return true
@@ -226,7 +198,7 @@ func (c *Config) StackSize() uint64 {

 // MaxStackAlloc returns the size of the maximum allocation to put on the stack vs heap.
 func (c *Config) MaxStackAlloc() uint64 {
-	if c.StackSize() >= 16*1024 {
+	if c.StackSize() > 32*1024 {
 		return 1024
 	}

@@ -264,18 +236,10 @@ func MuslArchitecture(triple string) string {
 	return CanonicalArchName(triple)
 }

-// Returns true if the libc needs to include malloc, for the libcs where this
-// matters.
-func (c *Config) LibcNeedsMalloc() bool {
-	if c.GC() == "boehm" && c.Target.Libc == "wasi-libc" {
-		return true
-	}
-	return false
-}
-
-// LibraryPath returns the path to the library build directory. The path will be
-// a library path in the cache directory (which might not yet be built).
-func (c *Config) LibraryPath(name string) string {
+// LibcPath returns the path to the libc directory. The libc path will be either
+// a precompiled libc shipped with a TinyGo build, or a libc path in the cache
+// directory (which might not yet be built).
+func (c *Config) LibcPath(name string) (path string, precompiled bool) {
 	archname := c.Triple()
 	if c.CPU() != "" {
 		archname += "-" + c.CPU()
@@ -286,24 +250,18 @@ func (c *Config) LibraryPath(name string) string {
 	if c.Target.SoftFloat {
 		archname += "-softfloat"
 	}
-	if name == "bdwgc" {
-		// Boehm GC is compiled against a particular libc.
-		archname += "-" + c.Target.Libc
-	}

-	// Append a version string, if this library has a version.
-	if v, ok := libVersions[name]; ok {
-		archname += "-v" + strconv.Itoa(v)
-	}
-
-	options := ""
-	if c.LibcNeedsMalloc() {
-		options += "+malloc"
+	// Try to load a precompiled library.
+	precompiledDir := filepath.Join(goenv.Get("TINYGOROOT"), "pkg", archname, name)
+	if _, err := os.Stat(precompiledDir); err == nil {
+		// Found a precompiled library for this OS/architecture. Return the path
+		// directly.
+		return precompiledDir, true
 	}

 	// No precompiled library found. Determine the path name that will be used
 	// in the build cache.
-	return filepath.Join(goenv.Get("GOCACHE"), name+options+"-"+archname)
+	return filepath.Join(goenv.Get("GOCACHE"), name+"-"+archname), false
 }

 // DefaultBinaryExtension returns the default extension for binaries, such as
@@ -346,7 +304,57 @@ func (c *Config) CFlags(libclang bool) []string {
 			"-resource-dir="+resourceDir,
 		)
 	}
-	cflags = append(cflags, c.LibcCFlags()...)
+	switch c.Target.Libc {
+	case "darwin-libSystem":
+		root := goenv.Get("TINYGOROOT")
+		cflags = append(cflags,
+			"-nostdlibinc",
+			"-isystem", filepath.Join(root, "lib/macos-minimal-sdk/src/usr/include"),
+		)
+	case "picolibc":
+		root := goenv.Get("TINYGOROOT")
+		picolibcDir := filepath.Join(root, "lib", "picolibc", "newlib", "libc")
+		path, _ := c.LibcPath("picolibc")
+		cflags = append(cflags,
+			"-nostdlibinc",
+			"-isystem", filepath.Join(path, "include"),
+			"-isystem", filepath.Join(picolibcDir, "include"),
+			"-isystem", filepath.Join(picolibcDir, "tinystdio"),
+		)
+	case "musl":
+		root := goenv.Get("TINYGOROOT")
+		path, _ := c.LibcPath("musl")
+		arch := MuslArchitecture(c.Triple())
+		cflags = append(cflags,
+			"-nostdlibinc",
+			"-isystem", filepath.Join(path, "include"),
+			"-isystem", filepath.Join(root, "lib", "musl", "arch", arch),
+			"-isystem", filepath.Join(root, "lib", "musl", "include"),
+		)
+	case "wasi-libc":
+		root := goenv.Get("TINYGOROOT")
+		cflags = append(cflags,
+			"-nostdlibinc",
+			"-isystem", root+"/lib/wasi-libc/sysroot/include")
+	case "wasmbuiltins":
+		// nothing to add (library is purely for builtins)
+	case "mingw-w64":
+		root := goenv.Get("TINYGOROOT")
+		path, _ := c.LibcPath("mingw-w64")
+		cflags = append(cflags,
+			"-nostdlibinc",
+			"-isystem", filepath.Join(path, "include"),
+			"-isystem", filepath.Join(root, "lib", "mingw-w64", "mingw-w64-headers", "crt"),
+			"-isystem", filepath.Join(root, "lib", "mingw-w64", "mingw-w64-headers", "defaults", "include"),
+			"-D_UCRT",
+		)
+	case "":
+		// No libc specified, nothing to add.
+	default:
+		// Incorrect configuration. This could be handled in a better way, but
+		// usually this will be found by developers (not by TinyGo users).
+		panic("unknown libc: " + c.Target.Libc)
+	}
 	// Always emit debug information. It is optionally stripped at link time.
 	cflags = append(cflags, "-gdwarf-4")
 	// Use the same optimization level as TinyGo.
@@ -373,80 +381,6 @@ func (c *Config) CFlags(libclang bool) []string {
 	return cflags
 }

-// LibcCFlags returns the C compiler flags for the configured libc.
-// It only uses flags that are part of the libc path (triple, cpu, abi, libc
-// name) so it can safely be used to compile another C library.
-func (c *Config) LibcCFlags() []string {
-	switch c.Target.Libc {
-	case "darwin-libSystem":
-		root := goenv.Get("TINYGOROOT")
-		return []string{
-			"-nostdlibinc",
-			"-isystem", filepath.Join(root, "lib/macos-minimal-sdk/src/usr/include"),
-		}
-	case "picolibc":
-		root := goenv.Get("TINYGOROOT")
-		picolibcDir := filepath.Join(root, "lib", "picolibc", "newlib", "libc")
-		path := c.LibraryPath("picolibc")
-		return []string{
-			"-nostdlibinc",
-			"-isystem", filepath.Join(path, "include"),
-			"-isystem", filepath.Join(picolibcDir, "include"),
-			"-isystem", filepath.Join(picolibcDir, "tinystdio"),
-			"-D__PICOLIBC_ERRNO_FUNCTION=__errno_location",
-		}
-	case "musl":
-		root := goenv.Get("TINYGOROOT")
-		path := c.LibraryPath("musl")
-		arch := MuslArchitecture(c.Triple())
-		return []string{
-			"-nostdlibinc",
-			"-isystem", filepath.Join(path, "include"),
-			"-isystem", filepath.Join(root, "lib", "musl", "arch", arch),
-			"-isystem", filepath.Join(root, "lib", "musl", "arch", "generic"),
-			"-isystem", filepath.Join(root, "lib", "musl", "include"),
-		}
-	case "wasi-libc":
-		path := c.LibraryPath("wasi-libc")
-		return []string{
-			"-nostdlibinc",
-			"-isystem", filepath.Join(path, "include"),
-		}
-	case "wasmbuiltins":
-		// nothing to add (library is purely for builtins)
-		return nil
-	case "mingw-w64":
-		root := goenv.Get("TINYGOROOT")
-		path := c.LibraryPath("mingw-w64")
-		cflags := []string{
-			"-nostdlibinc",
-			"-isystem", filepath.Join(path, "include"),
-			"-isystem", filepath.Join(root, "lib", "mingw-w64", "mingw-w64-headers", "crt"),
-			"-isystem", filepath.Join(root, "lib", "mingw-w64", "mingw-w64-headers", "include"),
-			"-isystem", filepath.Join(root, "lib", "mingw-w64", "mingw-w64-headers", "defaults", "include"),
-		}
-		if c.GOARCH() == "386" {
-			cflags = append(cflags,
-				"-D__MSVCRT_VERSION__=0x700", // Microsoft Visual C++ .NET 2002
-				"-D_WIN32_WINNT=0x0501",      // target Windows XP
-			)
-		} else {
-			cflags = append(cflags,
-				"-D_UCRT",
-				"-D_WIN32_WINNT=0x0a00", // target Windows 10
-			)
-		}
-		return cflags
-	case "":
-		// No libc specified, nothing to add.
-		return nil
-	default:
-		// Incorrect configuration. This could be handled in a better way, but
-		// usually this will be found by developers (not by TinyGo users).
-		panic("unknown libc: " + c.Target.Libc)
-	}
-}
-
 // LDFlags returns the flags to pass to the linker. A few more flags are needed
 // (like the one for the compiler runtime), but this represents the majority of
 // the flags.
@@ -461,8 +395,6 @@ func (c *Config) LDFlags() []string {
 	if c.Target.LinkerScript != "" {
 		ldflags = append(ldflags, "-T", c.Target.LinkerScript)
 	}
-	ldflags = append(ldflags, c.Options.ExtLDFlags...)
-
 	return ldflags
 }

@@ -536,7 +468,7 @@ func (c *Config) Programmer() (method, openocdInterface string) {
 	case "":
 		// No configuration supplied.
 		return c.Target.FlashMethod, c.Target.OpenOCDInterface
-	case "openocd", "msd", "command", "adb":
+	case "openocd", "msd", "command":
 		// The -programmer flag only specifies the flash method.
 		return c.Options.Programmer, c.Target.OpenOCDInterface
 	case "bmp":
@@ -8,11 +8,10 @@ import (
 )

 var (
-	validBuildModeOptions     = []string{"default", "c-shared", "wasi-legacy"}
-	validGCOptions            = []string{"none", "leaking", "conservative", "custom", "precise", "boehm"}
-	validSchedulerOptions     = []string{"none", "tasks", "asyncify", "threads", "cores"}
+	validGCOptions            = []string{"none", "leaking", "conservative", "custom", "precise"}
+	validSchedulerOptions     = []string{"none", "tasks", "asyncify"}
 	validSerialOptions        = []string{"none", "uart", "usb", "rtt"}
-	validPrintSizeOptions     = []string{"none", "short", "full", "html"}
+	validPrintSizeOptions     = []string{"none", "short", "full"}
 	validPanicStrategyOptions = []string{"print", "trap"}
 	validOptOptions           = []string{"none", "0", "1", "2", "s", "z"}
 )
@@ -21,58 +20,46 @@ var (
 // usually passed from the command line, but can also be passed in environment
 // variables for example.
 type Options struct {
-	GOOS                    string // environment variable
-	GOARCH                  string // environment variable
-	GOARM                   string // environment variable (only used with GOARCH=arm)
-	GOMIPS                  string // environment variable (only used with GOARCH=mips and GOARCH=mipsle)
-	Directory               string // working dir, leave it unset to use the current working dir
-	Target                  string
-	BuildMode               string // -buildmode flag
-	Opt                     string
-	GC                      string
-	PanicStrategy           string
-	Scheduler               string
-	StackSize               uint64 // goroutine stack size (if none could be automatically determined)
-	Serial                  string
-	Work                    bool // -work flag to print temporary build directory
-	InterpTimeout           time.Duration
-	InterpMaxLoopIterations int
-	PrintIR                 bool
-	DumpSSA                 bool
-	VerifyIR                bool
-	SkipDWARF               bool
-	PrintCommands           func(cmd string, args ...string) `json:"-"`
-	Semaphore               chan struct{}                    `json:"-"` // -p flag controls cap
-	Debug                   bool
-	Nobounds                bool
-	PrintSizes              string
-	PrintAllocs             *regexp.Regexp // regexp string
-	PrintStacks             bool
-	Tags                    []string
-	GlobalValues            map[string]map[string]string // map[pkgpath]map[varname]value
-	TestConfig              TestConfig
-	Programmer              string
-	OpenOCDCommands         []string
-	LLVMFeatures            string
-	Monitor                 bool
-	BaudRate                int
-	Timeout                 time.Duration
-	WITPackage              string // pass through to wasm-tools component embed invocation
-	WITWorld                string // pass through to wasm-tools component embed -w option
-	ExtLDFlags              []string
-	GoCompatibility         bool // enable to check for Go version compatibility
+	GOOS            string // environment variable
+	GOARCH          string // environment variable
+	GOARM           string // environment variable (only used with GOARCH=arm)
+	GOMIPS          string // environment variable (only used with GOARCH=mips and GOARCH=mipsle)
+	Directory       string // working dir, leave it unset to use the current working dir
+	Target          string
+	Opt             string
+	GC              string
+	PanicStrategy   string
+	Scheduler       string
+	StackSize       uint64 // goroutine stack size (if none could be automatically determined)
+	Serial          string
+	Work            bool // -work flag to print temporary build directory
+	InterpTimeout   time.Duration
+	PrintIR         bool
+	DumpSSA         bool
+	VerifyIR        bool
+	SkipDWARF       bool
+	PrintCommands   func(cmd string, args ...string) `json:"-"`
+	Semaphore       chan struct{}                    `json:"-"` // -p flag controls cap
+	Debug           bool
+	PrintSizes      string
+	PrintAllocs     *regexp.Regexp // regexp string
+	PrintStacks     bool
+	Tags            []string
+	GlobalValues    map[string]map[string]string // map[pkgpath]map[varname]value
+	TestConfig      TestConfig
+	Programmer      string
+	OpenOCDCommands []string
+	LLVMFeatures    string
+	PrintJSON       bool
+	Monitor         bool
+	BaudRate        int
+	Timeout         time.Duration
+	WITPackage      string // pass through to wasm-tools component embed invocation
+	WITWorld        string // pass through to wasm-tools component embed -w option
 }

 // Verify performs a validation on the given options, raising an error if options are not valid.
 func (o *Options) Verify() error {
-	if o.BuildMode != "" {
-		valid := isInArray(validBuildModeOptions, o.BuildMode)
-		if !valid {
-			return fmt.Errorf(`invalid buildmode option '%s': valid values are %s`,
-				o.BuildMode,
-				strings.Join(validBuildModeOptions, ", "))
-		}
-	}
 	if o.GC != "" {
 		valid := isInArray(validGCOptions, o.GC)
 		if !valid {
@@ -9,9 +9,9 @@ import (

 func TestVerifyOptions(t *testing.T) {

-	expectedGCError := errors.New(`invalid gc option 'incorrect': valid values are none, leaking, conservative, custom, precise, boehm`)
-	expectedSchedulerError := errors.New(`invalid scheduler option 'incorrect': valid values are none, tasks, asyncify, threads, cores`)
-	expectedPrintSizeError := errors.New(`invalid size option 'incorrect': valid values are none, short, full, html`)
+	expectedGCError := errors.New(`invalid gc option 'incorrect': valid values are none, leaking, conservative, custom, precise`)
+	expectedSchedulerError := errors.New(`invalid scheduler option 'incorrect': valid values are none, tasks, asyncify`)
+	expectedPrintSizeError := errors.New(`invalid size option 'incorrect': valid values are none, short, full`)
 	expectedPanicStrategyError := errors.New(`invalid panic option 'incorrect': valid values are print, trap`)

 	testCases := []struct {
@@ -24,7 +24,6 @@ import (
 // https://github.com/shepmaster/rust-arduino-blink-led-no-core-with-cargo/blob/master/blink/arduino.json
 type TargetSpec struct {
 	Inherits         []string `json:"inherits,omitempty"`
-	InheritableOnly  bool     `json:"inheritable-only"` // this target is only meant to be inherited from, not used directly
 	Triple           string   `json:"llvm-target,omitempty"`
 	CPU              string   `json:"cpu,omitempty"`
 	ABI              string   `json:"target-abi,omitempty"` // roughly equivalent to -mabi= flag
@@ -33,7 +32,6 @@ type TargetSpec struct {
 	GOARCH           string   `json:"goarch,omitempty"`
 	SoftFloat        bool     // used for non-baremetal systems (GOMIPS=softfloat etc)
 	BuildTags        []string `json:"build-tags,omitempty"`
-	BuildMode        string   `json:"buildmode,omitempty"` // default build mode (if nothing specified)
 	GC               string   `json:"gc,omitempty"`
 	Scheduler        string   `json:"scheduler,omitempty"`
 	Serial           string   `json:"serial,omitempty"` // which serial output to use (uart, usb, none)
@@ -47,7 +45,6 @@ type TargetSpec struct {
 	LinkerScript     string   `json:"linkerscript,omitempty"`
 	ExtraFiles       []string `json:"extra-files,omitempty"`
 	RP2040BootPatch  *bool    `json:"rp2040-boot-patch,omitempty"` // Patch RP2040 2nd stage bootloader checksum
-	BootPatches      []string `json:"boot-patches,omitempty"`      // Bootloader patches to be applied in the order they appear.
 	Emulator         string   `json:"emulator,omitempty"`
 	FlashCommand     string   `json:"flash-command,omitempty"`
 	GDB              []string `json:"gdb,omitempty"`
@@ -64,9 +61,6 @@ type TargetSpec struct {
 	OpenOCDCommands  []string `json:"openocd-commands,omitempty"`
 	OpenOCDVerify    *bool    `json:"openocd-verify,omitempty"` // enable verify when flashing with openocd
 	JLinkDevice      string   `json:"jlink-device,omitempty"`
-	ADBPreCommands   []string `json:"adb-pre-commands,omitempty"`
-	ADBPushRemote    string   `json:"adb-push-remote,omitempty"`
-	ADBPostCommands  []string `json:"adb-post-commands,omitempty"`
 	CodeModel        string   `json:"code-model,omitempty"`
 	RelocationModel  string   `json:"relocation-model,omitempty"`
 	WITPackage       string   `json:"wit-package,omitempty"`
@@ -152,11 +146,6 @@ func (spec *TargetSpec) loadFromGivenStr(str string) error {

 // resolveInherits loads inherited targets, recursively.
 func (spec *TargetSpec) resolveInherits() error {
-	// Save InheritableOnly before resolving, since it must not propagate
-	// from parent to child (a board target should not become inheritable-only
-	// just because its parent processor target is).
-	inheritableOnly := spec.InheritableOnly
-
 	// First create a new spec with all the inherited properties.
 	newSpec := &TargetSpec{}
 	for _, name := range spec.Inherits {
@@ -182,29 +171,11 @@ func (spec *TargetSpec) resolveInherits() error {
 	}
 	*spec = *newSpec

-	// Restore InheritableOnly from the original spec, not from parents.
-	spec.InheritableOnly = inheritableOnly
-
 	return nil
 }

 // Load a target specification.
 func LoadTarget(options *Options) (*TargetSpec, error) {
-	if options.Target == "" && options.GOARCH == "wasm" {
-		// Set a specific target if we're building from a known GOOS/GOARCH
-		// combination that is defined in a target JSON file.
-		switch options.GOOS {
-		case "js":
-			options.Target = "wasm"
-		case "wasip1":
-			options.Target = "wasip1"
-		case "wasip2":
-			options.Target = "wasip2"
-		default:
-			return nil, errors.New("GOARCH=wasm but GOOS is not set correctly. Please set GOOS to js, wasip1, or wasip2.")
-		}
-	}
-
 	if options.Target == "" {
 		return defaultTarget(options)
 	}
@@ -251,17 +222,10 @@ func GetTargetSpecs() (map[string]*TargetSpec, error) {
 			continue
 		}
 		path := filepath.Join(dir, entry.Name())
-
 		spec, err := LoadTarget(&Options{Target: path})
 		if err != nil {
 			return nil, fmt.Errorf("could not list target: %w", err)
 		}
-
-		if spec.InheritableOnly {
-			// Skip targets that are only meant to be inherited from, not used directly.
-			continue
-		}
-
 		if spec.FlashMethod == "" && spec.FlashCommand == "" && spec.Emulator == "" {
 			// This doesn't look like a regular target file, but rather like
 			// a parent target (such as targets/cortex-m.json).
@@ -281,6 +245,8 @@ func defaultTarget(options *Options) (*TargetSpec, error) {
 		GOOS:             options.GOOS,
 		GOARCH:           options.GOARCH,
 		BuildTags:        []string{options.GOOS, options.GOARCH},
+		GC:               "precise",
+		Scheduler:        "tasks",
 		Linker:           "cc",
 		DefaultStackSize: 1024 * 64, // 64kB
 		GDB:              []string{"gdb"},
@@ -360,14 +326,14 @@ func defaultTarget(options *Options) (*TargetSpec, error) {
 		spec.CPU = "generic"
 		llvmarch = "aarch64"
 		if options.GOOS == "darwin" {
-			spec.Features = "+ete,+fp-armv8,+neon,+trbe,+v8a"
+			spec.Features = "+fp-armv8,+neon"
 			// Looks like Apple prefers to call this architecture ARM64
 			// instead of AArch64.
 			llvmarch = "arm64"
 		} else if options.GOOS == "windows" {
-			spec.Features = "+ete,+fp-armv8,+neon,+trbe,+v8a,-fmv"
+			spec.Features = "+fp-armv8,+neon,-fmv"
 		} else { // linux
-			spec.Features = "+ete,+fp-armv8,+neon,+trbe,+v8a,-fmv,-outline-atomics"
+			spec.Features = "+fp-armv8,+neon,-fmv,-outline-atomics"
 		}
 	case "mips", "mipsle":
 		spec.CPU = "mips32"
@@ -388,7 +354,15 @@ func defaultTarget(options *Options) (*TargetSpec, error) {
 			return nil, fmt.Errorf("invalid GOMIPS=%s: must be hardfloat or softfloat", options.GOMIPS)
 		}
 	case "wasm":
-		return nil, fmt.Errorf("GOARCH=wasm but GOOS is unset. Please set GOOS to js, wasip1, or wasip2.")
+		llvmarch = "wasm32"
+		spec.CPU = "generic"
+		spec.Features = "+bulk-memory,+mutable-globals,+nontrapping-fptoint,+sign-ext"
+		spec.BuildTags = append(spec.BuildTags, "tinygo.wasm")
+		spec.CFlags = append(spec.CFlags,
+			"-mbulk-memory",
+			"-mnontrapping-fptoint",
+			"-msign-ext",
+		)
 	default:
 		return nil, fmt.Errorf("unknown GOARCH=%s", options.GOARCH)
 	}
@@ -398,13 +372,11 @@ func defaultTarget(options *Options) (*TargetSpec, error) {
 	llvmvendor := "unknown"
 	switch options.GOOS {
 	case "darwin":
-		spec.GC = "boehm"
 		platformVersion := "10.12.0"
 		if options.GOARCH == "arm64" {
 			platformVersion = "11.0.0" // first macosx platform with arm64 support
 		}
 		llvmvendor = "apple"
-		spec.Scheduler = "threads"
 		spec.Linker = "ld.lld"
 		spec.Libc = "darwin-libSystem"
 		// Use macosx* instead of darwin, otherwise darwin/arm64 will refer to
@@ -417,14 +389,9 @@ func defaultTarget(options *Options) (*TargetSpec, error) {
 			"-platform_version", "macos", platformVersion, platformVersion,
 		)
 		spec.ExtraFiles = append(spec.ExtraFiles,
-			"src/internal/futex/futex_darwin.c",
-			"src/internal/task/task_threads.c",
 			"src/runtime/os_darwin.c",
-			"src/runtime/runtime_unix.c",
-			"src/runtime/signal.c")
+			"src/runtime/runtime_unix.c")
 	case "linux":
-		spec.GC = "boehm"
-		spec.Scheduler = "threads"
 		spec.Linker = "ld.lld"
 		spec.RTLib = "compiler-rt"
 		spec.Libc = "musl"
@@ -444,31 +411,18 @@ func defaultTarget(options *Options) (*TargetSpec, error) {
 			spec.CFlags = append(spec.CFlags, "-mno-outline-atomics")
 		}
 		spec.ExtraFiles = append(spec.ExtraFiles,
-			"src/internal/futex/futex_linux.c",
-			"src/internal/task/task_threads.c",
-			"src/runtime/runtime_unix.c",
-			"src/runtime/signal.c")
+			"src/runtime/runtime_unix.c")
 	case "windows":
-		spec.GC = "boehm"
-		spec.Scheduler = "tasks"
 		spec.Linker = "ld.lld"
 		spec.Libc = "mingw-w64"
+		// Note: using a medium code model, low image base and no ASLR
+		// because Go doesn't really need those features. ASLR patches
+		// around issues for unsafe languages like C/C++ that are not
+		// normally present in Go (without explicitly opting in).
+		// For more discussion:
+		// https://groups.google.com/g/Golang-nuts/c/Jd9tlNc6jUE/m/Zo-7zIP_m3MJ?pli=1
 		switch options.GOARCH {
-		case "386":
-			spec.LDFlags = append(spec.LDFlags,
-				"-m", "i386pe",
-				"--major-os-version", "4",
-				"--major-subsystem-version", "4",
-			)
-			// __udivdi3 is not present in ucrt it seems.
-			spec.RTLib = "compiler-rt"
 		case "amd64":
-			// Note: using a medium code model, low image base and no ASLR
-			// because Go doesn't really need those features. ASLR patches
-			// around issues for unsafe languages like C/C++ that are not
-			// normally present in Go (without explicitly opting in).
-			// For more discussion:
-			// https://groups.google.com/g/Golang-nuts/c/Jd9tlNc6jUE/m/Zo-7zIP_m3MJ?pli=1
 			spec.LDFlags = append(spec.LDFlags,
 				"-m", "i386pep",
 				"--image-base", "0x400000",
@@ -484,18 +438,27 @@ func defaultTarget(options *Options) (*TargetSpec, error) {
 			"--no-insert-timestamp",
 			"--no-dynamicbase",
 		)
-	case "wasm", "wasip1", "wasip2":
-		return nil, fmt.Errorf("GOOS=%s but GOARCH is unset. Please set GOARCH to wasm", options.GOOS)
+	case "wasip1":
+		spec.GC = "" // use default GC
+		spec.Scheduler = "asyncify"
+		spec.Linker = "wasm-ld"
+		spec.RTLib = "compiler-rt"
+		spec.Libc = "wasi-libc"
+		spec.DefaultStackSize = 1024 * 64 // 64kB
+		spec.LDFlags = append(spec.LDFlags,
+			"--stack-first",
+			"--no-demangle",
+		)
+		spec.Emulator = "wasmtime --dir={tmpDir}::/tmp {}"
+		spec.ExtraFiles = append(spec.ExtraFiles,
+			"src/runtime/asm_tinygowasm.S",
+			"src/internal/task/task_asyncify_wasm.S",
+		)
+		llvmos = "wasi"
 	default:
 		return nil, fmt.Errorf("unknown GOOS=%s", options.GOOS)
 	}

-	if spec.GC == "boehm" {
-		// Add this file only when needed. This fixes a build failure on
-		// Windows.
-		spec.ExtraFiles = append(spec.ExtraFiles, "src/runtime/gc_boehm.c")
-	}
-
 	// Target triples (which actually have four components, but are called
 	// triples for historical reasons) have the form:
 	//   arch-vendor-os-environment
@@ -23,37 +23,6 @@ func TestLoadTarget(t *testing.T) {
 	}
 }

-func TestGetTargetSpecs_InheritableOnlyTargetsExcluded(t *testing.T) {
-	specs, err := GetTargetSpecs()
-	if err != nil {
-		t.Fatal("GetTargetSpecs failed:", err)
-	}
-
-	// Inheritable-only processor-level targets should not appear in the listing.
-	inheritableOnlyTargets := []string{"esp32", "esp32c3", "esp32s3", "esp8266", "rp2040", "rp2350", "rp2350b"}
-	for _, name := range inheritableOnlyTargets {
-		if _, ok := specs[name]; ok {
-			t.Errorf("inheritable-only target %q should not appear in GetTargetSpecs", name)
-		}
-	}
-
-	// Board targets that inherit from inheritable-only targets should still appear.
-	boardTargets := []string{"esp32-coreboard-v2", "pico"}
-	for _, name := range boardTargets {
-		if _, ok := specs[name]; !ok {
-			t.Errorf("board target %q should appear in GetTargetSpecs", name)
-		}
-	}
-}
-
-func TestLoadTarget_InheritableOnlyTargetStillLoadable(t *testing.T) {
-	// Inheritable-only targets should still be loadable directly (for building).
-	_, err := LoadTarget(&Options{Target: "esp32"})
-	if err != nil {
-		t.Errorf("LoadTarget should still load inheritable-only target esp32: %v", err)
-	}
-}
-
 func TestOverrideProperties(t *testing.T) {
 	baseAutoStackSize := true
 	base := &TargetSpec{
@@ -18,12 +18,11 @@ var stdlibAliases = map[string]string{
 	// crypto packages
 	"crypto/ed25519/internal/edwards25519/field.feMul": "crypto/ed25519/internal/edwards25519/field.feMulGeneric",
 	"crypto/internal/edwards25519/field.feSquare":      "crypto/ed25519/internal/edwards25519/field.feSquareGeneric",
-	"crypto/md5.block":           "crypto/md5.blockGeneric",
-	"crypto/sha1.block":          "crypto/sha1.blockGeneric",
-	"crypto/sha1.blockAMD64":     "crypto/sha1.blockGeneric",
-	"crypto/sha256.block":        "crypto/sha256.blockGeneric",
-	"crypto/sha512.blockAMD64":   "crypto/sha512.blockGeneric",
-	"internal/chacha8rand.block": "internal/chacha8rand.block_generic",
+	"crypto/md5.block":         "crypto/md5.blockGeneric",
+	"crypto/sha1.block":        "crypto/sha1.blockGeneric",
+	"crypto/sha1.blockAMD64":   "crypto/sha1.blockGeneric",
+	"crypto/sha256.block":      "crypto/sha256.blockGeneric",
+	"crypto/sha512.blockAMD64": "crypto/sha512.blockGeneric",

 	// AES
 	"crypto/aes.decryptBlockAsm": "crypto/aes.decryptBlock",
@@ -245,7 +245,7 @@ func (b *builder) createRuntimeAssert(assert llvm.Value, blockPrefix, assertFunc
 	// current insert position.
 	faultBlock := b.ctx.AddBasicBlock(b.llvmFn, blockPrefix+".throw")
 	nextBlock := b.insertBasicBlock(blockPrefix + ".next")
-	b.currentBlockInfo.exit = nextBlock // adjust outgoing block for phi nodes
+	b.blockExits[b.currentBlock] = nextBlock // adjust outgoing block for phi nodes

 	// Now branch to the out-of-bounds or the regular block.
 	b.CreateCondBr(assert, faultBlock, nextBlock)
@@ -19,9 +19,8 @@ const maxFieldsPerParam = 3
 // useful while declaring or defining a function.
 type paramInfo struct {
 	llvmType llvm.Type
-	name     string     // name, possibly with suffixes for e.g. struct fields
-	elemSize uint64     // size of pointer element type, or 0 if this isn't a pointer
-	flags    paramFlags // extra flags for this parameter
+	name     string // name, possibly with suffixes for e.g. struct fields
+	elemSize uint64 // size of pointer element type, or 0 if this isn't a pointer
 }

 // paramFlags identifies parameter attributes for flags. Most importantly, it
@@ -29,12 +28,9 @@ type paramInfo struct {
 type paramFlags uint8

 const (
-	// Whether this is a full or partial Go parameter (int, slice, etc).
-	// The extra context parameter is not a Go parameter.
-	paramIsGoParam = 1 << iota
-
-	// Whether this is a readonly parameter (for example, a string pointer).
-	paramIsReadonly
+	// Parameter may have the deferenceable_or_null attribute. This attribute
+	// cannot be applied to unsafe.Pointer and to the data pointer of slices.
+	paramIsDeferenceableOrNull = 1 << iota
 )

 // createRuntimeCallCommon creates a runtime call. Use createRuntimeCall or
@@ -79,15 +75,7 @@ func (b *builder) createCall(fnType llvm.Type, fn llvm.Value, args []llvm.Value,
 		fragments := b.expandFormalParam(arg)
 		expanded = append(expanded, fragments...)
 	}
-	call := b.CreateCall(fnType, fn, expanded, name)
-	if !fn.IsAFunction().IsNil() {
-		if cc := fn.FunctionCallConv(); cc != llvm.CCallConv {
-			// Set a different calling convention if needed.
-			// This is needed for GetModuleHandleExA on Windows, for example.
-			call.SetInstructionCallConv(cc)
-		}
-	}
-	return call
+	return b.CreateCall(fnType, fn, expanded, name)
 }

 // createInvoke is like createCall but continues execution at the landing pad if
@@ -170,7 +158,6 @@ func (c *compilerContext) flattenAggregateType(t llvm.Type, name string, goType
 				continue
 			}
 			suffix := strconv.Itoa(i)
-			isString := false
 			if goType != nil {
 				// Try to come up with a good suffix for this struct field,
 				// depending on which Go type it's based on.
@@ -187,16 +174,12 @@ func (c *compilerContext) flattenAggregateType(t llvm.Type, name string, goType
 						suffix = []string{"r", "i"}[i]
 					case types.String:
 						suffix = []string{"data", "len"}[i]
-						isString = true
 					}
 				case *types.Signature:
 					suffix = []string{"context", "funcptr"}[i]
 				}
 			}
 			subInfos := c.flattenAggregateType(subfield, name+"."+suffix, extractSubfield(goType, i))
-			if isString {
-				subInfos[0].flags |= paramIsReadonly
-			}
 			paramInfos = append(paramInfos, subInfos...)
 		}
 		return paramInfos
@@ -212,7 +195,6 @@ func (c *compilerContext) getParamInfo(t llvm.Type, name string, goType types.Ty
 	info := paramInfo{
 		llvmType: t,
 		name:     name,
-		flags:    paramIsGoParam,
 	}
 	if goType != nil {
 		switch underlying := goType.Underlying().(type) {
@@ -4,9 +4,7 @@ package compiler
 // or pseudo-operations that are lowered during goroutine lowering.

 import (
-	"fmt"
 	"go/types"
-	"math"

 	"github.com/tinygo-org/tinygo/compiler/llvmutil"
 	"golang.org/x/tools/go/ssa"
@@ -43,17 +41,17 @@ func (b *builder) createChanSend(instr *ssa.Send) {
 		b.CreateStore(chanValue, valueAlloca)
 	}

-	// Allocate buffer for the channel operation.
-	channelOp := b.getLLVMRuntimeType("channelOp")
-	channelOpAlloca, channelOpAllocaSize := b.createTemporaryAlloca(channelOp, "chan.op")
+	// Allocate blockedlist buffer.
+	channelBlockedList := b.getLLVMRuntimeType("channelBlockedList")
+	channelBlockedListAlloca, channelBlockedListAllocaSize := b.createTemporaryAlloca(channelBlockedList, "chan.blockedList")

 	// Do the send.
-	b.createRuntimeCall("chanSend", []llvm.Value{ch, valueAlloca, channelOpAlloca}, "")
+	b.createRuntimeCall("chanSend", []llvm.Value{ch, valueAlloca, channelBlockedListAlloca}, "")

 	// End the lifetime of the allocas.
 	// This also works around a bug in CoroSplit, at least in LLVM 8:
 	// https://bugs.llvm.org/show_bug.cgi?id=41742
-	b.emitLifetimeEnd(channelOpAlloca, channelOpAllocaSize)
+	b.emitLifetimeEnd(channelBlockedListAlloca, channelBlockedListAllocaSize)
 	if !isZeroSize {
 		b.emitLifetimeEnd(valueAlloca, valueAllocaSize)
 	}
@@ -74,12 +72,12 @@ func (b *builder) createChanRecv(unop *ssa.UnOp) llvm.Value {
 		valueAlloca, valueAllocaSize = b.createTemporaryAlloca(valueType, "chan.value")
 	}

-	// Allocate buffer for the channel operation.
-	channelOp := b.getLLVMRuntimeType("channelOp")
-	channelOpAlloca, channelOpAllocaSize := b.createTemporaryAlloca(channelOp, "chan.op")
+	// Allocate blockedlist buffer.
+	channelBlockedList := b.getLLVMRuntimeType("channelBlockedList")
+	channelBlockedListAlloca, channelBlockedListAllocaSize := b.createTemporaryAlloca(channelBlockedList, "chan.blockedList")

 	// Do the receive.
-	commaOk := b.createRuntimeCall("chanRecv", []llvm.Value{ch, valueAlloca, channelOpAlloca}, "")
+	commaOk := b.createRuntimeCall("chanRecv", []llvm.Value{ch, valueAlloca, channelBlockedListAlloca}, "")
 	var received llvm.Value
 	if isZeroSize {
 		received = llvm.ConstNull(valueType)
@@ -87,7 +85,7 @@ func (b *builder) createChanRecv(unop *ssa.UnOp) llvm.Value {
 		received = b.CreateLoad(valueType, valueAlloca, "chan.received")
 		b.emitLifetimeEnd(valueAlloca, valueAllocaSize)
 	}
-	b.emitLifetimeEnd(channelOpAlloca, channelOpAllocaSize)
+	b.emitLifetimeEnd(channelBlockedListAlloca, channelBlockedListAllocaSize)

 	if unop.CommaOk {
 		tuple := llvm.Undef(b.ctx.StructType([]llvm.Type{valueType, b.ctx.Int1Type()}, false))
@@ -126,20 +124,6 @@ func (b *builder) createSelect(expr *ssa.Select) llvm.Value {
 		}
 	}

-	const maxSelectStates = math.MaxUint32 >> 2
-	if len(expr.States) > maxSelectStates {
-		// The runtime code assumes that the number of state must fit in 30 bits
-		// (so the select index can be stored in a uint32 with two bits reserved
-		// for other purposes). It seems unlikely that a real program would have
-		// that many states, but we check for this case anyway to be sure.
-		// We use a uint32 (and not a uintptr or uint64) to avoid 64-bit atomic
-		// operations which aren't available everywhere.
-		b.addError(expr.Pos(), fmt.Sprintf("too many select states: got %d but the maximum supported number is %d", len(expr.States), maxSelectStates))
-
-		// Continue as usual (we'll generate broken code but the error will
-		// prevent the compilation to complete).
-	}
-
 	// This code create a (stack-allocated) slice containing all the select
 	// cases and then calls runtime.chanSelect to perform the actual select
 	// statement.
@@ -214,10 +198,10 @@ func (b *builder) createSelect(expr *ssa.Select) llvm.Value {
 	if expr.Blocking {
 		// Stack-allocate operation structures.
 		// If these were simply created as a slice, they would heap-allocate.
-		opsAllocaType := llvm.ArrayType(b.getLLVMRuntimeType("channelOp"), len(selectStates))
-		opsAlloca, opsSize := b.createTemporaryAlloca(opsAllocaType, "select.block.alloca")
-		opsLen := llvm.ConstInt(b.uintptrType, uint64(len(selectStates)), false)
-		opsPtr := b.CreateGEP(opsAllocaType, opsAlloca, []llvm.Value{
+		chBlockAllocaType := llvm.ArrayType(b.getLLVMRuntimeType("channelBlockedList"), len(selectStates))
+		chBlockAlloca, chBlockSize := b.createTemporaryAlloca(chBlockAllocaType, "select.block.alloca")
+		chBlockLen := llvm.ConstInt(b.uintptrType, uint64(len(selectStates)), false)
+		chBlockPtr := b.CreateGEP(chBlockAllocaType, chBlockAlloca, []llvm.Value{
 			llvm.ConstInt(b.ctx.Int32Type(), 0, false),
 			llvm.ConstInt(b.ctx.Int32Type(), 0, false),
 		}, "select.block")
@@ -225,18 +209,15 @@ func (b *builder) createSelect(expr *ssa.Select) llvm.Value {
 		results = b.createRuntimeCall("chanSelect", []llvm.Value{
 			recvbuf,
 			statesPtr, statesLen, statesLen, // []chanSelectState
-			opsPtr, opsLen, opsLen, // []channelOp
+			chBlockPtr, chBlockLen, chBlockLen, // []channelBlockList
 		}, "select.result")

 		// Terminate the lifetime of the operation structures.
-		b.emitLifetimeEnd(opsAlloca, opsSize)
+		b.emitLifetimeEnd(chBlockAlloca, chBlockSize)
 	} else {
-		opsPtr := llvm.ConstNull(b.dataPtrType)
-		opsLen := llvm.ConstInt(b.uintptrType, 0, false)
-		results = b.createRuntimeCall("chanSelect", []llvm.Value{
+		results = b.createRuntimeCall("tryChanSelect", []llvm.Value{
 			recvbuf,
 			statesPtr, statesLen, statesLen, // []chanSelectState
-			opsPtr, opsLen, opsLen, // []channelOp (nil slice)
 		}, "select.result")
 	}

@@ -17,7 +17,6 @@ import (

 	"github.com/tinygo-org/tinygo/compiler/llvmutil"
 	"github.com/tinygo-org/tinygo/loader"
-	"github.com/tinygo-org/tinygo/src/tinygo"
 	"golang.org/x/tools/go/ssa"
 	"golang.org/x/tools/go/types/typeutil"
 	"tinygo.org/x/go-llvm"
@@ -45,7 +44,6 @@ type Config struct {
 	ABI             string
 	GOOS            string
 	GOARCH          string
-	BuildMode       string
 	CodeModel       string
 	RelocationModel string
 	SizeLevel       int
@@ -58,7 +56,6 @@ type Config struct {
 	MaxStackAlloc      uint64
 	NeedsStackObjects  bool
 	Debug              bool // Whether to emit debug information in the LLVM module.
-	Nobounds           bool // Whether to skip bounds checks
 	PanicStrategy      string
 }

@@ -152,12 +149,10 @@ type builder struct {
 	llvmFnType        llvm.Type
 	llvmFn            llvm.Value
 	info              functionInfo
-	locals            map[ssa.Value]llvm.Value // local variables
-	blockInfo         []blockInfo
+	locals            map[ssa.Value]llvm.Value            // local variables
+	blockEntries      map[*ssa.BasicBlock]llvm.BasicBlock // a *ssa.BasicBlock may be split up
+	blockExits        map[*ssa.BasicBlock]llvm.BasicBlock // these are the exit blocks
 	currentBlock      *ssa.BasicBlock
-	currentBlockInfo  *blockInfo
-	tarjanStack       []uint
-	tarjanIndex       uint
 	phis              []phiNode
 	deferPtr          llvm.Value
 	deferFrame        llvm.Value
@@ -189,32 +184,11 @@ func newBuilder(c *compilerContext, irbuilder llvm.Builder, f *ssa.Function) *bu
 		info:            c.getFunctionInfo(f),
 		locals:          make(map[ssa.Value]llvm.Value),
 		dilocals:        make(map[*types.Var]llvm.Metadata),
+		blockEntries:    make(map[*ssa.BasicBlock]llvm.BasicBlock),
+		blockExits:      make(map[*ssa.BasicBlock]llvm.BasicBlock),
 	}
 }

-// Return the runtime.alloc function variant.
-// This is normally just "alloc", but is "alloc_noheap" if the //go:noheap
-// pragma is used.
-func (b *builder) allocFunc() string {
-	if b.info.noheap {
-		return "alloc_noheap"
-	}
-	return "alloc"
-}
-
-type blockInfo struct {
-	// entry is the LLVM basic block corresponding to the start of this *ssa.Block.
-	entry llvm.BasicBlock
-
-	// exit is the LLVM basic block corresponding to the end of this *ssa.Block.
-	// It will be different than entry if any of the block's instructions contain internal branches.
-	exit llvm.BasicBlock
-
-	// tarjan holds state for applying Tarjan's strongly connected components algorithm to the CFG.
-	// This is used by defer.go to determine whether to stack- or heap-allocate defer data.
-	tarjan tarjanNode
-}
-
 type deferBuiltin struct {
 	callName string
 	pos      token.Pos
@@ -324,6 +298,9 @@ func CompilePackage(moduleName string, pkg *loader.Package, ssaPkg *ssa.Package,
 	// Load comments such as //go:extern on globals.
 	c.loadASTComments(pkg)

+	// Predeclare the runtime.alloc function, which is used by the wordpack
+	// functionality.
+	c.getFunction(c.program.ImportedPackage("runtime").Members["alloc"].(*ssa.Function))
 	if c.NeedsStackObjects {
 		// Predeclare trackPointer, which is used everywhere we use runtime.alloc.
 		c.getFunction(c.program.ImportedPackage("runtime").Members["trackPointer"].(*ssa.Function))
@@ -409,7 +386,7 @@ func (c *compilerContext) getLLVMType(goType types.Type) llvm.Type {
 // makeLLVMType creates a LLVM type for a Go type. Don't call this, use
 // getLLVMType instead.
 func (c *compilerContext) makeLLVMType(goType types.Type) llvm.Type {
-	switch typ := types.Unalias(goType).(type) {
+	switch typ := goType.(type) {
 	case *types.Array:
 		elemType := c.getLLVMType(typ.Elem())
 		return llvm.ArrayType(elemType, int(typ.Len()))
@@ -517,21 +494,6 @@ func (c *compilerContext) createDIType(typ types.Type) llvm.Metadata {
 	llvmType := c.getLLVMType(typ)
 	sizeInBytes := c.targetData.TypeAllocSize(llvmType)
 	switch typ := typ.(type) {
-	case *types.Alias:
-		// Implement types.Alias just like types.Named: by treating them like a
-		// C typedef.
-		temporaryMDNode := c.dibuilder.CreateReplaceableCompositeType(llvm.Metadata{}, llvm.DIReplaceableCompositeType{
-			Tag:         dwarf.TagTypedef,
-			SizeInBits:  sizeInBytes * 8,
-			AlignInBits: uint32(c.targetData.ABITypeAlignment(llvmType)) * 8,
-		})
-		c.ditypes[typ] = temporaryMDNode
-		md := c.dibuilder.CreateTypedef(llvm.DITypedef{
-			Type: c.getDIType(types.Unalias(typ)), // TODO: use typ.Rhs in Go 1.23
-			Name: typ.String(),
-		})
-		temporaryMDNode.ReplaceAllUsesWith(md)
-		return md
 	case *types.Array:
 		return c.dibuilder.CreateArrayType(llvm.DIArrayType{
 			SizeInBits:  sizeInBytes * 8,
@@ -880,10 +842,6 @@ func (c *compilerContext) createPackage(irbuilder llvm.Builder, pkg *ssa.Package
 				// with a LLVM intrinsic.
 				continue
 			}
-			if ok := b.defineCryptoIntrinsic(); ok {
-				// Body of this function was replaced
-				continue
-			}
 			if member.Blocks == nil {
 				// Try to define this as an intrinsic function.
 				b.defineIntrinsicFunction()
@@ -898,11 +856,6 @@ func (c *compilerContext) createPackage(irbuilder llvm.Builder, pkg *ssa.Package
 				// Interfaces don't have concrete methods.
 				continue
 			}
-			if _, isalias := member.Type().(*types.Alias); isalias {
-				// Aliases don't need to be redefined, since they just refer to
-				// an already existing type whose methods will be defined.
-				continue
-			}

 			// Named type. We should make sure all methods are created.
 			// This includes both functions with pointer receivers and those
@@ -1244,29 +1197,14 @@ func (b *builder) createFunctionStart(intrinsic bool) {
 		// intrinsic (like an atomic operation). Create the entry block
 		// manually.
 		entryBlock = b.ctx.AddBasicBlock(b.llvmFn, "entry")
-		// Intrinsics may create internal branches (e.g. nil checks).
-		// They will attempt to access b.currentBlockInfo to update the exit block.
-		// Create some fake block info for them to access.
-		blockInfo := []blockInfo{
-			{
-				entry: entryBlock,
-				exit:  entryBlock,
-			},
-		}
-		b.blockInfo = blockInfo
-		b.currentBlockInfo = &blockInfo[0]
 	} else {
-		blocks := b.fn.Blocks
-		blockInfo := make([]blockInfo, len(blocks))
 		for _, block := range b.fn.DomPreorder() {
-			info := &blockInfo[block.Index]
 			llvmBlock := b.ctx.AddBasicBlock(b.llvmFn, block.Comment)
-			info.entry = llvmBlock
-			info.exit = llvmBlock
+			b.blockEntries[block] = llvmBlock
+			b.blockExits[block] = llvmBlock
 		}
-		b.blockInfo = blockInfo
 		// Normal functions have an entry block.
-		entryBlock = blockInfo[0].entry
+		entryBlock = b.blockEntries[b.fn.Blocks[0]]
 	}
 	b.SetInsertPointAtEnd(entryBlock)

@@ -1362,9 +1300,8 @@ func (b *builder) createFunction() {
 		if b.DumpSSA {
 			fmt.Printf("%d: %s:\n", block.Index, block.Comment)
 		}
+		b.SetInsertPointAtEnd(b.blockEntries[block])
 		b.currentBlock = block
-		b.currentBlockInfo = &b.blockInfo[block.Index]
-		b.SetInsertPointAtEnd(b.currentBlockInfo.entry)
 		for _, instr := range block.Instrs {
 			if instr, ok := instr.(*ssa.DebugRef); ok {
 				if !b.Debug {
@@ -1424,7 +1361,7 @@ func (b *builder) createFunction() {
 		block := phi.ssa.Block()
 		for i, edge := range phi.ssa.Edges {
 			llvmVal := b.getValue(edge, getPos(phi.ssa))
-			llvmBlock := b.blockInfo[block.Preds[i].Index].exit
+			llvmBlock := b.blockExits[block.Preds[i]]
 			phi.llvm.AddIncoming([]llvm.Value{llvmVal}, []llvm.BasicBlock{llvmBlock})
 		}
 	}
@@ -1447,11 +1384,6 @@ func (b *builder) createFunction() {
 		b.llvmFn.SetLinkage(llvm.InternalLinkage)
 		b.createFunction()
 	}
-
-	// Create wrapper function that can be called externally.
-	if b.info.wasmExport != "" {
-		b.createWasmExport()
-	}
 }

 // posser is an interface that's implemented by both ssa.Value and
@@ -1538,11 +1470,11 @@ func (b *builder) createInstruction(instr ssa.Instruction) {
 	case *ssa.If:
 		cond := b.getValue(instr.Cond, getPos(instr))
 		block := instr.Block()
-		blockThen := b.blockInfo[block.Succs[0].Index].entry
-		blockElse := b.blockInfo[block.Succs[1].Index].entry
+		blockThen := b.blockEntries[block.Succs[0]]
+		blockElse := b.blockEntries[block.Succs[1]]
 		b.CreateCondBr(cond, blockThen, blockElse)
 	case *ssa.Jump:
-		blockJump := b.blockInfo[instr.Block().Succs[0].Index].entry
+		blockJump := b.blockEntries[instr.Block().Succs[0]]
 		b.CreateBr(blockJump)
 	case *ssa.MapUpdate:
 		m := b.getValue(instr.Map, getPos(instr))
@@ -1610,8 +1542,7 @@ func (b *builder) createBuiltin(argTypes []types.Type, argValues []llvm.Value, c
 		elemsLen := b.CreateExtractValue(elems, 1, "append.elemsLen")
 		elemType := b.getLLVMType(argTypes[0].Underlying().(*types.Slice).Elem())
 		elemSize := llvm.ConstInt(b.uintptrType, b.targetData.TypeAllocSize(elemType), false)
-		elemLayout := b.createObjectLayout(elemType, pos)
-		result := b.createRuntimeCall("sliceAppend", []llvm.Value{srcBuf, elemsBuf, srcLen, srcCap, elemsLen, elemSize, elemLayout}, "append.new")
+		result := b.createRuntimeCall("sliceAppend", []llvm.Value{srcBuf, elemsBuf, srcLen, srcCap, elemsLen, elemSize}, "append.new")
 		newPtr := b.CreateExtractValue(result, 0, "append.newPtr")
 		newLen := b.CreateExtractValue(result, 1, "append.newLen")
 		newCap := b.CreateExtractValue(result, 2, "append.newCap")
@@ -1693,41 +1624,13 @@ func (b *builder) createBuiltin(argTypes []types.Type, argValues []llvm.Value, c
 	case "copy":
 		dst := argValues[0]
 		src := argValues[1]
-		// Fetch the lengths.
 		dstLen := b.CreateExtractValue(dst, 1, "copy.dstLen")
 		srcLen := b.CreateExtractValue(src, 1, "copy.srcLen")
-		// Find the minimum of the lengths.
-		minFuncName := "llvm.umin.i" + strconv.Itoa(b.uintptrType.IntTypeWidth())
-		minFunc := b.mod.NamedFunction(minFuncName)
-		if minFunc.IsNil() {
-			fnType := llvm.FunctionType(b.uintptrType, []llvm.Type{b.uintptrType, b.uintptrType}, false)
-			minFunc = llvm.AddFunction(b.mod, minFuncName, fnType)
-		}
-		minLen := b.CreateCall(minFunc.GlobalValueType(), minFunc, []llvm.Value{dstLen, srcLen}, "copy.n")
-		// Multiply the length by the element size.
+		dstBuf := b.CreateExtractValue(dst, 0, "copy.dstArray")
+		srcBuf := b.CreateExtractValue(src, 0, "copy.srcArray")
 		elemType := b.getLLVMType(argTypes[0].Underlying().(*types.Slice).Elem())
 		elemSize := llvm.ConstInt(b.uintptrType, b.targetData.TypeAllocSize(elemType), false)
-		// NOTE: This is also NSW when uintptr is int, but we can only choose one through the C API?
-		size := b.CreateNUWMul(minLen, elemSize, "copy.size")
-		// Fetch the pointers.
-		dstBuf := b.CreateExtractValue(dst, 0, "copy.dstPtr")
-		srcBuf := b.CreateExtractValue(src, 0, "copy.srcPtr")
-		// Create a memcpy.
-		call := b.createMemCopy("memmove", dstBuf, srcBuf, size)
-		align := b.targetData.ABITypeAlignment(elemType)
-		if align > 1 {
-			// Apply the type's alignment to the arguments.
-			// LLVM sometimes turns constant-length moves into loads and stores.
-			// It may use this alignment for the created loads and stores.
-			alignAttr := b.ctx.CreateEnumAttribute(llvm.AttributeKindID("align"), uint64(align))
-			call.AddCallSiteAttribute(1, alignAttr)
-			call.AddCallSiteAttribute(2, alignAttr)
-		}
-		// Extend and return the copied length.
-		if b.targetData.TypeAllocSize(minLen.Type()) < b.targetData.TypeAllocSize(b.intType) {
-			minLen = b.CreateZExt(minLen, b.intType, "copy.n.zext")
-		}
-		return minLen, nil
+		return b.createRuntimeCall("sliceCopy", []llvm.Value{dstBuf, srcBuf, dstLen, srcLen, elemSize}, "copy.n"), nil
 	case "delete":
 		m := argValues[0]
 		key := argValues[1]
@@ -1755,74 +1658,23 @@ func (b *builder) createBuiltin(argTypes []types.Type, argValues []llvm.Value, c
 		return llvmLen, nil
 	case "min", "max":
 		// min and max builtins, added in Go 1.21.
-		// Find the corresponding intrinsic name.
-		ty := argTypes[0].Underlying().(*types.Basic)
-		llvmType := b.getLLVMType(ty)
-		info := ty.Info()
-		var prefix, delimeter, typeName string
-		if info&types.IsInteger != 0 {
-			// This is an integer value.
-			// Use the LLVM int min/max intrinsics.
-			prefix = "llvm.s"
-			if info&types.IsUnsigned != 0 {
-				prefix = "llvm.u"
-			}
-			delimeter = ".i"
-			typeName = strconv.Itoa(llvmType.IntTypeWidth())
-		} else {
-			switch ty.Kind() {
-			case types.String:
-				// Strings do not have an equivalent intrinsic.
-				// Implement with compares and selects.
-				tok := token.LSS
-				if callName == "max" {
-					tok = token.GTR
-				}
-				result := argValues[0]
-				typ := argTypes[0]
-				for _, arg := range argValues[1:] {
-					cmp, err := b.createBinOp(tok, typ, typ, result, arg, pos)
-					if err != nil {
-						return result, err
-					}
-					result = b.CreateSelect(cmp, result, arg, "")
-				}
-				return result, nil
-			case types.Float32:
-				typeName = "f32"
-			case types.Float64:
-				typeName = "f64"
-			default:
-				return llvm.Value{}, b.makeError(pos, "todo: min/max: unknown type")
-			}
-			// There are a few edge cases with floating point min/max:
-			// min(-0.0, +0.0) = -0.0
-			// min(NaN, number) = NaN
-			// The llvm.minimum.*/llvm.maximum.* intrinsics match this behavior.
-			// Neither Go nor LLVM defines the bit representation of resulting NaNs.
-			prefix = "llvm."
-			delimeter = "imum."
+		// We can simply reuse the existing binop comparison code, which has all
+		// the edge cases figured out already.
+		tok := token.LSS
+		if callName == "max" {
+			tok = token.GTR
 		}
-		intrinsicName := prefix + callName + delimeter + typeName
-		// Find or create the intrinsic.
-		llvmFn := b.mod.NamedFunction(intrinsicName)
-		if llvmFn.IsNil() {
-			fnType := llvm.FunctionType(llvmType, []llvm.Type{llvmType, llvmType}, false)
-			llvmFn = llvm.AddFunction(b.mod, intrinsicName, fnType)
-		}
-		// Call the intrinsic repeatedly to merge the arguments.
-		callType := llvmFn.GlobalValueType()
 		result := argValues[0]
+		typ := argTypes[0]
 		for _, arg := range argValues[1:] {
-			result = b.CreateCall(callType, llvmFn, []llvm.Value{result, arg}, "")
+			cmp, err := b.createBinOp(tok, typ, typ, result, arg, pos)
+			if err != nil {
+				return result, err
+			}
+			result = b.CreateSelect(cmp, result, arg, "")
 		}
 		return result, nil
-	case "panic":
-		// This is rare, but happens in "defer panic()".
-		b.createRuntimeInvoke("_panic", argValues, "")
-		return llvm.Value{}, nil
 	case "print", "println":
-		b.createRuntimeCall("printlock", nil, "")
 		for i, value := range argValues {
 			if i >= 1 && callName == "println" {
 				b.createRuntimeCall("printspace", nil, "")
@@ -1883,7 +1735,6 @@ func (b *builder) createBuiltin(argTypes []types.Type, argValues []llvm.Value, c
 		if callName == "println" {
 			b.createRuntimeCall("printnl", nil, "")
 		}
-		b.createRuntimeCall("printunlock", nil, "")
 		return llvm.Value{}, nil // print() or println() returns void
 	case "real":
 		cplx := argValues[0]
@@ -1971,7 +1822,15 @@ func (b *builder) createBuiltin(argTypes []types.Type, argValues []llvm.Value, c
 //
 // This is also where compiler intrinsics are implemented.
 func (b *builder) createFunctionCall(instr *ssa.CallCommon) (llvm.Value, error) {
-	// See if this is an intrinsic function that is handled specially.
+	var params []llvm.Value
+	for _, param := range instr.Args {
+		params = append(params, b.getValue(param, getPos(instr)))
+	}
+
+	// Try to call the function directly for trivially static calls.
+	var callee, context llvm.Value
+	var calleeType llvm.Type
+	exported := false
 	if fn := instr.StaticCallee(); fn != nil {
 		// Direct function call, either to a named or anonymous (directly
 		// applied) function call. If it is anonymous, it may be a closure.
@@ -1987,14 +1846,10 @@ func (b *builder) createFunctionCall(instr *ssa.CallCommon) (llvm.Value, error)
 			return b.emitSV64Call(instr.Args, getPos(instr))
 		case strings.HasPrefix(name, "(device/riscv.CSR)."):
 			return b.emitCSROperation(instr)
-		case (strings.HasPrefix(name, "syscall.Syscall") || strings.HasPrefix(name, "syscall.RawSyscall") || strings.HasPrefix(name, "golang.org/x/sys/unix.Syscall") || strings.HasPrefix(name, "golang.org/x/sys/unix.RawSyscall")) && name != "syscall.SyscallN":
+		case strings.HasPrefix(name, "syscall.Syscall") || strings.HasPrefix(name, "syscall.RawSyscall") || strings.HasPrefix(name, "golang.org/x/sys/unix.Syscall") || strings.HasPrefix(name, "golang.org/x/sys/unix.RawSyscall"):
 			if b.GOOS != "darwin" {
 				return b.createSyscall(instr)
 			}
-		case name == "syscall.syscalln":
-			if b.GOOS == "windows" {
-				return b.createSyscalln(instr)
-			}
 		case strings.HasPrefix(name, "syscall.rawSyscallNoError") || strings.HasPrefix(name, "golang.org/x/sys/unix.RawSyscallNoError"):
 			return b.createRawSyscallNoError(instr)
 		case name == "runtime.supportsRecover":
@@ -2004,36 +1859,21 @@ func (b *builder) createFunctionCall(instr *ssa.CallCommon) (llvm.Value, error)
 			}
 			return llvm.ConstInt(b.ctx.Int1Type(), supportsRecover, false), nil
 		case name == "runtime.panicStrategy":
+			// These constants are defined in src/runtime/panic.go.
 			panicStrategy := map[string]uint64{
-				"print": tinygo.PanicStrategyPrint,
-				"trap":  tinygo.PanicStrategyTrap,
+				"print": 1, // panicStrategyPrint
+				"trap":  2, // panicStrategyTrap
 			}[b.Config.PanicStrategy]
 			return llvm.ConstInt(b.ctx.Int8Type(), panicStrategy, false), nil
 		case name == "runtime/interrupt.New":
 			return b.createInterruptGlobal(instr)
-		case name == "runtime.exportedFuncPtr":
-			_, ptr := b.getFunction(instr.Args[0].(*ssa.Function))
-			return b.CreatePtrToInt(ptr, b.uintptrType, ""), nil
-		case name == "(*runtime/interrupt.Checkpoint).Save":
-			return b.createInterruptCheckpoint(instr.Args[0]), nil
 		case name == "internal/abi.FuncPCABI0":
 			retval := b.createDarwinFuncPCABI0Call(instr)
 			if !retval.IsNil() {
 				return retval, nil
 			}
 		}
-	}

-	var params []llvm.Value
-	for _, param := range instr.Args {
-		params = append(params, b.getValue(param, getPos(instr)))
-	}
-
-	// Try to call the function directly for trivially static calls.
-	var callee, context llvm.Value
-	var calleeType llvm.Type
-	exported := false
-	if fn := instr.StaticCallee(); fn != nil {
 		calleeType, callee = b.getFunction(fn)
 		info := b.getFunctionInfo(fn)
 		if callee.IsNil() {
@@ -2183,7 +2023,7 @@ func (b *builder) createExpr(expr ssa.Value) (llvm.Value, error) {
 			}
 			sizeValue := llvm.ConstInt(b.uintptrType, size, false)
 			layoutValue := b.createObjectLayout(typ, expr.Pos())
-			buf := b.createRuntimeCall(b.allocFunc(), []llvm.Value{sizeValue, layoutValue}, expr.Comment)
+			buf := b.createRuntimeCall("alloc", []llvm.Value{sizeValue, layoutValue}, expr.Comment)
 			align := b.targetData.ABITypeAlignment(typ)
 			buf.AddCallSiteAttribute(0, b.ctx.CreateEnumAttribute(llvm.AttributeKindID("align"), uint64(align)))
 			return buf, nil
@@ -2415,7 +2255,7 @@ func (b *builder) createExpr(expr ssa.Value) (llvm.Value, error) {
 		}
 		sliceSize := b.CreateBinOp(llvm.Mul, elemSizeValue, sliceCapCast, "makeslice.cap")
 		layoutValue := b.createObjectLayout(llvmElemType, expr.Pos())
-		slicePtr := b.createRuntimeCall(b.allocFunc(), []llvm.Value{sliceSize, layoutValue}, "makeslice.buf")
+		slicePtr := b.createRuntimeCall("alloc", []llvm.Value{sliceSize, layoutValue}, "makeslice.buf")
 		slicePtr.AddCallSiteAttribute(0, b.ctx.CreateEnumAttribute(llvm.AttributeKindID("align"), uint64(elemAlign)))

 		// Extend or truncate if necessary. This is safe as we've already done
@@ -50,7 +50,6 @@ func TestCompiler(t *testing.T) {
 		{"channel.go", "", ""},
 		{"gc.go", "", ""},
 		{"zeromap.go", "", ""},
-		{"generics.go", "", ""},
 	}
 	if goMinor >= 20 {
 		tests = append(tests, testCase{"go1.20.go", "", ""})
@@ -100,14 +100,13 @@ func (b *builder) createLandingPad() {

 	// Continue at the 'recover' block, which returns to the parent in an
 	// appropriate way.
-	b.CreateBr(b.blockInfo[b.fn.Recover.Index].entry)
+	b.CreateBr(b.blockEntries[b.fn.Recover])
 }

-// Create a checkpoint (similar to setjmp). This emits inline assembly that
-// stores the current program counter inside the ptr address (actually
-// ptr+sizeof(ptr)) and then returns a boolean indicating whether this is the
-// normal flow (false) or we jumped here from somewhere else (true).
-func (b *builder) createCheckpoint(ptr llvm.Value) llvm.Value {
+// createInvokeCheckpoint saves the function state at the given point, to
+// continue at the landing pad if a panic happened. This is implemented using a
+// setjmp-like construct.
+func (b *builder) createInvokeCheckpoint() {
 	// Construct inline assembly equivalents of setjmp.
 	// The assembly works as follows:
 	//   * All registers (both callee-saved and caller saved) are clobbered
@@ -162,7 +161,7 @@ str x2, [x1, #8]
 mov x0, #0
 1:
 `
-		constraints = "={x0},{x1},~{x1},~{x2},~{x3},~{x4},~{x5},~{x6},~{x7},~{x8},~{x9},~{x10},~{x11},~{x12},~{x13},~{x14},~{x15},~{x16},~{x17},~{x19},~{x20},~{x21},~{x22},~{x23},~{x24},~{x25},~{x26},~{x27},~{x28},~{lr},~{q0},~{q1},~{q2},~{q3},~{q4},~{q5},~{q6},~{q7},~{q8},~{q9},~{q10},~{q11},~{q12},~{q13},~{q14},~{q15},~{q16},~{q17},~{q18},~{q19},~{q20},~{q21},~{q22},~{q23},~{q24},~{q25},~{q26},~{q27},~{q28},~{q29},~{q30},~{nzcv},~{ffr},~{memory}"
+		constraints = "={x0},{x1},~{x1},~{x2},~{x3},~{x4},~{x5},~{x6},~{x7},~{x8},~{x9},~{x10},~{x11},~{x12},~{x13},~{x14},~{x15},~{x16},~{x17},~{x19},~{x20},~{x21},~{x22},~{x23},~{x24},~{x25},~{x26},~{x27},~{x28},~{lr},~{q0},~{q1},~{q2},~{q3},~{q4},~{q5},~{q6},~{q7},~{q8},~{q9},~{q10},~{q11},~{q12},~{q13},~{q14},~{q15},~{q16},~{q17},~{q18},~{q19},~{q20},~{q21},~{q22},~{q23},~{q24},~{q25},~{q26},~{q27},~{q28},~{q29},~{q30},~{nzcv},~{ffr},~{vg},~{memory}"
 		if b.GOOS != "darwin" && b.GOOS != "windows" {
 			// These registers cause the following warning when compiling for
 			// MacOS and Windows:
@@ -218,124 +217,49 @@ li a0, 0
 		// This case should have been handled by b.supportsRecover().
 		b.addError(b.fn.Pos(), "unknown architecture for defer: "+b.archFamily())
 	}
-	asmType := llvm.FunctionType(resultType, []llvm.Type{b.dataPtrType}, false)
+	asmType := llvm.FunctionType(resultType, []llvm.Type{b.deferFrame.Type()}, false)
 	asm := llvm.InlineAsm(asmType, asmString, constraints, false, false, 0, false)
-	result := b.CreateCall(asmType, asm, []llvm.Value{ptr}, "setjmp")
+	result := b.CreateCall(asmType, asm, []llvm.Value{b.deferFrame}, "setjmp")
 	result.AddCallSiteAttribute(-1, b.ctx.CreateEnumAttribute(llvm.AttributeKindID("returns_twice"), 0))
 	isZero := b.CreateICmp(llvm.IntEQ, result, llvm.ConstInt(resultType, 0, false), "setjmp.result")
-	return isZero
-}
-
-// createInvokeCheckpoint saves the function state at the given point, to
-// continue at the landing pad if a panic happened. This is implemented using a
-// setjmp-like construct.
-func (b *builder) createInvokeCheckpoint() {
-	isZero := b.createCheckpoint(b.deferFrame)
 	continueBB := b.insertBasicBlock("")
 	b.CreateCondBr(isZero, continueBB, b.landingpad)
 	b.SetInsertPointAtEnd(continueBB)
-	b.currentBlockInfo.exit = continueBB
+	b.blockExits[b.currentBlock] = continueBB
 }

-// isInLoop checks if there is a path from the current block to itself.
-// Use Tarjan's strongly connected components algorithm to search for cycles.
-// A one-node SCC is a cycle iff there is an edge from the node to itself.
-// A multi-node SCC is always a cycle.
-// https://en.wikipedia.org/wiki/Tarjan%27s_strongly_connected_components_algorithm
-func (b *builder) isInLoop() bool {
-	if b.currentBlockInfo.tarjan.lowLink == 0 {
-		b.strongConnect(b.currentBlock)
-	}
-	return b.currentBlockInfo.tarjan.cyclic
-}
+// isInLoop checks if there is a path from a basic block to itself.
+func isInLoop(start *ssa.BasicBlock) bool {
+	// Use a breadth-first search to scan backwards through the block graph.
+	queue := []*ssa.BasicBlock{start}
+	checked := map[*ssa.BasicBlock]struct{}{}

-func (b *builder) strongConnect(block *ssa.BasicBlock) {
-	// Assign a new index.
-	// Indices start from 1 so that 0 can be used as a sentinel.
-	assignedIndex := b.tarjanIndex + 1
-	b.tarjanIndex = assignedIndex
+	for len(queue) > 0 {
+		// pop a block off of the queue
+		block := queue[len(queue)-1]
+		queue = queue[:len(queue)-1]

-	// Apply the new index.
-	blockIndex := block.Index
-	node := &b.blockInfo[blockIndex].tarjan
-	node.lowLink = assignedIndex
-
-	// Push the node onto the stack.
-	node.onStack = true
-	b.tarjanStack = append(b.tarjanStack, uint(blockIndex))
-
-	// Process the successors.
-	for _, successor := range block.Succs {
-		// Look up the successor's state.
-		successorIndex := successor.Index
-		if successorIndex == blockIndex {
-			// Handle a self-cycle specially.
-			node.cyclic = true
-			continue
-		}
-		successorNode := &b.blockInfo[successorIndex].tarjan
-
-		switch {
-		case successorNode.lowLink == 0:
-			// This node has not yet been visisted.
-			b.strongConnect(successor)
-
-		case !successorNode.onStack:
-			// This node has been visited, but is in a different SCC.
-			// Ignore it, and do not update lowLink.
-			continue
-		}
-
-		// Update the lowLink index.
-		// This always uses the min-of-lowlink instead of using index in the on-stack case.
-		// This is done for two reasons:
-		// 1. The lowLink update can be shared between the new-node and on-stack cases.
-		// 2. The assigned index does not need to be saved - it is only needed for root node detection.
-		if successorNode.lowLink < node.lowLink {
-			node.lowLink = successorNode.lowLink
-		}
-	}
-
-	if node.lowLink == assignedIndex {
-		// This is a root node.
-		// Pop the SCC off the stack.
-		stack := b.tarjanStack
-		top := stack[len(stack)-1]
-		stack = stack[:len(stack)-1]
-		blocks := b.blockInfo
-		topNode := &blocks[top].tarjan
-		topNode.onStack = false
-
-		if top != uint(blockIndex) {
-			// The root node is not the only node in the SCC.
-			// Mark all nodes in this SCC as cyclic.
-			topNode.cyclic = true
-			for top != uint(blockIndex) {
-				top = stack[len(stack)-1]
-				stack = stack[:len(stack)-1]
-				topNode = &blocks[top].tarjan
-				topNode.onStack = false
-				topNode.cyclic = true
+		// Search through predecessors.
+		// Searching backwards means that this is pretty fast when the block is close to the start of the function.
+		// Defers are often placed near the start of the function.
+		for _, pred := range block.Preds {
+			if pred == start {
+				// cycle found
+				return true
 			}
+
+			if _, ok := checked[pred]; ok {
+				// block already checked
+				continue
+			}
+
+			// add to queue and checked map
+			queue = append(queue, pred)
+			checked[pred] = struct{}{}
 		}
-
-		b.tarjanStack = stack
 	}
-}

-// tarjanNode holds per-block state for isInLoop and strongConnect.
-type tarjanNode struct {
-	// lowLink is the index of the first visited node that is reachable from this block.
-	// The lowLink indices are assigned by the SCC search, and do not correspond to b.Index.
-	// A lowLink of 0 is used as a sentinel to mark a node which has not yet been visited.
-	lowLink uint
-
-	// onStack tracks whether this node is currently on the SCC search stack.
-	onStack bool
-
-	// cyclic indicates whether this block is in a loop.
-	// If lowLink is 0, strongConnect must be called before reading this field.
-	cyclic bool
+	return false
 }

 // createDefer emits a single defer instruction, to be run when this function
@@ -477,10 +401,7 @@ func (b *builder) createDefer(instr *ssa.Defer) {

 	// Put this struct in an allocation.
 	var alloca llvm.Value
-	if instr.Block() != b.currentBlock {
-		panic("block mismatch")
-	}
-	if !b.isInLoop() {
+	if !isInLoop(instr.Block()) {
 		// This can safely use a stack allocation.
 		alloca = llvmutil.CreateEntryBlockAlloca(b.Builder, deferredCallType, "defer.alloca")
 	} else {
@@ -488,7 +409,7 @@ func (b *builder) createDefer(instr *ssa.Defer) {
 		size := b.targetData.TypeAllocSize(deferredCallType)
 		sizeValue := llvm.ConstInt(b.uintptrType, size, false)
 		nilPtr := llvm.ConstNull(b.dataPtrType)
-		alloca = b.createRuntimeCall(b.allocFunc(), []llvm.Value{sizeValue, nilPtr}, "defer.alloc.call")
+		alloca = b.createRuntimeCall("alloc", []llvm.Value{sizeValue, nilPtr}, "defer.alloc.call")
 	}
 	if b.NeedsStackObjects {
 		b.trackPointer(alloca)
@@ -99,9 +99,6 @@ func typeHasPointers(t llvm.Type) bool {
 		}
 		return false
 	case llvm.ArrayTypeKind:
-		if t.ArrayLength() == 0 {
-			return false
-		}
 		if typeHasPointers(t.ElementType()) {
 			return true
 		}
@@ -7,7 +7,6 @@ import (
 	"go/token"
 	"go/types"

-	"github.com/tinygo-org/tinygo/compiler/llvmutil"
 	"golang.org/x/tools/go/ssa"
 	"tinygo.org/x/go-llvm"
 )
@@ -102,7 +101,7 @@ func (b *builder) createGo(instr *ssa.Go) {

 	paramBundle := b.emitPointerPack(params)
 	var stackSize llvm.Value
-	callee := b.createGoroutineStartWrapper(funcType, funcPtr, prefix, hasContext, false, instr.Pos())
+	callee := b.createGoroutineStartWrapper(funcType, funcPtr, prefix, hasContext, instr.Pos())
 	if b.AutomaticStackSize {
 		// The stack size is not known until after linking. Call a dummy
 		// function that will be replaced with a load from a special ELF
@@ -122,147 +121,6 @@ func (b *builder) createGo(instr *ssa.Go) {
 	b.createCall(fnType, start, []llvm.Value{callee, paramBundle, stackSize, llvm.Undef(b.dataPtrType)}, "")
 }

-// Create an exported wrapper function for functions with the //go:wasmexport
-// pragma. This wrapper function is quite complex when the scheduler is enabled:
-// it needs to start a new goroutine each time the exported function is called.
-func (b *builder) createWasmExport() {
-	pos := b.info.wasmExportPos
-	if b.info.exported {
-		// //export really shouldn't be used anymore when //go:wasmexport is
-		// available, because //go:wasmexport is much better defined.
-		b.addError(pos, "cannot use //export and //go:wasmexport at the same time")
-		return
-	}
-
-	const suffix = "#wasmexport"
-
-	// Declare the exported function.
-	paramTypes := b.llvmFnType.ParamTypes()
-	exportedFnType := llvm.FunctionType(b.llvmFnType.ReturnType(), paramTypes[:len(paramTypes)-1], false)
-	exportedFn := llvm.AddFunction(b.mod, b.fn.RelString(nil)+suffix, exportedFnType)
-	b.addStandardAttributes(exportedFn)
-	llvmutil.AppendToGlobal(b.mod, "llvm.used", exportedFn)
-	exportedFn.AddFunctionAttr(b.ctx.CreateStringAttribute("wasm-export-name", b.info.wasmExport))
-
-	// Create a builder for this wrapper function.
-	builder := newBuilder(b.compilerContext, b.ctx.NewBuilder(), b.fn)
-	defer builder.Dispose()
-
-	// Define this function as a separate function in DWARF
-	if b.Debug {
-		if b.fn.Syntax() != nil {
-			// Create debug info file if needed.
-			pos := b.program.Fset.Position(pos)
-			builder.difunc = builder.attachDebugInfoRaw(b.fn, exportedFn, suffix, pos.Filename, pos.Line)
-		}
-		builder.setDebugLocation(pos)
-	}
-
-	// Create a single basic block inside of it.
-	bb := llvm.AddBasicBlock(exportedFn, "entry")
-	builder.SetInsertPointAtEnd(bb)
-
-	// Insert an assertion to make sure this //go:wasmexport function is not
-	// called at a time when it is not allowed (for example, before the runtime
-	// is initialized).
-	builder.createRuntimeCall("wasmExportCheckRun", nil, "")
-
-	if b.Scheduler == "none" {
-		// When the scheduler has been disabled, this is really trivial: just
-		// call the function.
-		params := exportedFn.Params()
-		params = append(params, llvm.ConstNull(b.dataPtrType)) // context parameter
-		retval := builder.CreateCall(b.llvmFnType, b.llvmFn, params, "")
-		if b.fn.Signature.Results() == nil {
-			builder.CreateRetVoid()
-		} else {
-			builder.CreateRet(retval)
-		}
-
-	} else {
-		// The scheduler is enabled, so we need to start a new goroutine, wait
-		// for it to complete, and read the result value.
-
-		// Build a function that looks like this:
-		//
-		//   func foo#wasmexport(param0, param1, ..., paramN) {
-		//       var state *stateStruct
-		//
-		//       // 'done' must be explicitly initialized ('state' is not zeroed)
-		//       state.done = false
-		//
-		//       // store the parameters in the state object
-		//       state.param0 = param0
-		//       state.param1 = param1
-		//       ...
-		//       state.paramN = paramN
-		//
-		//       // create a goroutine and push it to the runqueue
-		//       task.start(uintptr(gowrapper), &state)
-		//
-		//       // run the scheduler
-		//       runtime.wasmExportRun(&state.done)
-		//
-		//       // if there is a return value, load it and return
-		//       return state.result
-		//   }
-
-		hasReturn := b.fn.Signature.Results() != nil
-
-		// Build the state struct type.
-		// It stores the function parameters, the 'done' flag, and reserves
-		// space for a return value if needed.
-		stateFields := exportedFnType.ParamTypes()
-		numParams := len(stateFields)
-		stateFields = append(stateFields, b.ctx.Int1Type()) // 'done' field
-		if hasReturn {
-			stateFields = append(stateFields, b.llvmFnType.ReturnType())
-		}
-		stateStruct := b.ctx.StructType(stateFields, false)
-
-		// Allocate the state struct on the stack.
-		statePtr := builder.CreateAlloca(stateStruct, "status")
-
-		// Initialize the 'done' field.
-		doneGEP := builder.CreateInBoundsGEP(stateStruct, statePtr, []llvm.Value{
-			llvm.ConstInt(b.ctx.Int32Type(), 0, false),
-			llvm.ConstInt(b.ctx.Int32Type(), uint64(numParams), false),
-		}, "done.gep")
-		builder.CreateStore(llvm.ConstNull(b.ctx.Int1Type()), doneGEP)
-
-		// Store all parameters in the state object.
-		for i, param := range exportedFn.Params() {
-			gep := builder.CreateInBoundsGEP(stateStruct, statePtr, []llvm.Value{
-				llvm.ConstInt(b.ctx.Int32Type(), 0, false),
-				llvm.ConstInt(b.ctx.Int32Type(), uint64(i), false),
-			}, "")
-			builder.CreateStore(param, gep)
-		}
-
-		// Create a new goroutine and add it to the runqueue.
-		wrapper := b.createGoroutineStartWrapper(b.llvmFnType, b.llvmFn, "", false, true, pos)
-		stackSize := llvm.ConstInt(b.uintptrType, b.DefaultStackSize, false)
-		taskStartFnType, taskStartFn := builder.getFunction(b.program.ImportedPackage("internal/task").Members["start"].(*ssa.Function))
-		builder.createCall(taskStartFnType, taskStartFn, []llvm.Value{wrapper, statePtr, stackSize, llvm.Undef(b.dataPtrType)}, "")
-
-		// Run the scheduler.
-		builder.createRuntimeCall("wasmExportRun", []llvm.Value{doneGEP}, "")
-
-		// Read the return value (if any) and return to the caller of the
-		// //go:wasmexport function.
-		if hasReturn {
-			gep := builder.CreateInBoundsGEP(stateStruct, statePtr, []llvm.Value{
-				llvm.ConstInt(b.ctx.Int32Type(), 0, false),
-				llvm.ConstInt(b.ctx.Int32Type(), uint64(numParams)+1, false),
-			}, "")
-			retval := builder.CreateLoad(b.llvmFnType.ReturnType(), gep, "retval")
-			builder.CreateRet(retval)
-		} else {
-			builder.CreateRetVoid()
-		}
-	}
-}
-
 // createGoroutineStartWrapper creates a wrapper for the task-based
 // implementation of goroutines. For example, to call a function like this:
 //
@@ -286,7 +144,7 @@ func (b *builder) createWasmExport() {
 // to last parameter of the function) is used for this wrapper. If hasContext is
 // false, the parameter bundle is assumed to have no context parameter and undef
 // is passed instead.
-func (c *compilerContext) createGoroutineStartWrapper(fnType llvm.Type, fn llvm.Value, prefix string, hasContext, isWasmExport bool, pos token.Pos) llvm.Value {
+func (c *compilerContext) createGoroutineStartWrapper(fnType llvm.Type, fn llvm.Value, prefix string, hasContext bool, pos token.Pos) llvm.Value {
 	var wrapper llvm.Value

 	b := &builder{
@@ -304,18 +162,14 @@ func (c *compilerContext) createGoroutineStartWrapper(fnType llvm.Type, fn llvm.
 	if !fn.IsAFunction().IsNil() {
 		// See whether this wrapper has already been created. If so, return it.
 		name := fn.Name()
-		wrapperName := name + "$gowrapper"
-		if isWasmExport {
-			wrapperName += "-wasmexport"
-		}
-		wrapper = c.mod.NamedFunction(wrapperName)
+		wrapper = c.mod.NamedFunction(name + "$gowrapper")
 		if !wrapper.IsNil() {
 			return llvm.ConstPtrToInt(wrapper, c.uintptrType)
 		}

 		// Create the wrapper.
 		wrapperType := llvm.FunctionType(c.ctx.VoidType(), []llvm.Type{c.dataPtrType}, false)
-		wrapper = llvm.AddFunction(c.mod, wrapperName, wrapperType)
+		wrapper = llvm.AddFunction(c.mod, name+"$gowrapper", wrapperType)
 		c.addStandardAttributes(wrapper)
 		wrapper.SetLinkage(llvm.LinkOnceODRLinkage)
 		wrapper.SetUnnamedAddr(true)
@@ -345,110 +199,23 @@ func (c *compilerContext) createGoroutineStartWrapper(fnType llvm.Type, fn llvm.
 			b.SetCurrentDebugLocation(uint(pos.Line), uint(pos.Column), difunc, llvm.Metadata{})
 		}

-		if !isWasmExport {
-			// Regular 'go' instruction.
+		// Create the list of params for the call.
+		paramTypes := fnType.ParamTypes()
+		if !hasContext {
+			paramTypes = paramTypes[:len(paramTypes)-1] // strip context parameter
+		}
+		params := b.emitPointerUnpack(wrapper.Param(0), paramTypes)
+		if !hasContext {
+			params = append(params, llvm.Undef(c.dataPtrType)) // add dummy context parameter
+		}

-			// Create the list of params for the call.
-			paramTypes := fnType.ParamTypes()
-			if !hasContext {
-				paramTypes = paramTypes[:len(paramTypes)-1] // strip context parameter
-			}
+		// Create the call.
+		b.CreateCall(fnType, fn, params, "")

-			params := b.emitPointerUnpack(wrapper.Param(0), paramTypes)
-			if !hasContext {
-				params = append(params, llvm.Undef(c.dataPtrType)) // add dummy context parameter
-			}
-
-			// Create the call.
-			b.CreateCall(fnType, fn, params, "")
-
-			if c.Scheduler == "asyncify" {
-				b.CreateCall(deadlockType, deadlock, []llvm.Value{
-					llvm.Undef(c.dataPtrType),
-				}, "")
-			}
-		} else {
-			// Goroutine started from a //go:wasmexport pragma.
-			// The function looks like this:
-			//
-			//   func foo$gowrapper-wasmexport(state *stateStruct) {
-			//       // load values
-			//       param0 := state.params[0]
-			//       param1 := state.params[1]
-			//
-			//       // call wrapped functions
-			//       result := foo(param0, param1, ...)
-			//
-			//       // store result value (if there is any)
-			//       state.result = result
-			//
-			//       // finish exported function
-			//       state.done = true
-			//       runtime.wasmExportExit()
-			//   }
-			//
-			// The state object here looks like:
-			//
-			//   struct state {
-			//       param0
-			//       param1
-			//       param* // etc
-			//       done bool
-			//       result returnType
-			//   }
-
-			returnType := fnType.ReturnType()
-			hasReturn := returnType != b.ctx.VoidType()
-			statePtr := wrapper.Param(0)
-
-			// Create the state struct (it must match the type in createWasmExport).
-			stateFields := fnType.ParamTypes()
-			numParams := len(stateFields) - 1
-			stateFields = stateFields[:numParams:numParams]     // strip 'context' parameter
-			stateFields = append(stateFields, c.ctx.Int1Type()) // 'done' bool
-			if hasReturn {
-				stateFields = append(stateFields, returnType)
-			}
-			stateStruct := b.ctx.StructType(stateFields, false)
-
-			// Extract parameters from the state object, and call the function
-			// that's being wrapped.
-			var callParams []llvm.Value
-			for i := 0; i < numParams; i++ {
-				gep := b.CreateInBoundsGEP(stateStruct, statePtr, []llvm.Value{
-					llvm.ConstInt(b.ctx.Int32Type(), 0, false),
-					llvm.ConstInt(b.ctx.Int32Type(), uint64(i), false),
-				}, "")
-				param := b.CreateLoad(stateFields[i], gep, "")
-				callParams = append(callParams, param)
-			}
-			callParams = append(callParams, llvm.ConstNull(c.dataPtrType)) // add 'context' parameter
-			result := b.CreateCall(fnType, fn, callParams, "")
-
-			// Store the return value back into the shared state.
-			// Unlike regular goroutines, these special //go:wasmexport
-			// goroutines can return a value.
-			if hasReturn {
-				gep := b.CreateInBoundsGEP(stateStruct, statePtr, []llvm.Value{
-					llvm.ConstInt(c.ctx.Int32Type(), 0, false),
-					llvm.ConstInt(c.ctx.Int32Type(), uint64(numParams)+1, false),
-				}, "result.ptr")
-				b.CreateStore(result, gep)
-			}
-
-			// Mark this function as having finished executing.
-			// This is important so the runtime knows the exported function
-			// didn't block.
-			doneGEP := b.CreateInBoundsGEP(stateStruct, statePtr, []llvm.Value{
-				llvm.ConstInt(c.ctx.Int32Type(), 0, false),
-				llvm.ConstInt(c.ctx.Int32Type(), uint64(numParams), false),
-			}, "done.gep")
-			b.CreateStore(llvm.ConstInt(b.ctx.Int1Type(), 1, false), doneGEP)
-
-			// Call back into the runtime. This will exit the goroutine, switch
-			// back to the scheduler, which will in turn return from the
-			// //go:wasmexport function.
-			b.createRuntimeCall("wasmExportExit", nil, "")
+		if c.Scheduler == "asyncify" {
+			b.CreateCall(deadlockType, deadlock, []llvm.Value{
+				llvm.Undef(c.dataPtrType),
+			}, "")
 		}

 	} else {
@@ -530,5 +297,5 @@ func (c *compilerContext) createGoroutineStartWrapper(fnType llvm.Type, fn llvm.
 	}

 	// Return a ptrtoint of the wrapper, not the function itself.
-	return llvm.ConstPtrToInt(wrapper, c.uintptrType)
+	return b.CreatePtrToInt(wrapper, c.uintptrType, "")
 }
@@ -38,10 +38,10 @@ func (b *builder) createInlineAsm(args []ssa.Value) (llvm.Value, error) {
 // provided immediately. For example:
 //
 //	arm.AsmFull(
-//	    "str {value}, [{result}]",
+//	    "str {value}, {result}",
 //	    map[string]interface{}{
-//	        "value":  1,
-//	        "result": uintptr(unsafe.Pointer(&dest)),
+//	        "value":  1
+//	        "result": &dest,
 //	    })
 func (b *builder) createInlineAsmFull(instr *ssa.CallCommon) (llvm.Value, error) {
 	asmString := constant.StringVal(instr.Args[0].(*ssa.Const).Value)
@@ -249,15 +249,3 @@ func (b *builder) emitCSROperation(call *ssa.CallCommon) (llvm.Value, error) {
 		return llvm.Value{}, b.makeError(call.Pos(), "unknown CSR operation: "+name)
 	}
 }
-
-// Implement runtime/interrupt.Checkpoint.Save. It needs to be implemented
-// directly at the call site. If it isn't implemented directly at the call site
-// (but instead through a function call), it might result in an overwritten
-// stack in the non-jump return case.
-func (b *builder) createInterruptCheckpoint(ptr ssa.Value) llvm.Value {
-	addr := b.getValue(ptr, ptr.Pos())
-	b.createNilCheck(ptr, addr, "deref")
-	stackPointer := b.readStackPointer()
-	b.CreateStore(stackPointer, addr)
-	return b.createCheckpoint(addr)
-}
@@ -10,7 +10,6 @@ import (
 	"fmt"
 	"go/token"
 	"go/types"
-	"sort"
 	"strconv"
 	"strings"

@@ -18,12 +17,6 @@ import (
 	"tinygo.org/x/go-llvm"
 )

-// numMethodHasMethodSet is a flag in bit 15 of the numMethod field (uint16) in
-// Named, Pointer, and Struct type descriptors. When set, an inline method set
-// is present in the type descriptor. Must match the constant in
-// src/internal/reflectlite/type.go.
-const numMethodHasMethodSet = 0x8000
-
 // Type kinds for basic types.
 // They must match the constants for the Kind type in src/reflect/type.go.
 var basicTypes = [...]uint8{
@@ -129,9 +122,6 @@ func (c *compilerContext) pkgPathPtr(pkgpath string) llvm.Value {
 // This function returns a pointer to the 'kind' field (which might not be the
 // first field in the struct).
 func (c *compilerContext) getTypeCode(typ types.Type) llvm.Value {
-	// Resolve alias types: alias types are resolved at compile time.
-	typ = types.Unalias(typ)
-
 	ms := c.program.MethodSets.MethodSet(typ)
 	hasMethodSet := ms.Len() != 0
 	_, isInterface := typ.Underlying().(*types.Interface)
@@ -190,16 +180,6 @@ func (c *compilerContext) getTypeCode(typ types.Type) llvm.Value {
 		typeFieldTypes := []*types.Var{
 			types.NewVar(token.NoPos, nil, "kind", types.Typ[types.Int8]),
 		}
-		// Compute the method set value for types that support methods.
-		var methods []*types.Func
-		for i := 0; i < ms.Len(); i++ {
-			methods = append(methods, ms.At(i).Obj().(*types.Func))
-		}
-		methodSetType := types.NewStruct([]*types.Var{
-			types.NewVar(token.NoPos, nil, "length", types.Typ[types.Uintptr]),
-			types.NewVar(token.NoPos, nil, "methods", types.NewArray(types.Typ[types.UnsafePointer], int64(len(methods)))),
-		}, nil)
-		methodSetValue := c.getMethodSetValue(methods)
 		switch typ := typ.(type) {
 		case *types.Basic:
 			typeFieldTypes = append(typeFieldTypes,
@@ -216,13 +196,6 @@ func (c *compilerContext) getTypeCode(typ types.Type) llvm.Value {
 				types.NewVar(token.NoPos, nil, "ptrTo", types.Typ[types.UnsafePointer]),
 				types.NewVar(token.NoPos, nil, "underlying", types.Typ[types.UnsafePointer]),
 				types.NewVar(token.NoPos, nil, "pkgpath", types.Typ[types.UnsafePointer]),
-			)
-			if len(methods) > 0 {
-				typeFieldTypes = append(typeFieldTypes,
-					types.NewVar(token.NoPos, nil, "methods", methodSetType),
-				)
-			}
-			typeFieldTypes = append(typeFieldTypes,
 				types.NewVar(token.NoPos, nil, "name", types.NewArray(types.Typ[types.Int8], int64(len(pkgname)+1+len(name)+1))),
 			)
 		case *types.Chan:
@@ -242,11 +215,6 @@ func (c *compilerContext) getTypeCode(typ types.Type) llvm.Value {
 				types.NewVar(token.NoPos, nil, "numMethods", types.Typ[types.Uint16]),
 				types.NewVar(token.NoPos, nil, "elementType", types.Typ[types.UnsafePointer]),
 			)
-			if len(methods) > 0 {
-				typeFieldTypes = append(typeFieldTypes,
-					types.NewVar(token.NoPos, nil, "methods", methodSetType),
-				)
-			}
 		case *types.Array:
 			typeFieldTypes = append(typeFieldTypes,
 				types.NewVar(token.NoPos, nil, "numMethods", types.Typ[types.Uint16]),
@@ -271,16 +239,11 @@ func (c *compilerContext) getTypeCode(typ types.Type) llvm.Value {
 				types.NewVar(token.NoPos, nil, "numFields", types.Typ[types.Uint16]),
 				types.NewVar(token.NoPos, nil, "fields", types.NewArray(c.getRuntimeType("structField"), int64(typ.NumFields()))),
 			)
-			if len(methods) > 0 {
-				typeFieldTypes = append(typeFieldTypes,
-					types.NewVar(token.NoPos, nil, "methods", methodSetType),
-				)
-			}
 		case *types.Interface:
 			typeFieldTypes = append(typeFieldTypes,
 				types.NewVar(token.NoPos, nil, "ptrTo", types.Typ[types.UnsafePointer]),
-				types.NewVar(token.NoPos, nil, "methods", methodSetType),
 			)
+			// TODO: methods
 		case *types.Signature:
 			typeFieldTypes = append(typeFieldTypes,
 				types.NewVar(token.NoPos, nil, "ptrTo", types.Typ[types.UnsafePointer]),
@@ -326,24 +289,14 @@ func (c *compilerContext) getTypeCode(typ types.Type) llvm.Value {
 				pkgname = pkg.Name()
 			}
 			pkgPathPtr := c.pkgPathPtr(pkgpath)
-			namedNumMethods := uint64(numMethods)
-			if namedNumMethods&numMethodHasMethodSet != 0 {
-				panic("numMethods overflow: too many exported methods on named type " + name)
-			}
-			if len(methods) > 0 {
-				namedNumMethods |= numMethodHasMethodSet
-			}
 			typeFields = []llvm.Value{
-				llvm.ConstInt(c.ctx.Int16Type(), namedNumMethods, false), // numMethods
-				c.getTypeCode(types.NewPointer(typ)),                     // ptrTo
-				c.getTypeCode(typ.Underlying()),                          // underlying
-				pkgPathPtr,                                               // pkgpath pointer
+				llvm.ConstInt(c.ctx.Int16Type(), uint64(numMethods), false), // numMethods
+				c.getTypeCode(types.NewPointer(typ)),                        // ptrTo
+				c.getTypeCode(typ.Underlying()),                             // underlying
+				pkgPathPtr,                                                  // pkgpath pointer
+				c.ctx.ConstString(pkgname+"."+name+"\x00", false),           // name
 			}
-			if len(methods) > 0 {
-				typeFields = append(typeFields, methodSetValue) // methods
-			}
-			typeFields = append(typeFields, c.ctx.ConstString(pkgname+"."+name+"\x00", false)) // name
-			metabyte |= 1 << 5                                                                 // "named" flag
+			metabyte |= 1 << 5 // "named" flag
 		case *types.Chan:
 			var dir reflectChanDir
 			switch typ.Dir() {
@@ -367,20 +320,10 @@ func (c *compilerContext) getTypeCode(typ types.Type) llvm.Value {
 				c.getTypeCode(typ.Elem()),                  // elementType
 			}
 		case *types.Pointer:
-			ptrNumMethods := uint64(numMethods)
-			if ptrNumMethods&numMethodHasMethodSet != 0 {
-				panic("numMethods overflow: too many exported methods on pointer type")
-			}
-			if len(methods) > 0 {
-				ptrNumMethods |= numMethodHasMethodSet
-			}
 			typeFields = []llvm.Value{
-				llvm.ConstInt(c.ctx.Int16Type(), ptrNumMethods, false), // numMethods
+				llvm.ConstInt(c.ctx.Int16Type(), uint64(numMethods), false), // numMethods
 				c.getTypeCode(typ.Elem()),
 			}
-			if len(methods) > 0 {
-				typeFields = append(typeFields, methodSetValue)
-			}
 		case *types.Array:
 			typeFields = []llvm.Value{
 				llvm.ConstInt(c.ctx.Int16Type(), 0, false),             // numMethods
@@ -407,16 +350,9 @@ func (c *compilerContext) getTypeCode(typ types.Type) llvm.Value {

 			llvmStructType := c.getLLVMType(typ)
 			size := c.targetData.TypeStoreSize(llvmStructType)
-			structNumMethods := uint64(numMethods)
-			if structNumMethods&numMethodHasMethodSet != 0 {
-				panic("numMethods overflow: too many exported methods on struct type")
-			}
-			if len(methods) > 0 {
-				structNumMethods |= numMethodHasMethodSet
-			}
 			typeFields = []llvm.Value{
-				llvm.ConstInt(c.ctx.Int16Type(), structNumMethods, false), // numMethods
-				c.getTypeCode(types.NewPointer(typ)),                      // ptrTo
+				llvm.ConstInt(c.ctx.Int16Type(), uint64(numMethods), false), // numMethods
+				c.getTypeCode(types.NewPointer(typ)),                        // ptrTo
 				pkgPathPtr,
 				llvm.ConstInt(c.ctx.Int32Type(), uint64(size), false),            // size
 				llvm.ConstInt(c.ctx.Int16Type(), uint64(typ.NumFields()), false), // numFields
@@ -468,14 +404,9 @@ func (c *compilerContext) getTypeCode(typ types.Type) llvm.Value {
 				}))
 			}
 			typeFields = append(typeFields, llvm.ConstArray(structFieldType, fields))
-			if len(methods) > 0 {
-				typeFields = append(typeFields, methodSetValue)
-			}
 		case *types.Interface:
-			typeFields = []llvm.Value{
-				c.getTypeCode(types.NewPointer(typ)),
-				methodSetValue,
-			}
+			typeFields = []llvm.Value{c.getTypeCode(types.NewPointer(typ))}
+			// TODO: methods
 		case *types.Signature:
 			typeFields = []llvm.Value{c.getTypeCode(types.NewPointer(typ))}
 			// TODO: params, return values, etc
@@ -581,7 +512,7 @@ var basicTypeNames = [...]string{
 // interface lowering pass to assign type codes as expected by the reflect
 // package. See getTypeCodeNum.
 func getTypeCodeName(t types.Type) (string, bool) {
-	switch t := types.Unalias(t).(type) {
+	switch t := t.(type) {
 	case *types.Named:
 		if t.Obj().Parent() != t.Obj().Pkg().Scope() {
 			return "named:" + t.String() + "$local", true
@@ -762,11 +693,17 @@ func (b *builder) createTypeAssert(expr *ssa.TypeAssert) llvm.Value {
 			// This type assertion always succeeds, so we can just set commaOk to true.
 			commaOk = llvm.ConstInt(b.ctx.Int1Type(), 1, true)
 		} else {
-			// Type assert on an interface type with methods.
-			// Create a call to a declared-but-not-defined function that will
-			// be lowered by the interface lowering pass into a type-ID
-			// comparison chain.
-			commaOk = b.createInterfaceTypeAssert(intf, actualTypeNum)
+			// Type assert on interface type with methods.
+			// This is a call to an interface type assert function.
+			// The interface lowering pass will define this function by filling it
+			// with a type switch over all concrete types that implement this
+			// interface, and returning whether it's one of the matched types.
+			// This is very different from how interface asserts are implemented in
+			// the main Go compiler, where the runtime checks whether the type
+			// implements each method of the interface. See:
+			// https://research.swtch.com/interfaces
+			fn := b.getInterfaceImplementsFunc(expr.AssertedType)
+			commaOk = b.CreateCall(fn.GlobalValueType(), fn, []llvm.Value{actualTypeNum}, "")
 		}
 	} else {
 		name, _ := getTypeCodeName(expr.AssertedType)
@@ -797,7 +734,7 @@ func (b *builder) createTypeAssert(expr *ssa.TypeAssert) llvm.Value {
 	prevBlock := b.GetInsertBlock()
 	okBlock := b.insertBasicBlock("typeassert.ok")
 	nextBlock := b.insertBasicBlock("typeassert.next")
-	b.currentBlockInfo.exit = nextBlock // adjust outgoing block for phi nodes
+	b.blockExits[b.currentBlock] = nextBlock // adjust outgoing block for phi nodes
 	b.CreateCondBr(commaOk, okBlock, nextBlock)

 	// Retrieve the value from the interface if the type assert was
@@ -843,58 +780,20 @@ func (c *compilerContext) getMethodsString(itf *types.Interface) string {
 	return strings.Join(methods, "; ")
 }

-// getMethodSetValue creates the method set struct value for a list of methods.
-// The struct contains a length and a sorted array of method signature pointers.
-func (c *compilerContext) getMethodSetValue(methods []*types.Func) llvm.Value {
-	// Create a sorted list of method signature global names.
-	type methodRef struct {
-		name  string
-		value llvm.Value
+// getInterfaceImplementsFunc returns a declared function that works as a type
+// switch. The interface lowering pass will define this function.
+func (c *compilerContext) getInterfaceImplementsFunc(assertedType types.Type) llvm.Value {
+	s, _ := getTypeCodeName(assertedType.Underlying())
+	fnName := s + ".$typeassert"
+	llvmFn := c.mod.NamedFunction(fnName)
+	if llvmFn.IsNil() {
+		llvmFnType := llvm.FunctionType(c.ctx.Int1Type(), []llvm.Type{c.dataPtrType}, false)
+		llvmFn = llvm.AddFunction(c.mod, fnName, llvmFnType)
+		c.addStandardDeclaredAttributes(llvmFn)
+		methods := c.getMethodsString(assertedType.Underlying().(*types.Interface))
+		llvmFn.AddFunctionAttr(c.ctx.CreateStringAttribute("tinygo-methods", methods))
 	}
-	var refs []methodRef
-	for _, method := range methods {
-		name := method.Name()
-		if !token.IsExported(name) {
-			name = method.Pkg().Path() + "." + name
-		}
-		s, _ := getTypeCodeName(method.Type())
-		globalName := "reflect/types.signature:" + name + ":" + s
-		value := c.mod.NamedGlobal(globalName)
-		if value.IsNil() {
-			value = llvm.AddGlobal(c.mod, c.ctx.Int8Type(), globalName)
-			value.SetInitializer(llvm.ConstNull(c.ctx.Int8Type()))
-			value.SetGlobalConstant(true)
-			value.SetLinkage(llvm.LinkOnceODRLinkage)
-			value.SetAlignment(1)
-			if c.Debug {
-				file := c.getDIFile("<Go type>")
-				diglobal := c.dibuilder.CreateGlobalVariableExpression(file, llvm.DIGlobalVariableExpression{
-					Name:        globalName,
-					File:        file,
-					Line:        1,
-					Type:        c.getDIType(types.Typ[types.Uint8]),
-					LocalToUnit: false,
-					Expr:        c.dibuilder.CreateExpression(nil),
-					AlignInBits: 8,
-				})
-				value.AddMetadata(0, diglobal)
-			}
-		}
-		refs = append(refs, methodRef{globalName, value})
-	}
-	sort.Slice(refs, func(i, j int) bool {
-		return refs[i].name < refs[j].name
-	})
-
-	var values []llvm.Value
-	for _, ref := range refs {
-		values = append(values, ref.value)
-	}
-
-	return c.ctx.ConstStruct([]llvm.Value{
-		llvm.ConstInt(c.uintptrType, uint64(len(values)), false),
-		llvm.ConstArray(c.dataPtrType, values),
-	}, false)
+	return llvmFn
 }

 // getInvokeFunction returns the thunk to call the given interface method. The
@@ -921,24 +820,6 @@ func (c *compilerContext) getInvokeFunction(instr *ssa.CallCommon) llvm.Value {
 	return llvmFn
 }

-// createInterfaceTypeAssert creates a call to a declared-but-not-defined
-// $typeassert function for the given interface. This function will be defined
-// by the interface lowering pass as a type-ID comparison chain, avoiding the
-// need for runtime.typeImplementsMethodSet at compile time.
-func (b *builder) createInterfaceTypeAssert(intf *types.Interface, actualType llvm.Value) llvm.Value {
-	s, _ := getTypeCodeName(intf)
-	fnName := s + ".$typeassert"
-	llvmFn := b.mod.NamedFunction(fnName)
-	if llvmFn.IsNil() {
-		llvmFnType := llvm.FunctionType(b.ctx.Int1Type(), []llvm.Type{b.dataPtrType}, false)
-		llvmFn = llvm.AddFunction(b.mod, fnName, llvmFnType)
-		b.addStandardDeclaredAttributes(llvmFn)
-		methods := b.getMethodsString(intf)
-		llvmFn.AddFunctionAttr(b.ctx.CreateStringAttribute("tinygo-methods", methods))
-	}
-	return b.CreateCall(llvmFn.GlobalValueType(), llvmFn, []llvm.Value{actualType}, "")
-}
-
 // getInterfaceInvokeWrapper returns a wrapper for the given method so it can be
 // invoked from an interface. The wrapper takes in a pointer to the underlying
 // value, dereferences or unpacks it if necessary, and calls the real method.
@@ -1061,7 +942,7 @@ func signature(sig *types.Signature) string {
 // normalization around `byte` vs `uint8` for example.
 func typestring(t types.Type) string {
 	// See: https://github.com/golang/go/blob/master/src/go/types/typestring.go
-	switch t := types.Unalias(t).(type) {
+	switch t := t.(type) {
 	case *types.Array:
 		return "[" + strconv.FormatInt(t.Len(), 10) + "]" + typestring(t.Elem())
 	case *types.Basic:
@@ -41,8 +41,6 @@ func (b *builder) createInterruptGlobal(instr *ssa.CallCommon) (llvm.Value, erro

 	// Create a new global of type runtime/interrupt.handle. Globals of this
 	// type are lowered in the interrupt lowering pass.
-	// It must have an alignment of 1, otherwise LLVM thinks a ptrtoint of the
-	// global has the lower bits unset.
 	globalType := b.program.ImportedPackage("runtime/interrupt").Type("handle").Type()
 	globalLLVMType := b.getLLVMType(globalType)
 	globalName := b.fn.Package().Pkg.Path() + "$interrupt" + strconv.FormatInt(id.Int64(), 10)
@@ -50,7 +48,6 @@ func (b *builder) createInterruptGlobal(instr *ssa.CallCommon) (llvm.Value, erro
 	global.SetVisibility(llvm.HiddenVisibility)
 	global.SetGlobalConstant(true)
 	global.SetUnnamedAddr(true)
-	global.SetAlignment(1)
 	initializer := llvm.ConstNull(globalLLVMType)
 	initializer = b.CreateInsertValue(initializer, funcContext, 0, "")
 	initializer = b.CreateInsertValue(initializer, funcPtr, 1, "")
@@ -27,8 +27,6 @@ func (b *builder) defineIntrinsicFunction() {
 		b.createStackSaveImpl()
 	case name == "runtime.KeepAlive":
 		b.createKeepAliveImpl()
-	case name == "machine.keepAliveNoEscape":
-		b.createMachineKeepAliveImpl()
 	case strings.HasPrefix(name, "runtime/volatile.Load"):
 		b.createVolatileLoad()
 	case strings.HasPrefix(name, "runtime/volatile.Store"):
@@ -50,24 +48,19 @@ func (b *builder) defineIntrinsicFunction() {
 // and will otherwise be lowered to regular libc memcpy/memmove calls.
 func (b *builder) createMemoryCopyImpl() {
 	b.createFunctionStart(true)
-	params := b.fn.Params[0:3]
-	b.createMemCopy(
-		b.fn.Name(),
-		b.getValue(params[0], getPos(b.fn)),
-		b.getValue(params[1], getPos(b.fn)),
-		b.getValue(params[2], getPos(b.fn)),
-	)
-	b.CreateRetVoid()
-}
-
-func (b *builder) createMemCopy(kind string, dst, src, len llvm.Value) llvm.Value {
-	fnName := "llvm." + kind + ".p0.p0.i" + strconv.Itoa(b.uintptrType.IntTypeWidth())
+	fnName := "llvm." + b.fn.Name() + ".p0.p0.i" + strconv.Itoa(b.uintptrType.IntTypeWidth())
 	llvmFn := b.mod.NamedFunction(fnName)
 	if llvmFn.IsNil() {
 		fnType := llvm.FunctionType(b.ctx.VoidType(), []llvm.Type{b.dataPtrType, b.dataPtrType, b.uintptrType, b.ctx.Int1Type()}, false)
 		llvmFn = llvm.AddFunction(b.mod, fnName, fnType)
 	}
-	return b.CreateCall(llvmFn.GlobalValueType(), llvmFn, []llvm.Value{dst, src, len, llvm.ConstInt(b.ctx.Int1Type(), 0, false)}, "")
+	var params []llvm.Value
+	for _, param := range b.fn.Params {
+		params = append(params, b.getValue(param, getPos(b.fn)))
+	}
+	params = append(params, llvm.ConstInt(b.ctx.Int1Type(), 0, false))
+	b.CreateCall(llvmFn.GlobalValueType(), llvmFn, params, "")
+	b.CreateRetVoid()
 }

 // createMemoryZeroImpl creates calls to llvm.memset.* to zero a block of
@@ -128,43 +121,6 @@ func (b *builder) createKeepAliveImpl() {
 	b.CreateRetVoid()
 }

-// createAbiEscapeImpl implements the generic internal/abi.Escape function. It
-// currently only supports pointer types.
-func (b *builder) createAbiEscapeImpl() {
-	b.createFunctionStart(true)
-
-	// The first parameter is assumed to be a pointer. This is checked at the
-	// call site of createAbiEscapeImpl.
-	pointerValue := b.getValue(b.fn.Params[0], getPos(b.fn))
-
-	// Create an equivalent of the following C code, which is basically just a
-	// nop but ensures the pointerValue is kept alive:
-	//
-	//     __asm__ __volatile__("" : : "r"(pointerValue))
-	//
-	// It should be portable to basically everything as the "r" register type
-	// exists basically everywhere.
-	asmType := llvm.FunctionType(b.dataPtrType, []llvm.Type{b.dataPtrType}, false)
-	asmFn := llvm.InlineAsm(asmType, "", "=r,0", true, false, 0, false)
-	result := b.createCall(asmType, asmFn, []llvm.Value{pointerValue}, "")
-
-	b.CreateRet(result)
-}
-
-// Implement machine.keepAliveNoEscape, which makes sure the compiler keeps the
-// pointer parameter alive until this point (for GC).
-func (b *builder) createMachineKeepAliveImpl() {
-	b.createFunctionStart(true)
-	pointerValue := b.getValue(b.fn.Params[0], getPos(b.fn))
-
-	// See createKeepAliveImpl for details.
-	asmType := llvm.FunctionType(b.ctx.VoidType(), []llvm.Type{b.dataPtrType}, false)
-	asmFn := llvm.InlineAsm(asmType, "", "r", true, false, 0, false)
-	b.createCall(asmType, asmFn, []llvm.Value{pointerValue}, "")
-
-	b.CreateRetVoid()
-}
-
 var mathToLLVMMapping = map[string]string{
 	"math.Ceil":  "llvm.ceil.f64",
 	"math.Exp":   "llvm.exp.f64",
@@ -208,23 +164,6 @@ func (b *builder) defineMathOp() {
 	b.CreateRet(result)
 }

-func (b *builder) defineCryptoIntrinsic() bool {
-	if b.fn.Pkg.Pkg.Path() != "crypto/internal/constanttime" {
-		return false
-	}
-
-	switch b.fn.Name() {
-	case "boolToUint8":
-		b.createFunctionStart(true)
-		param := b.getValue(b.fn.Params[0], b.fn.Pos())
-		result := b.CreateZExt(param, b.ctx.Int8Type(), "")
-		b.CreateRet(result)
-		return true
-	}
-
-	return false
-}
-
 // Implement most math/bits functions.
 //
 // This implements all the functions that operate on bits. It does not yet
@@ -1,10 +1,10 @@
 package compiler

 import (
-	"encoding/binary"
 	"fmt"
 	"go/token"
 	"go/types"
+	"math/big"
 	"strings"

 	"github.com/tinygo-org/tinygo/compileopts"
@@ -129,9 +129,11 @@ func (b *builder) emitPointerPack(values []llvm.Value) llvm.Value {
 		// Packed data is bigger than a pointer, so allocate it on the heap.
 		sizeValue := llvm.ConstInt(b.uintptrType, size, false)
 		align := b.targetData.ABITypeAlignment(packedType)
-		packedAlloc := b.createRuntimeCall(b.allocFunc(), []llvm.Value{
+		alloc := b.mod.NamedFunction("runtime.alloc")
+		packedAlloc := b.CreateCall(alloc.GlobalValueType(), alloc, []llvm.Value{
 			sizeValue,
 			llvm.ConstNull(b.dataPtrType),
+			llvm.Undef(b.dataPtrType), // unused context parameter
 		}, "")
 		packedAlloc.AddCallSiteAttribute(0, b.ctx.CreateEnumAttribute(llvm.AttributeKindID("align"), uint64(align)))
 		if b.NeedsStackObjects {
@@ -229,12 +231,6 @@ func (c *compilerContext) makeGlobalArray(buf []byte, name string, elementType l
 //
 // For details on what's in this value, see src/runtime/gc_precise.go.
 func (c *compilerContext) createObjectLayout(t llvm.Type, pos token.Pos) llvm.Value {
-	if !typeHasPointers(t) {
-		// There are no pointers in this type, so we can simplify the layout.
-		layout := (uint64(1) << 1) | 1
-		return llvm.ConstIntToPtr(llvm.ConstInt(c.uintptrType, layout, false), c.dataPtrType)
-	}
-
 	// Use the element type for arrays. This works even for nested arrays.
 	for {
 		kind := t.TypeKind()
@@ -252,29 +248,54 @@ func (c *compilerContext) createObjectLayout(t llvm.Type, pos token.Pos) llvm.Va
 		break
 	}

-	// Create the pointer bitmap.
+	// Do a few checks to see whether we need to generate any object layout
+	// information at all.
 	objectSizeBytes := c.targetData.TypeAllocSize(t)
-	pointerAlignment := uint64(c.targetData.PrefTypeAlignment(c.dataPtrType))
-	bitmapLen := objectSizeBytes / pointerAlignment
-	bitmapBytes := (bitmapLen + 7) / 8
-	bitmap := make([]byte, bitmapBytes, max(bitmapBytes, 8))
-	c.buildPointerBitmap(bitmap, pointerAlignment, pos, t, 0)
-
-	// Try to encode the layout inline.
 	pointerSize := c.targetData.TypeAllocSize(c.dataPtrType)
-	pointerBits := pointerSize * 8
-	if bitmapLen < pointerBits {
-		rawMask := binary.LittleEndian.Uint64(bitmap[0:8])
-		layout := rawMask*pointerBits + bitmapLen
-		layout <<= 1
-		layout |= 1
+	pointerAlignment := c.targetData.PrefTypeAlignment(c.dataPtrType)
+	if objectSizeBytes < pointerSize {
+		// Too small to contain a pointer.
+		layout := (uint64(1) << 1) | 1
+		return llvm.ConstIntToPtr(llvm.ConstInt(c.uintptrType, layout, false), c.dataPtrType)
+	}
+	bitmap := c.getPointerBitmap(t, pos)
+	if bitmap.BitLen() == 0 {
+		// There are no pointers in this type, so we can simplify the layout.
+		// TODO: this can be done in many other cases, e.g. when allocating an
+		// array (like [4][]byte, which repeats a slice 4 times).
+		layout := (uint64(1) << 1) | 1
+		return llvm.ConstIntToPtr(llvm.ConstInt(c.uintptrType, layout, false), c.dataPtrType)
+	}
+	if objectSizeBytes%uint64(pointerAlignment) != 0 {
+		// This shouldn't happen except for packed structs, which aren't
+		// currently used.
+		c.addError(pos, "internal error: unexpected object size for object with pointer field")
+		return llvm.ConstNull(c.dataPtrType)
+	}
+	objectSizeWords := objectSizeBytes / uint64(pointerAlignment)

-		// Check if the layout fits.
-		layout &= 1<<pointerBits - 1
-		if (layout>>1)/pointerBits == rawMask {
-			// No set bits were shifted off.
-			return llvm.ConstIntToPtr(llvm.ConstInt(c.uintptrType, layout, false), c.dataPtrType)
-		}
+	pointerBits := pointerSize * 8
+	var sizeFieldBits uint64
+	switch pointerBits {
+	case 16:
+		sizeFieldBits = 4
+	case 32:
+		sizeFieldBits = 5
+	case 64:
+		sizeFieldBits = 6
+	default:
+		panic("unknown pointer size")
+	}
+	layoutFieldBits := pointerBits - 1 - sizeFieldBits
+
+	// Try to emit the value as an inline integer. This is possible in most
+	// cases.
+	if objectSizeWords < layoutFieldBits {
+		// If it can be stored directly in the pointer value, do so.
+		// The runtime knows that if the least significant bit of the pointer is
+		// set, the pointer contains the value itself.
+		layout := bitmap.Uint64()<<(sizeFieldBits+1) | (objectSizeWords << 1) | 1
+		return llvm.ConstIntToPtr(llvm.ConstInt(c.uintptrType, layout, false), c.dataPtrType)
 	}

 	// Unfortunately, the object layout is too big to fit in a pointer-sized
@@ -282,24 +303,25 @@ func (c *compilerContext) createObjectLayout(t llvm.Type, pos token.Pos) llvm.Va

 	// Try first whether the global already exists. All objects with a
 	// particular name have the same type, so this is possible.
-	globalName := "runtime/gc.layout:" + fmt.Sprintf("%d-%0*x", bitmapLen, (bitmapLen+15)/16, bitmap)
+	globalName := "runtime/gc.layout:" + fmt.Sprintf("%d-%0*x", objectSizeWords, (objectSizeWords+15)/16, bitmap)
 	global := c.mod.NamedGlobal(globalName)
 	if !global.IsNil() {
 		return global
 	}

 	// Create the global initializer.
-	bitmapByteValues := make([]llvm.Value, bitmapBytes)
-	i8 := c.ctx.Int8Type()
-	for i, b := range bitmap {
-		bitmapByteValues[i] = llvm.ConstInt(i8, uint64(b), false)
+	bitmapBytes := make([]byte, int(objectSizeWords+7)/8)
+	bitmap.FillBytes(bitmapBytes)
+	reverseBytes(bitmapBytes) // big-endian to little-endian
+	var bitmapByteValues []llvm.Value
+	for _, b := range bitmapBytes {
+		bitmapByteValues = append(bitmapByteValues, llvm.ConstInt(c.ctx.Int8Type(), uint64(b), false))
 	}
 	initializer := c.ctx.ConstStruct([]llvm.Value{
-		llvm.ConstInt(c.uintptrType, bitmapLen, false),
-		llvm.ConstArray(i8, bitmapByteValues),
+		llvm.ConstInt(c.uintptrType, objectSizeWords, false),
+		llvm.ConstArray(c.ctx.Int8Type(), bitmapByteValues),
 	}, false)

-	// Create the actual global.
 	global = llvm.AddGlobal(c.mod, initializer.Type(), globalName)
 	global.SetInitializer(initializer)
 	global.SetUnnamedAddr(true)
@@ -307,7 +329,6 @@ func (c *compilerContext) createObjectLayout(t llvm.Type, pos token.Pos) llvm.Va
 	global.SetLinkage(llvm.LinkOnceODRLinkage)
 	if c.targetData.PrefTypeAlignment(c.uintptrType) < 2 {
 		// AVR doesn't have alignment by default.
-		// The lowest bit must be unset to distinguish this from an inline layout.
 		global.SetAlignment(2)
 	}
 	if c.Debug && pos != token.NoPos {
@@ -339,71 +360,59 @@ func (c *compilerContext) createObjectLayout(t llvm.Type, pos token.Pos) llvm.Va
 	return global
 }

-// buildPointerBitmap scans the given LLVM type for pointers and sets bits in a
-// bitmap at the word offset that contains a pointer. This scan is recursive.
-func (c *compilerContext) buildPointerBitmap(
-	dst []byte,
-	ptrAlign uint64,
-	pos token.Pos,
-	t llvm.Type,
-	offset uint64,
-) {
-	switch t.TypeKind() {
+// getPointerBitmap scans the given LLVM type for pointers and sets bits in a
+// bigint at the word offset that contains a pointer. This scan is recursive.
+func (c *compilerContext) getPointerBitmap(typ llvm.Type, pos token.Pos) *big.Int {
+	alignment := c.targetData.PrefTypeAlignment(c.dataPtrType)
+	switch typ.TypeKind() {
 	case llvm.IntegerTypeKind, llvm.FloatTypeKind, llvm.DoubleTypeKind:
-		// These types do not contain pointers.
-
+		return big.NewInt(0)
 	case llvm.PointerTypeKind:
-		// Set the corresponding position in the bitmap.
-		dst[offset/8] |= 1 << (offset % 8)
-
+		return big.NewInt(1)
 	case llvm.StructTypeKind:
-		// Recurse over struct elements.
-		for i, et := range t.StructElementTypes() {
-			eo := c.targetData.ElementOffset(t, i)
-			if eo%uint64(ptrAlign) != 0 {
-				if typeHasPointers(et) {
-					// This error will let the compilation fail, but by continuing
-					// the error can still easily be shown.
-					c.addError(pos, "internal error: allocated struct contains unaligned pointer")
-				}
+		ptrs := big.NewInt(0)
+		if typ.StructName() == "runtime.funcValue" {
+			// Hack: the type runtime.funcValue contains an 'id' field which is
+			// of type uintptr, but before the LowerFuncValues pass it actually
+			// contains a pointer (ptrtoint) to a global. This trips up the
+			// interp package. Therefore, make the id field a pointer for now.
+			typ = c.ctx.StructType([]llvm.Type{c.dataPtrType, c.dataPtrType}, false)
+		}
+		for i, subtyp := range typ.StructElementTypes() {
+			subptrs := c.getPointerBitmap(subtyp, pos)
+			if subptrs.BitLen() == 0 {
 				continue
 			}
-			c.buildPointerBitmap(
-				dst,
-				ptrAlign,
-				pos,
-				et,
-				offset+(eo/ptrAlign),
-			)
-		}
-
-	case llvm.ArrayTypeKind:
-		// Recurse over array elements.
-		len := t.ArrayLength()
-		if len <= 0 {
-			return
-		}
-		et := t.ElementType()
-		elementSize := c.targetData.TypeAllocSize(et)
-		if elementSize%ptrAlign != 0 {
-			if typeHasPointers(et) {
-				// This error will let the compilation fail (but continues so that
-				// other errors can be shown).
-				c.addError(pos, "internal error: allocated array contains unaligned pointer")
+			offset := c.targetData.ElementOffset(typ, i)
+			if offset%uint64(alignment) != 0 {
+				// This error will let the compilation fail, but by continuing
+				// the error can still easily be shown.
+				c.addError(pos, "internal error: allocated struct contains unaligned pointer")
+				continue
 			}
-			return
+			subptrs.Lsh(subptrs, uint(offset)/uint(alignment))
+			ptrs.Or(ptrs, subptrs)
 		}
-		elementSize /= ptrAlign
-		for i := 0; i < len; i++ {
-			c.buildPointerBitmap(
-				dst,
-				ptrAlign,
-				pos,
-				et,
-				offset+uint64(i)*elementSize,
-			)
+		return ptrs
+	case llvm.ArrayTypeKind:
+		subtyp := typ.ElementType()
+		subptrs := c.getPointerBitmap(subtyp, pos)
+		ptrs := big.NewInt(0)
+		if subptrs.BitLen() == 0 {
+			return ptrs
 		}
-
+		elementSize := c.targetData.TypeAllocSize(subtyp)
+		if elementSize%uint64(alignment) != 0 {
+			// This error will let the compilation fail (but continues so that
+			// other errors can be shown).
+			c.addError(pos, "internal error: allocated array contains unaligned pointer")
+			return ptrs
+		}
+		for i := 0; i < typ.ArrayLength(); i++ {
+			ptrs.Lsh(ptrs, uint(elementSize)/uint(alignment))
+			ptrs.Or(ptrs, subptrs)
+		}
+		return ptrs
 	default:
 		// Should not happen.
 		panic("unknown LLVM type")
@@ -450,21 +459,6 @@ func (b *builder) readStackPointer() llvm.Value {
 	return b.CreateCall(stacksave.GlobalValueType(), stacksave, nil, "")
 }

-// writeStackPointer emits a LLVM intrinsic call that updates the current stack
-// pointer.
-func (b *builder) writeStackPointer(sp llvm.Value) {
-	name := "llvm.stackrestore.p0"
-	if llvmutil.Version() < 18 {
-		name = "llvm.stackrestore" // backwards compatibility with LLVM 17 and below
-	}
-	stackrestore := b.mod.NamedFunction(name)
-	if stackrestore.IsNil() {
-		fnType := llvm.FunctionType(b.ctx.VoidType(), []llvm.Type{b.dataPtrType}, false)
-		stackrestore = llvm.AddFunction(b.mod, name, fnType)
-	}
-	b.CreateCall(stackrestore.GlobalValueType(), stackrestore, []llvm.Value{sp}, "")
-}
-
 // createZExtOrTrunc lets the input value fit in the output type bits, by zero
 // extending or truncating the integer.
 func (b *builder) createZExtOrTrunc(value llvm.Value, t llvm.Type) llvm.Value {
@@ -218,7 +218,7 @@ func Version() int {
 	return major
 }

-// ByteOrder returns the byte order for the given target triple. Most targets are little
+// Return the byte order for the given target triple. Most targets are little
 // endian, but for example MIPS can be big-endian.
 func ByteOrder(target string) binary.ByteOrder {
 	if strings.HasPrefix(target, "mips-") {
@@ -3,14 +3,19 @@ package compiler
 // This file emits the correct map intrinsics for map operations.

 import (
-	"fmt"
 	"go/token"
 	"go/types"
+
 	"golang.org/x/tools/go/ssa"
 	"tinygo.org/x/go-llvm"
 )

-const hashArrayUnrollLimit = 4
+// constants for hashmap algorithms; must match src/runtime/hashmap.go
+const (
+	hashmapAlgorithmBinary = iota
+	hashmapAlgorithmString
+	hashmapAlgorithmInterface
+)

 // createMakeMap creates a new map object (runtime.hashmap) by allocating and
 // initializing an appropriately sized object.
@@ -18,13 +23,28 @@ func (b *builder) createMakeMap(expr *ssa.MakeMap) (llvm.Value, error) {
 	mapType := expr.Type().Underlying().(*types.Map)
 	keyType := mapType.Key().Underlying()
 	llvmValueType := b.getLLVMType(mapType.Elem().Underlying())
-	llvmKeyType := b.getLLVMType(keyType)
-
+	var llvmKeyType llvm.Type
+	var alg uint64 // must match values in src/runtime/hashmap.go
+	if t, ok := keyType.(*types.Basic); ok && t.Info()&types.IsString != 0 {
+		// String keys.
+		llvmKeyType = b.getLLVMType(keyType)
+		alg = hashmapAlgorithmString
+	} else if hashmapIsBinaryKey(keyType) {
+		// Trivially comparable keys.
+		llvmKeyType = b.getLLVMType(keyType)
+		alg = hashmapAlgorithmBinary
+	} else {
+		// All other keys. Implemented as map[interface{}]valueType for ease of
+		// implementation.
+		llvmKeyType = b.getLLVMRuntimeType("_interface")
+		alg = hashmapAlgorithmInterface
+	}
 	keySize := b.targetData.TypeAllocSize(llvmKeyType)
 	valueSize := b.targetData.TypeAllocSize(llvmValueType)
 	llvmKeySize := llvm.ConstInt(b.uintptrType, keySize, false)
 	llvmValueSize := llvm.ConstInt(b.uintptrType, valueSize, false)
 	sizeHint := llvm.ConstInt(b.uintptrType, 8, false)
+	algEnum := llvm.ConstInt(b.ctx.Int8Type(), alg, false)
 	if expr.Reserve != nil {
 		sizeHint = b.getValue(expr.Reserve, getPos(expr))
 		var err error
@@ -33,42 +53,10 @@ func (b *builder) createMakeMap(expr *ssa.MakeMap) (llvm.Value, error) {
 			return llvm.Value{}, err
 		}
 	}
-
-	// Resolve hash and equal functions for this key type. For string and
-	// binary key types, reference the corresponding runtime functions
-	// directly. For composite types, generate type-specific functions.
-	var hashFn, equalFn llvm.Value
-	if t, ok := keyType.(*types.Basic); ok && t.Info()&types.IsString != 0 {
-		hashFn = b.getRuntimeFunctionValue("hashmapStringPtrHash", hashmapKeyHashSignature())
-		equalFn = b.getRuntimeFunctionValue("hashmapStringEqual", hashmapKeyEqualSignature())
-	} else if hashmapIsBinaryKey(keyType) {
-		hashFn = b.getRuntimeFunctionValue("hash32", hashmapKeyHashSignature())
-		equalFn = b.getRuntimeFunctionValue("memequal", hashmapKeyEqualSignature())
-	} else {
-		fn := b.getOrGenerateKeyHashFunc(keyType)
-		hashFn = b.createFuncValue(fn, llvm.ConstNull(b.dataPtrType), hashmapKeyHashSignature())
-		fn = b.getOrGenerateKeyEqualFunc(keyType)
-		equalFn = b.createFuncValue(fn, llvm.ConstNull(b.dataPtrType), hashmapKeyEqualSignature())
-	}
-
-	hashmap := b.createRuntimeCall("hashmapMakeGeneric", []llvm.Value{
-		llvmKeySize, llvmValueSize, sizeHint,
-		hashFn, equalFn,
-	}, "")
+	hashmap := b.createRuntimeCall("hashmapMake", []llvm.Value{llvmKeySize, llvmValueSize, sizeHint, algEnum}, "")
 	return hashmap, nil
 }

-// getRuntimeFunctionValue returns a TinyGo function value (with nil context)
-// for the named runtime function.
-func (b *builder) getRuntimeFunctionValue(name string, sig *types.Signature) llvm.Value {
-	member := b.program.ImportedPackage("runtime").Members[name]
-	if member == nil {
-		panic("unknown runtime function: " + name)
-	}
-	_, llvmFn := b.getFunction(member.(*ssa.Function))
-	return b.createFuncValue(llvmFn, llvm.ConstNull(b.dataPtrType), sig)
-}
-
 // createMapLookup returns the value in a map. It calls a runtime function
 // depending on the map key type to load the map value and its comma-ok value.
 func (b *builder) createMapLookup(keyType, valueType types.Type, m, key llvm.Value, commaOk bool, pos token.Pos) (llvm.Value, error) {
@@ -90,23 +78,32 @@ func (b *builder) createMapLookup(keyType, valueType types.Type, m, key llvm.Val

 	// Do the lookup. How it is done depends on the key type.
 	var commaOkValue llvm.Value
+	origKeyType := keyType
 	keyType = keyType.Underlying()
 	if t, ok := keyType.(*types.Basic); ok && t.Info()&types.IsString != 0 {
 		// key is a string
 		params := []llvm.Value{m, key, mapValueAlloca, mapValueSize}
 		commaOkValue = b.createRuntimeCall("hashmapStringGet", params, "")
-	} else {
-		// Key stored at actual type: either binary-comparable or with
-		// compiler-generated hash/equal.
+	} else if hashmapIsBinaryKey(keyType) {
+		// key can be compared with runtime.memequal
+		// Store the key in an alloca, in the entry block to avoid dynamic stack
+		// growth.
 		mapKeyAlloca, mapKeySize := b.createTemporaryAlloca(key.Type(), "hashmap.key")
 		b.CreateStore(key, mapKeyAlloca)
+		b.zeroUndefBytes(b.getLLVMType(keyType), mapKeyAlloca)
+		// Fetch the value from the hashmap.
 		params := []llvm.Value{m, mapKeyAlloca, mapValueAlloca, mapValueSize}
-		fnName := "hashmapBinaryGet"
-		if !hashmapIsBinaryKey(keyType) {
-			fnName = "hashmapGenericGet"
-		}
-		commaOkValue = b.createRuntimeCall(fnName, params, "")
+		commaOkValue = b.createRuntimeCall("hashmapBinaryGet", params, "")
 		b.emitLifetimeEnd(mapKeyAlloca, mapKeySize)
+	} else {
+		// Not trivially comparable using memcmp. Make it an interface instead.
+		itfKey := key
+		if _, ok := keyType.(*types.Interface); !ok {
+			// Not already an interface, so convert it to an interface now.
+			itfKey = b.createMakeInterface(key, origKeyType, pos)
+		}
+		params := []llvm.Value{m, itfKey, mapValueAlloca, mapValueSize}
+		commaOkValue = b.createRuntimeCall("hashmapInterfaceGet", params, "")
 	}

 	// Load the resulting value from the hashmap. The value is set to the zero
@@ -129,22 +126,29 @@ func (b *builder) createMapLookup(keyType, valueType types.Type, m, key llvm.Val
 func (b *builder) createMapUpdate(keyType types.Type, m, key, value llvm.Value, pos token.Pos) {
 	valueAlloca, valueSize := b.createTemporaryAlloca(value.Type(), "hashmap.value")
 	b.CreateStore(value, valueAlloca)
+	origKeyType := keyType
 	keyType = keyType.Underlying()
 	if t, ok := keyType.(*types.Basic); ok && t.Info()&types.IsString != 0 {
 		// key is a string
 		params := []llvm.Value{m, key, valueAlloca}
 		b.createRuntimeCall("hashmapStringSet", params, "")
-	} else {
-		// Key stored at actual type.
+	} else if hashmapIsBinaryKey(keyType) {
+		// key can be compared with runtime.memequal
 		keyAlloca, keySize := b.createTemporaryAlloca(key.Type(), "hashmap.key")
 		b.CreateStore(key, keyAlloca)
-		fnName := "hashmapBinarySet"
-		if !hashmapIsBinaryKey(keyType) {
-			fnName = "hashmapGenericSet"
-		}
+		b.zeroUndefBytes(b.getLLVMType(keyType), keyAlloca)
 		params := []llvm.Value{m, keyAlloca, valueAlloca}
-		b.createRuntimeCall(fnName, params, "")
+		b.createRuntimeCall("hashmapBinarySet", params, "")
 		b.emitLifetimeEnd(keyAlloca, keySize)
+	} else {
+		// Key is not trivially comparable, so compare it as an interface instead.
+		itfKey := key
+		if _, ok := keyType.(*types.Interface); !ok {
+			// Not already an interface, so convert it to an interface first.
+			itfKey = b.createMakeInterface(key, origKeyType, pos)
+		}
+		params := []llvm.Value{m, itfKey, valueAlloca}
+		b.createRuntimeCall("hashmapInterfaceSet", params, "")
 	}
 	b.emitLifetimeEnd(valueAlloca, valueSize)
 }
@@ -152,24 +156,32 @@ func (b *builder) createMapUpdate(keyType types.Type, m, key, value llvm.Value,
 // createMapDelete deletes a key from a map by calling the appropriate runtime
 // function. It is the implementation of the Go delete() builtin.
 func (b *builder) createMapDelete(keyType types.Type, m, key llvm.Value, pos token.Pos) error {
+	origKeyType := keyType
 	keyType = keyType.Underlying()
 	if t, ok := keyType.(*types.Basic); ok && t.Info()&types.IsString != 0 {
 		// key is a string
 		params := []llvm.Value{m, key}
 		b.createRuntimeCall("hashmapStringDelete", params, "")
 		return nil
-	} else {
-		// Key stored at actual type.
+	} else if hashmapIsBinaryKey(keyType) {
 		keyAlloca, keySize := b.createTemporaryAlloca(key.Type(), "hashmap.key")
 		b.CreateStore(key, keyAlloca)
-		fnName := "hashmapBinaryDelete"
-		if !hashmapIsBinaryKey(keyType) {
-			fnName = "hashmapGenericDelete"
-		}
+		b.zeroUndefBytes(b.getLLVMType(keyType), keyAlloca)
 		params := []llvm.Value{m, keyAlloca}
-		b.createRuntimeCall(fnName, params, "")
+		b.createRuntimeCall("hashmapBinaryDelete", params, "")
 		b.emitLifetimeEnd(keyAlloca, keySize)
 		return nil
+	} else {
+		// Key is not trivially comparable, so compare it as an interface
+		// instead.
+		itfKey := key
+		if _, ok := keyType.(*types.Interface); !ok {
+			// Not already an interface, so convert it to an interface first.
+			itfKey = b.createMakeInterface(key, origKeyType, pos)
+		}
+		params := []llvm.Value{m, itfKey}
+		b.createRuntimeCall("hashmapInterfaceDelete", params, "")
+		return nil
 	}
 }

@@ -189,15 +201,42 @@ func (b *builder) createMapIteratorNext(rangeVal ssa.Value, llvmRangeVal, it llv
 	llvmKeyType := b.getLLVMType(keyType)
 	llvmValueType := b.getLLVMType(valueType)

-	// All key types are now stored at their declared type (no interface wrapping).
+	// There is a special case in which keys are stored as an interface value
+	// instead of the value they normally are. This happens for non-trivially
+	// comparable types such as float32 or some structs.
+	isKeyStoredAsInterface := false
+	if t, ok := keyType.Underlying().(*types.Basic); ok && t.Info()&types.IsString != 0 {
+		// key is a string
+	} else if hashmapIsBinaryKey(keyType) {
+		// key can be compared with runtime.memequal
+	} else {
+		// The key is stored as an interface value, and may or may not be an
+		// interface type (for example, float32 keys are stored as an interface
+		// value).
+		if _, ok := keyType.Underlying().(*types.Interface); !ok {
+			isKeyStoredAsInterface = true
+		}
+	}
+
+	// Determine the type of the key as stored in the map.
+	llvmStoredKeyType := llvmKeyType
+	if isKeyStoredAsInterface {
+		llvmStoredKeyType = b.getLLVMRuntimeType("_interface")
+	}

 	// Extract the key and value from the map.
-	mapKeyAlloca, mapKeySize := b.createTemporaryAlloca(llvmKeyType, "range.key")
+	mapKeyAlloca, mapKeySize := b.createTemporaryAlloca(llvmStoredKeyType, "range.key")
 	mapValueAlloca, mapValueSize := b.createTemporaryAlloca(llvmValueType, "range.value")
 	ok := b.createRuntimeCall("hashmapNext", []llvm.Value{llvmRangeVal, it, mapKeyAlloca, mapValueAlloca}, "range.next")
-	mapKey := b.CreateLoad(llvmKeyType, mapKeyAlloca, "")
+	mapKey := b.CreateLoad(llvmStoredKeyType, mapKeyAlloca, "")
 	mapValue := b.CreateLoad(llvmValueType, mapValueAlloca, "")

+	if isKeyStoredAsInterface {
+		// The key is stored as an interface but it isn't of interface type.
+		// Extract the underlying value.
+		mapKey = b.extractValueFromInterface(mapKey, llvmKeyType)
+	}
+
 	// End the lifetimes of the allocas, because we're done with them.
 	b.emitLifetimeEnd(mapKeyAlloca, mapKeySize)
 	b.emitLifetimeEnd(mapValueAlloca, mapValueSize)
@@ -215,411 +254,90 @@ func (b *builder) createMapIteratorNext(rangeVal ssa.Value, llvmRangeVal, it llv
 // can be compared with runtime.memequal.  Note that padding bytes are undef
 // and can alter two "equal" structs being equal when compared with memequal.
 func hashmapIsBinaryKey(keyType types.Type) bool {
-	switch keyType := keyType.Underlying().(type) {
+	switch keyType := keyType.(type) {
 	case *types.Basic:
-		return keyType.Info()&(types.IsBoolean|types.IsInteger) != 0 || keyType.Kind() == types.UnsafePointer
+		return keyType.Info()&(types.IsBoolean|types.IsInteger) != 0
 	case *types.Pointer:
 		return true
+	case *types.Struct:
+		for i := 0; i < keyType.NumFields(); i++ {
+			fieldType := keyType.Field(i).Type().Underlying()
+			if !hashmapIsBinaryKey(fieldType) {
+				return false
+			}
+		}
+		return true
 	case *types.Array:
 		return hashmapIsBinaryKey(keyType.Elem())
+	case *types.Named:
+		return hashmapIsBinaryKey(keyType.Underlying())
 	default:
 		return false
 	}
 }

-// hashmapKeyHashSignature returns the Go type signature for hashmap key hash
-// functions: func(key unsafe.Pointer, size, seed uintptr) uint32
-func hashmapKeyHashSignature() *types.Signature {
-	return types.NewSignatureType(nil, nil, nil,
-		types.NewTuple(
-			types.NewVar(token.NoPos, nil, "key", types.Typ[types.UnsafePointer]),
-			types.NewVar(token.NoPos, nil, "size", types.Typ[types.Uintptr]),
-			types.NewVar(token.NoPos, nil, "seed", types.Typ[types.Uintptr]),
-		),
-		types.NewTuple(
-			types.NewVar(token.NoPos, nil, "", types.Typ[types.Uint32]),
-		),
-		false,
-	)
-}
+func (b *builder) zeroUndefBytes(llvmType llvm.Type, ptr llvm.Value) error {
+	// We know that hashmapIsBinaryKey is true, so we only have to handle those types that can show up there.
+	// To zero all undefined bytes, we iterate over all the fields in the type.  For each element, compute the
+	// offset of that element.  If it's Basic type, there are no internal padding bytes.  For compound types, we recurse to ensure
+	// we handle nested types.  Next, we determine if there are any padding bytes before the next
+	// element and zero those as well.

-// hashmapKeyEqualSignature returns the Go type signature for hashmap key equal
-// functions: func(x, y unsafe.Pointer, n uintptr) bool
-func hashmapKeyEqualSignature() *types.Signature {
-	return types.NewSignatureType(nil, nil, nil,
-		types.NewTuple(
-			types.NewVar(token.NoPos, nil, "x", types.Typ[types.UnsafePointer]),
-			types.NewVar(token.NoPos, nil, "y", types.Typ[types.UnsafePointer]),
-			types.NewVar(token.NoPos, nil, "n", types.Typ[types.Uintptr]),
-		),
-		types.NewTuple(
-			types.NewVar(token.NoPos, nil, "", types.Typ[types.Bool]),
-		),
-		false,
-	)
-}
+	zero := llvm.ConstInt(b.ctx.Int32Type(), 0, false)

-// hashmapKeyFuncName returns a canonical name for a generated hash or equal
-// function based on the key type's underlying structure. Named types are
-// replaced with their underlying types so that structurally identical key
-// types (e.g., struct{i1; str1} and struct{i2; str2} where both i1, i2 are
-// int and str1, str2 are string) share the same generated function.
-func hashmapKeyFuncName(prefix string, keyType types.Type) string {
-	return prefix + "." + hashmapCanonicalTypeName(keyType)
-}
+	switch llvmType.TypeKind() {
+	case llvm.IntegerTypeKind:
+		// no padding bytes
+		return nil
+	case llvm.PointerTypeKind:
+		// mo padding bytes
+		return nil
+	case llvm.ArrayTypeKind:
+		llvmArrayType := llvmType
+		llvmElemType := llvmType.ElementType()

-// hashmapCanonicalTypeName returns a string representation of the hash/equal
-// operations needed for a type, stripping named types where the operation does
-// not depend on the name. Pointer and channel names do not include the element
-// type because their hash/equal operations only use the pointer word.
-func hashmapCanonicalTypeName(t types.Type) string {
-	switch t := t.Underlying().(type) {
-	case *types.Basic:
-		return t.Name()
-	case *types.Pointer:
-		return "*"
-	case *types.Chan:
-		switch t.Dir() {
-		case types.SendRecv:
-			return "chan"
-		case types.SendOnly:
-			return "chan<-"
-		case types.RecvOnly:
-			return "<-chan"
+		for i := 0; i < llvmArrayType.ArrayLength(); i++ {
+			idx := llvm.ConstInt(b.uintptrType, uint64(i), false)
+			elemPtr := b.CreateInBoundsGEP(llvmArrayType, ptr, []llvm.Value{zero, idx}, "")
+
+			// zero any padding bytes in this element
+			b.zeroUndefBytes(llvmElemType, elemPtr)
 		}
-	case *types.Interface:
-		if t.NumMethods() == 0 {
-			return "interface{}"
-		}
-		return t.String()
-	case *types.Struct:
-		s := "struct{"
-		for i := 0; i < t.NumFields(); i++ {
-			if i > 0 {
-				s += "; "
-			}
-			s += hashmapCanonicalTypeName(t.Field(i).Type())
-		}
-		return s + "}"
-	case *types.Array:
-		return fmt.Sprintf("[%d]%s", t.Len(), hashmapCanonicalTypeName(t.Elem()))
-	}
-	return t.String()
-}

-// getOrGenerateKeyHashFunc returns an LLVM function that computes the hash
-// of a key of the given type. The function is generated on first call and
-// cached in the module.
-func (b *builder) getOrGenerateKeyHashFunc(keyType types.Type) llvm.Value {
-	name := hashmapKeyFuncName("hashmapKeyHash", keyType)
-	if fn := b.mod.NamedFunction(name); !fn.IsNil() {
-		return fn
-	}
+	case llvm.StructTypeKind:
+		llvmStructType := llvmType
+		numFields := llvmStructType.StructElementTypesCount()
+		llvmElementTypes := llvmStructType.StructElementTypes()

-	// Create the LLVM function type:
-	// (key ptr, size uintptr, seed uintptr, context ptr) -> i32
-	fnType := llvm.FunctionType(b.ctx.Int32Type(), []llvm.Type{
-		b.dataPtrType, b.uintptrType, b.uintptrType, b.dataPtrType,
-	}, false)
-	fn := llvm.AddFunction(b.mod, name, fnType)
-	fn.SetLinkage(llvm.LinkOnceODRLinkage)
-	fn.SetUnnamedAddr(true)
-	b.addStandardAttributes(fn)
-
-	// Generate the function body.
-	savedBlock := b.GetInsertBlock()
-	defer b.SetInsertPointAtEnd(savedBlock)
-
-	entry := b.ctx.AddBasicBlock(fn, "entry")
-	b.SetInsertPointAtEnd(entry)
-
-	keyPtr := fn.Param(0)
-	seed := fn.Param(2)
-	llvmKeyType := b.getLLVMType(keyType)
-	hash := b.generateKeyHash(keyType, llvmKeyType, keyPtr, seed)
-	b.CreateRet(hash)
-
-	return fn
-}
-
-// getOrGenerateKeyEqualFunc returns an LLVM function that compares two keys
-// of the given type for equality. The function is generated on first call
-// and cached in the module.
-func (b *builder) getOrGenerateKeyEqualFunc(keyType types.Type) llvm.Value {
-	name := hashmapKeyFuncName("hashmapKeyEqual", keyType)
-	if fn := b.mod.NamedFunction(name); !fn.IsNil() {
-		return fn
-	}
-
-	// Create the LLVM function type:
-	// (x ptr, y ptr, n uintptr, context ptr) -> i1
-	fnType := llvm.FunctionType(b.ctx.Int1Type(), []llvm.Type{
-		b.dataPtrType, b.dataPtrType, b.uintptrType, b.dataPtrType,
-	}, false)
-	fn := llvm.AddFunction(b.mod, name, fnType)
-	fn.SetLinkage(llvm.LinkOnceODRLinkage)
-	fn.SetUnnamedAddr(true)
-	b.addStandardAttributes(fn)
-
-	// Generate the function body.
-	savedBlock := b.GetInsertBlock()
-	defer b.SetInsertPointAtEnd(savedBlock)
-
-	entry := b.ctx.AddBasicBlock(fn, "entry")
-	b.SetInsertPointAtEnd(entry)
-
-	xPtr := fn.Param(0)
-	yPtr := fn.Param(1)
-	llvmKeyType := b.getLLVMType(keyType)
-	result := b.generateKeyEqual(keyType, llvmKeyType, xPtr, yPtr, fn)
-	b.CreateRet(result)
-
-	return fn
-}
-
-// generateKeyHash generates IR that hashes a key value. Returns the i32 hash.
-func (b *builder) generateKeyHash(keyType types.Type, llvmKeyType llvm.Type, keyPtr llvm.Value, seed llvm.Value) llvm.Value {
-	switch keyType := keyType.Underlying().(type) {
-	case *types.Basic:
-		if keyType.Info()&types.IsString != 0 {
-			// Hash the string contents. The size parameter is unused by
-			// hashmapStringPtrHash (it dereferences the string header to
-			// get the actual length), but we pass it for signature
-			// consistency with other hash functions.
-			size := llvm.ConstInt(b.uintptrType, b.targetData.TypeAllocSize(llvmKeyType), false)
-			return b.createRuntimeCall("hashmapStringPtrHash", []llvm.Value{keyPtr, size, seed}, "hash")
-		}
-		if keyType.Info()&types.IsFloat != 0 {
-			// Float hash: normalizes -0 to +0 before hashing.
-			if keyType.Kind() == types.Float32 {
-				return b.createRuntimeCall("hashmapFloat32Hash", []llvm.Value{keyPtr, seed}, "hash")
-			}
-			return b.createRuntimeCall("hashmapFloat64Hash", []llvm.Value{keyPtr, seed}, "hash")
-		}
-		if keyType.Info()&types.IsComplex != 0 {
-			// Complex hash: hash real and imaginary parts as floats.
-			if keyType.Kind() == types.Complex64 {
-				realPtr := keyPtr
-				imagPtr := b.CreateInBoundsGEP(b.ctx.Int8Type(), keyPtr, []llvm.Value{
-					llvm.ConstInt(b.uintptrType, 4, false),
-				}, "")
-				realHash := b.createRuntimeCall("hashmapFloat32Hash", []llvm.Value{realPtr, seed}, "hash.real")
-				imagHash := b.createRuntimeCall("hashmapFloat32Hash", []llvm.Value{imagPtr, seed}, "hash.imag")
-				return b.CreateXor(realHash, imagHash, "")
-			}
-			realPtr := keyPtr
-			imagPtr := b.CreateInBoundsGEP(b.ctx.Int8Type(), keyPtr, []llvm.Value{
-				llvm.ConstInt(b.uintptrType, 8, false),
-			}, "")
-			realHash := b.createRuntimeCall("hashmapFloat64Hash", []llvm.Value{realPtr, seed}, "hash.real")
-			imagHash := b.createRuntimeCall("hashmapFloat64Hash", []llvm.Value{imagPtr, seed}, "hash.imag")
-			return b.CreateXor(realHash, imagHash, "")
-		}
-		// Integer/boolean: hash the raw bytes.
-		size := llvm.ConstInt(b.uintptrType, b.targetData.TypeAllocSize(llvmKeyType), false)
-		return b.createRuntimeCall("hash32", []llvm.Value{keyPtr, size, seed}, "hash")
-	case *types.Pointer, *types.Chan:
-		// Pointers and channels: hash as raw pointer-sized bytes.
-		size := llvm.ConstInt(b.uintptrType, b.targetData.TypeAllocSize(llvmKeyType), false)
-		return b.createRuntimeCall("hash32", []llvm.Value{keyPtr, size, seed}, "hash")
-	case *types.Interface:
-		// Interface: use runtime reflection-based hash.
-		size := llvm.ConstInt(b.uintptrType, b.targetData.TypeAllocSize(llvmKeyType), false)
-		return b.createRuntimeCall("hashmapInterfacePtrHash", []llvm.Value{keyPtr, size, seed}, "hash")
-	case *types.Struct:
-		hash := llvm.ConstInt(b.ctx.Int32Type(), 0, false)
-		zero := llvm.ConstInt(b.ctx.Int32Type(), 0, false)
-		for i := 0; i < keyType.NumFields(); i++ {
-			if keyType.Field(i).Name() == "_" {
-				continue // blank fields are ignored in Go equality
-			}
-			fieldType := keyType.Field(i).Type()
-			llvmFieldType := b.getLLVMType(fieldType)
-			if b.targetData.TypeAllocSize(llvmFieldType) == 0 {
-				continue // skip zero-sized fields
-			}
+		for i := 0; i < numFields; i++ {
 			idx := llvm.ConstInt(b.ctx.Int32Type(), uint64(i), false)
-			fieldPtr := b.CreateInBoundsGEP(llvmKeyType, keyPtr, []llvm.Value{zero, idx}, "")
-			fieldHash := b.generateKeyHash(fieldType, llvmFieldType, fieldPtr, seed)
-			hash = b.CreateXor(hash, fieldHash, "")
-		}
-		return hash
-	case *types.Array:
-		elemType := keyType.Elem()
-		llvmElemType := b.getLLVMType(elemType)
-		arrayLen := keyType.Len()
-		if hashmapIsBinaryKey(elemType) {
-			// All elements are binary-comparable; hash the entire array as raw bytes.
-			size := llvm.ConstInt(b.uintptrType, b.targetData.TypeAllocSize(llvmKeyType), false)
-			return b.createRuntimeCall("hash32", []llvm.Value{keyPtr, size, seed}, "hash")
-		}
-		if arrayLen == 0 {
-			return llvm.ConstInt(b.ctx.Int32Type(), 0, false)
-		}
-		if arrayLen <= hashArrayUnrollLimit {
-			hash := llvm.ConstInt(b.ctx.Int32Type(), 0, false)
-			zero := llvm.ConstInt(b.ctx.Int32Type(), 0, false)
-			for i := 0; i < int(arrayLen); i++ {
-				idx := llvm.ConstInt(b.uintptrType, uint64(i), false)
-				elemPtr := b.CreateInBoundsGEP(llvmKeyType, keyPtr, []llvm.Value{zero, idx}, "")
-				elemHash := b.generateKeyHash(elemType, llvmElemType, elemPtr, seed)
-				hash = b.CreateXor(hash, elemHash, "")
-			}
-			return hash
-		}
-		initHash := llvm.ConstInt(b.ctx.Int32Type(), 0, false)
-		zero := llvm.ConstInt(b.ctx.Int32Type(), 0, false)
+			elemPtr := b.CreateInBoundsGEP(llvmStructType, ptr, []llvm.Value{zero, idx}, "")

-		loopEntry := b.GetInsertBlock()
-		loopBody := b.ctx.AddBasicBlock(loopEntry.Parent(), "hash.array.body")
-		loopDone := b.ctx.AddBasicBlock(loopEntry.Parent(), "hash.array.done")
+			// zero any padding bytes in this field
+			llvmElemType := llvmElementTypes[i]
+			b.zeroUndefBytes(llvmElemType, elemPtr)

-		b.CreateBr(loopBody)
-		b.SetInsertPointAtEnd(loopBody)
+			// zero any padding bytes before the next field, if any
+			offset := b.targetData.ElementOffset(llvmStructType, i)
+			storeSize := b.targetData.TypeStoreSize(llvmElemType)
+			fieldEndOffset := offset + storeSize

-		phiI := b.CreatePHI(b.uintptrType, "i")
-		phiHash := b.CreatePHI(b.ctx.Int32Type(), "hash.acc")
-
-		elemPtr := b.CreateInBoundsGEP(llvmKeyType, keyPtr, []llvm.Value{zero, phiI}, "")
-		elemHash := b.generateKeyHash(elemType, llvmElemType, elemPtr, seed)
-		newHash := b.CreateXor(phiHash, elemHash, "")
-		nextI := b.CreateAdd(phiI, llvm.ConstInt(b.uintptrType, 1, false), "")
-		cond := b.CreateICmp(llvm.IntULT, nextI, llvm.ConstInt(b.uintptrType, uint64(arrayLen), false), "")
-		b.CreateCondBr(cond, loopBody, loopDone)
-
-		bodyEnd := b.GetInsertBlock()
-		phiI.AddIncoming([]llvm.Value{llvm.ConstInt(b.uintptrType, 0, false), nextI},
-			[]llvm.BasicBlock{loopEntry, bodyEnd})
-		phiHash.AddIncoming([]llvm.Value{initHash, newHash},
-			[]llvm.BasicBlock{loopEntry, bodyEnd})
-
-		b.SetInsertPointAtEnd(loopDone)
-		return newHash
-	default:
-		panic(fmt.Sprintf("unhandled key type for hash generation: %T", keyType))
-	}
-}
-
-// generateKeyEqual generates IR that compares two key values for equality.
-// Returns an i1 result.
-func (b *builder) generateKeyEqual(keyType types.Type, llvmKeyType llvm.Type, xPtr, yPtr llvm.Value, fn llvm.Value) llvm.Value {
-	switch keyType := keyType.Underlying().(type) {
-	case *types.Basic:
-		if keyType.Info()&types.IsString != 0 {
-			// Compare strings: load both string headers and compare.
-			xStr := b.CreateLoad(llvmKeyType, xPtr, "x.str")
-			yStr := b.CreateLoad(llvmKeyType, yPtr, "y.str")
-			return b.createRuntimeCall("stringEqual", []llvm.Value{xStr, yStr}, "eq")
-		}
-		if keyType.Info()&types.IsFloat != 0 {
-			// Float equality: fcmp oeq handles -0==+0 (true) and NaN==NaN (false).
-			xVal := b.CreateLoad(llvmKeyType, xPtr, "x.float")
-			yVal := b.CreateLoad(llvmKeyType, yPtr, "y.float")
-			return b.CreateFCmp(llvm.FloatOEQ, xVal, yVal, "eq")
-		}
-		if keyType.Info()&types.IsComplex != 0 {
-			// Complex equality: both real and imaginary parts must be equal.
-			var floatType llvm.Type
-			if keyType.Kind() == types.Complex64 {
-				floatType = b.ctx.FloatType()
+			var nextOffset uint64
+			if i < numFields-1 {
+				nextOffset = b.targetData.ElementOffset(llvmStructType, i+1)
 			} else {
-				floatType = b.ctx.DoubleType()
+				// Last field?  Next offset is the total size of the allocate struct.
+				nextOffset = b.targetData.TypeAllocSize(llvmStructType)
 			}
-			floatSize := b.targetData.TypeAllocSize(floatType)
-			imagOffset := llvm.ConstInt(b.uintptrType, floatSize, false)
-			// Real parts
-			xReal := b.CreateLoad(floatType, xPtr, "x.real")
-			yReal := b.CreateLoad(floatType, yPtr, "y.real")
-			realEq := b.CreateFCmp(llvm.FloatOEQ, xReal, yReal, "eq.real")
-			// Imaginary parts
-			xImagPtr := b.CreateInBoundsGEP(b.ctx.Int8Type(), xPtr, []llvm.Value{imagOffset}, "")
-			yImagPtr := b.CreateInBoundsGEP(b.ctx.Int8Type(), yPtr, []llvm.Value{imagOffset}, "")
-			xImag := b.CreateLoad(floatType, xImagPtr, "x.imag")
-			yImag := b.CreateLoad(floatType, yImagPtr, "y.imag")
-			imagEq := b.CreateFCmp(llvm.FloatOEQ, xImag, yImag, "eq.imag")
-			return b.CreateAnd(realEq, imagEq, "")
-		}
-		// Integer/boolean: compare raw bytes.
-		size := llvm.ConstInt(b.uintptrType, b.targetData.TypeAllocSize(llvmKeyType), false)
-		return b.createRuntimeCall("memequal", []llvm.Value{xPtr, yPtr, size}, "eq")
-	case *types.Pointer, *types.Chan:
-		// Pointers and channels: compare as raw pointer-sized bytes.
-		size := llvm.ConstInt(b.uintptrType, b.targetData.TypeAllocSize(llvmKeyType), false)
-		return b.createRuntimeCall("memequal", []llvm.Value{xPtr, yPtr, size}, "eq")
-	case *types.Interface:
-		// Interface: use runtime interface equality.
-		size := llvm.ConstInt(b.uintptrType, b.targetData.TypeAllocSize(llvmKeyType), false)
-		return b.createRuntimeCall("hashmapInterfaceEqual", []llvm.Value{xPtr, yPtr, size}, "eq")
-	case *types.Struct:
-		result := llvm.ConstInt(b.ctx.Int1Type(), 1, false) // start with true
-		zero := llvm.ConstInt(b.ctx.Int32Type(), 0, false)
-		for i := 0; i < keyType.NumFields(); i++ {
-			if keyType.Field(i).Name() == "_" {
-				continue // blank fields are ignored in Go equality
+
+			if fieldEndOffset != nextOffset {
+				n := llvm.ConstInt(b.uintptrType, nextOffset-fieldEndOffset, false)
+				llvmStoreSize := llvm.ConstInt(b.uintptrType, storeSize, false)
+				paddingStart := b.CreateInBoundsGEP(b.ctx.Int8Type(), elemPtr, []llvm.Value{llvmStoreSize}, "")
+				b.createRuntimeCall("memzero", []llvm.Value{paddingStart, n}, "")
 			}
-			fieldType := keyType.Field(i).Type()
-			llvmFieldType := b.getLLVMType(fieldType)
-			if b.targetData.TypeAllocSize(llvmFieldType) == 0 {
-				continue // skip zero-sized fields
-			}
-			idx := llvm.ConstInt(b.ctx.Int32Type(), uint64(i), false)
-			xFieldPtr := b.CreateInBoundsGEP(llvmKeyType, xPtr, []llvm.Value{zero, idx}, "")
-			yFieldPtr := b.CreateInBoundsGEP(llvmKeyType, yPtr, []llvm.Value{zero, idx}, "")
-			fieldEq := b.generateKeyEqual(fieldType, llvmFieldType, xFieldPtr, yFieldPtr, fn)
-			result = b.CreateAnd(result, fieldEq, "")
 		}
-		return result
-	case *types.Array:
-		elemType := keyType.Elem()
-		llvmElemType := b.getLLVMType(elemType)
-		arrayLen := keyType.Len()
-		if hashmapIsBinaryKey(elemType) {
-			// All elements are binary-comparable; compare the entire array.
-			size := llvm.ConstInt(b.uintptrType, b.targetData.TypeAllocSize(llvmKeyType), false)
-			return b.createRuntimeCall("memequal", []llvm.Value{xPtr, yPtr, size}, "eq")
-		}
-		if arrayLen == 0 {
-			return llvm.ConstInt(b.ctx.Int1Type(), 1, false)
-		}
-		if arrayLen <= hashArrayUnrollLimit {
-			result := llvm.ConstInt(b.ctx.Int1Type(), 1, false)
-			zero := llvm.ConstInt(b.ctx.Int32Type(), 0, false)
-			for i := 0; i < int(arrayLen); i++ {
-				idx := llvm.ConstInt(b.uintptrType, uint64(i), false)
-				xElemPtr := b.CreateInBoundsGEP(llvmKeyType, xPtr, []llvm.Value{zero, idx}, "")
-				yElemPtr := b.CreateInBoundsGEP(llvmKeyType, yPtr, []llvm.Value{zero, idx}, "")
-				elemEq := b.generateKeyEqual(elemType, llvmElemType, xElemPtr, yElemPtr, fn)
-				result = b.CreateAnd(result, elemEq, "")
-			}
-			return result
-		}
-		zero := llvm.ConstInt(b.ctx.Int32Type(), 0, false)
-
-		loopEntry := b.GetInsertBlock()
-		loopBody := b.ctx.AddBasicBlock(loopEntry.Parent(), "eq.array.body")
-		loopDone := b.ctx.AddBasicBlock(loopEntry.Parent(), "eq.array.done")
-
-		b.CreateBr(loopBody)
-		b.SetInsertPointAtEnd(loopBody)
-
-		phiI := b.CreatePHI(b.uintptrType, "i")
-
-		xElemPtr := b.CreateInBoundsGEP(llvmKeyType, xPtr, []llvm.Value{zero, phiI}, "")
-		yElemPtr := b.CreateInBoundsGEP(llvmKeyType, yPtr, []llvm.Value{zero, phiI}, "")
-		elemEq := b.generateKeyEqual(elemType, llvmElemType, xElemPtr, yElemPtr, fn)
-
-		nextI := b.CreateAdd(phiI, llvm.ConstInt(b.uintptrType, 1, false), "")
-		atEnd := b.CreateICmp(llvm.IntUGE, nextI, llvm.ConstInt(b.uintptrType, uint64(arrayLen), false), "")
-		exitLoop := b.CreateOr(atEnd, b.CreateNot(elemEq, ""), "")
-		b.CreateCondBr(exitLoop, loopDone, loopBody)
-
-		bodyEnd := b.GetInsertBlock()
-		phiI.AddIncoming([]llvm.Value{llvm.ConstInt(b.uintptrType, 0, false), nextI},
-			[]llvm.BasicBlock{loopEntry, bodyEnd})
-
-		b.SetInsertPointAtEnd(loopDone)
-		return elemEq
-	default:
-		panic(fmt.Sprintf("unhandled key type for equal generation: %T", keyType))
 	}
+
+	return nil
 }
@@ -12,7 +12,6 @@ import (
 	"strings"

 	"github.com/tinygo-org/tinygo/compiler/llvmutil"
-	"github.com/tinygo-org/tinygo/goenv"
 	"github.com/tinygo-org/tinygo/loader"
 	"golang.org/x/tools/go/ssa"
 	"tinygo.org/x/go-llvm"
@@ -24,19 +23,15 @@ import (
 // The linkName value contains a valid link name, even if //go:linkname is not
 // present.
 type functionInfo struct {
-	wasmModule    string     // go:wasm-module
-	wasmName      string     // wasm-export-name or wasm-import-name in the IR
-	wasmExport    string     // go:wasmexport is defined (export is unset, this adds an exported wrapper)
-	wasmExportPos token.Pos  // position of //go:wasmexport comment
-	linkName      string     // go:linkname, go:export - the IR function name
-	section       string     // go:section - object file section name
-	exported      bool       // go:export, CGo
-	interrupt     bool       // go:interrupt
-	nobounds      bool       // go:nobounds
-	noescape      bool       // go:noescape
-	noheap        bool       // go:noheap
-	variadic      bool       // go:variadic (CGo only)
-	inline        inlineType // go:inline
+	wasmModule string     // go:wasm-module
+	wasmName   string     // wasm-export-name or wasm-import-name in the IR
+	linkName   string     // go:linkname, go:export - the IR function name
+	section    string     // go:section - object file section name
+	exported   bool       // go:export, CGo
+	interrupt  bool       // go:interrupt
+	nobounds   bool       // go:nobounds
+	variadic   bool       // go:variadic (CGo only)
+	inline     inlineType // go:inline
 }

 type inlineType int
@@ -129,25 +124,11 @@ func (c *compilerContext) getFunction(fn *ssa.Function) (llvm.Type, llvm.Value)
 	c.addStandardDeclaredAttributes(llvmFn)

 	dereferenceableOrNullKind := llvm.AttributeKindID("dereferenceable_or_null")
-	for i, paramInfo := range paramInfos {
-		if paramInfo.elemSize != 0 {
-			dereferenceableOrNull := c.ctx.CreateEnumAttribute(dereferenceableOrNullKind, paramInfo.elemSize)
+	for i, info := range paramInfos {
+		if info.elemSize != 0 {
+			dereferenceableOrNull := c.ctx.CreateEnumAttribute(dereferenceableOrNullKind, info.elemSize)
 			llvmFn.AddAttributeAtIndex(i+1, dereferenceableOrNull)
 		}
-		if info.noescape && paramInfo.flags&paramIsGoParam != 0 && paramInfo.llvmType.TypeKind() == llvm.PointerTypeKind {
-			// Parameters to functions with a //go:noescape parameter should get
-			// the nocapture attribute. However, the context parameter should
-			// not.
-			// (It may be safe to add the nocapture parameter to the context
-			// parameter, but I'd like to stay on the safe side here).
-			nocapture := c.ctx.CreateEnumAttribute(llvm.AttributeKindID("nocapture"), 0)
-			llvmFn.AddAttributeAtIndex(i+1, nocapture)
-		}
-		if paramInfo.flags&paramIsReadonly != 0 && paramInfo.llvmType.TypeKind() == llvm.PointerTypeKind {
-			// Readonly pointer parameters (like strings) benefit from being marked as readonly.
-			readonly := c.ctx.CreateEnumAttribute(llvm.AttributeKindID("readonly"), 0)
-			llvmFn.AddAttributeAtIndex(i+1, readonly)
-		}
 	}

 	// Set a number of function or parameter attributes, depending on the
@@ -160,9 +141,7 @@ func (c *compilerContext) getFunction(fn *ssa.Function) (llvm.Type, llvm.Value)
 		llvmFn.AddFunctionAttr(c.ctx.CreateEnumAttribute(llvm.AttributeKindID("noreturn"), 0))
 	case "internal/abi.NoEscape":
 		llvmFn.AddAttributeAtIndex(1, c.ctx.CreateEnumAttribute(llvm.AttributeKindID("nocapture"), 0))
-	case "machine.keepAliveNoEscape", "machine.unsafeNoEscape":
-		llvmFn.AddAttributeAtIndex(1, c.ctx.CreateEnumAttribute(llvm.AttributeKindID("nocapture"), 0))
-	case "runtime.alloc", "runtime.alloc_noheap":
+	case "runtime.alloc":
 		// Tell the optimizer that runtime.alloc is an allocator, meaning that it
 		// returns values that are never null and never alias to an existing value.
 		for _, attrName := range []string{"noalias", "nonnull"} {
@@ -185,36 +164,11 @@ func (c *compilerContext) getFunction(fn *ssa.Function) (llvm.Type, llvm.Value)
 		// be modified.
 		llvmFn.AddAttributeAtIndex(2, c.ctx.CreateEnumAttribute(llvm.AttributeKindID("nocapture"), 0))
 		llvmFn.AddAttributeAtIndex(2, c.ctx.CreateEnumAttribute(llvm.AttributeKindID("readonly"), 0))
-	case "runtime.stringFromBytes":
+	case "runtime.sliceCopy":
+		// Copying a slice won't capture any of the parameters.
+		llvmFn.AddAttributeAtIndex(1, c.ctx.CreateEnumAttribute(llvm.AttributeKindID("writeonly"), 0))
 		llvmFn.AddAttributeAtIndex(1, c.ctx.CreateEnumAttribute(llvm.AttributeKindID("nocapture"), 0))
-		llvmFn.AddAttributeAtIndex(1, c.ctx.CreateEnumAttribute(llvm.AttributeKindID("readonly"), 0))
-	case "runtime.stringFromRunes":
-		llvmFn.AddAttributeAtIndex(1, c.ctx.CreateEnumAttribute(llvm.AttributeKindID("nocapture"), 0))
-		llvmFn.AddAttributeAtIndex(1, c.ctx.CreateEnumAttribute(llvm.AttributeKindID("readonly"), 0))
-	case "runtime.hashmapSet":
-		// The key (param 2) and value (param 3) pointers are only read via
-		// memcpy/hash/equal and are never captured. The indirect calls
-		// through m.keyHash and m.keyEqual function pointers prevent LLVM's
-		// functionattrs pass from inferring this automatically.
-		llvmFn.AddAttributeAtIndex(2, c.ctx.CreateEnumAttribute(llvm.AttributeKindID("nocapture"), 0))
-		llvmFn.AddAttributeAtIndex(3, c.ctx.CreateEnumAttribute(llvm.AttributeKindID("nocapture"), 0))
-	case "runtime.hashmapGet":
-		// The key (param 2) is read-only and never captured.
-		// The value (param 3) is written to (receives the result) but never captured.
-		llvmFn.AddAttributeAtIndex(2, c.ctx.CreateEnumAttribute(llvm.AttributeKindID("nocapture"), 0))
-		llvmFn.AddAttributeAtIndex(3, c.ctx.CreateEnumAttribute(llvm.AttributeKindID("nocapture"), 0))
-	case "runtime.hashmapDelete":
-		// The key (param 2) is read-only and never captured.
-		llvmFn.AddAttributeAtIndex(2, c.ctx.CreateEnumAttribute(llvm.AttributeKindID("nocapture"), 0))
-	case "runtime.hashmapGenericSet":
-		// Same as hashmapBinarySet: key (param 2) and value (param 3) are
-		// not captured.
-		llvmFn.AddAttributeAtIndex(2, c.ctx.CreateEnumAttribute(llvm.AttributeKindID("nocapture"), 0))
-		llvmFn.AddAttributeAtIndex(3, c.ctx.CreateEnumAttribute(llvm.AttributeKindID("nocapture"), 0))
-	case "runtime.hashmapGenericGet":
-		llvmFn.AddAttributeAtIndex(2, c.ctx.CreateEnumAttribute(llvm.AttributeKindID("nocapture"), 0))
-		llvmFn.AddAttributeAtIndex(3, c.ctx.CreateEnumAttribute(llvm.AttributeKindID("nocapture"), 0))
-	case "runtime.hashmapGenericDelete":
+		llvmFn.AddAttributeAtIndex(2, c.ctx.CreateEnumAttribute(llvm.AttributeKindID("readonly"), 0))
 		llvmFn.AddAttributeAtIndex(2, c.ctx.CreateEnumAttribute(llvm.AttributeKindID("nocapture"), 0))
 	case "runtime.trackPointer":
 		// This function is necessary for tracking pointers on the stack in a
@@ -235,12 +189,6 @@ func (c *compilerContext) getFunction(fn *ssa.Function) (llvm.Type, llvm.Value)
 			// > circumstances, and should not be exposed to source languages.
 			llvmutil.AppendToGlobal(c.mod, "llvm.compiler.used", llvmFn)
 		}
-	case "GetModuleHandleExA", "GetProcAddress", "GetSystemInfo", "GetSystemTimeAsFileTime", "LoadLibraryExW", "QueryPerformanceCounter", "QueryPerformanceFrequency", "QueryUnbiasedInterruptTime", "SetEnvironmentVariableA", "Sleep", "SystemFunction036", "VirtualAlloc":
-		// On Windows we need to use a special calling convention for some
-		// external calls.
-		if c.GOOS == "windows" && c.GOARCH == "386" {
-			llvmFn.SetFunctionCallConv(llvm.X86StdcallCallConv)
-		}
 	}

 	// External/exported functions may not retain pointer values.
@@ -264,15 +212,6 @@ func (c *compilerContext) getFunction(fn *ssa.Function) (llvm.Type, llvm.Value)
 		}
 	}

-	// Build the function if needed.
-	c.maybeCreateSyntheticFunction(fn, llvmFn)
-
-	return fnType, llvmFn
-}
-
-// If this is a synthetic function (such as a generic function or a wrapper),
-// create it now.
-func (c *compilerContext) maybeCreateSyntheticFunction(fn *ssa.Function, llvmFn llvm.Value) {
 	// Synthetic functions are functions that do not appear in the source code,
 	// they are artificially constructed. Usually they are wrapper functions
 	// that are not referenced anywhere except in a SSA call instruction so
@@ -280,27 +219,6 @@ func (c *compilerContext) maybeCreateSyntheticFunction(fn *ssa.Function, llvmFn
 	// The exception is the package initializer, which does appear in the
 	// *ssa.Package members and so shouldn't be created here.
 	if fn.Synthetic != "" && fn.Synthetic != "package initializer" && fn.Synthetic != "generic function" && fn.Synthetic != "range-over-func yield" {
-		if origin := fn.Origin(); origin != nil && origin.RelString(nil) == "internal/abi.Escape" {
-			// This is a special implementation or internal/abi.Escape, which
-			// can only really be implemented in the compiler.
-			// For simplicity we'll only implement pointer parameters for now.
-			if _, ok := fn.Params[0].Type().Underlying().(*types.Pointer); ok {
-				irbuilder := c.ctx.NewBuilder()
-				defer irbuilder.Dispose()
-				b := newBuilder(c, irbuilder, fn)
-				b.createAbiEscapeImpl()
-				llvmFn.SetLinkage(llvm.LinkOnceODRLinkage)
-				llvmFn.SetUnnamedAddr(true)
-			}
-			// If the parameter is not of a pointer type, it will be left
-			// unimplemented. This will result in a linker error if the function
-			// is really called, making it clear it needs to be implemented.
-			return
-		}
-		if len(fn.Blocks) == 0 {
-			c.addError(fn.Pos(), "missing function body")
-			return
-		}
 		irbuilder := c.ctx.NewBuilder()
 		b := newBuilder(c, irbuilder, fn)
 		b.createFunction()
@@ -308,6 +226,8 @@ func (c *compilerContext) maybeCreateSyntheticFunction(fn *ssa.Function, llvmFn
 		llvmFn.SetLinkage(llvm.LinkOnceODRLinkage)
 		llvmFn.SetUnnamedAddr(true)
 	}
+
+	return fnType, llvmFn
 }

 // getFunctionInfo returns information about a function that is not directly
@@ -321,27 +241,8 @@ func (c *compilerContext) getFunctionInfo(f *ssa.Function) functionInfo {
 		// Pick the default linkName.
 		linkName: f.RelString(nil),
 	}
-
-	// Check for a few runtime functions that are treated specially.
-	if info.linkName == "runtime.wasmEntryReactor" && c.BuildMode == "c-shared" {
-		info.linkName = "_initialize"
-		info.wasmName = "_initialize"
-		info.exported = true
-	}
-	if info.linkName == "runtime.wasmEntryCommand" && c.BuildMode == "default" {
-		info.linkName = "_start"
-		info.wasmName = "_start"
-		info.exported = true
-	}
-	if info.linkName == "runtime.wasmEntryLegacy" && c.BuildMode == "wasi-legacy" {
-		info.linkName = "_start"
-		info.wasmName = "_start"
-		info.exported = true
-	}
-
 	// Check for //go: pragmas, which may change the link name (among others).
 	c.parsePragmas(&info, f)
-
 	c.functionInfos[f] = info
 	return info
 }
@@ -349,177 +250,126 @@ func (c *compilerContext) getFunctionInfo(f *ssa.Function) functionInfo {
 // parsePragmas is used by getFunctionInfo to parse function pragmas such as
 // //export or //go:noinline.
 func (c *compilerContext) parsePragmas(info *functionInfo, f *ssa.Function) {
-	syntax := f.Syntax()
-	if f.Origin() != nil {
-		syntax = f.Origin().Syntax()
-	}
-	if syntax == nil {
+	if f.Syntax() == nil {
 		return
 	}
-
-	// Read all pragmas of this function.
-	var pragmas []*ast.Comment
-	hasWasmExport := false
-	if decl, ok := syntax.(*ast.FuncDecl); ok && decl.Doc != nil {
+	if decl, ok := f.Syntax().(*ast.FuncDecl); ok && decl.Doc != nil {
 		for _, comment := range decl.Doc.List {
 			text := comment.Text
-			if strings.HasPrefix(text, "//go:") || strings.HasPrefix(text, "//export ") {
-				pragmas = append(pragmas, comment)
-				if strings.HasPrefix(comment.Text, "//go:wasmexport ") {
-					hasWasmExport = true
+			if strings.HasPrefix(text, "//export ") {
+				// Rewrite '//export' to '//go:export' for compatibility with
+				// gc.
+				text = "//go:" + text[2:]
+			}
+			if !strings.HasPrefix(text, "//go:") {
+				continue
+			}
+			parts := strings.Fields(text)
+			switch parts[0] {
+			case "//go:export":
+				if len(parts) != 2 {
+					continue
+				}
+
+				info.linkName = parts[1]
+				info.wasmName = info.linkName
+				info.exported = true
+			case "//go:interrupt":
+				if hasUnsafeImport(f.Pkg.Pkg) {
+					info.interrupt = true
+				}
+			case "//go:wasm-module":
+				// Alternative comment for setting the import module.
+				// This is deprecated, use //go:wasmimport instead.
+				if len(parts) != 2 {
+					continue
+				}
+				info.wasmModule = parts[1]
+			case "//go:wasmimport":
+				// Import a WebAssembly function, for example a WASI function.
+				// Original proposal: https://github.com/golang/go/issues/38248
+				// Allow globally: https://github.com/golang/go/issues/59149
+				if len(parts) != 3 {
+					continue
+				}
+				c.checkWasmImport(f, comment.Text)
+				info.exported = true
+				info.wasmModule = parts[1]
+				info.wasmName = parts[2]
+			case "//go:inline":
+				info.inline = inlineHint
+			case "//go:noinline":
+				info.inline = inlineNone
+			case "//go:linkname":
+				if len(parts) != 3 || parts[1] != f.Name() {
+					continue
+				}
+				// Only enable go:linkname when the package imports "unsafe".
+				// This is a slightly looser requirement than what gc uses: gc
+				// requires the file to import "unsafe", not the package as a
+				// whole.
+				if hasUnsafeImport(f.Pkg.Pkg) {
+					info.linkName = parts[2]
+				}
+			case "//go:section":
+				// Only enable go:section when the package imports "unsafe".
+				// go:section also implies go:noinline since inlining could
+				// move the code to a different section than that requested.
+				if len(parts) == 2 && hasUnsafeImport(f.Pkg.Pkg) {
+					info.section = parts[1]
+					info.inline = inlineNone
+				}
+			case "//go:nobounds":
+				// Skip bounds checking in this function. Useful for some
+				// runtime functions.
+				// This is somewhat dangerous and thus only imported in packages
+				// that import unsafe.
+				if hasUnsafeImport(f.Pkg.Pkg) {
+					info.nobounds = true
+				}
+			case "//go:variadic":
+				// The //go:variadic pragma is emitted by the CGo preprocessing
+				// pass for C variadic functions. This includes both explicit
+				// (with ...) and implicit (no parameters in signature)
+				// functions.
+				if strings.HasPrefix(f.Name(), "C.") {
+					// This prefix cannot naturally be created, it must have
+					// been created as a result of CGo preprocessing.
+					info.variadic = true
 				}
 			}
 		}
 	}
-
-	// Parse each pragma.
-	for _, comment := range pragmas {
-		parts := strings.Fields(comment.Text)
-		switch parts[0] {
-		case "//export", "//go:export":
-			if len(parts) != 2 {
-				continue
-			}
-			if hasWasmExport {
-				// //go:wasmexport overrides //export.
-				continue
-			}
-
-			info.linkName = parts[1]
-			info.wasmName = info.linkName
-			info.exported = true
-		case "//go:interrupt":
-			if hasUnsafeImport(f.Pkg.Pkg) {
-				info.interrupt = true
-			}
-		case "//go:wasm-module":
-			// Alternative comment for setting the import module.
-			// This is deprecated, use //go:wasmimport instead.
-			if len(parts) != 2 {
-				continue
-			}
-			info.wasmModule = parts[1]
-		case "//go:wasmimport":
-			// Import a WebAssembly function, for example a WASI function.
-			// Original proposal: https://github.com/golang/go/issues/38248
-			// Allow globally: https://github.com/golang/go/issues/59149
-			if len(parts) != 3 {
-				continue
-			}
-			if f.Blocks != nil {
-				// Defined functions cannot be exported.
-				c.addError(f.Pos(), "can only use //go:wasmimport on declarations")
-				continue
-			}
-			c.checkWasmImportExport(f, comment.Text)
-			info.exported = true
-			info.wasmModule = parts[1]
-			info.wasmName = parts[2]
-		case "//go:wasmexport":
-			if f.Blocks == nil {
-				c.addError(f.Pos(), "can only use //go:wasmexport on definitions")
-				continue
-			}
-			if len(parts) != 2 {
-				c.addError(f.Pos(), fmt.Sprintf("expected one parameter to //go:wasmexport, not %d", len(parts)-1))
-				continue
-			}
-			name := parts[1]
-			if name == "_start" || name == "_initialize" {
-				c.addError(f.Pos(), fmt.Sprintf("//go:wasmexport does not allow %#v", name))
-				continue
-			}
-			if c.BuildMode != "c-shared" && f.RelString(nil) == "main.main" {
-				c.addError(f.Pos(), fmt.Sprintf("//go:wasmexport does not allow main.main to be exported with -buildmode=%s", c.BuildMode))
-				continue
-			}
-			if c.archFamily() != "wasm32" {
-				c.addError(f.Pos(), "//go:wasmexport is only supported on wasm")
-			}
-			c.checkWasmImportExport(f, comment.Text)
-			info.wasmExport = name
-			info.wasmExportPos = comment.Slash
-		case "//go:inline":
-			info.inline = inlineHint
-		case "//go:noinline":
-			info.inline = inlineNone
-		case "//go:linkname":
-			if len(parts) != 3 || parts[1] != f.Name() {
-				continue
-			}
-			// Only enable go:linkname when the package imports "unsafe".
-			// This is a slightly looser requirement than what gc uses: gc
-			// requires the file to import "unsafe", not the package as a
-			// whole.
-			if hasUnsafeImport(f.Pkg.Pkg) {
-				info.linkName = parts[2]
-			}
-		case "//go:section":
-			// Only enable go:section when the package imports "unsafe".
-			// go:section also implies go:noinline since inlining could
-			// move the code to a different section than that requested.
-			if len(parts) == 2 && hasUnsafeImport(f.Pkg.Pkg) {
-				info.section = parts[1]
-				info.inline = inlineNone
-			}
-		case "//go:nobounds":
-			// Skip bounds checking in this function. Useful for some
-			// runtime functions.
-			// This is somewhat dangerous and thus only imported in packages
-			// that import unsafe.
-			if hasUnsafeImport(f.Pkg.Pkg) {
-				info.nobounds = true
-			}
-		case "//go:noescape":
-			// Don't let pointer parameters escape.
-			// Following the upstream Go implementation, we only do this for
-			// declarations, not definitions.
-			if len(f.Blocks) == 0 {
-				info.noescape = true
-			}
-		case "//go:noheap":
-			// Ensure this function does not allocate on the heap.
-			info.noheap = true
-		case "//go:variadic":
-			// The //go:variadic pragma is emitted by the CGo preprocessing
-			// pass for C variadic functions. This includes both explicit
-			// (with ...) and implicit (no parameters in signature)
-			// functions.
-			if strings.HasPrefix(f.Name(), "_Cgo_") {
-				// This prefix was created as a result of CGo preprocessing.
-				info.variadic = true
-			}
-		}
-	}
-
-	if c.Nobounds {
-		info.nobounds = true
-	}
 }

-// Check whether this function can be used in //go:wasmimport or
-// //go:wasmexport. It will add an error if this is not the case.
+// Check whether this function cannot be used in //go:wasmimport. It will add an
+// error if this is the case.
 //
 // The list of allowed types is based on this proposal:
 // https://github.com/golang/go/issues/59149
-func (c *compilerContext) checkWasmImportExport(f *ssa.Function, pragma string) {
-	if c.pkg.Path() == "runtime" || c.pkg.Path() == "syscall/js" || c.pkg.Path() == "syscall" || c.pkg.Path() == "crypto/internal/sysrand" {
+func (c *compilerContext) checkWasmImport(f *ssa.Function, pragma string) {
+	if c.pkg.Path() == "runtime" || c.pkg.Path() == "syscall/js" || c.pkg.Path() == "syscall" {
 		// The runtime is a special case. Allow all kinds of parameters
 		// (importantly, including pointers).
 		return
 	}
+	if f.Blocks != nil {
+		// Defined functions cannot be exported.
+		c.addError(f.Pos(), "can only use //go:wasmimport on declarations")
+		return
+	}
 	if f.Signature.Results().Len() > 1 {
 		c.addError(f.Signature.Results().At(1).Pos(), fmt.Sprintf("%s: too many return values", pragma))
 	} else if f.Signature.Results().Len() == 1 {
 		result := f.Signature.Results().At(0)
-		if !c.isValidWasmType(result.Type(), siteResult) {
+		if !isValidWasmType(result.Type(), siteResult) {
 			c.addError(result.Pos(), fmt.Sprintf("%s: unsupported result type %s", pragma, result.Type().String()))
 		}
 	}
 	for _, param := range f.Params {
 		// Check whether the type is allowed.
 		// Only a very limited number of types can be mapped to WebAssembly.
-		if !c.isValidWasmType(param.Type(), siteParam) {
+		if !isValidWasmType(param.Type(), siteParam) {
 			c.addError(param.Pos(), fmt.Sprintf("%s: unsupported parameter type %s", pragma, param.Type().String()))
 		}
 	}
@@ -532,15 +382,13 @@ func (c *compilerContext) checkWasmImportExport(f *ssa.Function, pragma string)
 //
 // This previously reflected the additional restrictions documented here:
 // https://github.com/golang/go/issues/59149
-func (c *compilerContext) isValidWasmType(typ types.Type, site wasmSite) bool {
+func isValidWasmType(typ types.Type, site wasmSite) bool {
 	switch typ := typ.Underlying().(type) {
 	case *types.Basic:
 		switch typ.Kind() {
 		case types.Bool:
 			return true
-		case types.Int8, types.Uint8, types.Int16, types.Uint16:
-			return site == siteIndirect
-		case types.Int32, types.Uint32, types.Int64, types.Uint64:
+		case types.Int, types.Uint, types.Int8, types.Uint8, types.Int16, types.Uint16, types.Int32, types.Uint32, types.Int64, types.Uint64:
 			return true
 		case types.Float32, types.Float64:
 			return true
@@ -551,35 +399,19 @@ func (c *compilerContext) isValidWasmType(typ types.Type, site wasmSite) bool {
 			return site == siteParam || site == siteIndirect
 		}
 	case *types.Array:
-		return site == siteIndirect && c.isValidWasmType(typ.Elem(), siteIndirect)
+		return site == siteIndirect && isValidWasmType(typ.Elem(), siteIndirect)
 	case *types.Struct:
 		if site != siteIndirect {
 			return false
 		}
-		// Structs with no fields do not need structs.HostLayout
-		if typ.NumFields() == 0 {
-			return true
-		}
-		hasHostLayout := true // default to true before detecting Go version
-		// (*types.Package).GoVersion added in go1.21
-		if gv, ok := any(c.pkg).(interface{ GoVersion() string }); ok {
-			if goenv.Compare(gv.GoVersion(), "go1.23") >= 0 {
-				hasHostLayout = false // package structs added in go1.23
-			}
-		}
 		for i := 0; i < typ.NumFields(); i++ {
-			ftyp := typ.Field(i).Type()
-			if types.Unalias(ftyp).String() == "structs.HostLayout" {
-				hasHostLayout = true
-				continue
-			}
-			if !c.isValidWasmType(ftyp, siteIndirect) {
+			if !isValidWasmType(typ.Field(i).Type(), siteIndirect) {
 				return false
 			}
 		}
-		return hasHostLayout
+		return true
 	case *types.Pointer:
-		return c.isValidWasmType(typ.Elem(), siteIndirect)
+		return isValidWasmType(typ.Elem(), siteIndirect)
 	}
 	return false
 }
@@ -660,7 +492,7 @@ func (c *compilerContext) addStandardAttributes(llvmFn llvm.Value) {
 // linkName is equal to .RelString(nil) on a global and extern is false, but for
 // some symbols this is different (due to //go:extern for example).
 type globalInfo struct {
-	linkName string // go:extern, go:linkname
+	linkName string // go:extern
 	extern   bool   // go:extern
 	align    int    // go:align
 	section  string // go:section
@@ -745,14 +577,14 @@ func (c *compilerContext) getGlobalInfo(g *ssa.Global) globalInfo {
 	// Check for //go: pragmas, which may change the link name (among others).
 	doc := c.astComments[info.linkName]
 	if doc != nil {
-		info.parsePragmas(doc, c, g)
+		info.parsePragmas(doc)
 	}
 	return info
 }

 // Parse //go: pragma comments from the source. In particular, it parses the
-// //go:extern and //go:linkname pragmas on globals.
-func (info *globalInfo) parsePragmas(doc *ast.CommentGroup, c *compilerContext, g *ssa.Global) {
+// //go:extern pragma on globals.
+func (info *globalInfo) parsePragmas(doc *ast.CommentGroup) {
 	for _, comment := range doc.List {
 		if !strings.HasPrefix(comment.Text, "//go:") {
 			continue
@@ -773,17 +605,6 @@ func (info *globalInfo) parsePragmas(doc *ast.CommentGroup, c *compilerContext,
 			if len(parts) == 2 {
 				info.section = parts[1]
 			}
-		case "//go:linkname":
-			if len(parts) != 3 || parts[1] != g.Name() {
-				continue
-			}
-			// Only enable go:linkname when the package imports "unsafe".
-			// This is a slightly looser requirement than what gc uses: gc
-			// requires the file to import "unsafe", not the package as a
-			// whole.
-			if hasUnsafeImport(g.Pkg.Pkg) {
-				info.linkName = parts[2]
-			}
 		}
 	}
 }
@@ -74,14 +74,6 @@ func (b *builder) createRawSyscall(call *ssa.CallCommon) (llvm.Value, error) {
 		return b.CreateCall(fnType, target, args, ""), nil

 	case b.GOARCH == "arm" && b.GOOS == "linux":
-		if arch := b.archFamily(); arch != "arm" {
-			// Some targets pretend to be linux/arm for compatibility but aren't
-			// actually such a system. Make sure we emit an error instead of
-			// creating inline assembly that will fail to compile.
-			// See: https://github.com/tinygo-org/tinygo/issues/4959
-			return llvm.Value{}, b.makeError(call.Pos(), "system calls are not supported: target emulates a linux/arm system on "+arch)
-		}
-
 		// Implement the EABI system call convention for Linux.
 		// Source: syscall(2) man page.
 		args := []llvm.Value{}
@@ -276,8 +268,6 @@ func (b *builder) createSyscall(call *ssa.CallCommon) (llvm.Value, error) {
 		// The signature looks like this:
 		//   func Syscall(trap, nargs, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno)

-		isI386 := strings.HasPrefix(b.Triple, "i386-")
-
 		// Prepare input values.
 		var paramTypes []llvm.Type
 		var params []llvm.Value
@@ -295,17 +285,11 @@ func (b *builder) createSyscall(call *ssa.CallCommon) (llvm.Value, error) {
 		if setLastError.IsNil() {
 			llvmType := llvm.FunctionType(b.ctx.VoidType(), []llvm.Type{b.ctx.Int32Type()}, false)
 			setLastError = llvm.AddFunction(b.mod, "SetLastError", llvmType)
-			if isI386 {
-				setLastError.SetFunctionCallConv(llvm.X86StdcallCallConv)
-			}
 		}
 		getLastError := b.mod.NamedFunction("GetLastError")
 		if getLastError.IsNil() {
 			llvmType := llvm.FunctionType(b.ctx.Int32Type(), nil, false)
 			getLastError = llvm.AddFunction(b.mod, "GetLastError", llvmType)
-			if isI386 {
-				getLastError.SetFunctionCallConv(llvm.X86StdcallCallConv)
-			}
 		}

 		// Now do the actual call. Pseudocode:
@@ -316,24 +300,9 @@ func (b *builder) createSyscall(call *ssa.CallCommon) (llvm.Value, error) {
 		// Note that SetLastError/GetLastError could be replaced with direct
 		// access to the thread control block, which is probably smaller and
 		// faster. The Go runtime does this in assembly.
-		// On windows/386, we also need to save/restore the stack pointer. I'm
-		// not entirely sure why this is needed, but without it these calls
-		// change the stack pointer leading to a crash soon after.
-		setLastErrorCall := b.CreateCall(setLastError.GlobalValueType(), setLastError, []llvm.Value{llvm.ConstNull(b.ctx.Int32Type())}, "")
-		var sp llvm.Value
-		if isI386 {
-			setLastErrorCall.SetInstructionCallConv(llvm.X86StdcallCallConv)
-			sp = b.readStackPointer()
-		}
+		b.CreateCall(setLastError.GlobalValueType(), setLastError, []llvm.Value{llvm.ConstNull(b.ctx.Int32Type())}, "")
 		syscallResult := b.CreateCall(llvmType, fnPtr, params, "")
-		if isI386 {
-			syscallResult.SetInstructionCallConv(llvm.X86StdcallCallConv)
-			b.writeStackPointer(sp)
-		}
 		errResult := b.CreateCall(getLastError.GlobalValueType(), getLastError, nil, "err")
-		if isI386 {
-			errResult.SetInstructionCallConv(llvm.X86StdcallCallConv)
-		}
 		if b.uintptrType != b.ctx.Int32Type() {
 			errResult = b.CreateZExt(errResult, b.uintptrType, "err.uintptr")
 		}
@@ -349,130 +318,6 @@ func (b *builder) createSyscall(call *ssa.CallCommon) (llvm.Value, error) {
 	}
 }

-// createSyscalln emits instructions for the syscall.syscalln function on
-// Windows. This handles the variadic calling convention used in Go 1.26+:
-//
-//	func syscalln(fn, n uintptr, args ...uintptr) (r1, r2 uintptr, err Errno)
-//
-// The function generates a switch on n to dispatch to the correct fixed-argument
-// function pointer call with SetLastError(0)/GetLastError() wrapping.
-func (b *builder) createSyscalln(call *ssa.CallCommon) (llvm.Value, error) {
-	const maxArgs = 18 // Windows syscalls support up to 18 args
-
-	isI386 := strings.HasPrefix(b.Triple, "i386-")
-
-	// Get the function pointer (call.Args[0]) and n (call.Args[1]).
-	fn := b.getValue(call.Args[0], getPos(call))
-	fnPtr := b.CreateIntToPtr(fn, b.dataPtrType, "")
-	n := b.getValue(call.Args[1], getPos(call))
-
-	// Get the variadic args slice (call.Args[2]).
-	// In SSA, the variadic slice is the third argument.
-	var argsPtr llvm.Value
-	if len(call.Args) > 2 {
-		argsSlice := b.getValue(call.Args[2], getPos(call))
-		argsPtr = b.CreateExtractValue(argsSlice, 0, "args.data")
-	} else {
-		argsPtr = llvm.ConstNull(b.dataPtrType)
-	}
-
-	// Prepare SetLastError and GetLastError.
-	setLastError := b.mod.NamedFunction("SetLastError")
-	if setLastError.IsNil() {
-		llvmType := llvm.FunctionType(b.ctx.VoidType(), []llvm.Type{b.ctx.Int32Type()}, false)
-		setLastError = llvm.AddFunction(b.mod, "SetLastError", llvmType)
-		if isI386 {
-			setLastError.SetFunctionCallConv(llvm.X86StdcallCallConv)
-		}
-	}
-	getLastError := b.mod.NamedFunction("GetLastError")
-	if getLastError.IsNil() {
-		llvmType := llvm.FunctionType(b.ctx.Int32Type(), nil, false)
-		getLastError = llvm.AddFunction(b.mod, "GetLastError", llvmType)
-		if isI386 {
-			getLastError.SetFunctionCallConv(llvm.X86StdcallCallConv)
-		}
-	}
-
-	retType := b.ctx.StructType([]llvm.Type{b.uintptrType, b.uintptrType, b.uintptrType}, false)
-
-	// Create the merge block where all cases converge.
-	mergeBB := b.insertBasicBlock("syscalln.merge")
-
-	// Create the default (panic) block.
-	panicBB := b.insertBasicBlock("syscalln.panic")
-
-	// Create the switch on n.
-	sw := b.CreateSwitch(n, panicBB, maxArgs+1)
-
-	// We'll collect blocks and values for the PHI node.
-	var incomingVals []llvm.Value
-	var incomingBlocks []llvm.BasicBlock
-
-	// Generate a case for each arg count 0..maxArgs.
-	for i := 0; i <= maxArgs; i++ {
-		caseBB := b.insertBasicBlock("syscalln.case" + strconv.Itoa(i))
-		sw.AddCase(llvm.ConstInt(b.uintptrType, uint64(i), false), caseBB)
-		b.SetInsertPointAtEnd(caseBB)
-
-		// Load args[0] through args[i-1] from the slice data pointer.
-		var params []llvm.Value
-		var paramTypes []llvm.Type
-		for j := 0; j < i; j++ {
-			gep := b.CreateInBoundsGEP(b.uintptrType, argsPtr, []llvm.Value{
-				llvm.ConstInt(b.ctx.Int32Type(), uint64(j), false),
-			}, "")
-			arg := b.CreateLoad(b.uintptrType, gep, "")
-			params = append(params, arg)
-			paramTypes = append(paramTypes, b.uintptrType)
-		}
-
-		// SetLastError(0)
-		setCall := b.CreateCall(setLastError.GlobalValueType(), setLastError, []llvm.Value{llvm.ConstNull(b.ctx.Int32Type())}, "")
-		var sp llvm.Value
-		if isI386 {
-			setCall.SetInstructionCallConv(llvm.X86StdcallCallConv)
-			sp = b.readStackPointer()
-		}
-
-		// Call fn(args...)
-		fnType := llvm.FunctionType(b.uintptrType, paramTypes, false)
-		syscallResult := b.CreateCall(fnType, fnPtr, params, "")
-		if isI386 {
-			syscallResult.SetInstructionCallConv(llvm.X86StdcallCallConv)
-			b.writeStackPointer(sp)
-		}
-
-		// err = GetLastError()
-		errResult := b.CreateCall(getLastError.GlobalValueType(), getLastError, nil, "err")
-		if isI386 {
-			errResult.SetInstructionCallConv(llvm.X86StdcallCallConv)
-		}
-		if b.uintptrType != b.ctx.Int32Type() {
-			errResult = b.CreateZExt(errResult, b.uintptrType, "err.uintptr")
-		}
-
-		// Build {r1, 0, err}
-		result := llvm.ConstNull(retType)
-		result = b.CreateInsertValue(result, syscallResult, 0, "")
-		result = b.CreateInsertValue(result, errResult, 2, "")
-
-		incomingVals = append(incomingVals, result)
-		incomingBlocks = append(incomingBlocks, b.Builder.GetInsertBlock())
-		b.CreateBr(mergeBB)
-	}
-
-	// Panic block for n > maxArgs.
-	b.SetInsertPointAtEnd(panicBB)
-	b.CreateUnreachable()
-
-	// Merge block: PHI node to select the result.
-	b.SetInsertPointAtEnd(mergeBB)
-	phi := b.CreatePHI(retType, "syscalln.result")
-	phi.AddIncoming(incomingVals, incomingBlocks)
-	return phi, nil
-}
-
 // createRawSyscallNoError emits instructions for the Linux-specific
 // syscall.rawSyscallNoError function.
 func (b *builder) createRawSyscallNoError(call *ssa.CallCommon) (llvm.Value, error) {
@@ -1,6 +1,6 @@
 ; ModuleID = 'basic.go'
 source_filename = "basic.go"
-target datalayout = "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-i128:128-n32:64-S128-ni:1:10:20"
+target datalayout = "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-n32:64-S128-ni:1:10:20"
 target triple = "wasm32-unknown-wasi"

 %main.kv = type { float, i32, i32, i32 }
@@ -10,30 +10,33 @@ target triple = "wasm32-unknown-wasi"
@main.a = hidden global { ptr, i32, i32 } zeroinitializer, align 4
@main.b = hidden global [2 x ptr] zeroinitializer, align 4

-declare void @runtime.trackPointer(ptr nocapture readonly, ptr, ptr) #0
+; Function Attrs: allockind("alloc,zeroed") allocsize(0)
+declare noalias nonnull ptr @runtime.alloc(i32, ptr, ptr) #0
+
+declare void @runtime.trackPointer(ptr nocapture readonly, ptr, ptr) #1

 ; Function Attrs: nounwind
-define hidden void @main.init(ptr %context) unnamed_addr #1 {
+define hidden void @main.init(ptr %context) unnamed_addr #2 {
 entry:
  ret void
 }

 ; Function Attrs: nounwind
-define hidden i32 @main.addInt(i32 %x, i32 %y, ptr %context) unnamed_addr #1 {
+define hidden i32 @main.addInt(i32 %x, i32 %y, ptr %context) unnamed_addr #2 {
 entry:
  %0 = add i32 %x, %y
  ret i32 %0
 }

 ; Function Attrs: nounwind
-define hidden i1 @main.equalInt(i32 %x, i32 %y, ptr %context) unnamed_addr #1 {
+define hidden i1 @main.equalInt(i32 %x, i32 %y, ptr %context) unnamed_addr #2 {
 entry:
  %0 = icmp eq i32 %x, %y
  ret i1 %0
 }

 ; Function Attrs: nounwind
-define hidden i32 @main.divInt(i32 %x, i32 %y, ptr %context) unnamed_addr #1 {
+define hidden i32 @main.divInt(i32 %x, i32 %y, ptr %context) unnamed_addr #2 {
 entry:
  %0 = icmp eq i32 %y, 0
  br i1 %0, label %divbyzero.throw, label %divbyzero.next
@@ -47,14 +50,14 @@ divbyzero.next:                                   ; preds = %entry
  ret i32 %5

 divbyzero.throw:                                  ; preds = %entry
-  call void @runtime.divideByZeroPanic(ptr undef) #2
+  call void @runtime.divideByZeroPanic(ptr undef) #3
  unreachable
 }

-declare void @runtime.divideByZeroPanic(ptr) #0
+declare void @runtime.divideByZeroPanic(ptr) #1

 ; Function Attrs: nounwind
-define hidden i32 @main.divUint(i32 %x, i32 %y, ptr %context) unnamed_addr #1 {
+define hidden i32 @main.divUint(i32 %x, i32 %y, ptr %context) unnamed_addr #2 {
 entry:
  %0 = icmp eq i32 %y, 0
  br i1 %0, label %divbyzero.throw, label %divbyzero.next
@@ -64,12 +67,12 @@ divbyzero.next:                                   ; preds = %entry
  ret i32 %1

 divbyzero.throw:                                  ; preds = %entry
-  call void @runtime.divideByZeroPanic(ptr undef) #2
+  call void @runtime.divideByZeroPanic(ptr undef) #3
  unreachable
 }

 ; Function Attrs: nounwind
-define hidden i32 @main.remInt(i32 %x, i32 %y, ptr %context) unnamed_addr #1 {
+define hidden i32 @main.remInt(i32 %x, i32 %y, ptr %context) unnamed_addr #2 {
 entry:
  %0 = icmp eq i32 %y, 0
  br i1 %0, label %divbyzero.throw, label %divbyzero.next
@@ -83,12 +86,12 @@ divbyzero.next:                                   ; preds = %entry
  ret i32 %5

 divbyzero.throw:                                  ; preds = %entry
-  call void @runtime.divideByZeroPanic(ptr undef) #2
+  call void @runtime.divideByZeroPanic(ptr undef) #3
  unreachable
 }

 ; Function Attrs: nounwind
-define hidden i32 @main.remUint(i32 %x, i32 %y, ptr %context) unnamed_addr #1 {
+define hidden i32 @main.remUint(i32 %x, i32 %y, ptr %context) unnamed_addr #2 {
 entry:
  %0 = icmp eq i32 %y, 0
  br i1 %0, label %divbyzero.throw, label %divbyzero.next
@@ -98,66 +101,66 @@ divbyzero.next:                                   ; preds = %entry
  ret i32 %1

 divbyzero.throw:                                  ; preds = %entry
-  call void @runtime.divideByZeroPanic(ptr undef) #2
+  call void @runtime.divideByZeroPanic(ptr undef) #3
  unreachable
 }

 ; Function Attrs: nounwind
-define hidden i1 @main.floatEQ(float %x, float %y, ptr %context) unnamed_addr #1 {
+define hidden i1 @main.floatEQ(float %x, float %y, ptr %context) unnamed_addr #2 {
 entry:
  %0 = fcmp oeq float %x, %y
  ret i1 %0
 }

 ; Function Attrs: nounwind
-define hidden i1 @main.floatNE(float %x, float %y, ptr %context) unnamed_addr #1 {
+define hidden i1 @main.floatNE(float %x, float %y, ptr %context) unnamed_addr #2 {
 entry:
  %0 = fcmp une float %x, %y
  ret i1 %0
 }

 ; Function Attrs: nounwind
-define hidden i1 @main.floatLower(float %x, float %y, ptr %context) unnamed_addr #1 {
+define hidden i1 @main.floatLower(float %x, float %y, ptr %context) unnamed_addr #2 {
 entry:
  %0 = fcmp olt float %x, %y
  ret i1 %0
 }

 ; Function Attrs: nounwind
-define hidden i1 @main.floatLowerEqual(float %x, float %y, ptr %context) unnamed_addr #1 {
+define hidden i1 @main.floatLowerEqual(float %x, float %y, ptr %context) unnamed_addr #2 {
 entry:
  %0 = fcmp ole float %x, %y
  ret i1 %0
 }

 ; Function Attrs: nounwind
-define hidden i1 @main.floatGreater(float %x, float %y, ptr %context) unnamed_addr #1 {
+define hidden i1 @main.floatGreater(float %x, float %y, ptr %context) unnamed_addr #2 {
 entry:
  %0 = fcmp ogt float %x, %y
  ret i1 %0
 }

 ; Function Attrs: nounwind
-define hidden i1 @main.floatGreaterEqual(float %x, float %y, ptr %context) unnamed_addr #1 {
+define hidden i1 @main.floatGreaterEqual(float %x, float %y, ptr %context) unnamed_addr #2 {
 entry:
  %0 = fcmp oge float %x, %y
  ret i1 %0
 }

 ; Function Attrs: nounwind
-define hidden float @main.complexReal(float %x.r, float %x.i, ptr %context) unnamed_addr #1 {
+define hidden float @main.complexReal(float %x.r, float %x.i, ptr %context) unnamed_addr #2 {
 entry:
  ret float %x.r
 }

 ; Function Attrs: nounwind
-define hidden float @main.complexImag(float %x.r, float %x.i, ptr %context) unnamed_addr #1 {
+define hidden float @main.complexImag(float %x.r, float %x.i, ptr %context) unnamed_addr #2 {
 entry:
  ret float %x.i
 }

 ; Function Attrs: nounwind
-define hidden { float, float } @main.complexAdd(float %x.r, float %x.i, float %y.r, float %y.i, ptr %context) unnamed_addr #1 {
+define hidden { float, float } @main.complexAdd(float %x.r, float %x.i, float %y.r, float %y.i, ptr %context) unnamed_addr #2 {
 entry:
  %0 = fadd float %x.r, %y.r
  %1 = fadd float %x.i, %y.i
@@ -167,7 +170,7 @@ entry:
 }

 ; Function Attrs: nounwind
-define hidden { float, float } @main.complexSub(float %x.r, float %x.i, float %y.r, float %y.i, ptr %context) unnamed_addr #1 {
+define hidden { float, float } @main.complexSub(float %x.r, float %x.i, float %y.r, float %y.i, ptr %context) unnamed_addr #2 {
 entry:
  %0 = fsub float %x.r, %y.r
  %1 = fsub float %x.i, %y.i
@@ -177,7 +180,7 @@ entry:
 }

 ; Function Attrs: nounwind
-define hidden { float, float } @main.complexMul(float %x.r, float %x.i, float %y.r, float %y.i, ptr %context) unnamed_addr #1 {
+define hidden { float, float } @main.complexMul(float %x.r, float %x.i, float %y.r, float %y.i, ptr %context) unnamed_addr #2 {
 entry:
  %0 = fmul float %x.r, %y.r
  %1 = fmul float %x.i, %y.i
@@ -191,18 +194,19 @@ entry:
 }

 ; Function Attrs: nounwind
-define hidden void @main.foo(ptr %context) unnamed_addr #1 {
+define hidden void @main.foo(ptr %context) unnamed_addr #2 {
 entry:
  call void @"main.foo$1"(%main.kv.0 zeroinitializer, ptr undef)
  ret void
 }

 ; Function Attrs: nounwind
-define internal void @"main.foo$1"(%main.kv.0 %b, ptr %context) unnamed_addr #1 {
+define internal void @"main.foo$1"(%main.kv.0 %b, ptr %context) unnamed_addr #2 {
 entry:
  ret void
 }

-attributes #0 = { "target-features"="+bulk-memory,+bulk-memory-opt,+call-indirect-overlong,+mutable-globals,+nontrapping-fptoint,+sign-ext,-multivalue,-reference-types" }
-attributes #1 = { nounwind "target-features"="+bulk-memory,+bulk-memory-opt,+call-indirect-overlong,+mutable-globals,+nontrapping-fptoint,+sign-ext,-multivalue,-reference-types" }
-attributes #2 = { nounwind }
+attributes #0 = { allockind("alloc,zeroed") allocsize(0) "alloc-family"="runtime.alloc" "target-features"="+bulk-memory,+mutable-globals,+nontrapping-fptoint,+sign-ext" }
+attributes #1 = { "target-features"="+bulk-memory,+mutable-globals,+nontrapping-fptoint,+sign-ext" }
+attributes #2 = { nounwind "target-features"="+bulk-memory,+mutable-globals,+nontrapping-fptoint,+sign-ext" }
+attributes #3 = { nounwind }
@@ -1,91 +1,94 @@
 ; ModuleID = 'channel.go'
 source_filename = "channel.go"
-target datalayout = "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-i128:128-n32:64-S128-ni:1:10:20"
+target datalayout = "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-n32:64-S128-ni:1:10:20"
 target triple = "wasm32-unknown-wasi"

-%runtime.channelOp = type { ptr, ptr, i32, ptr }
+%runtime.channelBlockedList = type { ptr, ptr, ptr, { ptr, i32, i32 } }
 %runtime.chanSelectState = type { ptr, ptr }

-declare void @runtime.trackPointer(ptr nocapture readonly, ptr, ptr) #0
+; Function Attrs: allockind("alloc,zeroed") allocsize(0)
+declare noalias nonnull ptr @runtime.alloc(i32, ptr, ptr) #0
+
+declare void @runtime.trackPointer(ptr nocapture readonly, ptr, ptr) #1

 ; Function Attrs: nounwind
-define hidden void @main.init(ptr %context) unnamed_addr #1 {
+define hidden void @main.init(ptr %context) unnamed_addr #2 {
 entry:
  ret void
 }

 ; Function Attrs: nounwind
-define hidden void @main.chanIntSend(ptr dereferenceable_or_null(36) %ch, ptr %context) unnamed_addr #1 {
+define hidden void @main.chanIntSend(ptr dereferenceable_or_null(32) %ch, ptr %context) unnamed_addr #2 {
 entry:
-  %chan.op = alloca %runtime.channelOp, align 8
+  %chan.blockedList = alloca %runtime.channelBlockedList, align 8
  %chan.value = alloca i32, align 4
  call void @llvm.lifetime.start.p0(i64 4, ptr nonnull %chan.value)
  store i32 3, ptr %chan.value, align 4
-  call void @llvm.lifetime.start.p0(i64 16, ptr nonnull %chan.op)
-  call void @runtime.chanSend(ptr %ch, ptr nonnull %chan.value, ptr nonnull %chan.op, ptr undef) #3
-  call void @llvm.lifetime.end.p0(i64 16, ptr nonnull %chan.op)
+  call void @llvm.lifetime.start.p0(i64 24, ptr nonnull %chan.blockedList)
+  call void @runtime.chanSend(ptr %ch, ptr nonnull %chan.value, ptr nonnull %chan.blockedList, ptr undef) #4
+  call void @llvm.lifetime.end.p0(i64 24, ptr nonnull %chan.blockedList)
  call void @llvm.lifetime.end.p0(i64 4, ptr nonnull %chan.value)
  ret void
 }

 ; Function Attrs: nocallback nofree nosync nounwind willreturn memory(argmem: readwrite)
-declare void @llvm.lifetime.start.p0(i64 immarg, ptr nocapture) #2
+declare void @llvm.lifetime.start.p0(i64 immarg, ptr nocapture) #3

-declare void @runtime.chanSend(ptr dereferenceable_or_null(36), ptr, ptr dereferenceable_or_null(16), ptr) #0
+declare void @runtime.chanSend(ptr dereferenceable_or_null(32), ptr, ptr dereferenceable_or_null(24), ptr) #1

 ; Function Attrs: nocallback nofree nosync nounwind willreturn memory(argmem: readwrite)
-declare void @llvm.lifetime.end.p0(i64 immarg, ptr nocapture) #2
+declare void @llvm.lifetime.end.p0(i64 immarg, ptr nocapture) #3

 ; Function Attrs: nounwind
-define hidden void @main.chanIntRecv(ptr dereferenceable_or_null(36) %ch, ptr %context) unnamed_addr #1 {
+define hidden void @main.chanIntRecv(ptr dereferenceable_or_null(32) %ch, ptr %context) unnamed_addr #2 {
 entry:
-  %chan.op = alloca %runtime.channelOp, align 8
+  %chan.blockedList = alloca %runtime.channelBlockedList, align 8
  %chan.value = alloca i32, align 4
  call void @llvm.lifetime.start.p0(i64 4, ptr nonnull %chan.value)
-  call void @llvm.lifetime.start.p0(i64 16, ptr nonnull %chan.op)
-  %0 = call i1 @runtime.chanRecv(ptr %ch, ptr nonnull %chan.value, ptr nonnull %chan.op, ptr undef) #3
+  call void @llvm.lifetime.start.p0(i64 24, ptr nonnull %chan.blockedList)
+  %0 = call i1 @runtime.chanRecv(ptr %ch, ptr nonnull %chan.value, ptr nonnull %chan.blockedList, ptr undef) #4
  call void @llvm.lifetime.end.p0(i64 4, ptr nonnull %chan.value)
-  call void @llvm.lifetime.end.p0(i64 16, ptr nonnull %chan.op)
+  call void @llvm.lifetime.end.p0(i64 24, ptr nonnull %chan.blockedList)
  ret void
 }

-declare i1 @runtime.chanRecv(ptr dereferenceable_or_null(36), ptr, ptr dereferenceable_or_null(16), ptr) #0
+declare i1 @runtime.chanRecv(ptr dereferenceable_or_null(32), ptr, ptr dereferenceable_or_null(24), ptr) #1

 ; Function Attrs: nounwind
-define hidden void @main.chanZeroSend(ptr dereferenceable_or_null(36) %ch, ptr %context) unnamed_addr #1 {
+define hidden void @main.chanZeroSend(ptr dereferenceable_or_null(32) %ch, ptr %context) unnamed_addr #2 {
 entry:
-  %chan.op = alloca %runtime.channelOp, align 8
-  call void @llvm.lifetime.start.p0(i64 16, ptr nonnull %chan.op)
-  call void @runtime.chanSend(ptr %ch, ptr null, ptr nonnull %chan.op, ptr undef) #3
-  call void @llvm.lifetime.end.p0(i64 16, ptr nonnull %chan.op)
+  %chan.blockedList = alloca %runtime.channelBlockedList, align 8
+  call void @llvm.lifetime.start.p0(i64 24, ptr nonnull %chan.blockedList)
+  call void @runtime.chanSend(ptr %ch, ptr null, ptr nonnull %chan.blockedList, ptr undef) #4
+  call void @llvm.lifetime.end.p0(i64 24, ptr nonnull %chan.blockedList)
  ret void
 }

 ; Function Attrs: nounwind
-define hidden void @main.chanZeroRecv(ptr dereferenceable_or_null(36) %ch, ptr %context) unnamed_addr #1 {
+define hidden void @main.chanZeroRecv(ptr dereferenceable_or_null(32) %ch, ptr %context) unnamed_addr #2 {
 entry:
-  %chan.op = alloca %runtime.channelOp, align 8
-  call void @llvm.lifetime.start.p0(i64 16, ptr nonnull %chan.op)
-  %0 = call i1 @runtime.chanRecv(ptr %ch, ptr null, ptr nonnull %chan.op, ptr undef) #3
-  call void @llvm.lifetime.end.p0(i64 16, ptr nonnull %chan.op)
+  %chan.blockedList = alloca %runtime.channelBlockedList, align 8
+  call void @llvm.lifetime.start.p0(i64 24, ptr nonnull %chan.blockedList)
+  %0 = call i1 @runtime.chanRecv(ptr %ch, ptr null, ptr nonnull %chan.blockedList, ptr undef) #4
+  call void @llvm.lifetime.end.p0(i64 24, ptr nonnull %chan.blockedList)
  ret void
 }

 ; Function Attrs: nounwind
-define hidden void @main.selectZeroRecv(ptr dereferenceable_or_null(36) %ch1, ptr dereferenceable_or_null(36) %ch2, ptr %context) unnamed_addr #1 {
+define hidden void @main.selectZeroRecv(ptr dereferenceable_or_null(32) %ch1, ptr dereferenceable_or_null(32) %ch2, ptr %context) unnamed_addr #2 {
 entry:
  %select.states.alloca = alloca [2 x %runtime.chanSelectState], align 8
  %select.send.value = alloca i32, align 4
  store i32 1, ptr %select.send.value, align 4
  call void @llvm.lifetime.start.p0(i64 16, ptr nonnull %select.states.alloca)
  store ptr %ch1, ptr %select.states.alloca, align 4
-  %select.states.alloca.repack1 = getelementptr inbounds nuw i8, ptr %select.states.alloca, i32 4
+  %select.states.alloca.repack1 = getelementptr inbounds %runtime.chanSelectState, ptr %select.states.alloca, i32 0, i32 1
  store ptr %select.send.value, ptr %select.states.alloca.repack1, align 4
-  %0 = getelementptr inbounds nuw i8, ptr %select.states.alloca, i32 8
+  %0 = getelementptr inbounds [2 x %runtime.chanSelectState], ptr %select.states.alloca, i32 0, i32 1
  store ptr %ch2, ptr %0, align 4
-  %.repack3 = getelementptr inbounds nuw i8, ptr %select.states.alloca, i32 12
+  %.repack3 = getelementptr inbounds [2 x %runtime.chanSelectState], ptr %select.states.alloca, i32 0, i32 1, i32 1
  store ptr null, ptr %.repack3, align 4
-  %select.result = call { i32, i1 } @runtime.chanSelect(ptr undef, ptr nonnull %select.states.alloca, i32 2, i32 2, ptr null, i32 0, i32 0, ptr undef) #3
+  %select.result = call { i32, i1 } @runtime.tryChanSelect(ptr undef, ptr nonnull %select.states.alloca, i32 2, i32 2, ptr undef) #4
  call void @llvm.lifetime.end.p0(i64 16, ptr nonnull %select.states.alloca)
  %1 = extractvalue { i32, i1 } %select.result, 0
  %2 = icmp eq i32 %1, 0
@@ -102,9 +105,10 @@ select.body:                                      ; preds = %select.next
  br label %select.done
 }

-declare { i32, i1 } @runtime.chanSelect(ptr, ptr, i32, i32, ptr, i32, i32, ptr) #0
+declare { i32, i1 } @runtime.tryChanSelect(ptr, ptr, i32, i32, ptr) #1

-attributes #0 = { "target-features"="+bulk-memory,+bulk-memory-opt,+call-indirect-overlong,+mutable-globals,+nontrapping-fptoint,+sign-ext,-multivalue,-reference-types" }
-attributes #1 = { nounwind "target-features"="+bulk-memory,+bulk-memory-opt,+call-indirect-overlong,+mutable-globals,+nontrapping-fptoint,+sign-ext,-multivalue,-reference-types" }
-attributes #2 = { nocallback nofree nosync nounwind willreturn memory(argmem: readwrite) }
-attributes #3 = { nounwind }
+attributes #0 = { allockind("alloc,zeroed") allocsize(0) "alloc-family"="runtime.alloc" "target-features"="+bulk-memory,+mutable-globals,+nontrapping-fptoint,+sign-ext" }
+attributes #1 = { "target-features"="+bulk-memory,+mutable-globals,+nontrapping-fptoint,+sign-ext" }
+attributes #2 = { nounwind "target-features"="+bulk-memory,+mutable-globals,+nontrapping-fptoint,+sign-ext" }
+attributes #3 = { nocallback nofree nosync nounwind willreturn memory(argmem: readwrite) }
+attributes #4 = { nounwind }
@@ -3,19 +3,23 @@ source_filename = "defer.go"
 target datalayout = "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64"
 target triple = "thumbv7m-unknown-unknown-eabi"

-%runtime.deferFrame = type { ptr, ptr, [0 x ptr], ptr, i8, %runtime._interface }
+%runtime.deferFrame = type { ptr, ptr, [0 x ptr], ptr, i1, %runtime._interface }
 %runtime._interface = type { ptr, ptr }
+%runtime._defer = type { i32, ptr }
+
+; Function Attrs: allockind("alloc,zeroed") allocsize(0)
+declare noalias nonnull ptr @runtime.alloc(i32, ptr, ptr) #0

 ; Function Attrs: nounwind
-define hidden void @main.init(ptr %context) unnamed_addr #0 {
+define hidden void @main.init(ptr %context) unnamed_addr #1 {
 entry:
  ret void
 }

-declare void @main.external(ptr) #1
+declare void @main.external(ptr) #2

 ; Function Attrs: nounwind
-define hidden void @main.deferSimple(ptr %context) unnamed_addr #0 {
+define hidden void @main.deferSimple(ptr %context) unnamed_addr #1 {
 entry:
  %defer.alloca = alloca { i32, ptr }, align 4
  %deferPtr = alloca ptr, align 4
@@ -24,7 +28,7 @@ entry:
  %0 = call ptr @llvm.stacksave.p0()
  call void @runtime.setupDeferFrame(ptr nonnull %deferframe.buf, ptr %0, ptr undef) #4
  store i32 0, ptr %defer.alloca, align 4
-  %defer.alloca.repack15 = getelementptr inbounds nuw i8, ptr %defer.alloca, i32 4
+  %defer.alloca.repack15 = getelementptr inbounds { i32, ptr }, ptr %defer.alloca, i32 0, i32 1
  store ptr null, ptr %defer.alloca.repack15, align 4
  store ptr %defer.alloca, ptr %deferPtr, align 4
  %setjmp = call i32 asm "\0Amovs r0, #0\0Amov r2, pc\0Astr r2, [r1, #4]", "={r0},{r1},~{r1},~{r2},~{r3},~{r4},~{r5},~{r6},~{r7},~{r8},~{r9},~{r10},~{r11},~{r12},~{lr},~{q0},~{q1},~{q2},~{q3},~{q4},~{q5},~{q6},~{q7},~{q8},~{q9},~{q10},~{q11},~{q12},~{q13},~{q14},~{q15},~{cpsr},~{memory}"(ptr nonnull %deferframe.buf) #5
@@ -48,7 +52,7 @@ rundefers.loophead:                               ; preds = %3, %rundefers.block
  br i1 %stackIsNil, label %rundefers.end, label %rundefers.loop

 rundefers.loop:                                   ; preds = %rundefers.loophead
-  %stack.next.gep = getelementptr inbounds nuw i8, ptr %2, i32 4
+  %stack.next.gep = getelementptr inbounds %runtime._defer, ptr %2, i32 0, i32 1
  %stack.next = load ptr, ptr %stack.next.gep, align 4
  store ptr %stack.next, ptr %deferPtr, align 4
  %callback = load i32, ptr %2, align 4
@@ -84,7 +88,7 @@ rundefers.loophead6:                              ; preds = %5, %lpad
  br i1 %stackIsNil7, label %rundefers.end3, label %rundefers.loop5

 rundefers.loop5:                                  ; preds = %rundefers.loophead6
-  %stack.next.gep8 = getelementptr inbounds nuw i8, ptr %4, i32 4
+  %stack.next.gep8 = getelementptr inbounds %runtime._defer, ptr %4, i32 0, i32 1
  %stack.next9 = load ptr, ptr %stack.next.gep8, align 4
  store ptr %stack.next9, ptr %deferPtr, align 4
  %callback11 = load i32, ptr %4, align 4
@@ -109,29 +113,23 @@ rundefers.end3:                                   ; preds = %rundefers.loophead6
 }

 ; Function Attrs: nocallback nofree nosync nounwind willreturn
-declare ptr @llvm.stacksave.p0() #2
+declare ptr @llvm.stacksave.p0() #3

-declare void @runtime.setupDeferFrame(ptr dereferenceable_or_null(24), ptr, ptr) #1
+declare void @runtime.setupDeferFrame(ptr dereferenceable_or_null(24), ptr, ptr) #2

-declare void @runtime.destroyDeferFrame(ptr dereferenceable_or_null(24), ptr) #1
+declare void @runtime.destroyDeferFrame(ptr dereferenceable_or_null(24), ptr) #2

 ; Function Attrs: nounwind
-define internal void @"main.deferSimple$1"(ptr %context) unnamed_addr #0 {
+define internal void @"main.deferSimple$1"(ptr %context) unnamed_addr #1 {
 entry:
-  call void @runtime.printlock(ptr undef) #4
  call void @runtime.printint32(i32 3, ptr undef) #4
-  call void @runtime.printunlock(ptr undef) #4
  ret void
 }

-declare void @runtime.printlock(ptr) #1
-
-declare void @runtime.printint32(i32, ptr) #1
-
-declare void @runtime.printunlock(ptr) #1
+declare void @runtime.printint32(i32, ptr) #2

 ; Function Attrs: nounwind
-define hidden void @main.deferMultiple(ptr %context) unnamed_addr #0 {
+define hidden void @main.deferMultiple(ptr %context) unnamed_addr #1 {
 entry:
  %defer.alloca2 = alloca { i32, ptr }, align 4
  %defer.alloca = alloca { i32, ptr }, align 4
@@ -141,11 +139,11 @@ entry:
  %0 = call ptr @llvm.stacksave.p0()
  call void @runtime.setupDeferFrame(ptr nonnull %deferframe.buf, ptr %0, ptr undef) #4
  store i32 0, ptr %defer.alloca, align 4
-  %defer.alloca.repack22 = getelementptr inbounds nuw i8, ptr %defer.alloca, i32 4
+  %defer.alloca.repack22 = getelementptr inbounds { i32, ptr }, ptr %defer.alloca, i32 0, i32 1
  store ptr null, ptr %defer.alloca.repack22, align 4
  store ptr %defer.alloca, ptr %deferPtr, align 4
  store i32 1, ptr %defer.alloca2, align 4
-  %defer.alloca2.repack23 = getelementptr inbounds nuw i8, ptr %defer.alloca2, i32 4
+  %defer.alloca2.repack23 = getelementptr inbounds { i32, ptr }, ptr %defer.alloca2, i32 0, i32 1
  store ptr %defer.alloca, ptr %defer.alloca2.repack23, align 4
  store ptr %defer.alloca2, ptr %deferPtr, align 4
  %setjmp = call i32 asm "\0Amovs r0, #0\0Amov r2, pc\0Astr r2, [r1, #4]", "={r0},{r1},~{r1},~{r2},~{r3},~{r4},~{r5},~{r6},~{r7},~{r8},~{r9},~{r10},~{r11},~{r12},~{lr},~{q0},~{q1},~{q2},~{q3},~{q4},~{q5},~{q6},~{q7},~{q8},~{q9},~{q10},~{q11},~{q12},~{q13},~{q14},~{q15},~{cpsr},~{memory}"(ptr nonnull %deferframe.buf) #5
@@ -169,7 +167,7 @@ rundefers.loophead:                               ; preds = %4, %3, %rundefers.b
  br i1 %stackIsNil, label %rundefers.end, label %rundefers.loop

 rundefers.loop:                                   ; preds = %rundefers.loophead
-  %stack.next.gep = getelementptr inbounds nuw i8, ptr %2, i32 4
+  %stack.next.gep = getelementptr inbounds %runtime._defer, ptr %2, i32 0, i32 1
  %stack.next = load ptr, ptr %stack.next.gep, align 4
  store ptr %stack.next, ptr %deferPtr, align 4
  %callback = load i32, ptr %2, align 4
@@ -215,7 +213,7 @@ rundefers.loophead10:                             ; preds = %7, %6, %lpad
  br i1 %stackIsNil11, label %rundefers.end7, label %rundefers.loop9

 rundefers.loop9:                                  ; preds = %rundefers.loophead10
-  %stack.next.gep12 = getelementptr inbounds nuw i8, ptr %5, i32 4
+  %stack.next.gep12 = getelementptr inbounds %runtime._defer, ptr %5, i32 0, i32 1
  %stack.next13 = load ptr, ptr %stack.next.gep12, align 4
  store ptr %stack.next13, ptr %deferPtr, align 4
  %callback15 = load i32, ptr %5, align 4
@@ -250,264 +248,22 @@ rundefers.end7:                                   ; preds = %rundefers.loophead1
 }

 ; Function Attrs: nounwind
-define internal void @"main.deferMultiple$1"(ptr %context) unnamed_addr #0 {
+define internal void @"main.deferMultiple$1"(ptr %context) unnamed_addr #1 {
 entry:
-  call void @runtime.printlock(ptr undef) #4
  call void @runtime.printint32(i32 3, ptr undef) #4
-  call void @runtime.printunlock(ptr undef) #4
  ret void
 }

 ; Function Attrs: nounwind
-define internal void @"main.deferMultiple$2"(ptr %context) unnamed_addr #0 {
+define internal void @"main.deferMultiple$2"(ptr %context) unnamed_addr #1 {
 entry:
-  call void @runtime.printlock(ptr undef) #4
  call void @runtime.printint32(i32 5, ptr undef) #4
-  call void @runtime.printunlock(ptr undef) #4
  ret void
 }

-; Function Attrs: nounwind
-define hidden void @main.deferInfiniteLoop(ptr %context) unnamed_addr #0 {
-entry:
-  %deferPtr = alloca ptr, align 4
-  store ptr null, ptr %deferPtr, align 4
-  %deferframe.buf = alloca %runtime.deferFrame, align 4
-  %0 = call ptr @llvm.stacksave.p0()
-  call void @runtime.setupDeferFrame(ptr nonnull %deferframe.buf, ptr %0, ptr undef) #4
-  br label %for.body
-
-for.body:                                         ; preds = %for.body, %entry
-  %defer.next = load ptr, ptr %deferPtr, align 4
-  %defer.alloc.call = call dereferenceable(12) ptr @runtime.alloc(i32 12, ptr null, ptr undef) #4
-  store i32 0, ptr %defer.alloc.call, align 4
-  %defer.alloc.call.repack1 = getelementptr inbounds nuw i8, ptr %defer.alloc.call, i32 4
-  store ptr %defer.next, ptr %defer.alloc.call.repack1, align 4
-  %defer.alloc.call.repack3 = getelementptr inbounds nuw i8, ptr %defer.alloc.call, i32 8
-  store i32 8, ptr %defer.alloc.call.repack3, align 4
-  store ptr %defer.alloc.call, ptr %deferPtr, align 4
-  br label %for.body
-
-recover:                                          ; preds = %rundefers.end
-  ret void
-
-lpad:                                             ; No predecessors!
-  br label %rundefers.loophead
-
-rundefers.loophead:                               ; preds = %rundefers.callback0, %lpad
-  br i1 poison, label %rundefers.end, label %rundefers.loop
-
-rundefers.loop:                                   ; preds = %rundefers.loophead
-  switch i32 poison, label %rundefers.default [
-    i32 0, label %rundefers.callback0
-  ]
-
-rundefers.callback0:                              ; preds = %rundefers.loop
-  br label %rundefers.loophead
-
-rundefers.default:                                ; preds = %rundefers.loop
-  unreachable
-
-rundefers.end:                                    ; preds = %rundefers.loophead
-  br label %recover
-}
-
-; Function Attrs: allockind("alloc,zeroed") allocsize(0)
-declare noalias nonnull ptr @runtime.alloc(i32, ptr, ptr) #3
-
-; Function Attrs: nounwind
-define hidden void @main.deferLoop(ptr %context) unnamed_addr #0 {
-entry:
-  %deferPtr = alloca ptr, align 4
-  store ptr null, ptr %deferPtr, align 4
-  %deferframe.buf = alloca %runtime.deferFrame, align 4
-  %0 = call ptr @llvm.stacksave.p0()
-  call void @runtime.setupDeferFrame(ptr nonnull %deferframe.buf, ptr %0, ptr undef) #4
-  br label %for.loop
-
-for.loop:                                         ; preds = %for.body, %entry
-  %1 = phi i32 [ 0, %entry ], [ %3, %for.body ]
-  %2 = icmp slt i32 %1, 10
-  br i1 %2, label %for.body, label %for.done
-
-for.body:                                         ; preds = %for.loop
-  %defer.next = load ptr, ptr %deferPtr, align 4
-  %defer.alloc.call = call dereferenceable(12) ptr @runtime.alloc(i32 12, ptr null, ptr undef) #4
-  store i32 0, ptr %defer.alloc.call, align 4
-  %defer.alloc.call.repack13 = getelementptr inbounds nuw i8, ptr %defer.alloc.call, i32 4
-  store ptr %defer.next, ptr %defer.alloc.call.repack13, align 4
-  %defer.alloc.call.repack15 = getelementptr inbounds nuw i8, ptr %defer.alloc.call, i32 8
-  store i32 %1, ptr %defer.alloc.call.repack15, align 4
-  store ptr %defer.alloc.call, ptr %deferPtr, align 4
-  %3 = add i32 %1, 1
-  br label %for.loop
-
-for.done:                                         ; preds = %for.loop
-  br label %rundefers.block
-
-rundefers.after:                                  ; preds = %rundefers.end
-  call void @runtime.destroyDeferFrame(ptr nonnull %deferframe.buf, ptr undef) #4
-  ret void
-
-rundefers.block:                                  ; preds = %for.done
-  br label %rundefers.loophead
-
-rundefers.loophead:                               ; preds = %rundefers.callback0, %rundefers.block
-  %4 = load ptr, ptr %deferPtr, align 4
-  %stackIsNil = icmp eq ptr %4, null
-  br i1 %stackIsNil, label %rundefers.end, label %rundefers.loop
-
-rundefers.loop:                                   ; preds = %rundefers.loophead
-  %stack.next.gep = getelementptr inbounds nuw i8, ptr %4, i32 4
-  %stack.next = load ptr, ptr %stack.next.gep, align 4
-  store ptr %stack.next, ptr %deferPtr, align 4
-  %callback = load i32, ptr %4, align 4
-  switch i32 %callback, label %rundefers.default [
-    i32 0, label %rundefers.callback0
-  ]
-
-rundefers.callback0:                              ; preds = %rundefers.loop
-  %gep = getelementptr inbounds nuw i8, ptr %4, i32 8
-  %param = load i32, ptr %gep, align 4
-  call void @runtime.printlock(ptr undef) #4
-  call void @runtime.printint32(i32 %param, ptr undef) #4
-  call void @runtime.printunlock(ptr undef) #4
-  br label %rundefers.loophead
-
-rundefers.default:                                ; preds = %rundefers.loop
-  unreachable
-
-rundefers.end:                                    ; preds = %rundefers.loophead
-  br label %rundefers.after
-
-recover:                                          ; preds = %rundefers.end1
-  ret void
-
-lpad:                                             ; No predecessors!
-  br label %rundefers.loophead4
-
-rundefers.loophead4:                              ; preds = %rundefers.callback010, %lpad
-  br i1 poison, label %rundefers.end1, label %rundefers.loop3
-
-rundefers.loop3:                                  ; preds = %rundefers.loophead4
-  switch i32 poison, label %rundefers.default2 [
-    i32 0, label %rundefers.callback010
-  ]
-
-rundefers.callback010:                            ; preds = %rundefers.loop3
-  br label %rundefers.loophead4
-
-rundefers.default2:                               ; preds = %rundefers.loop3
-  unreachable
-
-rundefers.end1:                                   ; preds = %rundefers.loophead4
-  br label %recover
-}
-
-; Function Attrs: nounwind
-define hidden void @main.deferBetweenLoops(ptr %context) unnamed_addr #0 {
-entry:
-  %defer.alloca = alloca { i32, ptr, i32 }, align 4
-  %deferPtr = alloca ptr, align 4
-  store ptr null, ptr %deferPtr, align 4
-  %deferframe.buf = alloca %runtime.deferFrame, align 4
-  %0 = call ptr @llvm.stacksave.p0()
-  call void @runtime.setupDeferFrame(ptr nonnull %deferframe.buf, ptr %0, ptr undef) #4
-  br label %for.loop
-
-for.loop:                                         ; preds = %for.body, %entry
-  %1 = phi i32 [ 0, %entry ], [ %3, %for.body ]
-  %2 = icmp slt i32 %1, 10
-  br i1 %2, label %for.body, label %for.done
-
-for.body:                                         ; preds = %for.loop
-  %3 = add i32 %1, 1
-  br label %for.loop
-
-for.done:                                         ; preds = %for.loop
-  %defer.next = load ptr, ptr %deferPtr, align 4
-  store i32 0, ptr %defer.alloca, align 4
-  %defer.alloca.repack16 = getelementptr inbounds nuw i8, ptr %defer.alloca, i32 4
-  store ptr %defer.next, ptr %defer.alloca.repack16, align 4
-  %defer.alloca.repack18 = getelementptr inbounds nuw i8, ptr %defer.alloca, i32 8
-  store i32 1, ptr %defer.alloca.repack18, align 4
-  store ptr %defer.alloca, ptr %deferPtr, align 4
-  br label %for.loop1
-
-for.loop1:                                        ; preds = %for.body2, %for.done
-  %4 = phi i32 [ 0, %for.done ], [ %6, %for.body2 ]
-  %5 = icmp slt i32 %4, 10
-  br i1 %5, label %for.body2, label %for.done3
-
-for.body2:                                        ; preds = %for.loop1
-  %6 = add i32 %4, 1
-  br label %for.loop1
-
-for.done3:                                        ; preds = %for.loop1
-  br label %rundefers.block
-
-rundefers.after:                                  ; preds = %rundefers.end
-  call void @runtime.destroyDeferFrame(ptr nonnull %deferframe.buf, ptr undef) #4
-  ret void
-
-rundefers.block:                                  ; preds = %for.done3
-  br label %rundefers.loophead
-
-rundefers.loophead:                               ; preds = %rundefers.callback0, %rundefers.block
-  %7 = load ptr, ptr %deferPtr, align 4
-  %stackIsNil = icmp eq ptr %7, null
-  br i1 %stackIsNil, label %rundefers.end, label %rundefers.loop
-
-rundefers.loop:                                   ; preds = %rundefers.loophead
-  %stack.next.gep = getelementptr inbounds nuw i8, ptr %7, i32 4
-  %stack.next = load ptr, ptr %stack.next.gep, align 4
-  store ptr %stack.next, ptr %deferPtr, align 4
-  %callback = load i32, ptr %7, align 4
-  switch i32 %callback, label %rundefers.default [
-    i32 0, label %rundefers.callback0
-  ]
-
-rundefers.callback0:                              ; preds = %rundefers.loop
-  %gep = getelementptr inbounds nuw i8, ptr %7, i32 8
-  %param = load i32, ptr %gep, align 4
-  call void @runtime.printlock(ptr undef) #4
-  call void @runtime.printint32(i32 %param, ptr undef) #4
-  call void @runtime.printunlock(ptr undef) #4
-  br label %rundefers.loophead
-
-rundefers.default:                                ; preds = %rundefers.loop
-  unreachable
-
-rundefers.end:                                    ; preds = %rundefers.loophead
-  br label %rundefers.after
-
-recover:                                          ; preds = %rundefers.end4
-  ret void
-
-lpad:                                             ; No predecessors!
-  br label %rundefers.loophead7
-
-rundefers.loophead7:                              ; preds = %rundefers.callback013, %lpad
-  br i1 poison, label %rundefers.end4, label %rundefers.loop6
-
-rundefers.loop6:                                  ; preds = %rundefers.loophead7
-  switch i32 poison, label %rundefers.default5 [
-    i32 0, label %rundefers.callback013
-  ]
-
-rundefers.callback013:                            ; preds = %rundefers.loop6
-  br label %rundefers.loophead7
-
-rundefers.default5:                               ; preds = %rundefers.loop6
-  unreachable
-
-rundefers.end4:                                   ; preds = %rundefers.loophead7
-  br label %recover
-}
-
-attributes #0 = { nounwind "target-features"="+armv7-m,+hwdiv,+soft-float,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" }
-attributes #1 = { "target-features"="+armv7-m,+hwdiv,+soft-float,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" }
-attributes #2 = { nocallback nofree nosync nounwind willreturn }
-attributes #3 = { allockind("alloc,zeroed") allocsize(0) "alloc-family"="runtime.alloc" "target-features"="+armv7-m,+hwdiv,+soft-float,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" }
+attributes #0 = { allockind("alloc,zeroed") allocsize(0) "alloc-family"="runtime.alloc" "target-features"="+armv7-m,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" }
+attributes #1 = { nounwind "target-features"="+armv7-m,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" }
+attributes #2 = { "target-features"="+armv7-m,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" }
+attributes #3 = { nocallback nofree nosync nounwind willreturn }
 attributes #4 = { nounwind }
 attributes #5 = { nounwind returns_twice }
@@ -18,23 +18,3 @@ func deferMultiple() {
 	}()
 	external()
 }
-
-func deferInfiniteLoop() {
-	for {
-		defer print(8)
-	}
-}
-
-func deferLoop() {
-	for i := 0; i < 10; i++ {
-		defer print(i)
-	}
-}
-
-func deferBetweenLoops() {
-	for i := 0; i < 10; i++ {
-	}
-	defer print(1)
-	for i := 0; i < 10; i++ {
-	}
-}
@@ -1,9 +1,6 @@
 package main

-import (
-	"structs"
-	"unsafe"
-)
+import "unsafe"

 //go:wasmimport modulename empty
 func empty()
@@ -17,37 +14,31 @@ func implementation() {
 type Uint uint32

 type S struct {
-	_ structs.HostLayout
 	a [4]uint32
 	b uintptr
+	c int
 	d float32
 	e float64
 }

 //go:wasmimport modulename validparam
-func validparam(a int32, b uint64, c float64, d unsafe.Pointer, e Uint, f uintptr, g string, h *int32, i *S, j *struct{}, k *[8]uint8)
+func validparam(a int32, b uint64, c float64, d unsafe.Pointer, e Uint, f uintptr, g string, h *int32, i *S)

 // ERROR: //go:wasmimport modulename invalidparam: unsupported parameter type [4]uint32
 // ERROR: //go:wasmimport modulename invalidparam: unsupported parameter type []byte
 // ERROR: //go:wasmimport modulename invalidparam: unsupported parameter type struct{a int}
 // ERROR: //go:wasmimport modulename invalidparam: unsupported parameter type chan struct{}
 // ERROR: //go:wasmimport modulename invalidparam: unsupported parameter type func()
-// ERROR: //go:wasmimport modulename invalidparam: unsupported parameter type int
-// ERROR: //go:wasmimport modulename invalidparam: unsupported parameter type uint
-// ERROR: //go:wasmimport modulename invalidparam: unsupported parameter type [8]int
 //
 //go:wasmimport modulename invalidparam
-func invalidparam(a [4]uint32, b []byte, c struct{ a int }, d chan struct{}, e func(), f int, g uint, h [8]int)
-
-// ERROR: //go:wasmimport modulename invalidparam_no_hostlayout: unsupported parameter type *struct{int}
-// ERROR: //go:wasmimport modulename invalidparam_no_hostlayout: unsupported parameter type *struct{string}
-//
-//go:wasmimport modulename invalidparam_no_hostlayout
-func invalidparam_no_hostlayout(a *struct{ int }, b *struct{ string })
+func invalidparam(a [4]uint32, b []byte, c struct{ a int }, d chan struct{}, e func())

 //go:wasmimport modulename validreturn_int32
 func validreturn_int32() int32

+//go:wasmimport modulename validreturn_int
+func validreturn_int() int
+
 //go:wasmimport modulename validreturn_ptr_int32
 func validreturn_ptr_int32() *int32

@@ -57,12 +48,6 @@ func validreturn_ptr_string() *string
 //go:wasmimport modulename validreturn_ptr_struct
 func validreturn_ptr_struct() *S

-//go:wasmimport modulename validreturn_ptr_struct
-func validreturn_ptr_empty_struct() *struct{}
-
-//go:wasmimport modulename validreturn_ptr_array
-func validreturn_ptr_array() *[8]uint8
-
 //go:wasmimport modulename validreturn_unsafe_pointer
 func validreturn_unsafe_pointer() unsafe.Pointer

@@ -71,26 +56,11 @@ func validreturn_unsafe_pointer() unsafe.Pointer
 //go:wasmimport modulename manyreturns
 func manyreturns() (int32, int32)

-// ERROR: //go:wasmimport modulename invalidreturn_int: unsupported result type int
-//
-//go:wasmimport modulename invalidreturn_int
-func invalidreturn_int() int
-
-// ERROR: //go:wasmimport modulename invalidreturn_int: unsupported result type uint
-//
-//go:wasmimport modulename invalidreturn_int
-func invalidreturn_uint() uint
-
 // ERROR: //go:wasmimport modulename invalidreturn_func: unsupported result type func()
 //
 //go:wasmimport modulename invalidreturn_func
 func invalidreturn_func() func()

-// ERROR: //go:wasmimport modulename invalidreturn_pointer_array_int: unsupported result type *[8]int
-//
-//go:wasmimport modulename invalidreturn_pointer_array_int
-func invalidreturn_pointer_array_int() *[8]int
-
 // ERROR: //go:wasmimport modulename invalidreturn_slice_byte: unsupported result type []byte
 //
 //go:wasmimport modulename invalidreturn_slice_byte
@@ -1,18 +1,21 @@
 ; ModuleID = 'float.go'
 source_filename = "float.go"
-target datalayout = "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-i128:128-n32:64-S128-ni:1:10:20"
+target datalayout = "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-n32:64-S128-ni:1:10:20"
 target triple = "wasm32-unknown-wasi"

-declare void @runtime.trackPointer(ptr nocapture readonly, ptr, ptr) #0
+; Function Attrs: allockind("alloc,zeroed") allocsize(0)
+declare noalias nonnull ptr @runtime.alloc(i32, ptr, ptr) #0
+
+declare void @runtime.trackPointer(ptr nocapture readonly, ptr, ptr) #1

 ; Function Attrs: nounwind
-define hidden void @main.init(ptr %context) unnamed_addr #1 {
+define hidden void @main.init(ptr %context) unnamed_addr #2 {
 entry:
  ret void
 }

 ; Function Attrs: nounwind
-define hidden i32 @main.f32tou32(float %v, ptr %context) unnamed_addr #1 {
+define hidden i32 @main.f32tou32(float %v, ptr %context) unnamed_addr #2 {
 entry:
  %positive = fcmp oge float %v, 0.000000e+00
  %withinmax = fcmp ole float %v, 0x41EFFFFFC0000000
@@ -24,25 +27,25 @@ entry:
 }

 ; Function Attrs: nounwind
-define hidden float @main.maxu32f(ptr %context) unnamed_addr #1 {
+define hidden float @main.maxu32f(ptr %context) unnamed_addr #2 {
 entry:
  ret float 0x41F0000000000000
 }

 ; Function Attrs: nounwind
-define hidden i32 @main.maxu32tof32(ptr %context) unnamed_addr #1 {
+define hidden i32 @main.maxu32tof32(ptr %context) unnamed_addr #2 {
 entry:
  ret i32 -1
 }

 ; Function Attrs: nounwind
-define hidden { i32, i32, i32, i32 } @main.inftoi32(ptr %context) unnamed_addr #1 {
+define hidden { i32, i32, i32, i32 } @main.inftoi32(ptr %context) unnamed_addr #2 {
 entry:
  ret { i32, i32, i32, i32 } { i32 -1, i32 0, i32 2147483647, i32 -2147483648 }
 }

 ; Function Attrs: nounwind
-define hidden i32 @main.u32tof32tou32(i32 %v, ptr %context) unnamed_addr #1 {
+define hidden i32 @main.u32tof32tou32(i32 %v, ptr %context) unnamed_addr #2 {
 entry:
  %0 = uitofp i32 %v to float
  %withinmax = fcmp ole float %0, 0x41EFFFFFC0000000
@@ -52,7 +55,7 @@ entry:
 }

 ; Function Attrs: nounwind
-define hidden float @main.f32tou32tof32(float %v, ptr %context) unnamed_addr #1 {
+define hidden float @main.f32tou32tof32(float %v, ptr %context) unnamed_addr #2 {
 entry:
  %positive = fcmp oge float %v, 0.000000e+00
  %withinmax = fcmp ole float %v, 0x41EFFFFFC0000000
@@ -65,7 +68,7 @@ entry:
 }

 ; Function Attrs: nounwind
-define hidden i8 @main.f32tou8(float %v, ptr %context) unnamed_addr #1 {
+define hidden i8 @main.f32tou8(float %v, ptr %context) unnamed_addr #2 {
 entry:
  %positive = fcmp oge float %v, 0.000000e+00
  %withinmax = fcmp ole float %v, 2.550000e+02
@@ -77,7 +80,7 @@ entry:
 }

 ; Function Attrs: nounwind
-define hidden i8 @main.f32toi8(float %v, ptr %context) unnamed_addr #1 {
+define hidden i8 @main.f32toi8(float %v, ptr %context) unnamed_addr #2 {
 entry:
  %abovemin = fcmp oge float %v, -1.280000e+02
  %belowmax = fcmp ole float %v, 1.270000e+02
@@ -90,5 +93,6 @@ entry:
  ret i8 %0
 }

-attributes #0 = { "target-features"="+bulk-memory,+bulk-memory-opt,+call-indirect-overlong,+mutable-globals,+nontrapping-fptoint,+sign-ext,-multivalue,-reference-types" }
-attributes #1 = { nounwind "target-features"="+bulk-memory,+bulk-memory-opt,+call-indirect-overlong,+mutable-globals,+nontrapping-fptoint,+sign-ext,-multivalue,-reference-types" }
+attributes #0 = { allockind("alloc,zeroed") allocsize(0) "alloc-family"="runtime.alloc" "target-features"="+bulk-memory,+mutable-globals,+nontrapping-fptoint,+sign-ext" }
+attributes #1 = { "target-features"="+bulk-memory,+mutable-globals,+nontrapping-fptoint,+sign-ext" }
+attributes #2 = { nounwind "target-features"="+bulk-memory,+mutable-globals,+nontrapping-fptoint,+sign-ext" }
@@ -1,46 +1,50 @@
 ; ModuleID = 'func.go'
 source_filename = "func.go"
-target datalayout = "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-i128:128-n32:64-S128-ni:1:10:20"
+target datalayout = "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-n32:64-S128-ni:1:10:20"
 target triple = "wasm32-unknown-wasi"

-declare void @runtime.trackPointer(ptr nocapture readonly, ptr, ptr) #0
+; Function Attrs: allockind("alloc,zeroed") allocsize(0)
+declare noalias nonnull ptr @runtime.alloc(i32, ptr, ptr) #0
+
+declare void @runtime.trackPointer(ptr nocapture readonly, ptr, ptr) #1

 ; Function Attrs: nounwind
-define hidden void @main.init(ptr %context) unnamed_addr #1 {
+define hidden void @main.init(ptr %context) unnamed_addr #2 {
 entry:
  ret void
 }

 ; Function Attrs: nounwind
-define hidden void @main.foo(ptr %callback.context, ptr %callback.funcptr, ptr %context) unnamed_addr #1 {
+define hidden void @main.foo(ptr %callback.context, ptr %callback.funcptr, ptr %context) unnamed_addr #2 {
 entry:
  %0 = icmp eq ptr %callback.funcptr, null
  br i1 %0, label %fpcall.throw, label %fpcall.next

 fpcall.next:                                      ; preds = %entry
-  call void %callback.funcptr(i32 3, ptr %callback.context) #2
+  call void %callback.funcptr(i32 3, ptr %callback.context) #3
  ret void

 fpcall.throw:                                     ; preds = %entry
-  call void @runtime.nilPanic(ptr undef) #2
+  call void @runtime.nilPanic(ptr undef) #3
  unreachable
 }

-declare void @runtime.nilPanic(ptr) #0
+declare void @runtime.nilPanic(ptr) #1

 ; Function Attrs: nounwind
-define hidden void @main.bar(ptr %context) unnamed_addr #1 {
+define hidden void @main.bar(ptr %context) unnamed_addr #2 {
 entry:
  call void @main.foo(ptr undef, ptr nonnull @main.someFunc, ptr undef)
  ret void
 }

 ; Function Attrs: nounwind
-define hidden void @main.someFunc(i32 %arg0, ptr %context) unnamed_addr #1 {
+define hidden void @main.someFunc(i32 %arg0, ptr %context) unnamed_addr #2 {
 entry:
  ret void
 }

-attributes #0 = { "target-features"="+bulk-memory,+bulk-memory-opt,+call-indirect-overlong,+mutable-globals,+nontrapping-fptoint,+sign-ext,-multivalue,-reference-types" }
-attributes #1 = { nounwind "target-features"="+bulk-memory,+bulk-memory-opt,+call-indirect-overlong,+mutable-globals,+nontrapping-fptoint,+sign-ext,-multivalue,-reference-types" }
-attributes #2 = { nounwind }
+attributes #0 = { allockind("alloc,zeroed") allocsize(0) "alloc-family"="runtime.alloc" "target-features"="+bulk-memory,+mutable-globals,+nontrapping-fptoint,+sign-ext" }
+attributes #1 = { "target-features"="+bulk-memory,+mutable-globals,+nontrapping-fptoint,+sign-ext" }
+attributes #2 = { nounwind "target-features"="+bulk-memory,+mutable-globals,+nontrapping-fptoint,+sign-ext" }
+attributes #3 = { nounwind }
@@ -24,10 +24,6 @@ var (
 		x *byte
 		y [61]uintptr
 	}
-	struct5 *struct {
-		x *byte
-		y [30]uintptr
-	}

 	slice1 []byte
 	slice2 []*int
@@ -62,10 +58,6 @@ func newStruct() {
 		x *byte
 		y [61]uintptr
 	})
-	struct5 = new(struct {
-		x *byte
-		y [30]uintptr
-	})
 }

 func newFuncValue() *func() {
@@ -1,6 +1,6 @@
 ; ModuleID = 'gc.go'
 source_filename = "gc.go"
-target datalayout = "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-i128:128-n32:64-S128-ni:1:10:20"
+target datalayout = "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-n32:64-S128-ni:1:10:20"
 target triple = "wasm32-unknown-wasi"

 %runtime._interface = type { ptr, ptr }
@@ -16,25 +16,27 @@ target triple = "wasm32-unknown-wasi"
@main.struct2 = hidden global ptr null, align 4
@main.struct3 = hidden global ptr null, align 4
@main.struct4 = hidden global ptr null, align 4
-@main.struct5 = hidden global ptr null, align 4
@main.slice1 = hidden global { ptr, i32, i32 } zeroinitializer, align 4
@main.slice2 = hidden global { ptr, i32, i32 } zeroinitializer, align 4
@main.slice3 = hidden global { ptr, i32, i32 } zeroinitializer, align 4
-@"runtime/gc.layout:62-0100000000000020" = linkonce_odr unnamed_addr constant { i32, [8 x i8] } { i32 62, [8 x i8] c"\01\00\00\00\00\00\00 " }
-@"runtime/gc.layout:62-0100000000000000" = linkonce_odr unnamed_addr constant { i32, [8 x i8] } { i32 62, [8 x i8] c"\01\00\00\00\00\00\00\00" }
+@"runtime/gc.layout:62-2000000000000001" = linkonce_odr unnamed_addr constant { i32, [8 x i8] } { i32 62, [8 x i8] c"\01\00\00\00\00\00\00 " }
+@"runtime/gc.layout:62-0001" = linkonce_odr unnamed_addr constant { i32, [8 x i8] } { i32 62, [8 x i8] c"\01\00\00\00\00\00\00\00" }
@"reflect/types.type:basic:complex128" = linkonce_odr constant { i8, ptr } { i8 80, ptr @"reflect/types.type:pointer:basic:complex128" }, align 4
@"reflect/types.type:pointer:basic:complex128" = linkonce_odr constant { i8, i16, ptr } { i8 -43, i16 0, ptr @"reflect/types.type:basic:complex128" }, align 4

-declare void @runtime.trackPointer(ptr nocapture readonly, ptr, ptr) #0
+; Function Attrs: allockind("alloc,zeroed") allocsize(0)
+declare noalias nonnull ptr @runtime.alloc(i32, ptr, ptr) #0
+
+declare void @runtime.trackPointer(ptr nocapture readonly, ptr, ptr) #1

 ; Function Attrs: nounwind
-define hidden void @main.init(ptr %context) unnamed_addr #1 {
+define hidden void @main.init(ptr %context) unnamed_addr #2 {
 entry:
  ret void
 }

 ; Function Attrs: nounwind
-define hidden void @main.newScalar(ptr %context) unnamed_addr #1 {
+define hidden void @main.newScalar(ptr %context) unnamed_addr #2 {
 entry:
  %stackalloc = alloca i8, align 1
  %new = call align 1 dereferenceable(1) ptr @runtime.alloc(i32 1, ptr nonnull inttoptr (i32 3 to ptr), ptr undef) #3
@@ -52,11 +54,8 @@ entry:
  ret void
 }

-; Function Attrs: allockind("alloc,zeroed") allocsize(0)
-declare noalias nonnull ptr @runtime.alloc(i32, ptr, ptr) #2
-
 ; Function Attrs: nounwind
-define hidden void @main.newArray(ptr %context) unnamed_addr #1 {
+define hidden void @main.newArray(ptr %context) unnamed_addr #2 {
 entry:
  %stackalloc = alloca i8, align 1
  %new = call align 1 dereferenceable(3) ptr @runtime.alloc(i32 3, ptr nonnull inttoptr (i32 3 to ptr), ptr undef) #3
@@ -72,7 +71,7 @@ entry:
 }

 ; Function Attrs: nounwind
-define hidden void @main.newStruct(ptr %context) unnamed_addr #1 {
+define hidden void @main.newStruct(ptr %context) unnamed_addr #2 {
 entry:
  %stackalloc = alloca i8, align 1
  %new = call align 1 ptr @runtime.alloc(i32 0, ptr nonnull inttoptr (i32 3 to ptr), ptr undef) #3
@@ -81,20 +80,17 @@ entry:
  %new1 = call align 4 dereferenceable(8) ptr @runtime.alloc(i32 8, ptr nonnull inttoptr (i32 3 to ptr), ptr undef) #3
  call void @runtime.trackPointer(ptr nonnull %new1, ptr nonnull %stackalloc, ptr undef) #3
  store ptr %new1, ptr @main.struct2, align 4
-  %new2 = call align 4 dereferenceable(248) ptr @runtime.alloc(i32 248, ptr nonnull @"runtime/gc.layout:62-0100000000000020", ptr undef) #3
+  %new2 = call align 4 dereferenceable(248) ptr @runtime.alloc(i32 248, ptr nonnull @"runtime/gc.layout:62-2000000000000001", ptr undef) #3
  call void @runtime.trackPointer(ptr nonnull %new2, ptr nonnull %stackalloc, ptr undef) #3
  store ptr %new2, ptr @main.struct3, align 4
-  %new3 = call align 4 dereferenceable(248) ptr @runtime.alloc(i32 248, ptr nonnull @"runtime/gc.layout:62-0100000000000000", ptr undef) #3
+  %new3 = call align 4 dereferenceable(248) ptr @runtime.alloc(i32 248, ptr nonnull @"runtime/gc.layout:62-0001", ptr undef) #3
  call void @runtime.trackPointer(ptr nonnull %new3, ptr nonnull %stackalloc, ptr undef) #3
  store ptr %new3, ptr @main.struct4, align 4
-  %new4 = call align 4 dereferenceable(124) ptr @runtime.alloc(i32 124, ptr nonnull inttoptr (i32 127 to ptr), ptr undef) #3
-  call void @runtime.trackPointer(ptr nonnull %new4, ptr nonnull %stackalloc, ptr undef) #3
-  store ptr %new4, ptr @main.struct5, align 4
  ret void
 }

 ; Function Attrs: nounwind
-define hidden ptr @main.newFuncValue(ptr %context) unnamed_addr #1 {
+define hidden ptr @main.newFuncValue(ptr %context) unnamed_addr #2 {
 entry:
  %stackalloc = alloca i8, align 1
  %new = call align 4 dereferenceable(8) ptr @runtime.alloc(i32 8, ptr nonnull inttoptr (i32 197 to ptr), ptr undef) #3
@@ -103,35 +99,35 @@ entry:
 }

 ; Function Attrs: nounwind
-define hidden void @main.makeSlice(ptr %context) unnamed_addr #1 {
+define hidden void @main.makeSlice(ptr %context) unnamed_addr #2 {
 entry:
  %stackalloc = alloca i8, align 1
  %makeslice = call align 1 dereferenceable(5) ptr @runtime.alloc(i32 5, ptr nonnull inttoptr (i32 3 to ptr), ptr undef) #3
  call void @runtime.trackPointer(ptr nonnull %makeslice, ptr nonnull %stackalloc, ptr undef) #3
  store ptr %makeslice, ptr @main.slice1, align 4
-  store i32 5, ptr getelementptr inbounds nuw (i8, ptr @main.slice1, i32 4), align 4
-  store i32 5, ptr getelementptr inbounds nuw (i8, ptr @main.slice1, i32 8), align 4
+  store i32 5, ptr getelementptr inbounds ({ ptr, i32, i32 }, ptr @main.slice1, i32 0, i32 1), align 4
+  store i32 5, ptr getelementptr inbounds ({ ptr, i32, i32 }, ptr @main.slice1, i32 0, i32 2), align 4
  %makeslice1 = call align 4 dereferenceable(20) ptr @runtime.alloc(i32 20, ptr nonnull inttoptr (i32 67 to ptr), ptr undef) #3
  call void @runtime.trackPointer(ptr nonnull %makeslice1, ptr nonnull %stackalloc, ptr undef) #3
  store ptr %makeslice1, ptr @main.slice2, align 4
-  store i32 5, ptr getelementptr inbounds nuw (i8, ptr @main.slice2, i32 4), align 4
-  store i32 5, ptr getelementptr inbounds nuw (i8, ptr @main.slice2, i32 8), align 4
+  store i32 5, ptr getelementptr inbounds ({ ptr, i32, i32 }, ptr @main.slice2, i32 0, i32 1), align 4
+  store i32 5, ptr getelementptr inbounds ({ ptr, i32, i32 }, ptr @main.slice2, i32 0, i32 2), align 4
  %makeslice3 = call align 4 dereferenceable(60) ptr @runtime.alloc(i32 60, ptr nonnull inttoptr (i32 71 to ptr), ptr undef) #3
  call void @runtime.trackPointer(ptr nonnull %makeslice3, ptr nonnull %stackalloc, ptr undef) #3
  store ptr %makeslice3, ptr @main.slice3, align 4
-  store i32 5, ptr getelementptr inbounds nuw (i8, ptr @main.slice3, i32 4), align 4
-  store i32 5, ptr getelementptr inbounds nuw (i8, ptr @main.slice3, i32 8), align 4
+  store i32 5, ptr getelementptr inbounds ({ ptr, i32, i32 }, ptr @main.slice3, i32 0, i32 1), align 4
+  store i32 5, ptr getelementptr inbounds ({ ptr, i32, i32 }, ptr @main.slice3, i32 0, i32 2), align 4
  ret void
 }

 ; Function Attrs: nounwind
-define hidden %runtime._interface @main.makeInterface(double %v.r, double %v.i, ptr %context) unnamed_addr #1 {
+define hidden %runtime._interface @main.makeInterface(double %v.r, double %v.i, ptr %context) unnamed_addr #2 {
 entry:
  %stackalloc = alloca i8, align 1
  %0 = call align 8 dereferenceable(16) ptr @runtime.alloc(i32 16, ptr null, ptr undef) #3
  call void @runtime.trackPointer(ptr nonnull %0, ptr nonnull %stackalloc, ptr undef) #3
  store double %v.r, ptr %0, align 8
-  %.repack1 = getelementptr inbounds nuw i8, ptr %0, i32 8
+  %.repack1 = getelementptr inbounds { double, double }, ptr %0, i32 0, i32 1
  store double %v.i, ptr %.repack1, align 8
  %1 = insertvalue %runtime._interface { ptr @"reflect/types.type:basic:complex128", ptr undef }, ptr %0, 1
  call void @runtime.trackPointer(ptr nonnull @"reflect/types.type:basic:complex128", ptr nonnull %stackalloc, ptr undef) #3
@@ -139,7 +135,7 @@ entry:
  ret %runtime._interface %1
 }

-attributes #0 = { "target-features"="+bulk-memory,+bulk-memory-opt,+call-indirect-overlong,+mutable-globals,+nontrapping-fptoint,+sign-ext,-multivalue,-reference-types" }
-attributes #1 = { nounwind "target-features"="+bulk-memory,+bulk-memory-opt,+call-indirect-overlong,+mutable-globals,+nontrapping-fptoint,+sign-ext,-multivalue,-reference-types" }
-attributes #2 = { allockind("alloc,zeroed") allocsize(0) "alloc-family"="runtime.alloc" "target-features"="+bulk-memory,+bulk-memory-opt,+call-indirect-overlong,+mutable-globals,+nontrapping-fptoint,+sign-ext,-multivalue,-reference-types" }
+attributes #0 = { allockind("alloc,zeroed") allocsize(0) "alloc-family"="runtime.alloc" "target-features"="+bulk-memory,+mutable-globals,+nontrapping-fptoint,+sign-ext" }
+attributes #1 = { "target-features"="+bulk-memory,+mutable-globals,+nontrapping-fptoint,+sign-ext" }
+attributes #2 = { nounwind "target-features"="+bulk-memory,+mutable-globals,+nontrapping-fptoint,+sign-ext" }
 attributes #3 = { nounwind }
@@ -1,78 +1,144 @@
 ; ModuleID = 'generics.go'
 source_filename = "generics.go"
-target datalayout = "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-i128:128-n32:64-S128-ni:1:10:20"
+target datalayout = "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-n32:64-S128-ni:1:10:20"
 target triple = "wasm32-unknown-wasi"

-%"main.Point[float32]" = type { float, float }
 %"main.Point[int]" = type { i32, i32 }
+%"main.Point[float32]" = type { float, float }

-declare void @runtime.trackPointer(ptr nocapture readonly, ptr, ptr) #0
+declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*) #0
+
+declare void @runtime.trackPointer(i8* nocapture readonly, i8*) #0

 ; Function Attrs: nounwind
-define hidden void @main.init(ptr %context) unnamed_addr #1 {
+define hidden void @main.init(i8* %context) unnamed_addr #1 {
 entry:
  ret void
 }

 ; Function Attrs: nounwind
-define hidden void @main.main(ptr %context) unnamed_addr #1 {
+define hidden void @main.main(i8* %context) unnamed_addr #1 {
 entry:
-  %0 = call %"main.Point[float32]" @"main.Add[float32]"(float 0.000000e+00, float 0.000000e+00, float 0.000000e+00, float 0.000000e+00, ptr undef)
-  %1 = call %"main.Point[int]" @"main.Add[int]"(i32 0, i32 0, i32 0, i32 0, ptr undef)
+  %bi = alloca %"main.Point[int]", align 8
+  %ai = alloca %"main.Point[int]", align 8
+  %bf = alloca %"main.Point[float32]", align 8
+  %af = alloca %"main.Point[float32]", align 8
+  %af.repack = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %af, i32 0, i32 0
+  store float 0.000000e+00, float* %af.repack, align 8
+  %af.repack1 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %af, i32 0, i32 1
+  store float 0.000000e+00, float* %af.repack1, align 4
+  %0 = bitcast %"main.Point[float32]"* %af to i8*
+  call void @runtime.trackPointer(i8* nonnull %0, i8* undef) #2
+  %bf.repack = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %bf, i32 0, i32 0
+  store float 0.000000e+00, float* %bf.repack, align 8
+  %bf.repack2 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %bf, i32 0, i32 1
+  store float 0.000000e+00, float* %bf.repack2, align 4
+  %1 = bitcast %"main.Point[float32]"* %bf to i8*
+  call void @runtime.trackPointer(i8* nonnull %1, i8* undef) #2
+  %.elt = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %af, i32 0, i32 0
+  %.unpack = load float, float* %.elt, align 8
+  %.elt3 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %af, i32 0, i32 1
+  %.unpack4 = load float, float* %.elt3, align 4
+  %.elt5 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %bf, i32 0, i32 0
+  %.unpack6 = load float, float* %.elt5, align 8
+  %.elt7 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %bf, i32 0, i32 1
+  %.unpack8 = load float, float* %.elt7, align 4
+  %2 = call %"main.Point[float32]" @"main.Add[float32]"(float %.unpack, float %.unpack4, float %.unpack6, float %.unpack8, i8* undef)
+  %ai.repack = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %ai, i32 0, i32 0
+  store i32 0, i32* %ai.repack, align 8
+  %ai.repack9 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %ai, i32 0, i32 1
+  store i32 0, i32* %ai.repack9, align 4
+  %3 = bitcast %"main.Point[int]"* %ai to i8*
+  call void @runtime.trackPointer(i8* nonnull %3, i8* undef) #2
+  %bi.repack = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %bi, i32 0, i32 0
+  store i32 0, i32* %bi.repack, align 8
+  %bi.repack10 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %bi, i32 0, i32 1
+  store i32 0, i32* %bi.repack10, align 4
+  %4 = bitcast %"main.Point[int]"* %bi to i8*
+  call void @runtime.trackPointer(i8* nonnull %4, i8* undef) #2
+  %.elt11 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %ai, i32 0, i32 0
+  %.unpack12 = load i32, i32* %.elt11, align 8
+  %.elt13 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %ai, i32 0, i32 1
+  %.unpack14 = load i32, i32* %.elt13, align 4
+  %.elt15 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %bi, i32 0, i32 0
+  %.unpack16 = load i32, i32* %.elt15, align 8
+  %.elt17 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %bi, i32 0, i32 1
+  %.unpack18 = load i32, i32* %.elt17, align 4
+  %5 = call %"main.Point[int]" @"main.Add[int]"(i32 %.unpack12, i32 %.unpack14, i32 %.unpack16, i32 %.unpack18, i8* undef)
  ret void
 }

 ; Function Attrs: nounwind
-define linkonce_odr hidden %"main.Point[float32]" @"main.Add[float32]"(float %a.X, float %a.Y, float %b.X, float %b.Y, ptr %context) unnamed_addr #1 {
+define linkonce_odr hidden %"main.Point[float32]" @"main.Add[float32]"(float %a.X, float %a.Y, float %b.X, float %b.Y, i8* %context) unnamed_addr #1 {
 entry:
-  %stackalloc = alloca i8, align 1
-  %a = call align 4 dereferenceable(8) ptr @runtime.alloc(i32 8, ptr nonnull inttoptr (i32 3 to ptr), ptr undef) #3
-  call void @runtime.trackPointer(ptr nonnull %a, ptr nonnull %stackalloc, ptr undef) #3
-  store float %a.X, ptr %a, align 4
-  %a.repack9 = getelementptr inbounds nuw i8, ptr %a, i32 4
-  store float %a.Y, ptr %a.repack9, align 4
-  %b = call align 4 dereferenceable(8) ptr @runtime.alloc(i32 8, ptr nonnull inttoptr (i32 3 to ptr), ptr undef) #3
-  call void @runtime.trackPointer(ptr nonnull %b, ptr nonnull %stackalloc, ptr undef) #3
-  store float %b.X, ptr %b, align 4
-  %b.repack11 = getelementptr inbounds nuw i8, ptr %b, i32 4
-  store float %b.Y, ptr %b.repack11, align 4
-  call void @main.checkSize(i32 4, ptr undef) #3
-  call void @main.checkSize(i32 8, ptr undef) #3
-  %complit = call align 4 dereferenceable(8) ptr @runtime.alloc(i32 8, ptr nonnull inttoptr (i32 3 to ptr), ptr undef) #3
-  call void @runtime.trackPointer(ptr nonnull %complit, ptr nonnull %stackalloc, ptr undef) #3
+  %complit = alloca %"main.Point[float32]", align 8
+  %b = alloca %"main.Point[float32]", align 8
+  %a = alloca %"main.Point[float32]", align 8
+  %a.repack = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %a, i32 0, i32 0
+  store float 0.000000e+00, float* %a.repack, align 8
+  %a.repack9 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %a, i32 0, i32 1
+  store float 0.000000e+00, float* %a.repack9, align 4
+  %0 = bitcast %"main.Point[float32]"* %a to i8*
+  call void @runtime.trackPointer(i8* nonnull %0, i8* undef) #2
+  %a.repack10 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %a, i32 0, i32 0
+  store float %a.X, float* %a.repack10, align 8
+  %a.repack11 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %a, i32 0, i32 1
+  store float %a.Y, float* %a.repack11, align 4
+  %b.repack = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %b, i32 0, i32 0
+  store float 0.000000e+00, float* %b.repack, align 8
+  %b.repack13 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %b, i32 0, i32 1
+  store float 0.000000e+00, float* %b.repack13, align 4
+  %1 = bitcast %"main.Point[float32]"* %b to i8*
+  call void @runtime.trackPointer(i8* nonnull %1, i8* undef) #2
+  %b.repack14 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %b, i32 0, i32 0
+  store float %b.X, float* %b.repack14, align 8
+  %b.repack15 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %b, i32 0, i32 1
+  store float %b.Y, float* %b.repack15, align 4
+  call void @main.checkSize(i32 4, i8* undef) #2
+  call void @main.checkSize(i32 8, i8* undef) #2
+  %complit.repack = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %complit, i32 0, i32 0
+  store float 0.000000e+00, float* %complit.repack, align 8
+  %complit.repack17 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %complit, i32 0, i32 1
+  store float 0.000000e+00, float* %complit.repack17, align 4
+  %2 = bitcast %"main.Point[float32]"* %complit to i8*
+  call void @runtime.trackPointer(i8* nonnull %2, i8* undef) #2
+  %3 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %complit, i32 0, i32 0
  br i1 false, label %deref.throw, label %deref.next

 deref.next:                                       ; preds = %entry
  br i1 false, label %deref.throw1, label %deref.next2

 deref.next2:                                      ; preds = %deref.next
-  %0 = load float, ptr %a, align 4
-  %1 = load float, ptr %b, align 4
-  %2 = fadd float %0, %1
+  %4 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %b, i32 0, i32 0
+  %5 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %a, i32 0, i32 0
+  %6 = load float, float* %5, align 8
+  %7 = load float, float* %4, align 8
+  %8 = fadd float %6, %7
  br i1 false, label %deref.throw3, label %deref.next4

 deref.next4:                                      ; preds = %deref.next2
  br i1 false, label %deref.throw5, label %deref.next6

 deref.next6:                                      ; preds = %deref.next4
-  %3 = getelementptr inbounds nuw i8, ptr %b, i32 4
-  %4 = getelementptr inbounds nuw i8, ptr %a, i32 4
-  %5 = load float, ptr %4, align 4
-  %6 = load float, ptr %3, align 4
+  %9 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %b, i32 0, i32 1
+  %10 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %a, i32 0, i32 1
+  %11 = load float, float* %10, align 4
+  %12 = load float, float* %9, align 4
  br i1 false, label %store.throw, label %store.next

 store.next:                                       ; preds = %deref.next6
-  store float %2, ptr %complit, align 4
+  store float %8, float* %3, align 8
  br i1 false, label %store.throw7, label %store.next8

 store.next8:                                      ; preds = %store.next
-  %7 = getelementptr inbounds nuw i8, ptr %complit, i32 4
-  %8 = fadd float %5, %6
-  store float %8, ptr %7, align 4
-  %.unpack = load float, ptr %complit, align 4
-  %9 = insertvalue %"main.Point[float32]" poison, float %.unpack, 0
-  %10 = insertvalue %"main.Point[float32]" %9, float %8, 1
-  ret %"main.Point[float32]" %10
+  %13 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %complit, i32 0, i32 1
+  %14 = fadd float %11, %12
+  store float %14, float* %13, align 4
+  %.elt = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %complit, i32 0, i32 0
+  %.unpack = load float, float* %.elt, align 8
+  %15 = insertvalue %"main.Point[float32]" undef, float %.unpack, 0
+  %16 = insertvalue %"main.Point[float32]" %15, float %14, 1
+  ret %"main.Point[float32]" %16

 deref.throw:                                      ; preds = %entry
  unreachable
@@ -93,64 +159,81 @@ store.throw7:                                     ; preds = %store.next
  unreachable
 }

-; Function Attrs: allockind("alloc,zeroed") allocsize(0)
-declare noalias nonnull ptr @runtime.alloc(i32, ptr, ptr) #2
+declare void @main.checkSize(i32, i8*) #0

-declare void @main.checkSize(i32, ptr) #0
-
-declare void @runtime.nilPanic(ptr) #0
+declare void @runtime.nilPanic(i8*) #0

 ; Function Attrs: nounwind
-define linkonce_odr hidden %"main.Point[int]" @"main.Add[int]"(i32 %a.X, i32 %a.Y, i32 %b.X, i32 %b.Y, ptr %context) unnamed_addr #1 {
+define linkonce_odr hidden %"main.Point[int]" @"main.Add[int]"(i32 %a.X, i32 %a.Y, i32 %b.X, i32 %b.Y, i8* %context) unnamed_addr #1 {
 entry:
-  %stackalloc = alloca i8, align 1
-  %a = call align 4 dereferenceable(8) ptr @runtime.alloc(i32 8, ptr nonnull inttoptr (i32 3 to ptr), ptr undef) #3
-  call void @runtime.trackPointer(ptr nonnull %a, ptr nonnull %stackalloc, ptr undef) #3
-  store i32 %a.X, ptr %a, align 4
-  %a.repack9 = getelementptr inbounds nuw i8, ptr %a, i32 4
-  store i32 %a.Y, ptr %a.repack9, align 4
-  %b = call align 4 dereferenceable(8) ptr @runtime.alloc(i32 8, ptr nonnull inttoptr (i32 3 to ptr), ptr undef) #3
-  call void @runtime.trackPointer(ptr nonnull %b, ptr nonnull %stackalloc, ptr undef) #3
-  store i32 %b.X, ptr %b, align 4
-  %b.repack11 = getelementptr inbounds nuw i8, ptr %b, i32 4
-  store i32 %b.Y, ptr %b.repack11, align 4
-  call void @main.checkSize(i32 4, ptr undef) #3
-  call void @main.checkSize(i32 8, ptr undef) #3
-  %complit = call align 4 dereferenceable(8) ptr @runtime.alloc(i32 8, ptr nonnull inttoptr (i32 3 to ptr), ptr undef) #3
-  call void @runtime.trackPointer(ptr nonnull %complit, ptr nonnull %stackalloc, ptr undef) #3
+  %complit = alloca %"main.Point[int]", align 8
+  %b = alloca %"main.Point[int]", align 8
+  %a = alloca %"main.Point[int]", align 8
+  %a.repack = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %a, i32 0, i32 0
+  store i32 0, i32* %a.repack, align 8
+  %a.repack9 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %a, i32 0, i32 1
+  store i32 0, i32* %a.repack9, align 4
+  %0 = bitcast %"main.Point[int]"* %a to i8*
+  call void @runtime.trackPointer(i8* nonnull %0, i8* undef) #2
+  %a.repack10 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %a, i32 0, i32 0
+  store i32 %a.X, i32* %a.repack10, align 8
+  %a.repack11 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %a, i32 0, i32 1
+  store i32 %a.Y, i32* %a.repack11, align 4
+  %b.repack = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %b, i32 0, i32 0
+  store i32 0, i32* %b.repack, align 8
+  %b.repack13 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %b, i32 0, i32 1
+  store i32 0, i32* %b.repack13, align 4
+  %1 = bitcast %"main.Point[int]"* %b to i8*
+  call void @runtime.trackPointer(i8* nonnull %1, i8* undef) #2
+  %b.repack14 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %b, i32 0, i32 0
+  store i32 %b.X, i32* %b.repack14, align 8
+  %b.repack15 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %b, i32 0, i32 1
+  store i32 %b.Y, i32* %b.repack15, align 4
+  call void @main.checkSize(i32 4, i8* undef) #2
+  call void @main.checkSize(i32 8, i8* undef) #2
+  %complit.repack = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %complit, i32 0, i32 0
+  store i32 0, i32* %complit.repack, align 8
+  %complit.repack17 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %complit, i32 0, i32 1
+  store i32 0, i32* %complit.repack17, align 4
+  %2 = bitcast %"main.Point[int]"* %complit to i8*
+  call void @runtime.trackPointer(i8* nonnull %2, i8* undef) #2
+  %3 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %complit, i32 0, i32 0
  br i1 false, label %deref.throw, label %deref.next

 deref.next:                                       ; preds = %entry
  br i1 false, label %deref.throw1, label %deref.next2

 deref.next2:                                      ; preds = %deref.next
-  %0 = load i32, ptr %a, align 4
-  %1 = load i32, ptr %b, align 4
-  %2 = add i32 %0, %1
+  %4 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %b, i32 0, i32 0
+  %5 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %a, i32 0, i32 0
+  %6 = load i32, i32* %5, align 8
+  %7 = load i32, i32* %4, align 8
+  %8 = add i32 %6, %7
  br i1 false, label %deref.throw3, label %deref.next4

 deref.next4:                                      ; preds = %deref.next2
  br i1 false, label %deref.throw5, label %deref.next6

 deref.next6:                                      ; preds = %deref.next4
-  %3 = getelementptr inbounds nuw i8, ptr %b, i32 4
-  %4 = getelementptr inbounds nuw i8, ptr %a, i32 4
-  %5 = load i32, ptr %4, align 4
-  %6 = load i32, ptr %3, align 4
+  %9 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %b, i32 0, i32 1
+  %10 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %a, i32 0, i32 1
+  %11 = load i32, i32* %10, align 4
+  %12 = load i32, i32* %9, align 4
  br i1 false, label %store.throw, label %store.next

 store.next:                                       ; preds = %deref.next6
-  store i32 %2, ptr %complit, align 4
+  store i32 %8, i32* %3, align 8
  br i1 false, label %store.throw7, label %store.next8

 store.next8:                                      ; preds = %store.next
-  %7 = getelementptr inbounds nuw i8, ptr %complit, i32 4
-  %8 = add i32 %5, %6
-  store i32 %8, ptr %7, align 4
-  %.unpack = load i32, ptr %complit, align 4
-  %9 = insertvalue %"main.Point[int]" poison, i32 %.unpack, 0
-  %10 = insertvalue %"main.Point[int]" %9, i32 %8, 1
-  ret %"main.Point[int]" %10
+  %13 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %complit, i32 0, i32 1
+  %14 = add i32 %11, %12
+  store i32 %14, i32* %13, align 4
+  %.elt = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %complit, i32 0, i32 0
+  %.unpack = load i32, i32* %.elt, align 8
+  %15 = insertvalue %"main.Point[int]" undef, i32 %.unpack, 0
+  %16 = insertvalue %"main.Point[int]" %15, i32 %14, 1
+  ret %"main.Point[int]" %16

 deref.throw:                                      ; preds = %entry
  unreachable
@@ -171,7 +254,6 @@ store.throw7:                                     ; preds = %store.next
  unreachable
 }

-attributes #0 = { "target-features"="+bulk-memory,+bulk-memory-opt,+call-indirect-overlong,+mutable-globals,+nontrapping-fptoint,+sign-ext,-multivalue,-reference-types" }
-attributes #1 = { nounwind "target-features"="+bulk-memory,+bulk-memory-opt,+call-indirect-overlong,+mutable-globals,+nontrapping-fptoint,+sign-ext,-multivalue,-reference-types" }
-attributes #2 = { allockind("alloc,zeroed") allocsize(0) "alloc-family"="runtime.alloc" "target-features"="+bulk-memory,+bulk-memory-opt,+call-indirect-overlong,+mutable-globals,+nontrapping-fptoint,+sign-ext,-multivalue,-reference-types" }
-attributes #3 = { nounwind }
+attributes #0 = { "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
+attributes #1 = { nounwind "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
+attributes #2 = { nounwind }
@@ -1,28 +1,31 @@
 ; ModuleID = 'go1.20.go'
 source_filename = "go1.20.go"
-target datalayout = "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-i128:128-n32:64-S128-ni:1:10:20"
+target datalayout = "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-n32:64-S128-ni:1:10:20"
 target triple = "wasm32-unknown-wasi"

 %runtime._string = type { ptr, i32 }

-declare void @runtime.trackPointer(ptr nocapture readonly, ptr, ptr) #0
+; Function Attrs: allockind("alloc,zeroed") allocsize(0)
+declare noalias nonnull ptr @runtime.alloc(i32, ptr, ptr) #0
+
+declare void @runtime.trackPointer(ptr nocapture readonly, ptr, ptr) #1

 ; Function Attrs: nounwind
-define hidden void @main.init(ptr %context) unnamed_addr #1 {
+define hidden void @main.init(ptr %context) unnamed_addr #2 {
 entry:
  ret void
 }

 ; Function Attrs: nounwind
-define hidden ptr @main.unsafeSliceData(ptr %s.data, i32 %s.len, i32 %s.cap, ptr %context) unnamed_addr #1 {
+define hidden ptr @main.unsafeSliceData(ptr %s.data, i32 %s.len, i32 %s.cap, ptr %context) unnamed_addr #2 {
 entry:
  %stackalloc = alloca i8, align 1
-  call void @runtime.trackPointer(ptr %s.data, ptr nonnull %stackalloc, ptr undef) #2
+  call void @runtime.trackPointer(ptr %s.data, ptr nonnull %stackalloc, ptr undef) #3
  ret ptr %s.data
 }

 ; Function Attrs: nounwind
-define hidden %runtime._string @main.unsafeString(ptr dereferenceable_or_null(1) %ptr, i16 %len, ptr %context) unnamed_addr #1 {
+define hidden %runtime._string @main.unsafeString(ptr dereferenceable_or_null(1) %ptr, i16 %len, ptr %context) unnamed_addr #2 {
 entry:
  %stackalloc = alloca i8, align 1
  %0 = icmp slt i16 %len, 0
@@ -33,27 +36,28 @@ entry:
  br i1 %4, label %unsafe.String.throw, label %unsafe.String.next

 unsafe.String.next:                               ; preds = %entry
-  %5 = zext nneg i16 %len to i32
+  %5 = zext i16 %len to i32
  %6 = insertvalue %runtime._string undef, ptr %ptr, 0
  %7 = insertvalue %runtime._string %6, i32 %5, 1
-  call void @runtime.trackPointer(ptr %ptr, ptr nonnull %stackalloc, ptr undef) #2
+  call void @runtime.trackPointer(ptr %ptr, ptr nonnull %stackalloc, ptr undef) #3
  ret %runtime._string %7

 unsafe.String.throw:                              ; preds = %entry
-  call void @runtime.unsafeSlicePanic(ptr undef) #2
+  call void @runtime.unsafeSlicePanic(ptr undef) #3
  unreachable
 }

-declare void @runtime.unsafeSlicePanic(ptr) #0
+declare void @runtime.unsafeSlicePanic(ptr) #1

 ; Function Attrs: nounwind
-define hidden ptr @main.unsafeStringData(ptr readonly %s.data, i32 %s.len, ptr %context) unnamed_addr #1 {
+define hidden ptr @main.unsafeStringData(ptr %s.data, i32 %s.len, ptr %context) unnamed_addr #2 {
 entry:
  %stackalloc = alloca i8, align 1
-  call void @runtime.trackPointer(ptr %s.data, ptr nonnull %stackalloc, ptr undef) #2
+  call void @runtime.trackPointer(ptr %s.data, ptr nonnull %stackalloc, ptr undef) #3
  ret ptr %s.data
 }

-attributes #0 = { "target-features"="+bulk-memory,+bulk-memory-opt,+call-indirect-overlong,+mutable-globals,+nontrapping-fptoint,+sign-ext,-multivalue,-reference-types" }
-attributes #1 = { nounwind "target-features"="+bulk-memory,+bulk-memory-opt,+call-indirect-overlong,+mutable-globals,+nontrapping-fptoint,+sign-ext,-multivalue,-reference-types" }
-attributes #2 = { nounwind }
+attributes #0 = { allockind("alloc,zeroed") allocsize(0) "alloc-family"="runtime.alloc" "target-features"="+bulk-memory,+mutable-globals,+nontrapping-fptoint,+sign-ext" }
+attributes #1 = { "target-features"="+bulk-memory,+mutable-globals,+nontrapping-fptoint,+sign-ext" }
+attributes #2 = { nounwind "target-features"="+bulk-memory,+mutable-globals,+nontrapping-fptoint,+sign-ext" }
+attributes #3 = { nounwind }
@@ -1,36 +1,36 @@
 ; ModuleID = 'go1.21.go'
 source_filename = "go1.21.go"
-target datalayout = "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-i128:128-n32:64-S128-ni:1:10:20"
+target datalayout = "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-n32:64-S128-ni:1:10:20"
 target triple = "wasm32-unknown-wasi"

 %runtime._string = type { ptr, i32 }

-declare void @runtime.trackPointer(ptr nocapture readonly, ptr, ptr) #0
+; Function Attrs: allockind("alloc,zeroed") allocsize(0)
+declare noalias nonnull ptr @runtime.alloc(i32, ptr, ptr) #0
+
+declare void @runtime.trackPointer(ptr nocapture readonly, ptr, ptr) #1

 ; Function Attrs: nounwind
-define hidden void @main.init(ptr %context) unnamed_addr #1 {
+define hidden void @main.init(ptr %context) unnamed_addr #2 {
 entry:
  ret void
 }

 ; Function Attrs: nounwind
-define hidden i32 @main.min1(i32 %a, ptr %context) unnamed_addr #1 {
+define hidden i32 @main.min1(i32 %a, ptr %context) unnamed_addr #2 {
 entry:
  ret i32 %a
 }

-; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none)
-declare i32 @llvm.smin.i32(i32, i32) #2
-
 ; Function Attrs: nounwind
-define hidden i32 @main.min2(i32 %a, i32 %b, ptr %context) unnamed_addr #1 {
+define hidden i32 @main.min2(i32 %a, i32 %b, ptr %context) unnamed_addr #2 {
 entry:
  %0 = call i32 @llvm.smin.i32(i32 %a, i32 %b)
  ret i32 %0
 }

 ; Function Attrs: nounwind
-define hidden i32 @main.min3(i32 %a, i32 %b, i32 %c, ptr %context) unnamed_addr #1 {
+define hidden i32 @main.min3(i32 %a, i32 %b, i32 %c, ptr %context) unnamed_addr #2 {
 entry:
  %0 = call i32 @llvm.smin.i32(i32 %a, i32 %b)
  %1 = call i32 @llvm.smin.i32(i32 %0, i32 %c)
@@ -38,7 +38,7 @@ entry:
 }

 ; Function Attrs: nounwind
-define hidden i32 @main.min4(i32 %a, i32 %b, i32 %c, i32 %d, ptr %context) unnamed_addr #1 {
+define hidden i32 @main.min4(i32 %a, i32 %b, i32 %c, i32 %d, ptr %context) unnamed_addr #2 {
 entry:
  %0 = call i32 @llvm.smin.i32(i32 %a, i32 %b)
  %1 = call i32 @llvm.smin.i32(i32 %0, i32 %c)
@@ -47,109 +47,91 @@ entry:
 }

 ; Function Attrs: nounwind
-define hidden i8 @main.minUint8(i8 %a, i8 %b, ptr %context) unnamed_addr #1 {
+define hidden i8 @main.minUint8(i8 %a, i8 %b, ptr %context) unnamed_addr #2 {
 entry:
  %0 = call i8 @llvm.umin.i8(i8 %a, i8 %b)
  ret i8 %0
 }

-; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none)
-declare i8 @llvm.umin.i8(i8, i8) #2
-
 ; Function Attrs: nounwind
-define hidden i32 @main.minUnsigned(i32 %a, i32 %b, ptr %context) unnamed_addr #1 {
+define hidden i32 @main.minUnsigned(i32 %a, i32 %b, ptr %context) unnamed_addr #2 {
 entry:
  %0 = call i32 @llvm.umin.i32(i32 %a, i32 %b)
  ret i32 %0
 }

-; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none)
-declare i32 @llvm.umin.i32(i32, i32) #2
-
 ; Function Attrs: nounwind
-define hidden float @main.minFloat32(float %a, float %b, ptr %context) unnamed_addr #1 {
+define hidden float @main.minFloat32(float %a, float %b, ptr %context) unnamed_addr #2 {
 entry:
-  %0 = call float @llvm.minimum.f32(float %a, float %b)
-  ret float %0
+  %0 = fcmp olt float %a, %b
+  %1 = select i1 %0, float %a, float %b
+  ret float %1
 }

-; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none)
-declare float @llvm.minimum.f32(float, float) #2
-
 ; Function Attrs: nounwind
-define hidden double @main.minFloat64(double %a, double %b, ptr %context) unnamed_addr #1 {
+define hidden double @main.minFloat64(double %a, double %b, ptr %context) unnamed_addr #2 {
 entry:
-  %0 = call double @llvm.minimum.f64(double %a, double %b)
-  ret double %0
+  %0 = fcmp olt double %a, %b
+  %1 = select i1 %0, double %a, double %b
+  ret double %1
 }

-; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none)
-declare double @llvm.minimum.f64(double, double) #2
-
 ; Function Attrs: nounwind
-define hidden %runtime._string @main.minString(ptr readonly %a.data, i32 %a.len, ptr readonly %b.data, i32 %b.len, ptr %context) unnamed_addr #1 {
+define hidden %runtime._string @main.minString(ptr %a.data, i32 %a.len, ptr %b.data, i32 %b.len, ptr %context) unnamed_addr #2 {
 entry:
  %0 = insertvalue %runtime._string zeroinitializer, ptr %a.data, 0
  %1 = insertvalue %runtime._string %0, i32 %a.len, 1
  %2 = insertvalue %runtime._string zeroinitializer, ptr %b.data, 0
  %3 = insertvalue %runtime._string %2, i32 %b.len, 1
  %stackalloc = alloca i8, align 1
-  %4 = call i1 @runtime.stringLess(ptr %a.data, i32 %a.len, ptr %b.data, i32 %b.len, ptr undef) #4
+  %4 = call i1 @runtime.stringLess(ptr %a.data, i32 %a.len, ptr %b.data, i32 %b.len, ptr undef) #5
  %5 = select i1 %4, %runtime._string %1, %runtime._string %3
-  %6 = select i1 %4, ptr %a.data, ptr %b.data
-  call void @runtime.trackPointer(ptr %6, ptr nonnull %stackalloc, ptr undef) #4
+  %6 = extractvalue %runtime._string %5, 0
+  call void @runtime.trackPointer(ptr %6, ptr nonnull %stackalloc, ptr undef) #5
  ret %runtime._string %5
 }

-declare i1 @runtime.stringLess(ptr readonly, i32, ptr readonly, i32, ptr) #0
+declare i1 @runtime.stringLess(ptr, i32, ptr, i32, ptr) #1

 ; Function Attrs: nounwind
-define hidden i32 @main.maxInt(i32 %a, i32 %b, ptr %context) unnamed_addr #1 {
+define hidden i32 @main.maxInt(i32 %a, i32 %b, ptr %context) unnamed_addr #2 {
 entry:
  %0 = call i32 @llvm.smax.i32(i32 %a, i32 %b)
  ret i32 %0
 }

-; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none)
-declare i32 @llvm.smax.i32(i32, i32) #2
-
 ; Function Attrs: nounwind
-define hidden i32 @main.maxUint(i32 %a, i32 %b, ptr %context) unnamed_addr #1 {
+define hidden i32 @main.maxUint(i32 %a, i32 %b, ptr %context) unnamed_addr #2 {
 entry:
  %0 = call i32 @llvm.umax.i32(i32 %a, i32 %b)
  ret i32 %0
 }

-; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none)
-declare i32 @llvm.umax.i32(i32, i32) #2
-
 ; Function Attrs: nounwind
-define hidden float @main.maxFloat32(float %a, float %b, ptr %context) unnamed_addr #1 {
+define hidden float @main.maxFloat32(float %a, float %b, ptr %context) unnamed_addr #2 {
 entry:
-  %0 = call float @llvm.maximum.f32(float %a, float %b)
-  ret float %0
+  %0 = fcmp ogt float %a, %b
+  %1 = select i1 %0, float %a, float %b
+  ret float %1
 }

-; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none)
-declare float @llvm.maximum.f32(float, float) #2
-
 ; Function Attrs: nounwind
-define hidden %runtime._string @main.maxString(ptr readonly %a.data, i32 %a.len, ptr readonly %b.data, i32 %b.len, ptr %context) unnamed_addr #1 {
+define hidden %runtime._string @main.maxString(ptr %a.data, i32 %a.len, ptr %b.data, i32 %b.len, ptr %context) unnamed_addr #2 {
 entry:
  %0 = insertvalue %runtime._string zeroinitializer, ptr %a.data, 0
  %1 = insertvalue %runtime._string %0, i32 %a.len, 1
  %2 = insertvalue %runtime._string zeroinitializer, ptr %b.data, 0
  %3 = insertvalue %runtime._string %2, i32 %b.len, 1
  %stackalloc = alloca i8, align 1
-  %4 = call i1 @runtime.stringLess(ptr %b.data, i32 %b.len, ptr %a.data, i32 %a.len, ptr undef) #4
+  %4 = call i1 @runtime.stringLess(ptr %b.data, i32 %b.len, ptr %a.data, i32 %a.len, ptr undef) #5
  %5 = select i1 %4, %runtime._string %1, %runtime._string %3
-  %6 = select i1 %4, ptr %a.data, ptr %b.data
-  call void @runtime.trackPointer(ptr %6, ptr nonnull %stackalloc, ptr undef) #4
+  %6 = extractvalue %runtime._string %5, 0
+  call void @runtime.trackPointer(ptr %6, ptr nonnull %stackalloc, ptr undef) #5
  ret %runtime._string %5
 }

 ; Function Attrs: nounwind
-define hidden void @main.clearSlice(ptr %s.data, i32 %s.len, i32 %s.cap, ptr %context) unnamed_addr #1 {
+define hidden void @main.clearSlice(ptr %s.data, i32 %s.len, i32 %s.cap, ptr %context) unnamed_addr #2 {
 entry:
  %0 = shl i32 %s.len, 2
  call void @llvm.memset.p0.i32(ptr align 4 %s.data, i8 0, i32 %0, i1 false)
@@ -160,22 +142,38 @@ entry:
 declare void @llvm.memset.p0.i32(ptr nocapture writeonly, i8, i32, i1 immarg) #3

 ; Function Attrs: nounwind
-define hidden void @main.clearZeroSizedSlice(ptr %s.data, i32 %s.len, i32 %s.cap, ptr %context) unnamed_addr #1 {
+define hidden void @main.clearZeroSizedSlice(ptr %s.data, i32 %s.len, i32 %s.cap, ptr %context) unnamed_addr #2 {
 entry:
  ret void
 }

 ; Function Attrs: nounwind
-define hidden void @main.clearMap(ptr dereferenceable_or_null(48) %m, ptr %context) unnamed_addr #1 {
+define hidden void @main.clearMap(ptr dereferenceable_or_null(40) %m, ptr %context) unnamed_addr #2 {
 entry:
-  call void @runtime.hashmapClear(ptr %m, ptr undef) #4
+  call void @runtime.hashmapClear(ptr %m, ptr undef) #5
  ret void
 }

-declare void @runtime.hashmapClear(ptr dereferenceable_or_null(48), ptr) #0
+declare void @runtime.hashmapClear(ptr dereferenceable_or_null(40), ptr) #1

-attributes #0 = { "target-features"="+bulk-memory,+bulk-memory-opt,+call-indirect-overlong,+mutable-globals,+nontrapping-fptoint,+sign-ext,-multivalue,-reference-types" }
-attributes #1 = { nounwind "target-features"="+bulk-memory,+bulk-memory-opt,+call-indirect-overlong,+mutable-globals,+nontrapping-fptoint,+sign-ext,-multivalue,-reference-types" }
-attributes #2 = { nocallback nofree nosync nounwind speculatable willreturn memory(none) }
+; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none)
+declare i32 @llvm.smin.i32(i32, i32) #4
+
+; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none)
+declare i8 @llvm.umin.i8(i8, i8) #4
+
+; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none)
+declare i32 @llvm.umin.i32(i32, i32) #4
+
+; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none)
+declare i32 @llvm.smax.i32(i32, i32) #4
+
+; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none)
+declare i32 @llvm.umax.i32(i32, i32) #4
+
+attributes #0 = { allockind("alloc,zeroed") allocsize(0) "alloc-family"="runtime.alloc" "target-features"="+bulk-memory,+mutable-globals,+nontrapping-fptoint,+sign-ext" }
+attributes #1 = { "target-features"="+bulk-memory,+mutable-globals,+nontrapping-fptoint,+sign-ext" }
+attributes #2 = { nounwind "target-features"="+bulk-memory,+mutable-globals,+nontrapping-fptoint,+sign-ext" }
 attributes #3 = { nocallback nofree nounwind willreturn memory(argmem: write) }
-attributes #4 = { nounwind }
+attributes #4 = { nocallback nofree nosync nounwind speculatable willreturn memory(none) }
+attributes #5 = { nounwind }
@@ -5,50 +5,53 @@ target triple = "thumbv7m-unknown-unknown-eabi"

@"main$string" = internal unnamed_addr constant [4 x i8] c"test", align 1

+; Function Attrs: allockind("alloc,zeroed") allocsize(0)
+declare noalias nonnull ptr @runtime.alloc(i32, ptr, ptr) #0
+
 ; Function Attrs: nounwind
-define hidden void @main.init(ptr %context) unnamed_addr #0 {
+define hidden void @main.init(ptr %context) unnamed_addr #1 {
 entry:
  ret void
 }

 ; Function Attrs: nounwind
-define hidden void @main.regularFunctionGoroutine(ptr %context) unnamed_addr #0 {
+define hidden void @main.regularFunctionGoroutine(ptr %context) unnamed_addr #1 {
 entry:
-  %stacksize = call i32 @"internal/task.getGoroutineStackSize"(i32 ptrtoint (ptr @"main.regularFunction$gowrapper" to i32), ptr undef) #11
-  call void @"internal/task.start"(i32 ptrtoint (ptr @"main.regularFunction$gowrapper" to i32), ptr nonnull inttoptr (i32 5 to ptr), i32 %stacksize, ptr undef) #11
+  %stacksize = call i32 @"internal/task.getGoroutineStackSize"(i32 ptrtoint (ptr @"main.regularFunction$gowrapper" to i32), ptr undef) #9
+  call void @"internal/task.start"(i32 ptrtoint (ptr @"main.regularFunction$gowrapper" to i32), ptr nonnull inttoptr (i32 5 to ptr), i32 %stacksize, ptr undef) #9
  ret void
 }

-declare void @main.regularFunction(i32, ptr) #1
+declare void @main.regularFunction(i32, ptr) #2

 ; Function Attrs: nounwind
-define linkonce_odr void @"main.regularFunction$gowrapper"(ptr %0) unnamed_addr #2 {
+define linkonce_odr void @"main.regularFunction$gowrapper"(ptr %0) unnamed_addr #3 {
 entry:
  %unpack.int = ptrtoint ptr %0 to i32
-  call void @main.regularFunction(i32 %unpack.int, ptr undef) #11
+  call void @main.regularFunction(i32 %unpack.int, ptr undef) #9
  ret void
 }

-declare i32 @"internal/task.getGoroutineStackSize"(i32, ptr) #1
+declare i32 @"internal/task.getGoroutineStackSize"(i32, ptr) #2

-declare void @"internal/task.start"(i32, ptr, i32, ptr) #1
+declare void @"internal/task.start"(i32, ptr, i32, ptr) #2

 ; Function Attrs: nounwind
-define hidden void @main.inlineFunctionGoroutine(ptr %context) unnamed_addr #0 {
+define hidden void @main.inlineFunctionGoroutine(ptr %context) unnamed_addr #1 {
 entry:
-  %stacksize = call i32 @"internal/task.getGoroutineStackSize"(i32 ptrtoint (ptr @"main.inlineFunctionGoroutine$1$gowrapper" to i32), ptr undef) #11
-  call void @"internal/task.start"(i32 ptrtoint (ptr @"main.inlineFunctionGoroutine$1$gowrapper" to i32), ptr nonnull inttoptr (i32 5 to ptr), i32 %stacksize, ptr undef) #11
+  %stacksize = call i32 @"internal/task.getGoroutineStackSize"(i32 ptrtoint (ptr @"main.inlineFunctionGoroutine$1$gowrapper" to i32), ptr undef) #9
+  call void @"internal/task.start"(i32 ptrtoint (ptr @"main.inlineFunctionGoroutine$1$gowrapper" to i32), ptr nonnull inttoptr (i32 5 to ptr), i32 %stacksize, ptr undef) #9
  ret void
 }

 ; Function Attrs: nounwind
-define internal void @"main.inlineFunctionGoroutine$1"(i32 %x, ptr %context) unnamed_addr #0 {
+define internal void @"main.inlineFunctionGoroutine$1"(i32 %x, ptr %context) unnamed_addr #1 {
 entry:
  ret void
 }

 ; Function Attrs: nounwind
-define linkonce_odr void @"main.inlineFunctionGoroutine$1$gowrapper"(ptr %0) unnamed_addr #3 {
+define linkonce_odr void @"main.inlineFunctionGoroutine$1$gowrapper"(ptr %0) unnamed_addr #4 {
 entry:
  %unpack.int = ptrtoint ptr %0 to i32
  call void @"main.inlineFunctionGoroutine$1"(i32 %unpack.int, ptr undef)
@@ -56,28 +59,23 @@ entry:
 }

 ; Function Attrs: nounwind
-define hidden void @main.closureFunctionGoroutine(ptr %context) unnamed_addr #0 {
+define hidden void @main.closureFunctionGoroutine(ptr %context) unnamed_addr #1 {
 entry:
-  %n = call align 4 dereferenceable(4) ptr @runtime.alloc(i32 4, ptr nonnull inttoptr (i32 3 to ptr), ptr undef) #11
+  %n = call align 4 dereferenceable(4) ptr @runtime.alloc(i32 4, ptr nonnull inttoptr (i32 3 to ptr), ptr undef) #9
  store i32 3, ptr %n, align 4
-  %0 = call align 4 dereferenceable(8) ptr @runtime.alloc(i32 8, ptr null, ptr undef) #11
+  %0 = call align 4 dereferenceable(8) ptr @runtime.alloc(i32 8, ptr null, ptr undef) #9
  store i32 5, ptr %0, align 4
-  %1 = getelementptr inbounds nuw i8, ptr %0, i32 4
+  %1 = getelementptr inbounds { i32, ptr }, ptr %0, i32 0, i32 1
  store ptr %n, ptr %1, align 4
-  %stacksize = call i32 @"internal/task.getGoroutineStackSize"(i32 ptrtoint (ptr @"main.closureFunctionGoroutine$1$gowrapper" to i32), ptr undef) #11
-  call void @"internal/task.start"(i32 ptrtoint (ptr @"main.closureFunctionGoroutine$1$gowrapper" to i32), ptr nonnull %0, i32 %stacksize, ptr undef) #11
+  %stacksize = call i32 @"internal/task.getGoroutineStackSize"(i32 ptrtoint (ptr @"main.closureFunctionGoroutine$1$gowrapper" to i32), ptr undef) #9
+  call void @"internal/task.start"(i32 ptrtoint (ptr @"main.closureFunctionGoroutine$1$gowrapper" to i32), ptr nonnull %0, i32 %stacksize, ptr undef) #9
  %2 = load i32, ptr %n, align 4
-  call void @runtime.printlock(ptr undef) #11
-  call void @runtime.printint32(i32 %2, ptr undef) #11
-  call void @runtime.printunlock(ptr undef) #11
+  call void @runtime.printint32(i32 %2, ptr undef) #9
  ret void
 }

-; Function Attrs: allockind("alloc,zeroed") allocsize(0)
-declare noalias nonnull ptr @runtime.alloc(i32, ptr, ptr) #4
-
 ; Function Attrs: nounwind
-define internal void @"main.closureFunctionGoroutine$1"(i32 %x, ptr %context) unnamed_addr #0 {
+define internal void @"main.closureFunctionGoroutine$1"(i32 %x, ptr %context) unnamed_addr #1 {
 entry:
  store i32 7, ptr %context, align 4
  ret void
@@ -87,29 +85,25 @@ entry:
 define linkonce_odr void @"main.closureFunctionGoroutine$1$gowrapper"(ptr %0) unnamed_addr #5 {
 entry:
  %1 = load i32, ptr %0, align 4
-  %2 = getelementptr inbounds nuw i8, ptr %0, i32 4
+  %2 = getelementptr inbounds { i32, ptr }, ptr %0, i32 0, i32 1
  %3 = load ptr, ptr %2, align 4
  call void @"main.closureFunctionGoroutine$1"(i32 %1, ptr %3)
  ret void
 }

-declare void @runtime.printlock(ptr) #1
-
-declare void @runtime.printint32(i32, ptr) #1
-
-declare void @runtime.printunlock(ptr) #1
+declare void @runtime.printint32(i32, ptr) #2

 ; Function Attrs: nounwind
-define hidden void @main.funcGoroutine(ptr %fn.context, ptr %fn.funcptr, ptr %context) unnamed_addr #0 {
+define hidden void @main.funcGoroutine(ptr %fn.context, ptr %fn.funcptr, ptr %context) unnamed_addr #1 {
 entry:
-  %0 = call align 4 dereferenceable(12) ptr @runtime.alloc(i32 12, ptr null, ptr undef) #11
+  %0 = call align 4 dereferenceable(12) ptr @runtime.alloc(i32 12, ptr null, ptr undef) #9
  store i32 5, ptr %0, align 4
-  %1 = getelementptr inbounds nuw i8, ptr %0, i32 4
+  %1 = getelementptr inbounds { i32, ptr, ptr }, ptr %0, i32 0, i32 1
  store ptr %fn.context, ptr %1, align 4
-  %2 = getelementptr inbounds nuw i8, ptr %0, i32 8
+  %2 = getelementptr inbounds { i32, ptr, ptr }, ptr %0, i32 0, i32 2
  store ptr %fn.funcptr, ptr %2, align 4
-  %stacksize = call i32 @"internal/task.getGoroutineStackSize"(i32 ptrtoint (ptr @main.funcGoroutine.gowrapper to i32), ptr undef) #11
-  call void @"internal/task.start"(i32 ptrtoint (ptr @main.funcGoroutine.gowrapper to i32), ptr nonnull %0, i32 %stacksize, ptr undef) #11
+  %stacksize = call i32 @"internal/task.getGoroutineStackSize"(i32 ptrtoint (ptr @main.funcGoroutine.gowrapper to i32), ptr undef) #9
+  call void @"internal/task.start"(i32 ptrtoint (ptr @main.funcGoroutine.gowrapper to i32), ptr nonnull %0, i32 %stacksize, ptr undef) #9
  ret void
 }

@@ -117,84 +111,77 @@ entry:
 define linkonce_odr void @main.funcGoroutine.gowrapper(ptr %0) unnamed_addr #6 {
 entry:
  %1 = load i32, ptr %0, align 4
-  %2 = getelementptr inbounds nuw i8, ptr %0, i32 4
+  %2 = getelementptr inbounds { i32, ptr, ptr }, ptr %0, i32 0, i32 1
  %3 = load ptr, ptr %2, align 4
-  %4 = getelementptr inbounds nuw i8, ptr %0, i32 8
+  %4 = getelementptr inbounds { i32, ptr, ptr }, ptr %0, i32 0, i32 2
  %5 = load ptr, ptr %4, align 4
-  call void %5(i32 %1, ptr %3) #11
+  call void %5(i32 %1, ptr %3) #9
  ret void
 }

 ; Function Attrs: nounwind
-define hidden void @main.recoverBuiltinGoroutine(ptr %context) unnamed_addr #0 {
+define hidden void @main.recoverBuiltinGoroutine(ptr %context) unnamed_addr #1 {
 entry:
  ret void
 }

 ; Function Attrs: nounwind
-define hidden void @main.copyBuiltinGoroutine(ptr %dst.data, i32 %dst.len, i32 %dst.cap, ptr %src.data, i32 %src.len, i32 %src.cap, ptr %context) unnamed_addr #0 {
+define hidden void @main.copyBuiltinGoroutine(ptr %dst.data, i32 %dst.len, i32 %dst.cap, ptr %src.data, i32 %src.len, i32 %src.cap, ptr %context) unnamed_addr #1 {
 entry:
-  %copy.n = call i32 @llvm.umin.i32(i32 %dst.len, i32 %src.len)
-  call void @llvm.memmove.p0.p0.i32(ptr align 1 %dst.data, ptr align 1 %src.data, i32 %copy.n, i1 false)
+  %copy.n = call i32 @runtime.sliceCopy(ptr %dst.data, ptr %src.data, i32 %dst.len, i32 %src.len, i32 1, ptr undef) #9
  ret void
 }

-; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none)
-declare i32 @llvm.umin.i32(i32, i32) #7
-
-; Function Attrs: nocallback nofree nounwind willreturn memory(argmem: readwrite)
-declare void @llvm.memmove.p0.p0.i32(ptr nocapture writeonly, ptr nocapture readonly, i32, i1 immarg) #8
+declare i32 @runtime.sliceCopy(ptr nocapture writeonly, ptr nocapture readonly, i32, i32, i32, ptr) #2

 ; Function Attrs: nounwind
-define hidden void @main.closeBuiltinGoroutine(ptr dereferenceable_or_null(36) %ch, ptr %context) unnamed_addr #0 {
+define hidden void @main.closeBuiltinGoroutine(ptr dereferenceable_or_null(32) %ch, ptr %context) unnamed_addr #1 {
 entry:
-  call void @runtime.chanClose(ptr %ch, ptr undef) #11
+  call void @runtime.chanClose(ptr %ch, ptr undef) #9
  ret void
 }

-declare void @runtime.chanClose(ptr dereferenceable_or_null(36), ptr) #1
+declare void @runtime.chanClose(ptr dereferenceable_or_null(32), ptr) #2

 ; Function Attrs: nounwind
-define hidden void @main.startInterfaceMethod(ptr %itf.typecode, ptr %itf.value, ptr %context) unnamed_addr #0 {
+define hidden void @main.startInterfaceMethod(ptr %itf.typecode, ptr %itf.value, ptr %context) unnamed_addr #1 {
 entry:
-  %0 = call align 4 dereferenceable(16) ptr @runtime.alloc(i32 16, ptr null, ptr undef) #11
+  %0 = call align 4 dereferenceable(16) ptr @runtime.alloc(i32 16, ptr null, ptr undef) #9
  store ptr %itf.value, ptr %0, align 4
-  %1 = getelementptr inbounds nuw i8, ptr %0, i32 4
+  %1 = getelementptr inbounds { ptr, ptr, i32, ptr }, ptr %0, i32 0, i32 1
  store ptr @"main$string", ptr %1, align 4
-  %2 = getelementptr inbounds nuw i8, ptr %0, i32 8
+  %2 = getelementptr inbounds { ptr, ptr, i32, ptr }, ptr %0, i32 0, i32 2
  store i32 4, ptr %2, align 4
-  %3 = getelementptr inbounds nuw i8, ptr %0, i32 12
+  %3 = getelementptr inbounds { ptr, ptr, i32, ptr }, ptr %0, i32 0, i32 3
  store ptr %itf.typecode, ptr %3, align 4
-  %stacksize = call i32 @"internal/task.getGoroutineStackSize"(i32 ptrtoint (ptr @"interface:{Print:func:{basic:string}{}}.Print$invoke$gowrapper" to i32), ptr undef) #11
-  call void @"internal/task.start"(i32 ptrtoint (ptr @"interface:{Print:func:{basic:string}{}}.Print$invoke$gowrapper" to i32), ptr nonnull %0, i32 %stacksize, ptr undef) #11
+  %stacksize = call i32 @"internal/task.getGoroutineStackSize"(i32 ptrtoint (ptr @"interface:{Print:func:{basic:string}{}}.Print$invoke$gowrapper" to i32), ptr undef) #9
+  call void @"internal/task.start"(i32 ptrtoint (ptr @"interface:{Print:func:{basic:string}{}}.Print$invoke$gowrapper" to i32), ptr nonnull %0, i32 %stacksize, ptr undef) #9
  ret void
 }

-declare void @"interface:{Print:func:{basic:string}{}}.Print$invoke"(ptr, ptr, i32, ptr, ptr) #9
+declare void @"interface:{Print:func:{basic:string}{}}.Print$invoke"(ptr, ptr, i32, ptr, ptr) #7

 ; Function Attrs: nounwind
-define linkonce_odr void @"interface:{Print:func:{basic:string}{}}.Print$invoke$gowrapper"(ptr %0) unnamed_addr #10 {
+define linkonce_odr void @"interface:{Print:func:{basic:string}{}}.Print$invoke$gowrapper"(ptr %0) unnamed_addr #8 {
 entry:
  %1 = load ptr, ptr %0, align 4
-  %2 = getelementptr inbounds nuw i8, ptr %0, i32 4
+  %2 = getelementptr inbounds { ptr, ptr, i32, ptr }, ptr %0, i32 0, i32 1
  %3 = load ptr, ptr %2, align 4
-  %4 = getelementptr inbounds nuw i8, ptr %0, i32 8
+  %4 = getelementptr inbounds { ptr, ptr, i32, ptr }, ptr %0, i32 0, i32 2
  %5 = load i32, ptr %4, align 4
-  %6 = getelementptr inbounds nuw i8, ptr %0, i32 12
+  %6 = getelementptr inbounds { ptr, ptr, i32, ptr }, ptr %0, i32 0, i32 3
  %7 = load ptr, ptr %6, align 4
-  call void @"interface:{Print:func:{basic:string}{}}.Print$invoke"(ptr %1, ptr %3, i32 %5, ptr %7, ptr undef) #11
+  call void @"interface:{Print:func:{basic:string}{}}.Print$invoke"(ptr %1, ptr %3, i32 %5, ptr %7, ptr undef) #9
  ret void
 }

-attributes #0 = { nounwind "target-features"="+armv7-m,+hwdiv,+soft-float,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" }
-attributes #1 = { "target-features"="+armv7-m,+hwdiv,+soft-float,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" }
-attributes #2 = { nounwind "target-features"="+armv7-m,+hwdiv,+soft-float,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" "tinygo-gowrapper"="main.regularFunction" }
-attributes #3 = { nounwind "target-features"="+armv7-m,+hwdiv,+soft-float,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" "tinygo-gowrapper"="main.inlineFunctionGoroutine$1" }
-attributes #4 = { allockind("alloc,zeroed") allocsize(0) "alloc-family"="runtime.alloc" "target-features"="+armv7-m,+hwdiv,+soft-float,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" }
-attributes #5 = { nounwind "target-features"="+armv7-m,+hwdiv,+soft-float,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" "tinygo-gowrapper"="main.closureFunctionGoroutine$1" }
-attributes #6 = { nounwind "target-features"="+armv7-m,+hwdiv,+soft-float,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" "tinygo-gowrapper" }
-attributes #7 = { nocallback nofree nosync nounwind speculatable willreturn memory(none) }
-attributes #8 = { nocallback nofree nounwind willreturn memory(argmem: readwrite) }
-attributes #9 = { "target-features"="+armv7-m,+hwdiv,+soft-float,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" "tinygo-invoke"="reflect/methods.Print(string)" "tinygo-methods"="reflect/methods.Print(string)" }
-attributes #10 = { nounwind "target-features"="+armv7-m,+hwdiv,+soft-float,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" "tinygo-gowrapper"="interface:{Print:func:{basic:string}{}}.Print$invoke" }
-attributes #11 = { nounwind }
+attributes #0 = { allockind("alloc,zeroed") allocsize(0) "alloc-family"="runtime.alloc" "target-features"="+armv7-m,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" }
+attributes #1 = { nounwind "target-features"="+armv7-m,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" }
+attributes #2 = { "target-features"="+armv7-m,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" }
+attributes #3 = { nounwind "target-features"="+armv7-m,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" "tinygo-gowrapper"="main.regularFunction" }
+attributes #4 = { nounwind "target-features"="+armv7-m,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" "tinygo-gowrapper"="main.inlineFunctionGoroutine$1" }
+attributes #5 = { nounwind "target-features"="+armv7-m,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" "tinygo-gowrapper"="main.closureFunctionGoroutine$1" }
+attributes #6 = { nounwind "target-features"="+armv7-m,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" "tinygo-gowrapper" }
+attributes #7 = { "target-features"="+armv7-m,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" "tinygo-invoke"="reflect/methods.Print(string)" "tinygo-methods"="reflect/methods.Print(string)" }
+attributes #8 = { nounwind "target-features"="+armv7-m,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" "tinygo-gowrapper"="interface:{Print:func:{basic:string}{}}.Print$invoke" }
+attributes #9 = { nounwind }
--- a/Show More
+++ b/Show More