Use upstream openlibm, goblin

This commit is contained in:
Jeremy Soller 2016-12-14 15:45:18 -07:00
parent 7a76e82b66
commit fa8dae8466
3 changed files with 4 additions and 4 deletions

4
.gitmodules vendored
View file

@ -49,9 +49,9 @@
[submodule "crates/docgen"] [submodule "crates/docgen"]
path = crates/docgen path = crates/docgen
url = https://github.com/redox-os/docgen.git url = https://github.com/redox-os/docgen.git
[submodule "libstd_real/openlibm"] [submodule "libstd/openlibm"]
path = libstd/openlibm path = libstd/openlibm
url = https://github.com/redox-os/openlibm.git url = https://github.com/JuliaLang/openlibm.git
[submodule "programs/binutils"] [submodule "programs/binutils"]
path = programs/binutils path = programs/binutils
url = https://github.com/redox-os/binutils.git url = https://github.com/redox-os/binutils.git

View file

@ -13,7 +13,7 @@ spin = "*"
redox_syscall = { path = "syscall/" } redox_syscall = { path = "syscall/" }
[dependencies.goblin] [dependencies.goblin]
git = "https://github.com/redox-os/goblin.git" git = "https://github.com/m4b/goblin.git"
default-features = false default-features = false
features = ["elf32", "elf64"] features = ["elf32", "elf64"]

View file

@ -358,7 +358,7 @@ $(BUILD)/libstd_unicode.rlib: rust/src/libstd_unicode/lib.rs $(BUILD)/libcore.rl
$(RUSTC) $(RUSTCFLAGS) -o $@ $< $(RUSTC) $(RUSTCFLAGS) -o $@ $<
libstd/openlibm/libopenlibm.a: libstd/openlibm/libopenlibm.a:
CROSSCC=$(CC) CFLAGS=-fno-stack-protector make -C libstd/openlibm libopenlibm.a CFLAGS=-fno-stack-protector make -C libstd/openlibm libopenlibm.a
$(BUILD)/libopenlibm.a: libstd/openlibm/libopenlibm.a $(BUILD)/libopenlibm.a: libstd/openlibm/libopenlibm.a
mkdir -p $(BUILD) mkdir -p $(BUILD)