diff --git a/.circleci/config.yml b/.circleci/config.yml index be4d764d..f01dd54f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,7 +24,6 @@ commands: libclang<>-dev \ lld<> \ gcc-arm-linux-gnueabihf \ - binutils-arm-none-eabi \ libc6-dev-armel-cross \ gcc-aarch64-linux-gnu \ libc6-dev-arm64-cross \ diff --git a/.travis.yml b/.travis.yml index d2f92377..995884d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,11 +11,9 @@ matrix: addons: homebrew: update: true - taps: ArmMbed/homebrew-formulae packages: - llvm@8 - qemu - - arm-none-eabi-gcc install: - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh diff --git a/Dockerfile b/Dockerfile index 46c102a1..2ace118d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -59,7 +59,7 @@ COPY --from=tinygo-base /go/src/github.com/tinygo-org/tinygo/lib /go/src/github. RUN cd /go/src/github.com/tinygo-org/tinygo/ && \ apt-get update && \ - apt-get install -y apt-utils python3 make binutils-arm-none-eabi clang-8 && \ + apt-get install -y apt-utils python3 make clang-8 && \ make gen-device-nrf && make gen-device-stm32 && \ apt-get remove -y python3 make && \ apt-get autoremove -y && \ @@ -74,7 +74,7 @@ COPY --from=tinygo-base /go/src/github.com/tinygo-org/tinygo/lib /go/src/github. RUN cd /go/src/github.com/tinygo-org/tinygo/ && \ apt-get update && \ - apt-get install -y apt-utils python3 make binutils-arm-none-eabi clang-8 binutils-avr gcc-avr avr-libc && \ + apt-get install -y apt-utils python3 make clang-8 binutils-avr gcc-avr avr-libc && \ make gen-device && \ apt-get remove -y python3 make && \ apt-get autoremove -y && \ diff --git a/commands_macos.go b/commands_macos.go index 24f16314..e457ba88 100644 --- a/commands_macos.go +++ b/commands_macos.go @@ -6,6 +6,6 @@ package main var commands = map[string]string{ "ar": "llvm-ar", "clang": "clang-8", - "ld.lld": "ld.lld-8", + "ld.lld": "ld.lld", "wasm-ld": "wasm-ld", } diff --git a/targets/arm.ld b/targets/arm.ld index c964331d..0d5c12f1 100644 --- a/targets/arm.ld +++ b/targets/arm.ld @@ -54,6 +54,7 @@ SECTIONS /DISCARD/ : { + *(.ARM.exidx) /* causes 'no memory region specified' error in lld */ *(.ARM.exidx.*) /* causes spurious 'undefined reference' errors */ } } diff --git a/targets/cortex-m.json b/targets/cortex-m.json index 406239bb..0e11034a 100644 --- a/targets/cortex-m.json +++ b/targets/cortex-m.json @@ -4,7 +4,7 @@ "goarch": "arm", "compiler": "clang-8", "gc": "marksweep", - "linker": "arm-none-eabi-ld", + "linker": "ld.lld", "rtlib": "compiler-rt", "cflags": [ "-Oz",