tools: process SVD files in parallel

This speeds up the generation of SVD files, for example as part of a
package build (where parallelism may not be desired, or tools should
auto-detect the number of threads to use).

.circleci/config.yml

@@ -5,17 +5,17 @@ commands:
     steps:
       - run:
           name: "Pull submodules"
-          command: git submodule update --init --recursive
+          command: git submodule update --init
   llvm-source-linux:
     steps:
       - restore_cache:
           keys:
-            - llvm-source-17-v1
+            - llvm-source-16-v3
       - run:
           name: "Fetch LLVM source"
           command: make llvm-source
       - save_cache:
-          key: llvm-source-17-v1
+          key: llvm-source-16-v3
           paths:
             - llvm-project/clang/lib/Headers
             - llvm-project/clang/include
@@ -55,7 +55,7 @@ commands:
       - 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
+            echo 'deb https://apt.llvm.org/buster/ llvm-toolchain-buster-<<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 \
@@ -69,16 +69,16 @@ commands:
       - build-binaryen-linux
       - restore_cache:
           keys:
-            - go-cache-v4-{{ checksum "go.mod" }}-{{ .Environment.CIRCLE_PREVIOUS_BUILD_NUM }}
-            - go-cache-v4-{{ checksum "go.mod" }}
+            - go-cache-v3-{{ checksum "go.mod" }}-{{ .Environment.CIRCLE_PREVIOUS_BUILD_NUM }}
+            - go-cache-v3-{{ checksum "go.mod" }}
       - llvm-source-linux
       - run: go install -tags=llvm<<parameters.llvm>> .
       - restore_cache:
           keys:
-            - wasi-libc-sysroot-systemclang-v7
+            - wasi-libc-sysroot-systemclang-v6
       - run: make wasi-libc
       - save_cache:
-          key: wasi-libc-sysroot-systemclang-v7
+          key: wasi-libc-sysroot-systemclang-v6
           paths:
             - lib/wasi-libc/sysroot
       - when:
@@ -89,10 +89,10 @@ commands:
               # formatting of generated files.
               name: Check Go code formatting
               command: make fmt-check
-      - run: make gen-device -j4
+      - run: make gen-device
       - run: make smoketest XTENSA=0
       - save_cache:
-          key: go-cache-v4-{{ checksum "go.mod" }}-{{ .Environment.CIRCLE_BUILD_NUM }}
+          key: go-cache-v3-{{ checksum "go.mod" }}-{{ .Environment.CIRCLE_BUILD_NUM }}
           paths:
             - ~/.cache/go-build
             - /go/pkg/mod
@@ -100,18 +100,11 @@ commands:
 jobs:
   test-llvm15-go118:
     docker:
-      - image: golang:1.18-bullseye
+      - image: golang:1.18-buster
     steps:
       - test-linux:
           llvm: "15"
     resource_class: large
-  test-llvm17-go122:
-    docker:
-      - image: golang:1.22-bullseye
-    steps:
-      - test-linux:
-          llvm: "17"
-    resource_class: large
 
 workflows:
   test-all:
@@ -119,5 +112,3 @@ workflows:
       # This tests our lowest supported versions of Go and LLVM, to make sure at
       # least the smoke tests still pass.
       - test-llvm15-go118
-      # This tests LLVM 17 support when linking against system libraries.
-      - test-llvm17-go122

.github/workflows/build-macos.yml

@@ -14,36 +14,26 @@ concurrency:
 jobs:
   build-macos:
     name: build-macos
-    strategy:
-      matrix:
-        # 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
-    runs-on: ${{ matrix.os }}
+    runs-on: macos-11
     steps:
       - name: Install Dependencies
         shell: bash
         run: |
           HOMEBREW_NO_AUTO_UPDATE=1 brew install qemu binaryen
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           submodules: true
       - name: Install Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v3
         with:
-          go-version: '1.22'
+          go-version: '1.21'
           cache: true
       - name: Restore LLVM source cache
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v3
         id: cache-llvm-source
         with:
-          key: llvm-source-17-${{ matrix.os }}-v1
+          key: llvm-source-16-macos-v1
           path: |
             llvm-project/clang/lib/Headers
             llvm-project/clang/include
@@ -54,7 +44,7 @@ jobs:
         if: steps.cache-llvm-source.outputs.cache-hit != 'true'
         run: make llvm-source
       - name: Save LLVM source cache
-        uses: actions/cache/save@v4
+        uses: actions/cache/save@v3
         if: steps.cache-llvm-source.outputs.cache-hit != 'true'
         with:
           key: ${{ steps.cache-llvm-source.outputs.cache-primary-key }}
@@ -65,10 +55,10 @@ jobs:
             llvm-project/lld/include
             llvm-project/llvm/include
       - name: Restore LLVM build cache
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v3
         id: cache-llvm-build
         with:
-          key: llvm-build-17-${{ matrix.os }}-v1
+          key: llvm-build-16-macos-v1
           path: llvm-build
       - name: Build LLVM
         if: steps.cache-llvm-build.outputs.cache-hit != 'true'
@@ -83,22 +73,22 @@ jobs:
           make llvm-build
           find llvm-build -name CMakeFiles -prune -exec rm -r '{}' \;
       - name: Save LLVM build cache
-        uses: actions/cache/save@v4
+        uses: actions/cache/save@v3
         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
+        uses: actions/cache@v3
         id: cache-wasi-libc
         with:
-          key: wasi-libc-sysroot-${{ matrix.os }}-v1
+          key: wasi-libc-sysroot-v4
           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
+        run: make gen-device
       - name: Test TinyGo
         shell: bash
         run: make test GOTESTFLAGS="-short"
@@ -108,7 +98,7 @@ jobs:
         run: make tinygo-test
       - name: Make release artifact
         shell: bash
-        run: cp -p build/release.tar.gz build/tinygo.darwin-${{ matrix.goarch }}.tar.gz
+        run: cp -p build/release.tar.gz build/tinygo.darwin-amd64.tar.gz 
       - name: Publish release artifact
         # Note: this release artifact is double-zipped, see:
         # https://github.com/actions/upload-artifact/issues/39
@@ -116,44 +106,29 @@ jobs:
         # - 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
+        uses: actions/upload-artifact@v2
         with:
-          name: darwin-${{ matrix.goarch }}-double-zipped
-          path: build/tinygo.darwin-${{ matrix.goarch }}.tar.gz
+          name: darwin-amd64-double-zipped
+          path: build/tinygo.darwin-amd64.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]
     steps:
-      - name: Set up Homebrew
-        uses: Homebrew/actions/setup-homebrew@master
-      - name: Fix Python symlinks
-        run: |
-          # Github runners have broken symlinks, so relink
-          # see: https://github.com/actions/setup-python/issues/577
-          brew list -1 | grep python | while read formula; do brew unlink $formula; brew link --overwrite $formula; done
       - name: Install LLVM
+        shell: bash
         run: |
-          brew install llvm@${{ matrix.version }}
+          HOMEBREW_NO_AUTO_UPDATE=1 brew install llvm@16
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Install Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v3
         with:
-          go-version: '1.22'
+          go-version: '1.21'
           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 == 17
+      - name: Build TinyGo
         run: go install
       - name: Check binary
-        if: matrix.version == 17
         run: tinygo version

.github/workflows/docker.yml

@@ -19,26 +19,15 @@ jobs:
       packages: write
       contents: read
     steps:
-      - name: Free Disk space
-        shell: bash
-        run: |
-          df -h
-          sudo rm -rf /opt/hostedtoolcache
-          sudo rm -rf /usr/local/lib/android
-          sudo rm -rf /usr/share/dotnet
-          sudo rm -rf /opt/ghc
-          sudo rm -rf /usr/local/graalvm
-          sudo rm -rf /usr/local/share/boost
-          df -h
       - name: Check out the repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           submodules: recursive
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v4
         with:
           images: |
             tinygo/tinygo-dev
@@ -47,24 +36,24 @@ jobs:
             type=sha,format=long
             type=raw,value=latest
       - name: Log in to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
       - name: Log in to Github Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v3
         with:
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          build-contexts: tinygo-llvm-build=docker-image://tinygo/llvm-17
+          build-contexts: tinygo-llvm-build=docker-image://tinygo/llvm-16
           cache-from: type=gha
           cache-to: type=gha,mode=max
       - name: Trigger Drivers repo build on Github Actions

.github/workflows/linux.yml

@@ -18,10 +18,10 @@ jobs:
     # statically linked binary.
     runs-on: ubuntu-latest
     container:
-      image: golang:1.22-alpine
+      image: golang:1.21-alpine
     steps:
       - name: Install apk dependencies
-        # tar: needed for actions/cache@v4
+        # tar: needed for actions/cache@v3
         # git+openssh: needed for checkout (I think?)
         # ruby: needed to install fpm
         run: apk add tar git openssh make g++ ruby
@@ -29,21 +29,21 @@ jobs:
         # 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@v4
+        uses: actions/checkout@v3
         with:
           submodules: true
       - name: Cache Go
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           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@v4
+        uses: actions/cache/restore@v3
         id: cache-llvm-source
         with:
-          key: llvm-source-17-linux-alpine-v1
+          key: llvm-source-16-linux-alpine-v1
           path: |
             llvm-project/clang/lib/Headers
             llvm-project/clang/include
@@ -54,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@v4
+        uses: actions/cache/save@v3
         if: steps.cache-llvm-source.outputs.cache-hit != 'true'
         with:
           key: ${{ steps.cache-llvm-source.outputs.cache-primary-key }}
@@ -65,10 +65,10 @@ jobs:
             llvm-project/lld/include
             llvm-project/llvm/include
       - name: Restore LLVM build cache
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v3
         id: cache-llvm-build
         with:
-          key: llvm-build-17-linux-alpine-v1
+          key: llvm-build-16-linux-alpine-v1
           path: llvm-build
       - name: Build LLVM
         if: steps.cache-llvm-build.outputs.cache-hit != 'true'
@@ -83,13 +83,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@v4
+        uses: actions/cache/save@v3
         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@v4
+        uses: actions/cache@v3
         id: cache-binaryen
         with:
           key: binaryen-linux-alpine-v1
@@ -100,10 +100,10 @@ jobs:
           apk add cmake samurai python3
           make binaryen STATIC=1
       - name: Cache wasi-libc
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         id: cache-wasi-libc
         with:
-          key: wasi-libc-sysroot-linux-alpine-v2
+          key: wasi-libc-sysroot-linux-alpine-v1
           path: lib/wasi-libc/sysroot
       - name: Build wasi-libc
         if: steps.cache-wasi-libc.outputs.cache-hit != 'true'
@@ -119,7 +119,7 @@ jobs:
           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
+        uses: actions/upload-artifact@v3
         with:
           name: linux-amd64-double-zipped
           path: |
@@ -131,20 +131,20 @@ jobs:
     needs: build-linux
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Install Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v3
         with:
-          go-version: '1.22'
+          go-version: '1.21'
           cache: true
       - name: Install wasmtime
         run: |
           mkdir -p $HOME/.wasmtime $HOME/.wasmtime/bin
-          curl https://github.com/bytecodealliance/wasmtime/releases/download/v14.0.4/wasmtime-v14.0.4-x86_64-linux.tar.xz -o wasmtime-v14.0.4-x86_64-linux.tar.xz -SfL
-          tar -C $HOME/.wasmtime/bin --wildcards -xf wasmtime-v14.0.4-x86_64-linux.tar.xz --strip-components=1 wasmtime-v14.0.4-x86_64-linux/*
+          curl https://github.com/bytecodealliance/wasmtime/releases/download/v5.0.0/wasmtime-v5.0.0-x86_64-linux.tar.xz -o wasmtime-v5.0.0-x86_64-linux.tar.xz -SfL
+          tar -C $HOME/.wasmtime/bin --wildcards -xf wasmtime-v5.0.0-x86_64-linux.tar.xz --strip-components=1 wasmtime-v5.0.0-x86_64-linux/*
           echo "$HOME/.wasmtime/bin" >> $GITHUB_PATH
       - name: Download release artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: linux-amd64-double-zipped
       - name: Extract release tarball
@@ -161,7 +161,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           submodules: true
       - name: Install apt dependencies
@@ -176,25 +176,25 @@ jobs:
               simavr \
               ninja-build
       - name: Install Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v3
         with:
-          go-version: '1.22'
+          go-version: '1.21'
           cache: true
       - name: Install Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
         with:
-          node-version: '18'
+          node-version: '16'
       - name: Install wasmtime
         run: |
           mkdir -p $HOME/.wasmtime $HOME/.wasmtime/bin
-          curl -L https://github.com/bytecodealliance/wasmtime/releases/download/v14.0.4/wasmtime-v14.0.4-x86_64-linux.tar.xz -o wasmtime-v14.0.4-x86_64-linux.tar.xz -SfL
-          tar -C $HOME/.wasmtime/bin --wildcards -xf wasmtime-v14.0.4-x86_64-linux.tar.xz --strip-components=1 wasmtime-v14.0.4-x86_64-linux/*
+          curl -L https://github.com/bytecodealliance/wasmtime/releases/download/v5.0.0/wasmtime-v5.0.0-x86_64-linux.tar.xz -o wasmtime-v5.0.0-x86_64-linux.tar.xz -SfL
+          tar -C $HOME/.wasmtime/bin --wildcards -xf wasmtime-v5.0.0-x86_64-linux.tar.xz --strip-components=1 wasmtime-v5.0.0-x86_64-linux/*
           echo "$HOME/.wasmtime/bin" >> $GITHUB_PATH
       - name: Restore LLVM source cache
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v3
         id: cache-llvm-source
         with:
-          key: llvm-source-17-linux-asserts-v1
+          key: llvm-source-16-linux-asserts-v1
           path: |
             llvm-project/clang/lib/Headers
             llvm-project/clang/include
@@ -205,7 +205,7 @@ jobs:
         if: steps.cache-llvm-source.outputs.cache-hit != 'true'
         run: make llvm-source
       - name: Save LLVM source cache
-        uses: actions/cache/save@v4
+        uses: actions/cache/save@v3
         if: steps.cache-llvm-source.outputs.cache-hit != 'true'
         with:
           key: ${{ steps.cache-llvm-source.outputs.cache-primary-key }}
@@ -216,10 +216,10 @@ jobs:
             llvm-project/lld/include
             llvm-project/llvm/include
       - name: Restore LLVM build cache
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v3
         id: cache-llvm-build
         with:
-          key: llvm-build-17-linux-asserts-v1
+          key: llvm-build-16-linux-asserts-v1
           path: llvm-build
       - name: Build LLVM
         if: steps.cache-llvm-build.outputs.cache-hit != 'true'
@@ -232,13 +232,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@v4
+        uses: actions/cache/save@v3
         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@v4
+        uses: actions/cache@v3
         id: cache-binaryen
         with:
           key: binaryen-linux-asserts-v1
@@ -247,15 +247,15 @@ jobs:
         if: steps.cache-binaryen.outputs.cache-hit != 'true'
         run: make binaryen
       - name: Cache wasi-libc
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         id: cache-wasi-libc
         with:
-          key: wasi-libc-sysroot-linux-asserts-v6
+          key: wasi-libc-sysroot-linux-asserts-v5
           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
+      - run: make gen-device
       - name: Test TinyGo
         run: make ASSERT=1 test
       - name: Build TinyGo
@@ -290,7 +290,7 @@ jobs:
     needs: build-linux
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Install apt dependencies
         run: |
           sudo apt-get update
@@ -299,15 +299,15 @@ jobs:
               g++-${{ matrix.toolchain }} \
               libc6-dev-${{ matrix.libc }}-cross
       - name: Install Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v3
         with:
-          go-version: '1.22'
+          go-version: '1.21'
           cache: true
       - name: Restore LLVM source cache
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v3
         id: cache-llvm-source
         with:
-          key: llvm-source-17-linux-v1
+          key: llvm-source-16-linux-v1
           path: |
             llvm-project/clang/lib/Headers
             llvm-project/clang/include
@@ -318,7 +318,7 @@ jobs:
         if: steps.cache-llvm-source.outputs.cache-hit != 'true'
         run: make llvm-source
       - name: Save LLVM source cache
-        uses: actions/cache/save@v4
+        uses: actions/cache/save@v3
         if: steps.cache-llvm-source.outputs.cache-hit != 'true'
         with:
           key: ${{ steps.cache-llvm-source.outputs.cache-primary-key }}
@@ -329,10 +329,10 @@ jobs:
             llvm-project/lld/include
             llvm-project/llvm/include
       - name: Restore LLVM build cache
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v3
         id: cache-llvm-build
         with:
-          key: llvm-build-17-linux-${{ matrix.goarch }}-v1
+          key: llvm-build-16-linux-${{ matrix.goarch }}-v1
           path: llvm-build
       - name: Build LLVM
         if: steps.cache-llvm-build.outputs.cache-hit != 'true'
@@ -347,22 +347,22 @@ 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@v4
+        uses: actions/cache/save@v3
         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@v4
+        uses: actions/cache@v3
         id: cache-binaryen
         with:
-          key: binaryen-linux-${{ matrix.goarch }}-v3
+          key: binaryen-linux-${{ matrix.goarch }}-v1
           path: build/wasm-opt
       - name: Build Binaryen
         if: steps.cache-binaryen.outputs.cache-hit != 'true'
         run: |
           sudo apt-get install --no-install-recommends ninja-build
-          git submodule update --init --recursive lib/binaryen
+          git submodule update --init lib/binaryen
           make CROSS=${{ matrix.toolchain }} binaryen
       - name: Install fpm
         run: |
@@ -373,7 +373,7 @@ jobs:
         run: |
           make CROSS=${{ matrix.toolchain }}
       - name: Download amd64 release
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: linux-amd64-double-zipped
       - name: Extract amd64 release
@@ -390,7 +390,7 @@ jobs:
           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
+        uses: actions/upload-artifact@v3
         with:
           name: linux-${{ matrix.goarch }}-double-zipped
           path: |

.github/workflows/llvm.yml

@@ -25,18 +25,18 @@ jobs:
       contents: read
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           submodules: recursive
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v4
         with:
           images: |
-            tinygo/llvm-17
-            ghcr.io/${{ github.repository_owner }}/llvm-17
+            tinygo/llvm-16
+            ghcr.io/${{ github.repository_owner }}/llvm-16
           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@v3
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v4
         with:
           target: tinygo-llvm-build
           context: .

.github/workflows/nix.yml

@@ -1,43 +0,0 @@
-name: Nix
-
-on:
-  pull_request:
-  push:
-    branches:
-      - dev
-      - release
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  nix-test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Pull musl
-        run: |
-            git submodule update --init lib/musl
-      - name: Restore LLVM source cache
-        uses: actions/cache/restore@v4
-        id: cache-llvm-source
-        with:
-          key: llvm-source-17-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@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@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"

.github/workflows/sizediff-install-pkgs.sh

@@ -1,12 +0,0 @@
-# Command that's part of sizediff.yml. This is put in a separate file so that it
-# 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/jammy/ llvm-toolchain-jammy-17 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-17-dev \
-    clang-17 \
-    libclang-17-dev \
-    lld-17

.github/workflows/sizediff.yml

@@ -18,54 +18,59 @@ jobs:
         run: |
           echo "$HOME/go/bin" >> $GITHUB_PATH
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0 # fetch all history (no sparse checkout)
           submodules: true
       - name: Install apt dependencies
-        run: ./.github/workflows/sizediff-install-pkgs.sh
+        run: |
+          echo 'deb https://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 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-16-dev \
+              clang-16 \
+              libclang-16-dev \
+              lld-16
       - name: Restore LLVM source cache
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         id: cache-llvm-source
         with:
-          key: llvm-source-17-sizediff-v1
+          key: llvm-source-16-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@v4
+        uses: actions/cache@v3
         with:
           key: go-cache-linux-sizediff-v1-${{ hashFiles('go.mod') }}
           path: |
             ~/.cache/go-build
             ~/go/pkg/mod
-      - run: make gen-device -j4
+      - run: make gen-device
       - name: Download drivers repo
         run: git clone https://github.com/tinygo-org/drivers.git
       - name: Save HEAD
         run: git branch github-actions-saved-HEAD HEAD
 
-      # Compute sizes for the PR branch
-      - name: Build tinygo binary for the PR branch
-        run: go install
-      - name: Determine binary sizes on the PR branch
-        run: (cd drivers; make smoke-test XTENSA=0 | tee sizes-pr.txt)
-
       # Compute sizes for the dev branch
       - name: Checkout dev branch
-        run: |
-          git reset --hard origin/dev
-          git checkout --no-recurse-submodules `git merge-base HEAD origin/dev`
-      - name: Install apt dependencies on the dev branch
-        # this is only needed on a PR that changes the LLVM version
-        run: ./.github/workflows/sizediff-install-pkgs.sh
+        run: git checkout --no-recurse-submodules `git merge-base HEAD origin/dev`
       - name: Build tinygo binary for the dev branch
         run: go install
       - name: Determine binary sizes on the dev branch
         run: (cd drivers; make smoke-test XTENSA=0 | tee sizes-dev.txt)
 
+      # Compute sizes for the PR branch
+      - name: Checkout PR branch
+        run: git checkout --no-recurse-submodules github-actions-saved-HEAD
+      - name: Build tinygo binary for the PR branch
+        run: go install
+      - name: Determine binary sizes on the PR branch
+        run: (cd drivers; make smoke-test XTENSA=0 | tee sizes-pr.txt)
+
       # Create comment
       # TODO: add a summary, something like:
       #  - overall size difference (percent)

.github/workflows/windows.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: windows-2022
     steps:
       - name: Configure pagefile
-        uses: al-cheb/configure-pagefile-action@v1.4
+        uses: al-cheb/configure-pagefile-action@v1.3
         with:
           minimum-size: 8GB
           maximum-size: 24GB
@@ -29,19 +29,19 @@ jobs:
         run: |
           scoop install ninja binaryen
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           submodules: true
       - name: Install Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v3
         with:
-          go-version: '1.22'
+          go-version: '1.21'
           cache: true
       - name: Restore cached LLVM source
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v3
         id: cache-llvm-source
         with:
-          key: llvm-source-17-windows-v1
+          key: llvm-source-16-windows-v1
           path: |
             llvm-project/clang/lib/Headers
             llvm-project/clang/include
@@ -52,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@v4
+        uses: actions/cache/save@v3
         if: steps.cache-llvm-source.outputs.cache-hit != 'true'
         with:
           key: ${{ steps.cache-llvm-source.outputs.cache-primary-key }}
@@ -63,10 +63,10 @@ jobs:
             llvm-project/lld/include
             llvm-project/llvm/include
       - name: Restore cached LLVM build
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v3
         id: cache-llvm-build
         with:
-          key: llvm-build-17-windows-v1
+          key: llvm-build-16-windows-v2
           path: llvm-build
       - name: Build LLVM
         if: steps.cache-llvm-build.outputs.cache-hit != 'true'
@@ -80,25 +80,25 @@ 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@v4
+        uses: actions/cache/save@v3
         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
+        uses: actions/cache@v3
         id: cache-wasi-libc
         with:
-          key: wasi-libc-sysroot-v5
+          key: wasi-libc-sysroot-v4
           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 install wasmtime@14.0.4
+          scoop install wasmtime
       - name: make gen-device
-        run: make -j3 gen-device
+        run: make gen-device
       - name: Test TinyGo
         shell: bash
         run: make test GOTESTFLAGS="-short"
@@ -116,7 +116,7 @@ jobs:
         # - 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
+        uses: actions/upload-artifact@v3
         with:
           name: windows-amd64-double-zipped
           path: build/release/release.zip
@@ -126,7 +126,7 @@ jobs:
     needs: build-windows
     steps:
       - name: Configure pagefile
-        uses: al-cheb/configure-pagefile-action@v1.4
+        uses: al-cheb/configure-pagefile-action@v1.3
         with:
           minimum-size: 8GB
           maximum-size: 24GB
@@ -139,14 +139,14 @@ jobs:
         run: |
           scoop install binaryen
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Install Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v3
         with:
-          go-version: '1.22'
+          go-version: '1.21'
           cache: true
       - name: Download TinyGo build
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v2
         with:
           name: windows-amd64-double-zipped
           path: build/
@@ -163,20 +163,20 @@ jobs:
     needs: build-windows
     steps:
       - name: Configure pagefile
-        uses: al-cheb/configure-pagefile-action@v1.4
+        uses: al-cheb/configure-pagefile-action@v1.3
         with:
           minimum-size: 8GB
           maximum-size: 24GB
           disk-root: "C:"
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Install Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v3
         with:
-          go-version: '1.22'
+          go-version: '1.21'
           cache: true
       - name: Download TinyGo build
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v2
         with:
           name: windows-amd64-double-zipped
           path: build/
@@ -192,7 +192,7 @@ jobs:
     needs: build-windows
     steps:
       - name: Configure pagefile
-        uses: al-cheb/configure-pagefile-action@v1.4
+        uses: al-cheb/configure-pagefile-action@v1.3
         with:
           minimum-size: 8GB
           maximum-size: 24GB
@@ -203,16 +203,16 @@ jobs:
       - name: Install Dependencies
         shell: bash
         run: |
-          scoop install binaryen && scoop install wasmtime@14.0.4
+          scoop install binaryen wasmtime
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Install Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v3
         with:
-          go-version: '1.22'
+          go-version: '1.21'
           cache: true
       - name: Download TinyGo build
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v2
         with:
           name: windows-amd64-double-zipped
           path: build/

.gitmodules

@@ -9,11 +9,10 @@
 	url = https://github.com/avr-rust/avr-mcu.git
 [submodule "lib/cmsis-svd"]
 	path = lib/cmsis-svd
-	url = https://github.com/cmsis-svd/cmsis-svd-data.git
-	branch = main
+	url = https://github.com/tinygo-org/cmsis-svd
 [submodule "lib/wasi-libc"]
 	path = lib/wasi-libc
-	url = https://github.com/WebAssembly/wasi-libc
+	url = https://github.com/CraneStation/wasi-libc
 [submodule "lib/picolibc"]
 	path = lib/picolibc
 	url = https://github.com/keith-packard/picolibc.git
@@ -35,7 +34,3 @@
 [submodule "lib/renesas-svd"]
 	path = lib/renesas-svd
 	url = https://github.com/tinygo-org/renesas-svd.git
-[submodule "src/net"]
-	path = src/net
-	url = https://github.com/tinygo-org/net.git
-	branch = dev

BUILDING.md

@@ -85,7 +85,7 @@ Now that we have a working static build, it's time to make a release tarball:
 
 If you did not clone the repository with the `--recursive` option, you will get errors until you initialize the project submodules:
 
-    git submodule update --init --recursive
+    git submodule update --init
 
 The release tarball is stored in build/release.tar.gz, and can be extracted with
 the following command (for example in ~/lib):

CHANGELOG.md

@@ -1,78 +1,3 @@
-0.31.0
----
-
-* **general**
-  * remove LLVM 14 support
-  * add LLVM 17 support, and use it by default
-  * add Nix flake support
-  * update bundled Binaryen to version 116
-  * add `ports` subcommand that lists available serial ports for `-port` and `-monitor`
-  * support wasmtime version 14
-  * add `-serial=rtt` for serial output over SWD
-  * add Go 1.22 support and use it by default
-  * change minimum Node.js version from 16 to 18
-* **compiler**
-  * use the new LLVM pass manager
-  * allow systems with more stack space to allocate larger values on the stack
-  * `build`: fix a crash due to sharing GlobalValues between build instances
-  * `cgo`: add `C._Bool` type
-  * `cgo`: fix calling CGo callback inside generic function
-  * `compileopts`: set `purego` build tag by default so that more packages can be built
-  * `compileopts`: force-enable CGo to avoid build issues
-  * `compiler`: fix crash on type assert on interfaces with no methods
-  * `interp`: print LLVM instruction in traceback
-  * `interp`: support runtime times by running them at runtime
-  * `loader`: enforce Go language version in the type checker (this may break existing programs with an incorrect Go version in go.mod)
-  * `transform`: fix bug in StringToBytes optimization pass
-* **standard library**
-  * `crypto/tls`: stub out a lot of functions
-  * `internal/task`, `machine`: make TinyGo code usable with "big Go" CGo
-  * `machine`: implement `I2C.SetBaudRate` consistently across chips
-  * `machine`: implement `SPI.Configure` consistently across chips
-  * `machine`: add `DeviceID` for nrf, rp2040, sam, stm32
-  * `machine`: use smaller UART buffer size on atmega chips
-  * `machine/usb`: allow setting a serial number using a linker flag
-  * `math`: support more math functions on baremetal (picolibc) systems
-  * `net`: replace entire net package with a new one based on the netdev driver
-  * `os/user`: add bare-bones implementation of this package
-  * `reflect`: stub `CallSlice` and `FuncOf`
-  * `reflect`: add `TypeFor[T]`
-  * `reflect`: update `IsZero` to Go 1.22 semantics
-  * `reflect`: move indirect values into interface when setting interfaces
-  * `runtime`: stub `Breakpoint`
-  * `sync`: implement trylock
-* **targets**
-  * `atmega`: use UART double speed mode for fewer errors and higher throughput
-  * `atmega328pb`: refactor to enable extra uart
-  * `avr`: don't compile large parts of picolibc (math, stdio) for LLVM 17 support
-  * `esp32`: switch over to the official SVD file
-  * `esp32c3`: implement USB_SERIAL for USBCDC communication
-  * `esp32c3`: implement I2C
-  * `esp32c3`: implement RNG
-  * `esp32c3`: add more ROM functions and update linker script for the in-progress wifi support
-  * `esp32c3`: update to newer SVD files
-  * `rp2040`: add support for UART hardware flow control
-  * `rp2040`: add definition for `machine.PinToggle`
-  * `rp2040`: set XOSC startup delay multiplier
-  * `samd21`: add support for UART hardware flow control
-  * `samd51`: add support for UART hardware flow control
-  * `wasm`: increase default stack size to 64k for wasi/wasm targets
-  * `wasm`: bump wasi-libc version to SDK 20
-  * `wasm`: remove line of dead code in wasm_exec.js
-* **new targets/boards**
-  * `qtpy-esp32c3`: add Adafruit QT Py ESP32-C3 board
-  * `mksnanov3`: add support for the MKS Robin Nano V3.x
-  * `nrf52840-generic`: add generic nrf52840 chip support
-  * `thumby`: add support for Thumby
-  * `wasm`: add new `wasm-generic` target that doesn't depend on WASI or a browser
-* **boards**
-  * `arduino-mkrwifi1010`, `arduino-nano33`, `nano-rp2040`, `matrixportal-m4`, `metro-m4-airlift`, `pybadge`, `pyportal`: add `ninafw` build tag and some constants for BLE support
-  * `gopher-badge`: fix typo in USB product name
-  * `nano-rp2040`: add UART1 and correct mappings for NINA via UART
-  * `pico`: bump default stack size from 2kB to 8kB
-  * `wioterminal`: expose UART4
-
-
 0.30.0
 ---
 

Dockerfile

@@ -1,15 +1,10 @@
 # tinygo-llvm stage obtains the llvm source for TinyGo
-FROM golang:1.22 AS tinygo-llvm
+FROM golang:1.21 AS tinygo-llvm
 
 RUN apt-get update && \
-    apt-get install -y apt-utils make cmake clang-15 ninja-build && \
-    rm -rf \
-        /var/lib/apt/lists/* \
-        /var/log/* \
-        /var/tmp/* \
-        /tmp/*
+    apt-get install -y apt-utils make cmake clang-15 ninja-build
 
-COPY ./GNUmakefile /tinygo/GNUmakefile
+COPY ./Makefile /tinygo/Makefile
 
 RUN cd /tinygo/ && \
     make llvm-source
@@ -20,24 +15,26 @@ FROM tinygo-llvm AS tinygo-llvm-build
 RUN cd /tinygo/ && \
     make llvm-build
 
-# tinygo-compiler-build stage builds the compiler itself
-FROM tinygo-llvm-build AS tinygo-compiler-build
+# tinygo-compiler stage builds the compiler itself
+FROM tinygo-llvm-build AS tinygo-compiler
 
 COPY . /tinygo
 
-# build the compiler and tools
+# update submodules
 RUN cd /tinygo/ && \
-    git submodule update --init --recursive && \
+    rm -rf ./lib/*/ && \
+    git submodule sync && \
+    git submodule update --init --recursive --force
+
+RUN cd /tinygo/ && \
+    make
+
+# tinygo-tools stage installs the needed dependencies to compile TinyGo programs for all platforms.
+FROM tinygo-compiler AS tinygo-tools
+
+RUN cd /tinygo/ && \
+    make wasi-libc binaryen && \
     make gen-device -j4 && \
