aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--builder/tools-builtin.go1
-rw-r--r--builder/tools-external.go1
-rw-r--r--cgo/libclang_config_llvm14.go1
-rw-r--r--cgo/libclang_config_llvm15.go1
-rw-r--r--src/crypto/rand/rand_arc4random.go1
-rw-r--r--src/crypto/rand/rand_baremetal.go1
-rw-r--r--src/crypto/rand/rand_urandom.go1
-rw-r--r--src/device/arm/scb.go1
-rw-r--r--src/device/avr/avr_tiny85.go1
-rw-r--r--src/device/nxp/hardfault.go1
-rw-r--r--src/device/nxp/mimxrt1062_clock.go1
-rw-r--r--src/device/nxp/mimxrt1062_hardfault.go1
-rw-r--r--src/device/nxp/mimxrt1062_mpu.go1
-rw-r--r--src/device/sam/atsamd51x-bitfields.go1
-rw-r--r--src/device/sam/atsame5x-bitfields.go1
-rw-r--r--src/examples/can/feather-m4-can.go1
-rw-r--r--src/examples/caninterrupt/feather-m4-can.go1
-rw-r--r--src/examples/dac/circuitplay_express.go1
-rw-r--r--src/examples/dac/pyportal.go1
-rw-r--r--src/examples/pininterrupt/circuitplay-express.go1
-rw-r--r--src/examples/pininterrupt/pca10040.go1
-rw-r--r--src/examples/pininterrupt/stm32.go1
-rw-r--r--src/examples/pininterrupt/wioterminal.go1
-rw-r--r--src/examples/pwm/arduino-mega1280.go1
-rw-r--r--src/examples/pwm/arduino.go1
-rw-r--r--src/examples/pwm/bluepill.go1
-rw-r--r--src/examples/pwm/feather-m4.go1
-rw-r--r--src/examples/pwm/itsybitsy-m0.go1
-rw-r--r--src/examples/pwm/itsybitsy-m4.go1
-rw-r--r--src/examples/pwm/nucleo-f722ze.go1
-rw-r--r--src/examples/pwm/nucleo-l031k6.go1
-rw-r--r--src/examples/pwm/nucleo-l432kc.go1
-rw-r--r--src/examples/pwm/nucleo-l552ze.go1
-rw-r--r--src/examples/pwm/pico.go1
-rw-r--r--src/examples/pwm/stm32f4disco.go1
-rw-r--r--src/internal/task/gc_stack_chain.go1
-rw-r--r--src/internal/task/gc_stack_noop.go1
-rw-r--r--src/internal/task/task_asyncify.go1
-rw-r--r--src/internal/task/task_none.go1
-rw-r--r--src/internal/task/task_stack.go1
-rw-r--r--src/internal/task/task_stack_386.go1
-rw-r--r--src/internal/task/task_stack_amd64.go1
-rw-r--r--src/internal/task/task_stack_amd64_windows.go1
-rw-r--r--src/internal/task/task_stack_arm.go1
-rw-r--r--src/internal/task/task_stack_arm64.go1
-rw-r--r--src/internal/task/task_stack_avr.go1
-rw-r--r--src/internal/task/task_stack_cortexm.go1
-rw-r--r--src/internal/task/task_stack_esp32.go1
-rw-r--r--src/internal/task/task_stack_esp8266.go1
-rw-r--r--src/internal/task/task_stack_tinygoriscv.go1
-rw-r--r--src/machine/board_arduino.go1
-rw-r--r--src/machine/board_arduino_mega1280.go1
-rw-r--r--src/machine/board_arduino_mega2560.go1
-rw-r--r--src/machine/board_arduino_mkr1000.go1
-rw-r--r--src/machine/board_arduino_mkrwifi1010.go1
-rw-r--r--src/machine/board_arduino_nano.go1
-rw-r--r--src/machine/board_arduino_nano33.go1
-rw-r--r--src/machine/board_arduino_zero.go1
-rw-r--r--src/machine/board_atmega328p.go1
-rw-r--r--src/machine/board_atsamd21.go1
-rw-r--r--src/machine/board_atsame54-xpro.go1
-rw-r--r--src/machine/board_badger2040.go1
-rw-r--r--src/machine/board_bluepill.go1
-rw-r--r--src/machine/board_challenger_rp2040.go1
-rw-r--r--src/machine/board_circuitplay_bluefruit.go1
-rw-r--r--src/machine/board_circuitplay_express.go1
-rw-r--r--src/machine/board_clue_alpha.go1
-rw-r--r--src/machine/board_digispark.go1
-rw-r--r--src/machine/board_esp32-coreboard-v2.go1
-rw-r--r--src/machine/board_esp32c3-12f.go1
-rw-r--r--src/machine/board_fe310.go1
-rw-r--r--src/machine/board_feather-m0.go1
-rw-r--r--src/machine/board_feather-m4-can.go1
-rw-r--r--src/machine/board_feather-m4.go1
-rw-r--r--src/machine/board_feather-nrf52840-sense.go1
-rw-r--r--src/machine/board_feather-nrf52840.go1
-rw-r--r--src/machine/board_feather-stm32f405.go1
-rw-r--r--src/machine/board_feather_rp2040.go1
-rw-r--r--src/machine/board_gnse.go1
-rw-r--r--src/machine/board_grandcentral-m4.go1
-rw-r--r--src/machine/board_hifive1b.go1
-rw-r--r--src/machine/board_hifive1b_baremetal.go1
-rw-r--r--src/machine/board_itsybitsy-m0.go1
-rw-r--r--src/machine/board_itsybitsy-m4.go1
-rw-r--r--src/machine/board_itsybitsy-nrf52840.go1
-rw-r--r--src/machine/board_k210.go1
-rw-r--r--src/machine/board_lgt92.go1
-rw-r--r--src/machine/board_lorae5.go1
-rw-r--r--src/machine/board_m5stack.go1
-rw-r--r--src/machine/board_m5stack_core2.go1
-rw-r--r--src/machine/board_m5stamp_c3.go1
-rw-r--r--src/machine/board_macropad-rp2040.go1
-rw-r--r--src/machine/board_maixbit.go1
-rw-r--r--src/machine/board_maixbit_baremetal.go1
-rw-r--r--src/machine/board_matrixportal-m4.go1
-rw-r--r--src/machine/board_mch2022.go1
-rw-r--r--src/machine/board_mdbt50qrx.go1
-rw-r--r--src/machine/board_metro-m4-airlift.go1
-rw-r--r--src/machine/board_microbit-v2.go1
-rw-r--r--src/machine/board_microbit.go1
-rw-r--r--src/machine/board_nano-33-ble.go1
-rw-r--r--src/machine/board_nano-rp2040.go1
-rw-r--r--src/machine/board_nicenano.go1
-rw-r--r--src/machine/board_nodemcu.go1
-rw-r--r--src/machine/board_nrf51.go1
-rw-r--r--src/machine/board_nrf52840-mdk-usb-dongle.go1
-rw-r--r--src/machine/board_nrf52840-mdk.go1
-rw-r--r--src/machine/board_nrf52840.go1
-rw-r--r--src/machine/board_nucleof103rb.go1
-rw-r--r--src/machine/board_nucleof722ze.go1
-rw-r--r--src/machine/board_nucleol031k6.go1
-rw-r--r--src/machine/board_nucleol432kc.go1
-rw-r--r--src/machine/board_nucleol552ze.go1
-rw-r--r--src/machine/board_nucleowl55jc.go1
-rw-r--r--src/machine/board_p1am-100.go1
-rw-r--r--src/machine/board_particle_argon.go1
-rw-r--r--src/machine/board_particle_boron.go1
-rw-r--r--src/machine/board_particle_xenon.go1
-rw-r--r--src/machine/board_pca10031.go1
-rw-r--r--src/machine/board_pca10040.go1
-rw-r--r--src/machine/board_pca10056.go1
-rw-r--r--src/machine/board_pca10059.go1
-rw-r--r--src/machine/board_pico.go1
-rw-r--r--src/machine/board_pinetime-devkit0.go1
-rw-r--r--src/machine/board_pybadge.go1
-rw-r--r--src/machine/board_pygamer.go1
-rw-r--r--src/machine/board_pyportal.go1
-rw-r--r--src/machine/board_qtpy.go1
-rw-r--r--src/machine/board_qtpy_rp2040.go1
-rw-r--r--src/machine/board_reelboard.go1
-rw-r--r--src/machine/board_stm32f469disco.go1
-rw-r--r--src/machine/board_stm32f4disco.go1
-rw-r--r--src/machine/board_swan.go1
-rw-r--r--src/machine/board_teensy36.go1
-rw-r--r--src/machine/board_teensy40.go1
-rw-r--r--src/machine/board_teensy41.go1
-rw-r--r--src/machine/board_thingplus_rp2040.go1
-rw-r--r--src/machine/board_trinket.go1
-rw-r--r--src/machine/board_trinkey_qt2040.go1
-rw-r--r--src/machine/board_tufty2040.go2
-rw-r--r--src/machine/board_waveshare-rp2040-zero.go1
-rw-r--r--src/machine/board_wioterminal.go1
-rw-r--r--src/machine/board_x9pro.go1
-rw-r--r--src/machine/board_xiao-ble.go1
-rw-r--r--src/machine/board_xiao-esp32c3.go1
-rw-r--r--src/machine/board_xiao-rp2040.go1
-rw-r--r--src/machine/board_xiao.go1
-rw-r--r--src/machine/i2c.go1
-rw-r--r--src/machine/i2s.go1
-rw-r--r--src/machine/machine_atmega.go1
-rw-r--r--src/machine/machine_atmega1280.go1
-rw-r--r--src/machine/machine_atmega1284p.go1
-rw-r--r--src/machine/machine_atmega2560.go1
-rw-r--r--src/machine/machine_atmega328p.go1
-rw-r--r--src/machine/machine_atmega328pb.go1
-rw-r--r--src/machine/machine_atsamd21.go1
-rw-r--r--src/machine/machine_atsamd21_usb.go1
-rw-r--r--src/machine/machine_atsamd21e18.go1
-rw-r--r--src/machine/machine_atsamd21g18.go1
-rw-r--r--src/machine/machine_atsamd51.go1
-rw-r--r--src/machine/machine_atsamd51_usb.go1
-rw-r--r--src/machine/machine_atsamd51g19.go1
-rw-r--r--src/machine/machine_atsamd51j19.go1
-rw-r--r--src/machine/machine_atsamd51j20.go1
-rw-r--r--src/machine/machine_atsamd51p19.go1
-rw-r--r--src/machine/machine_atsamd51p20.go1
-rw-r--r--src/machine/machine_atsame51j19.go1
-rw-r--r--src/machine/machine_atsame54p20.go1
-rw-r--r--src/machine/machine_atsame5x_can.go1
-rw-r--r--src/machine/machine_attiny85.go1
-rw-r--r--src/machine/machine_avr.go1
-rw-r--r--src/machine/machine_esp32.go1
-rw-r--r--src/machine/machine_esp32c3.go1
-rw-r--r--src/machine/machine_esp8266.go1
-rw-r--r--src/machine/machine_fe310.go1
-rw-r--r--src/machine/machine_gameboyadvance.go1
-rw-r--r--src/machine/machine_generic.go1
-rw-r--r--src/machine/machine_generic_peripherals.go1
-rw-r--r--src/machine/machine_k210.go1
-rw-r--r--src/machine/machine_mimxrt1062.go1
-rw-r--r--src/machine/machine_mimxrt1062_i2c.go1
-rw-r--r--src/machine/machine_mimxrt1062_spi.go1
-rw-r--r--src/machine/machine_mimxrt1062_uart.go1
-rw-r--r--src/machine/machine_nrf.go1
-rw-r--r--src/machine/machine_nrf51.go1
-rw-r--r--src/machine/machine_nrf52.go1
-rw-r--r--src/machine/machine_nrf52833.go1
-rw-r--r--src/machine/machine_nrf52840.go1
-rw-r--r--src/machine/machine_nrf52840_enter_bootloader.go1
-rw-r--r--src/machine/machine_nrf52840_usb.go1
-rw-r--r--src/machine/machine_nrf52840_usb_reset_bossa.go1
-rw-r--r--src/machine/machine_nrf52840_usb_reset_none.go1
-rw-r--r--src/machine/machine_nrf52840_usb_reset_uf2.go1
-rw-r--r--src/machine/machine_nrf528xx.go1
-rw-r--r--src/machine/machine_nxpmk66f18.go1
-rw-r--r--src/machine/machine_nxpmk66f18_uart.go1
-rw-r--r--src/machine/machine_rp2040.go1
-rw-r--r--src/machine/machine_rp2040_adc.go1
-rw-r--r--src/machine/machine_rp2040_clocks.go1
-rw-r--r--src/machine/machine_rp2040_enter_bootloader.go1
-rw-r--r--src/machine/machine_rp2040_gpio.go1
-rw-r--r--src/machine/machine_rp2040_i2c.go1
-rw-r--r--src/machine/machine_rp2040_pll.go1
-rw-r--r--src/machine/machine_rp2040_pwm.go1
-rw-r--r--src/machine/machine_rp2040_resets.go1
-rw-r--r--src/machine/machine_rp2040_rng.go1
-rw-r--r--src/machine/machine_rp2040_spi.go1
-rw-r--r--src/machine/machine_rp2040_sync.go1
-rw-r--r--src/machine/machine_rp2040_timer.go1
-rw-r--r--src/machine/machine_rp2040_uart.go1
-rw-r--r--src/machine/machine_rp2040_usb.go1
-rw-r--r--src/machine/machine_rp2040_watchdog.go1
-rw-r--r--src/machine/machine_rp2040_xosc.go1
-rw-r--r--src/machine/machine_stm32.go1
-rw-r--r--src/machine/machine_stm32_adc_f1.go1
-rw-r--r--src/machine/machine_stm32_adc_f4.go1
-rw-r--r--src/machine/machine_stm32_exti_afio.go1
-rw-r--r--src/machine/machine_stm32_exti_exti.go1
-rw-r--r--src/machine/machine_stm32_exti_syscfg.go1
-rw-r--r--src/machine/machine_stm32_exti_syscfg_noenable.go1
-rw-r--r--src/machine/machine_stm32_gpio_reva.go1
-rw-r--r--src/machine/machine_stm32_gpio_revb.go1
-rw-r--r--src/machine/machine_stm32_gpio_revb_mp.go1
-rw-r--r--src/machine/machine_stm32_i2c_reva.go1
-rw-r--r--src/machine/machine_stm32_i2c_revb.go1
-rw-r--r--src/machine/machine_stm32_moder_gpio.go3
-rw-r--r--src/machine/machine_stm32_rng.go1
-rw-r--r--src/machine/machine_stm32_spi.go1
-rw-r--r--src/machine/machine_stm32_tim.go1
-rw-r--r--src/machine/machine_stm32_tim_moder.go1
-rw-r--r--src/machine/machine_stm32_uart.go1
-rw-r--r--src/machine/machine_stm32f103.go1
-rw-r--r--src/machine/machine_stm32f4.go1
-rw-r--r--src/machine/machine_stm32f40x.go2
-rw-r--r--src/machine/machine_stm32f469.go1
-rw-r--r--src/machine/machine_stm32f7.go1
-rw-r--r--src/machine/machine_stm32f7x2.go1
-rw-r--r--src/machine/machine_stm32l0.go1
-rw-r--r--src/machine/machine_stm32l0x1.go1
-rw-r--r--src/machine/machine_stm32l0x2.go1
-rw-r--r--src/machine/machine_stm32l4.go1
-rw-r--r--src/machine/machine_stm32l4x2.go1
-rw-r--r--src/machine/machine_stm32l4x5.go1
-rw-r--r--src/machine/machine_stm32l5.go1
-rw-r--r--src/machine/machine_stm32l5x2.go1
-rw-r--r--src/machine/machine_stm32wlx.go1
-rw-r--r--src/machine/serial-none.go1
-rw-r--r--src/machine/serial-uart.go1
-rw-r--r--src/machine/serial-usb.go1
-rw-r--r--src/machine/spi.go1
-rw-r--r--src/machine/spi_tx.go1
-rw-r--r--src/machine/uart.go1
-rw-r--r--src/machine/usb.go1
-rw-r--r--src/net/interface_tinygo.go1
-rw-r--r--src/os/dir_other.go1
-rw-r--r--src/os/dir_test.go1
-rw-r--r--src/os/dir_unix.go1
-rw-r--r--src/os/dirent_linux.go1
-rw-r--r--src/os/env_unix_test.go1
-rw-r--r--src/os/exec_posix.go1
-rw-r--r--src/os/executable_other.go1
-rw-r--r--src/os/executable_procfs.go1
-rw-r--r--src/os/file_anyos.go1
-rw-r--r--src/os/file_anyos_test.go1
-rw-r--r--src/os/file_other.go1
-rw-r--r--src/os/file_unix.go1
-rw-r--r--src/os/file_windows.go1
-rw-r--r--src/os/getpagesize_test.go1
-rw-r--r--src/os/is_wasi_no_test.go1
-rw-r--r--src/os/is_wasi_test.go1
-rw-r--r--src/os/os_anyos_test.go1
-rw-r--r--src/os/os_chmod_test.go1
-rw-r--r--src/os/os_symlink_test.go1
-rw-r--r--src/os/path_unix.go1
-rw-r--r--src/os/pipe_test.go1
-rw-r--r--src/os/read_test.go1
-rw-r--r--src/os/removeall_noat.go1
-rw-r--r--src/os/removeall_other.go1
-rw-r--r--src/os/removeall_test.go1
-rw-r--r--src/os/seek_unix_bad.go1
-rw-r--r--src/os/stat_linux.go1
-rw-r--r--src/os/stat_other.go1
-rw-r--r--src/os/stat_unix.go1
-rw-r--r--src/os/tempfile_test.go1
-rw-r--r--src/os/types_anyos.go1
-rw-r--r--src/os/types_unix.go1
-rw-r--r--src/runtime/arch_arm.go1
-rw-r--r--src/runtime/arch_avr.go1
-rw-r--r--src/runtime/arch_cortexm.go1
-rw-r--r--src/runtime/arch_tinygoriscv.go1
-rw-r--r--src/runtime/arch_tinygoriscv32.go1
-rw-r--r--src/runtime/arch_tinygoriscv64.go1
-rw-r--r--src/runtime/arch_tinygowasm.go1
-rw-r--r--src/runtime/arch_tinygowasm_malloc.go1
-rw-r--r--src/runtime/arch_xtensa.go1
-rw-r--r--src/runtime/atomics_critical.go1
-rw-r--r--src/runtime/baremetal.go1
-rw-r--r--src/runtime/cond.go1
-rw-r--r--src/runtime/cond_nosched.go1
-rw-r--r--src/runtime/env_linux.go1
-rw-r--r--src/runtime/gc_conservative.go1
-rw-r--r--src/runtime/gc_globals.go2
-rw-r--r--src/runtime/gc_leaking.go1
-rw-r--r--src/runtime/gc_none.go1
-rw-r--r--src/runtime/gc_stack_portable.go1
-rw-r--r--src/runtime/gc_stack_raw.go1
-rw-r--r--src/runtime/hosted.go1
-rw-r--r--src/runtime/interrupt/interrupt_avr.go1
-rw-r--r--src/runtime/interrupt/interrupt_cortexm.go1
-rw-r--r--src/runtime/interrupt/interrupt_esp32c3.go1
-rw-r--r--src/runtime/interrupt/interrupt_gameboyadvance.go1
-rw-r--r--src/runtime/interrupt/interrupt_k210.go1
-rw-r--r--src/runtime/interrupt/interrupt_none.go1
-rw-r--r--src/runtime/interrupt/interrupt_sifive.go1
-rw-r--r--src/runtime/interrupt/interrupt_tinygoriscv.go1
-rw-r--r--src/runtime/interrupt/interrupt_xtensa.go1
-rw-r--r--src/runtime/memhash_fnv.go1
-rw-r--r--src/runtime/memhash_leveldb.go1
-rw-r--r--src/runtime/memhash_tsip.go1
-rw-r--r--src/runtime/mstats_conservative.go1
-rw-r--r--src/runtime/mstats_leaking.go1
-rw-r--r--src/runtime/nonhosted.go1
-rw-r--r--src/runtime/os_darwin.go1
-rw-r--r--src/runtime/os_js.go1
-rw-r--r--src/runtime/os_linux.go1
-rw-r--r--src/runtime/os_other.go2
-rw-r--r--src/runtime/runtime_arm7tdmi.go1
-rw-r--r--src/runtime/runtime_atmega.go1
-rw-r--r--src/runtime/runtime_atsamd21.go1
-rw-r--r--src/runtime/runtime_atsamd21e18.go1
-rw-r--r--src/runtime/runtime_atsamd21g18.go1
-rw-r--r--src/runtime/runtime_atsamd51.go1
-rw-r--r--src/runtime/runtime_atsamd51g19.go1
-rw-r--r--src/runtime/runtime_atsamd51j19.go1
-rw-r--r--src/runtime/runtime_atsamd51j20.go1
-rw-r--r--src/runtime/runtime_atsamd51p19.go1
-rw-r--r--src/runtime/runtime_atsamd51p20.go1
-rw-r--r--src/runtime/runtime_atsame51j19.go1
-rw-r--r--src/runtime/runtime_atsame54p20.go1
-rw-r--r--src/runtime/runtime_atsame5x_can.go1
-rw-r--r--src/runtime/runtime_attiny.go1
-rw-r--r--src/runtime/runtime_avr.go1
-rw-r--r--src/runtime/runtime_cortexm.go1
-rw-r--r--src/runtime/runtime_cortexm_abort.go1
-rw-r--r--src/runtime/runtime_cortexm_hardfault.go1
-rw-r--r--src/runtime/runtime_cortexm_hardfault_debug.go1
-rw-r--r--src/runtime/runtime_cortexm_qemu.go1
-rw-r--r--src/runtime/runtime_esp32.go1
-rw-r--r--src/runtime/runtime_esp32c3.go1
-rw-r--r--src/runtime/runtime_esp32xx.go4
-rw-r--r--src/runtime/runtime_esp8266.go1
-rw-r--r--src/runtime/runtime_fe310.go1
-rw-r--r--src/runtime/runtime_fe310_baremetal.go1
-rw-r--r--src/runtime/runtime_fe310_qemu.go1
-rw-r--r--src/runtime/runtime_k210.go1
-rw-r--r--src/runtime/runtime_k210_baremetal.go1
-rw-r--r--src/runtime/runtime_mimxrt1062.go1
-rw-r--r--src/runtime/runtime_mimxrt1062_clock.go1
-rw-r--r--src/runtime/runtime_mimxrt1062_mpu.go1
-rw-r--r--src/runtime/runtime_mimxrt1062_time.go1
-rw-r--r--src/runtime/runtime_nintendoswitch.go1
-rw-r--r--src/runtime/runtime_nrf.go1
-rw-r--r--src/runtime/runtime_nrf52840.go1
-rw-r--r--src/runtime/runtime_nrf_bare.go1
-rw-r--r--src/runtime/runtime_nrf_softdevice.go1
-rw-r--r--src/runtime/runtime_nxpmk66f18.go1
-rw-r--r--src/runtime/runtime_rp2040.go1
-rw-r--r--src/runtime/runtime_stm32.go1
-rw-r--r--src/runtime/runtime_stm32_timers.go1
-rw-r--r--src/runtime/runtime_stm32f103.go1
-rw-r--r--src/runtime/runtime_stm32f4.go2
-rw-r--r--src/runtime/runtime_stm32f405.go1
-rw-r--r--src/runtime/runtime_stm32f407.go1
-rw-r--r--src/runtime/runtime_stm32f469.go1
-rw-r--r--src/runtime/runtime_stm32f7x2.go1
-rw-r--r--src/runtime/runtime_stm32l0.go1
-rw-r--r--src/runtime/runtime_stm32l0x1.go1
-rw-r--r--src/runtime/runtime_stm32l0x2.go1
-rw-r--r--src/runtime/runtime_stm32l4.go1
-rw-r--r--src/runtime/runtime_stm32l4x2.go1
-rw-r--r--src/runtime/runtime_stm32l4x5.go1
-rw-r--r--src/runtime/runtime_stm32l5x2.go1
-rw-r--r--src/runtime/runtime_stm32wlx.go1
-rw-r--r--src/runtime/runtime_tinygoriscv.go1
-rw-r--r--src/runtime/runtime_tinygoriscv64.go1
-rw-r--r--src/runtime/runtime_tinygoriscv_qemu.go1
-rw-r--r--src/runtime/runtime_tinygowasm.go1
-rw-r--r--src/runtime/runtime_unix.go2
-rw-r--r--src/runtime/runtime_wasm_js.go1
-rw-r--r--src/runtime/runtime_wasm_js_scheduler.go1
-rw-r--r--src/runtime/runtime_wasm_wasi.go1
-rw-r--r--src/runtime/scheduler_any.go1
-rw-r--r--src/runtime/scheduler_none.go1
-rw-r--r--src/runtime/scheduler_tasks.go1
-rw-r--r--src/runtime/time_nxpmk66f18.go1
-rw-r--r--src/runtime/volatile/bitband_nxpmk66f18.go1
-rw-r--r--src/runtime/wait_other.go1
-rw-r--r--src/syscall/errno_other.go1
-rw-r--r--src/syscall/file_emulated.go1
-rw-r--r--src/syscall/file_hosted.go1
-rw-r--r--src/syscall/mmap_unix_test.go1
-rw-r--r--src/syscall/proc_emulated.go1
-rw-r--r--src/syscall/proc_hosted.go1
-rw-r--r--src/syscall/syscall_libc.go1
-rw-r--r--src/syscall/syscall_libc_darwin.go1
-rw-r--r--src/syscall/syscall_libc_darwin_amd64.go1
-rw-r--r--src/syscall/syscall_libc_darwin_arm64.go1
-rw-r--r--src/syscall/syscall_libc_nintendoswitch.go1
-rw-r--r--src/syscall/syscall_libc_wasi.go1
-rw-r--r--src/syscall/syscall_nonhosted.go1
-rw-r--r--src/syscall/tables_nonhosted.go1
-rw-r--r--src/testing/is_baremetal.go1
-rw-r--r--src/testing/is_not_baremetal.go1
-rw-r--r--src/testing/is_wasi_no_test.go1
-rw-r--r--src/testing/is_wasi_test.go1
-rw-r--r--src/testing/testing_test.go1
-rw-r--r--tests/runtime_wasi/malloc_test.go1
-rw-r--r--util_unix.go1
418 files changed, 4 insertions, 425 deletions
diff --git a/builder/tools-builtin.go b/builder/tools-builtin.go
index ceb493be8..fbe6ef02f 100644
--- a/builder/tools-builtin.go
+++ b/builder/tools-builtin.go
@@ -1,5 +1,4 @@
//go:build byollvm
-// +build byollvm
package builder
diff --git a/builder/tools-external.go b/builder/tools-external.go
index b2af00fb0..d85886271 100644
--- a/builder/tools-external.go
+++ b/builder/tools-external.go
@@ -1,5 +1,4 @@
//go:build !byollvm
-// +build !byollvm
package builder
diff --git a/cgo/libclang_config_llvm14.go b/cgo/libclang_config_llvm14.go
index 953ce8e23..861ced9de 100644
--- a/cgo/libclang_config_llvm14.go
+++ b/cgo/libclang_config_llvm14.go
@@ -1,5 +1,4 @@
//go:build !byollvm && llvm14
-// +build !byollvm,llvm14
package cgo
diff --git a/cgo/libclang_config_llvm15.go b/cgo/libclang_config_llvm15.go
index e918a473a..32daf0608 100644
--- a/cgo/libclang_config_llvm15.go
+++ b/cgo/libclang_config_llvm15.go
@@ -1,5 +1,4 @@
//go:build !byollvm && !llvm14
-// +build !byollvm,!llvm14
package cgo
diff --git a/src/crypto/rand/rand_arc4random.go b/src/crypto/rand/rand_arc4random.go
index 6fcf1fd68..1b1796b4d 100644
--- a/src/crypto/rand/rand_arc4random.go
+++ b/src/crypto/rand/rand_arc4random.go
@@ -1,5 +1,4 @@
//go:build darwin || tinygo.wasm
-// +build darwin tinygo.wasm
// This implementation of crypto/rand uses the arc4random_buf function
// (available on both MacOS and WASI) to generate random numbers.
diff --git a/src/crypto/rand/rand_baremetal.go b/src/crypto/rand/rand_baremetal.go
index e41036840..a220c2f98 100644
--- a/src/crypto/rand/rand_baremetal.go
+++ b/src/crypto/rand/rand_baremetal.go
@@ -1,5 +1,4 @@
//go:build nrf || stm32 || (sam && atsamd51) || (sam && atsame5x)
-// +build nrf stm32 sam,atsamd51 sam,atsame5x
package rand
diff --git a/src/crypto/rand/rand_urandom.go b/src/crypto/rand/rand_urandom.go
index 78d1a9e99..2a55a0ea5 100644
--- a/src/crypto/rand/rand_urandom.go
+++ b/src/crypto/rand/rand_urandom.go
@@ -1,5 +1,4 @@
//go:build linux && !baremetal && !wasi
-// +build linux,!baremetal,!wasi
// This implementation of crypto/rand uses the /dev/urandom pseudo-file to
// generate random numbers.
diff --git a/src/device/arm/scb.go b/src/device/arm/scb.go
index 007ecec9d..528b7cb99 100644
--- a/src/device/arm/scb.go
+++ b/src/device/arm/scb.go
@@ -2,7 +2,6 @@
// Cortex-M System Control Block-related definitions.
//go:build cortexm
-// +build cortexm
package arm
diff --git a/src/device/avr/avr_tiny85.go b/src/device/avr/avr_tiny85.go
index 645914e4e..ab082dbef 100644
--- a/src/device/avr/avr_tiny85.go
+++ b/src/device/avr/avr_tiny85.go
@@ -1,5 +1,4 @@
//go:build avr && attiny85
-// +build avr,attiny85
package avr
diff --git a/src/device/nxp/hardfault.go b/src/device/nxp/hardfault.go
index e37c5f9df..abfba679f 100644
--- a/src/device/nxp/hardfault.go
+++ b/src/device/nxp/hardfault.go
@@ -3,7 +3,6 @@
// auto-generated by gen-device-svd.go) among devices in package nxp.
//go:build nxp && !mimxrt1062
-// +build nxp,!mimxrt1062
package nxp
diff --git a/src/device/nxp/mimxrt1062_clock.go b/src/device/nxp/mimxrt1062_clock.go
index 2bd0e33ea..77409ba1f 100644
--- a/src/device/nxp/mimxrt1062_clock.go
+++ b/src/device/nxp/mimxrt1062_clock.go
@@ -3,7 +3,6 @@
// peripherals of the NXP MIMXRT1062.
//go:build nxp && mimxrt1062
-// +build nxp,mimxrt1062
package nxp
diff --git a/src/device/nxp/mimxrt1062_hardfault.go b/src/device/nxp/mimxrt1062_hardfault.go
index c36a3a471..d60de0da6 100644
--- a/src/device/nxp/mimxrt1062_hardfault.go
+++ b/src/device/nxp/mimxrt1062_hardfault.go
@@ -3,7 +3,6 @@
// auto-generated by gen-device-svd.go) among devices in package nxp.
//go:build nxp && mimxrt1062
-// +build nxp,mimxrt1062
package nxp
diff --git a/src/device/nxp/mimxrt1062_mpu.go b/src/device/nxp/mimxrt1062_mpu.go
index 91c867db4..e5dbfb750 100644
--- a/src/device/nxp/mimxrt1062_mpu.go
+++ b/src/device/nxp/mimxrt1062_mpu.go
@@ -3,7 +3,6 @@
// of the NXP MIMXRT1062.
//go:build nxp && mimxrt1062
-// +build nxp,mimxrt1062
package nxp
diff --git a/src/device/sam/atsamd51x-bitfields.go b/src/device/sam/atsamd51x-bitfields.go
index 55f17ef9d..294f7037a 100644
--- a/src/device/sam/atsamd51x-bitfields.go
+++ b/src/device/sam/atsamd51x-bitfields.go
@@ -2,7 +2,6 @@
// atsamd51x bitfield definitions that are not auto-generated by gen-device-svd.go
//go:build sam && atsamd51
-// +build sam,atsamd51
// These are the supported pchctrl function numberings on the atsamd51x
// See http://ww1.microchip.com/downloads/en/DeviceDoc/SAM_D5xE5x_Family_Data_Sheet_DS60001507F.pdf
diff --git a/src/device/sam/atsame5x-bitfields.go b/src/device/sam/atsame5x-bitfields.go
index 29c520029..bf3d789a6 100644
--- a/src/device/sam/atsame5x-bitfields.go
+++ b/src/device/sam/atsame5x-bitfields.go
@@ -2,7 +2,6 @@
// atsamd51x bitfield definitions that are not auto-generated by gen-device-svd.go
//go:build sam && atsame5x
-// +build sam,atsame5x
// These are the supported pchctrl function numberings on the atsamd51x
// See http://ww1.microchip.com/downloads/en/DeviceDoc/SAM_D5xE5x_Family_Data_Sheet_DS60001507F.pdf
diff --git a/src/examples/can/feather-m4-can.go b/src/examples/can/feather-m4-can.go
index a97099ca6..d53cadf9d 100644
--- a/src/examples/can/feather-m4-can.go
+++ b/src/examples/can/feather-m4-can.go
@@ -1,5 +1,4 @@
//go:build feather_m4_can
-// +build feather_m4_can
package main
diff --git a/src/examples/caninterrupt/feather-m4-can.go b/src/examples/caninterrupt/feather-m4-can.go
index a97099ca6..d53cadf9d 100644
--- a/src/examples/caninterrupt/feather-m4-can.go
+++ b/src/examples/caninterrupt/feather-m4-can.go
@@ -1,5 +1,4 @@
//go:build feather_m4_can
-// +build feather_m4_can
package main
diff --git a/src/examples/dac/circuitplay_express.go b/src/examples/dac/circuitplay_express.go
index 6ca853e75..801abb9cf 100644
--- a/src/examples/dac/circuitplay_express.go
+++ b/src/examples/dac/circuitplay_express.go
@@ -1,5 +1,4 @@
//go:build circuitplay_express
-// +build circuitplay_express
package main
diff --git a/src/examples/dac/pyportal.go b/src/examples/dac/pyportal.go
index 31f37c127..0551fbb55 100644
--- a/src/examples/dac/pyportal.go
+++ b/src/examples/dac/pyportal.go
@@ -1,5 +1,4 @@
//go:build pyportal
-// +build pyportal
package main
diff --git a/src/examples/pininterrupt/circuitplay-express.go b/src/examples/pininterrupt/circuitplay-express.go
index 743bf99e6..e03655064 100644
--- a/src/examples/pininterrupt/circuitplay-express.go
+++ b/src/examples/pininterrupt/circuitplay-express.go
@@ -1,5 +1,4 @@
//go:build circuitplay_express
-// +build circuitplay_express
package main
diff --git a/src/examples/pininterrupt/pca10040.go b/src/examples/pininterrupt/pca10040.go
index db169ced3..e4a9d6feb 100644
--- a/src/examples/pininterrupt/pca10040.go
+++ b/src/examples/pininterrupt/pca10040.go
@@ -1,5 +1,4 @@
//go:build pca10040
-// +build pca10040
package main
diff --git a/src/examples/pininterrupt/stm32.go b/src/examples/pininterrupt/stm32.go
index a9047f2c5..24d7e5f7b 100644
--- a/src/examples/pininterrupt/stm32.go
+++ b/src/examples/pininterrupt/stm32.go
@@ -1,5 +1,4 @@
//go:build stm32
-// +build stm32
package main
diff --git a/src/examples/pininterrupt/wioterminal.go b/src/examples/pininterrupt/wioterminal.go
index 9a98b15b8..90443537a 100644
--- a/src/examples/pininterrupt/wioterminal.go
+++ b/src/examples/pininterrupt/wioterminal.go
@@ -1,5 +1,4 @@
//go:build wioterminal
-// +build wioterminal
package main
diff --git a/src/examples/pwm/arduino-mega1280.go b/src/examples/pwm/arduino-mega1280.go
index 2cf5d8364..a1fafe0bc 100644
--- a/src/examples/pwm/arduino-mega1280.go
+++ b/src/examples/pwm/arduino-mega1280.go
@@ -1,5 +1,4 @@
//go:build arduino_mega1280
-// +build arduino_mega1280
package main
diff --git a/src/examples/pwm/arduino.go b/src/examples/pwm/arduino.go
index 3186bf4e7..bbbcf54e9 100644
--- a/src/examples/pwm/arduino.go
+++ b/src/examples/pwm/arduino.go
@@ -1,5 +1,4 @@
//go:build arduino
-// +build arduino
package main
diff --git a/src/examples/pwm/bluepill.go b/src/examples/pwm/bluepill.go
index e676f58f4..ca09a9ee9 100644
--- a/src/examples/pwm/bluepill.go
+++ b/src/examples/pwm/bluepill.go
@@ -1,5 +1,4 @@
//go:build bluepill
-// +build bluepill
package main
diff --git a/src/examples/pwm/feather-m4.go b/src/examples/pwm/feather-m4.go
index c00539b98..7bd661e2a 100644
--- a/src/examples/pwm/feather-m4.go
+++ b/src/examples/pwm/feather-m4.go
@@ -1,5 +1,4 @@
//go:build feather_m4
-// +build feather_m4
package main
diff --git a/src/examples/pwm/itsybitsy-m0.go b/src/examples/pwm/itsybitsy-m0.go
index fe401e8c3..495ab58f9 100644
--- a/src/examples/pwm/itsybitsy-m0.go
+++ b/src/examples/pwm/itsybitsy-m0.go
@@ -1,5 +1,4 @@
//go:build itsybitsy_m0
-// +build itsybitsy_m0
package main
diff --git a/src/examples/pwm/itsybitsy-m4.go b/src/examples/pwm/itsybitsy-m4.go
index 5926fb1bf..ae518f1f9 100644
--- a/src/examples/pwm/itsybitsy-m4.go
+++ b/src/examples/pwm/itsybitsy-m4.go
@@ -1,5 +1,4 @@
//go:build itsybitsy_m4
-// +build itsybitsy_m4
package main
diff --git a/src/examples/pwm/nucleo-f722ze.go b/src/examples/pwm/nucleo-f722ze.go
index b23816d0f..bf6f1e1ff 100644
--- a/src/examples/pwm/nucleo-f722ze.go
+++ b/src/examples/pwm/nucleo-f722ze.go
@@ -1,5 +1,4 @@
//go:build stm32f7
-// +build stm32f7
package main
diff --git a/src/examples/pwm/nucleo-l031k6.go b/src/examples/pwm/nucleo-l031k6.go
index 6de19f88c..ea763e7e0 100644
--- a/src/examples/pwm/nucleo-l031k6.go
+++ b/src/examples/pwm/nucleo-l031k6.go
@@ -1,5 +1,4 @@
//go:build stm32l0
-// +build stm32l0
package main
diff --git a/src/examples/pwm/nucleo-l432kc.go b/src/examples/pwm/nucleo-l432kc.go
index 0663541f3..eea62c3ec 100644
--- a/src/examples/pwm/nucleo-l432kc.go
+++ b/src/examples/pwm/nucleo-l432kc.go
@@ -1,5 +1,4 @@
//go:build stm32l4
-// +build stm32l4
package main
diff --git a/src/examples/pwm/nucleo-l552ze.go b/src/examples/pwm/nucleo-l552ze.go
index d09557a7e..58f863c2b 100644
--- a/src/examples/pwm/nucleo-l552ze.go
+++ b/src/examples/pwm/nucleo-l552ze.go
@@ -1,5 +1,4 @@
//go:build stm32l5
-// +build stm32l5
package main
diff --git a/src/examples/pwm/pico.go b/src/examples/pwm/pico.go
index 87c592a4e..826b1151b 100644
--- a/src/examples/pwm/pico.go
+++ b/src/examples/pwm/pico.go
@@ -1,5 +1,4 @@
//go:build pico
-// +build pico
package main
diff --git a/src/examples/pwm/stm32f4disco.go b/src/examples/pwm/stm32f4disco.go
index 87b30c82f..a8990f46f 100644
--- a/src/examples/pwm/stm32f4disco.go
+++ b/src/examples/pwm/stm32f4disco.go
@@ -1,5 +1,4 @@
//go:build stm32f4disco
-// +build stm32f4disco
package main
diff --git a/src/internal/task/gc_stack_chain.go b/src/internal/task/gc_stack_chain.go
index 07588d409..6c71c04d6 100644
--- a/src/internal/task/gc_stack_chain.go
+++ b/src/internal/task/gc_stack_chain.go
@@ -1,5 +1,4 @@
//go:build gc.conservative && tinygo.wasm
-// +build gc.conservative,tinygo.wasm
package task
diff --git a/src/internal/task/gc_stack_noop.go b/src/internal/task/gc_stack_noop.go
index b1cfd4483..eb5fe4e2c 100644
--- a/src/internal/task/gc_stack_noop.go
+++ b/src/internal/task/gc_stack_noop.go
@@ -1,5 +1,4 @@
//go:build !gc.conservative || !tinygo.wasm
-// +build !gc.conservative !tinygo.wasm
package task
diff --git a/src/internal/task/task_asyncify.go b/src/internal/task/task_asyncify.go
index 939008bcd..b16ddd7d8 100644
--- a/src/internal/task/task_asyncify.go
+++ b/src/internal/task/task_asyncify.go
@@ -1,5 +1,4 @@
//go:build scheduler.asyncify
-// +build scheduler.asyncify
package task
diff --git a/src/internal/task/task_none.go b/src/internal/task/task_none.go
index 19dbee624..280f1c4a8 100644
--- a/src/internal/task/task_none.go
+++ b/src/internal/task/task_none.go
@@ -1,5 +1,4 @@
//go:build scheduler.none
-// +build scheduler.none
package task
diff --git a/src/internal/task/task_stack.go b/src/internal/task/task_stack.go
index 63a8fdc82..47a82cc2f 100644
--- a/src/internal/task/task_stack.go
+++ b/src/internal/task/task_stack.go
@@ -1,5 +1,4 @@
//go:build scheduler.tasks
-// +build scheduler.tasks
package task
diff --git a/src/internal/task/task_stack_386.go b/src/internal/task/task_stack_386.go
index 10744757a..aa6fe0fb8 100644
--- a/src/internal/task/task_stack_386.go
+++ b/src/internal/task/task_stack_386.go
@@ -1,5 +1,4 @@
//go:build scheduler.tasks && 386
-// +build scheduler.tasks,386
package task
diff --git a/src/internal/task/task_stack_amd64.go b/src/internal/task/task_stack_amd64.go
index b39189316..d252b1c50 100644
--- a/src/internal/task/task_stack_amd64.go
+++ b/src/internal/task/task_stack_amd64.go
@@ -1,5 +1,4 @@
//go:build scheduler.tasks && amd64 && !windows
-// +build scheduler.tasks,amd64,!windows
package task
diff --git a/src/internal/task/task_stack_amd64_windows.go b/src/internal/task/task_stack_amd64_windows.go
index ee90ec9c5..f174196f3 100644
--- a/src/internal/task/task_stack_amd64_windows.go
+++ b/src/internal/task/task_stack_amd64_windows.go
@@ -1,5 +1,4 @@
//go:build scheduler.tasks && amd64 && windows
-// +build scheduler.tasks,amd64,windows
package task
diff --git a/src/internal/task/task_stack_arm.go b/src/internal/task/task_stack_arm.go
index 18982e875..c9b4a9a27 100644
--- a/src/internal/task/task_stack_arm.go
+++ b/src/internal/task/task_stack_arm.go
@@ -1,5 +1,4 @@
//go:build scheduler.tasks && arm && !cortexm && !avr && !xtensa && !tinygo.riscv
-// +build scheduler.tasks,arm,!cortexm,!avr,!xtensa,!tinygo.riscv
package task
diff --git a/src/internal/task/task_stack_arm64.go b/src/internal/task/task_stack_arm64.go
index e4fd09b20..74b8bc2cb 100644
--- a/src/internal/task/task_stack_arm64.go
+++ b/src/internal/task/task_stack_arm64.go
@@ -1,5 +1,4 @@
//go:build scheduler.tasks && arm64
-// +build scheduler.tasks,arm64
package task
diff --git a/src/internal/task/task_stack_avr.go b/src/internal/task/task_stack_avr.go
index 3af801fe9..7463d6907 100644
--- a/src/internal/task/task_stack_avr.go
+++ b/src/internal/task/task_stack_avr.go
@@ -1,5 +1,4 @@
//go:build scheduler.tasks && avr
-// +build scheduler.tasks,avr
package task
diff --git a/src/internal/task/task_stack_cortexm.go b/src/internal/task/task_stack_cortexm.go
index f61688808..442a717a4 100644
--- a/src/internal/task/task_stack_cortexm.go
+++ b/src/internal/task/task_stack_cortexm.go
@@ -1,5 +1,4 @@
//go:build scheduler.tasks && cortexm
-// +build scheduler.tasks,cortexm
package task
diff --git a/src/internal/task/task_stack_esp32.go b/src/internal/task/task_stack_esp32.go
index a76688447..e0bfa5b44 100644
--- a/src/internal/task/task_stack_esp32.go
+++ b/src/internal/task/task_stack_esp32.go
@@ -1,5 +1,4 @@
//go:build scheduler.tasks && esp32
-// +build scheduler.tasks,esp32
package task
diff --git a/src/internal/task/task_stack_esp8266.go b/src/internal/task/task_stack_esp8266.go
index 4a01a6fff..0241a56bc 100644
--- a/src/internal/task/task_stack_esp8266.go
+++ b/src/internal/task/task_stack_esp8266.go
@@ -1,5 +1,4 @@
//go:build scheduler.tasks && esp8266
-// +build scheduler.tasks,esp8266
package task
diff --git a/src/internal/task/task_stack_tinygoriscv.go b/src/internal/task/task_stack_tinygoriscv.go
index 36ef742e2..edf1215a0 100644
--- a/src/internal/task/task_stack_tinygoriscv.go
+++ b/src/internal/task/task_stack_tinygoriscv.go
@@ -1,5 +1,4 @@
//go:build scheduler.tasks && tinygo.riscv
-// +build scheduler.tasks,tinygo.riscv
package task
diff --git a/src/machine/board_arduino.go b/src/machine/board_arduino.go
index e78153f18..a164406f2 100644
--- a/src/machine/board_arduino.go
+++ b/src/machine/board_arduino.go
@@ -1,5 +1,4 @@
//go:build arduino
-// +build arduino
package machine
diff --git a/src/machine/board_arduino_mega1280.go b/src/machine/board_arduino_mega1280.go
index a4908847b..7bf6090ee 100644
--- a/src/machine/board_arduino_mega1280.go
+++ b/src/machine/board_arduino_mega1280.go
@@ -1,5 +1,4 @@
//go:build arduino_mega1280
-// +build arduino_mega1280
package machine
diff --git a/src/machine/board_arduino_mega2560.go b/src/machine/board_arduino_mega2560.go
index 57af7cb5e..2e4aefd87 100644
--- a/src/machine/board_arduino_mega2560.go
+++ b/src/machine/board_arduino_mega2560.go
@@ -1,5 +1,4 @@
//go:build arduino_mega2560
-// +build arduino_mega2560
package machine
diff --git a/src/machine/board_arduino_mkr1000.go b/src/machine/board_arduino_mkr1000.go
index 1cb711621..2c9ae603f 100644
--- a/src/machine/board_arduino_mkr1000.go
+++ b/src/machine/board_arduino_mkr1000.go
@@ -1,5 +1,4 @@
//go:build arduino_mkr1000
-// +build arduino_mkr1000
// This contains the pin mappings for the Arduino MKR1000 board.
//
diff --git a/src/machine/board_arduino_mkrwifi1010.go b/src/machine/board_arduino_mkrwifi1010.go
index 43490f9a5..18330f37f 100644
--- a/src/machine/board_arduino_mkrwifi1010.go
+++ b/src/machine/board_arduino_mkrwifi1010.go
@@ -1,5 +1,4 @@
//go:build arduino_mkrwifi1010
-// +build arduino_mkrwifi1010
// This contains the pin mappings for the Arduino MKR WiFi 1010 board.
//
diff --git a/src/machine/board_arduino_nano.go b/src/machine/board_arduino_nano.go
index d3213d4f1..8bc883364 100644
--- a/src/machine/board_arduino_nano.go
+++ b/src/machine/board_arduino_nano.go
@@ -1,5 +1,4 @@
//go:build arduino_nano
-// +build arduino_nano
package machine
diff --git a/src/machine/board_arduino_nano33.go b/src/machine/board_arduino_nano33.go
index ff53be607..f7eb2f8e0 100644
--- a/src/machine/board_arduino_nano33.go
+++ b/src/machine/board_arduino_nano33.go
@@ -1,5 +1,4 @@
//go:build arduino_nano33
-// +build arduino_nano33
// This contains the pin mappings for the Arduino Nano33 IoT board.
//
diff --git a/src/machine/board_arduino_zero.go b/src/machine/board_arduino_zero.go
index 8e7d9a778..f09fb47c5 100644
--- a/src/machine/board_arduino_zero.go
+++ b/src/machine/board_arduino_zero.go
@@ -1,5 +1,4 @@
//go:build sam && atsamd21 && arduino_zero
-// +build sam,atsamd21,arduino_zero
package machine
diff --git a/src/machine/board_atmega328p.go b/src/machine/board_atmega328p.go
index 254c42e31..a00fec516 100644
--- a/src/machine/board_atmega328p.go
+++ b/src/machine/board_atmega328p.go
@@ -1,5 +1,4 @@
//go:build (avr && atmega328p) || arduino || arduino_nano
-// +build avr,atmega328p arduino arduino_nano
package machine
diff --git a/src/machine/board_atsamd21.go b/src/machine/board_atsamd21.go
index a90ed0743..878224994 100644
--- a/src/machine/board_atsamd21.go
+++ b/src/machine/board_atsamd21.go
@@ -1,5 +1,4 @@
//go:build (sam && atsamd21) || arduino_nano33 || circuitplay_express
-// +build sam,atsamd21 arduino_nano33 circuitplay_express
package machine
diff --git a/src/machine/board_atsame54-xpro.go b/src/machine/board_atsame54-xpro.go
index 98521002d..ae1086d4a 100644
--- a/src/machine/board_atsame54-xpro.go
+++ b/src/machine/board_atsame54-xpro.go
@@ -1,5 +1,4 @@
//go:build atsame54_xpro
-// +build atsame54_xpro
package machine
diff --git a/src/machine/board_badger2040.go b/src/machine/board_badger2040.go
index 46e3ce566..d1b29f4c6 100644
--- a/src/machine/board_badger2040.go
+++ b/src/machine/board_badger2040.go
@@ -1,5 +1,4 @@
//go:build badger2040
-// +build badger2040
// This contains the pin mappings for the Badger 2040 Connect board.
//
diff --git a/src/machine/board_bluepill.go b/src/machine/board_bluepill.go
index 278bbdc66..83f527d57 100644
--- a/src/machine/board_bluepill.go
+++ b/src/machine/board_bluepill.go
@@ -1,5 +1,4 @@
//go:build bluepill
-// +build bluepill
package machine
diff --git a/src/machine/board_challenger_rp2040.go b/src/machine/board_challenger_rp2040.go
index daae745f2..b67b3245d 100644
--- a/src/machine/board_challenger_rp2040.go
+++ b/src/machine/board_challenger_rp2040.go
@@ -1,5 +1,4 @@
//go:build challenger_rp2040
-// +build challenger_rp2040
package machine
diff --git a/src/machine/board_circuitplay_bluefruit.go b/src/machine/board_circuitplay_bluefruit.go
index bfa7cb2ca..d578760bb 100644
--- a/src/machine/board_circuitplay_bluefruit.go
+++ b/src/machine/board_circuitplay_bluefruit.go
@@ -1,5 +1,4 @@
//go:build circuitplay_bluefruit
-// +build circuitplay_bluefruit
package machine
diff --git a/src/machine/board_circuitplay_express.go b/src/machine/board_circuitplay_express.go
index da2270822..1601fcab3 100644
--- a/src/machine/board_circuitplay_express.go
+++ b/src/machine/board_circuitplay_express.go
@@ -1,5 +1,4 @@
//go:build circuitplay_express
-// +build circuitplay_express
package machine
diff --git a/src/machine/board_clue_alpha.go b/src/machine/board_clue_alpha.go
index 53325ee80..8d16f4ef4 100644
--- a/src/machine/board_clue_alpha.go
+++ b/src/machine/board_clue_alpha.go
@@ -1,5 +1,4 @@
//go:build clue_alpha
-// +build clue_alpha
package machine
diff --git a/src/machine/board_digispark.go b/src/machine/board_digispark.go
index 55531d556..f380aae85 100644
--- a/src/machine/board_digispark.go
+++ b/src/machine/board_digispark.go
@@ -1,5 +1,4 @@
//go:build digispark
-// +build digispark
package machine
diff --git a/src/machine/board_esp32-coreboard-v2.go b/src/machine/board_esp32-coreboard-v2.go
index 10aeafed3..044d90606 100644
--- a/src/machine/board_esp32-coreboard-v2.go
+++ b/src/machine/board_esp32-coreboard-v2.go
@@ -1,5 +1,4 @@
//go:build esp32_coreboard_v2
-// +build esp32_coreboard_v2
package machine
diff --git a/src/machine/board_esp32c3-12f.go b/src/machine/board_esp32c3-12f.go
index a9d4075a2..df28915a4 100644
--- a/src/machine/board_esp32c3-12f.go
+++ b/src/machine/board_esp32c3-12f.go
@@ -1,5 +1,4 @@
//go:build esp32c312f
-// +build esp32c312f
package machine
diff --git a/src/machine/board_fe310.go b/src/machine/board_fe310.go
index 70c266345..88810155c 100644
--- a/src/machine/board_fe310.go
+++ b/src/machine/board_fe310.go
@@ -1,5 +1,4 @@
//go:build hifive1b
-// +build hifive1b
package machine
diff --git a/src/machine/board_feather-m0.go b/src/machine/board_feather-m0.go
index 01fadc5fe..5cd339340 100644
--- a/src/machine/board_feather-m0.go
+++ b/src/machine/board_feather-m0.go
@@ -1,5 +1,4 @@
//go:build sam && atsamd21 && feather_m0
-// +build sam,atsamd21,feather_m0
package machine
diff --git a/src/machine/board_feather-m4-can.go b/src/machine/board_feather-m4-can.go
index 4f2e3d668..6a3950656 100644
--- a/src/machine/board_feather-m4-can.go
+++ b/src/machine/board_feather-m4-can.go
@@ -1,5 +1,4 @@
//go:build feather_m4_can
-// +build feather_m4_can
package machine
diff --git a/src/machine/board_feather-m4.go b/src/machine/board_feather-m4.go
index c9b0b4cbc..fb88fb93f 100644
--- a/src/machine/board_feather-m4.go
+++ b/src/machine/board_feather-m4.go
@@ -1,5 +1,4 @@
//go:build feather_m4
-// +build feather_m4
package machine
diff --git a/src/machine/board_feather-nrf52840-sense.go b/src/machine/board_feather-nrf52840-sense.go
index ae98ce84d..2a7845081 100644
--- a/src/machine/board_feather-nrf52840-sense.go
+++ b/src/machine/board_feather-nrf52840-sense.go
@@ -1,5 +1,4 @@
//go:build feather_nrf52840_sense
-// +build feather_nrf52840_sense
package machine
diff --git a/src/machine/board_feather-nrf52840.go b/src/machine/board_feather-nrf52840.go
index 42cdf582b..02fd05360 100644
--- a/src/machine/board_feather-nrf52840.go
+++ b/src/machine/board_feather-nrf52840.go
@@ -1,5 +1,4 @@
//go:build feather_nrf52840
-// +build feather_nrf52840
package machine
diff --git a/src/machine/board_feather-stm32f405.go b/src/machine/board_feather-stm32f405.go
index 1e695a43a..5b980867f 100644
--- a/src/machine/board_feather-stm32f405.go
+++ b/src/machine/board_feather-stm32f405.go
@@ -1,5 +1,4 @@
//go:build feather_stm32f405
-// +build feather_stm32f405
package machine
diff --git a/src/machine/board_feather_rp2040.go b/src/machine/board_feather_rp2040.go
index 088815c67..f121a1e83 100644
--- a/src/machine/board_feather_rp2040.go
+++ b/src/machine/board_feather_rp2040.go
@@ -1,5 +1,4 @@
//go:build feather_rp2040
-// +build feather_rp2040
package machine
diff --git a/src/machine/board_gnse.go b/src/machine/board_gnse.go
index 073c0c045..02a8038b1 100644
--- a/src/machine/board_gnse.go
+++ b/src/machine/board_gnse.go
@@ -1,5 +1,4 @@
//go:build gnse
-// +build gnse
package machine
diff --git a/src/machine/board_grandcentral-m4.go b/src/machine/board_grandcentral-m4.go
index 7acdffe17..46fb95697 100644
--- a/src/machine/board_grandcentral-m4.go
+++ b/src/machine/board_grandcentral-m4.go
@@ -1,5 +1,4 @@
//go:build grandcentral_m4
-// +build grandcentral_m4
package machine
diff --git a/src/machine/board_hifive1b.go b/src/machine/board_hifive1b.go
index 7e3001a61..a38b6c0a8 100644
--- a/src/machine/board_hifive1b.go
+++ b/src/machine/board_hifive1b.go
@@ -1,5 +1,4 @@
//go:build hifive1b
-// +build hifive1b
package machine
diff --git a/src/machine/board_hifive1b_baremetal.go b/src/machine/board_hifive1b_baremetal.go
index 28d276f23..cea0443e6 100644
--- a/src/machine/board_hifive1b_baremetal.go
+++ b/src/machine/board_hifive1b_baremetal.go
@@ -1,5 +1,4 @@
//go:build fe310 && hifive1b
-// +build fe310,hifive1b
package machine
diff --git a/src/machine/board_itsybitsy-m0.go b/src/machine/board_itsybitsy-m0.go
index 32e9d82a5..67ebdee90 100644
--- a/src/machine/board_itsybitsy-m0.go
+++ b/src/machine/board_itsybitsy-m0.go
@@ -1,5 +1,4 @@
//go:build sam && atsamd21 && itsybitsy_m0
-// +build sam,atsamd21,itsybitsy_m0
package machine
diff --git a/src/machine/board_itsybitsy-m4.go b/src/machine/board_itsybitsy-m4.go
index 8170b678c..687538e65 100644
--- a/src/machine/board_itsybitsy-m4.go
+++ b/src/machine/board_itsybitsy-m4.go
@@ -1,5 +1,4 @@
//go:build itsybitsy_m4
-// +build itsybitsy_m4
package machine
diff --git a/src/machine/board_itsybitsy-nrf52840.go b/src/machine/board_itsybitsy-nrf52840.go
index a003704c2..0e5818fa6 100644
--- a/src/machine/board_itsybitsy-nrf52840.go
+++ b/src/machine/board_itsybitsy-nrf52840.go
@@ -1,5 +1,4 @@
//go:build itsybitsy_nrf52840
-// +build itsybitsy_nrf52840
package machine
diff --git a/src/machine/board_k210.go b/src/machine/board_k210.go
index d476fee87..862be255b 100644
--- a/src/machine/board_k210.go
+++ b/src/machine/board_k210.go
@@ -1,5 +1,4 @@
//go:build maixbit
-// +build maixbit
// Chip datasheet: https://s3.cn-north-1.amazonaws.com.cn/dl.kendryte.com/documents/kendryte_datasheet_20181011163248_en.pdf
diff --git a/src/machine/board_lgt92.go b/src/machine/board_lgt92.go
index 7a4da00bb..ff4d03cd8 100644
--- a/src/machine/board_lgt92.go
+++ b/src/machine/board_lgt92.go
@@ -1,5 +1,4 @@
//go:build lgt92
-// +build lgt92
package machine
diff --git a/src/machine/board_lorae5.go b/src/machine/board_lorae5.go
index 422eca20b..4da7972b8 100644
--- a/src/machine/board_lorae5.go
+++ b/src/machine/board_lorae5.go
@@ -1,5 +1,4 @@
//go:build lorae5
-// +build lorae5
package machine
diff --git a/src/machine/board_m5stack.go b/src/machine/board_m5stack.go
index f61d99d39..33c890a83 100644
--- a/src/machine/board_m5stack.go
+++ b/src/machine/board_m5stack.go
@@ -1,5 +1,4 @@
//go:build m5stack
-// +build m5stack
package machine
diff --git a/src/machine/board_m5stack_core2.go b/src/machine/board_m5stack_core2.go
index 477a7df63..773a0699e 100644
--- a/src/machine/board_m5stack_core2.go
+++ b/src/machine/board_m5stack_core2.go
@@ -1,5 +1,4 @@
//go:build m5stack_core2
-// +build m5stack_core2
package machine
diff --git a/src/machine/board_m5stamp_c3.go b/src/machine/board_m5stamp_c3.go
index dbb0e345e..a77e5449d 100644
--- a/src/machine/board_m5stamp_c3.go
+++ b/src/machine/board_m5stamp_c3.go
@@ -1,5 +1,4 @@
//go:build m5stamp_c3
-// +build m5stamp_c3
package machine
diff --git a/src/machine/board_macropad-rp2040.go b/src/machine/board_macropad-rp2040.go
index 87880ed5b..8b8f4a7c6 100644
--- a/src/machine/board_macropad-rp2040.go
+++ b/src/machine/board_macropad-rp2040.go
@@ -1,5 +1,4 @@
//go:build macropad_rp2040
-// +build macropad_rp2040
package machine
diff --git a/src/machine/board_maixbit.go b/src/machine/board_maixbit.go
index b633ac423..359a9b8c4 100644
--- a/src/machine/board_maixbit.go
+++ b/src/machine/board_maixbit.go
@@ -1,5 +1,4 @@
//go:build maixbit
-// +build maixbit
package machine
diff --git a/src/machine/board_maixbit_baremetal.go b/src/machine/board_maixbit_baremetal.go
index 5c9ab7704..7318cfa9e 100644
--- a/src/machine/board_maixbit_baremetal.go
+++ b/src/machine/board_maixbit_baremetal.go
@@ -1,5 +1,4 @@
//go:build k210 && maixbit
-// +build k210,maixbit
package machine
diff --git a/src/machine/board_matrixportal-m4.go b/src/machine/board_matrixportal-m4.go
index 9d3303530..b99fcb2f1 100644
--- a/src/machine/board_matrixportal-m4.go
+++ b/src/machine/board_matrixportal-m4.go
@@ -1,5 +1,4 @@
//go:build matrixportal_m4
-// +build matrixportal_m4
package machine
diff --git a/src/machine/board_mch2022.go b/src/machine/board_mch2022.go
index 1d11e49ff..bc6b60004 100644
--- a/src/machine/board_mch2022.go
+++ b/src/machine/board_mch2022.go
@@ -1,5 +1,4 @@
//go:build mch2022
-// +build mch2022
package machine
diff --git a/src/machine/board_mdbt50qrx.go b/src/machine/board_mdbt50qrx.go
index 2e3f847be..b93bee7c1 100644
--- a/src/machine/board_mdbt50qrx.go
+++ b/src/machine/board_mdbt50qrx.go
@@ -1,5 +1,4 @@
//go:build mdbt50qrx
-// +build mdbt50qrx
package machine
diff --git a/src/machine/board_metro-m4-airlift.go b/src/machine/board_metro-m4-airlift.go
index 649de0be3..30ae80ec4 100644
--- a/src/machine/board_metro-m4-airlift.go
+++ b/src/machine/board_metro-m4-airlift.go
@@ -1,5 +1,4 @@
//go:build metro_m4_airlift
-// +build metro_m4_airlift
package machine
diff --git a/src/machine/board_microbit-v2.go b/src/machine/board_microbit-v2.go
index 20c0bc808..26cfb517e 100644
--- a/src/machine/board_microbit-v2.go
+++ b/src/machine/board_microbit-v2.go
@@ -1,5 +1,4 @@
//go:build microbit_v2
-// +build microbit_v2
package machine
diff --git a/src/machine/board_microbit.go b/src/machine/board_microbit.go
index b6b7823aa..719bd1d4c 100644
--- a/src/machine/board_microbit.go
+++ b/src/machine/board_microbit.go
@@ -1,5 +1,4 @@
//go:build microbit
-// +build microbit
package machine
diff --git a/src/machine/board_nano-33-ble.go b/src/machine/board_nano-33-ble.go
index 127484253..911be0add 100644
--- a/src/machine/board_nano-33-ble.go
+++ b/src/machine/board_nano-33-ble.go
@@ -1,5 +1,4 @@
//go:build nano_33_ble
-// +build nano_33_ble
// This contains the pin mappings for the Arduino Nano 33 BLE [Sense] boards.
// - https://store.arduino.cc/arduino-nano-33-ble
diff --git a/src/machine/board_nano-rp2040.go b/src/machine/board_nano-rp2040.go
index 898559730..0a27290dd 100644
--- a/src/machine/board_nano-rp2040.go
+++ b/src/machine/board_nano-rp2040.go
@@ -1,5 +1,4 @@
//go:build nano_rp2040
-// +build nano_rp2040
// This contains the pin mappings for the Arduino Nano RP2040 Connect board.
//
diff --git a/src/machine/board_nicenano.go b/src/machine/board_nicenano.go
index 8baf86fa0..254e78058 100644
--- a/src/machine/board_nicenano.go
+++ b/src/machine/board_nicenano.go
@@ -1,5 +1,4 @@
//go:build nicenano
-// +build nicenano
package machine
diff --git a/src/machine/board_nodemcu.go b/src/machine/board_nodemcu.go
index f204b7770..5157c82e9 100644
--- a/src/machine/board_nodemcu.go
+++ b/src/machine/board_nodemcu.go
@@ -1,5 +1,4 @@
//go:build nodemcu
-// +build nodemcu
// Pinout for the NodeMCU dev kit.
diff --git a/src/machine/board_nrf51.go b/src/machine/board_nrf51.go
index 1de226e39..74e258118 100644
--- a/src/machine/board_nrf51.go
+++ b/src/machine/board_nrf51.go
@@ -1,5 +1,4 @@
//go:build nrf51 || microbit
-// +build nrf51 microbit
package machine
diff --git a/src/machine/board_nrf52840-mdk-usb-dongle.go b/src/machine/board_nrf52840-mdk-usb-dongle.go
index c1910fecf..c30555ca5 100644
--- a/src/machine/board_nrf52840-mdk-usb-dongle.go
+++ b/src/machine/board_nrf52840-mdk-usb-dongle.go
@@ -1,5 +1,4 @@
//go:build nrf52840_mdk_usb_dongle
-// +build nrf52840_mdk_usb_dongle
package machine
diff --git a/src/machine/board_nrf52840-mdk.go b/src/machine/board_nrf52840-mdk.go
index c9e012bc0..20edde927 100644
--- a/src/machine/board_nrf52840-mdk.go
+++ b/src/machine/board_nrf52840-mdk.go
@@ -1,5 +1,4 @@
//go:build nrf52840_mdk
-// +build nrf52840_mdk
package machine
diff --git a/src/machine/board_nrf52840.go b/src/machine/board_nrf52840.go
index 4d3c322f5..e7f1f8938 100644
--- a/src/machine/board_nrf52840.go
+++ b/src/machine/board_nrf52840.go
@@ -1,5 +1,4 @@
//go:build nrf52840 || circuitplay_bluefruit || reelboard || clue || itsybitsy_nrf52840
-// +build nrf52840 circuitplay_bluefruit reelboard clue itsybitsy_nrf52840
package machine
diff --git a/src/machine/board_nucleof103rb.go b/src/machine/board_nucleof103rb.go
index 3027c5ad5..af7a99e9d 100644
--- a/src/machine/board_nucleof103rb.go
+++ b/src/machine/board_nucleof103rb.go
@@ -1,5 +1,4 @@
//go:build nucleof103rb
-// +build nucleof103rb
package machine
diff --git a/src/machine/board_nucleof722ze.go b/src/machine/board_nucleof722ze.go
index 4206e39d4..c9a0b01b0 100644
--- a/src/machine/board_nucleof722ze.go
+++ b/src/machine/board_nucleof722ze.go
@@ -1,5 +1,4 @@
//go:build nucleof722ze
-// +build nucleof722ze
package machine
diff --git a/src/machine/board_nucleol031k6.go b/src/machine/board_nucleol031k6.go
index 1f6e4d045..1a57289b9 100644
--- a/src/machine/board_nucleol031k6.go
+++ b/src/machine/board_nucleol031k6.go
@@ -1,5 +1,4 @@
//go:build nucleol031k6
-// +build nucleol031k6
package machine
diff --git a/src/machine/board_nucleol432kc.go b/src/machine/board_nucleol432kc.go
index 9a5c5d88c..3d09b6c55 100644
--- a/src/machine/board_nucleol432kc.go
+++ b/src/machine/board_nucleol432kc.go
@@ -1,5 +1,4 @@
//go:build nucleol432kc
-// +build nucleol432kc
package machine
diff --git a/src/machine/board_nucleol552ze.go b/src/machine/board_nucleol552ze.go
index d9102c521..6a13d9fb2 100644
--- a/src/machine/board_nucleol552ze.go
+++ b/src/machine/board_nucleol552ze.go
@@ -1,5 +1,4 @@
//go:build nucleol552ze
-// +build nucleol552ze
package machine
diff --git a/src/machine/board_nucleowl55jc.go b/src/machine/board_nucleowl55jc.go
index 761d4b841..fd4883cc0 100644
--- a/src/machine/board_nucleowl55jc.go
+++ b/src/machine/board_nucleowl55jc.go
@@ -1,5 +1,4 @@
//go:build nucleowl55jc
-// +build nucleowl55jc
package machine
diff --git a/src/machine/board_p1am-100.go b/src/machine/board_p1am-100.go
index e7a74a785..d6fbdcb36 100644
--- a/src/machine/board_p1am-100.go
+++ b/src/machine/board_p1am-100.go
@@ -1,5 +1,4 @@
//go:build p1am_100
-// +build p1am_100
// This contains the pin mappings for the ProductivityOpen P1AM-100 board.
//
diff --git a/src/machine/board_particle_argon.go b/src/machine/board_particle_argon.go
index 2ba568b43..efd861335 100644
--- a/src/machine/board_particle_argon.go
+++ b/src/machine/board_particle_argon.go
@@ -1,5 +1,4 @@
//go:build particle_argon
-// +build particle_argon
package machine
diff --git a/src/machine/board_particle_boron.go b/src/machine/board_particle_boron.go
index fb83eed18..f986060b2 100644
--- a/src/machine/board_particle_boron.go
+++ b/src/machine/board_particle_boron.go
@@ -1,5 +1,4 @@
//go:build particle_boron
-// +build particle_boron
package machine
diff --git a/src/machine/board_particle_xenon.go b/src/machine/board_particle_xenon.go
index 2d86ec9dc..52c2b1812 100644
--- a/src/machine/board_particle_xenon.go
+++ b/src/machine/board_particle_xenon.go
@@ -1,5 +1,4 @@
//go:build particle_xenon
-// +build particle_xenon
package machine
diff --git a/src/machine/board_pca10031.go b/src/machine/board_pca10031.go
index b1cc1f278..3d8f34fba 100644
--- a/src/machine/board_pca10031.go
+++ b/src/machine/board_pca10031.go
@@ -1,5 +1,4 @@
//go:build pca10031
-// +build pca10031
// pca10031 is a nrf51 based dongle, intended for use in wireless applications.
//
diff --git a/src/machine/board_pca10040.go b/src/machine/board_pca10040.go
index d41c791d2..a9be6ad43 100644
--- a/src/machine/board_pca10040.go
+++ b/src/machine/board_pca10040.go
@@ -1,5 +1,4 @@
//go:build pca10040
-// +build pca10040
package machine
diff --git a/src/machine/board_pca10056.go b/src/machine/board_pca10056.go
index 16665bcb6..44a2d5394 100644
--- a/src/machine/board_pca10056.go
+++ b/src/machine/board_pca10056.go
@@ -1,5 +1,4 @@
//go:build pca10056
-// +build pca10056
package machine
diff --git a/src/machine/board_pca10059.go b/src/machine/board_pca10059.go
index 1ec9610dc..bd1150328 100644
--- a/src/machine/board_pca10059.go
+++ b/src/machine/board_pca10059.go
@@ -1,5 +1,4 @@
//go:build pca10059
-// +build pca10059
package machine
diff --git a/src/machine/board_pico.go b/src/machine/board_pico.go
index 25e3551d1..41109af03 100644
--- a/src/machine/board_pico.go
+++ b/src/machine/board_pico.go
@@ -1,5 +1,4 @@
//go:build pico
-// +build pico
package machine
diff --git a/src/machine/board_pinetime-devkit0.go b/src/machine/board_pinetime-devkit0.go
index 781092a23..26a557cb0 100644
--- a/src/machine/board_pinetime-devkit0.go
+++ b/src/machine/board_pinetime-devkit0.go
@@ -1,5 +1,4 @@
//go:build pinetime_devkit0
-// +build pinetime_devkit0
package machine
diff --git a/src/machine/board_pybadge.go b/src/machine/board_pybadge.go
index 65432d7dc..fa8be2a75 100644
--- a/src/machine/board_pybadge.go
+++ b/src/machine/board_pybadge.go
@@ -1,5 +1,4 @@
//go:build pybadge
-// +build pybadge
package machine
diff --git a/src/machine/board_pygamer.go b/src/machine/board_pygamer.go
index b1d6a4251..84a746459 100644
--- a/src/machine/board_pygamer.go
+++ b/src/machine/board_pygamer.go
@@ -1,5 +1,4 @@
//go:build sam && atsamd51 && pygamer
-// +build sam,atsamd51,pygamer
package machine
diff --git a/src/machine/board_pyportal.go b/src/machine/board_pyportal.go
index 600969b48..b244000cf 100644
--- a/src/machine/board_pyportal.go
+++ b/src/machine/board_pyportal.go
@@ -1,5 +1,4 @@
//go:build pyportal
-// +build pyportal
package machine
diff --git a/src/machine/board_qtpy.go b/src/machine/board_qtpy.go
index 3ebf1fdd0..d0f89e461 100644
--- a/src/machine/board_qtpy.go
+++ b/src/machine/board_qtpy.go
@@ -1,5 +1,4 @@
//go:build sam && atsamd21 && qtpy
-// +build sam,atsamd21,qtpy
package machine
diff --git a/src/machine/board_qtpy_rp2040.go b/src/machine/board_qtpy_rp2040.go
index 90a356f24..3f37023f8 100644
--- a/src/machine/board_qtpy_rp2040.go
+++ b/src/machine/board_qtpy_rp2040.go
@@ -1,5 +1,4 @@
//go:build qtpy_rp2040
-// +build qtpy_rp2040
package machine
diff --git a/src/machine/board_reelboard.go b/src/machine/board_reelboard.go
index 36dbc8d91..3c84070fe 100644
--- a/src/machine/board_reelboard.go
+++ b/src/machine/board_reelboard.go
@@ -1,5 +1,4 @@
//go:build reelboard
-// +build reelboard
package machine
diff --git a/src/machine/board_stm32f469disco.go b/src/machine/board_stm32f469disco.go
index 07a51c0bb..a4eef1420 100644
--- a/src/machine/board_stm32f469disco.go
+++ b/src/machine/board_stm32f469disco.go
@@ -1,5 +1,4 @@
//go:build stm32f469disco
-// +build stm32f469disco
package machine
diff --git a/src/machine/board_stm32f4disco.go b/src/machine/board_stm32f4disco.go
index 36cfcf07a..291109c5d 100644
--- a/src/machine/board_stm32f4disco.go
+++ b/src/machine/board_stm32f4disco.go
@@ -1,5 +1,4 @@
//go:build stm32f4disco
-// +build stm32f4disco
package machine
diff --git a/src/machine/board_swan.go b/src/machine/board_swan.go
index 8c50fff49..7502dd6ad 100644
--- a/src/machine/board_swan.go
+++ b/src/machine/board_swan.go
@@ -1,5 +1,4 @@
//go:build swan
-// +build swan
package machine
diff --git a/src/machine/board_teensy36.go b/src/machine/board_teensy36.go
index 5ccb29ef8..4859154d9 100644
--- a/src/machine/board_teensy36.go
+++ b/src/machine/board_teensy36.go
@@ -1,5 +1,4 @@
//go:build nxp && mk66f18 && teensy36
-// +build nxp,mk66f18,teensy36
package machine
diff --git a/src/machine/board_teensy40.go b/src/machine/board_teensy40.go
index f2c3505b3..92fe81bce 100644
--- a/src/machine/board_teensy40.go
+++ b/src/machine/board_teensy40.go
@@ -1,5 +1,4 @@
//go:build teensy40
-// +build teensy40
package machine
diff --git a/src/machine/board_teensy41.go b/src/machine/board_teensy41.go
index a8aaa1078..436c1b9c6 100644
--- a/src/machine/board_teensy41.go
+++ b/src/machine/board_teensy41.go
@@ -1,5 +1,4 @@
//go:build teensy41
-// +build teensy41
package machine
diff --git a/src/machine/board_thingplus_rp2040.go b/src/machine/board_thingplus_rp2040.go
index d814116f8..ac40ee4a4 100644
--- a/src/machine/board_thingplus_rp2040.go
+++ b/src/machine/board_thingplus_rp2040.go
@@ -1,5 +1,4 @@
//go:build thingplus_rp2040
-// +build thingplus_rp2040
package machine
diff --git a/src/machine/board_trinket.go b/src/machine/board_trinket.go
index c95dd2c5e..2ce419a4a 100644
--- a/src/machine/board_trinket.go
+++ b/src/machine/board_trinket.go
@@ -1,5 +1,4 @@
//go:build sam && atsamd21 && trinket_m0
-// +build sam,atsamd21,trinket_m0
package machine
diff --git a/src/machine/board_trinkey_qt2040.go b/src/machine/board_trinkey_qt2040.go
index 3a582fa87..1a49c6d92 100644
--- a/src/machine/board_trinkey_qt2040.go
+++ b/src/machine/board_trinkey_qt2040.go
@@ -1,5 +1,4 @@
//go:build trinkey_qt2040
-// +build trinkey_qt2040
// This file contains the pin mappings for the Adafruit Trinkey QT2040 board.
//
diff --git a/src/machine/board_tufty2040.go b/src/machine/board_tufty2040.go
index c45c12f7d..d82cb9951 100644
--- a/src/machine/board_tufty2040.go
+++ b/src/machine/board_tufty2040.go
@@ -1,12 +1,10 @@
//go:build tufty2040
-// +build tufty2040
// This contains the pin mappings for the Badger 2040 Connect board.
//
// For more information, see: https://shop.pimoroni.com/products/tufty-2040
// Also
// - Tufty 2040 schematic: https://cdn.shopify.com/s/files/1/0174/1800/files/tufty_schematic.pdf?v=1655385675
-//
package machine
import (
diff --git a/src/machine/board_waveshare-rp2040-zero.go b/src/machine/board_waveshare-rp2040-zero.go
index 8772541b6..65e7a9481 100644
--- a/src/machine/board_waveshare-rp2040-zero.go
+++ b/src/machine/board_waveshare-rp2040-zero.go
@@ -1,5 +1,4 @@
//go:build waveshare_rp2040_zero
-// +build waveshare_rp2040_zero
// This file contains the pin mappings for the Waveshare RP2040-Zero boards.
//
diff --git a/src/machine/board_wioterminal.go b/src/machine/board_wioterminal.go
index dfe836e61..9923c3712 100644
--- a/src/machine/board_wioterminal.go
+++ b/src/machine/board_wioterminal.go
@@ -1,5 +1,4 @@
//go:build wioterminal
-// +build wioterminal
package machine
diff --git a/src/machine/board_x9pro.go b/src/machine/board_x9pro.go
index 5e2d67769..88468e97d 100644
--- a/src/machine/board_x9pro.go
+++ b/src/machine/board_x9pro.go
@@ -1,5 +1,4 @@
//go:build x9pro
-// +build x9pro
package machine
diff --git a/src/machine/board_xiao-ble.go b/src/machine/board_xiao-ble.go
index 2691c6c9d..b4168d8d0 100644
--- a/src/machine/board_xiao-ble.go
+++ b/src/machine/board_xiao-ble.go
@@ -1,5 +1,4 @@
//go:build xiao_ble
-// +build xiao_ble
// This file contains the pin mappings for the Seeed XIAO BLE nRF52840 [Sense] boards.
//
diff --git a/src/machine/board_xiao-esp32c3.go b/src/machine/board_xiao-esp32c3.go
index 5c65da3bb..5a2cf2ee3 100644
--- a/src/machine/board_xiao-esp32c3.go
+++ b/src/machine/board_xiao-esp32c3.go
@@ -1,5 +1,4 @@
//go:build xiao_esp32c3
-// +build xiao_esp32c3
// This file contains the pin mappings for the Seeed XIAO ESP32C3 boards.
//
diff --git a/src/machine/board_xiao-rp2040.go b/src/machine/board_xiao-rp2040.go
index d66b73145..197ad31fe 100644
--- a/src/machine/board_xiao-rp2040.go
+++ b/src/machine/board_xiao-rp2040.go
@@ -1,5 +1,4 @@
//go:build xiao_rp2040
-// +build xiao_rp2040
// This file contains the pin mappings for the Seeed XIAO RP2040 boards.
//
diff --git a/src/machine/board_xiao.go b/src/machine/board_xiao.go
index aee638493..aedf7fb35 100644
--- a/src/machine/board_xiao.go
+++ b/src/machine/board_xiao.go
@@ -1,5 +1,4 @@
//go:build sam && atsamd21 && xiao
-// +build sam,atsamd21,xiao
package machine
diff --git a/src/machine/i2c.go b/src/machine/i2c.go
index beef9ea44..4e7a630b9 100644
--- a/src/machine/i2c.go
+++ b/src/machine/i2c.go
@@ -1,5 +1,4 @@
//go:build atmega || nrf || sam || stm32 || fe310 || k210 || rp2040
-// +build atmega nrf sam stm32 fe310 k210 rp2040
package machine
diff --git a/src/machine/i2s.go b/src/machine/i2s.go
index 91c97ec9f..8f5e30953 100644
--- a/src/machine/i2s.go
+++ b/src/machine/i2s.go
@@ -1,5 +1,4 @@
//go:build sam
-// +build sam
// This is the definition for I2S bus functions.
// Actual implementations if available for any given hardware
diff --git a/src/machine/machine_atmega.go b/src/machine/machine_atmega.go
index aeb32d09a..90977fb87 100644
--- a/src/machine/machine_atmega.go
+++ b/src/machine/machine_atmega.go
@@ -1,5 +1,4 @@
//go:build avr && atmega
-// +build avr,atmega
package machine
diff --git a/src/machine/machine_atmega1280.go b/src/machine/machine_atmega1280.go
index ba9c1462b..49564a3ce 100644
--- a/src/machine/machine_atmega1280.go
+++ b/src/machine/machine_atmega1280.go
@@ -1,5 +1,4 @@
//go:build avr && atmega1280
-// +build avr,atmega1280
package machine
diff --git a/src/machine/machine_atmega1284p.go b/src/machine/machine_atmega1284p.go
index 633a4e9c8..511f9e873 100644
--- a/src/machine/machine_atmega1284p.go
+++ b/src/machine/machine_atmega1284p.go
@@ -1,5 +1,4 @@
//go:build avr && atmega1284p
-// +build avr,atmega1284p
package machine
diff --git a/src/machine/machine_atmega2560.go b/src/machine/machine_atmega2560.go
index c3a1ca1ab..339c35ae7 100644
--- a/src/machine/machine_atmega2560.go
+++ b/src/machine/machine_atmega2560.go
@@ -1,5 +1,4 @@
//go:build avr && atmega2560
-// +build avr,atmega2560
package machine
diff --git a/src/machine/machine_atmega328p.go b/src/machine/machine_atmega328p.go
index a7d5d0c20..ed832e6d3 100644
--- a/src/machine/machine_atmega328p.go
+++ b/src/machine/machine_atmega328p.go
@@ -1,5 +1,4 @@
//go:build avr && atmega328p
-// +build avr,atmega328p
package machine
diff --git a/src/machine/machine_atmega328pb.go b/src/machine/machine_atmega328pb.go
index afae4798d..af36b63e1 100644
--- a/src/machine/machine_atmega328pb.go
+++ b/src/machine/machine_atmega328pb.go
@@ -1,5 +1,4 @@
//go:build avr && atmega328pb
-// +build avr,atmega328pb
package machine
diff --git a/src/machine/machine_atsamd21.go b/src/machine/machine_atsamd21.go
index 587fb3623..7a5a20c7e 100644
--- a/src/machine/machine_atsamd21.go
+++ b/src/machine/machine_atsamd21.go
@@ -1,5 +1,4 @@
//go:build sam && atsamd21
-// +build sam,atsamd21
// Peripheral abstraction layer for the atsamd21.
//
diff --git a/src/machine/machine_atsamd21_usb.go b/src/machine/machine_atsamd21_usb.go
index 7eeb4d0ce..d170c9177 100644
--- a/src/machine/machine_atsamd21_usb.go
+++ b/src/machine/machine_atsamd21_usb.go
@@ -1,5 +1,4 @@
//go:build sam && atsamd21
-// +build sam,atsamd21
package machine
diff --git a/src/machine/machine_atsamd21e18.go b/src/machine/machine_atsamd21e18.go
index 26e251678..85d7ff255 100644
--- a/src/machine/machine_atsamd21e18.go
+++ b/src/machine/machine_atsamd21e18.go
@@ -1,5 +1,4 @@
//go:build sam && atsamd21 && atsamd21e18
-// +build sam,atsamd21,atsamd21e18
// Peripheral abstraction layer for the atsamd21.
//
diff --git a/src/machine/machine_atsamd21g18.go b/src/machine/machine_atsamd21g18.go
index c933f4bfe..6b60cfc4a 100644
--- a/src/machine/machine_atsamd21g18.go
+++ b/src/machine/machine_atsamd21g18.go
@@ -1,5 +1,4 @@
//go:build sam && atsamd21 && atsamd21g18
-// +build sam,atsamd21,atsamd21g18
// Peripheral abstraction layer for the atsamd21.
//
diff --git a/src/machine/machine_atsamd51.go b/src/machine/machine_atsamd51.go
index 0c296553b..21da8d59d 100644
--- a/src/machine/machine_atsamd51.go
+++ b/src/machine/machine_atsamd51.go
@@ -1,5 +1,4 @@
//go:build (sam && atsamd51) || (sam && atsame5x)
-// +build sam,atsamd51 sam,atsame5x
// Peripheral abstraction layer for the atsamd51.
//
diff --git a/src/machine/machine_atsamd51_usb.go b/src/machine/machine_atsamd51_usb.go
index 7c11f9e1b..b3f570ac7 100644
--- a/src/machine/machine_atsamd51_usb.go
+++ b/src/machine/machine_atsamd51_usb.go
@@ -1,5 +1,4 @@
//go:build (sam && atsamd51) || (sam && atsame5x)
-// +build sam,atsamd51 sam,atsame5x
package machine
diff --git a/src/machine/machine_atsamd51g19.go b/src/machine/machine_atsamd51g19.go
index c0dc1993c..ade031bb0 100644
--- a/src/machine/machine_atsamd51g19.go
+++ b/src/machine/machine_atsamd51g19.go
@@ -1,5 +1,4 @@
//go:build sam && atsamd51 && atsamd51g19
-// +build sam,atsamd51,atsamd51g19
// Peripheral abstraction layer for the atsamd51.
//
diff --git a/src/machine/machine_atsamd51j19.go b/src/machine/machine_atsamd51j19.go
index 28c73060d..b41c25c14 100644
--- a/src/machine/machine_atsamd51j19.go
+++ b/src/machine/machine_atsamd51j19.go
@@ -1,5 +1,4 @@
//go:build sam && atsamd51 && atsamd51j19
-// +build sam,atsamd51,atsamd51j19
// Peripheral abstraction layer for the atsamd51.
//
diff --git a/src/machine/machine_atsamd51j20.go b/src/machine/machine_atsamd51j20.go
index 411b029d2..2c5391afe 100644
--- a/src/machine/machine_atsamd51j20.go
+++ b/src/machine/machine_atsamd51j20.go
@@ -1,5 +1,4 @@
//go:build sam && atsamd51 && atsamd51j20
-// +build sam,atsamd51,atsamd51j20
// Peripheral abstraction layer for the atsamd51.
//
diff --git a/src/machine/machine_atsamd51p19.go b/src/machine/machine_atsamd51p19.go
index c3026966e..70050c2d6 100644
--- a/src/machine/machine_atsamd51p19.go
+++ b/src/machine/machine_atsamd51p19.go
@@ -1,5 +1,4 @@
//go:build sam && atsamd51 && atsamd51p19
-// +build sam,atsamd51,atsamd51p19
// Peripheral abstraction layer for the atsamd51.
//
diff --git a/src/machine/machine_atsamd51p20.go b/src/machine/machine_atsamd51p20.go
index b418faec5..9f52ba257 100644
--- a/src/machine/machine_atsamd51p20.go
+++ b/src/machine/machine_atsamd51p20.go
@@ -1,5 +1,4 @@
//go:build sam && atsamd51 && atsamd51p20
-// +build sam,atsamd51,atsamd51p20
// Peripheral abstraction layer for the atsamd51.
//
diff --git a/src/machine/machine_atsame51j19.go b/src/machine/machine_atsame51j19.go
index 2f3ba62f0..8f8294a26 100644
--- a/src/machine/machine_atsame51j19.go
+++ b/src/machine/machine_atsame51j19.go
@@ -1,5 +1,4 @@
//go:build sam && atsame51 && atsame51j19
-// +build sam,atsame51,atsame51j19
// Peripheral abstraction layer for the atsame51.
//
diff --git a/src/machine/machine_atsame54p20.go b/src/machine/machine_atsame54p20.go
index 02661a601..922ee3147 100644
--- a/src/machine/machine_atsame54p20.go
+++ b/src/machine/machine_atsame54p20.go
@@ -1,5 +1,4 @@
//go:build sam && atsame5x && atsame54p20
-// +build sam,atsame5x,atsame54p20
// Peripheral abstraction layer for the atsame54.
//
diff --git a/src/machine/machine_atsame5x_can.go b/src/machine/machine_atsame5x_can.go
index 46b2c9e79..b404bdaa6 100644
--- a/src/machine/machine_atsame5x_can.go
+++ b/src/machine/machine_atsame5x_can.go
@@ -1,5 +1,4 @@
//go:build (sam && atsame51) || (sam && atsame54)
-// +build sam,atsame51 sam,atsame54
package machine
diff --git a/src/machine/machine_attiny85.go b/src/machine/machine_attiny85.go
index 002a1feab..33424c605 100644
--- a/src/machine/machine_attiny85.go
+++ b/src/machine/machine_attiny85.go
@@ -1,5 +1,4 @@
//go:build attiny85
-// +build attiny85
package machine
diff --git a/src/machine/machine_avr.go b/src/machine/machine_avr.go
index 59b494dc4..a1c6991cc 100644
--- a/src/machine/machine_avr.go
+++ b/src/machine/machine_avr.go
@@ -1,5 +1,4 @@
//go:build avr
-// +build avr
package machine
diff --git a/src/machine/machine_esp32.go b/src/machine/machine_esp32.go
index c17f431a5..adca2bb68 100644
--- a/src/machine/machine_esp32.go
+++ b/src/machine/machine_esp32.go
@@ -1,5 +1,4 @@
//go:build esp32
-// +build esp32
package machine
diff --git a/src/machine/machine_esp32c3.go b/src/machine/machine_esp32c3.go
index 44c273df3..1c60c1936 100644
--- a/src/machine/machine_esp32c3.go
+++ b/src/machine/machine_esp32c3.go
@@ -1,5 +1,4 @@
//go:build esp32c3
-// +build esp32c3
package machine
diff --git a/src/machine/machine_esp8266.go b/src/machine/machine_esp8266.go
index 3b27a1915..37ab29a17 100644
--- a/src/machine/machine_esp8266.go
+++ b/src/machine/machine_esp8266.go
@@ -1,5 +1,4 @@
//go:build esp8266
-// +build esp8266
package machine
diff --git a/src/machine/machine_fe310.go b/src/machine/machine_fe310.go
index 3d9c298db..3a0c45134 100644
--- a/src/machine/machine_fe310.go
+++ b/src/machine/machine_fe310.go
@@ -1,5 +1,4 @@
//go:build fe310
-// +build fe310
package machine
diff --git a/src/machine/machine_gameboyadvance.go b/src/machine/machine_gameboyadvance.go
index 9c7c83926..0c4cd7cbd 100644
--- a/src/machine/machine_gameboyadvance.go
+++ b/src/machine/machine_gameboyadvance.go
@@ -1,5 +1,4 @@
//go:build gameboyadvance
-// +build gameboyadvance
package machine
diff --git a/src/machine/machine_generic.go b/src/machine/machine_generic.go
index 51ea63c04..b0aea8062 100644
--- a/src/machine/machine_generic.go
+++ b/src/machine/machine_generic.go
@@ -1,5 +1,4 @@
//go:build !baremetal
-// +build !baremetal
package machine
diff --git a/src/machine/machine_generic_peripherals.go b/src/machine/machine_generic_peripherals.go
index a9ac85d5f..5491a2698 100644
--- a/src/machine/machine_generic_peripherals.go
+++ b/src/machine/machine_generic_peripherals.go
@@ -1,5 +1,4 @@
//go:build !baremetal && !arduino_mkr1000 && !arduino_mkrwifi1010 && !arduino_nano33 && !arduino_zero && !circuitplay_express && !feather_m0 && !feather_m4 && !grandcentral_m4 && !itsybitsy_m0 && !itsybitsy_m4 && !matrixportal_m4 && !metro_m4_airlift && !p1am_100 && !pybadge && !pygamer && !pyportal && !qtpy && !trinket_m0 && !wioterminal && !xiao
-// +build !baremetal,!arduino_mkr1000,!arduino_mkrwifi1010,!arduino_nano33,!arduino_zero,!circuitplay_express,!feather_m0,!feather_m4,!grandcentral_m4,!itsybitsy_m0,!itsybitsy_m4,!matrixportal_m4,!metro_m4_airlift,!p1am_100,!pybadge,!pygamer,!pyportal,!qtpy,!trinket_m0,!wioterminal,!xiao
package machine
diff --git a/src/machine/machine_k210.go b/src/machine/machine_k210.go
index 13f151d43..9c63a8f76 100644
--- a/src/machine/machine_k210.go
+++ b/src/machine/machine_k210.go
@@ -1,5 +1,4 @@
//go:build k210
-// +build k210
package machine
diff --git a/src/machine/machine_mimxrt1062.go b/src/machine/machine_mimxrt1062.go
index 5fd3199fc..8c42c5564 100644
--- a/src/machine/machine_mimxrt1062.go
+++ b/src/machine/machine_mimxrt1062.go
@@ -1,5 +1,4 @@
//go:build mimxrt1062
-// +build mimxrt1062
package machine
diff --git a/src/machine/machine_mimxrt1062_i2c.go b/src/machine/machine_mimxrt1062_i2c.go
index e24781bad..d7ba82f55 100644
--- a/src/machine/machine_mimxrt1062_i2c.go
+++ b/src/machine/machine_mimxrt1062_i2c.go
@@ -1,5 +1,4 @@
//go:build mimxrt1062
-// +build mimxrt1062
package machine
diff --git a/src/machine/machine_mimxrt1062_spi.go b/src/machine/machine_mimxrt1062_spi.go
index 6068f5050..9b92fc6d1 100644
--- a/src/machine/machine_mimxrt1062_spi.go
+++ b/src/machine/machine_mimxrt1062_spi.go
@@ -1,5 +1,4 @@
//go:build mimxrt1062
-// +build mimxrt1062
package machine
diff --git a/src/machine/machine_mimxrt1062_uart.go b/src/machine/machine_mimxrt1062_uart.go
index c366fd453..d24206dfb 100644
--- a/src/machine/machine_mimxrt1062_uart.go
+++ b/src/machine/machine_mimxrt1062_uart.go
@@ -1,5 +1,4 @@
//go:build mimxrt1062
-// +build mimxrt1062
package machine
diff --git a/src/machine/machine_nrf.go b/src/machine/machine_nrf.go
index 2f8360679..f7f1d5926 100644
--- a/src/machine/machine_nrf.go
+++ b/src/machine/machine_nrf.go
@@ -1,5 +1,4 @@
//go:build nrf
-// +build nrf
package machine
diff --git a/src/machine/machine_nrf51.go b/src/machine/machine_nrf51.go
index a771b563a..0fd04f776 100644
--- a/src/machine/machine_nrf51.go
+++ b/src/machine/machine_nrf51.go
@@ -1,5 +1,4 @@
//go:build nrf51
-// +build nrf51
package machine
diff --git a/src/machine/machine_nrf52.go b/src/machine/machine_nrf52.go
index f5c6ed240..06ca6e01c 100644
--- a/src/machine/machine_nrf52.go
+++ b/src/machine/machine_nrf52.go
@@ -1,5 +1,4 @@
//go:build nrf52
-// +build nrf52
package machine
diff --git a/src/machine/machine_nrf52833.go b/src/machine/machine_nrf52833.go
index 1d1ab961c..ded3c90cf 100644
--- a/src/machine/machine_nrf52833.go
+++ b/src/machine/machine_nrf52833.go
@@ -1,5 +1,4 @@
//go:build nrf52833
-// +build nrf52833
package machine
diff --git a/src/machine/machine_nrf52840.go b/src/machine/machine_nrf52840.go
index 195c4f94b..005bf2525 100644
--- a/src/machine/machine_nrf52840.go
+++ b/src/machine/machine_nrf52840.go
@@ -1,5 +1,4 @@
//go:build nrf52840
-// +build nrf52840
package machine
diff --git a/src/machine/machine_nrf52840_enter_bootloader.go b/src/machine/machine_nrf52840_enter_bootloader.go
index cb69cfacc..d24152a5e 100644
--- a/src/machine/machine_nrf52840_enter_bootloader.go
+++ b/src/machine/machine_nrf52840_enter_bootloader.go
@@ -1,5 +1,4 @@
//go:build nrf52840
-// +build nrf52840
package machine
diff --git a/src/machine/machine_nrf52840_usb.go b/src/machine/machine_nrf52840_usb.go
index 18a9a397a..3dde46636 100644
--- a/src/machine/machine_nrf52840_usb.go
+++ b/src/machine/machine_nrf52840_usb.go
@@ -1,5 +1,4 @@
//go:build nrf52840
-// +build nrf52840
package machine
diff --git a/src/machine/machine_nrf52840_usb_reset_bossa.go b/src/machine/machine_nrf52840_usb_reset_bossa.go
index 419ed0437..b790eb726 100644
--- a/src/machine/machine_nrf52840_usb_reset_bossa.go
+++ b/src/machine/machine_nrf52840_usb_reset_bossa.go
@@ -1,5 +1,4 @@
//go:build nrf52840 && nrf52840_reset_bossa
-// +build nrf52840,nrf52840_reset_bossa
package machine
diff --git a/src/machine/machine_nrf52840_usb_reset_none.go b/src/machine/machine_nrf52840_usb_reset_none.go
index 409280820..e3900e4dc 100644
--- a/src/machine/machine_nrf52840_usb_reset_none.go
+++ b/src/machine/machine_nrf52840_usb_reset_none.go
@@ -1,5 +1,4 @@
//go:build nrf52840 && !nrf52840_reset_uf2 && !nrf52840_reset_bossa
-// +build nrf52840,!nrf52840_reset_uf2,!nrf52840_reset_bossa
package machine
diff --git a/src/machine/machine_nrf52840_usb_reset_uf2.go b/src/machine/machine_nrf52840_usb_reset_uf2.go
index e5a4a6b11..6573ebbea 100644
--- a/src/machine/machine_nrf52840_usb_reset_uf2.go
+++ b/src/machine/machine_nrf52840_usb_reset_uf2.go
@@ -1,5 +1,4 @@
//go:build nrf52840 && nrf52840_reset_uf2
-// +build nrf52840,nrf52840_reset_uf2
package machine
diff --git a/src/machine/machine_nrf528xx.go b/src/machine/machine_nrf528xx.go
index b3f88ad14..ac43c8f33 100644
--- a/src/machine/machine_nrf528xx.go
+++ b/src/machine/machine_nrf528xx.go
@@ -1,5 +1,4 @@
//go:build nrf52 || nrf52840 || nrf52833
-// +build nrf52 nrf52840 nrf52833
package machine
diff --git a/src/machine/machine_nxpmk66f18.go b/src/machine/machine_nxpmk66f18.go
index af6d7f1f9..5dd54d97b 100644
--- a/src/machine/machine_nxpmk66f18.go
+++ b/src/machine/machine_nxpmk66f18.go
@@ -28,7 +28,6 @@
// SOFTWARE.
//go:build nxp && mk66f18
-// +build nxp,mk66f18
package machine
diff --git a/src/machine/machine_nxpmk66f18_uart.go b/src/machine/machine_nxpmk66f18_uart.go
index 742ee312d..01faa6582 100644
--- a/src/machine/machine_nxpmk66f18_uart.go
+++ b/src/machine/machine_nxpmk66f18_uart.go
@@ -28,7 +28,6 @@
// SOFTWARE.
//go:build nxp && mk66f18
-// +build nxp,mk66f18
package machine
diff --git a/src/machine/machine_rp2040.go b/src/machine/machine_rp2040.go
index f65a8097c..fcff58bc5 100644
--- a/src/machine/machine_rp2040.go
+++ b/src/machine/machine_rp2040.go
@@ -1,5 +1,4 @@
//go:build rp2040
-// +build rp2040
package machine
diff --git a/src/machine/machine_rp2040_adc.go b/src/machine/machine_rp2040_adc.go
index 38ba4cf87..1f05684eb 100644
--- a/src/machine/machine_rp2040_adc.go
+++ b/src/machine/machine_rp2040_adc.go
@@ -1,5 +1,4 @@
//go:build rp2040
-// +build rp2040
package machine
diff --git a/src/machine/machine_rp2040_clocks.go b/src/machine/machine_rp2040_clocks.go
index eed86f8e0..093731049 100644
--- a/src/machine/machine_rp2040_clocks.go
+++ b/src/machine/machine_rp2040_clocks.go
@@ -1,5 +1,4 @@
//go:build rp2040
-// +build rp2040
package machine
diff --git a/src/machine/machine_rp2040_enter_bootloader.go b/src/machine/machine_rp2040_enter_bootloader.go
index 7259b060b..189060756 100644
--- a/src/machine/machine_rp2040_enter_bootloader.go
+++ b/src/machine/machine_rp2040_enter_bootloader.go
@@ -1,5 +1,4 @@
//go:build rp2040
-// +build rp2040
package machine
diff --git a/src/machine/machine_rp2040_gpio.go b/src/machine/machine_rp2040_gpio.go
index 04871bd28..a62a90484 100644
--- a/src/machine/machine_rp2040_gpio.go
+++ b/src/machine/machine_rp2040_gpio.go
@@ -1,5 +1,4 @@
//go:build rp2040
-// +build rp2040
package machine
diff --git a/src/machine/machine_rp2040_i2c.go b/src/machine/machine_rp2040_i2c.go
index 3e75e7e68..d49e7f576 100644
--- a/src/machine/machine_rp2040_i2c.go
+++ b/src/machine/machine_rp2040_i2c.go
@@ -1,5 +1,4 @@
//go:build rp2040
-// +build rp2040
package machine
diff --git a/src/machine/machine_rp2040_pll.go b/src/machine/machine_rp2040_pll.go
index d716566b8..d611f2924 100644
--- a/src/machine/machine_rp2040_pll.go
+++ b/src/machine/machine_rp2040_pll.go
@@ -1,5 +1,4 @@
//go:build rp2040
-// +build rp2040
package machine
diff --git a/src/machine/machine_rp2040_pwm.go b/src/machine/machine_rp2040_pwm.go
index 330968a6a..c114005e1 100644
--- a/src/machine/machine_rp2040_pwm.go
+++ b/src/machine/machine_rp2040_pwm.go
@@ -1,5 +1,4 @@
//go:build rp2040
-// +build rp2040
package machine
diff --git a/src/machine/machine_rp2040_resets.go b/src/machine/machine_rp2040_resets.go
index 1a6ad99e5..6f15e9952 100644
--- a/src/machine/machine_rp2040_resets.go
+++ b/src/machine/machine_rp2040_resets.go
@@ -1,5 +1,4 @@
//go:build rp2040
-// +build rp2040
package machine
diff --git a/src/machine/machine_rp2040_rng.go b/src/machine/machine_rp2040_rng.go
index e300b1abc..1706785d0 100644
--- a/src/machine/machine_rp2040_rng.go
+++ b/src/machine/machine_rp2040_rng.go
@@ -1,5 +1,4 @@
//go:build rp2040
-// +build rp2040
// Implementation based on code located here:
// https://github.com/raspberrypi/pico-sdk/blob/master/src/rp2_common/pico_lwip/random.c
diff --git a/src/machine/machine_rp2040_spi.go b/src/machine/machine_rp2040_spi.go
index c37eeb694..fd1b6ab0f 100644
--- a/src/machine/machine_rp2040_spi.go
+++ b/src/machine/machine_rp2040_spi.go
@@ -1,5 +1,4 @@
//go:build rp2040
-// +build rp2040
package machine
diff --git a/src/machine/machine_rp2040_sync.go b/src/machine/machine_rp2040_sync.go
index 18ac261cb..4c9b44323 100644
--- a/src/machine/machine_rp2040_sync.go
+++ b/src/machine/machine_rp2040_sync.go
@@ -1,5 +1,4 @@
//go:build rp2040
-// +build rp2040
package machine
diff --git a/src/machine/machine_rp2040_timer.go b/src/machine/machine_rp2040_timer.go
index 9396d68a1..56c012cd6 100644
--- a/src/machine/machine_rp2040_timer.go
+++ b/src/machine/machine_rp2040_timer.go
@@ -1,5 +1,4 @@
//go:build rp2040
-// +build rp2040
package machine
diff --git a/src/machine/machine_rp2040_uart.go b/src/machine/machine_rp2040_uart.go
index 7dd822cf9..b4053aeb9 100644
--- a/src/machine/machine_rp2040_uart.go
+++ b/src/machine/machine_rp2040_uart.go
@@ -1,5 +1,4 @@
//go:build rp2040
-// +build rp2040
package machine
diff --git a/src/machine/machine_rp2040_usb.go b/src/machine/machine_rp2040_usb.go
index 45c378345..eecf9d636 100644
--- a/src/machine/machine_rp2040_usb.go
+++ b/src/machine/machine_rp2040_usb.go
@@ -1,5 +1,4 @@
//go:build rp2040
-// +build rp2040
package machine
diff --git a/src/machine/machine_rp2040_watchdog.go b/src/machine/machine_rp2040_watchdog.go
index e2dc196fc..6e9fb874f 100644
--- a/src/machine/machine_rp2040_watchdog.go
+++ b/src/machine/machine_rp2040_watchdog.go
@@ -1,5 +1,4 @@
//go:build rp2040
-// +build rp2040
package machine
diff --git a/src/machine/machine_rp2040_xosc.go b/src/machine/machine_rp2040_xosc.go
index f670de40c..c3d6d713a 100644
--- a/src/machine/machine_rp2040_xosc.go
+++ b/src/machine/machine_rp2040_xosc.go
@@ -1,5 +1,4 @@
//go:build rp2040
-// +build rp2040
package machine
diff --git a/src/machine/machine_stm32.go b/src/machine/machine_stm32.go
index a5d4b3827..4f04cae4c 100644
--- a/src/machine/machine_stm32.go
+++ b/src/machine/machine_stm32.go
@@ -1,5 +1,4 @@
//go:build stm32
-// +build stm32
package machine
diff --git a/src/machine/machine_stm32_adc_f1.go b/src/machine/machine_stm32_adc_f1.go
index e2c82f623..f852f402b 100644
--- a/src/machine/machine_stm32_adc_f1.go
+++ b/src/machine/machine_stm32_adc_f1.go
@@ -1,5 +1,4 @@
//go:build stm32f103
-// +build stm32f103
package machine
diff --git a/src/machine/machine_stm32_adc_f4.go b/src/machine/machine_stm32_adc_f4.go
index 3a163ffda..df4984c1b 100644
--- a/src/machine/machine_stm32_adc_f4.go
+++ b/src/machine/machine_stm32_adc_f4.go
@@ -1,5 +1,4 @@
//go:build stm32f4
-// +build stm32f4
package machine
diff --git a/src/machine/machine_stm32_exti_afio.go b/src/machine/machine_stm32_exti_afio.go
index 0cf34003b..89a95067a 100644
--- a/src/machine/machine_stm32_exti_afio.go
+++ b/src/machine/machine_stm32_exti_afio.go
@@ -1,5 +1,4 @@
//go:build stm32f1
-// +build stm32f1
package machine
diff --git a/src/machine/machine_stm32_exti_exti.go b/src/machine/machine_stm32_exti_exti.go
index e21cfae56..874a04383 100644
--- a/src/machine/machine_stm32_exti_exti.go
+++ b/src/machine/machine_stm32_exti_exti.go
@@ -1,5 +1,4 @@
//go:build stm32l5
-// +build stm32l5
package machine
diff --git a/src/machine/machine_stm32_exti_syscfg.go b/src/machine/machine_stm32_exti_syscfg.go
index 7e4666cf4..f7c91f81f 100644
--- a/src/machine/machine_stm32_exti_syscfg.go
+++ b/src/machine/machine_stm32_exti_syscfg.go
@@ -1,5 +1,4 @@
//go:build stm32 && !stm32f1 && !stm32l5 && !stm32wlx
-// +build stm32,!stm32f1,!stm32l5,!stm32wlx
package machine
diff --git a/src/machine/machine_stm32_exti_syscfg_noenable.go b/src/machine/machine_stm32_exti_syscfg_noenable.go
index d6fa06e27..85f47fa9f 100644
--- a/src/machine/machine_stm32_exti_syscfg_noenable.go
+++ b/src/machine/machine_stm32_exti_syscfg_noenable.go
@@ -1,5 +1,4 @@
//go:build stm32wlx
-// +build stm32wlx
package machine
diff --git a/src/machine/machine_stm32_gpio_reva.go b/src/machine/machine_stm32_gpio_reva.go
index 1712986aa..2fb5a0349 100644
--- a/src/machine/machine_stm32_gpio_reva.go
+++ b/src/machine/machine_stm32_gpio_reva.go
@@ -1,5 +1,4 @@
//go:build stm32 && !stm32l4 && !stm32l5 && !stm32wlx
-// +build stm32,!stm32l4,!stm32l5,!stm32wlx
package machine
diff --git a/src/machine/machine_stm32_gpio_revb.go b/src/machine/machine_stm32_gpio_revb.go
index 7329f47ee..49094c730 100644
--- a/src/machine/machine_stm32_gpio_revb.go
+++ b/src/machine/machine_stm32_gpio_revb.go
@@ -1,5 +1,4 @@
//go:build stm32l4 || stm32l5
-// +build stm32l4 stm32l5
package machine
diff --git a/src/machine/machine_stm32_gpio_revb_mp.go b/src/machine/machine_stm32_gpio_revb_mp.go
index 0eb91989a..2124b1629 100644
--- a/src/machine/machine_stm32_gpio_revb_mp.go
+++ b/src/machine/machine_stm32_gpio_revb_mp.go
@@ -1,5 +1,4 @@
//go:build stm32wlx
-// +build stm32wlx
package machine
diff --git a/src/machine/machine_stm32_i2c_reva.go b/src/machine/machine_stm32_i2c_reva.go
index d60247b2b..38ebdcdc4 100644
--- a/src/machine/machine_stm32_i2c_reva.go
+++ b/src/machine/machine_stm32_i2c_reva.go
@@ -1,5 +1,4 @@
//go:build stm32f4 || stm32f1
-// +build stm32f4 stm32f1
package machine
diff --git a/src/machine/machine_stm32_i2c_revb.go b/src/machine/machine_stm32_i2c_revb.go
index 449c28099..6adb704db 100644
--- a/src/machine/machine_stm32_i2c_revb.go
+++ b/src/machine/machine_stm32_i2c_revb.go
@@ -1,5 +1,4 @@
//go:build stm32l5 || stm32f7 || stm32l4 || stm32l0 || stm32wlx
-// +build stm32l5 stm32f7 stm32l4 stm32l0 stm32wlx
package machine
diff --git a/src/machine/machine_stm32_moder_gpio.go b/src/machine/machine_stm32_moder_gpio.go
index 99d913cdb..b8585c28c 100644
--- a/src/machine/machine_stm32_moder_gpio.go
+++ b/src/machine/machine_stm32_moder_gpio.go
@@ -1,5 +1,4 @@
//go:build stm32 && !stm32f103
-// +build stm32,!stm32f103
package machine
@@ -8,7 +7,7 @@ import (
)
// GPIO for the stm32 families except the stm32f1xx which uses a simpler but
-// less flexible mechanism. Extend the +build directive above to exclude other
+// less flexible mechanism. Extend the go:build directive above to exclude other
// models in the stm32f1xx series as necessary
const (
diff --git a/src/machine/machine_stm32_rng.go b/src/machine/machine_stm32_rng.go
index 8160ab87f..490c2e421 100644
--- a/src/machine/machine_stm32_rng.go
+++ b/src/machine/machine_stm32_rng.go
@@ -1,5 +1,4 @@
//go:build stm32 && !(stm32f103 || stm32l0x1)
-// +build stm32,!stm32f103,!stm32l0x1
package machine
diff --git a/src/machine/machine_stm32_spi.go b/src/machine/machine_stm32_spi.go
index 481df8cd1..192411c47 100644
--- a/src/machine/machine_stm32_spi.go
+++ b/src/machine/machine_stm32_spi.go
@@ -1,5 +1,4 @@
//go:build stm32 && !stm32f7x2 && !stm32l5x2
-// +build stm32,!stm32f7x2,!stm32l5x2
package machine
diff --git a/src/machine/machine_stm32_tim.go b/src/machine/machine_stm32_tim.go
index 4f607d036..4898ed9f6 100644
--- a/src/machine/machine_stm32_tim.go
+++ b/src/machine/machine_stm32_tim.go
@@ -1,5 +1,4 @@
//go:build stm32
-// +build stm32
package machine
diff --git a/src/machine/machine_stm32_tim_moder.go b/src/machine/machine_stm32_tim_moder.go
index e868469f4..5cb360d95 100644
--- a/src/machine/machine_stm32_tim_moder.go
+++ b/src/machine/machine_stm32_tim_moder.go
@@ -1,5 +1,4 @@
//go:build stm32 && !stm32f1
-// +build stm32,!stm32f1
package machine
diff --git a/src/machine/machine_stm32_uart.go b/src/machine/machine_stm32_uart.go
index 9fdd17cb0..6ae6f0f99 100644
--- a/src/machine/machine_stm32_uart.go
+++ b/src/machine/machine_stm32_uart.go
@@ -1,5 +1,4 @@
//go:build stm32
-// +build stm32
package machine
diff --git a/src/machine/machine_stm32f103.go b/src/machine/machine_stm32f103.go
index 4c6778023..e7593829b 100644
--- a/src/machine/machine_stm32f103.go
+++ b/src/machine/machine_stm32f103.go
@@ -1,5 +1,4 @@
//go:build stm32 && stm32f103
-// +build stm32,stm32f103
package machine
diff --git a/src/machine/machine_stm32f4.go b/src/machine/machine_stm32f4.go
index dd8a0ad7c..829dc7f85 100644
--- a/src/machine/machine_stm32f4.go
+++ b/src/machine/machine_stm32f4.go
@@ -1,5 +1,4 @@
//go:build stm32f4
-// +build stm32f4
package machine
diff --git a/src/machine/machine_stm32f40x.go b/src/machine/machine_stm32f40x.go
index 42ddb94a9..953c7fab4 100644
--- a/src/machine/machine_stm32f40x.go
+++ b/src/machine/machine_stm32f40x.go
@@ -1,6 +1,4 @@
//go:build stm32f4 && (stm32f405 || stm32f407)
-// +build stm32f4
-// +build stm32f405 stm32f407
package machine
diff --git a/src/machine/machine_stm32f469.go b/src/machine/machine_stm32f469.go
index d8f86d5eb..dfda91fc3 100644
--- a/src/machine/machine_stm32f469.go
+++ b/src/machine/machine_stm32f469.go
@@ -1,5 +1,4 @@
//go:build stm32f4 && stm32f469
-// +build stm32f4,stm32f469
package machine
diff --git a/src/machine/machine_stm32f7.go b/src/machine/machine_stm32f7.go
index 838250b5a..a08d083a2 100644
--- a/src/machine/machine_stm32f7.go
+++ b/src/machine/machine_stm32f7.go
@@ -1,5 +1,4 @@
//go:build stm32f7
-// +build stm32f7
package machine
diff --git a/src/machine/machine_stm32f7x2.go b/src/machine/machine_stm32f7x2.go
index bdfa27bc1..8755bc8ff 100644
--- a/src/machine/machine_stm32f7x2.go
+++ b/src/machine/machine_stm32f7x2.go
@@ -1,5 +1,4 @@
//go:build stm32f7x2
-// +build stm32f7x2
package machine
diff --git a/src/machine/machine_stm32l0.go b/src/machine/machine_stm32l0.go
index 70b7ce583..f3d213c48 100644
--- a/src/machine/machine_stm32l0.go
+++ b/src/machine/machine_stm32l0.go
@@ -1,5 +1,4 @@
//go:build stm32l0
-// +build stm32l0
package machine
diff --git a/src/machine/machine_stm32l0x1.go b/src/machine/machine_stm32l0x1.go
index 254fb36cc..f0d23ca49 100644
--- a/src/machine/machine_stm32l0x1.go
+++ b/src/machine/machine_stm32l0x1.go
@@ -1,5 +1,4 @@
//go:build stm32l0x1
-// +build stm32l0x1
package machine
diff --git a/src/machine/machine_stm32l0x2.go b/src/machine/machine_stm32l0x2.go
index 3ac632548..2a747920b 100644
--- a/src/machine/machine_stm32l0x2.go
+++ b/src/machine/machine_stm32l0x2.go
@@ -1,5 +1,4 @@
//go:build stm32l0x2
-// +build stm32l0x2
package machine
diff --git a/src/machine/machine_stm32l4.go b/src/machine/machine_stm32l4.go
index 9063b802b..b6da1b4db 100644
--- a/src/machine/machine_stm32l4.go
+++ b/src/machine/machine_stm32l4.go
@@ -1,5 +1,4 @@
//go:build stm32l4
-// +build stm32l4
package machine
diff --git a/src/machine/machine_stm32l4x2.go b/src/machine/machine_stm32l4x2.go
index 98439117f..497cf3e1d 100644
--- a/src/machine/machine_stm32l4x2.go
+++ b/src/machine/machine_stm32l4x2.go
@@ -1,5 +1,4 @@
//go:build stm32l4x2
-// +build stm32l4x2
package machine
diff --git a/src/machine/machine_stm32l4x5.go b/src/machine/machine_stm32l4x5.go
index 2e042e4e9..ec06544ba 100644
--- a/src/machine/machine_stm32l4x5.go
+++ b/src/machine/machine_stm32l4x5.go
@@ -1,5 +1,4 @@
//go:build stm32l4x5
-// +build stm32l4x5
package machine
diff --git a/src/machine/machine_stm32l5.go b/src/machine/machine_stm32l5.go
index 5eb951d83..d85157dbe 100644
--- a/src/machine/machine_stm32l5.go
+++ b/src/machine/machine_stm32l5.go
@@ -1,5 +1,4 @@
//go:build stm32l5
-// +build stm32l5
package machine
diff --git a/src/machine/machine_stm32l5x2.go b/src/machine/machine_stm32l5x2.go
index 966c0cebc..2fb3a0d63 100644
--- a/src/machine/machine_stm32l5x2.go
+++ b/src/machine/machine_stm32l5x2.go
@@ -1,5 +1,4 @@
//go:build stm32l5x2
-// +build stm32l5x2
package machine
diff --git a/src/machine/machine_stm32wlx.go b/src/machine/machine_stm32wlx.go
index 377781e8b..ff1745d41 100644
--- a/src/machine/machine_stm32wlx.go
+++ b/src/machine/machine_stm32wlx.go
@@ -1,5 +1,4 @@
//go:build stm32wlx
-// +build stm32wlx
package machine
diff --git a/src/machine/serial-none.go b/src/machine/serial-none.go
index 6cfce217a..7b65c328b 100644
--- a/src/machine/serial-none.go
+++ b/src/machine/serial-none.go
@@ -1,5 +1,4 @@
//go:build baremetal && serial.none
-// +build baremetal,serial.none
package machine
diff --git a/src/machine/serial-uart.go b/src/machine/serial-uart.go
index e0525d98d..e9388659d 100644
--- a/src/machine/serial-uart.go
+++ b/src/machine/serial-uart.go
@@ -1,5 +1,4 @@
//go:build baremetal && serial.uart
-// +build baremetal,serial.uart
package machine
diff --git a/src/machine/serial-usb.go b/src/machine/serial-usb.go
index 702cab1ee..658708291 100644
--- a/src/machine/serial-usb.go
+++ b/src/machine/serial-usb.go
@@ -1,5 +1,4 @@
//go:build baremetal && serial.usb
-// +build baremetal,serial.usb
package machine
diff --git a/src/machine/spi.go b/src/machine/spi.go
index 5c1fbbf69..803f4ffcb 100644
--- a/src/machine/spi.go
+++ b/src/machine/spi.go
@@ -1,5 +1,4 @@
//go:build !baremetal || atmega || esp32 || fe310 || k210 || nrf || (nxp && !mk66f18) || rp2040 || sam || (stm32 && !stm32f7x2 && !stm32l5x2)
-// +build !baremetal atmega esp32 fe310 k210 nrf nxp,!mk66f18 rp2040 sam stm32,!stm32f7x2,!stm32l5x2
package machine
diff --git a/src/machine/spi_tx.go b/src/machine/spi_tx.go
index 7356f2057..bfc3bfb60 100644
--- a/src/machine/spi_tx.go
+++ b/src/machine/spi_tx.go
@@ -1,5 +1,4 @@
//go:build !baremetal || atmega || fe310 || k210 || (nxp && !mk66f18) || (stm32 && !stm32f7x2 && !stm32l5x2)
-// +build !baremetal atmega fe310 k210 nxp,!mk66f18 stm32,!stm32f7x2,!stm32l5x2
// This file implements the SPI Tx function for targets that don't have a custom
// (faster) implementation for it.
diff --git a/src/machine/uart.go b/src/machine/uart.go
index f5b3b82f2..37d322332 100644
--- a/src/machine/uart.go
+++ b/src/machine/uart.go
@@ -1,5 +1,4 @@
//go:build atmega || esp || nrf || sam || sifive || stm32 || k210 || nxp || rp2040
-// +build atmega esp nrf sam sifive stm32 k210 nxp rp2040
package machine
diff --git a/src/machine/usb.go b/src/machine/usb.go
index 3fbec5391..c5820dc6a 100644
--- a/src/machine/usb.go
+++ b/src/machine/usb.go
@@ -1,5 +1,4 @@
//go:build sam || nrf52840 || rp2040
-// +build sam nrf52840 rp2040
package machine
diff --git a/src/net/interface_tinygo.go b/src/net/interface_tinygo.go
index 30eea3f44..60d4d58d7 100644
--- a/src/net/interface_tinygo.go
+++ b/src/net/interface_tinygo.go
@@ -1,5 +1,4 @@
//go:build tinygo
-// +build tinygo
package net
diff --git a/src/os/dir_other.go b/src/os/dir_other.go
index aebeed4e4..ddf28c6b5 100644
--- a/src/os/dir_other.go
+++ b/src/os/dir_other.go
@@ -1,5 +1,4 @@
//go:build baremetal || js || wasi || windows
-// +build baremetal js wasi windows
// Copyright 2009 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
diff --git a/src/os/dir_test.go b/src/os/dir_test.go
index f088861c2..c09067df1 100644
--- a/src/os/dir_test.go
+++ b/src/os/dir_test.go
@@ -1,5 +1,4 @@
//go:build darwin || (linux && !baremetal && !js && !wasi && !386 && !arm)
-// +build darwin linux,!baremetal,!js,!wasi,!386,!arm
package os_test
diff --git a/src/os/dir_unix.go b/src/os/dir_unix.go
index 659b612bb..a23f00e4c 100644
--- a/src/os/dir_unix.go
+++ b/src/os/dir_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux && !baremetal && !wasi
-// +build linux,!baremetal,!wasi
package os
diff --git a/src/os/dirent_linux.go b/src/os/dirent_linux.go
index c249f615a..2527182fb 100644
--- a/src/os/dirent_linux.go
+++ b/src/os/dirent_linux.go
@@ -1,5 +1,4 @@
//go:build !baremetal && !js && !wasi
-// +build !baremetal,!js,!wasi
// Copyright 2020 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
diff --git a/src/os/env_unix_test.go b/src/os/env_unix_test.go
index d567acf1e..b5f6473e1 100644
--- a/src/os/env_unix_test.go
+++ b/src/os/env_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || linux
-// +build darwin linux
package os_test
diff --git a/src/os/exec_posix.go b/src/os/exec_posix.go
index f100d6317..151520cca 100644
--- a/src/os/exec_posix.go
+++ b/src/os/exec_posix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris || windows
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris windows
package os
diff --git a/src/os/executable_other.go b/src/os/executable_other.go
index 4bf1f0423..5da50ede1 100644
--- a/src/os/executable_other.go
+++ b/src/os/executable_other.go
@@ -1,5 +1,4 @@
//go:build !linux || baremetal
-// +build !linux baremetal
package os
diff --git a/src/os/executable_procfs.go b/src/os/executable_procfs.go
index cabe3744f..0d12d8bf9 100644
--- a/src/os/executable_procfs.go
+++ b/src/os/executable_procfs.go
@@ -5,7 +5,6 @@
// license that can be found in the LICENSE file.
//go:build linux && !baremetal
-// +build linux,!baremetal
package os
diff --git a/src/os/file_anyos.go b/src/os/file_anyos.go
index 117f173f6..0436d1222 100644
--- a/src/os/file_anyos.go
+++ b/src/os/file_anyos.go
@@ -1,5 +1,4 @@
//go:build !baremetal && !js
-// +build !baremetal,!js
// Portions copyright 2009 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
diff --git a/src/os/file_anyos_test.go b/src/os/file_anyos_test.go
index 25fcfd281..205ac299f 100644
--- a/src/os/file_anyos_test.go
+++ b/src/os/file_anyos_test.go
@@ -1,5 +1,4 @@
//go:build !baremetal && !js
-// +build !baremetal,!js
package os_test
diff --git a/src/os/file_other.go b/src/os/file_other.go
index 82c84e958..12b21b838 100644
--- a/src/os/file_other.go
+++ b/src/os/file_other.go
@@ -1,5 +1,4 @@
//go:build baremetal || (wasm && !wasi)
-// +build baremetal wasm,!wasi
package os
diff --git a/src/os/file_unix.go b/src/os/file_unix.go
index a76f5ff13..271071e32 100644
--- a/src/os/file_unix.go
+++ b/src/os/file_unix.go
@@ -1,5 +1,4 @@
//go:build darwin || (linux && !baremetal)
-// +build darwin linux,!baremetal
// target wasi sets GOOS=linux and thus the +linux build tag,
// even though it doesn't show up in "tinygo info target -wasi"
diff --git a/src/os/file_windows.go b/src/os/file_windows.go
index a26cfd2a0..a6838a642 100644
--- a/src/os/file_windows.go
+++ b/src/os/file_windows.go
@@ -1,5 +1,4 @@
//go:build windows
-// +build windows
// Portions copyright 2009 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
diff --git a/src/os/getpagesize_test.go b/src/os/getpagesize_test.go
index bcba9643f..705cfd47d 100644
--- a/src/os/getpagesize_test.go
+++ b/src/os/getpagesize_test.go
@@ -1,5 +1,4 @@
//go:build windows || darwin || (linux && !baremetal)
-// +build windows darwin linux,!baremetal
package os_test
diff --git a/src/os/is_wasi_no_test.go b/src/os/is_wasi_no_test.go
index 6917ec974..a8d04b674 100644
--- a/src/os/is_wasi_no_test.go
+++ b/src/os/is_wasi_no_test.go
@@ -1,5 +1,4 @@
//go:build !wasi
-// +build !wasi
package os_test
diff --git a/src/os/is_wasi_test.go b/src/os/is_wasi_test.go
index 6041faca6..551e00075 100644
--- a/src/os/is_wasi_test.go
+++ b/src/os/is_wasi_test.go
@@ -1,5 +1,4 @@
//go:build wasi
-// +build wasi
package os_test
diff --git a/src/os/os_anyos_test.go b/src/os/os_anyos_test.go
index dd255fb46..76bf4f368 100644
--- a/src/os/os_anyos_test.go
+++ b/src/os/os_anyos_test.go
@@ -1,5 +1,4 @@
//go:build windows || darwin || (linux && !baremetal)
-// +build windows darwin linux,!baremetal
package os_test
diff --git a/src/os/os_chmod_test.go b/src/os/os_chmod_test.go
index 01ec7f662..af54815d8 100644
--- a/src/os/os_chmod_test.go
+++ b/src/os/os_chmod_test.go
@@ -1,5 +1,4 @@
//go:build !baremetal && !js && !wasi
-// +build !baremetal,!js,!wasi
// Copyright 2009 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
diff --git a/src/os/os_symlink_test.go b/src/os/os_symlink_test.go
index dd9747971..f231f8d9d 100644
--- a/src/os/os_symlink_test.go
+++ b/src/os/os_symlink_test.go
@@ -1,5 +1,4 @@
//go:build !windows && !baremetal && !js && !wasi
-// +build !windows,!baremetal,!js,!wasi
// Copyright 2009 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
diff --git a/src/os/path_unix.go b/src/os/path_unix.go
index 1ade59014..97a028c5c 100644
--- a/src/os/path_unix.go
+++ b/src/os/path_unix.go
@@ -1,5 +1,4 @@
//go:build !windows
-// +build !windows
// Copyright 2011 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
diff --git a/src/os/pipe_test.go b/src/os/pipe_test.go
index dcb995284..b0553ffdb 100644
--- a/src/os/pipe_test.go
+++ b/src/os/pipe_test.go
@@ -1,5 +1,4 @@
//go:build windows || darwin || (linux && !baremetal && !wasi)
-// +build windows darwin linux,!baremetal,!wasi
// Copyright 2021 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
diff --git a/src/os/read_test.go b/src/os/read_test.go
index 0051f9763..6915dfaf9 100644
--- a/src/os/read_test.go
+++ b/src/os/read_test.go
@@ -1,5 +1,4 @@
//go:build !baremetal && !js && !wasi
-// +build !baremetal,!js,!wasi
// Copyright 2009 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
diff --git a/src/os/removeall_noat.go b/src/os/removeall_noat.go
index 8b41282be..03339ae3b 100644
--- a/src/os/removeall_noat.go
+++ b/src/os/removeall_noat.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !baremetal && !js && !wasi
-// +build !baremetal,!js,!wasi
package os
diff --git a/src/os/removeall_other.go b/src/os/removeall_other.go
index 41cb0f544..a388a6c22 100644
--- a/src/os/removeall_other.go
+++ b/src/os/removeall_other.go
@@ -1,5 +1,4 @@
//go:build baremetal || js || wasi
-// +build baremetal js wasi
// Copyright 2009 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
diff --git a/src/os/removeall_test.go b/src/os/removeall_test.go
index 81e7f58f2..ea7c83b4e 100644
--- a/src/os/removeall_test.go
+++ b/src/os/removeall_test.go
@@ -1,5 +1,4 @@
//go:build darwin || (linux && !baremetal && !js && !wasi)
-// +build darwin linux,!baremetal,!js,!wasi
// TODO: implement ReadDir on windows
diff --git a/src/os/seek_unix_bad.go b/src/os/seek_unix_bad.go
index 13f1d98c2..1f09426ae 100644
--- a/src/os/seek_unix_bad.go
+++ b/src/os/seek_unix_bad.go
@@ -1,5 +1,4 @@
//go:build (linux && !baremetal && 386) || (linux && !baremetal && arm && !wasi)
-// +build linux,!baremetal,386 linux,!baremetal,arm,!wasi
package os
diff --git a/src/os/stat_linux.go b/src/os/stat_linux.go
index d186926ab..d407c5c7e 100644
--- a/src/os/stat_linux.go
+++ b/src/os/stat_linux.go
@@ -1,5 +1,4 @@
//go:build linux && !baremetal
-// +build linux,!baremetal
// Copyright 2009 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
diff --git a/src/os/stat_other.go b/src/os/stat_other.go
index 5b574abba..57be74bed 100644
--- a/src/os/stat_other.go
+++ b/src/os/stat_other.go
@@ -1,5 +1,4 @@
//go:build baremetal || (wasm && !wasi)
-// +build baremetal wasm,!wasi
// Copyright 2016 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
diff --git a/src/os/stat_unix.go b/src/os/stat_unix.go
index 68f0168b7..74507c777 100644
--- a/src/os/stat_unix.go
+++ b/src/os/stat_unix.go
@@ -1,5 +1,4 @@
//go:build darwin || (linux && !baremetal)
-// +build darwin linux,!baremetal
// Copyright 2016 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
diff --git a/src/os/tempfile_test.go b/src/os/tempfile_test.go
index 7c3e706e3..f25390d6c 100644
--- a/src/os/tempfile_test.go
+++ b/src/os/tempfile_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !baremetal && !js && !wasi
-// +build !baremetal,!js,!wasi
package os_test
diff --git a/src/os/types_anyos.go b/src/os/types_anyos.go
index e8013cb4f..cb3a0b949 100644
--- a/src/os/types_anyos.go
+++ b/src/os/types_anyos.go
@@ -1,5 +1,4 @@
//go:build !baremetal && !js
-// +build !baremetal,!js
// Copyright 2009 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
diff --git a/src/os/types_unix.go b/src/os/types_unix.go
index 095fabda7..68a4e628a 100644
--- a/src/os/types_unix.go
+++ b/src/os/types_unix.go
@@ -1,5 +1,4 @@
//go:build darwin || (linux && !baremetal)
-// +build darwin linux,!baremetal
// Copyright 2009 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
diff --git a/src/runtime/arch_arm.go b/src/runtime/arch_arm.go
index 3b0ff6794..16d3649bb 100644
--- a/src/runtime/arch_arm.go
+++ b/src/runtime/arch_arm.go
@@ -1,5 +1,4 @@
//go:build (arm && !baremetal && !tinygo.wasm) || (arm && arm7tdmi)
-// +build arm,!baremetal,!tinygo.wasm arm,arm7tdmi
package runtime
diff --git a/src/runtime/arch_avr.go b/src/runtime/arch_avr.go
index 61c08ea2a..5fe066056 100644
--- a/src/runtime/arch_avr.go
+++ b/src/runtime/arch_avr.go
@@ -1,5 +1,4 @@
//go:build avr
-// +build avr
package runtime
diff --git a/src/runtime/arch_cortexm.go b/src/runtime/arch_cortexm.go
index de0844dad..613dfd5fc 100644
--- a/src/runtime/arch_cortexm.go
+++ b/src/runtime/arch_cortexm.go
@@ -1,5 +1,4 @@
//go:build cortexm
-// +build cortexm
package runtime
diff --git a/src/runtime/arch_tinygoriscv.go b/src/runtime/arch_tinygoriscv.go
index c20e0fdff..bec0821ec 100644
--- a/src/runtime/arch_tinygoriscv.go
+++ b/src/runtime/arch_tinygoriscv.go
@@ -1,5 +1,4 @@
//go:build tinygo.riscv
-// +build tinygo.riscv
package runtime
diff --git a/src/runtime/arch_tinygoriscv32.go b/src/runtime/arch_tinygoriscv32.go
index 046006aa4..538259f74 100644
--- a/src/runtime/arch_tinygoriscv32.go
+++ b/src/runtime/arch_tinygoriscv32.go
@@ -1,5 +1,4 @@
//go:build tinygo.riscv32
-// +build tinygo.riscv32
package runtime
diff --git a/src/runtime/arch_tinygoriscv64.go b/src/runtime/arch_tinygoriscv64.go
index 71410e6e4..23036f8df 100644
--- a/src/runtime/arch_tinygoriscv64.go
+++ b/src/runtime/arch_tinygoriscv64.go
@@ -1,5 +1,4 @@
//go:build tinygo.riscv64
-// +build tinygo.riscv64
package runtime
diff --git a/src/runtime/arch_tinygowasm.go b/src/runtime/arch_tinygowasm.go
index a4a701a8e..ac1a221c4 100644
--- a/src/runtime/arch_tinygowasm.go
+++ b/src/runtime/arch_tinygowasm.go
@@ -1,5 +1,4 @@
//go:build tinygo.wasm
-// +build tinygo.wasm
package runtime
diff --git a/src/runtime/arch_tinygowasm_malloc.go b/src/runtime/arch_tinygowasm_malloc.go
index 06ae96cac..acbea9ab7 100644
--- a/src/runtime/arch_tinygowasm_malloc.go
+++ b/src/runtime/arch_tinygowasm_malloc.go
@@ -1,5 +1,4 @@
//go:build tinygo.wasm && !custommalloc
-// +build tinygo.wasm,!custommalloc
package runtime
diff --git a/src/runtime/arch_xtensa.go b/src/runtime/arch_xtensa.go
index b3926286e..2bb58476c 100644
--- a/src/runtime/arch_xtensa.go
+++ b/src/runtime/arch_xtensa.go
@@ -1,5 +1,4 @@
//go:build xtensa
-// +build xtensa
package runtime
diff --git a/src/runtime/atomics_critical.go b/src/runtime/atomics_critical.go
index 615426ae5..2d98881a1 100644
--- a/src/runtime/atomics_critical.go
+++ b/src/runtime/atomics_critical.go
@@ -1,5 +1,4 @@
//go:build baremetal && !tinygo.wasm
-// +build baremetal,!tinygo.wasm
// Automatically generated file. DO NOT EDIT.
// This file implements standins for non-native atomics using critical sections.
diff --git a/src/runtime/baremetal.go b/src/runtime/baremetal.go
index c4e44b7ea..a51191bb9 100644
--- a/src/runtime/baremetal.go
+++ b/src/runtime/baremetal.go
@@ -1,5 +1,4 @@
//go:build baremetal
-// +build baremetal
package runtime
diff --git a/src/runtime/cond.go b/src/runtime/cond.go
index e382adb8b..00e89932a 100644
--- a/src/runtime/cond.go
+++ b/src/runtime/cond.go
@@ -1,5 +1,4 @@
//go:build !scheduler.none
-// +build !scheduler.none
package runtime
diff --git a/src/runtime/cond_nosched.go b/src/runtime/cond_nosched.go
index f999a56c6..ff57f4146 100644
--- a/src/runtime/cond_nosched.go
+++ b/src/runtime/cond_nosched.go
@@ -1,5 +1,4 @@
//go:build scheduler.none
-// +build scheduler.none
package runtime
diff --git a/src/runtime/env_linux.go b/src/runtime/env_linux.go
index cfe8c7f85..2581ab8e2 100644
--- a/src/runtime/env_linux.go
+++ b/src/runtime/env_linux.go
@@ -1,5 +1,4 @@
//go:build linux
-// +build linux
package runtime
diff --git a/src/runtime/gc_conservative.go b/src/runtime/gc_conservative.go
index 205003f3b..1cb0274b2 100644
--- a/src/runtime/gc_conservative.go
+++ b/src/runtime/gc_conservative.go
@@ -1,5 +1,4 @@
//go:build gc.conservative
-// +build gc.conservative
package runtime
diff --git a/src/runtime/gc_globals.go b/src/runtime/gc_globals.go
index f3a15a00b..85efa4a0b 100644
--- a/src/runtime/gc_globals.go
+++ b/src/runtime/gc_globals.go
@@ -1,6 +1,4 @@
//go:build gc.conservative && (baremetal || tinygo.wasm)
-// +build gc.conservative
-// +build baremetal tinygo.wasm
package runtime
diff --git a/src/runtime/gc_leaking.go b/src/runtime/gc_leaking.go
index 4f5fa34e1..a01642507 100644
--- a/src/runtime/gc_leaking.go
+++ b/src/runtime/gc_leaking.go
@@ -1,5 +1,4 @@
//go:build gc.leaking
-// +build gc.leaking
package runtime
diff --git a/src/runtime/gc_none.go b/src/runtime/gc_none.go
index e80083bb4..859c0b5db 100644
--- a/src/runtime/gc_none.go
+++ b/src/runtime/gc_none.go
@@ -1,5 +1,4 @@
//go:build gc.none
-// +build gc.none
package runtime
diff --git a/src/runtime/gc_stack_portable.go b/src/runtime/gc_stack_portable.go
index b1073e4fa..995975809 100644
--- a/src/runtime/gc_stack_portable.go
+++ b/src/runtime/gc_stack_portable.go
@@ -1,5 +1,4 @@
//go:build gc.conservative && tinygo.wasm
-// +build gc.conservative,tinygo.wasm
package runtime
diff --git a/src/runtime/gc_stack_raw.go b/src/runtime/gc_stack_raw.go
index e8fb0dc13..fa764c8ba 100644
--- a/src/runtime/gc_stack_raw.go
+++ b/src/runtime/gc_stack_raw.go
@@ -1,5 +1,4 @@
//go:build gc.conservative && !tinygo.wasm
-// +build gc.conservative,!tinygo.wasm
package runtime
diff --git a/src/runtime/hosted.go b/src/runtime/hosted.go
index 72eb11497..913322e27 100644
--- a/src/runtime/hosted.go
+++ b/src/runtime/hosted.go
@@ -1,5 +1,4 @@
//go:build !baremetal
-// +build !baremetal
package runtime
diff --git a/src/runtime/interrupt/interrupt_avr.go b/src/runtime/interrupt/interrupt_avr.go
index 8fc4aabd5..25c8caa02 100644
--- a/src/runtime/interrupt/interrupt_avr.go
+++ b/src/runtime/interrupt/interrupt_avr.go
@@ -1,5 +1,4 @@
//go:build avr
-// +build avr
package interrupt
diff --git a/src/runtime/interrupt/interrupt_cortexm.go b/src/runtime/interrupt/interrupt_cortexm.go
index e56a3bbe8..a7127c3ef 100644
--- a/src/runtime/interrupt/interrupt_cortexm.go
+++ b/src/runtime/interrupt/interrupt_cortexm.go
@@ -1,5 +1,4 @@
//go:build cortexm
-// +build cortexm
package interrupt
diff --git a/src/runtime/interrupt/interrupt_esp32c3.go b/src/runtime/interrupt/interrupt_esp32c3.go
index b32a9afe0..5a9337ed1 100644
--- a/src/runtime/interrupt/interrupt_esp32c3.go
+++ b/src/runtime/interrupt/interrupt_esp32c3.go
@@ -1,5 +1,4 @@
//go:build esp32c3
-// +build esp32c3
package interrupt
diff --git a/src/runtime/interrupt/interrupt_gameboyadvance.go b/src/runtime/interrupt/interrupt_gameboyadvance.go
index f6dcc5e00..72f2a8194 100644
--- a/src/runtime/interrupt/interrupt_gameboyadvance.go
+++ b/src/runtime/interrupt/interrupt_gameboyadvance.go
@@ -1,5 +1,4 @@
//go:build gameboyadvance
-// +build gameboyadvance
package interrupt
diff --git a/src/runtime/interrupt/interrupt_k210.go b/src/runtime/interrupt/interrupt_k210.go
index 4f987171c..c0e2d7960 100644
--- a/src/runtime/interrupt/interrupt_k210.go
+++ b/src/runtime/interrupt/interrupt_k210.go
@@ -1,5 +1,4 @@
//go:build k210
-// +build k210
package interrupt
diff --git a/src/runtime/interrupt/interrupt_none.go b/src/runtime/interrupt/interrupt_none.go
index 1a1066524..caafc285d 100644
--- a/src/runtime/interrupt/interrupt_none.go
+++ b/src/runtime/interrupt/interrupt_none.go
@@ -1,5 +1,4 @@
//go:build !baremetal
-// +build !baremetal
package interrupt
diff --git a/src/runtime/interrupt/interrupt_sifive.go b/src/runtime/interrupt/interrupt_sifive.go
index 4be3ee6a3..468dd3a75 100644
--- a/src/runtime/interrupt/interrupt_sifive.go
+++ b/src/runtime/interrupt/interrupt_sifive.go
@@ -1,5 +1,4 @@
//go:build sifive
-// +build sifive
package interrupt
diff --git a/src/runtime/interrupt/interrupt_tinygoriscv.go b/src/runtime/interrupt/interrupt_tinygoriscv.go
index 477227fe4..14d9a5886 100644
--- a/src/runtime/interrupt/interrupt_tinygoriscv.go
+++ b/src/runtime/interrupt/interrupt_tinygoriscv.go
@@ -1,5 +1,4 @@
//go:build tinygo.riscv
-// +build tinygo.riscv
package interrupt
diff --git a/src/runtime/interrupt/interrupt_xtensa.go b/src/runtime/interrupt/interrupt_xtensa.go
index bbb9e84ea..be8d4dc77 100644
--- a/src/runtime/interrupt/interrupt_xtensa.go
+++ b/src/runtime/interrupt/interrupt_xtensa.go
@@ -1,5 +1,4 @@
//go:build xtensa
-// +build xtensa
package interrupt
diff --git a/src/runtime/memhash_fnv.go b/src/runtime/memhash_fnv.go
index 585f99bc9..b09b9f721 100644
--- a/src/runtime/memhash_fnv.go
+++ b/src/runtime/memhash_fnv.go
@@ -1,5 +1,4 @@
//go:build !runtime_memhash_tsip && !runtime_memhash_leveldb
-// +build !runtime_memhash_tsip,!runtime_memhash_leveldb
package runtime
diff --git a/src/runtime/memhash_leveldb.go b/src/runtime/memhash_leveldb.go
index e91456700..34a598e43 100644
--- a/src/runtime/memhash_leveldb.go
+++ b/src/runtime/memhash_leveldb.go
@@ -1,5 +1,4 @@
//go:build runtime_memhash_leveldb
-// +build runtime_memhash_leveldb
// This is the hash function from Google's leveldb key-value storage system. It
// processes 4 bytes at a time making it faster than the FNV hash for buffer
diff --git a/src/runtime/memhash_tsip.go b/src/runtime/memhash_tsip.go
index 2b5882f55..e05bf15dc 100644
--- a/src/runtime/memhash_tsip.go
+++ b/src/runtime/memhash_tsip.go
@@ -1,5 +1,4 @@
//go:build runtime_memhash_tsip
-// +build runtime_memhash_tsip
// This is the tsip hash developed by Damian Gryski, based on ideas from SipHash.
// It is slower than leveldb's hash, but should be "stronger".
diff --git a/src/runtime/mstats_conservative.go b/src/runtime/mstats_conservative.go
index 1f2bb879e..7a6d42ef1 100644
--- a/src/runtime/mstats_conservative.go
+++ b/src/runtime/mstats_conservative.go
@@ -1,5 +1,4 @@
//go:build gc.conservative
-// +build gc.conservative
package runtime
diff --git a/src/runtime/mstats_leaking.go b/src/runtime/mstats_leaking.go
index f1cfa793c..c568905c4 100644
--- a/src/runtime/mstats_leaking.go
+++ b/src/runtime/mstats_leaking.go
@@ -1,5 +1,4 @@
//go:build gc.leaking
-// +build gc.leaking
package runtime
diff --git a/src/runtime/nonhosted.go b/src/runtime/nonhosted.go
index 010b7c4cd..6b47ba8b0 100644
--- a/src/runtime/nonhosted.go
+++ b/src/runtime/nonhosted.go
@@ -1,5 +1,4 @@
//go:build baremetal || js
-// +build baremetal js
package runtime
diff --git a/src/runtime/os_darwin.go b/src/runtime/os_darwin.go
index f18a46cff..005600e67 100644
--- a/src/runtime/os_darwin.go
+++ b/src/runtime/os_darwin.go
@@ -1,5 +1,4 @@
//go:build darwin
-// +build darwin
package runtime
diff --git a/src/runtime/os_js.go b/src/runtime/os_js.go
index d4000108e..31ea8f5dd 100644
--- a/src/runtime/os_js.go
+++ b/src/runtime/os_js.go
@@ -1,5 +1,4 @@
//go:build js
-// +build js
package runtime
diff --git a/src/runtime/os_linux.go b/src/runtime/os_linux.go
index 8f1572658..67ae21691 100644
--- a/src/runtime/os_linux.go
+++ b/src/runtime/os_linux.go
@@ -1,5 +1,4 @@
//go:build linux && !baremetal && !nintendoswitch && !wasi
-// +build linux,!baremetal,!nintendoswitch,!wasi
package runtime
diff --git a/src/runtime/os_other.go b/src/runtime/os_other.go
index 93773e536..63d8153fe 100644
--- a/src/runtime/os_other.go
+++ b/src/runtime/os_other.go
@@ -1,6 +1,4 @@
//go:build linux && (baremetal || nintendoswitch || wasi)
-// +build linux
-// +build baremetal nintendoswitch wasi
// Other systems that aren't operating systems supported by the Go toolchain
// need to pretend to be an existing operating system. Linux seems like a good
diff --git a/src/runtime/runtime_arm7tdmi.go b/src/runtime/runtime_arm7tdmi.go
index 5c52e4a94..4f0ad8335 100644
--- a/src/runtime/runtime_arm7tdmi.go
+++ b/src/runtime/runtime_arm7tdmi.go
@@ -1,5 +1,4 @@
//go:build arm7tdmi
-// +build arm7tdmi
package runtime
diff --git a/src/runtime/runtime_atmega.go b/src/runtime/runtime_atmega.go
index 17c0eabe8..b2e024457 100644
--- a/src/runtime/runtime_atmega.go
+++ b/src/runtime/runtime_atmega.go
@@ -1,5 +1,4 @@
//go:build avr && atmega
-// +build avr,atmega
package runtime
diff --git a/src/runtime/runtime_atsamd21.go b/src/runtime/runtime_atsamd21.go
index 0f411366b..166df214f 100644
--- a/src/runtime/runtime_atsamd21.go
+++ b/src/runtime/runtime_atsamd21.go
@@ -1,5 +1,4 @@
//go:build sam && atsamd21
-// +build sam,atsamd21
package runtime
diff --git a/src/runtime/runtime_atsamd21e18.go b/src/runtime/runtime_atsamd21e18.go
index 2ad6eae9c..fd3ed84a3 100644
--- a/src/runtime/runtime_atsamd21e18.go
+++ b/src/runtime/runtime_atsamd21e18.go
@@ -1,5 +1,4 @@
//go:build sam && atsamd21 && atsamd21e18
-// +build sam,atsamd21,atsamd21e18
package runtime
diff --git a/src/runtime/runtime_atsamd21g18.go b/src/runtime/runtime_atsamd21g18.go
index 469387348..d699a0429 100644
--- a/src/runtime/runtime_atsamd21g18.go
+++ b/src/runtime/runtime_atsamd21g18.go
@@ -1,5 +1,4 @@
//go:build sam && atsamd21 && atsamd21g18
-// +build sam,atsamd21,atsamd21g18
package runtime
diff --git a/src/runtime/runtime_atsamd51.go b/src/runtime/runtime_atsamd51.go
index f1e585ee2..f58e097ee 100644
--- a/src/runtime/runtime_atsamd51.go
+++ b/src/runtime/runtime_atsamd51.go
@@ -1,5 +1,4 @@
//go:build (sam && atsamd51) || (sam && atsame5x)
-// +build sam,atsamd51 sam,atsame5x
package runtime
diff --git a/src/runtime/runtime_atsamd51g19.go b/src/runtime/runtime_atsamd51g19.go
index c8aed7170..e0869f4bd 100644
--- a/src/runtime/runtime_atsamd51g19.go
+++ b/src/runtime/runtime_atsamd51g19.go
@@ -1,5 +1,4 @@
//go:build sam && atsamd51 && atsamd51g19
-// +build sam,atsamd51,atsamd51g19
package runtime
diff --git a/src/runtime/runtime_atsamd51j19.go b/src/runtime/runtime_atsamd51j19.go
index b3e1db0f1..3b202b72b 100644
--- a/src/runtime/runtime_atsamd51j19.go
+++ b/src/runtime/runtime_atsamd51j19.go
@@ -1,5 +1,4 @@
//go:build sam && atsamd51 && atsamd51j19
-// +build sam,atsamd51,atsamd51j19
package runtime
diff --git a/src/runtime/runtime_atsamd51j20.go b/src/runtime/runtime_atsamd51j20.go
index af50349e3..a92002e20 100644
--- a/src/runtime/runtime_atsamd51j20.go
+++ b/src/runtime/runtime_atsamd51j20.go
@@ -1,5 +1,4 @@
//go:build sam && atsamd51 && atsamd51j20
-// +build sam,atsamd51,atsamd51j20
package runtime
diff --git a/src/runtime/runtime_atsamd51p19.go b/src/runtime/runtime_atsamd51p19.go
index 07c220fcc..489705733 100644
--- a/src/runtime/runtime_atsamd51p19.go
+++ b/src/runtime/runtime_atsamd51p19.go
@@ -1,5 +1,4 @@
//go:build sam && atsamd51 && atsamd51p19
-// +build sam,atsamd51,atsamd51p19
package runtime
diff --git a/src/runtime/runtime_atsamd51p20.go b/src/runtime/runtime_atsamd51p20.go
index 835621016..de7c9e69f 100644
--- a/src/runtime/runtime_atsamd51p20.go
+++ b/src/runtime/runtime_atsamd51p20.go
@@ -1,5 +1,4 @@
//go:build sam && atsamd51 && atsamd51p20
-// +build sam,atsamd51,atsamd51p20
package runtime
diff --git a/src/runtime/runtime_atsame51j19.go b/src/runtime/runtime_atsame51j19.go
index 907b95be2..8126e561c 100644
--- a/src/runtime/runtime_atsame51j19.go
+++ b/src/runtime/runtime_atsame51j19.go
@@ -1,5 +1,4 @@
//go:build sam && atsame51 && atsame51j19
-// +build sam,atsame51,atsame51j19
package runtime
diff --git a/src/runtime/runtime_atsame54p20.go b/src/runtime/runtime_atsame54p20.go
index 34a281533..96006e0f3 100644
--- a/src/runtime/runtime_atsame54p20.go
+++ b/src/runtime/runtime_atsame54p20.go
@@ -1,5 +1,4 @@
//go:build sam && atsame5x && atsame54p20
-// +build sam,atsame5x,atsame54p20
package runtime
diff --git a/src/runtime/runtime_atsame5x_can.go b/src/runtime/runtime_atsame5x_can.go
index dc1fc2ab8..fb9f3a34e 100644
--- a/src/runtime/runtime_atsame5x_can.go
+++ b/src/runtime/runtime_atsame5x_can.go
@@ -1,5 +1,4 @@
//go:build (sam && atsame51) || (sam && atsame54)
-// +build sam,atsame51 sam,atsame54
package runtime
diff --git a/src/runtime/runtime_attiny.go b/src/runtime/runtime_attiny.go
index bb1968409..6405e3638 100644
--- a/src/runtime/runtime_attiny.go
+++ b/src/runtime/runtime_attiny.go
@@ -1,5 +1,4 @@
//go:build avr && attiny
-// +build avr,attiny
package runtime
diff --git a/src/runtime/runtime_avr.go b/src/runtime/runtime_avr.go
index 10ce1dada..aff6f7898 100644
--- a/src/runtime/runtime_avr.go
+++ b/src/runtime/runtime_avr.go
@@ -1,5 +1,4 @@
//go:build avr
-// +build avr
package runtime
diff --git a/src/runtime/runtime_cortexm.go b/src/runtime/runtime_cortexm.go
index e718344fa..55ccc7d33 100644
--- a/src/runtime/runtime_cortexm.go
+++ b/src/runtime/runtime_cortexm.go
@@ -1,5 +1,4 @@
//go:build cortexm
-// +build cortexm
package runtime
diff --git a/src/runtime/runtime_cortexm_abort.go b/src/runtime/runtime_cortexm_abort.go
index 584c0c22c..4a02e44f8 100644
--- a/src/runtime/runtime_cortexm_abort.go
+++ b/src/runtime/runtime_cortexm_abort.go
@@ -1,5 +1,4 @@
//go:build cortexm && !nxp && !qemu
-// +build cortexm,!nxp,!qemu
package runtime
diff --git a/src/runtime/runtime_cortexm_hardfault.go b/src/runtime/runtime_cortexm_hardfault.go
index e7eb67a9b..1e264c286 100644
--- a/src/runtime/runtime_cortexm_hardfault.go
+++ b/src/runtime/runtime_cortexm_hardfault.go
@@ -1,5 +1,4 @@
//go:build atsamd21 || nrf51
-// +build atsamd21 nrf51
package runtime
diff --git a/src/runtime/runtime_cortexm_hardfault_debug.go b/src/runtime/runtime_cortexm_hardfault_debug.go
index 2ee7a4964..ea6c50702 100644
--- a/src/runtime/runtime_cortexm_hardfault_debug.go
+++ b/src/runtime/runtime_cortexm_hardfault_debug.go
@@ -1,5 +1,4 @@
//go:build cortexm && !atsamd21 && !nrf51
-// +build cortexm,!atsamd21,!nrf51
package runtime
diff --git a/src/runtime/runtime_cortexm_qemu.go b/src/runtime/runtime_cortexm_qemu.go
index 458b9764b..22bfee167 100644
--- a/src/runtime/runtime_cortexm_qemu.go
+++ b/src/runtime/runtime_cortexm_qemu.go
@@ -1,5 +1,4 @@
//go:build cortexm && qemu
-// +build cortexm,qemu
package runtime
diff --git a/src/runtime/runtime_esp32.go b/src/runtime/runtime_esp32.go
index 2b24d371b..909d3cc72 100644
--- a/src/runtime/runtime_esp32.go
+++ b/src/runtime/runtime_esp32.go
@@ -1,5 +1,4 @@
//go:build esp32
-// +build esp32
package runtime
diff --git a/src/runtime/runtime_esp32c3.go b/src/runtime/runtime_esp32c3.go
index f5af66be3..561ba4bfd 100644
--- a/src/runtime/runtime_esp32c3.go
+++ b/src/runtime/runtime_esp32c3.go
@@ -1,5 +1,4 @@
//go:build esp32c3
-// +build esp32c3
package runtime
diff --git a/src/runtime/runtime_esp32xx.go b/src/runtime/runtime_esp32xx.go
index 08370f722..36b499657 100644
--- a/src/runtime/runtime_esp32xx.go
+++ b/src/runtime/runtime_esp32xx.go
@@ -1,5 +1,4 @@
//go:build esp32 || esp32c3
-// +build esp32 esp32c3
package runtime
@@ -43,7 +42,10 @@ func initTimer() {
// INCREASE: Count up every tick (as opposed to counting down).
// DIVIDER: 16-bit prescaler, set to 2 for dividing the APB clock by two
// (40MHz).
+ // esp.TIMG0.T0CONFIG.Set(0 << esp.TIMG_T0CONFIG_T0_EN_Pos)
esp.TIMG0.T0CONFIG.Set(esp.TIMG_T0CONFIG_T0_EN | esp.TIMG_T0CONFIG_T0_INCREASE | 2<<esp.TIMG_T0CONFIG_T0_DIVIDER_Pos)
+ // esp.TIMG0.T0CONFIG.Set(1 << esp.TIMG_T0CONFIG_T0_DIVCNT_RST_Pos)
+ // esp.TIMG0.T0CONFIG.Set(esp.TIMG_T0CONFIG_T0_EN)
// Set the timer counter value to 0.
esp.TIMG0.T0LOADLO.Set(0)
diff --git a/src/runtime/runtime_esp8266.go b/src/runtime/runtime_esp8266.go
index d62b40fe0..9b1bd807a 100644
--- a/src/runtime/runtime_esp8266.go
+++ b/src/runtime/runtime_esp8266.go
@@ -1,5 +1,4 @@
//go:build esp8266
-// +build esp8266
package runtime
diff --git a/src/runtime/runtime_fe310.go b/src/runtime/runtime_fe310.go
index 8bb696baa..22afca407 100644
--- a/src/runtime/runtime_fe310.go
+++ b/src/runtime/runtime_fe310.go
@@ -1,5 +1,4 @@
//go:build fe310
-// +build fe310
// This file implements target-specific things for the FE310 chip as used in the
// HiFive1.
diff --git a/src/runtime/runtime_fe310_baremetal.go b/src/runtime/runtime_fe310_baremetal.go
index 5c393740e..0e64f26ce 100644
--- a/src/runtime/runtime_fe310_baremetal.go
+++ b/src/runtime/runtime_fe310_baremetal.go
@@ -1,5 +1,4 @@
//go:build fe310 && !qemu
-// +build fe310,!qemu
package runtime
diff --git a/src/runtime/runtime_fe310_qemu.go b/src/runtime/runtime_fe310_qemu.go
index 42ba0c313..eee0429c2 100644
--- a/src/runtime/runtime_fe310_qemu.go
+++ b/src/runtime/runtime_fe310_qemu.go
@@ -1,5 +1,4 @@
//go:build fe310 && qemu
-// +build fe310,qemu
package runtime
diff --git a/src/runtime/runtime_k210.go b/src/runtime/runtime_k210.go
index ffc348db8..298a420ff 100644
--- a/src/runtime/runtime_k210.go
+++ b/src/runtime/runtime_k210.go
@@ -1,5 +1,4 @@
//go:build k210
-// +build k210
// This file implements target-specific things for the K210 chip as used in the
// MAix Bit with Mic.
diff --git a/src/runtime/runtime_k210_baremetal.go b/src/runtime/runtime_k210_baremetal.go
index 160d64116..ad60913c8 100644
--- a/src/runtime/runtime_k210_baremetal.go
+++ b/src/runtime/runtime_k210_baremetal.go
@@ -1,5 +1,4 @@
//go:build k210 && !qemu
-// +build k210,!qemu
package runtime
diff --git a/src/runtime/runtime_mimxrt1062.go b/src/runtime/runtime_mimxrt1062.go
index 770a928d2..a26c9b6e3 100644
--- a/src/runtime/runtime_mimxrt1062.go
+++ b/src/runtime/runtime_mimxrt1062.go
@@ -1,5 +1,4 @@
//go:build mimxrt1062
-// +build mimxrt1062
package runtime
diff --git a/src/runtime/runtime_mimxrt1062_clock.go b/src/runtime/runtime_mimxrt1062_clock.go
index 8071cb97a..23d6c3caf 100644
--- a/src/runtime/runtime_mimxrt1062_clock.go
+++ b/src/runtime/runtime_mimxrt1062_clock.go
@@ -1,5 +1,4 @@
//go:build mimxrt1062
-// +build mimxrt1062
package runtime
diff --git a/src/runtime/runtime_mimxrt1062_mpu.go b/src/runtime/runtime_mimxrt1062_mpu.go
index 1ceb98424..b7d0a81a1 100644
--- a/src/runtime/runtime_mimxrt1062_mpu.go
+++ b/src/runtime/runtime_mimxrt1062_mpu.go
@@ -1,5 +1,4 @@
//go:build mimxrt1062
-// +build mimxrt1062
package runtime
diff --git a/src/runtime/runtime_mimxrt1062_time.go b/src/runtime/runtime_mimxrt1062_time.go
index 9c4101be3..e3779052f 100644
--- a/src/runtime/runtime_mimxrt1062_time.go
+++ b/src/runtime/runtime_mimxrt1062_time.go
@@ -1,5 +1,4 @@
//go:build mimxrt1062
-// +build mimxrt1062
package runtime
diff --git a/src/runtime/runtime_nintendoswitch.go b/src/runtime/runtime_nintendoswitch.go
index c4116fce4..d03d71496 100644
--- a/src/runtime/runtime_nintendoswitch.go
+++ b/src/runtime/runtime_nintendoswitch.go
@@ -1,5 +1,4 @@
//go:build nintendoswitch
-// +build nintendoswitch
package runtime
diff --git a/src/runtime/runtime_nrf.go b/src/runtime/runtime_nrf.go
index 26a48d2a2..2f58c3518 100644
--- a/src/runtime/runtime_nrf.go
+++ b/src/runtime/runtime_nrf.go
@@ -1,5 +1,4 @@
//go:build nrf && !nrf52840
-// +build nrf,!nrf52840
package runtime
diff --git a/src/runtime/runtime_nrf52840.go b/src/runtime/runtime_nrf52840.go
index cd1d892e5..47f9a8db1 100644
--- a/src/runtime/runtime_nrf52840.go
+++ b/src/runtime/runtime_nrf52840.go
@@ -1,5 +1,4 @@
//go:build nrf && nrf52840
-// +build nrf,nrf52840
package runtime
diff --git a/src/runtime/runtime_nrf_bare.go b/src/runtime/runtime_nrf_bare.go
index 51035e21c..dc0fa7910 100644
--- a/src/runtime/runtime_nrf_bare.go
+++ b/src/runtime/runtime_nrf_bare.go
@@ -1,5 +1,4 @@
//go:build nrf && !softdevice
-// +build nrf,!softdevice
package runtime
diff --git a/src/runtime/runtime_nrf_softdevice.go b/src/runtime/runtime_nrf_softdevice.go
index 5da3776f3..3fb6550ba 100644
--- a/src/runtime/runtime_nrf_softdevice.go
+++ b/src/runtime/runtime_nrf_softdevice.go
@@ -1,5 +1,4 @@
//go:build nrf && softdevice
-// +build nrf,softdevice
package runtime
diff --git a/src/runtime/runtime_nxpmk66f18.go b/src/runtime/runtime_nxpmk66f18.go
index 28c019e55..8943f59b9 100644
--- a/src/runtime/runtime_nxpmk66f18.go
+++ b/src/runtime/runtime_nxpmk66f18.go
@@ -28,7 +28,6 @@
// SOFTWARE.
//go:build nxp && mk66f18
-// +build nxp,mk66f18
package runtime
diff --git a/src/runtime/runtime_rp2040.go b/src/runtime/runtime_rp2040.go
index 089c91eda..e5659d625 100644
--- a/src/runtime/runtime_rp2040.go
+++ b/src/runtime/runtime_rp2040.go
@@ -1,5 +1,4 @@
//go:build rp2040
-// +build rp2040
package runtime
diff --git a/src/runtime/runtime_stm32.go b/src/runtime/runtime_stm32.go
index 7fb332f99..c212ead72 100644
--- a/src/runtime/runtime_stm32.go
+++ b/src/runtime/runtime_stm32.go
@@ -1,5 +1,4 @@
//go:build stm32
-// +build stm32
package runtime
diff --git a/src/runtime/runtime_stm32_timers.go b/src/runtime/runtime_stm32_timers.go
index ec2a2c563..392a91aca 100644
--- a/src/runtime/runtime_stm32_timers.go
+++ b/src/runtime/runtime_stm32_timers.go
@@ -1,5 +1,4 @@
//go:build stm32
-// +build stm32
package runtime
diff --git a/src/runtime/runtime_stm32f103.go b/src/runtime/runtime_stm32f103.go
index afc7cfa17..ac98de674 100644
--- a/src/runtime/runtime_stm32f103.go
+++ b/src/runtime/runtime_stm32f103.go
@@ -1,5 +1,4 @@
//go:build stm32 && stm32f103
-// +build stm32,stm32f103
package runtime
diff --git a/src/runtime/runtime_stm32f4.go b/src/runtime/runtime_stm32f4.go
index 1512269fd..be6b73255 100644
--- a/src/runtime/runtime_stm32f4.go
+++ b/src/runtime/runtime_stm32f4.go
@@ -1,6 +1,4 @@
//go:build stm32f4 && (stm32f407 || stm32f469)
-// +build stm32f4
-// +build stm32f407 stm32f469
package runtime
diff --git a/src/runtime/runtime_stm32f405.go b/src/runtime/runtime_stm32f405.go
index 59db1e760..8481a206e 100644
--- a/src/runtime/runtime_stm32f405.go
+++ b/src/runtime/runtime_stm32f405.go
@@ -1,5 +1,4 @@
//go:build stm32f405
-// +build stm32f405
package runtime
diff --git a/src/runtime/runtime_stm32f407.go b/src/runtime/runtime_stm32f407.go
index 0a269e273..802a10298 100644
--- a/src/runtime/runtime_stm32f407.go
+++ b/src/runtime/runtime_stm32f407.go
@@ -1,5 +1,4 @@
//go:build stm32f4 && stm32f407
-// +build stm32f4,stm32f407
package runtime
diff --git a/src/runtime/runtime_stm32f469.go b/src/runtime/runtime_stm32f469.go
index 49e6657ac..38343dc0d 100644
--- a/src/runtime/runtime_stm32f469.go
+++ b/src/runtime/runtime_stm32f469.go
@@ -1,5 +1,4 @@
//go:build stm32f4 && stm32f469
-// +build stm32f4,stm32f469
package runtime
diff --git a/src/runtime/runtime_stm32f7x2.go b/src/runtime/runtime_stm32f7x2.go
index 1c7168d8e..a15c692b1 100644
--- a/src/runtime/runtime_stm32f7x2.go
+++ b/src/runtime/runtime_stm32f7x2.go
@@ -1,5 +1,4 @@
//go:build stm32 && stm32f7x2
-// +build stm32,stm32f7x2
package runtime
diff --git a/src/runtime/runtime_stm32l0.go b/src/runtime/runtime_stm32l0.go
index 0caf95ec4..03e69ad26 100644
--- a/src/runtime/runtime_stm32l0.go
+++ b/src/runtime/runtime_stm32l0.go
@@ -1,5 +1,4 @@
//go:build stm32l0
-// +build stm32l0
package runtime
diff --git a/src/runtime/runtime_stm32l0x1.go b/src/runtime/runtime_stm32l0x1.go
index d06e2d8fd..8f2a87882 100644
--- a/src/runtime/runtime_stm32l0x1.go
+++ b/src/runtime/runtime_stm32l0x1.go
@@ -1,5 +1,4 @@
//go:build stm32l0x1
-// +build stm32l0x1
package runtime
diff --git a/src/runtime/runtime_stm32l0x2.go b/src/runtime/runtime_stm32l0x2.go
index ead55a556..83f76e5a7 100644
--- a/src/runtime/runtime_stm32l0x2.go
+++ b/src/runtime/runtime_stm32l0x2.go
@@ -1,5 +1,4 @@
//go:build stm32l0x2
-// +build stm32l0x2
package runtime
diff --git a/src/runtime/runtime_stm32l4.go b/src/runtime/runtime_stm32l4.go
index 8522da892..c6c5e9769 100644
--- a/src/runtime/runtime_stm32l4.go
+++ b/src/runtime/runtime_stm32l4.go
@@ -1,5 +1,4 @@
//go:build stm32 && stm32l4
-// +build stm32,stm32l4
package runtime
diff --git a/src/runtime/runtime_stm32l4x2.go b/src/runtime/runtime_stm32l4x2.go
index 2e571eaa3..6abae922b 100644
--- a/src/runtime/runtime_stm32l4x2.go
+++ b/src/runtime/runtime_stm32l4x2.go
@@ -1,5 +1,4 @@
//go:build stm32 && stm32l4x2
-// +build stm32,stm32l4x2
package runtime
diff --git a/src/runtime/runtime_stm32l4x5.go b/src/runtime/runtime_stm32l4x5.go
index 8a3439d1a..273eb726f 100644
--- a/src/runtime/runtime_stm32l4x5.go
+++ b/src/runtime/runtime_stm32l4x5.go
@@ -1,5 +1,4 @@
//go:build stm32 && stm32l4x5
-// +build stm32,stm32l4x5
package runtime
diff --git a/src/runtime/runtime_stm32l5x2.go b/src/runtime/runtime_stm32l5x2.go
index b55bc1a97..5095384ad 100644
--- a/src/runtime/runtime_stm32l5x2.go
+++ b/src/runtime/runtime_stm32l5x2.go
@@ -1,5 +1,4 @@
//go:build stm32 && stm32l5x2
-// +build stm32,stm32l5x2
package runtime
diff --git a/src/runtime/runtime_stm32wlx.go b/src/runtime/runtime_stm32wlx.go
index fec771082..35c017c3d 100644
--- a/src/runtime/runtime_stm32wlx.go
+++ b/src/runtime/runtime_stm32wlx.go
@@ -1,5 +1,4 @@
//go:build stm32wlx
-// +build stm32wlx
package runtime
diff --git a/src/runtime/runtime_tinygoriscv.go b/src/runtime/runtime_tinygoriscv.go
index 1778749e1..f4385f305 100644
--- a/src/runtime/runtime_tinygoriscv.go
+++ b/src/runtime/runtime_tinygoriscv.go
@@ -1,5 +1,4 @@
//go:build tinygo.riscv32
-// +build tinygo.riscv32
package runtime
diff --git a/src/runtime/runtime_tinygoriscv64.go b/src/runtime/runtime_tinygoriscv64.go
index 020dfc7ff..44049a51b 100644
--- a/src/runtime/runtime_tinygoriscv64.go
+++ b/src/runtime/runtime_tinygoriscv64.go
@@ -1,5 +1,4 @@
//go:build tinygo.riscv64
-// +build tinygo.riscv64
package runtime
diff --git a/src/runtime/runtime_tinygoriscv_qemu.go b/src/runtime/runtime_tinygoriscv_qemu.go
index 9e3882f5a..e68041890 100644
--- a/src/runtime/runtime_tinygoriscv_qemu.go
+++ b/src/runtime/runtime_tinygoriscv_qemu.go
@@ -1,5 +1,4 @@
//go:build tinygo.riscv && virt && qemu
-// +build tinygo.riscv,virt,qemu
package runtime
diff --git a/src/runtime/runtime_tinygowasm.go b/src/runtime/runtime_tinygowasm.go
index 73a9eddf9..95c02a522 100644
--- a/src/runtime/runtime_tinygowasm.go
+++ b/src/runtime/runtime_tinygowasm.go
@@ -1,5 +1,4 @@
//go:build tinygo.wasm
-// +build tinygo.wasm
package runtime
diff --git a/src/runtime/runtime_unix.go b/src/runtime/runtime_unix.go
index 604f21c6d..39ea125c1 100644
--- a/src/runtime/runtime_unix.go
+++ b/src/runtime/runtime_unix.go
@@ -1,6 +1,4 @@
//go:build (darwin || (linux && !baremetal && !wasi)) && !nintendoswitch
-// +build darwin linux,!baremetal,!wasi
-// +build !nintendoswitch
package runtime
diff --git a/src/runtime/runtime_wasm_js.go b/src/runtime/runtime_wasm_js.go
index ecc9d73d3..c735c76fc 100644
--- a/src/runtime/runtime_wasm_js.go
+++ b/src/runtime/runtime_wasm_js.go
@@ -1,5 +1,4 @@
//go:build wasm && !wasi
-// +build wasm,!wasi
package runtime
diff --git a/src/runtime/runtime_wasm_js_scheduler.go b/src/runtime/runtime_wasm_js_scheduler.go
index ab80cf1d3..8f8823fef 100644
--- a/src/runtime/runtime_wasm_js_scheduler.go
+++ b/src/runtime/runtime_wasm_js_scheduler.go
@@ -1,5 +1,4 @@
//go:build wasm && !wasi && !scheduler.none
-// +build wasm,!wasi,!scheduler.none
package runtime
diff --git a/src/runtime/runtime_wasm_wasi.go b/src/runtime/runtime_wasm_wasi.go
index 52fd79d61..bacc30dfe 100644
--- a/src/runtime/runtime_wasm_wasi.go
+++ b/src/runtime/runtime_wasm_wasi.go
@@ -1,5 +1,4 @@
//go:build tinygo.wasm && wasi
-// +build tinygo.wasm,wasi
package runtime
diff --git a/src/runtime/scheduler_any.go b/src/runtime/scheduler_any.go
index 39bbeb1e4..0911a2dc7 100644
--- a/src/runtime/scheduler_any.go
+++ b/src/runtime/scheduler_any.go
@@ -1,5 +1,4 @@
//go:build !scheduler.none
-// +build !scheduler.none
package runtime
diff --git a/src/runtime/scheduler_none.go b/src/runtime/scheduler_none.go
index 2086e4225..5079a8085 100644
--- a/src/runtime/scheduler_none.go
+++ b/src/runtime/scheduler_none.go
@@ -1,5 +1,4 @@
//go:build scheduler.none
-// +build scheduler.none
package runtime
diff --git a/src/runtime/scheduler_tasks.go b/src/runtime/scheduler_tasks.go
index 67b475496..6ee540fd3 100644
--- a/src/runtime/scheduler_tasks.go
+++ b/src/runtime/scheduler_tasks.go
@@ -1,5 +1,4 @@
//go:build scheduler.tasks
-// +build scheduler.tasks
package runtime
diff --git a/src/runtime/time_nxpmk66f18.go b/src/runtime/time_nxpmk66f18.go
index fd6078dc5..ca3120f84 100644
--- a/src/runtime/time_nxpmk66f18.go
+++ b/src/runtime/time_nxpmk66f18.go
@@ -28,7 +28,6 @@
// SOFTWARE.
//go:build nxp && mk66f18
-// +build nxp,mk66f18
package runtime
diff --git a/src/runtime/volatile/bitband_nxpmk66f18.go b/src/runtime/volatile/bitband_nxpmk66f18.go
index a6da2ec93..6ad507f85 100644
--- a/src/runtime/volatile/bitband_nxpmk66f18.go
+++ b/src/runtime/volatile/bitband_nxpmk66f18.go
@@ -1,5 +1,4 @@
//go:build nxp && mk66f18
-// +build nxp,mk66f18
package volatile
diff --git a/src/runtime/wait_other.go b/src/runtime/wait_other.go
index 1807a76eb..b51d4b64b 100644
--- a/src/runtime/wait_other.go
+++ b/src/runtime/wait_other.go
@@ -1,5 +1,4 @@
//go:build !tinygo.riscv && !cortexm
-// +build !tinygo.riscv,!cortexm
package runtime
diff --git a/src/syscall/errno_other.go b/src/syscall/errno_other.go
index 3e9374b97..19822a1c6 100644
--- a/src/syscall/errno_other.go
+++ b/src/syscall/errno_other.go
@@ -1,5 +1,4 @@
//go:build !wasi && !darwin
-// +build !wasi,!darwin
package syscall
diff --git a/src/syscall/file_emulated.go b/src/syscall/file_emulated.go
index b1859bb1b..f12d74e58 100644
--- a/src/syscall/file_emulated.go
+++ b/src/syscall/file_emulated.go
@@ -1,5 +1,4 @@
//go:build baremetal || wasm
-// +build baremetal wasm
// This file emulates some file-related functions that are only available
// under a real operating system.
diff --git a/src/syscall/file_hosted.go b/src/syscall/file_hosted.go
index 86fc62c40..553322f02 100644
--- a/src/syscall/file_hosted.go
+++ b/src/syscall/file_hosted.go
@@ -1,5 +1,4 @@
//go:build !baremetal && !wasm
-// +build !baremetal,!wasm
// This file assumes there is a libc available that runs on a real operating
// system.
diff --git a/src/syscall/mmap_unix_test.go b/src/syscall/mmap_unix_test.go
index d13036044..1946265d8 100644
--- a/src/syscall/mmap_unix_test.go
+++ b/src/syscall/mmap_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || linux
-// +build darwin linux
package syscall_test
diff --git a/src/syscall/proc_emulated.go b/src/syscall/proc_emulated.go
index 4ed0b44c1..46570f530 100644
--- a/src/syscall/proc_emulated.go
+++ b/src/syscall/proc_emulated.go
@@ -1,5 +1,4 @@
//go:build baremetal || wasi || wasm
-// +build baremetal wasi wasm
// This file emulates some process-related functions that are only available
// under a real operating system.
diff --git a/src/syscall/proc_hosted.go b/src/syscall/proc_hosted.go
index dd7c289ca..ab35762d0 100644
--- a/src/syscall/proc_hosted.go
+++ b/src/syscall/proc_hosted.go
@@ -1,5 +1,4 @@
//go:build !baremetal && !wasi && !wasm
-// +build !baremetal,!wasi,!wasm
// This file assumes there is a libc available that runs on a real operating
// system.
diff --git a/src/syscall/syscall_libc.go b/src/syscall/syscall_libc.go
index 34e2bc3fa..002c9dc3f 100644
--- a/src/syscall/syscall_libc.go
+++ b/src/syscall/syscall_libc.go
@@ -1,5 +1,4 @@
//go:build darwin || nintendoswitch || wasi
-// +build darwin nintendoswitch wasi
package syscall
diff --git a/src/syscall/syscall_libc_darwin.go b/src/syscall/syscall_libc_darwin.go
index 051b88df0..2628185da 100644
--- a/src/syscall/syscall_libc_darwin.go
+++ b/src/syscall/syscall_libc_darwin.go
@@ -1,5 +1,4 @@
//go:build darwin
-// +build darwin
package syscall
diff --git a/src/syscall/syscall_libc_darwin_amd64.go b/src/syscall/syscall_libc_darwin_amd64.go
index 242aca3f2..d890c6624 100644
--- a/src/syscall/syscall_libc_darwin_amd64.go
+++ b/src/syscall/syscall_libc_darwin_amd64.go
@@ -1,5 +1,4 @@
//go:build darwin
-// +build darwin
package syscall
diff --git a/src/syscall/syscall_libc_darwin_arm64.go b/src/syscall/syscall_libc_darwin_arm64.go
index 815d84f92..49f3c598c 100644
--- a/src/syscall/syscall_libc_darwin_arm64.go
+++ b/src/syscall/syscall_libc_darwin_arm64.go
@@ -1,5 +1,4 @@
//go:build darwin
-// +build darwin
package syscall
diff --git a/src/syscall/syscall_libc_nintendoswitch.go b/src/syscall/syscall_libc_nintendoswitch.go
index c7d937a1a..698a7e438 100644
--- a/src/syscall/syscall_libc_nintendoswitch.go
+++ b/src/syscall/syscall_libc_nintendoswitch.go
@@ -1,5 +1,4 @@
//go:build nintendoswitch
-// +build nintendoswitch
package syscall
diff --git a/src/syscall/syscall_libc_wasi.go b/src/syscall/syscall_libc_wasi.go
index ab1ed3c65..12959238f 100644
--- a/src/syscall/syscall_libc_wasi.go
+++ b/src/syscall/syscall_libc_wasi.go
@@ -1,5 +1,4 @@
//go:build wasi
-// +build wasi
package syscall
diff --git a/src/syscall/syscall_nonhosted.go b/src/syscall/syscall_nonhosted.go
index 399e97428..04a776802 100644
--- a/src/syscall/syscall_nonhosted.go
+++ b/src/syscall/syscall_nonhosted.go
@@ -1,5 +1,4 @@
//go:build baremetal || js
-// +build baremetal js
package syscall
diff --git a/src/syscall/tables_nonhosted.go b/src/syscall/tables_nonhosted.go
index ae0c7cc57..d9f2f8654 100644
--- a/src/syscall/tables_nonhosted.go
+++ b/src/syscall/tables_nonhosted.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build baremetal || nintendoswitch || js
-// +build baremetal nintendoswitch js
package syscall
diff --git a/src/testing/is_baremetal.go b/src/testing/is_baremetal.go
index 95eefe0f4..a9a2625a4 100644
--- a/src/testing/is_baremetal.go
+++ b/src/testing/is_baremetal.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//
//go:build baremetal
-// +build baremetal
package testing
diff --git a/src/testing/is_not_baremetal.go b/src/testing/is_not_baremetal.go
index 4035c93bb..8f487ec99 100644
--- a/src/testing/is_not_baremetal.go
+++ b/src/testing/is_not_baremetal.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//
//go:build !baremetal
-// +build !baremetal
package testing
diff --git a/src/testing/is_wasi_no_test.go b/src/testing/is_wasi_no_test.go
index 6c1a765eb..86fab391e 100644
--- a/src/testing/is_wasi_no_test.go
+++ b/src/testing/is_wasi_no_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//
//go:build !wasi
-// +build !wasi
package testing_test
diff --git a/src/testing/is_wasi_test.go b/src/testing/is_wasi_test.go
index 588327eb7..e50af901b 100644
--- a/src/testing/is_wasi_test.go
+++ b/src/testing/is_wasi_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//
//go:build wasi
-// +build wasi
package testing_test
diff --git a/src/testing/testing_test.go b/src/testing/testing_test.go
index 3ab324262..b0b5ff060 100644
--- a/src/testing/testing_test.go
+++ b/src/testing/testing_test.go
@@ -1,5 +1,4 @@
//go:build !windows
-// +build !windows
// TODO: implement readdir for windows, then enable this file
diff --git a/tests/runtime_wasi/malloc_test.go b/tests/runtime_wasi/malloc_test.go
index eb655b424..e5bbb4ebb 100644
--- a/tests/runtime_wasi/malloc_test.go
+++ b/tests/runtime_wasi/malloc_test.go
@@ -1,5 +1,4 @@
//go:build tinygo.wasm
-// +build tinygo.wasm
package runtime_wasi
diff --git a/util_unix.go b/util_unix.go
index 47a3a2c3e..3c8dbdc2d 100644
--- a/util_unix.go
+++ b/util_unix.go
@@ -1,5 +1,4 @@
//go:build !windows
-// +build !windows
package main