Skip to content

Commit 4be80e0

Browse files
aykevldeadprogram
authored andcommitted
Revert "all: use compiler-rt from the llvm-project directory"
This reverts commit acdaaa1. See #734 for details.
1 parent 10e1420 commit 4be80e0

File tree

4 files changed

+14
-15
lines changed

4 files changed

+14
-15
lines changed

.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,7 @@
1010
[submodule "lib/cmsis-svd"]
1111
path = lib/cmsis-svd
1212
url = https://github.com/tinygo-org/cmsis-svd
13+
[submodule "lib/compiler-rt"]
14+
path = lib/compiler-rt
15+
url = https://github.com/llvm-mirror/compiler-rt.git
16+
branch = release_80

Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -258,16 +258,16 @@ release: tinygo gen-device
258258
@mkdir -p build/release/tinygo/pkg/armv7m-none-eabi
259259
@mkdir -p build/release/tinygo/pkg/armv7em-none-eabi
260260
@echo copying source files
261-
@cp -p build/tinygo$(EXE) build/release/tinygo/bin
261+
@cp -p build/tinygo$(EXE) build/release/tinygo/bin
262262
@cp -p $(abspath $(CLANG_SRC))/lib/Headers/*.h build/release/tinygo/lib/clang/include
263-
@cp -rp lib/CMSIS/CMSIS/Include build/release/tinygo/lib/CMSIS/CMSIS
264-
@cp -rp lib/CMSIS/README.md build/release/tinygo/lib/CMSIS
265-
@cp -rp llvm-project/compiler-rt/lib/builtins build/release/tinygo/lib/compiler-rt/lib
266-
@cp -rp llvm-project/compiler-rt/LICENSE.TXT build/release/tinygo/lib/compiler-rt
267-
@cp -rp llvm-project/compiler-rt/README.txt build/release/tinygo/lib/compiler-rt
268-
@cp -rp lib/nrfx/* build/release/tinygo/lib/nrfx
269-
@cp -rp src build/release/tinygo/src
270-
@cp -rp targets build/release/tinygo/targets
263+
@cp -rp lib/CMSIS/CMSIS/Include build/release/tinygo/lib/CMSIS/CMSIS
264+
@cp -rp lib/CMSIS/README.md build/release/tinygo/lib/CMSIS
265+
@cp -rp lib/compiler-rt/lib/builtins build/release/tinygo/lib/compiler-rt/lib
266+
@cp -rp lib/compiler-rt/LICENSE.TXT build/release/tinygo/lib/compiler-rt
267+
@cp -rp lib/compiler-rt/README.txt build/release/tinygo/lib/compiler-rt
268+
@cp -rp lib/nrfx/* build/release/tinygo/lib/nrfx
269+
@cp -rp src build/release/tinygo/src
270+
@cp -rp targets build/release/tinygo/targets
271271
./build/tinygo build-builtins -target=armv6m-none-eabi -o build/release/tinygo/pkg/armv6m-none-eabi/compiler-rt.a
272272
./build/tinygo build-builtins -target=armv7m-none-eabi -o build/release/tinygo/pkg/armv7m-none-eabi/compiler-rt.a
273273
./build/tinygo build-builtins -target=armv7em-none-eabi -o build/release/tinygo/pkg/armv7em-none-eabi/compiler-rt.a

builder/builtins.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,6 @@ func builtinFiles(target string) []string {
166166

167167
// builtinsDir returns the directory where the sources for compiler-rt are kept.
168168
func builtinsDir() string {
169-
// Path from within the development directory.
170-
path := filepath.Join(goenv.Get("TINYGOROOT"), "llvm-project", "compiler-rt", "lib", "builtins")
171-
if _, err := os.Stat(path); err == nil {
172-
return path
173-
}
174-
// Path from within an installation directory (bundled in the release tarball).
175169
return filepath.Join(goenv.Get("TINYGOROOT"), "lib", "compiler-rt", "lib", "builtins")
176170
}
177171

lib/compiler-rt

Submodule compiler-rt added at 5bc7979

0 commit comments

Comments
 (0)