-    make build/release
+    cp build/* $GOPATH/bin/
 
-# tinygo-compiler copies the compiler build over to a base Go container (without
-# all the build tools etc).
-FROM golang:1.21 AS tinygo-compiler
-
-# Copy tinygo build.
-COPY --from=tinygo-compiler-build /tinygo/build/release/tinygo /tinygo
-
-# Configure the container.
-ENV PATH="${PATH}:/tinygo/bin"
 CMD ["tinygo"]

GNUmakefile

@@ -10,7 +10,7 @@ LLD_SRC ?= $(LLVM_PROJECTDIR)/lld
 
 # Try to autodetect LLVM build tools.
 # Versions are listed here in descending priority order.
-LLVM_VERSIONS = 17 16 15
+LLVM_VERSIONS = 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)
@@ -32,6 +32,9 @@ export GOROOT = $(shell $(GO) env GOROOT)
 # Flags to pass to go test.
 GOTESTFLAGS ?=
 
+# md5sum binary
+MD5SUM = md5sum
+
 # tinygo binary for tests
 TINYGO ?= $(call detect,tinygo,tinygo $(CURDIR)/build/tinygo)
 
@@ -127,14 +130,14 @@ ifeq ($(OS),Windows_NT)
     USE_SYSTEM_BINARYEN ?= 1
 
 else ifeq ($(shell uname -s),Darwin)
-    MD5SUM ?= md5
+    MD5SUM = md5
 
     CGO_LDFLAGS += -lxar
 
     USE_SYSTEM_BINARYEN ?= 1
 
 else ifeq ($(shell uname -s),FreeBSD)
-    MD5SUM ?= md5
+    MD5SUM = md5
     START_GROUP = -Wl,--start-group
     END_GROUP = -Wl,--end-group
 else
@@ -142,9 +145,6 @@ else
     END_GROUP = -Wl,--end-group
 endif
 
-# md5sum binary default, can be overridden by an environment variable
-MD5SUM ?= md5sum
-
 # Libraries that should be linked in for the statically linked Clang.
 CLANG_LIB_NAMES = clangAnalysis 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++
@@ -190,7 +190,7 @@ gen-device: gen-device-stm32
 endif
 
 gen-device-avr:
-	@if [ ! -e lib/avr/README.md ]; then echo "Submodules have not been downloaded. Please download them using:\n  git submodule update --init --recursive"; exit 1; fi
+	@if [ ! -e lib/avr/README.md ]; then echo "Submodules have not been downloaded. Please download them using:\n  git submodule update --init"; exit 1; fi
 	$(GO) build -o ./build/gen-device-avr ./tools/gen-device-avr/
 	./build/gen-device-avr lib/avr/packs/atmega src/device/avr/
 	./build/gen-device-avr lib/avr/packs/tiny src/device/avr/
@@ -238,7 +238,7 @@ gen-device-renesas: build/gen-device-svd
 
 # Get LLVM sources.
 $(LLVM_PROJECTDIR)/llvm:
-	git clone -b xtensa_release_17.0.1 --depth=1 https://github.com/espressif/llvm-project $(LLVM_PROJECTDIR)
+	git clone -b xtensa_release_16.x --depth=1 https://github.com/espressif/llvm-project $(LLVM_PROJECTDIR)
 llvm-source: $(LLVM_PROJECTDIR)/llvm
 
 # Configure LLVM.
@@ -256,7 +256,7 @@ ifneq ($(USE_SYSTEM_BINARYEN),1)
 binaryen: build/wasm-opt$(EXE)
 build/wasm-opt$(EXE):
 	mkdir -p build
-	cd lib/binaryen && cmake -G Ninja . -DBUILD_STATIC_LIB=ON -DBUILD_TESTS=OFF $(BINARYEN_OPTION) && ninja bin/wasm-opt$(EXE)
+	cd lib/binaryen && cmake -G Ninja . -DBUILD_STATIC_LIB=ON $(BINARYEN_OPTION) && ninja bin/wasm-opt$(EXE)
 	cp lib/binaryen/bin/wasm-opt$(EXE) build/wasm-opt$(EXE)
 endif
 
@@ -264,19 +264,19 @@ endif
 .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 --recursive"; 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)
+	@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)
 
 # Check for Node.js used during WASM tests.
 NODEJS_VERSION := $(word 1,$(subst ., ,$(shell node -v | cut -c 2-)))
-MIN_NODEJS_VERSION=18
+MIN_NODEJS_VERSION=16
 
 .PHONY: check-nodejs-version
 check-nodejs-version:
 ifeq (, $(shell which node))
-	@echo "Install NodeJS version 18+ to run tests."; exit 1;
+	@echo "Install NodeJS version 16+ 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
+	@if [ $(NODEJS_VERSION) -lt $(MIN_NODEJS_VERSION) ]; then echo "Install NodeJS version 16+ to run tests."; exit 1; fi
 
 # Build the Go compiler.
 tinygo:
@@ -506,8 +506,6 @@ smoketest:
 	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=feather-rp2040      examples/watchdog
 	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=feather-rp2040      examples/device-id
-	@$(MD5SUM) test.hex
 	# test simulated boards on play.tinygo.org
 ifneq ($(WASM), 0)
 	$(TINYGO) build -size short -o test.wasm -tags=arduino              examples/blinky1
@@ -670,8 +668,6 @@ endif
 	@$(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
 	# test pwm
 	$(TINYGO) build -size short -o test.hex -target=itsybitsy-m0        examples/pwm
 	@$(MD5SUM) test.hex
@@ -686,8 +682,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=nrf52840-s140v6-uf2-generic	examples/serial
-	@$(MD5SUM) test.hex
 ifneq ($(STM32), 0)
 	$(TINYGO) build -size short -o test.hex -target=bluepill            examples/blinky1
 	@$(MD5SUM) test.hex
@@ -721,11 +715,7 @@ ifneq ($(STM32), 0)
 	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=swan                examples/blinky1
 	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=mksnanov3           examples/blinky1
-	@$(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/serial
 	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=arduino             examples/blinky1
@@ -762,7 +752,9 @@ ifneq ($(XTENSA), 0)
 	$(TINYGO) build -size short -o test.bin -target mch2022             examples/serial
 	@$(MD5SUM) test.bin
 endif
-	$(TINYGO) build -size short -o test.bin -target=qtpy-esp32c3        examples/serial
+	$(TINYGO) build -size short -o test.bin -target=esp32c3             examples/serial
+	@$(MD5SUM) test.bin
+	$(TINYGO) build -size short -o test.bin -target=esp32c3-12f         examples/serial
 	@$(MD5SUM) test.bin
 	$(TINYGO) build -size short -o test.bin -target=m5stamp-c3          examples/serial
 	@$(MD5SUM) test.bin
@@ -775,7 +767,6 @@ endif
 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
-	$(TINYGO) build -size short -o wasm.wasm -target=wasm-unknown       examples/hello-wasm-unknown
 endif
 	# test various compiler flags
 	$(TINYGO) build -size short -o test.hex -target=pca10040 -gc=none -scheduler=none examples/blinky1
@@ -784,8 +775,6 @@ endif
 	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=pca10040 -serial=none examples/echo
 	@$(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/serial
 	@$(MD5SUM) test.nro
 	$(TINYGO) build -size short -o test.hex -target=pca10040 -opt=0     ./testdata/stdlib.go
@@ -845,7 +834,6 @@ endif
 	@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
-	@cp -rp lib/musl/src/linux           build/release/tinygo/lib/musl/src
 	@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
@@ -890,7 +878,7 @@ deb:
 	@mkdir -p build/release-deb/usr/local/lib
 	cp -ar build/release/tinygo build/release-deb/usr/local/lib/tinygo
 	ln -sf ../lib/tinygo/bin/tinygo build/release-deb/usr/local/bin/tinygo
-	fpm -f -s dir -t deb -n tinygo -a $(DEB_ARCH) -v $(shell grep "const version = " goenv/version.go | awk '{print $$NF}') -m '@tinygo-org' --description='TinyGo is a Go compiler for small places.' --license='BSD 3-Clause' --url=https://tinygo.org/ --deb-changelog CHANGELOG.md -p build/release.deb -C ./build/release-deb
+	fpm -f -s dir -t deb -n tinygo -a $(DEB_ARCH) -v $(shell grep "const Version = " goenv/version.go | awk '{print $$NF}') -m '@tinygo-org' --description='TinyGo is a Go compiler for small places.' --license='BSD 3-Clause' --url=https://tinygo.org/ --deb-changelog CHANGELOG.md -p build/release.deb -C ./build/release-deb
 
 ifneq ($(RELEASEONLY), 1)
 release: build/release

README.md

@@ -1,6 +1,6 @@
 # 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) [![CircleCI](https://circleci.com/gh/tinygo-org/tinygo/tree/dev.svg?style=svg)](https://circleci.com/gh/tinygo-org/tinygo/tree/dev)
+[![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) [![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.
 

builder/build.go

@@ -114,30 +114,6 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe
 		cacheDir = tmpdir
 	}
 
-	// Create default global values.
-	globalValues := map[string]map[string]string{
-		"runtime": {
-			"buildVersion": goenv.Version(),
-		},
-		"testing": {},
-	}
-	if config.TestConfig.CompileTestBinary {
-		// The testing.testBinary is set to "1" when in a test.
-		// This is needed for testing.Testing() to work correctly.
-		globalValues["testing"]["testBinary"] = "1"
-	}
-
-	// Copy over explicitly set global values, like
-	// -ldflags="-X main.Version="1.0"
-	for pkgPath, vals := range config.Options.GlobalValues {
-		if _, ok := globalValues[pkgPath]; !ok {
-			globalValues[pkgPath] = map[string]string{}
-		}
-		for k, v := range vals {
-			globalValues[pkgPath][k] = v
-		}
-	}
-
 	// Check for a libc dependency.
 	// As a side effect, this also creates the headers for the given libc, if
 	// the libc needs them.
@@ -192,12 +168,11 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe
 		CodeModel:       config.CodeModel(),
 		RelocationModel: config.RelocationModel(),
 		SizeLevel:       sizeLevel,
-		TinyGoVersion:   goenv.Version(),
+		TinyGoVersion:   goenv.Version,
 
 		Scheduler:          config.Scheduler(),
 		AutomaticStackSize: config.AutomaticStackSize(),
 		DefaultStackSize:   config.StackSize(),
-		MaxStackAlloc:      config.MaxStackAlloc(),
 		NeedsStackObjects:  config.NeedsStackObjects(),
 		Debug:              !config.Options.SkipDWARF, // emit DWARF except when -internal-nodwarf is passed
 	}
@@ -212,7 +187,7 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe
 	defer machine.Dispose()
 
 	// Load entire program AST into memory.
-	lprogram, err := loader.Load(config, pkgName, types.Config{
+	lprogram, err := loader.Load(config, pkgName, config.ClangHeaders, types.Config{
 		Sizes: compiler.Sizes(machine),
 	})
 	if err != nil {
@@ -241,12 +216,34 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe
 	var packageJobs []*compileJob
 	packageActionIDJobs := make(map[string]*compileJob)
 
+	if config.Options.GlobalValues == nil {
+		config.Options.GlobalValues = make(map[string]map[string]string)
+	}
+	if config.Options.GlobalValues["runtime"]["buildVersion"] == "" {
+		version := goenv.Version
+		if strings.HasSuffix(goenv.Version, "-dev") && goenv.GitSha1 != "" {
+			version += "-" + goenv.GitSha1
+		}
+		if config.Options.GlobalValues["runtime"] == nil {
+			config.Options.GlobalValues["runtime"] = make(map[string]string)
+		}
+		config.Options.GlobalValues["runtime"]["buildVersion"] = version
+	}
+	if config.TestConfig.CompileTestBinary {
+		// The testing.testBinary is set to "1" when in a test.
+		// This is needed for testing.Testing() to work correctly.
+		if config.Options.GlobalValues["testing"] == nil {
+			config.Options.GlobalValues["testing"] = make(map[string]string)
+		}
+		config.Options.GlobalValues["testing"]["testBinary"] = "1"
+	}
+
 	var embedFileObjects []*compileJob
 	for _, pkg := range lprogram.Sorted() {
 		pkg := pkg // necessary to avoid a race condition
 
 		var undefinedGlobals []string
-		for name := range globalValues[pkg.Pkg.Path()] {
+		for name := range config.Options.GlobalValues[pkg.Pkg.Path()] {
 			undefinedGlobals = append(undefinedGlobals, name)
 		}
 		sort.Strings(undefinedGlobals)
@@ -574,7 +571,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, globalValues)
+			err := optimizeProgram(mod, config)
 			if err != nil {
 				return err
 			}
@@ -663,7 +660,7 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe
 		job := &compileJob{
 			description: "compile extra file " + path,
 			run: func(job *compileJob) error {
-				result, err := compileAndCacheCFile(abspath, tmpdir, config.CFlags(false), config.Options.PrintCommands)
+				result, err := compileAndCacheCFile(abspath, tmpdir, config.CFlags(), config.Options.PrintCommands)
 				job.result = result
 				return err
 			},
@@ -808,8 +805,21 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe
 
 			// Run wasm-opt for wasm binaries
 			if arch := strings.Split(config.Triple(), "-")[0]; arch == "wasm32" {
-				optLevel, _, _ := config.OptLevel()
-				opt := "-" + optLevel
+				var opt string
+				switch config.Options.Opt {
+				case "none", "0":
+					opt = "-O0"
+				case "1":
+					opt = "-O1"
+				case "2":
+					opt = "-O2"
+				case "s":
+					opt = "-Os"
+				case "z":
+					opt = "-Oz"
+				default:
+					return fmt.Errorf("unknown opt level: %q", config.Options.Opt)
+				}
 
 				var args []string
 
@@ -1030,7 +1040,7 @@ 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, globalValues map[string]map[string]string) error {
+func optimizeProgram(mod llvm.Module, config *compileopts.Config) error {
 	err := interp.Run(mod, config.Options.InterpTimeout, config.DumpSSA())
 	if err != nil {
 		return err
@@ -1049,7 +1059,7 @@ func optimizeProgram(mod llvm.Module, config *compileopts.Config, globalValues m
 	}
 
 	// Insert values from -ldflags="-X ..." into the IR.
-	err = setGlobalValues(mod, globalValues)
+	err = setGlobalValues(mod, config.Options.GlobalValues)
 	if err != nil {
 		return err
 	}

builder/builder_test.go

@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/tinygo-org/tinygo/compileopts"
+	"github.com/tinygo-org/tinygo/goenv"
 	"tinygo.org/x/go-llvm"
 )
 
@@ -35,7 +36,6 @@ func TestClangAttributes(t *testing.T) {
 		"riscv-qemu",
 		"wasi",
 		"wasm",
-		"wasm-unknown",
 	}
 	if hasBuiltinTools {
 		// hasBuiltinTools is set when TinyGo is statically linked with LLVM,
@@ -74,6 +74,7 @@ func TestClangAttributes(t *testing.T) {
 
 func testClangAttributes(t *testing.T, options *compileopts.Options) {
 	testDir := t.TempDir()
+	clangHeaderPath := getClangHeaderPath(goenv.Get("TINYGOROOT"))
 
 	ctx := llvm.NewContext()
 	defer ctx.Dispose()
@@ -83,8 +84,9 @@ func testClangAttributes(t *testing.T, options *compileopts.Options) {
 		t.Fatalf("could not load target: %s", err)
 	}
 	config := compileopts.Config{
-		Options: options,
-		Target:  target,
+		Options:      options,
+		Target:       target,
+		ClangHeaders: clangHeaderPath,
 	}
 
 	// Create a very simple C input file.
@@ -96,7 +98,7 @@ func testClangAttributes(t *testing.T, options *compileopts.Options) {
 
 	// Compile this file using Clang.
 	outpath := filepath.Join(testDir, "test.bc")
-	flags := append([]string{"-c", "-emit-llvm", "-o", outpath, srcpath}, config.CFlags(false)...)
+	flags := append([]string{"-c", "-emit-llvm", "-o", outpath, srcpath}, config.CFlags()...)
 	if config.GOOS() == "darwin" {
 		// Silence some warnings that happen when testing GOOS=darwin on
 		// something other than MacOS.

builder/buildid.go

@@ -77,15 +77,6 @@ func ReadBuildID() ([]byte, error) {
 			}
 			return raw[4:], nil
 		}
-
-		// Normally we would have found a build ID by now. But not on Nix,
-		// unfortunately, because Nix adds -no_uuid for some reason:
-		// https://github.com/NixOS/nixpkgs/issues/178366
-		// Fall back to the same implementation that we use for Windows.
-		id, err := readRawGoBuildID(f, 32*1024)
-		if len(id) != 0 || err != nil {
-			return id, err
-		}
 	default:
 		// On other platforms (such as Windows) there isn't such a convenient
 		// build ID. Luckily, Go does have an equivalent of the build ID, which
@@ -97,31 +88,16 @@ func ReadBuildID() ([]byte, error) {
 		// directly. Luckily the build ID is always at the start of the file.
 		// For details, see:
 		// https://github.com/golang/go/blob/master/src/cmd/internal/buildid/buildid.go
-		id, err := readRawGoBuildID(f, 4096)
-		if len(id) != 0 || err != nil {
-			return id, err
+		fileStart := make([]byte, 4096)
+		_, err := io.ReadFull(f, fileStart)
+		index := bytes.Index(fileStart, []byte("\xff Go build ID: \""))
+		if index < 0 || index > len(fileStart)-103 {
+			return nil, fmt.Errorf("could not find build id in %s", err)
+		}
+		buf := fileStart[index : index+103]
+		if bytes.HasPrefix(buf, []byte("\xff Go build ID: \"")) && bytes.HasSuffix(buf, []byte("\"\n \xff")) {
+			return buf[len("\xff Go build ID: \"") : len(buf)-1], nil
 		}
 	}
-	return nil, fmt.Errorf("could not find build ID in %v", executable)
-}
-
-// The Go toolchain stores a build ID in the binary that we can use, as a
-// fallback if binary file specific build IDs can't be obtained.
-// This function reads that build ID from the binary.
-func readRawGoBuildID(f *os.File, prefixSize int) ([]byte, error) {
-	fileStart := make([]byte, prefixSize)
-	_, err := io.ReadFull(f, fileStart)
-	if err != nil {
-		return nil, fmt.Errorf("could not read build id from %s: %v", f.Name(), err)
-	}
-	index := bytes.Index(fileStart, []byte("\xff Go build ID: \""))
-	if index < 0 || index > len(fileStart)-103 {
-		return nil, fmt.Errorf("could not find build id in %s", f.Name())
-	}
-	buf := fileStart[index : index+103]
-	if bytes.HasPrefix(buf, []byte("\xff Go build ID: \"")) && bytes.HasSuffix(buf, []byte("\"\n \xff")) {
-		return buf[len("\xff Go build ID: \"") : len(buf)-1], nil
-	}
-
-	return nil, nil
+	return nil, fmt.Errorf("could not find build ID in %s", executable)
 }

builder/cc1as.cpp

@@ -1,12 +1,5 @@
 //go:build byollvm
 
-// Source: https://github.com/llvm/llvm-project/blob/main/clang/tools/driver/cc1as_main.cpp
-// This file needs to be updated each LLVM release.
-// There are a few small modifications to make, like:
-//   * ExecuteAssembler is made non-static.
-//   * The struct AssemblerImplementation is moved to cc1as.h so it can be
-//     included elsewhere.
-
 //===-- cc1as.cpp - Clang Assembler  --------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
@@ -28,8 +21,8 @@
 #include "clang/Frontend/TextDiagnosticPrinter.h"
 #include "clang/Frontend/Utils.h"
 #include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/StringSwitch.h"
+#include "llvm/ADT/Triple.h"
 #include "llvm/IR/DataLayout.h"
 #include "llvm/MC/MCAsmBackend.h"
 #include "llvm/MC/MCAsmInfo.h"
@@ -53,6 +46,7 @@
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/FormattedStream.h"
+#include "llvm/Support/Host.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/Process.h"
@@ -61,8 +55,6 @@
 #include "llvm/Support/TargetSelect.h"
 #include "llvm/Support/Timer.h"
 #include "llvm/Support/raw_ostream.h"
-#include "llvm/TargetParser/Host.h"
-#include "llvm/TargetParser/Triple.h"
 #include <memory>
 #include <optional>
 #include <system_error>
@@ -159,7 +151,8 @@ bool AssemblerInvocation::CreateFromArgs(AssemblerInvocation &Opts,
 
   for (const auto &Arg : Args.getAllArgValues(OPT_fdebug_prefix_map_EQ)) {
     auto Split = StringRef(Arg).split('=');
-    Opts.DebugPrefixMap.emplace_back(Split.first, Split.second);
+    Opts.DebugPrefixMap.insert(
+        {std::string(Split.first), std::string(Split.second)});
   }
 
   // Frontend Options
@@ -232,9 +225,6 @@ bool AssemblerInvocation::CreateFromArgs(AssemblerInvocation &Opts,
             .Case("default", EmitDwarfUnwindType::Default);
   }
 
-  Opts.EmitCompactUnwindNonCanonical =
-      Args.hasArg(OPT_femit_compact_unwind_non_canonical);
-
   Opts.AsSecureLogFile = Args.getLastArgValue(OPT_as_secure_log_file);
 
   return Success;
@@ -270,8 +260,8 @@ static bool ExecuteAssemblerImpl(AssemblerInvocation &Opts,
       MemoryBuffer::getFileOrSTDIN(Opts.InputFile, /*IsText=*/true);
 
   if (std::error_code EC = Buffer.getError()) {
-    return Diags.Report(diag::err_fe_error_reading)
-           << Opts.InputFile << EC.message();
+    Error = EC.message();
+    return Diags.Report(diag::err_fe_error_reading) << Opts.InputFile;
   }
 
   SourceMgr SrcMgr;
