vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Add binutils

Browse source
This commit is contained in:
Jeremy Soller 2016-11-18 09:01:39 -07:00
parent 74a9369294
commit 150dfc5c4e
4 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -52,3 +52,6 @@
[submodule "libstd_real/openlibm"] [submodule "libstd_real/openlibm"]
path = libstd/openlibm path = libstd/openlibm
url = https://github.com/redox-os/openlibm.git url = https://github.com/redox-os/openlibm.git
[submodule "programs/binutils"]
path = programs/binutils
url = https://github.com/redox-os/binutils.git

18
Makefile
View file

@ -19,7 +19,7 @@ CARGO=RUSTC="$(RUSTC)" RUSTDOC="$(RUSTDOC)" cargo
CARGOFLAGS=--target $(TARGET).json --release -- CARGOFLAGS=--target $(TARGET).json --release --
# Default targets # Default targets
.PHONY: all clean doc ref test update qemu bochs drivers schemes coreutils extrautils netutils userutils wireshark FORCE .PHONY: all clean doc ref test update qemu bochs drivers schemes binutils coreutils extrautils netutils userutils wireshark FORCE
all: $(KBUILD)/harddrive.bin all: $(KBUILD)/harddrive.bin
@ -38,6 +38,7 @@ clean:
cargo clean --manifest-path programs/contain/Cargo.toml cargo clean --manifest-path programs/contain/Cargo.toml
cargo clean --manifest-path programs/init/Cargo.toml cargo clean --manifest-path programs/init/Cargo.toml
cargo clean --manifest-path programs/ion/Cargo.toml cargo clean --manifest-path programs/ion/Cargo.toml
cargo clean --manifest-path programs/binutils/Cargo.toml
cargo clean --manifest-path programs/coreutils/Cargo.toml cargo clean --manifest-path programs/coreutils/Cargo.toml
cargo clean --manifest-path programs/extrautils/Cargo.toml cargo clean --manifest-path programs/extrautils/Cargo.toml
cargo clean --manifest-path programs/netutils/Cargo.toml cargo clean --manifest-path programs/netutils/Cargo.toml
@ -74,6 +75,7 @@ doc-std: $(BUILD)/libstd.rlib FORCE
ref: FORCE ref: FORCE
rm -rf filesystem/ref/ rm -rf filesystem/ref/
mkdir -p filesystem/ref/ mkdir -p filesystem/ref/
cargo run --manifest-path crates/docgen/Cargo.toml -- programs/binutils/src/bin/ filesystem/ref/
cargo run --manifest-path crates/docgen/Cargo.toml -- programs/coreutils/src/bin/ filesystem/ref/ cargo run --manifest-path crates/docgen/Cargo.toml -- programs/coreutils/src/bin/ filesystem/ref/
cargo run --manifest-path crates/docgen/Cargo.toml -- programs/extrautils/src/bin/ filesystem/ref/ cargo run --manifest-path crates/docgen/Cargo.toml -- programs/extrautils/src/bin/ filesystem/ref/
cargo run --manifest-path crates/docgen/Cargo.toml -- programs/netutils/src/ filesystem/ref/ cargo run --manifest-path crates/docgen/Cargo.toml -- programs/netutils/src/ filesystem/ref/
@ -91,6 +93,7 @@ test:
cargo test --manifest-path programs/contain/Cargo.toml cargo test --manifest-path programs/contain/Cargo.toml
cargo test --manifest-path programs/init/Cargo.toml cargo test --manifest-path programs/init/Cargo.toml
cargo test --manifest-path programs/ion/Cargo.toml cargo test --manifest-path programs/ion/Cargo.toml
cargo test --manifest-path programs/binutils/Cargo.toml
cargo test --manifest-path programs/coreutils/Cargo.toml cargo test --manifest-path programs/coreutils/Cargo.toml
cargo test --manifest-path programs/extrautils/Cargo.toml cargo test --manifest-path programs/extrautils/Cargo.toml
cargo test --manifest-path programs/netutils/Cargo.toml cargo test --manifest-path programs/netutils/Cargo.toml
@ -122,6 +125,7 @@ update:
cargo update --manifest-path programs/contain/Cargo.toml cargo update --manifest-path programs/contain/Cargo.toml
cargo update --manifest-path programs/init/Cargo.toml cargo update --manifest-path programs/init/Cargo.toml
cargo update --manifest-path programs/ion/Cargo.toml cargo update --manifest-path programs/ion/Cargo.toml
cargo update --manifest-path programs/binutils/Cargo.toml
cargo update --manifest-path programs/coreutils/Cargo.toml cargo update --manifest-path programs/coreutils/Cargo.toml
cargo update --manifest-path programs/extrautils/Cargo.toml cargo update --manifest-path programs/extrautils/Cargo.toml
cargo update --manifest-path programs/netutils/Cargo.toml cargo update --manifest-path programs/netutils/Cargo.toml
@ -373,6 +377,12 @@ filesystem/bin/%: programs/%/Cargo.toml programs/%/src/** $(BUILD)/libstd.rlib
filesystem/bin/sh: filesystem/bin/ion filesystem/bin/sh: filesystem/bin/ion
cp $< $@ cp $< $@
filesystem/bin/%: programs/binutils/Cargo.toml programs/binutils/src/bin/%.rs $(BUILD)/libstd.rlib
mkdir -p filesystem/bin
$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
strip $@
rm $@.d
filesystem/bin/%: programs/coreutils/Cargo.toml programs/coreutils/src/bin/%.rs $(BUILD)/libstd.rlib filesystem/bin/%: programs/coreutils/Cargo.toml programs/coreutils/src/bin/%.rs $(BUILD)/libstd.rlib
mkdir -p filesystem/bin mkdir -p filesystem/bin
$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@ $(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
@ -420,6 +430,11 @@ drivers: \
filesystem/bin/e1000d \ filesystem/bin/e1000d \
filesystem/bin/rtl8168d filesystem/bin/rtl8168d
binutils: \
filesystem/bin/hex \
filesystem/bin/hexdump \
filesystem/bin/strings
coreutils: \ coreutils: \
filesystem/bin/basename \ filesystem/bin/basename \
filesystem/bin/cat \ filesystem/bin/cat \
@ -464,7 +479,6 @@ extrautils: \
filesystem/bin/cksum \ filesystem/bin/cksum \
filesystem/bin/cur \ filesystem/bin/cur \
filesystem/bin/grep \ filesystem/bin/grep \
filesystem/bin/hexdump \
filesystem/bin/less \ filesystem/bin/less \
filesystem/bin/man \ filesystem/bin/man \
filesystem/bin/mdless \ filesystem/bin/mdless \

1
programs/binutils Submodule

@ -0,0 +1 @@
Subproject commit 5599724eab8b28705f6b2b66145fdcb7e4ce2d4d

2
programs/extrautils

@ -1 +1 @@
Subproject commit b3d8bf61860cd4c7c2263b2798779aa182cab1d6 Subproject commit 63f27dccc12184a4eb73efa0a065fea65650c664