@@ -288,7 +278,6 @@ static bool ExecuteAssemblerImpl(AssemblerInvocation &Opts,
 
   MCTargetOptions MCOptions;
   MCOptions.EmitDwarfUnwind = Opts.EmitDwarfUnwind;
-  MCOptions.EmitCompactUnwindNonCanonical = Opts.EmitCompactUnwindNonCanonical;
   MCOptions.AsSecureLogFile = Opts.AsSecureLogFile;
 
   std::unique_ptr<MCAsmInfo> MAI(

builder/cc1as.h

@@ -1,6 +1,3 @@
-// Source: https://github.com/llvm/llvm-project/blob/main/clang/tools/driver/cc1as_main.cpp
-// See cc1as.cpp for details.
-
 //===-- cc1as.h - Clang Assembler  ----------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
@@ -47,7 +44,7 @@ struct AssemblerInvocation {
   std::string DwarfDebugFlags;
   std::string DwarfDebugProducer;
   std::string DebugCompilationDir;
-  llvm::SmallVector<std::pair<std::string, std::string>, 0> DebugPrefixMap;
+  std::map<const std::string, const std::string> DebugPrefixMap;
   llvm::DebugCompressionType CompressDebugSections =
       llvm::DebugCompressionType::None;
   std::string MainFileName;
@@ -92,10 +89,6 @@ struct AssemblerInvocation {
   /// Whether to emit DWARF unwind info.
   EmitDwarfUnwindType EmitDwarfUnwind;
 
-  // Whether to emit compact-unwind for non-canonical entries.
-  // Note: maybe overriden by other constraints.
-  unsigned EmitCompactUnwindNonCanonical : 1;
-
   /// The name of the relocation model to use.
   std::string RelocationModel;
 
@@ -135,7 +128,6 @@ public:
     DwarfVersion = 0;
     EmbedBitcode = 0;
     EmitDwarfUnwind = EmitDwarfUnwindType::Default;
-    EmitCompactUnwindNonCanonical = false;
   }
 
   static bool CreateFromArgs(AssemblerInvocation &Res,

builder/clang.cpp

@@ -11,7 +11,7 @@
 #include <clang/FrontendTool/Utils.h>
 #include <llvm/ADT/IntrusiveRefCntPtr.h>
 #include <llvm/Option/Option.h>
-#include <llvm/TargetParser/Host.h>
+#include <llvm/Support/Host.h>
 
 using namespace llvm;
 using namespace clang;

builder/config.go

@@ -27,16 +27,19 @@ func NewConfig(options *compileopts.Options) (*compileopts.Config, error) {
 	if err != nil {
 		return nil, err
 	}
-	if major != 1 || minor < 18 || minor > 22 {
+	if major != 1 || minor < 18 || minor > 21 {
 		// 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.18 through 1.22, got go%d.%d", major, minor)
+		return nil, fmt.Errorf("requires go version 1.18 through 1.21, got go%d.%d", major, minor)
 	}
 
+	clangHeaderPath := getClangHeaderPath(goenv.Get("TINYGOROOT"))
+
 	return &compileopts.Config{
 		Options:        options,
 		Target:         spec,
 		GoMinorVersion: minor,
+		ClangHeaders:   clangHeaderPath,
 		TestConfig:     options.TestConfig,
 	}, nil
 }

builder/env.go

@@ -0,0 +1,105 @@
+package builder
+
+import (
+	"errors"
+	"io/fs"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"sort"
+	"strings"
+
+	"tinygo.org/x/go-llvm"
+)
+
+// getClangHeaderPath returns the path to the built-in Clang headers. It tries
+// multiple locations, which should make it find the directory when installed in
+// various ways.
+func getClangHeaderPath(TINYGOROOT string) string {
+	// Check whether we're running from the source directory.
+	path := filepath.Join(TINYGOROOT, "llvm-project", "clang", "lib", "Headers")
+	if _, err := os.Stat(path); !errors.Is(err, fs.ErrNotExist) {
+		return path
+	}
+
+	// Check whether we're running from the installation directory.
+	path = filepath.Join(TINYGOROOT, "lib", "clang", "include")
+	if _, err := os.Stat(path); !errors.Is(err, fs.ErrNotExist) {
+		return path
+	}
+
+	// It looks like we are built with a system-installed LLVM. Do a last
+	// attempt: try to use Clang headers relative to the clang binary.
+	llvmMajor := strings.Split(llvm.Version, ".")[0]
+	for _, cmdName := range commands["clang"] {
+		binpath, err := exec.LookPath(cmdName)
+		if err == nil {
+			// This should be the command that will also be used by
+			// execCommand. To avoid inconsistencies, make sure we use the
+			// headers relative to this command.
+			binpath, err = filepath.EvalSymlinks(binpath)
+			if err != nil {
+				// Unexpected.
+				return ""
+			}
+			// Example executable:
+			//     /usr/lib/llvm-9/bin/clang
+			// Example include path:
+			//     /usr/lib/llvm-9/lib64/clang/9.0.1/include/
+			llvmRoot := filepath.Dir(filepath.Dir(binpath))
+			clangVersionRoot := filepath.Join(llvmRoot, "lib64", "clang")
+			dirs64, err64 := ioutil.ReadDir(clangVersionRoot)
+			// Example include path:
+			//     /usr/lib/llvm-9/lib/clang/9.0.1/include/
+			clangVersionRoot = filepath.Join(llvmRoot, "lib", "clang")
+			dirs32, err32 := ioutil.ReadDir(clangVersionRoot)
+			if err64 != nil && err32 != nil {
+				// Unexpected.
+				continue
+			}
+			dirnames := make([]string, len(dirs64)+len(dirs32))
+			dirCount := 0
+			for _, d := range dirs32 {
+				name := d.Name()
+				if name == llvmMajor || strings.HasPrefix(name, llvmMajor+".") {
+					dirnames[dirCount] = filepath.Join(llvmRoot, "lib", "clang", name)
+					dirCount++
+				}
+			}
+			for _, d := range dirs64 {
+				name := d.Name()
+				if name == llvmMajor || strings.HasPrefix(name, llvmMajor+".") {
+					dirnames[dirCount] = filepath.Join(llvmRoot, "lib64", "clang", name)
+					dirCount++
+				}
+			}
+			sort.Strings(dirnames)
+			// Check for the highest version first.
+			for i := dirCount - 1; i >= 0; i-- {
+				path := filepath.Join(dirnames[i], "include")
+				_, err := os.Stat(filepath.Join(path, "stdint.h"))
+				if err == nil {
+					return path
+				}
+			}
+		}
+	}
+
+	// On Arch Linux, the clang executable is stored in /usr/bin rather than being symlinked from there.
+	// Search directly in /usr/lib for clang.
+	if matches, err := filepath.Glob("/usr/lib/clang/" + llvmMajor + ".*.*"); err == nil {
+		// Check for the highest version first.
+		sort.Strings(matches)
+		for i := len(matches) - 1; i >= 0; i-- {
+			path := filepath.Join(matches[i], "include")
+			_, err := os.Stat(filepath.Join(path, "stdint.h"))
+			if err == nil {
+				return path
+			}
+		}
+	}
+
+	// Could not find it.
+	return ""
+}

builder/library.go

@@ -143,10 +143,6 @@ func (l *Library) load(config *compileopts.Config, tmpdir string) (job *compileJ
 	// reproducible. Otherwise the temporary directory is stored in the archive
 	// itself, which varies each run.
 	args := append(l.cflags(target, headerPath), "-c", "-Oz", "-gdwarf-4", "-ffunction-sections", "-fdata-sections", "-Wno-macro-redefined", "--target="+target, "-fdebug-prefix-map="+dir+"="+remapDir)
-	resourceDir := goenv.ClangResourceDir(false)
-	if resourceDir != "" {
-		args = append(args, "-resource-dir="+resourceDir)
-	}
 	cpu := config.CPU()
 	if cpu != "" {
 		// X86 has deprecated the -mcpu flag, so we need to use -march instead.

builder/lld.cpp

@@ -5,11 +5,7 @@
 #include <lld/Common/Driver.h>
 #include <llvm/Support/Parallel.h>
 
-LLD_HAS_DRIVER(coff)
-LLD_HAS_DRIVER(elf)
-LLD_HAS_DRIVER(mingw)
-LLD_HAS_DRIVER(macho)
-LLD_HAS_DRIVER(wasm)
+extern "C" {
 
 static void configure() {
 #if _WIN64
@@ -20,13 +16,28 @@ static void configure() {
 #endif
 }
 
-extern "C" {
-
-bool tinygo_link(int argc, char **argv) {
+bool tinygo_link_elf(int argc, char **argv) {
 	configure();
 	std::vector<const char*> args(argv, argv + argc);
-	lld::Result r = lld::lldMain(args, llvm::outs(), llvm::errs(), LLD_ALL_DRIVERS);
-	return !r.retCode;
+	return lld::elf::link(args, llvm::outs(), llvm::errs(), false, false);
+}
+
+bool tinygo_link_macho(int argc, char **argv) {
+	configure();
+	std::vector<const char*> args(argv, argv + argc);
+	return lld::macho::link(args, llvm::outs(), llvm::errs(), false, false);
+}
+
+bool tinygo_link_mingw(int argc, char **argv) {
+	configure();
+	std::vector<const char*> args(argv, argv + argc);
+	return lld::mingw::link(args, llvm::outs(), llvm::errs(), false, false);
+}
+
+bool tinygo_link_wasm(int argc, char **argv) {
+	configure();
+	std::vector<const char*> args(argv, argv + argc);
+	return lld::wasm::link(args, llvm::outs(), llvm::errs(), false, false);
 }
 
 } // external "C"

builder/musl.go

@@ -119,7 +119,6 @@ var Musl = Library{
 			"internal/syscall_ret.c",
 			"internal/vdso.c",
 			"legacy/*.c",
-			"linux/*.c",
 			"malloc/*.c",
 			"malloc/mallocng/*.c",
 			"mman/*.c",

builder/picolibc.go

@@ -3,7 +3,6 @@ package builder
 import (
 	"os"
 	"path/filepath"
-	"strings"
 
 	"github.com/tinygo-org/tinygo/goenv"
 )
@@ -42,23 +41,91 @@ var Picolibc = Library{
 	},
 	sourceDir: func() string { return filepath.Join(goenv.Get("TINYGOROOT"), "lib/picolibc/newlib") },
 	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,
-			// pow, etc). Therefore exclude those source files for those chips.
-			// Unfortunately it's difficult to exclude only some chips, so this
-			// excludes those files on all AVR chips for now.
-			// More information:
-			// https://github.com/llvm/llvm-project/issues/67042
-			sources = append(sources, picolibcSourcesLarge...)
-		}
-		return sources, nil
+		return picolibcSources, nil
 	},
 }
 
 var picolibcSources = []string{
 	"../../picolibc-stdio.c",
 
+	// srcs_tinystdio
+	"libc/tinystdio/asprintf.c",
+	"libc/tinystdio/bufio.c",
+	"libc/tinystdio/clearerr.c",
+	"libc/tinystdio/ecvt_r.c",
+	"libc/tinystdio/ecvt.c",
+	"libc/tinystdio/ecvtf_r.c",
+	"libc/tinystdio/ecvtf.c",
+	"libc/tinystdio/fcvt.c",
+	"libc/tinystdio/fcvt_r.c",
+	"libc/tinystdio/fcvtf.c",
+	"libc/tinystdio/fcvtf_r.c",
+	"libc/tinystdio/gcvt.c",
+	"libc/tinystdio/gcvtf.c",
+	"libc/tinystdio/fclose.c",
+	"libc/tinystdio/fdevopen.c",
+	"libc/tinystdio/feof.c",
+	"libc/tinystdio/ferror.c",
+	"libc/tinystdio/fflush.c",
+	"libc/tinystdio/fgetc.c",
+	"libc/tinystdio/fgets.c",
+	"libc/tinystdio/fileno.c",
+	"libc/tinystdio/filestrget.c",
+	"libc/tinystdio/filestrput.c",
+	"libc/tinystdio/filestrputalloc.c",
+	"libc/tinystdio/fmemopen.c",
+	"libc/tinystdio/fprintf.c",
+	"libc/tinystdio/fputc.c",
+	"libc/tinystdio/fputs.c",
+	"libc/tinystdio/fread.c",
+	//"libc/tinystdio/freopen.c", // crashes with AVR, see: https://github.com/picolibc/picolibc/pull/369
+	"libc/tinystdio/fscanf.c",
+	"libc/tinystdio/fseek.c",
+	"libc/tinystdio/fseeko.c",
+	"libc/tinystdio/ftell.c",
+	"libc/tinystdio/ftello.c",
+	"libc/tinystdio/fwrite.c",
+	"libc/tinystdio/getchar.c",
+	"libc/tinystdio/gets.c",
+	"libc/tinystdio/matchcaseprefix.c",
+	"libc/tinystdio/mktemp.c",
+	"libc/tinystdio/perror.c",
+	"libc/tinystdio/printf.c",
+	"libc/tinystdio/putchar.c",
+	"libc/tinystdio/puts.c",
+	"libc/tinystdio/rewind.c",
+	"libc/tinystdio/scanf.c",
+	"libc/tinystdio/setbuf.c",
+	"libc/tinystdio/setbuffer.c",
+	"libc/tinystdio/setlinebuf.c",
+	"libc/tinystdio/setvbuf.c",
+	"libc/tinystdio/snprintf.c",
+	"libc/tinystdio/sprintf.c",
+	"libc/tinystdio/snprintfd.c",
+	"libc/tinystdio/snprintff.c",
+	"libc/tinystdio/sprintff.c",
+	"libc/tinystdio/sprintfd.c",
+	"libc/tinystdio/sscanf.c",
+	"libc/tinystdio/strfromf.c",
+	"libc/tinystdio/strfromd.c",
+	"libc/tinystdio/strtof.c",
+	"libc/tinystdio/strtof_l.c",
+	"libc/tinystdio/strtod.c",
+	"libc/tinystdio/strtod_l.c",
+	"libc/tinystdio/ungetc.c",
+	"libc/tinystdio/vasprintf.c",
+	"libc/tinystdio/vfiprintf.c",
+	"libc/tinystdio/vfprintf.c",
+	"libc/tinystdio/vfprintff.c",
+	"libc/tinystdio/vfscanf.c",
+	"libc/tinystdio/vfiscanf.c",
+	"libc/tinystdio/vfscanff.c",
+	"libc/tinystdio/vprintf.c",
+	"libc/tinystdio/vscanf.c",
+	"libc/tinystdio/vsscanf.c",
+	"libc/tinystdio/vsnprintf.c",
+	"libc/tinystdio/vsprintf.c",
+
 	"libc/string/bcmp.c",
 	"libc/string/bcopy.c",
 	"libc/string/bzero.c",
@@ -162,87 +229,6 @@ var picolibcSources = []string{
 	"libc/string/wmempcpy.c",
 	"libc/string/wmemset.c",
 	"libc/string/xpg_strerror_r.c",
-}
-
-// Parts of picolibc that are too large for small AVRs.
-var picolibcSourcesLarge = []string{
-	// srcs_tinystdio
-	"libc/tinystdio/asprintf.c",
-	"libc/tinystdio/bufio.c",
-	"libc/tinystdio/clearerr.c",
-	"libc/tinystdio/ecvt_r.c",
-	"libc/tinystdio/ecvt.c",
-	"libc/tinystdio/ecvtf_r.c",
-	"libc/tinystdio/ecvtf.c",
-	"libc/tinystdio/fcvt.c",
-	"libc/tinystdio/fcvt_r.c",
-	"libc/tinystdio/fcvtf.c",
-	"libc/tinystdio/fcvtf_r.c",
-	"libc/tinystdio/gcvt.c",
-	"libc/tinystdio/gcvtf.c",
-	"libc/tinystdio/fclose.c",
-	"libc/tinystdio/fdevopen.c",
-	"libc/tinystdio/feof.c",
-	"libc/tinystdio/ferror.c",
-	"libc/tinystdio/fflush.c",
-	"libc/tinystdio/fgetc.c",
-	"libc/tinystdio/fgets.c",
-	"libc/tinystdio/fileno.c",
-	"libc/tinystdio/filestrget.c",
-	"libc/tinystdio/filestrput.c",
-	"libc/tinystdio/filestrputalloc.c",
-	"libc/tinystdio/fmemopen.c",
-	"libc/tinystdio/fprintf.c",
-	"libc/tinystdio/fputc.c",
-	"libc/tinystdio/fputs.c",
-	"libc/tinystdio/fread.c",
-	//"libc/tinystdio/freopen.c", // crashes with AVR, see: https://github.com/picolibc/picolibc/pull/369
-	"libc/tinystdio/fscanf.c",
-	"libc/tinystdio/fseek.c",
-	"libc/tinystdio/fseeko.c",
-	"libc/tinystdio/ftell.c",
-	"libc/tinystdio/ftello.c",
-	"libc/tinystdio/fwrite.c",
-	"libc/tinystdio/getchar.c",
-	"libc/tinystdio/gets.c",
-	"libc/tinystdio/matchcaseprefix.c",
-	"libc/tinystdio/mktemp.c",
-	"libc/tinystdio/perror.c",
-	"libc/tinystdio/printf.c",
-	"libc/tinystdio/putchar.c",
-	"libc/tinystdio/puts.c",
-	"libc/tinystdio/rewind.c",
-	"libc/tinystdio/scanf.c",
-	"libc/tinystdio/setbuf.c",
-	"libc/tinystdio/setbuffer.c",
-	"libc/tinystdio/setlinebuf.c",
-	"libc/tinystdio/setvbuf.c",
-	"libc/tinystdio/snprintf.c",
-	"libc/tinystdio/sprintf.c",
-	"libc/tinystdio/snprintfd.c",
-	"libc/tinystdio/snprintff.c",
-	"libc/tinystdio/sprintff.c",
-	"libc/tinystdio/sprintfd.c",
-	"libc/tinystdio/sscanf.c",
-	"libc/tinystdio/strfromf.c",
-	"libc/tinystdio/strfromd.c",
-	"libc/tinystdio/strtof.c",
-	"libc/tinystdio/strtof_l.c",
-	"libc/tinystdio/strtod.c",
-	"libc/tinystdio/strtod_l.c",
-	"libc/tinystdio/ungetc.c",
-	"libc/tinystdio/vasprintf.c",
-	"libc/tinystdio/vfiprintf.c",
-	"libc/tinystdio/vfprintf.c",
-	"libc/tinystdio/vfprintff.c",
-	"libc/tinystdio/vfscanf.c",
-	"libc/tinystdio/vfiscanf.c",
-	"libc/tinystdio/vfscanff.c",
-	"libc/tinystdio/vprintf.c",
-	"libc/tinystdio/vscanf.c",
-	"libc/tinystdio/vsscanf.c",
-	"libc/tinystdio/vsnprintf.c",
-	"libc/tinystdio/vsprintf.c",
 
 	"libm/common/sf_finite.c",
 	"libm/common/sf_copysign.c",
@@ -337,12 +323,6 @@ var picolibcSourcesLarge = []string{
 	"libm/common/math_err_may_uflow.c",
 	"libm/common/math_err_check_uflow.c",
 	"libm/common/math_err_check_oflow.c",
-	"libm/common/math_errf_divzerof.c",
-	"libm/common/math_errf_invalidf.c",
-	"libm/common/math_errf_may_uflowf.c",
-	"libm/common/math_errf_oflowf.c",
-	"libm/common/math_errf_uflowf.c",
-	"libm/common/math_errf_with_errnof.c",
 	"libm/common/math_inexact.c",
 	"libm/common/math_inexactf.c",
 	"libm/common/log.c",

builder/sizes_test.go

@@ -41,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", 4476, 280, 0, 2252},
+		{"hifive1b", "examples/echo", 4484, 280, 0, 2252},
 		{"microbit", "examples/serial", 2724, 388, 8, 2256},
-		{"wioterminal", "examples/pininterrupt", 5996, 1484, 116, 6816},
+		{"wioterminal", "examples/pininterrupt", 6000, 1484, 116, 6816},
 
 		// TODO: also check wasm. Right now this is difficult, because
 		// wasm binaries are run through wasm-opt and therefore the

builder/tools-builtin.go

@@ -12,7 +12,10 @@ import (
 #include <stdbool.h>
 #include <stdlib.h>
 bool tinygo_clang_driver(int argc, char **argv);
-bool tinygo_link(int argc, char **argv);
+bool tinygo_link_elf(int argc, char **argv);
+bool tinygo_link_macho(int argc, char **argv);
+bool tinygo_link_mingw(int argc, char **argv);
+bool tinygo_link_wasm(int argc, char **argv);
 */
 import "C"
 
@@ -23,7 +26,16 @@ const hasBuiltinTools = true
 // This version actually runs the tools because TinyGo was compiled while
 // linking statically with LLVM (with the byollvm build tag).
 func RunTool(tool string, args ...string) error {
-	args = append([]string{tool}, args...)
+	linker := "elf"
+	if tool == "ld.lld" && len(args) >= 2 {
+		if args[0] == "-m" && (args[1] == "i386pep" || args[1] == "arm64pe") {
+			linker = "mingw"
+		} else if args[0] == "-flavor" {
+			linker = args[1]
+			args = args[2:]
+		}
+	}
+	args = append([]string{"tinygo:" + tool}, args...)
 
 	var cflag *C.char
 	buf := C.calloc(C.size_t(len(args)), C.size_t(unsafe.Sizeof(cflag)))
@@ -39,8 +51,19 @@ func RunTool(tool string, args ...string) error {
 	switch tool {
 	case "clang":
 		ok = C.tinygo_clang_driver(C.int(len(args)), (**C.char)(buf))
-	case "ld.lld", "wasm-ld":
-		ok = C.tinygo_link(C.int(len(args)), (**C.char)(buf))
+	case "ld.lld":
+		switch linker {
+		case "darwin":
+			ok = C.tinygo_link_macho(C.int(len(args)), (**C.char)(buf))
+		case "elf":
+			ok = C.tinygo_link_elf(C.int(len(args)), (**C.char)(buf))
+		case "mingw":
+			ok = C.tinygo_link_mingw(C.int(len(args)), (**C.char)(buf))
+		default:
+			return errors.New("unknown linker: " + linker)
+		}
+	case "wasm-ld":
+		ok = C.tinygo_link_wasm(C.int(len(args)), (**C.char)(buf))
 	default:
 		return errors.New("unknown tool: " + tool)
 	}

builder/tools.go

@@ -1,6 +1,7 @@
 package builder
 
 import (
+	"errors"
 	"os"
 	"os/exec"
 
@@ -11,6 +12,11 @@ import (
 func runCCompiler(flags ...string) error {
 	if hasBuiltinTools {
 		// Compile this with the internal Clang compiler.
+		headerPath := getClangHeaderPath(goenv.Get("TINYGOROOT"))
+		if headerPath == "" {
+			return errors.New("could not locate Clang headers")
+		}
+		flags = append(flags, "-I"+headerPath)
 		cmd := exec.Command(os.Args[0], append([]string{"clang"}, flags...)...)
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr

cgo/cgo.go

@@ -25,15 +25,9 @@ import (
 	"golang.org/x/tools/go/ast/astutil"
 )
 
-// Function that's only defined in Go 1.22.
-var setASTFileFields = func(f *ast.File, start, end token.Pos) {
-}
-
 // cgoPackage holds all CGo-related information of a package.
 type cgoPackage struct {
 	generated       *ast.File
-	packageName     string
-	cgoFiles        []*ast.File
 	generatedPos    token.Pos
 	errors          []error
 	currentDir      string // current working directory
@@ -171,9 +165,8 @@ func GoBytes(ptr unsafe.Pointer, length C.int) []byte {
 // 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) ([]*ast.File, []string, []string, []string, map[string][]byte, []error) {
+func Process(files []*ast.File, dir, importPath string, fset *token.FileSet, cflags []string, clangHeaders string) (*ast.File, []string, []string, []string, map[string][]byte, []error) {
 	p := &cgoPackage{
-		packageName:     files[0].Name.Name,
 		currentDir:      dir,
 		importPath:      importPath,
 		fset:            fset,
@@ -209,7 +202,6 @@ func Process(files []*ast.File, dir, importPath string, fset *token.FileSet, cfl
 		// This is always a bug in the cgo package.
 		panic("unexpected error: " + err.Error())
 	}
-	p.cgoFiles = append(p.cgoFiles, p.generated)
 	// 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
@@ -300,6 +292,9 @@ func Process(files []*ast.File, dir, importPath string, fset *token.FileSet, cfl
 	// have better alternatives anyway.
 	cflagsForCGo := append([]string{"-D_FORTIFY_SOURCE=0"}, cflags...)
 	cflagsForCGo = append(cflagsForCGo, p.cflags...)
+	if clangHeaders != "" {
+		cflagsForCGo = append(cflagsForCGo, "-isystem", clangHeaders)
+	}
 
 	// Retrieve types such as C.int, C.longlong, etc from C.
 	p.newCGoFile(nil, -1).readNames(builtinAliasTypedefs, cflagsForCGo, "", func(names map[string]clangCursor) {
@@ -340,7 +335,7 @@ func Process(files []*ast.File, dir, importPath string, fset *token.FileSet, cfl
 	// Print the newly generated in-memory AST, for debugging.
 	//ast.Print(fset, p.generated)
 
-	return p.cgoFiles, p.cgoHeaders, p.cflags, p.ldflags, p.visitedFiles, p.errors
+	return p.generated, p.cgoHeaders, p.cflags, p.ldflags, p.visitedFiles, p.errors
 }
 
 func (p *cgoPackage) newCGoFile(file *ast.File, index int) *cgoFile {

cgo/cgo_go122.go

@@ -1,17 +0,0 @@
-//go:build go1.22
-
-package cgo
-
-// Code specifically for Go 1.22.
-
-import (
-	"go/ast"
-	"go/token"
-)
-
-func init() {
-	setASTFileFields = func(f *ast.File, start, end token.Pos) {
-		f.FileStart = start
-		f.FileEnd = end
-	}
-}

cgo/cgo_test.go

@@ -55,7 +55,7 @@ func TestCGo(t *testing.T) {
 			}
 
 			// Process the AST with CGo.
-			cgoFiles, _, _, _, _, cgoErrors := Process([]*ast.File{f}, "testdata", "main", fset, cflags)
+			cgoAST, _, _, _, _, cgoErrors := Process([]*ast.File{f}, "testdata", "main", fset, cflags, "")
 
 			// Check the AST for type errors.
 			var typecheckErrors []error
@@ -66,7 +66,7 @@ func TestCGo(t *testing.T) {
 				Importer: simpleImporter{},
 				Sizes:    types.SizesFor("gccgo", "arm"),
 			}
-			_, err = config.Check("", fset, append([]*ast.File{f}, cgoFiles...), nil)
+			_, err = config.Check("", fset, []*ast.File{f, cgoAST}, nil)
 			if err != nil && len(typecheckErrors) == 0 {
 				// Only report errors when no type errors are found (an
 				// unexpected condition).
@@ -91,7 +91,7 @@ func TestCGo(t *testing.T) {
 				}
 				buf.WriteString("\n")
 			}
-			err = format.Node(buf, fset, cgoFiles[0])
+			err = format.Node(buf, fset, cgoAST)
 			if err != nil {
 				t.Errorf("could not write out CGo AST: %v", err)
 			}

cgo/libclang.go

@@ -589,13 +589,6 @@ func (p *cgoPackage) getClangLocationPosition(location C.CXSourceLocation, tu C.
 		f := p.fset.AddFile(filename, -1, int(size))
 		f.SetLines(lines)
 		p.tokenFiles[filename] = f
-		// Add dummy file AST, to satisfy the type checker.
-		astFile := &ast.File{
-			Package: f.Pos(0),
-			Name:    ast.NewIdent(p.packageName),
-		}
-		setASTFileFields(astFile, f.Pos(0), f.Pos(int(size)))
-		p.cgoFiles = append(p.cgoFiles, astFile)
 	}
 	positionFile := p.tokenFiles[filename]
 

cgo/libclang_config_llvm15.go

@@ -8,8 +8,8 @@ package cgo
 #cgo darwin,arm64 CFLAGS:  -I/opt/homebrew/opt/llvm@15/include
 #cgo freebsd      CFLAGS:  -I/usr/local/llvm15/include
 #cgo linux        LDFLAGS: -L/usr/lib/llvm-15/lib -lclang
-#cgo darwin,amd64 LDFLAGS: -L/usr/local/opt/llvm@15/lib -lclang
-#cgo darwin,arm64 LDFLAGS: -L/opt/homebrew/opt/llvm@15/lib -lclang
+#cgo darwin,amd64 LDFLAGS: -L/usr/local/opt/llvm@15/lib -lclang -lffi
+#cgo darwin,arm64 LDFLAGS: -L/opt/homebrew/opt/llvm@15/lib -lclang -lffi
 #cgo freebsd      LDFLAGS: -L/usr/local/llvm15/lib -lclang
 */
 import "C"

cgo/libclang_config_llvm16.go

@@ -1,8 +1,8 @@
-//go:build !byollvm && llvm16
+//go:build !byollvm && !llvm15
 
 package cgo
 
-// As of 2023-05-05, there is a packaging issue with LLVM 16 on Debian:
+// As of 2023-05-05, there is a packaging issue on Debian:
 // https://github.com/llvm/llvm-project/issues/62199
 // A workaround is to fix this locally, using something like this:
 //
@@ -14,8 +14,8 @@ package cgo
 #cgo darwin,arm64 CFLAGS:  -I/opt/homebrew/opt/llvm@16/include
 #cgo freebsd      CFLAGS:  -I/usr/local/llvm16/include
 #cgo linux        LDFLAGS: -L/usr/lib/llvm-16/lib -lclang
-#cgo darwin,amd64 LDFLAGS: -L/usr/local/opt/llvm@16/lib -lclang
-#cgo darwin,arm64 LDFLAGS: -L/opt/homebrew/opt/llvm@16/lib -lclang
+#cgo darwin,amd64 LDFLAGS: -L/usr/local/opt/llvm@16/lib -lclang -lffi
+#cgo darwin,arm64 LDFLAGS: -L/opt/homebrew/opt/llvm@16/lib -lclang -lffi
 #cgo freebsd      LDFLAGS: -L/usr/local/llvm16/lib -lclang
 */
 import "C"

cgo/libclang_config_llvm17.go

@@ -1,15 +0,0 @@
-//go:build !byollvm && !llvm15 && !llvm16
-
-package cgo
-
-/*
-#cgo linux        CFLAGS:  -I/usr/include/llvm-17 -I/usr/include/llvm-c-17 -I/usr/lib/llvm-17/include
-#cgo darwin,amd64 CFLAGS:  -I/usr/local/opt/llvm@17/include
-#cgo darwin,arm64 CFLAGS:  -I/opt/homebrew/opt/llvm@17/include
-#cgo freebsd      CFLAGS:  -I/usr/local/llvm17/include
-#cgo linux        LDFLAGS: -L/usr/lib/llvm-17/lib -lclang
-#cgo darwin,amd64 LDFLAGS: -L/usr/local/opt/llvm@17/lib -lclang
-#cgo darwin,arm64 LDFLAGS: -L/opt/homebrew/opt/llvm@17/lib -lclang
-#cgo freebsd      LDFLAGS: -L/usr/local/llvm17/lib -lclang
-*/
-import "C"

compileopts/config.go

@@ -19,6 +19,7 @@ type Config struct {
 	Options        *Options
 	Target         *TargetSpec
 	GoMinorVersion int
+	ClangHeaders   string // Clang built-in header include path
 	TestConfig     TestConfig
 }
 
@@ -74,12 +75,7 @@ func (c *Config) GOARM() string {
 
 // BuildTags returns the complete list of build tags used during this build.
 func (c *Config) BuildTags() []string {
-	tags := append(c.Target.BuildTags, []string{
-		"tinygo",                                     // that's the compiler
-		"purego",                                     // to get various crypto packages to work
-		"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
+	tags := append(c.Target.BuildTags, []string{"tinygo", "math_big_pure_go", "gc." + c.GC(), "scheduler." + c.Scheduler(), "serial." + c.Serial()}...)
 	for i := 1; i <= c.GoMinorVersion; i++ {
 		tags = append(tags, fmt.Sprintf("go1.%d", i))
 	}
@@ -87,6 +83,12 @@ func (c *Config) BuildTags() []string {
 	return tags
 }
 
+// CgoEnabled returns true if (and only if) CGo is enabled. It is true by
+// default and false if CGO_ENABLED is set to "0".
+func (c *Config) CgoEnabled() bool {
+	return goenv.Get("CGO_ENABLED") == "1"
+}
+
 // GC returns the garbage collection strategy in use on this platform. Valid
 // values are "none", "leaking", "conservative" and "precise".
 func (c *Config) GC() string {
@@ -188,15 +190,6 @@ func (c *Config) StackSize() uint64 {
 	return c.Target.DefaultStackSize
 }
 
-// MaxStackAlloc returns the size of the maximum allocation to put on the stack vs heap.
-func (c *Config) MaxStackAlloc() uint64 {
-	if c.StackSize() > 32*1024 {
-		return 1024
-	}
-
-	return 256
-}
-
 // RP2040BootPatch returns whether the RP2040 boot patch should be applied that
 // calculates and patches in the checksum for the 2nd stage bootloader.
 func (c *Config) RP2040BootPatch() bool {
@@ -266,35 +259,24 @@ func (c *Config) DefaultBinaryExtension() string {
 
 // CFlags returns the flags to pass to the C compiler. This is necessary for CGo
 // preprocessing.
-func (c *Config) CFlags(libclang bool) []string {
+func (c *Config) CFlags() []string {
 	var cflags []string
 	for _, flag := range c.Target.CFlags {
 		cflags = append(cflags, strings.ReplaceAll(flag, "{root}", goenv.Get("TINYGOROOT")))
 	}
-	resourceDir := goenv.ClangResourceDir(libclang)
-	if resourceDir != "" {
-		// The resource directory contains the built-in clang headers like
-		// stdbool.h, stdint.h, float.h, etc.
-		// It is left empty if we're using an external compiler (that already
-		// knows these headers).
-		cflags = append(cflags,
-			"-resource-dir="+resourceDir,
-		)
-	}
 	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"),
+			"--sysroot="+filepath.Join(root, "lib/macos-minimal-sdk/src"),
 		)
 	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"),
+			"--sysroot="+path,
+			"-isystem", filepath.Join(path, "include"), // necessary for Xtensa
 			"-isystem", filepath.Join(picolibcDir, "include"),
 			"-isystem", filepath.Join(picolibcDir, "tinystdio"),
 		)
@@ -315,8 +297,7 @@ func (c *Config) CFlags(libclang bool) []string {
 		root := goenv.Get("TINYGOROOT")
 		path, _ := c.LibcPath("mingw-w64")
 		cflags = append(cflags,
-			"-nostdlibinc",
-			"-isystem", filepath.Join(path, "include"),
+			"--sysroot="+path,
 			"-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",

compileopts/options.go

@@ -10,7 +10,7 @@ import (
 var (
 	validGCOptions            = []string{"none", "leaking", "conservative", "custom", "precise"}
 	validSchedulerOptions     = []string{"none", "tasks", "asyncify"}
-	validSerialOptions        = []string{"none", "uart", "usb", "rtt"}
+	validSerialOptions        = []string{"none", "uart", "usb"}
 	validPrintSizeOptions     = []string{"none", "short", "full"}
 	validPanicStrategyOptions = []string{"print", "trap"}
 	validOptOptions           = []string{"none", "0", "1", "2", "s", "z"}
@@ -23,7 +23,6 @@ type Options struct {
 	GOOS            string // environment variable
 	GOARCH          string // environment variable
 	GOARM           string // environment variable (only used with GOARCH=arm)
-	Directory       string // working dir, leave it unset to use the current working dir
 	Target          string
 	Opt             string
 	GC              string
@@ -49,6 +48,7 @@ type Options struct {
 	Programmer      string
 	OpenOCDCommands []string
 	LLVMFeatures    string
+	Directory       string
 	PrintJSON       bool
 	Monitor         bool
 	BaudRate        int

compileopts/target.go

@@ -246,43 +246,6 @@ func LoadTarget(options *Options) (*TargetSpec, error) {
 	return spec, nil
 }
 
-// GetTargetSpecs retrieves target specifications from the TINYGOROOT targets
-// directory.  Only valid target JSON files are considered, and the function
-// returns a map of target names to their respective TargetSpec.
-func GetTargetSpecs() (map[string]*TargetSpec, error) {
-	dir := filepath.Join(goenv.Get("TINYGOROOT"), "targets")
-	entries, err := os.ReadDir(dir)
-	if err != nil {
-		return nil, fmt.Errorf("could not list targets: %w", err)
-	}
-
-	maps := map[string]*TargetSpec{}
-	for _, entry := range entries {
-		entryInfo, err := entry.Info()
-		if err != nil {
-			return nil, fmt.Errorf("could not get entry info: %w", err)
-		}
-		if !entryInfo.Mode().IsRegular() || !strings.HasSuffix(entry.Name(), ".json") {
-			// Only inspect JSON files.
-			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.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).
-			continue
-		}
-		name := entry.Name()
-		name = name[:len(name)-5]
-		maps[name] = spec
-	}
-	return maps, nil
-}
-
 func defaultTarget(goos, goarch, triple string) (*TargetSpec, error) {
 	// No target spec available. Use the default one, useful on most systems
 	// with a regular OS.
@@ -301,10 +264,10 @@ func defaultTarget(goos, goarch, triple string) (*TargetSpec, error) {
 	switch goarch {
 	case "386":
 		spec.CPU = "pentium4"
-		spec.Features = "+cmov,+cx8,+fxsr,+mmx,+sse,+sse2,+x87"
+		spec.Features = "+cx8,+fxsr,+mmx,+sse,+sse2,+x87"
 	case "amd64":
 		spec.CPU = "x86-64"
-		spec.Features = "+cmov,+cx8,+fxsr,+mmx,+sse,+sse2,+x87"
+		spec.Features = "+cx8,+fxsr,+mmx,+sse,+sse2,+x87"
 	case "arm":
 		spec.CPU = "generic"
 		spec.CFlags = append(spec.CFlags, "-fno-unwind-tables", "-fno-asynchronous-unwind-tables")
@@ -320,10 +283,8 @@ func defaultTarget(goos, goarch, triple string) (*TargetSpec, error) {
 		spec.CPU = "generic"
 		if goos == "darwin" {
 			spec.Features = "+neon"
-		} else if goos == "windows" {
+		} else { // windows, linux
 			spec.Features = "+neon,-fmv"
-		} else { // linux
-			spec.Features = "+neon,-fmv,-outline-atomics"
 		}
 	case "wasm":
 		spec.CPU = "generic"
@@ -351,20 +312,6 @@ func defaultTarget(goos, goarch, triple string) (*TargetSpec, error) {
 		spec.RTLib = "compiler-rt"
 		spec.Libc = "musl"
 		spec.LDFlags = append(spec.LDFlags, "--gc-sections")
-		if goarch == "arm64" {
-			// Disable outline atomics. For details, see:
-			// https://cpufun.substack.com/p/atomics-in-aarch64
-			// A better way would be to fully support outline atomics, which
-			// makes atomics slightly more efficient on systems with many cores.
-			// But the instructions are only supported on newer aarch64 CPUs, so
-			// this feature is normally put in a system library which does
-			// feature detection for you.
-			// We take the lazy way out and simply disable this feature, instead
-			// of enabling it in compiler-rt (which is a bit more complicated).
-			// We don't really need this feature anyway as we don't even support
-			// proper threading.
-			spec.CFlags = append(spec.CFlags, "-mno-outline-atomics")
-		}
 	} else if goos == "windows" {
 		spec.Linker = "ld.lld"
 		spec.Libc = "mingw-w64"
@@ -397,12 +344,12 @@ func defaultTarget(goos, goarch, triple string) (*TargetSpec, error) {
 		spec.Linker = "wasm-ld"
 		spec.RTLib = "compiler-rt"
 		spec.Libc = "wasi-libc"
-		spec.DefaultStackSize = 1024 * 64 // 64kB
+		spec.DefaultStackSize = 1024 * 32 // 32kB
 		spec.LDFlags = append(spec.LDFlags,
 			"--stack-first",
 			"--no-demangle",
 		)
-		spec.Emulator = "wasmtime --dir={tmpDir}::/tmp {}"
+		spec.Emulator = "wasmtime --mapdir=/tmp::{tmpDir} {}"
 		spec.ExtraFiles = append(spec.ExtraFiles,
 			"src/runtime/asm_tinygowasm.S",
 			"src/internal/task/task_asyncify_wasm.S",

compiler/compiler.go

@@ -53,7 +53,6 @@ type Config struct {
 	Scheduler          string
 	AutomaticStackSize bool
 	DefaultStackSize   uint64
-	MaxStackAlloc      uint64
 	NeedsStackObjects  bool
 	Debug              bool // Whether to emit debug information in the LLVM module.
 }
@@ -1998,8 +1997,8 @@ func (b *builder) createExpr(expr ssa.Value) (llvm.Value, error) {
 	case *ssa.Alloc:
 		typ := b.getLLVMType(expr.Type().Underlying().(*types.Pointer).Elem())
 		size := b.targetData.TypeAllocSize(typ)
-		// Move all "large" allocations to the heap.
-		if expr.Heap || size > b.MaxStackAlloc {
+		// Move all "large" allocations to the heap.  This value is also transform.maxStackAlloc.
+		if expr.Heap || size > 256 {
 			// Calculate ^uintptr(0)
 			maxSize := llvm.ConstNot(llvm.ConstInt(b.uintptrType, 0, false)).ZExtValue()
 			if size > maxSize {
@@ -3262,11 +3261,7 @@ func (b *builder) createUnOp(unop *ssa.UnOp) (llvm.Value, error) {
 			// Instead of a load from the global, create a bitcast of the
 			// function pointer itself.
 			name := strings.TrimSuffix(unop.X.(*ssa.Global).Name(), "$funcaddr")
-			pkg := b.fn.Pkg
-			if pkg == nil {
-				pkg = b.fn.Origin().Pkg
-			}
-			_, fn := b.getFunction(pkg.Members[name].(*ssa.Function))
+			_, fn := b.getFunction(b.fn.Pkg.Members[name].(*ssa.Function))
 			if fn.IsNil() {
 				return llvm.Value{}, b.makeError(unop.Pos(), "cgo function not found: "+name)
 			}

compiler/compiler_test.go

@@ -243,7 +243,7 @@ func testCompilePackage(t *testing.T, options *compileopts.Options, file string)
 	defer machine.Dispose()
 
 	// Load entire program AST into memory.
-	lprogram, err := loader.Load(config, "./testdata/"+file, types.Config{
+	lprogram, err := loader.Load(config, "./testdata/"+file, config.ClangHeaders, types.Config{
 		Sizes: Sizes(machine),
 	})
 	if err != nil {

compiler/interface.go

@@ -684,25 +684,19 @@ func (b *builder) createTypeAssert(expr *ssa.TypeAssert) llvm.Value {
 
 	actualTypeNum := b.CreateExtractValue(itf, 0, "interface.type")
 	commaOk := llvm.Value{}
+	if _, ok := expr.AssertedType.Underlying().(*types.Interface); ok {
+		// Type assert on interface type.
+		// 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}, "")
 
-	if intf, ok := expr.AssertedType.Underlying().(*types.Interface); ok {
-		if intf.Empty() {
-			// intf is the empty interface => no methods
-			// 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 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)
 		globalName := "reflect/types.typeid:" + name

compiler/testdata/goroutine-wasm-asyncify.ll

@@ -21,7 +21,7 @@ entry:
 ; Function Attrs: nounwind
 define hidden void @main.regularFunctionGoroutine(ptr %context) unnamed_addr #2 {
 entry:
-  call void @"internal/task.start"(i32 ptrtoint (ptr @"main.regularFunction$gowrapper" to i32), ptr nonnull inttoptr (i32 5 to ptr), i32 65536, ptr undef) #9
+  call void @"internal/task.start"(i32 ptrtoint (ptr @"main.regularFunction$gowrapper" to i32), ptr nonnull inttoptr (i32 5 to ptr), i32 32768, ptr undef) #9
   ret void
 }
 
@@ -43,7 +43,7 @@ declare void @"internal/task.start"(i32, ptr, i32, ptr) #1
 ; Function Attrs: nounwind
 define hidden void @main.inlineFunctionGoroutine(ptr %context) unnamed_addr #2 {
 entry:
-  call void @"internal/task.start"(i32 ptrtoint (ptr @"main.inlineFunctionGoroutine$1$gowrapper" to i32), ptr nonnull inttoptr (i32 5 to ptr), i32 65536, 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 32768, ptr undef) #9
   ret void
 }
 
@@ -76,7 +76,7 @@ entry:
   store i32 5, ptr %0, align 4
   %1 = getelementptr inbounds { i32, ptr }, ptr %0, i32 0, i32 1
   store ptr %n, ptr %1, align 4
-  call void @"internal/task.start"(i32 ptrtoint (ptr @"main.closureFunctionGoroutine$1$gowrapper" to i32), ptr nonnull %0, i32 65536, ptr undef) #9
+  call void @"internal/task.start"(i32 ptrtoint (ptr @"main.closureFunctionGoroutine$1$gowrapper" to i32), ptr nonnull %0, i32 32768, ptr undef) #9
   %2 = load i32, ptr %n, align 4
   call void @runtime.printint32(i32 %2, ptr undef) #9
   ret void
@@ -113,7 +113,7 @@ entry:
   store ptr %fn.context, ptr %1, align 4
   %2 = getelementptr inbounds { i32, ptr, ptr }, ptr %0, i32 0, i32 2
   store ptr %fn.funcptr, ptr %2, align 4
-  call void @"internal/task.start"(i32 ptrtoint (ptr @main.funcGoroutine.gowrapper to i32), ptr nonnull %0, i32 65536, ptr undef) #9
+  call void @"internal/task.start"(i32 ptrtoint (ptr @main.funcGoroutine.gowrapper to i32), ptr nonnull %0, i32 32768, ptr undef) #9
   ret void
 }
 
@@ -167,7 +167,7 @@ entry:
   store i32 4, ptr %.repack1, align 4
   %2 = getelementptr inbounds { ptr, %runtime._string, ptr }, ptr %0, i32 0, i32 2
   store ptr %itf.typecode, ptr %2, align 4
-  call void @"internal/task.start"(i32 ptrtoint (ptr @"interface:{Print:func:{basic:string}{}}.Print$invoke$gowrapper" to i32), ptr nonnull %0, i32 65536, 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 32768, ptr undef) #9
   ret void
 }
 

flake.lock

@@ -1,60 +0,0 @@
-{
-  "nodes": {
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1694529238,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1703068421,
-        "narHash": "sha256-WSw5Faqlw75McIflnl5v7qVD/B3S2sLh+968bpOGrWA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d65bceaee0fb1e64363f7871bc43dc1c6ecad99f",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-23.11",
-        "type": "indirect"
-      }
-    },
-    "root": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

flake.nix

@@ -1,86 +0,0 @@
-# A Nix flake file, mainly intended for developing TinyGo.
-# You can download Nix here, for use on your Linux or macOS system:
-#   https://nixos.org/download.html
-# After you have installed Nix, you can enter the development environment as
-# follows:
-#
-#   nix develop
-#
-# This drops you into a bash shell, where you can install TinyGo simply using
-# the following command:
-#
-#   go install
-#
-# That's all! Assuming you've set up your $PATH correctly, you can now use the
-# tinygo command as usual:
-#
-#   tinygo version
-#
-# But you'll need a bit more to make TinyGo actually able to compile code:
-#
-#   make llvm-source                        # fetch compiler-rt
-#   git submodule update --init --recursive # fetch lots of other libraries and SVD files
-#   make gen-device -j4                     # build src/device/*/*.go files
-#   make wasi-libc                          # build support for wasi/wasm
-#
-# With this, you should have an environment that can compile anything - except
-# for the Xtensa architecture (ESP8266/ESP32) because support for that lives in
-# a separate LLVM fork.
-#
-# You can also do many other things from this environment. Building and flashing
-# should work as you're used to: it's not a VM or container so there are no
-# access restrictions and you're running in the same host environment - just
-# with a slightly different set of tools available.
-{
-  inputs = {
-    # Use a recent stable release, but fix the version to make it reproducible.
-    # This version should be updated from time to time.
-    nixpkgs.url = "nixpkgs/nixos-23.11";
-    flake-utils.url = "github:numtide/flake-utils";
-  };
-  outputs = { self, nixpkgs, flake-utils }:
-    flake-utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = nixpkgs.legacyPackages.${system};
-      in
-      with pkgs;
-      {
-        devShells.default = mkShell {
-          buildInputs = [
-            # These dependencies are required for building tinygo (go install).
-            go
-            llvmPackages_17.llvm
-            llvmPackages_17.libclang
-            llvmPackages_17.libcxx
-            # Additional dependencies needed at runtime, for building and/or
-            # flashing.
-            llvmPackages_17.lld
-            avrdude
-            binaryen
-            # Additional dependencies needed for on-chip debugging.
-            # These tools are rather big (especially GDB) and not frequently
-            # used, so are commented out. On-chip debugging is still possible if
-            # these tools are available in the host environment.
-            #gdb
-            #openocd
-          ];
-          shellHook= ''
-            # Configure CLANG, LLVM_AR, and LLVM_NM for `make wasi-libc`.
-            # Without setting these explicitly, Homebrew versions might be used
-            # or the default `ar` and `nm` tools might be used (which don't
-            # support wasi).
-            export CLANG="clang-17 -resource-dir ${llvmPackages_17.clang.cc.lib}/lib/clang/17"
-            export LLVM_AR=llvm-ar
-            export LLVM_NM=llvm-nm
-
-            # Make `make smoketest` work (the default is `md5`, while Nix only
-            # has `md5sum`).
-            export MD5SUM=md5sum
-
-            # Ugly hack to make the Clang resources directory available.
-            export GOFLAGS="\"-ldflags=-X github.com/tinygo-org/tinygo/goenv.clangResourceDir=${llvmPackages_17.clang.cc.lib}/lib/clang/17"\"
-          '';
-        };
-      }
-    );
-}

go.mod

@@ -15,11 +15,10 @@ require (
 	github.com/mattn/go-tty v0.0.4
 	github.com/sigurn/crc16 v0.0.0-20211026045750-20ab5afb07e3
 	go.bug.st/serial v1.6.0
-	golang.org/x/net v0.20.0
-	golang.org/x/sys v0.16.0
-	golang.org/x/tools v0.17.0
+	golang.org/x/sys v0.11.0
+	golang.org/x/tools v0.12.0
 	gopkg.in/yaml.v2 v2.4.0
-	tinygo.org/x/go-llvm v0.0.0-20240106122909-c2c543540318
+	tinygo.org/x/go-llvm v0.0.0-20230920233244-32ed56c6be9c
 )
 
 require (
@@ -31,5 +30,4 @@ require (
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-isatty v0.0.12 // indirect
-	golang.org/x/text v0.14.0 // indirect
 )

go.sum

@@ -48,9 +48,7 @@ github.com/sigurn/crc16 v0.0.0-20211026045750-20ab5afb07e3/go.mod h1:9/etS5gpQq9
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 go.bug.st/serial v1.6.0 h1:mAbRGN4cKE2J5gMwsMHC2KQisdLRQssO9WSM+rbZJ8A=
 go.bug.st/serial v1.6.0/go.mod h1:UABfsluHAiaNI+La2iESysd9Vetq7VRdpxvjx7CmmOE=
-golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
-golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
-golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
+golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -58,16 +56,14 @@ golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201207223542-d4d67f95c62d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
-golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
-golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
+golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
+golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss=
+golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
-tinygo.org/x/go-llvm v0.0.0-20240106122909-c2c543540318 h1:4KjZvPtcN1UwobevcGbdzeinx0L1i8HDdJu84bu7NI8=
-tinygo.org/x/go-llvm v0.0.0-20240106122909-c2c543540318/go.mod h1:GFbusT2VTA4I+l4j80b17KFK+6whv69Wtny5U+T8RR0=
+tinygo.org/x/go-llvm v0.0.0-20230920233244-32ed56c6be9c h1:rS8mAFqf0CfxPCbtfsI3bWL4jkb0TBYA1wx7tY1nu28=
+tinygo.org/x/go-llvm v0.0.0-20230920233244-32ed56c6be9c/go.mod h1:GFbusT2VTA4I+l4j80b17KFK+6whv69Wtny5U+T8RR0=

goenv/goenv.go

@@ -14,8 +14,6 @@ import (
 	"runtime"
 	"strings"
 	"sync"
-
-	"tinygo.org/x/go-llvm"
 )
 
 // Keys is a slice of all available environment variable keys.
@@ -35,20 +33,11 @@ func init() {
 	}
 }
 
-// Set to true if we're linking statically against LLVM.
-var hasBuiltinTools = false
-
 // TINYGOROOT is the path to the final location for checking tinygo files. If
 // unset (by a -X ldflag), then sourceDir() will fallback to the original build
 // directory.
 var TINYGOROOT string
 
-// If a particular Clang resource dir must always be used and TinyGo can't
-// figure out the directory using heuristics, this global can be set using a
-// linker flag.
-// This is needed for Nix.
-var clangResourceDir string
-
 // Variables read from a `go env` command invocation.
 var goEnvVars struct {
 	GOPATH    string
@@ -142,8 +131,11 @@ func Get(name string) string {
 		}
 		return filepath.Join(dir, "tinygo")
 	case "CGO_ENABLED":
-		// Always enable CGo. It is required by a number of targets, including
-		// macOS and the rp2040.
+		val := os.Getenv("CGO_ENABLED")
+		if val == "1" || val == "0" {
+			return val
+		}
+		// Default to enabling CGo.
 		return "1"
 	case "TINYGOROOT":
 		return sourceDir()
@@ -292,95 +284,3 @@ func isSourceDir(root string) bool {
 	_, err = os.Stat(filepath.Join(root, "src/device/arm/arm.go"))
 	return err == nil
 }
-
-// ClangResourceDir returns the clang resource dir if available. This is the
-// -resource-dir flag. If it isn't available, an empty string is returned and
-// -resource-dir should be left unset.
-// The libclang flag must be set if the resource dir is read for use by
-// libclang.
-// In that case, the resource dir is always returned (even when linking
-// dynamically against LLVM) because libclang always needs this directory.
-func ClangResourceDir(libclang bool) string {
-	if clangResourceDir != "" {
-		// The resource dir is forced to a particular value at build time.
-		// This is needed on Nix for example, where Clang and libclang don't
-		// know their own resource dir.
-		// Also see:
-		// https://discourse.nixos.org/t/why-is-the-clang-resource-dir-split-in-a-separate-package/34114
-		return clangResourceDir
-	}
-
-	if !hasBuiltinTools && !libclang {
-		// Using external tools, so the resource dir doesn't need to be
-		// specified. Clang knows where to find it.
-		return ""
-	}
-
-	// Check whether we're running from a TinyGo release directory.
-	// This is the case for release binaries on GitHub.
-	root := Get("TINYGOROOT")
-	releaseHeaderDir := filepath.Join(root, "lib", "clang")
-	if _, err := os.Stat(releaseHeaderDir); !errors.Is(err, fs.ErrNotExist) {
-		return releaseHeaderDir
-	}
-
-	if hasBuiltinTools {
-		// We are statically linked to LLVM.
-		// Check whether we're running from the source directory.
-		// This typically happens when TinyGo was built using `make` as part of
-		// development.
-		llvmMajor := strings.Split(llvm.Version, ".")[0]
-		buildResourceDir := filepath.Join(root, "llvm-build", "lib", "clang", llvmMajor)
-		if _, err := os.Stat(buildResourceDir); !errors.Is(err, fs.ErrNotExist) {
-			return buildResourceDir
-		}
-	} else {
-		// We use external tools, either when installed using `go install` or
-		// when packaged in a Linux distribution (Linux distros typically prefer
-		// dynamic linking).
-		// Try to detect the system clang resources directory.
-		resourceDir := findSystemClangResources(root)
-		if resourceDir != "" {
-			return resourceDir
-		}
-	}
-
-	// Resource directory not found.
-	return ""
-}
-
-// Find the Clang resource dir on this particular system.
-// Return the empty string when they aren't found.
-func findSystemClangResources(TINYGOROOT string) string {
-	llvmMajor := strings.Split(llvm.Version, ".")[0]
-
-	switch runtime.GOOS {
-	case "linux", "android":
-		// Header files are typically stored in /usr/lib/clang/<version>/include.
-		// Tested on Fedora 39, Debian 12, and Arch Linux.
-		path := filepath.Join("/usr/lib/clang", llvmMajor)
-		_, err := os.Stat(filepath.Join(path, "include", "stdint.h"))
-		if err == nil {
-			return path
-		}
-	case "darwin":
-		// This assumes a Homebrew installation, like in builder/commands.go.
-		var prefix string
-		switch runtime.GOARCH {
-		case "amd64":
-			prefix = "/usr/local/opt/llvm@" + llvmMajor
-		case "arm64":
-			prefix = "/opt/homebrew/opt/llvm@" + llvmMajor
-		default:
-			return "" // very unlikely for now
-		}
-		path := fmt.Sprintf("%s/lib/clang/%s", prefix, llvmMajor)
-		_, err := os.Stat(path + "/include/stdint.h")
-		if err == nil {
-			return path
-		}
-	}
-
-	// Could not find it.
-	return ""
-}

goenv/tools-builtin.go

@@ -1,7 +0,0 @@
-//go:build byollvm
-
-package goenv
-
-func init() {
-	hasBuiltinTools = true
-}

goenv/version.go

@@ -9,7 +9,7 @@ import (
 
 // Version of TinyGo.
 // Update this value before release of new version of software.
-const version = "0.31.0"
+const Version = "0.30.0"
 
 var (
 	// This variable is set at build time using -ldflags parameters.
@@ -17,16 +17,6 @@ var (
 	GitSha1 string
 )
 
-// Return TinyGo version, either in the form 0.30.0 or as a development version
-// (like 0.30.0-dev-abcd012).
-func Version() string {
-	v := version
-	if strings.HasSuffix(version, "-dev") && GitSha1 != "" {
-		v += "-" + GitSha1
-	}
-	return v
-}
-
 // GetGorootVersion returns the major and minor version for a given GOROOT path.
 // If the goroot cannot be determined, (0, 0) is returned.
 func GetGorootVersion() (major, minor int, err error) {

hooks/post_checkout

@@ -1,4 +1,4 @@
 #!/bin/bash
 # Docker hub does a recursive clone, then checks the branch out,
 # so when a PR adds a submodule (or updates it), it fails.
-git submodule update --init --recursive
+git submodule update --init

interp/interpreter.go

@@ -239,8 +239,7 @@ func (r *runner) run(fn *function, params []value, parentMem *memoryView, indent
 				// already be emitted in initAll.
 				continue
 			case strings.HasPrefix(callFn.name, "runtime.print") || callFn.name == "runtime._panic" || callFn.name == "runtime.hashmapGet" || callFn.name == "runtime.hashmapInterfaceHash" ||
-				callFn.name == "os.runtime_args" || callFn.name == "internal/task.start" || callFn.name == "internal/task.Current" ||
-				callFn.name == "time.startTimer" || callFn.name == "time.stopTimer" || callFn.name == "time.resetTimer":
+				callFn.name == "os.runtime_args" || callFn.name == "internal/task.start" || callFn.name == "internal/task.Current":
 				// These functions should be run at runtime. Specifically:
 				//   * Print and panic functions are best emitted directly without
 				//     interpreting them, otherwise we get a ton of putchar (etc.)
@@ -253,8 +252,6 @@ func (r *runner) run(fn *function, params []value, parentMem *memoryView, indent
 				//     at runtime.
 				//   * internal/task.start, internal/task.Current: start and read shcheduler state,
 				//     which is modified elsewhere.
-				//   * Timer functions access runtime internal state which may
-				//     not be initialized.
 				err := r.runAtRuntime(fn, inst, locals, &mem, indent)
 				if err != nil {
 					return nil, mem, err

loader/goroot.go

@@ -18,6 +18,7 @@ import (
 	"errors"
 	"io"
 	"io/fs"
+	"io/ioutil"
 	"os"
 	"os/exec"
 	"path"
@@ -156,7 +157,7 @@ func listGorootMergeLinks(goroot, tinygoroot string, overrides map[string]bool)
 
 		// Add files from TinyGo.
 		tinygoDir := filepath.Join(tinygoSrc, dir)
-		tinygoEntries, err := os.ReadDir(tinygoDir)
+		tinygoEntries, err := ioutil.ReadDir(tinygoDir)
 		if err != nil {
 			return nil, err
 		}
@@ -176,7 +177,7 @@ func listGorootMergeLinks(goroot, tinygoroot string, overrides map[string]bool)
 		// Add all directories from $GOROOT that are not part of the TinyGo
 		// overrides.
 		goDir := filepath.Join(goSrc, dir)
-		goEntries, err := os.ReadDir(goDir)
+		goEntries, err := ioutil.ReadDir(goDir)
 		if err != nil {
 			return nil, err
 		}
@@ -232,7 +233,6 @@ func pathsToOverride(goMinor int, needsSyscallPackage bool) map[string]bool {
 		"":                      true,
 		"crypto/":               true,
 		"crypto/rand/":          false,
-		"crypto/tls/":           false,
 		"device/":               false,
 		"examples/":             false,
 		"internal/":             true,
@@ -242,9 +242,7 @@ func pathsToOverride(goMinor int, needsSyscallPackage bool) map[string]bool {
 		"internal/task/":        false,
 		"machine/":              false,
 		"net/":                  true,
-		"net/http/":             false,
 		"os/":                   true,
-		"os/user/":              false,
 		"reflect/":              false,
 		"runtime/":              false,
 		"sync/":                 true,

loader/list.go

@@ -22,8 +22,12 @@ func List(config *compileopts.Config, extraArgs, pkgs []string) (*exec.Cmd, erro
 		args = append(args, "-tags", strings.Join(config.BuildTags(), " "))
 	}
 	args = append(args, pkgs...)
+	cgoEnabled := "0"
+	if config.CgoEnabled() {
+		cgoEnabled = "1"
+	}
 	cmd := exec.Command(filepath.Join(goenv.Get("GOROOT"), "bin", "go"), args...)
-	cmd.Env = append(os.Environ(), "GOROOT="+goroot, "GOOS="+config.GOOS(), "GOARCH="+config.GOARCH(), "CGO_ENABLED=1")
+	cmd.Env = append(os.Environ(), "GOROOT="+goroot, "GOOS="+config.GOOS(), "GOARCH="+config.GOARCH(), "CGO_ENABLED="+cgoEnabled)
 	if config.Options.Directory != "" {
 		cmd.Dir = config.Options.Directory
 	}

loader/loader.go

@@ -27,14 +27,13 @@ import (
 	"github.com/tinygo-org/tinygo/goenv"
 )
 
-var initFileVersions = func(info *types.Info) {}
-
 // Program holds all packages and some metadata about the program as a whole.
 type Program struct {
-	config      *compileopts.Config
-	typeChecker types.Config
-	goroot      string // synthetic GOROOT
-	workingDir  string
+	config       *compileopts.Config
+	clangHeaders string
+	typeChecker  types.Config
+	goroot       string // synthetic GOROOT
+	workingDir   string
 
 	Packages map[string]*Package
 	sorted   []*Package
@@ -104,7 +103,7 @@ type EmbedFile struct {
 // Load loads the given package with all dependencies (including the runtime
 // package). Call .Parse() afterwards to parse all Go files (including CGo
 // processing, if necessary).
-func Load(config *compileopts.Config, inputPkg string, typeChecker types.Config) (*Program, error) {
+func Load(config *compileopts.Config, inputPkg string, clangHeaders string, typeChecker types.Config) (*Program, error) {
 	goroot, err := GetCachedGoroot(config)
 	if err != nil {
 		return nil, err
@@ -119,12 +118,13 @@ func Load(config *compileopts.Config, inputPkg string, typeChecker types.Config)
 		}
 	}
 	p := &Program{
-		config:      config,
-		typeChecker: typeChecker,
-		goroot:      goroot,
-		workingDir:  wd,
-		Packages:    make(map[string]*Package),
-		fset:        token.NewFileSet(),
+		config:       config,
+		clangHeaders: clangHeaders,
+		typeChecker:  typeChecker,
+		goroot:       goroot,
+		workingDir:   wd,
+		Packages:     make(map[string]*Package),
+		fset:         token.NewFileSet(),
 	}
 
 	// List the dependencies of this package, in raw JSON format.
@@ -380,24 +380,6 @@ func (p *Package) Check() error {
 		typeErrors = append(typeErrors, err)
 	}
 	checker.Importer = p
-	if p.Module.GoVersion != "" {
-		// Setting the Go version for a module makes sure the type checker
-		// errors out on language features not supported in that particular
-		// version.
-		checker.GoVersion = "go" + p.Module.GoVersion
-	} else {
-		// Version is not known, so use the currently installed Go version.
-		// This is needed for `tinygo run` for example.
-		// Normally we'd use goenv.GorootVersionString(), but for compatibility
-		// with Go 1.20 and below we need a version in the form of "go1.12" (no
-		// patch version).
-		major, minor, err := goenv.GetGorootVersion()
-		if err != nil {
-			return err
-		}
-		checker.GoVersion = fmt.Sprintf("go%d.%d", major, minor)
-	}
-	initFileVersions(&p.info)
 
 	// Do typechecking of the package.
 	packageName := p.ImportPath
@@ -456,9 +438,9 @@ func (p *Package) parseFiles() ([]*ast.File, error) {
 	// to call cgo.Process in that case as it will only cause issues.
 	if len(p.CgoFiles) != 0 && len(files) != 0 {
 		var initialCFlags []string
-		initialCFlags = append(initialCFlags, p.program.config.CFlags(true)...)
+		initialCFlags = append(initialCFlags, p.program.config.CFlags()...)
 		initialCFlags = append(initialCFlags, "-I"+p.Dir)
-		generated, headerCode, cflags, ldflags, accessedFiles, errs := cgo.Process(files, p.program.workingDir, p.ImportPath, p.program.fset, initialCFlags)
+		generated, headerCode, cflags, ldflags, accessedFiles, errs := cgo.Process(files, p.program.workingDir, p.ImportPath, p.program.fset, initialCFlags, p.program.clangHeaders)
 		p.CFlags = append(initialCFlags, cflags...)
 		p.CGoHeaders = headerCode
 		for path, hash := range accessedFiles {
@@ -467,7 +449,7 @@ func (p *Package) parseFiles() ([]*ast.File, error) {
 		if errs != nil {
 			fileErrs = append(fileErrs, errs...)
 		}
-		files = append(files, generated...)
+		files = append(files, generated)
 		p.program.LDFlags = append(p.program.LDFlags, ldflags...)
 	}
 

loader/loader_go122.go

@@ -1,17 +0,0 @@
-//go:build go1.22
-
-// types.Info.FileVersions was added in Go 1.22, so we can only initialize it
-// when built with Go 1.22.
-
-package loader
-
-import (
-	"go/ast"
-	"go/types"
-)
-
-func init() {
-	initFileVersions = func(info *types.Info) {
-		info.FileVersions = make(map[*ast.File]string)
-	}
-}

main.go

@@ -11,6 +11,7 @@ import (
 	"go/scanner"
 	"go/types"
 	"io"
+	"io/ioutil"
 	"os"
 	"os/exec"
 	"os/signal"
@@ -532,7 +533,7 @@ func Flash(pkgName, port string, options *compileopts.Options) error {
 		return fmt.Errorf("unknown flash method: %s", flashMethod)
 	}
 	if options.Monitor {
-		return Monitor(result.Executable, "", config)
+		return Monitor(result.Executable, "", options)
 	}
 	return nil
 }
@@ -797,7 +798,7 @@ func buildAndRun(pkgName string, config *compileopts.Config, stdout io.Writer, c
 			needsEnvInVars = true
 		}
 	}
-	var args, emuArgs, env []string
+	var args, env []string
 	var extraCmdEnv []string
 	if needsEnvInVars {
 		runtimeGlobals := make(map[string]string)
@@ -820,14 +821,13 @@ func buildAndRun(pkgName string, config *compileopts.Config, stdout io.Writer, c
 	} else if config.EmulatorName() == "wasmtime" {
 		// Wasmtime needs some special flags to pass environment variables
 		// and allow reading from the current directory.
-		emuArgs = append(emuArgs, "--dir=.")
+		args = append(args, "--dir=.")
 		for _, v := range environmentVars {
-			emuArgs = append(emuArgs, "--env", v)
+			args = append(args, "--env", v)
 		}
 		if len(cmdArgs) != 0 {
-			// Use of '--' argument no longer necessary as of Wasmtime v14:
-			// https://github.com/bytecodealliance/wasmtime/pull/6946
-			// args = append(args, "--")
+			// mark end of wasmtime arguments and start of program ones: --
+			args = append(args, "--")
 			args = append(args, cmdArgs...)
 		}
 
@@ -877,7 +877,7 @@ func buildAndRun(pkgName string, config *compileopts.Config, stdout io.Writer, c
 			return result, err
 		}
 		name = emulator[0]
-		emuArgs = append(emuArgs, emulator[1:]...)
+		emuArgs := append([]string(nil), emulator[1:]...)
 		args = append(emuArgs, args...)
 	}
 	var cmd *exec.Cmd
@@ -1212,10 +1212,15 @@ func getBMPPorts() (gdbPort, uartPort string, err error) {
 }
 
 func usage(command string) {
+	version := goenv.Version
+	if strings.HasSuffix(version, "-dev") && goenv.GitSha1 != "" {
+		version += "-" + goenv.GitSha1
+	}
+
 	switch command {
 	default:
 		fmt.Fprintln(os.Stderr, "TinyGo is a Go compiler for small places.")
-		fmt.Fprintln(os.Stderr, "version:", goenv.Version())
+		fmt.Fprintln(os.Stderr, "version:", version)
 		fmt.Fprintf(os.Stderr, "usage: %s <command> [arguments]\n", os.Args[0])
 		fmt.Fprintln(os.Stderr, "\ncommands:")
 		fmt.Fprintln(os.Stderr, "  build:   compile packages and dependencies")
@@ -1225,7 +1230,6 @@ func usage(command string) {
 		fmt.Fprintln(os.Stderr, "  gdb:     run/flash and immediately enter GDB")
 		fmt.Fprintln(os.Stderr, "  lldb:    run/flash and immediately enter LLDB")
 		fmt.Fprintln(os.Stderr, "  monitor: open communication port")
-		fmt.Fprintln(os.Stderr, "  ports:   list available serial ports")
 		fmt.Fprintln(os.Stderr, "  env:     list environment variables used during build")
 		fmt.Fprintln(os.Stderr, "  list:    run go list using the TinyGo root")
 		fmt.Fprintln(os.Stderr, "  clean:   empty cache directory ("+goenv.Get("GOCACHE")+")")
@@ -1733,33 +1737,35 @@ func main() {
 			os.Exit(1)
 		}
 	case "monitor":
-		config, err := builder.NewConfig(options)
+		err := Monitor("", *port, options)
 		handleCompilerError(err)
-		err = Monitor("", *port, config)
-		handleCompilerError(err)
-	case "ports":
-		serialPortInfo, err := ListSerialPorts()
-		handleCompilerError(err)
-		if len(serialPortInfo) == 0 {
-			fmt.Println("No serial ports found.")
-		}
-		fmt.Printf("%-20s %-9s %s\n", "Port", "ID", "Boards")
-		for _, s := range serialPortInfo {
-			fmt.Printf("%-20s %4s:%4s %s\n", s.Name, s.VID, s.PID, s.Target)
-		}
 	case "targets":
-		specs, err := compileopts.GetTargetSpecs()
+		dir := filepath.Join(goenv.Get("TINYGOROOT"), "targets")
+		entries, err := ioutil.ReadDir(dir)
 		if err != nil {
 			fmt.Fprintln(os.Stderr, "could not list targets:", err)
 			os.Exit(1)
 			return
 		}
-		names := []string{}
-		for key := range specs {
-			names = append(names, key)
-		}
-		sort.Strings(names)
-		for _, name := range names {
+		for _, entry := range entries {
+			if !entry.Mode().IsRegular() || !strings.HasSuffix(entry.Name(), ".json") {
+				// Only inspect JSON files.
+				continue
+			}
+			path := filepath.Join(dir, entry.Name())
+			spec, err := compileopts.LoadTarget(&compileopts.Options{Target: path})
+			if err != nil {
+				fmt.Fprintln(os.Stderr, "could not list target:", err)
+				os.Exit(1)
+				return
+			}
+			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).
+				continue
+			}
+			name := entry.Name()
+			name = name[:len(name)-5]
 			fmt.Println(name)
 		}
 	case "info":
@@ -1868,7 +1874,11 @@ func main() {
 		if s, err := goenv.GorootVersionString(); err == nil {
 			goversion = s
 		}
-		fmt.Printf("tinygo version %s %s/%s (using go version %s and LLVM version %s)\n", goenv.Version(), runtime.GOOS, runtime.GOARCH, goversion, llvm.Version)
+		version := goenv.Version
+		if strings.HasSuffix(goenv.Version, "-dev") && goenv.GitSha1 != "" {
+			version += "-" + goenv.GitSha1
+		}
+		fmt.Printf("tinygo version %s %s/%s (using go version %s and LLVM version %s)\n", version, runtime.GOOS, runtime.GOARCH, goversion, llvm.Version)
 	case "env":
 		if flag.NArg() == 0 {
 			// Show all environment variables.

main_test.go

@@ -69,7 +69,6 @@ func TestBuild(t *testing.T) {
 		"json.go",
 		"map.go",
 		"math.go",
-		"oldgo/",
 		"print.go",
 		"reflect.go",
 		"slice.go",
@@ -91,9 +90,6 @@ func TestBuild(t *testing.T) {
 	if minor >= 21 {
 		tests = append(tests, "go1.21.go")
 	}
-	if minor >= 22 {
-		tests = append(tests, "go1.22/")
-	}
 
 	if *testTarget != "" {
 		// This makes it possible to run one specific test (instead of all),
@@ -337,11 +333,8 @@ func runTestWithConfig(name string, t *testing.T, options compileopts.Options, c
 	path := TESTDATA + "/" + name
 	// Get the expected output for this test.
 	txtpath := path[:len(path)-3] + ".txt"
-	pkgName := "./" + path
 	if path[len(path)-1] == '/' {
 		txtpath = path + "out.txt"
-		options.Directory = path
-		pkgName = "."
 	}
 	expected, err := os.ReadFile(txtpath)
 	if err != nil {
@@ -355,7 +348,7 @@ func runTestWithConfig(name string, t *testing.T, options compileopts.Options, c
 
 	// Build the test binary.
 	stdout := &bytes.Buffer{}
-	_, err = buildAndRun(pkgName, config, stdout, cmdArgs, environmentVars, time.Minute, func(cmd *exec.Cmd, result builder.BuildResult) error {
+	_, err = buildAndRun("./"+path, config, stdout, cmdArgs, environmentVars, time.Minute, func(cmd *exec.Cmd, result builder.BuildResult) error {
 		return cmd.Run()
 	})
 	if err != nil {

monitor.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"bufio"
 	"debug/dwarf"
 	"debug/elf"
 	"debug/macho"
@@ -10,168 +9,58 @@ import (
 	"fmt"
 	"go/token"
 	"io"
-	"net"
 	"os"
 	"os/signal"
 	"regexp"
 	"strconv"
-	"strings"
 	"time"
 
 	"github.com/mattn/go-tty"
+	"github.com/tinygo-org/tinygo/builder"
 	"github.com/tinygo-org/tinygo/compileopts"
-
 	"go.bug.st/serial"
-	"go.bug.st/serial/enumerator"
 )
 
 // Monitor connects to the given port and reads/writes the serial port.
-func Monitor(executable, port string, config *compileopts.Config) error {
-	const timeout = time.Second * 3
-	var exit func() // function to be called before exiting
-	var serialConn io.ReadWriter
-
-	if config.Options.Serial == "rtt" {
-		// Use the RTT interface, which is documented (in part) here:
-		// https://wiki.segger.com/RTT
-
-		// Try to find the "machine.rttSerialInstance" symbol, which is the RTT
-		// control block.
-		file, err := elf.Open(executable)
-		if err != nil {
-			return fmt.Errorf("could not open ELF file to determine RTT control block: %w", err)
-		}
-		defer file.Close()
-		symbols, err := file.Symbols()
-		if err != nil {
-			return fmt.Errorf("could not read ELF symbol table to determine RTT control block: %w", err)
-		}
-		var address uint64
-		for _, symbol := range symbols {
-			if symbol.Name == "machine.rttSerialInstance" {
-				address = symbol.Value
-				break
-			}
-		}
-		if address == 0 {
-			return fmt.Errorf("could not find RTT control block in ELF file")
-		}
-
-		// Start an openocd process in the background.
-		args, err := config.OpenOCDConfiguration()
-		if err != nil {
-			return err
-		}
-		args = append(args,
-			"-c", fmt.Sprintf("rtt setup 0x%x 16 \"SEGGER RTT\"", address),
-			"-c", "init",
-			"-c", "rtt server start 0 0")
-		cmd := executeCommand(config.Options, "openocd", args...)
-		stderr, err := cmd.StderrPipe()
-		if err != nil {
-			return err
-		}
-		cmd.Stdout = os.Stdout
-		err = cmd.Start()
-		if err != nil {
-			return err
-		}
-		defer cmd.Process.Kill()
-		exit = func() {
-			// Make sure the openocd process is terminated at exit.
-			// This does not happen through the defer above when exiting through
-			// os.Exit.
-			cmd.Process.Kill()
-		}
-
-		// Read the stderr, which logs various important messages we need.
-		r := bufio.NewReader(stderr)
-		var telnet net.Conn
-		var timeoutAt time.Time
-		for {
-			// Read the next line from the openocd process.
-			lineBytes, err := r.ReadBytes('\n')
-			if err != nil {
-				return err
-			}
-			line := string(lineBytes)
-
-			if line == "Info : rtt: No control block found\n" {
-				// Message that is sent back when OpenOCD can't find the control
-				// block after a 'rtt start' message.
-				if time.Now().After(timeoutAt) {
-					return fmt.Errorf("RTT timeout (could not locate RTT control block at 0x%08x)", address)
-				}
-				time.Sleep(time.Millisecond * 100)
-				telnet.Write([]byte("rtt start\r\n"))
-			} else if strings.HasPrefix(line, "Info : Listening on port") {
-				// We need two different ports for controlling OpenOCD
-				// (typically port 4444) and the RTT channel 0 socket (arbitrary
-				// port).
-				var port int
-				var protocol string
-				fmt.Sscanf(line, "Info : Listening on port %d for %s connections\n", &port, &protocol)
-				if protocol == "telnet" && telnet == nil {
-					// Connect to the "telnet" command line interface.
-					telnet, err = net.Dial("tcp4", fmt.Sprintf("localhost:%d", port))
-					if err != nil {
-						return err
-					}
-					// Tell OpenOCD to start scanning for the RTT control block.
-					telnet.Write([]byte("rtt start\r\n"))
-					// Also make sure we will time out if the control block just
-					// can't be found.
-					timeoutAt = time.Now().Add(timeout)
-				} else if protocol == "rtt" {
-					// Connect to the RTT channel, for both stdin and stdout.
-					conn, err := net.Dial("tcp4", fmt.Sprintf("localhost:%d", port))
-					if err != nil {
-						return err
-					}
-					serialConn = conn
-				}
-			} else if strings.HasPrefix(line, "Info : rtt: Control block found at") {
-				// Connection established!
-				break
-			}
-		}
-	} else { // -serial=uart or -serial=usb
-		var err error
-		wait := 300
-		for i := 0; i <= wait; i++ {
-			port, err = getDefaultPort(port, config.Target.SerialPort)
-			if err != nil {
-				if i < wait {
-					time.Sleep(10 * time.Millisecond)
-					continue
-				}
-				return err
-			}
-			break
-		}
-
-		br := config.Options.BaudRate
-		if br <= 0 {
-			br = 115200
-		}
-
-		wait = 300
-		var p serial.Port
-		for i := 0; i <= wait; i++ {
-			p, err = serial.Open(port, &serial.Mode{BaudRate: br})
-			if err != nil {
-				if i < wait {
-					time.Sleep(10 * time.Millisecond)
-					continue
-				}
-				return err
-			}
-			serialConn = p
-			break
-		}
-		defer p.Close()
+func Monitor(executable, port string, options *compileopts.Options) error {
+	config, err := builder.NewConfig(options)
+	if err != nil {
+		return err
 	}
 
+	wait := 300
+	for i := 0; i <= wait; i++ {
+		port, err = getDefaultPort(port, config.Target.SerialPort)
+		if err != nil {
+			if i < wait {
+				time.Sleep(10 * time.Millisecond)
+				continue
+			}
+			return err
+		}
+		break
+	}
+
+	br := options.BaudRate
+	if br <= 0 {
+		br = 115200
+	}
+
+	wait = 300
+	var p serial.Port
+	for i := 0; i <= wait; i++ {
+		p, err = serial.Open(port, &serial.Mode{BaudRate: br})
+		if err != nil {
+			if i < wait {
+				time.Sleep(10 * time.Millisecond)
+				continue
+			}
+			return err
+		}
+		break
+	}
+	defer p.Close()
+
 	tty, err := tty.Open()
 	if err != nil {
 		return err
@@ -185,9 +74,6 @@ func Monitor(executable, port string, config *compileopts.Config) error {
 	go func() {
 		<-sig
 		tty.Close()
-		if exit != nil {
-			exit()
-		}
 		os.Exit(0)
 	}()
 
@@ -199,7 +85,7 @@ func Monitor(executable, port string, config *compileopts.Config) error {
 		buf := make([]byte, 100*1024)
 		var line []byte
 		for {
-			n, err := serialConn.Read(buf)
+			n, err := p.Read(buf)
 			if err != nil {
 				errCh <- fmt.Errorf("read error: %w", err)
 				return
@@ -235,66 +121,13 @@ func Monitor(executable, port string, config *compileopts.Config) error {
 			if r == 0 {
 				continue
 			}
-			serialConn.Write([]byte(string(r)))
+			p.Write([]byte(string(r)))
 		}
 	}()
 
 	return <-errCh
 }
 
-// SerialPortInfo is a structure that holds information about the port and its
-// associated TargetSpec.
-type SerialPortInfo struct {
-	Name   string
-	IsUSB  bool
-	VID    string
-	PID    string
-	Target string
-	Spec   *compileopts.TargetSpec
-}
-
-// ListSerialPort returns serial port information and any detected TinyGo
-// target.
-func ListSerialPorts() ([]SerialPortInfo, error) {
-	maps, err := compileopts.GetTargetSpecs()
-	if err != nil {
-		return nil, err
-	}
-
-	portsList, err := enumerator.GetDetailedPortsList()
-	if err != nil {
-		return nil, err
-	}
-
-	serialPortInfo := []SerialPortInfo{}
-	for _, p := range portsList {
-		info := SerialPortInfo{
-			Name:  p.Name,
-			IsUSB: p.IsUSB,
-			VID:   p.VID,
-			PID:   p.PID,
-		}
-		vid := strings.ToLower(p.VID)
-		pid := strings.ToLower(p.PID)
-		for k, v := range maps {
-			usbInterfaces := v.SerialPort
-			for _, s := range usbInterfaces {
-				parts := strings.Split(s, ":")
-				if len(parts) != 2 {
-					continue
-				}
-				if vid == strings.ToLower(parts[0]) && pid == strings.ToLower(parts[1]) {
-					info.Target = k
-					info.Spec = v
-				}
-			}
-		}
-		serialPortInfo = append(serialPortInfo, info)
-	}
-
-	return serialPortInfo, nil
-}
-
 var addressMatch = regexp.MustCompile(`^panic: runtime error at 0x([0-9a-f]+): `)
 
 // Extract the address from the "panic: runtime error at" message.

src/crypto/rand/rand_baremetal.go

@@ -1,7 +1,4 @@
-//go:build nrf || (stm32 && !(stm32f103 || stm32l0x1)) || (sam && atsamd51) || (sam && atsame5x) || esp32c3
-
-// If you update the above build constraint, you'll probably also need to update
-// src/runtime/rand_hwrng.go.
+//go:build nrf || stm32 || (sam && atsamd51) || (sam && atsame5x)
 
 package rand
 

src/crypto/tls/common.go

@@ -1,447 +0,0 @@
-// TINYGO: The following is copied and modified from Go 1.19.3 official implementation.
-
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package tls
-
-import (
-	"context"
-	"crypto"
-	"crypto/x509"
-	"io"
-	"net"
-	"sync"
-	"time"
-)
-
-// CurveID is the type of a TLS identifier for an elliptic curve. See
-// https://www.iana.org/assignments/tls-parameters/tls-parameters.xml#tls-parameters-8.
-//
-// In TLS 1.3, this type is called NamedGroup, but at this time this library
-// only supports Elliptic Curve based groups. See RFC 8446, Section 4.2.7.
-type CurveID uint16
-
-// ConnectionState records basic TLS details about the connection.
-type ConnectionState struct {
-	// TINYGO: empty; TLS connection offloaded to device
-}
-
-// ClientAuthType declares the policy the server will follow for
-// TLS Client Authentication.
-type ClientAuthType int
-
-// ClientSessionCache is a cache of ClientSessionState objects that can be used
-// by a client to resume a TLS session with a given server. ClientSessionCache
-// implementations should expect to be called concurrently from different
-// goroutines. Up to TLS 1.2, only ticket-based resumption is supported, not
-// SessionID-based resumption. In TLS 1.3 they were merged into PSK modes, which
-// are supported via this interface.
-type ClientSessionCache interface {
-	// Get searches for a ClientSessionState associated with the given key.
-	// On return, ok is true if one was found.
-	Get(sessionKey string) (session *ClientSessionState, ok bool)
-
-	// Put adds the ClientSessionState to the cache with the given key. It might
-	// get called multiple times in a connection if a TLS 1.3 server provides
-	// more than one session ticket. If called with a nil *ClientSessionState,
-	// it should remove the cache entry.
-	Put(sessionKey string, cs *ClientSessionState)
-}
-
-//go:generate stringer -type=SignatureScheme,CurveID,ClientAuthType -output=common_string.go
-
-// SignatureScheme identifies a signature algorithm supported by TLS. See
-// RFC 8446, Section 4.2.3.
-type SignatureScheme uint16
-
-// ClientHelloInfo contains information from a ClientHello message in order to
-// guide application logic in the GetCertificate and GetConfigForClient callbacks.
-type ClientHelloInfo struct {
-	// CipherSuites lists the CipherSuites supported by the client (e.g.
-	// TLS_AES_128_GCM_SHA256, TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256).
-	CipherSuites []uint16
-
-	// ServerName indicates the name of the server requested by the client
-	// in order to support virtual hosting. ServerName is only set if the
-	// client is using SNI (see RFC 4366, Section 3.1).
-	ServerName string
-
-	// SupportedCurves lists the elliptic curves supported by the client.
-	// SupportedCurves is set only if the Supported Elliptic Curves
-	// Extension is being used (see RFC 4492, Section 5.1.1).
-	SupportedCurves []CurveID
-
-	// SupportedPoints lists the point formats supported by the client.
-	// SupportedPoints is set only if the Supported Point Formats Extension
-	// is being used (see RFC 4492, Section 5.1.2).
-	SupportedPoints []uint8
-
-	// SignatureSchemes lists the signature and hash schemes that the client
-	// is willing to verify. SignatureSchemes is set only if the Signature
-	// Algorithms Extension is being used (see RFC 5246, Section 7.4.1.4.1).
-	SignatureSchemes []SignatureScheme
-
-	// SupportedProtos lists the application protocols supported by the client.
-	// SupportedProtos is set only if the Application-Layer Protocol
-	// Negotiation Extension is being used (see RFC 7301, Section 3.1).
-	//
-	// Servers can select a protocol by setting Config.NextProtos in a
-	// GetConfigForClient return value.
-	SupportedProtos []string
-
-	// SupportedVersions lists the TLS versions supported by the client.
-	// For TLS versions less than 1.3, this is extrapolated from the max
-	// version advertised by the client, so values other than the greatest
-	// might be rejected if used.
-	SupportedVersions []uint16
-
-	// Conn is the underlying net.Conn for the connection. Do not read
-	// from, or write to, this connection; that will cause the TLS
-	// connection to fail.
-	Conn net.Conn
-
-	// config is embedded by the GetCertificate or GetConfigForClient caller,
-	// for use with SupportsCertificate.
-	config *Config
-
-	// ctx is the context of the handshake that is in progress.
-	ctx context.Context
-}
-
-// CertificateRequestInfo contains information from a server's
-// CertificateRequest message, which is used to demand a certificate and proof
-// of control from a client.
-type CertificateRequestInfo struct {
-	// AcceptableCAs contains zero or more, DER-encoded, X.501
-	// Distinguished Names. These are the names of root or intermediate CAs
-	// that the server wishes the returned certificate to be signed by. An
-	// empty slice indicates that the server has no preference.
-	AcceptableCAs [][]byte
-
-	// SignatureSchemes lists the signature schemes that the server is
-	// willing to verify.
-	SignatureSchemes []SignatureScheme
-
-	// Version is the TLS version that was negotiated for this connection.
-	Version uint16
-
-	// ctx is the context of the handshake that is in progress.
-	ctx context.Context
-}
-
-// RenegotiationSupport enumerates the different levels of support for TLS
-// renegotiation. TLS renegotiation is the act of performing subsequent
-// handshakes on a connection after the first. This significantly complicates
-// the state machine and has been the source of numerous, subtle security
-// issues. Initiating a renegotiation is not supported, but support for
-// accepting renegotiation requests may be enabled.
-//
-// Even when enabled, the server may not change its identity between handshakes
-// (i.e. the leaf certificate must be the same). Additionally, concurrent
-// handshake and application data flow is not permitted so renegotiation can
-// only be used with protocols that synchronise with the renegotiation, such as
-// HTTPS.
-//
-// Renegotiation is not defined in TLS 1.3.
-type RenegotiationSupport int
-
-// A Config structure is used to configure a TLS client or server.
-// After one has been passed to a TLS function it must not be
-// modified. A Config may be reused; the tls package will also not
-// modify it.
-type Config struct {
-	// Rand provides the source of entropy for nonces and RSA blinding.
-	// If Rand is nil, TLS uses the cryptographic random reader in package
-	// crypto/rand.
-	// The Reader must be safe for use by multiple goroutines.
-	Rand io.Reader
-
-	// Time returns the current time as the number of seconds since the epoch.
-	// If Time is nil, TLS uses time.Now.
-	Time func() time.Time
-
-	// Certificates contains one or more certificate chains to present to the
-	// other side of the connection. The first certificate compatible with the
-	// peer's requirements is selected automatically.
-	//
-	// Server configurations must set one of Certificates, GetCertificate or
-	// GetConfigForClient. Clients doing client-authentication may set either
-	// Certificates or GetClientCertificate.
-	//
-	// Note: if there are multiple Certificates, and they don't have the
-	// optional field Leaf set, certificate selection will incur a significant
-	// per-handshake performance cost.
-	Certificates []Certificate
-
-	// NameToCertificate maps from a certificate name to an element of
-	// Certificates. Note that a certificate name can be of the form
-	// '*.example.com' and so doesn't have to be a domain name as such.
-	//
-	// Deprecated: NameToCertificate only allows associating a single
-	// certificate with a given name. Leave this field nil to let the library
-	// select the first compatible chain from Certificates.
-	NameToCertificate map[string]*Certificate
-
-	// GetCertificate returns a Certificate based on the given
-	// ClientHelloInfo. It will only be called if the client supplies SNI
-	// information or if Certificates is empty.
-	//
-	// If GetCertificate is nil or returns nil, then the certificate is
-	// retrieved from NameToCertificate. If NameToCertificate is nil, the
-	// best element of Certificates will be used.
-	//
-	// Once a Certificate is returned it should not be modified.
-	GetCertificate func(*ClientHelloInfo) (*Certificate, error)
-
-	// GetClientCertificate, if not nil, is called when a server requests a
-	// certificate from a client. If set, the contents of Certificates will
-	// be ignored.
-	//
-	// If GetClientCertificate returns an error, the handshake will be
-	// aborted and that error will be returned. Otherwise
-	// GetClientCertificate must return a non-nil Certificate. If
-	// Certificate.Certificate is empty then no certificate will be sent to
-	// the server. If this is unacceptable to the server then it may abort
-	// the handshake.
-	//
-	// GetClientCertificate may be called multiple times for the same
-	// connection if renegotiation occurs or if TLS 1.3 is in use.
-	//
-	// Once a Certificate is returned it should not be modified.
-	GetClientCertificate func(*CertificateRequestInfo) (*Certificate, error)
-
-	// GetConfigForClient, if not nil, is called after a ClientHello is
-	// received from a client. It may return a non-nil Config in order to
-	// change the Config that will be used to handle this connection. If
-	// the returned Config is nil, the original Config will be used. The
-	// Config returned by this callback may not be subsequently modified.
-	//
-	// If GetConfigForClient is nil, the Config passed to Server() will be
-	// used for all connections.
-	//
-	// If SessionTicketKey was explicitly set on the returned Config, or if
-	// SetSessionTicketKeys was called on the returned Config, those keys will
-	// be used. Otherwise, the original Config keys will be used (and possibly
-	// rotated if they are automatically managed).
-	GetConfigForClient func(*ClientHelloInfo) (*Config, error)
-
-	// VerifyPeerCertificate, if not nil, is called after normal
-	// certificate verification by either a TLS client or server. It
-	// receives the raw ASN.1 certificates provided by the peer and also
-	// any verified chains that normal processing found. If it returns a
-	// non-nil error, the handshake is aborted and that error results.
-	//
-	// If normal verification fails then the handshake will abort before
-	// considering this callback. If normal verification is disabled (on the
-	// client when InsecureSkipVerify is set, or on a server when ClientAuth is
-	// RequestClientCert or RequireAnyClientCert), then this callback will be
-	// considered but the verifiedChains argument will always be nil. When
-	// ClientAuth is NoClientCert, this callback is not called on the server.
-	// rawCerts may be empty on the server if ClientAuth is RequestClientCert or
-	// VerifyClientCertIfGiven.
-	//
-	// This callback is not invoked on resumed connections, as certificates are
-	// not re-verified on resumption.
-	//
-	// verifiedChains and its contents should not be modified.
-	VerifyPeerCertificate func(rawCerts [][]byte, verifiedChains [][]*x509.Certificate) error
-
-	// VerifyConnection, if not nil, is called after normal certificate
-	// verification and after VerifyPeerCertificate by either a TLS client
-	// or server. If it returns a non-nil error, the handshake is aborted
-	// and that error results.
-	//
-	// If normal verification fails then the handshake will abort before
-	// considering this callback. This callback will run for all connections,
-	// including resumptions, regardless of InsecureSkipVerify or ClientAuth
-	// settings.
-	VerifyConnection func(ConnectionState) error
-
-	// RootCAs defines the set of root certificate authorities
-	// that clients use when verifying server certificates.
-	// If RootCAs is nil, TLS uses the host's root CA set.
-	RootCAs *x509.CertPool
-
-	// NextProtos is a list of supported application level protocols, in
-	// order of preference. If both peers support ALPN, the selected
-	// protocol will be one from this list, and the connection will fail
-	// if there is no mutually supported protocol. If NextProtos is empty
-	// or the peer doesn't support ALPN, the connection will succeed and
-	// ConnectionState.NegotiatedProtocol will be empty.
-	NextProtos []string
-
-	// ServerName is used to verify the hostname on the returned
-	// certificates unless InsecureSkipVerify is given. It is also included
-	// in the client's handshake to support virtual hosting unless it is
-	// an IP address.
-	ServerName string
-
-	// ClientAuth determines the server's policy for
-	// TLS Client Authentication. The default is NoClientCert.
-	ClientAuth ClientAuthType
-
-	// ClientCAs defines the set of root certificate authorities
-	// that servers use if required to verify a client certificate
-	// by the policy in ClientAuth.
-	ClientCAs *x509.CertPool
-
-	// InsecureSkipVerify controls whether a client verifies the server's
-	// certificate chain and host name. If InsecureSkipVerify is true, crypto/tls
-	// accepts any certificate presented by the server and any host name in that
-	// certificate. In this mode, TLS is susceptible to machine-in-the-middle
-	// attacks unless custom verification is used. This should be used only for
-	// testing or in combination with VerifyConnection or VerifyPeerCertificate.
-	InsecureSkipVerify bool
-
-	// CipherSuites is a list of enabled TLS 1.0–1.2 cipher suites. The order of
-	// the list is ignored. Note that TLS 1.3 ciphersuites are not configurable.
-	//
-	// If CipherSuites is nil, a safe default list is used. The default cipher
-	// suites might change over time.
-	CipherSuites []uint16
-
-	// PreferServerCipherSuites is a legacy field and has no effect.
-	//
-	// It used to control whether the server would follow the client's or the
-	// server's preference. Servers now select the best mutually supported
-	// cipher suite based on logic that takes into account inferred client
-	// hardware, server hardware, and security.
-	//
-	// Deprecated: PreferServerCipherSuites is ignored.
-	PreferServerCipherSuites bool
-
-	// SessionTicketsDisabled may be set to true to disable session ticket and
-	// PSK (resumption) support. Note that on clients, session ticket support is
-	// also disabled if ClientSessionCache is nil.
-	SessionTicketsDisabled bool
-
-	// SessionTicketKey is used by TLS servers to provide session resumption.
-	// See RFC 5077 and the PSK mode of RFC 8446. If zero, it will be filled
-	// with random data before the first server handshake.
-	//
-	// Deprecated: if this field is left at zero, session ticket keys will be
-	// automatically rotated every day and dropped after seven days. For
-	// customizing the rotation schedule or synchronizing servers that are
-	// terminating connections for the same host, use SetSessionTicketKeys.
-	SessionTicketKey [32]byte
-
-	// ClientSessionCache is a cache of ClientSessionState entries for TLS
-	// session resumption. It is only used by clients.
-	ClientSessionCache ClientSessionCache
-
-	// UnwrapSession is called on the server to turn a ticket/identity
-	// previously produced by [WrapSession] into a usable session.
-	//
-	// UnwrapSession will usually either decrypt a session state in the ticket
-	// (for example with [Config.EncryptTicket]), or use the ticket as a handle
-	// to recover a previously stored state. It must use [ParseSessionState] to
-	// deserialize the session state.
-	//
-	// If UnwrapSession returns an error, the connection is terminated. If it
-	// returns (nil, nil), the session is ignored. crypto/tls may still choose
-	// not to resume the returned session.
-	UnwrapSession func(identity []byte, cs ConnectionState) (*SessionState, error)
-
-	// WrapSession is called on the server to produce a session ticket/identity.
-	//
-	// WrapSession must serialize the session state with [SessionState.Bytes].
-	// It may then encrypt the serialized state (for example with
-	// [Config.DecryptTicket]) and use it as the ticket, or store the state and
-	// return a handle for it.
-	//
-	// If WrapSession returns an error, the connection is terminated.
-	//
-	// Warning: the return value will be exposed on the wire and to clients in
-	// plaintext. The application is in charge of encrypting and authenticating
-	// it (and rotating keys) or returning high-entropy identifiers. Failing to
-	// do so correctly can compromise current, previous, and future connections
-	// depending on the protocol version.
-	WrapSession func(ConnectionState, *SessionState) ([]byte, error)
-
-	// MinVersion contains the minimum TLS version that is acceptable.
-	//
-	// By default, TLS 1.2 is currently used as the minimum when acting as a
-	// client, and TLS 1.0 when acting as a server. TLS 1.0 is the minimum
-	// supported by this package, both as a client and as a server.
-	//
-	// The client-side default can temporarily be reverted to TLS 1.0 by
-	// including the value "x509sha1=1" in the GODEBUG environment variable.
-	// Note that this option will be removed in Go 1.19 (but it will still be
-	// possible to set this field to VersionTLS10 explicitly).
-	MinVersion uint16
-
-	// MaxVersion contains the maximum TLS version that is acceptable.
-	//
-	// By default, the maximum version supported by this package is used,
-	// which is currently TLS 1.3.
-	MaxVersion uint16
-
-	// CurvePreferences contains the elliptic curves that will be used in
-	// an ECDHE handshake, in preference order. If empty, the default will
-	// be used. The client will use the first preference as the type for
-	// its key share in TLS 1.3. This may change in the future.
-	CurvePreferences []CurveID
-
-	// DynamicRecordSizingDisabled disables adaptive sizing of TLS records.
-	// When true, the largest possible TLS record size is always used. When
-	// false, the size of TLS records may be adjusted in an attempt to
-	// improve latency.
-	DynamicRecordSizingDisabled bool
-
-	// Renegotiation controls what types of renegotiation are supported.
-	// The default, none, is correct for the vast majority of applications.
-	Renegotiation RenegotiationSupport
-
-	// KeyLogWriter optionally specifies a destination for TLS master secrets
-	// in NSS key log format that can be used to allow external programs
-	// such as Wireshark to decrypt TLS connections.
-	// See https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/Key_Log_Format.
-	// Use of KeyLogWriter compromises security and should only be
-	// used for debugging.
-	KeyLogWriter io.Writer
-
-	// mutex protects sessionTicketKeys and autoSessionTicketKeys.
-	mutex sync.RWMutex
-	// sessionTicketKeys contains zero or more ticket keys. If set, it means
-	// the keys were set with SessionTicketKey or SetSessionTicketKeys. The
-	// first key is used for new tickets and any subsequent keys can be used to
-	// decrypt old tickets. The slice contents are not protected by the mutex
-	// and are immutable.
-	sessionTicketKeys []ticketKey
-	// autoSessionTicketKeys is like sessionTicketKeys but is owned by the
-	// auto-rotation logic. See Config.ticketKeys.
-	autoSessionTicketKeys []ticketKey
-}
-
-// ticketKey is the internal representation of a session ticket key.
-type ticketKey struct {
-	aesKey  [16]byte
-	hmacKey [16]byte
-	// created is the time at which this ticket key was created. See Config.ticketKeys.
-	created time.Time
-}
-
-// A Certificate is a chain of one or more certificates, leaf first.
-type Certificate struct {
-	Certificate [][]byte
-	// PrivateKey contains the private key corresponding to the public key in
-	// Leaf. This must implement crypto.Signer with an RSA, ECDSA or Ed25519 PublicKey.
-	// For a server up to TLS 1.2, it can also implement crypto.Decrypter with
-	// an RSA PublicKey.
-	PrivateKey crypto.PrivateKey
-	// SupportedSignatureAlgorithms is an optional list restricting what
-	// signature algorithms the PrivateKey can be used for.
-	SupportedSignatureAlgorithms []SignatureScheme
-	// OCSPStaple contains an optional OCSP response which will be served
-	// to clients that request it.
-	OCSPStaple []byte
-	// SignedCertificateTimestamps contains an optional list of Signed
-	// Certificate Timestamps which will be served to clients that request it.
-	SignedCertificateTimestamps [][]byte
-	// Leaf is the parsed form of the leaf certificate, which may be initialized
-	// using x509.ParseCertificate to reduce per-handshake processing. If nil,
-	// the leaf certificate will be parsed as needed.
-	Leaf *x509.Certificate
-}

src/crypto/tls/ticket.go

@@ -1,16 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package tls
-
-// A SessionState is a resumable session.
-type SessionState struct {
-}
-
-// ClientSessionState contains the state needed by a client to
-// resume a previous TLS session.
-type ClientSessionState struct {
-	ticket  []byte
-	session *SessionState
-}

src/crypto/tls/tls.go

@@ -1,114 +0,0 @@
-// TINYGO: The following is copied and modified from Go 1.21.4 official implementation.
-
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package tls partially implements TLS 1.2, as specified in RFC 5246,
-// and TLS 1.3, as specified in RFC 8446.
-package tls
-
-// BUG(agl): The crypto/tls package only implements some countermeasures
-// against Lucky13 attacks on CBC-mode encryption, and only on SHA1
-// variants. See http://www.isg.rhul.ac.uk/tls/TLStiming.pdf and
-// https://www.imperialviolet.org/2013/02/04/luckythirteen.html.
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"net"
-)
-
-// Client returns a new TLS client side connection
-// using conn as the underlying transport.
-// The config cannot be nil: users must set either ServerName or
-// InsecureSkipVerify in the config.
-func Client(conn net.Conn, config *Config) *net.TLSConn {
-	panic("tls.Client() not implemented")
-	return nil
-}
-
-// A listener implements a network listener (net.Listener) for TLS connections.
-type listener struct {
-	net.Listener
-	config *Config
-}
-
-// NewListener creates a Listener which accepts connections from an inner
-// Listener and wraps each connection with Server.
-// The configuration config must be non-nil and must include
-// at least one certificate or else set GetCertificate.
-func NewListener(inner net.Listener, config *Config) net.Listener {
-	l := new(listener)
-	l.Listener = inner
-	l.config = config
-	return l
-}
-
-// DialWithDialer connects to the given network address using dialer.Dial and
-// then initiates a TLS handshake, returning the resulting TLS connection. Any
-// timeout or deadline given in the dialer apply to connection and TLS
-// handshake as a whole.
-//
-// DialWithDialer interprets a nil configuration as equivalent to the zero
-// configuration; see the documentation of Config for the defaults.
-//
-// DialWithDialer uses context.Background internally; to specify the context,
-// use Dialer.DialContext with NetDialer set to the desired dialer.
-func DialWithDialer(dialer *net.Dialer, network, addr string, config *Config) (*net.TLSConn, error) {
-	switch network {
-	case "tcp", "tcp4":
-	default:
-		return nil, fmt.Errorf("Network %s not supported", network)
-	}
-
-	return net.DialTLS(addr)
-}
-
-// Dial connects to the given network address using net.Dial
-// and then initiates a TLS handshake, returning the resulting
-// TLS connection.
-// Dial interprets a nil configuration as equivalent to
-// the zero configuration; see the documentation of Config
-// for the defaults.
-func Dial(network, addr string, config *Config) (*net.TLSConn, error) {
-	return DialWithDialer(new(net.Dialer), network, addr, config)
-}
-
-// Dialer dials TLS connections given a configuration and a Dialer for the
-// underlying connection.
-type Dialer struct {
-	// NetDialer is the optional dialer to use for the TLS connections'
-	// underlying TCP connections.
-	// A nil NetDialer is equivalent to the net.Dialer zero value.
-	NetDialer *net.Dialer
-
-	// Config is the TLS configuration to use for new connections.
-	// A nil configuration is equivalent to the zero
-	// configuration; see the documentation of Config for the
-	// defaults.
-	Config *Config
-}
-
-// DialContext connects to the given network address and initiates a TLS
-// handshake, returning the resulting TLS connection.
-//
-// The provided Context must be non-nil. If the context expires before
-// the connection is complete, an error is returned. Once successfully
-// connected, any expiration of the context will not affect the
-// connection.
-//
-// The returned Conn, if any, will always be of type *Conn.
-func (d *Dialer) DialContext(ctx context.Context, network, addr string) (net.Conn, error) {
-	return nil, errors.New("tls:DialContext not implmented")
-}
-
-// LoadX509KeyPair reads and parses a public/private key pair from a pair
-// of files. The files must contain PEM encoded data. The certificate file
-// may contain intermediate certificates following the leaf certificate to
-// form a certificate chain. On successful return, Certificate.Leaf will
-// be nil because the parsed form of the certificate is not retained.
-func LoadX509KeyPair(certFile, keyFile string) (Certificate, error) {
-	return Certificate{}, errors.New("tls:LoadX509KeyPair not implemented")
-}

src/examples/device-id/main.go

@@ -1,21 +0,0 @@
-package main
-
-import (
-	"encoding/hex"
-	"machine"
-	"time"
-)
-
-func main() {
-	time.Sleep(2 * time.Second)
-
-	// For efficiency, it's best to get the device ID once and cache it
-	// (e.g. on RP2040 XIP flash and interrupts disabled for period of
-	// retrieving the hardware ID from ROM chip)
-	id := machine.DeviceID()
-
-	for {
-		println("Device ID:", hex.EncodeToString(id))
-		time.Sleep(1 * time.Second)
-	}
-}

src/examples/hello-wasm-unknown/main.go

@@ -1,18 +0,0 @@
-// this is intended to be used as wasm32-unknown-unknown module.
-// to compile it, run:
-// tinygo build -size short -o hello-unknown.wasm -target wasm-unknown -gc=leaking -no-debug ./src/examples/hello-wasm-unknown/
-package main
-
-var x int32
-
-//go:wasmimport hosted echo_i32
-func echo(x int32)
-
-//go:export update
-func update() {
-	x++
-	echo(x)
-}
-
-func main() {
-}

src/examples/hid-keyboard/main.go

@@ -1,6 +1,6 @@
 // to override the USB Manufacturer or Product names:
 //
-// tinygo flash -target circuitplay-express -ldflags="-X main.usbManufacturer='TinyGopher Labs' -X main.usbProduct='GopherKeyboard' -X main.usbSerial='XXXXX'" examples/hid-keyboard
+// tinygo flash -target circuitplay-express -ldflags="-X main.usbManufacturer='TinyGopher Labs' -X main.usbProduct='GopherKeyboard'" examples/hid-keyboard
 //
 // you can also override the VID/PID. however, only set this if you know what you are doing,
 // since changing it can make it difficult to reflash some devices.
@@ -15,7 +15,7 @@ import (
 )
 
 var usbVID, usbPID string
-var usbManufacturer, usbProduct, usbSerial string
+var usbManufacturer, usbProduct string
 
 func main() {
 	button := machine.BUTTON
@@ -49,8 +49,4 @@ func init() {
 	if usbProduct != "" {
 		usb.Product = usbProduct
 	}
-
-	if usbSerial != "" {
-		usb.Serial = usbSerial
-	}
 }

src/examples/rtcinterrupt/rtcinterrupt.go

@@ -24,9 +24,7 @@ func main() {
 
 	// Schedule and enable recurring interrupt.
 	// The callback function is executed in the context of an interrupt handler,
-	// so regular restrictions for this sort of code apply: no blocking, no memory allocation, etc.
-	// Please check the online documentation for the details about interrupts:
-	// https://tinygo.org/docs/concepts/compiler-internals/interrupts/
+	// so regular restructions for this sort of code apply: no blocking, no memory allocation, etc.
 	delay := time.Minute + 12*time.Second
 	machine.RTC.SetInterrupt(uint32(delay.Seconds()), true, func() { println("Peekaboo!") })
 

src/internal/bytealg/bytealg.go

@@ -1,14 +1,5 @@
 package bytealg
 
-// Some code in this file has been copied from the Go source code, and has
-// copyright of their original authors:
-//
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-//
-// This is indicated specifically in the file.
-
 const (
 	// Index can search any valid length of string.
 
@@ -134,6 +125,10 @@ func IndexString(str, sub string) int {
 	return -1
 }
 
+// Copyright 2020 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // The following code has been copied from the Go 1.15 release tree.
 
 // PrimeRK is the prime base used in Rabin-Karp algorithm.
@@ -141,8 +136,6 @@ const PrimeRK = 16777619
 
 // HashStrBytes returns the hash and the appropriate multiplicative
 // factor for use in Rabin-Karp algorithm.
-//
-// This function was removed in Go 1.22.
 func HashStrBytes(sep []byte) (uint32, uint32) {
 	hash := uint32(0)
 	for i := 0; i < len(sep); i++ {
@@ -160,9 +153,7 @@ func HashStrBytes(sep []byte) (uint32, uint32) {
 
 // HashStr returns the hash and the appropriate multiplicative
 // factor for use in Rabin-Karp algorithm.
-//
-// This function was removed in Go 1.22.
-func HashStr[T string | []byte](sep T) (uint32, uint32) {
+func HashStr(sep string) (uint32, uint32) {
 	hash := uint32(0)
 	for i := 0; i < len(sep); i++ {
 		hash = hash*PrimeRK + uint32(sep[i])
@@ -179,8 +170,6 @@ func HashStr[T string | []byte](sep T) (uint32, uint32) {
 
 // HashStrRevBytes returns the hash of the reverse of sep and the
 // appropriate multiplicative factor for use in Rabin-Karp algorithm.
-//
-// This function was removed in Go 1.22.
 func HashStrRevBytes(sep []byte) (uint32, uint32) {
 	hash := uint32(0)
 	for i := len(sep) - 1; i >= 0; i-- {
@@ -198,9 +187,7 @@ func HashStrRevBytes(sep []byte) (uint32, uint32) {
 
 // HashStrRev returns the hash of the reverse of sep and the
 // appropriate multiplicative factor for use in Rabin-Karp algorithm.
-//
-// Copied from the Go 1.22rc1 source tree.
-func HashStrRev[T string | []byte](sep T) (uint32, uint32) {
+func HashStrRev(sep string) (uint32, uint32) {
 	hash := uint32(0)
 	for i := len(sep) - 1; i >= 0; i-- {
 		hash = hash*PrimeRK + uint32(sep[i])
@@ -217,8 +204,6 @@ func HashStrRev[T string | []byte](sep T) (uint32, uint32) {
 
 // IndexRabinKarpBytes uses the Rabin-Karp search algorithm to return the index of the
 // first occurence of substr in s, or -1 if not present.
-//
-// This function was removed in Go 1.22.
 func IndexRabinKarpBytes(s, sep []byte) int {
 	// Rabin-Karp search
 	hashsep, pow := HashStrBytes(sep)
@@ -243,18 +228,16 @@ func IndexRabinKarpBytes(s, sep []byte) int {
 }
 
 // IndexRabinKarp uses the Rabin-Karp search algorithm to return the index of the
-// first occurrence of sep in s, or -1 if not present.
-//
-// Copied from the Go 1.22rc1 source tree.
-func IndexRabinKarp[T string | []byte](s, sep T) int {
+// first occurence of substr in s, or -1 if not present.
+func IndexRabinKarp(s, substr string) int {
 	// Rabin-Karp search
-	hashss, pow := HashStr(sep)
-	n := len(sep)
+	hashss, pow := HashStr(substr)
+	n := len(substr)
 	var h uint32
 	for i := 0; i < n; i++ {
 		h = h*PrimeRK + uint32(s[i])
 	}
-	if h == hashss && string(s[:n]) == string(sep) {
+	if h == hashss && s[:n] == substr {
 		return 0
 	}
 	for i := n; i < len(s); {
@@ -262,7 +245,7 @@ func IndexRabinKarp[T string | []byte](s, sep T) int {
 		h += uint32(s[i])
 		h -= pow * uint32(s[i-n])
 		i++
-		if h == hashss && string(s[i-n:i]) == string(sep) {
+		if h == hashss && s[i-n:i] == substr {
 			return i - n
 		}
 	}
@@ -278,50 +261,3 @@ func MakeNoZero(n int) []byte {
 	// malloc function implemented in the runtime).
 	return make([]byte, n)
 }
-
-// Copied from the Go 1.22rc1 source tree.
-func LastIndexByte(s []byte, c byte) int {
-	for i := len(s) - 1; i >= 0; i-- {
-		if s[i] == c {
-			return i
-		}
-	}
-	return -1
-}
-
-// Copied from the Go 1.22rc1 source tree.
-func LastIndexByteString(s string, c byte) int {
-	for i := len(s) - 1; i >= 0; i-- {
-		if s[i] == c {
-			return i
-		}
-	}
-	return -1
-}
-
-// LastIndexRabinKarp uses the Rabin-Karp search algorithm to return the last index of the
-// occurrence of sep in s, or -1 if not present.
-//
-// Copied from the Go 1.22rc1 source tree.
-func LastIndexRabinKarp[T string | []byte](s, sep T) int {
-	// Rabin-Karp search from the end of the string
-	hashss, pow := HashStrRev(sep)
-	n := len(sep)
-	last := len(s) - n
-	var h uint32
-	for i := len(s) - 1; i >= last; i-- {
-		h = h*PrimeRK + uint32(s[i])
-	}
-	if h == hashss && string(s[last:]) == string(sep) {
-		return last
-	}
-	for i := last - 1; i >= 0; i-- {
-		h *= PrimeRK
-		h += uint32(s[i])
-		h -= pow * uint32(s[i+n])
-		if h == hashss && string(s[i:i+n]) == string(sep) {
-			return i
-		}
-	}
-	return -1
-}

src/internal/task/task_stack_arm.S

@@ -1,5 +1,3 @@
-//go:build tinygo
-
 // Only generate .debug_frame, don't generate .eh_frame.
 .cfi_sections .debug_frame
 

src/internal/task/task_stack_avr.S

@@ -1,5 +1,3 @@
-//go:build tinygo
-
 .section .bss.tinygo_systemStack
 .global tinygo_systemStack
 .type   tinygo_systemStack, %object

src/internal/task/task_stack_cortexm.S

@@ -1,5 +1,3 @@
-//go:build tinygo
-
 // Only generate .debug_frame, don't generate .eh_frame.
 .cfi_sections .debug_frame
 

src/internal/task/task_stack_cortexm.go

@@ -52,17 +52,17 @@ func (s *state) archInit(r *calleeSavedRegs, fn uintptr, args unsafe.Pointer) {
 }
 
 func (s *state) resume() {
-	tinygo_switchToTask(s.sp)
+	switchToTask(s.sp)
 }
 
 //export tinygo_switchToTask
-func tinygo_switchToTask(uintptr)
+func switchToTask(uintptr)
 
 //export tinygo_switchToScheduler
-func tinygo_switchToScheduler(*uintptr)
+func switchToScheduler(*uintptr)
 
 func (s *state) pause() {
-	tinygo_switchToScheduler(&s.sp)
+	switchToScheduler(&s.sp)
 }
 
 // SystemStack returns the system stack pointer. On Cortex-M, it is always

src/internal/task/task_stack_esp32.S

@@ -1,5 +1,3 @@
-//go:build tinygo
-
 .section .text.tinygo_startTask,"ax",@progbits
 .global  tinygo_startTask
 .type    tinygo_startTask, %function

src/internal/task/task_stack_esp8266.S

@@ -1,5 +1,3 @@
-//go:build tinygo
-
 .section .text.tinygo_startTask,"ax",@progbits
 .global  tinygo_startTask
 .type    tinygo_startTask, %function

src/internal/task/task_stack_tinygoriscv.S

@@ -1,5 +1,3 @@
-//go:build tinygo
-
 .section .text.tinygo_startTask
 .global  tinygo_startTask
 .type    tinygo_startTask, %function

src/machine/board_arduino.go

@@ -2,6 +2,11 @@
 
 package machine
 
+// Return the current CPU frequency in hertz.
+func CPUFrequency() uint32 {
+	return 16000000
+}
+
 // Digital pins, marked as plain numbers on the board.
 const (
 	D0  = PD0 // RX

src/machine/board_arduino_nano.go

@@ -2,6 +2,11 @@
 
 package machine
 
+// Return the current CPU frequency in hertz.
+func CPUFrequency() uint32 {
+	return 16000000
+}
+
 // Digital pins.
 const (
 	D0  = PD0 // RX0

src/machine/board_arduino_nano33.go

@@ -63,9 +63,6 @@ var UART1 = &sercomUSART3
 // UART2 on the Arduino Nano 33 connects to the normal TX/RX pins.
 var UART2 = &sercomUSART5
 
-// UART_NINA on the Arduino Nano 33 connects to the NINA HCI.
-var UART_NINA = &sercomUSART2
-
 // I2C pins
 const (
 	SDA_PIN Pin = A4 // SDA: SERCOM4/PAD[1]
@@ -102,17 +99,8 @@ const (
 	NINA_GPIO0  Pin = PA27
 	NINA_RESETN Pin = PA08
 	NINA_ACK    Pin = PA28
-	NINA_TX     Pin = PA12
-	NINA_RX     Pin = PA13
-	NINA_RTS    Pin = PA14
-	NINA_CTS    Pin = PA15
-)
-
-// NINA-W102 settings
-const (
-	NINA_BAUDRATE         = 912600
-	NINA_RESET_INVERTED   = true
-	NINA_SOFT_FLOWCONTROL = false
+	NINA_TX     Pin = PA22
+	NINA_RX     Pin = PA23
 )
 
 // I2S pins

src/machine/board_atmega328p.go

@@ -2,11 +2,6 @@
 
 package machine
 
-// Return the current CPU frequency in hertz.
-func CPUFrequency() uint32 {
-	return 16000000
-}
-
 const (
 	// Note: start at port B because there is no port A.
 	portB Pin = iota * 8

src/machine/board_atmega328pb.go

@@ -1,51 +0,0 @@
-//go:build avr && atmega328pb
-
-package machine
-
-// Return the current CPU frequency in hertz.
-func CPUFrequency() uint32 {
-	return 16000000
-}
-
-const (
-	// Note: start at port B because there is no port A.
-	portB Pin = iota * 8
-	portC
-	portD
-	portE
-)
-
-const (
-	PB0 = portB + 0
-	PB1 = portB + 1 // peripherals: Timer1 channel A
-	PB2 = portB + 2 // peripherals: Timer1 channel B
-	PB3 = portB + 3 // peripherals: Timer2 channel A
-	PB4 = portB + 4
-	PB5 = portB + 5
-	PB6 = portB + 6
-	PB7 = portB + 7
-	PC0 = portC + 0
-	PC1 = portC + 1
-	PC2 = portC + 2
-	PC3 = portC + 3
-	PC4 = portC + 4
-	PC5 = portC + 5
-	PC6 = portC + 6
-	PC7 = portC + 7
-	PD0 = portD + 0
-	PD1 = portD + 1
-	PD2 = portD + 2
-	PD3 = portD + 3 // peripherals: Timer2 channel B
-	PD4 = portD + 4
-	PD5 = portD + 5 // peripherals: Timer0 channel B
-	PD6 = portD + 6 // peripherals: Timer0 channel A
-	PD7 = portD + 7
-	PE0 = portE + 0
-	PE1 = portE + 1
-	PE2 = portE + 2
-	PE3 = portE + 3
-	PE4 = portE + 4
-	PE5 = portE + 5
-	PE6 = portE + 6
-	PE7 = portE + 7
-)

src/machine/board_gopher-badge.go

@@ -73,7 +73,7 @@ const (
 
 // USB CDC identifiers
 const (
-	usb_STRING_PRODUCT      = "Gopher Badge"
+	usb_STRING_PRODUCT      = "Gopher Badger"
 	usb_STRING_MANUFACTURER = "TinyGo"
 )
 

src/machine/board_metro-m4-airlift.go

@@ -62,15 +62,6 @@ var (
 	UART2 = &sercomUSART0
 
 	DefaultUART = UART1
-
-	UART_NINA = UART2
-)
-
-// NINA-W102 settings
-const (
-	NINA_BAUDRATE         = 115200
-	NINA_RESET_INVERTED   = true
-	NINA_SOFT_FLOWCONTROL = true
 )
 
 const (
@@ -79,12 +70,9 @@ const (
 	NINA_GPIO0  = PB01
 	NINA_RESETN = PB05
 
-	// pins used for the ESP32 connection do not allow hardware
-	// flow control, which is required. have to emulate with software.
 	NINA_TX  = PA04
 	NINA_RX  = PA07
-	NINA_CTS = NINA_ACK
-	NINA_RTS = NINA_GPIO0
+	NINA_RTS = PB23
 )
 
 // I2C pins

src/machine/board_mksnanov3.go

@@ -1,142 +0,0 @@
-//go:build mksnanov3
-
-// The MKS Robin Nano V3.X board.
-// Documented at https://github.com/makerbase-mks/MKS-Robin-Nano-V3.X.
-
-package machine
-
-import (
-	"device/stm32"
-	"runtime/interrupt"
-)
-
-// LED is also wired to the SD card card detect (CD) pin.
-const LED = PD12
-
-// UART pins
-const (
-	UART_TX_PIN = PB10
-	UART_RX_PIN = PB11
-)
-
-// EXP1 and EXP2 expansion ports for connecting
-// the MKS TS35 V2.0 expansion board.
-const (
-	BEEPER = EXP1_1
-
-	// LCD pins.
-	LCD_DC        = EXP1_8
-	LCD_CS        = EXP1_7
-	LCD_RS        = EXP1_4
-	LCD_BACKLIGHT = EXP1_3
-
-	// Touch pins. Note that some pins are shared with the
-	// LCD SPI1 interface.
-	TOUCH_CLK  = EXP2_2
-	TOUCH_CS   = EXP1_5
-	TOUCH_DIN  = EXP2_6
-	TOUCH_DOUT = EXP2_1
-	TOUCH_IRQ  = EXP1_6
-
-	BUTTON         = BUTTON_JOG
-	BUTTON_JOG     = EXP1_2
-	BUTTON_JOG_CCW = EXP2_3
-	BUTTON_JOG_CW  = EXP2_5
-
-	EXP1_1 = PC5
-	EXP1_2 = PE13
-	EXP1_3 = PD13
-	EXP1_4 = PC6
-	EXP1_5 = PE14
-	EXP1_6 = PE15
-	EXP1_7 = PD11
-	EXP1_8 = PD10
-
-	EXP2_1 = PA6
-	EXP2_2 = PA5
-	EXP2_3 = PE8
-	EXP2_4 = PE10
-	EXP2_5 = PE11
-	EXP2_6 = PA7
-	EXP2_7 = PE12
-)
-
-var (
-	UART3  = &_UART3
-	_UART3 = UART{
-		Buffer:            NewRingBuffer(),
-		Bus:               stm32.USART3,
-		TxAltFuncSelector: AF7_USART1_2_3,
-		RxAltFuncSelector: AF7_USART1_2_3,
-	}
-	DefaultUART = UART3
-)
-
-// set up RX IRQ handler. Follow similar pattern for other UARTx instances
-func init() {
-	UART3.Interrupt = interrupt.New(stm32.IRQ_USART3, _UART3.handleInterrupt)
-}
-
-// SPI pins
-const (
-	SPI1_SCK_PIN = EXP2_2
-	SPI1_SDI_PIN = EXP2_1
-	SPI1_SDO_PIN = EXP2_6
-	SPI0_SCK_PIN = SPI1_SCK_PIN
-	SPI0_SDI_PIN = SPI1_SDI_PIN
-	SPI0_SDO_PIN = SPI1_SDO_PIN
-)
-
-// Since the first interface is named SPI1, both SPI0 and SPI1 refer to SPI1.
-var (
-	SPI0 = SPI{
-		Bus:             stm32.SPI1,
-		AltFuncSelector: AF5_SPI1_SPI2,
-	}
-	SPI1 = &SPI0
-)
-
-const (
-	I2C0_SCL_PIN = PB6
-	I2C0_SDA_PIN = PB7
-)
-
-var (
-	I2C0 = &I2C{
-		Bus:             stm32.I2C1,
-		AltFuncSelector: AF4_I2C1_2_3,
-	}
-)
-
-// Motor control pins.
-const (
-	X_ENABLE = PE4
-	X_STEP   = PE3
-	X_DIR    = PE2
-	X_DIAG   = PA15
-	X_UART   = PD5
-
-	Y_ENABLE = PE1
-	Y_STEP   = PE0
-	Y_DIR    = PB9
-	Y_DIAG   = PD2
-	Y_UART   = PD7
-
-	Z_ENABLE = PB8
-	Z_STEP   = PB5
-	Z_DIR    = PB4
-	Z_DIAG   = PC8
-	Z_UART   = PD4
-
-	E0_ENABLE = PB3
-	E0_STEP   = PD6
-	E0_DIR    = PD3
-	E0_DIAG   = PC4
-	E0_UART   = PD9
-
-	E1_ENABLE = PA3
-	E1_STEP   = PD15
-	E1_DIR    = PA1
-	E1_DIAG   = PE7
-	E1_UART   = PD8
-)

src/machine/board_nano-rp2040.go

@@ -87,17 +87,8 @@ const (
 	NINA_GPIO0  Pin = GPIO2
 	NINA_RESETN Pin = GPIO3
 
-	NINA_TX  Pin = GPIO8
-	NINA_RX  Pin = GPIO9
-	NINA_CTS Pin = GPIO10
-	NINA_RTS Pin = GPIO11
-)
-
-// NINA-W102 settings
-const (
-	NINA_BAUDRATE         = 115200
-	NINA_RESET_INVERTED   = true
-	NINA_SOFT_FLOWCONTROL = false
+	NINA_TX Pin = GPIO9
+	NINA_RX Pin = GPIO8
 )
 
 // Onboard crystal oscillator frequency, in MHz.
@@ -132,20 +123,10 @@ var (
 		Buffer: NewRingBuffer(),
 		Bus:    rp.UART0,
 	}
-
-	UART1  = &_UART1
-	_UART1 = UART{
-		Buffer: NewRingBuffer(),
-		Bus:    rp.UART1,
-	}
-
-	// UART_NINA on the Arduino Nano RP2040 connects to the NINA HCI.
-	UART_NINA = UART1
 )
 
 var DefaultUART = UART0
 
 func init() {
 	UART0.Interrupt = interrupt.New(rp.IRQ_UART0_IRQ, _UART0.handleInterrupt)
-	UART1.Interrupt = interrupt.New(rp.IRQ_UART1_IRQ, _UART1.handleInterrupt)
 }

src/machine/board_nrf52840_generic.go

@@ -1,25 +0,0 @@
-//go:build nrf52840 && nrf52840_generic
-
-package machine
-
-var (
-	LED          = NoPin
-	SDA_PIN      = NoPin
-	SCL_PIN      = NoPin
-	UART_TX_PIN  = NoPin
-	UART_RX_PIN  = NoPin
-	SPI0_SCK_PIN = NoPin
-	SPI0_SDO_PIN = NoPin
-	SPI0_SDI_PIN = NoPin
-
-	// https://pid.codes/org/TinyGo/
-	usb_VID uint16 = 0x1209
-	usb_PID uint16 = 0x9090
-
-	usb_STRING_MANUFACTURER = "TinyGo"
-	usb_STRING_PRODUCT      = "nRF52840 Generic board"
-)
-
-var (
-	DefaultUART = UART0
-)

src/machine/board_pybadge.go

@@ -130,33 +130,3 @@ var (
 	usb_VID uint16 = 0x239A
 	usb_PID uint16 = 0x8033
 )
-
-// NINA-W102 settings when using AirLift WiFi FeatherWing
-const (
-	NINA_BAUDRATE         = 115200
-	NINA_RESET_INVERTED   = true
-	NINA_SOFT_FLOWCONTROL = true
-)
-
-const (
-	NINA_CS     = D13
-	NINA_ACK    = D11
-	NINA_GPIO0  = D10
-	NINA_RESETN = D12
-
-	// pins used for the ESP32 connection do not allow hardware
-	// flow control, which is required. have to emulate with software.
-	NINA_TX  = UART_TX_PIN
-	NINA_RX  = UART_RX_PIN
-	NINA_CTS = NINA_ACK
-	NINA_RTS = NINA_GPIO0
-
-	NINA_SDO = SPI0_SDO_PIN
-	NINA_SDI = SPI0_SDI_PIN
-	NINA_SCK = SPI0_SCK_PIN
-)
-
-var (
-	NINA_SPI  = SPI0
-	UART_NINA = UART1
-)

src/machine/board_pyportal.go

@@ -53,12 +53,9 @@ const (
 	NINA_GPIO0  = D6
 	NINA_RESETN = D7
 
-	// pins used for the ESP32 connection do not allow hardware
-	// flow control, which is required. have to emulate with software.
 	NINA_TX  = D1
 	NINA_RX  = D0
-	NINA_CTS = NINA_ACK
-	NINA_RTS = NINA_GPIO0
+	NINA_RTS = D51
 
 	LCD_DATA0 = D34
 
@@ -114,15 +111,6 @@ var (
 	UART1 = &sercomUSART4
 
 	DefaultUART = UART1
-
-	UART_NINA = UART1
-)
-
-// NINA-W102 settings
-const (
-	NINA_BAUDRATE         = 115200
-	NINA_RESET_INVERTED   = true
-	NINA_SOFT_FLOWCONTROL = true
 )
 
 // I2C pins

src/machine/board_qtpy_esp32c3.go

@@ -1,60 +0,0 @@
-//go:build qtpy_esp32c3
-
-// This file contains the pin mappings for the Adafruit QtPy ESP32C3 boards.
-//
-// https://learn.adafruit.com/adafruit-qt-py-esp32-c3-wifi-dev-board/pinouts
-package machine
-
-// Digital Pins
-const (
-	D0 = GPIO4
-	D1 = GPIO3
-	D2 = GPIO1
-	D3 = GPIO0
-)
-
-// Analog pins (ADC1)
-const (
-	A0 = GPIO4
-	A1 = GPIO3
-	A2 = GPIO1
-	A3 = GPIO0
-)
-
-// UART pins
-const (
-	RX_PIN = GPIO20
-	TX_PIN = GPIO21
-
-	UART_RX_PIN = RX_PIN
-	UART_TX_PIN = TX_PIN
-)
-
-// I2C pins
-const (
-	SDA_PIN = GPIO5
-	SCL_PIN = GPIO6
-
-	I2C0_SDA_PIN = SDA_PIN
-	I2C0_SCL_PIN = SCL_PIN
-)
-
-// SPI pins
-const (
-	SCK_PIN = GPIO10
-	MI_PIN  = GPIO8
-	MO_PIN  = GPIO7
-
-	SPI_SCK_PIN = SCK_PIN
-	SPI_SDI_PIN = MI_PIN
-	SPI_SDO_PIN = MO_PIN
-)
-
-const (
-	NEOPIXEL = GPIO2
-	WS2812   = GPIO2
-
-	// also used for boot button.
-	// set it to be an input-with-pullup
-	BUTTON = GPIO9
-)

src/machine/board_thumby.go

@@ -1,94 +0,0 @@
-//go:build thumby
-
-// This contains the pin mappings for the Thumby.
-//
-// https://thumby.us/
-package machine
-
-import (
-	"device/rp"
-	"runtime/interrupt"
-)
-
-const (
-	THUMBY_SCK_PIN = I2C1_SDA_PIN
-	THUMBY_SDA_PIN = I2C1_SCL_PIN
-
-	THUMBY_CS_PIN    = GPIO16
-	THUMBY_DC_PIN    = GPIO17
-	THUMBY_RESET_PIN = GPIO20
-
-	THUMBY_LINK_TX_PIN = UART0_TX_PIN
-	THUMBY_LINK_RX_PIN = UART0_RX_PIN
-	THUMBY_LINK_PU_PIN = GPIO2
-
-	THUMBY_BTN_LDPAD_PIN = GPIO3
-	THUMBY_BTN_RDPAD_PIN = GPIO5
-	THUMBY_BTN_UDPAD_PIN = GPIO4
-	THUMBY_BTN_DDPAD_PIN = GPIO6
-	THUMBY_BTN_B_PIN     = GPIO24
-	THUMBY_BTN_A_PIN     = GPIO27
-
-	THUMBY_AUDIO_PIN = GPIO28
-
-	THUMBY_SCREEN_RESET_PIN = GPIO20
-)
-
-// I2C pins
-const (
-	I2C0_SDA_PIN Pin = NoPin
-	I2C0_SCL_PIN Pin = NoPin
-
-	I2C1_SDA_PIN Pin = GPIO18
-	I2C1_SCL_PIN Pin = GPIO19
-)
-
-// SPI pins
-const (
-	SPI0_SCK_PIN = GPIO18
-	SPI0_SDO_PIN = GPIO19
-	SPI0_SDI_PIN = GPIO16
-
-	SPI1_SCK_PIN = NoPin
-	SPI1_SDO_PIN = NoPin
-	SPI1_SDI_PIN = NoPin
-)
-
-// Onboard crystal oscillator frequency, in MHz.
-const (
-	xoscFreq = 12 // MHz
-)
-
-// USB CDC identifiers
-const (
-	usb_STRING_PRODUCT      = "Thumby"
-	usb_STRING_MANUFACTURER = "TinyCircuits"
-)
-
-var (
-	usb_VID uint16 = 0x2E8A
-	usb_PID uint16 = 0x0005
-)
-
-// UART pins
-const (
-	UART0_TX_PIN = GPIO0
-	UART0_RX_PIN = GPIO1
-	UART_TX_PIN  = UART0_TX_PIN
-	UART_RX_PIN  = UART0_RX_PIN
-)
-
-// UART on the Thumby
-var (
-	UART0  = &_UART0
-	_UART0 = UART{
-		Buffer: NewRingBuffer(),
-		Bus:    rp.UART0,
-	}
-)
-
-var DefaultUART = UART0
-
-func init() {
-	UART0.Interrupt = interrupt.New(rp.IRQ_UART0_IRQ, _UART0.handleInterrupt)
-}

src/machine/board_wioterminal.go

@@ -353,9 +353,6 @@ var (
 
 	// RTL8720D (tx: PB24, rx: PC24)
 	UART3 = &sercomUSART0
-
-	// Right-hand grove port (tx: D0, rx: D1)
-	UART4 = &sercomUSART4
 )
 
 // I2C pins

src/machine/buffer.go

@@ -4,6 +4,8 @@ import (
 	"runtime/volatile"
 )
 
+const bufferSize = 128
+
 // RingBuffer is ring buffer implementation inspired by post at
 // https://www.embeddedrelated.com/showthread/comp.arch.embedded/77084-1.php
 type RingBuffer struct {

src/machine/buffer_atmega.go

@@ -1,5 +0,0 @@
-//go:build atmega
-
-package machine
-
-const bufferSize = 32

src/machine/buffer_generic.go

@@ -1,5 +0,0 @@
-//go:build !atmega
-
-package machine
-
-const bufferSize = 128

src/machine/deviceid.go

@@ -1,17 +0,0 @@
-//go:build rp2040 || nrf || sam
-
-package machine
-
-// DeviceID returns an identifier that is unique within
-// a particular chipset.
-//
-// The identity is one burnt into the MCU itself, or the
-// flash chip at time of manufacture.
-//
-// It's possible that two different vendors may allocate
-// the same DeviceID, so callers should take this into
-// account if needing to generate a globally unique id.
-//
-// The length of the hardware ID is vendor-specific, but
-// 8 bytes (64 bits) and 16 bytes (128 bits) are common.
-var _ = (func() []byte)(DeviceID)

src/machine/i2c.go

@@ -1,4 +1,4 @@
-//go:build atmega || nrf || sam || stm32 || fe310 || k210 || rp2040 || mimxrt1062 || (esp32c3 && !m5stamp_c3)
+//go:build atmega || nrf || sam || stm32 || fe310 || k210 || rp2040
 
 package machine
 
@@ -6,17 +6,6 @@ import (
 	"errors"
 )
 
-// If you are getting a compile error on this line please check to see you've
-// correctly implemented the methods on the I2C type. They must match
-// the i2cController interface method signatures type to type perfectly.
-// If not implementing the I2C type please remove your target from the build tags
-// at the top of this file.
-var _ interface { // 2
-	Configure(config I2CConfig) error
-	Tx(addr uint16, w, r []byte) error
-	SetBaudRate(br uint32) error
-} = (*I2C)(nil)
-
 // TWI_FREQ is the I2C bus speed. Normally either 100 kHz, or 400 kHz for high-speed bus.
 //
 // Deprecated: use 100 * machine.KHz or 400 * machine.KHz instead.
@@ -36,7 +25,6 @@ var (
 	errI2CBusError           = errors.New("I2C bus error")
 	errI2COverflow           = errors.New("I2C receive buffer overflow")
 	errI2COverread           = errors.New("I2C transmit buffer overflow")
-	errI2CNotImplemented     = errors.New("I2C operation not yet implemented")
 )
 
 // I2CTargetEvent reflects events on the I2C bus

src/machine/machine_atmega.go

@@ -11,20 +11,11 @@ import (
 
 // I2C on AVR.
 type I2C struct {
-	srReg *volatile.Register8
-	brReg *volatile.Register8
-	crReg *volatile.Register8
-	drReg *volatile.Register8
-
-	srPS0 byte
-	srPS1 byte
-	crEN  byte
-	crINT byte
-	crSTO byte
-	crEA  byte
-	crSTA byte
 }
 
+// I2C0 is the only I2C interface on most AVRs.
+var I2C0 *I2C = nil
+
 // I2CConfig is used to store config info for I2C.
 type I2CConfig struct {
 	Frequency uint32
@@ -40,22 +31,17 @@ func (i2c *I2C) Configure(config I2CConfig) error {
 	// Activate internal pullups for twi.
 	avr.PORTC.SetBits((avr.DIDR0_ADC4D | avr.DIDR0_ADC5D))
 
-	return i2c.SetBaudRate(config.Frequency)
-}
-
-// SetBaudRate sets the communication speed for I2C.
-func (i2c *I2C) SetBaudRate(br uint32) error {
 	// Initialize twi prescaler and bit rate.
-	i2c.srReg.SetBits((i2c.srPS0 | i2c.srPS1))
+	avr.TWSR.SetBits((avr.TWSR_TWPS0 | avr.TWSR_TWPS1))
 
 	// twi bit rate formula from atmega128 manual pg. 204:
 	// SCL Frequency = CPU Clock Frequency / (16 + (2 * TWBR))
 	// NOTE: TWBR should be 10 or higher for controller mode.
 	// It is 72 for a 16mhz board with 100kHz TWI
-	i2c.brReg.Set(uint8(((CPUFrequency() / br) - 16) / 2))
+	avr.TWBR.Set(uint8(((CPUFrequency() / config.Frequency) - 16) / 2))
 
 	// Enable twi module.
-	i2c.crReg.Set(i2c.crEN)
+	avr.TWCR.Set(avr.TWCR_TWEN)
 
 	return nil
 }
@@ -86,10 +72,10 @@ func (i2c *I2C) Tx(addr uint16, w, r []byte) error {
 // start starts an I2C communication session.
 func (i2c *I2C) start(address uint8, write bool) {
 	// Clear TWI interrupt flag, put start condition on SDA, and enable TWI.
-	i2c.crReg.Set((i2c.crINT | i2c.crSTA | i2c.crEN))
+	avr.TWCR.Set((avr.TWCR_TWINT | avr.TWCR_TWSTA | avr.TWCR_TWEN))
 
 	// Wait till start condition is transmitted.
-	for !i2c.crReg.HasBits(i2c.crINT) {
+	for !avr.TWCR.HasBits(avr.TWCR_TWINT) {
 	}
 
 	// Write 7-bit shifted peripheral address.
@@ -103,23 +89,23 @@ func (i2c *I2C) start(address uint8, write bool) {
 // stop ends an I2C communication session.
 func (i2c *I2C) stop() {
 	// Send stop condition.
-	i2c.crReg.Set(i2c.crEN | i2c.crINT | i2c.crSTO)
+	avr.TWCR.Set(avr.TWCR_TWEN | avr.TWCR_TWINT | avr.TWCR_TWSTO)
 
 	// Wait for stop condition to be executed on bus.
-	for !i2c.crReg.HasBits(i2c.crSTO) {
+	for !avr.TWCR.HasBits(avr.TWCR_TWSTO) {
 	}
 }
 
 // writeByte writes a single byte to the I2C bus.
 func (i2c *I2C) writeByte(data byte) error {
 	// Write data to register.
-	i2c.drReg.Set(data)
+	avr.TWDR.Set(data)
 
 	// Clear TWI interrupt flag and enable TWI.
-	i2c.crReg.Set(i2c.crEN | i2c.crINT)
+	avr.TWCR.Set(avr.TWCR_TWEN | avr.TWCR_TWINT)
 
 	// Wait till data is transmitted.
-	for !i2c.crReg.HasBits(i2c.crINT) {
+	for !avr.TWCR.HasBits(avr.TWCR_TWINT) {
 	}
 	return nil
 }
@@ -127,13 +113,13 @@ func (i2c *I2C) writeByte(data byte) error {
 // readByte reads a single byte from the I2C bus.
 func (i2c *I2C) readByte() byte {
 	// Clear TWI interrupt flag and enable TWI.
-	i2c.crReg.Set(i2c.crEN | i2c.crINT | i2c.crEA)
+	avr.TWCR.Set(avr.TWCR_TWEN | avr.TWCR_TWINT | avr.TWCR_TWEA)
 
 	// Wait till read request is transmitted.
-	for !i2c.crReg.HasBits(i2c.crINT) {
+	for !avr.TWCR.HasBits(avr.TWCR_TWINT) {
 	}
 
-	return byte(i2c.drReg.Get())
+	return byte(avr.TWDR.Get())
 }
 
 // Always use UART0 as the serial output.
@@ -179,18 +165,10 @@ func (uart *UART) Configure(config UARTConfig) {
 		config.BaudRate = 9600
 	}
 
-	// Prescale formula for u2x mode from AVR MiniCore source code.
-	// Same as formula from specification but taking into account rounding error.
-	ps := (CPUFrequency()/4/config.BaudRate - 1) / 2
-	uart.statusRegA.SetBits(avr.UCSR0A_U2X0)
-
-	// Hardcoded exception for 57600 for compatibility with older bootloaders.
-	// Also, prescale cannot be > 4095, so switch back to non-u2x mode if the baud rate is too low.
-	if (CPUFrequency() == 16000000 && config.BaudRate == 57600) || ps > 0xfff {
-		ps = (CPUFrequency()/8/config.BaudRate - 1) / 2
-		uart.statusRegA.ClearBits(avr.UCSR0A_U2X0)
-	}
-
+	// Set baud rate based on prescale formula from
+	// https://www.microchip.com/webdoc/AVRLibcReferenceManual/FAQ_1faq_wrong_baud_rate.html
+	// ((F_CPU + UART_BAUD_RATE * 8L) / (UART_BAUD_RATE * 16L) - 1)
+	ps := ((CPUFrequency()+config.BaudRate*8)/(config.BaudRate*16) - 1)
 	uart.baudRegH.Set(uint8(ps >> 8))
 	uart.baudRegL.Set(uint8(ps & 0xff))
 
@@ -238,17 +216,6 @@ type SPI struct {
 	spdr *volatile.Register8
 	spsr *volatile.Register8
 
-	spcrR0   byte
-	spcrR1   byte
-	spcrCPHA byte
-	spcrCPOL byte
-	spcrDORD byte
-	spcrSPE  byte
-	spcrMSTR byte
-
-	spsrI2X  byte
-	spsrSPIF byte
-
 	// The io pins for the SPIx port set by the chip
 	sck Pin
 	sdi Pin
@@ -292,39 +259,39 @@ func (s SPI) Configure(config SPIConfig) error {
 
 	switch {
 	case frequencyDivider >= 128:
-		s.spcr.SetBits(s.spcrR0 | s.spcrR1)
+		s.spcr.SetBits(avr.SPCR_SPR0 | avr.SPCR_SPR1)
 	case frequencyDivider >= 64:
-		s.spcr.SetBits(s.spcrR1)
+		s.spcr.SetBits(avr.SPCR_SPR1)
 	case frequencyDivider >= 32:
-		s.spcr.SetBits(s.spcrR1)
-		s.spsr.SetBits(s.spsrI2X)
+		s.spcr.SetBits(avr.SPCR_SPR1)
+		s.spsr.SetBits(avr.SPSR_SPI2X)
 	case frequencyDivider >= 16:
-		s.spcr.SetBits(s.spcrR0)
+		s.spcr.SetBits(avr.SPCR_SPR0)
 	case frequencyDivider >= 8:
-		s.spcr.SetBits(s.spcrR0)
-		s.spsr.SetBits(s.spsrI2X)
+		s.spcr.SetBits(avr.SPCR_SPR0)
+		s.spsr.SetBits(avr.SPSR_SPI2X)
 	case frequencyDivider >= 4:
 		// The clock is already set to all 0's.
 	default: // defaults to fastest which is /2
-		s.spsr.SetBits(s.spsrI2X)
+		s.spsr.SetBits(avr.SPSR_SPI2X)
 	}
 
 	switch config.Mode {
 	case Mode1:
-		s.spcr.SetBits(s.spcrCPHA)
+		s.spcr.SetBits(avr.SPCR_CPHA)
 	case Mode2:
-		s.spcr.SetBits(s.spcrCPHA)
+		s.spcr.SetBits(avr.SPCR_CPOL)
 	case Mode3:
-		s.spcr.SetBits(s.spcrCPHA | s.spcrCPOL)
+		s.spcr.SetBits(avr.SPCR_CPHA | avr.SPCR_CPOL)
 	default: // default is mode 0
 	}
 
 	if config.LSBFirst {
-		s.spcr.SetBits(s.spcrDORD)
+		s.spcr.SetBits(avr.SPCR_DORD)
 	}
 
 	// enable SPI, set controller, set clock rate
-	s.spcr.SetBits(s.spcrSPE | s.spcrMSTR)
+	s.spcr.SetBits(avr.SPCR_SPE | avr.SPCR_MSTR)
 
 	return nil
 }
@@ -333,7 +300,7 @@ func (s SPI) Configure(config SPIConfig) error {
 func (s SPI) Transfer(b byte) (byte, error) {
 	s.spdr.Set(uint8(b))
 
-	for !s.spsr.HasBits(s.spsrSPIF) {
+	for !s.spsr.HasBits(avr.SPSR_SPIF) {
 	}
 
 	return byte(s.spdr.Get()), nil